Packman Build Service PMBS

Changes of Revision 2

tomahawk.spec Changed

@@ -4,7 +4,7 @@
 
 Name:       tomahawk
 Summary:    The social media player
-Version:    0.4.2
+Version:    0.5.5
 Release:    0
 License:    GPL3+
 Group:      Productivity/Multimedia/Sound/Players
@@ -25,6 +25,7 @@
 BuildRequires:  taglib-devel >= 1.6.2
 BuildRequires:  libclucene-unstable-devel
 BuildRequires:  sqlite3-devel >= 3.6.22
+BuildRequires:  liblastfm1-devel >= 1.0.1
 
 # Audio stuff
 BuildRequires:  phonon-devel >= 4.5.0
@@ -34,11 +35,12 @@
 
 
 # Optional deps for additional features
-BuildRequires:  libechonest-devel >= 1.2
+BuildRequires:  libechonest-devel >= 2.0
 BuildRequires:  libjreen-devel >= 1.0.1
 BuildRequires:  qtweetlib-devel
 BuildRequires:  libqca2-devel
-BuildRequires:  libattica-devel quazip-devel
+BuildRequires:  libattica-devel >= 0.4.0
+BuildRequires:  quazip-devel
 
 # Other
 BuildRequires:  update-desktop-files
@@ -59,7 +61,7 @@
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DBUILD_RELEASE=ON
 
-make VERBOSE=1 %{?_smp_mflags}
+make VERBOSE=1 %{?_smp_mflags} || make
 
 %install
 %makeinstall

tomahawk-0.4.2.tar.bz2/CMakeModules/FindGloox.cmake Deleted

tomahawk-0.4.2.tar.bz2/CMakeModules/FindLibEchonest.cmake Deleted

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

tomahawk-0.4.2.tar.bz2/data/images/avatar-dude-plus.png Deleted

tomahawk-0.4.2.tar.bz2/data/images/avatar-dude.png Deleted

tomahawk-0.4.2.tar.bz2/data/images/collapse.png Deleted

tomahawk-0.4.2.tar.bz2/data/images/create-playlist.png Deleted

tomahawk-0.4.2.tar.bz2/data/images/home.png Deleted

tomahawk-0.4.2.tar.bz2/data/images/post.png Deleted

tomahawk-0.4.2.tar.bz2/src/GetNewStuffDelegate.cpp Deleted

@@ -1,323 +0,0 @@
-/* === 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 "GetNewStuffDelegate.h"
-
-#include "GetNewStuffModel.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include <QtGui/QPainter>
-#include <QApplication>
-#include <QMouseEvent>
-#include "AtticaManager.h"
-
-#define PADDING 4
-#define PADDING_BETWEEN_STARS 2
-#define STAR_SIZE 12
-
-#ifdef Q_WS_MAC
-#define SIZEHINT_HEIGHT 70
-#else
-#define SIZEHINT_HEIGHT 60
-#endif
-
-GetNewStuffDelegate::GetNewStuffDelegate( QObject* parent )
-    : QStyledItemDelegate ( parent )
-    , m_widestTextWidth( 0 )
-    , m_hoveringOver( -1 )
-{
-    m_defaultCover.load( RESPATH "images/sipplugin-online.png" );
-    m_ratingStarPositive.load( RESPATH "images/starred.png" );
-    m_ratingStarNegative.load( RESPATH "images/star-unstarred.png" );
-    m_onHoverStar.load( RESPATH "images/star-hover.png" );
-
-    m_ratingStarPositive = m_ratingStarPositive.scaled( STAR_SIZE, STAR_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
-    m_ratingStarNegative = m_ratingStarNegative.scaled( STAR_SIZE, STAR_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
-    m_onHoverStar = m_onHoverStar.scaled( STAR_SIZE, STAR_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
-
-    const int w = SIZEHINT_HEIGHT - 2*PADDING;
-    m_defaultCover = m_defaultCover.scaled( w, w, Qt::KeepAspectRatio, Qt::SmoothTransformation );
-
-    // save the widest wifth
-    QFont f( QApplication::font() );
-    f.setPointSize( f.pointSize() - 1 );
-    QFontMetrics fm( f );
-    QStringList l = QStringList() << tr( "Installed" ) << tr( "Installing" ) << tr( "Failed" ) << tr( "Uninstalling" );
-    foreach ( const QString& str, l )
-    {
-        if ( fm.width( str ) > m_widestTextWidth )
-            m_widestTextWidth = fm.width( str );
-    }
-}
-
-void
-GetNewStuffDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, index );
-
-    QApplication::style()->drawPrimitive( QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget );
-
-    painter->setRenderHint( QPainter::Antialiasing );
-
-    QFont titleFont = opt.font;
-    titleFont.setBold( true );
-    titleFont.setPointSize( titleFont.pointSize() + 2 );
-    QFontMetrics titleMetrics( titleFont );
-
-    QFont authorFont = opt.font;
-    authorFont.setItalic( true );
-    authorFont.setPointSize( authorFont.pointSize() - 1 );
-    QFontMetrics authorMetrics( authorFont );
-
-    QFont descFont = authorFont;
-    descFont.setItalic( false );
-    QFontMetrics descMetrics( descFont );
-
-    QFont installFont = opt.font;
-    installFont.setPointSize( installFont.pointSize() - 1 );
-    QFontMetrics installMetrics( descFont );
-
-    const int height = opt.rect.height();
-    const int center = height / 2 + opt.rect.top();
-
-    // Pixmap
-    QPixmap p = index.data( Qt::DecorationRole ).value< QPixmap >();
-    const int pixmapWidth = height - 2*PADDING;
-    QRect pixmapRect( PADDING, PADDING + opt.rect.top(), pixmapWidth, pixmapWidth );
-    if ( p.isNull() ) // default image... TODO
-        p = m_defaultCover;
-    else
-        p = p.scaled( pixmapRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation );
-
-    painter->drawPixmap( pixmapRect, p );
-
-    // Go from right edge now, stars, install button, and downloaded info
-
-    // install / status button
-    AtticaManager::ResolverState state = static_cast< AtticaManager::ResolverState >( index.data( GetNewStuffModel::StateRole ).toInt() );
-    QString actionText;
-    switch( state )
-    {
-        case AtticaManager::Uninstalled:
-            actionText = tr( "Install" );
-            break;
-        case AtticaManager::Installing:
-            actionText = tr( "Installing" );
-            break;
-        case AtticaManager::Upgrading:
-            actionText = tr( "Upgrading" );
-            break;
-        case AtticaManager::Failed:
-            actionText = tr( "Failed" );
-            break;
-        case AtticaManager::Installed:
-            actionText = tr( "Uninstall" );
-            break;
-        case AtticaManager::NeedsUpgrade:
-            actionText = tr( "Upgrade" );
-            break;
-    }
-
-    const int btnWidth = m_widestTextWidth + 7;
-    const int leftEdge = opt.rect.width() - PADDING - btnWidth - 3;
-    const QRect btnRect( leftEdge, center - ( installMetrics.height() + 4 ) / 2, btnWidth, installMetrics.height() + 4 );
-    m_cachedButtonRects QPair<int, int>(index.row(), index.column())  = btnRect;
-
-    QPen saved = painter->pen();
-    painter->setPen( opt.palette.color( QPalette::Active, QPalette::AlternateBase ) );
-
-    QPainterPath btnPath;
-    const int radius = 3;
-    //btnPath.addRoundedRect( btnRect, 3, 3 );
-    // draw top half gradient
-    const int btnCenter = btnRect.bottom() - ( btnRect.height() / 2 );
-    btnPath.moveTo( btnRect.left(), btnCenter );
-    btnPath.lineTo( btnRect.left(), btnRect.top() + radius );
-    btnPath.quadTo( QPoint( btnRect.topLeft() ), QPoint( btnRect.left() + radius, btnRect.top() ) );
-    btnPath.lineTo( btnRect.right() - radius, btnRect.top() );
-    btnPath.quadTo( QPoint( btnRect.topRight() ), QPoint( btnRect.right(), btnRect.top() + radius ) );
-    btnPath.lineTo( btnRect.right(),btnCenter );
-    btnPath.lineTo( btnRect.left(), btnCenter );
-
-    QLinearGradient g;
-    g.setColorAt( 0, QColor(54, 127, 211) );
-    g.setColorAt( 0.5, QColor(43, 104, 182) );
-    //painter->setPen( bg.darker() );
-    painter->fillPath( btnPath, g );
-    //painter->drawPath( btnPath );
-
-    btnPath = QPainterPath();
-    btnPath.moveTo( btnRect.left(), btnCenter );
-    btnPath.lineTo( btnRect.left(), btnRect.bottom() - radius );
-    btnPath.quadTo( QPoint( btnRect.bottomLeft() ), QPoint( btnRect.left() + radius, btnRect.bottom() ) );
-    btnPath.lineTo( btnRect.right() - radius, btnRect.bottom() );
-    btnPath.quadTo( QPoint( btnRect.bottomRight() ), QPoint( btnRect.right(), btnRect.bottom() - radius ) );
-    btnPath.lineTo( btnRect.right(), btnCenter );
-    btnPath.lineTo( btnRect.left(), btnCenter );
-
-    g.setColorAt( 0, QColor(34, 85, 159) );
-    g.setColorAt( 0.5, QColor(35, 79, 147) );
-    painter->fillPath( btnPath, g );
-
-    painter->setFont( installFont );
-    painter->drawText( btnRect, Qt::AlignCenter, actionText );
-
-    painter->setPen( saved );
-
-    // rating stars
-    int rating = index.data( GetNewStuffModel::RatingRole ).toInt();
-    const int ratingWidth = 5 * ( m_ratingStarPositive.width() + PADDING_BETWEEN_STARS );
-    int runningEdge = ( btnRect.right() - btnRect.width() / 2 ) - ratingWidth / 2;
-    for ( int i = 1; i < 6; i++ )
-    {
-        QRect r( runningEdge, btnRect.top() - m_ratingStarPositive.height() - PADDING, m_ratingStarPositive.width(), m_ratingStarPositive.height() );
-        if ( i == 1 )
-            m_cachedStarRects QPair<int, int>(index.row(), index.column())  = r;
-
-        const bool userHasRated = index.data( GetNewStuffModel::UserHasRatedRole ).toBool();
-        if ( !userHasRated && // Show on-hover animation if the user hasn't rated it yet, and is hovering over it
-             m_hoveringOver > -1 &&
-             m_hoveringItem == index )
-        {
-            if ( i <= m_hoveringOver ) // positive star
-                painter->drawPixmap( r, m_onHoverStar );
-            else
-                painter->drawPixmap( r, m_ratingStarNegative );
-        }
-        else
-        {
-            if ( i <= rating ) // positive or rated star
-            {
-                if ( userHasRated )
-                    painter->drawPixmap( r, m_onHoverStar );
-                else
-                    painter->drawPixmap( r, m_ratingStarPositive );
-            }
-            else
-                painter->drawPixmap( r, m_ratingStarNegative );
-        }
-        runningEdge += m_ratingStarPositive.width() + PADDING_BETWEEN_STARS;
-    }
-
-    // downloaded num times, underneath button
-    QString count = tr( "%1 downloads" ).arg( index.data( GetNewStuffModel::DownloadCounterRole ).toInt() );
-    const QRect countRect( btnRect.left(), btnRect.bottom() + PADDING, btnRect.width(), opt.rect.bottom() - PADDING - btnRect.bottom() );
-    QFont countFont = descFont;
-    countFont.setPointSize( countFont.pointSize() - 2 );
-    countFont.setBold( true );
-    painter->setFont( countFont );
-    painter->drawText( countRect, Qt::AlignCenter | Qt::TextWordWrap, count );
-
-    // author and version
-    QString author = index.data( GetNewStuffModel::AuthorRole ).toString();
-    const int authorWidth = authorMetrics.width( author );
-    const int topTextLine = opt.rect.top() + PADDING;
-    const QRect authorRect( btnRect.x() - 3*PADDING - authorWidth, topTextLine, authorWidth + 6, authorMetrics.height() );
-    painter->setFont( authorFont );
-    painter->drawText( authorRect, Qt::AlignCenter, author );
-
-    const QRect versionRect = authorRect.translated( 0, authorRect.height() );
-    QString version = index.data( GetNewStuffModel::VersionRole ).toString();
-    painter->drawText( versionRect, Qt::AlignCenter, version );
-
-    // title
-    QString title = index.data( Qt::DisplayRole ).toString();
-    const int rightTitleEdge = authorRect.left() - PADDING;
-    const int leftTitleEdge = pixmapRect.right() + PADDING;
-    const QRect textRect( leftTitleEdge, topTextLine, rightTitleEdge - leftTitleEdge, versionRect.bottom() - opt.rect.top() - PADDING );
-    painter->setFont( titleFont );
-    painter->drawText( textRect, Qt::AlignVCenter | Qt::AlignLeft, title );
-
-    // description
-    QString desc = index.data( GetNewStuffModel::DescriptionRole ).toString();
-    const int descWidth = btnRect.left() - leftTitleEdge - PADDING;
-    const QRect descRect( leftTitleEdge, versionRect.bottom(), descWidth, opt.rect.bottom() - versionRect.bottom() + PADDING );
-    painter->setFont( descFont );
-    painter->drawText( descRect, Qt::AlignLeft | Qt::TextWordWrap, desc );
-}
-
-
-QSize
-GetNewStuffDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    Q_UNUSED( option );
-    Q_UNUSED( index );
-    return QSize( 200, SIZEHINT_HEIGHT );
-}
-
-bool
-GetNewStuffDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
-{
-    Q_UNUSED( option );
-
-    if ( event->type() != QEvent::MouseButtonRelease &&
-         event->type() != QEvent::MouseMove )
-        return false;
-
-    if ( event->type() == QEvent::MouseButtonRelease && m_cachedButtonRects.contains( QPair<int, int>( index.row(), index.column() ) ) )
-    {
-        QRect rect = m_cachedButtonRects QPair<int, int>( index.row(), index.column() ) ;
-        QMouseEvent* me = static_cast< QMouseEvent* >( event );
-
-        if ( rect.contains( me->pos() ) )
-        {
-            model->setData( index, true );
-
-            return true;
-        }
-    }
-
-    if ( m_cachedStarRects.contains( QPair<int, int>( index.row(), index.column() ) ) )
-    {
-        QRect fullStars = m_cachedStarRects QPair<int, int>( index.row(), index.column() ) ;
-        const int starsWidth = 5 * ( m_ratingStarPositive.width() + PADDING_BETWEEN_STARS );
-        fullStars.setWidth( starsWidth );
-
-        QMouseEvent* me = static_cast< QMouseEvent* >( event );
-
-        if ( fullStars.contains( me->pos() ) )
-        {
-            const int eachStar = starsWidth / 5;
-            const int clickOffset = me->pos().x() - fullStars.x();
-            const int whichStar = (clickOffset / eachStar) + 1;
-
-            if ( event->type() == QEvent::MouseButtonRelease )
-            {
-                model->setData( index, whichStar, GetNewStuffModel::RatingRole );
-            }
-            else if ( event->type() == QEvent::MouseMove )
-            {
-                // 0-indexed
-                m_hoveringOver = whichStar;
-                m_hoveringItem = index;
-            }
-
-            return true;
-        }
-    }
-
-    if ( m_hoveringOver > -1 )
-    {
-        emit update( m_hoveringItem );
-        m_hoveringOver = -1;
-        m_hoveringItem = QPersistentModelIndex();
-    }
-    return false;
-}

tomahawk-0.4.2.tar.bz2/src/GetNewStuffDelegate.h Deleted

@@ -1,50 +0,0 @@
-/* === 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 GETNEWSTUFFDELEGATE_H
-#define GETNEWSTUFFDELEGATE_H
-
-#include <QStyledItemDelegate>
-
-
-class
-GetNewStuffDelegate : public QStyledItemDelegate
-{
-    Q_OBJECT
-public:
-    explicit GetNewStuffDelegate( QObject* parent = 0 );
-    virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    virtual QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-signals:
-    void update( const QModelIndex& idx );
-
-protected:
-    virtual bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
-
-private:
-    QPixmap m_defaultCover, m_onHoverStar, m_ratingStarPositive, m_ratingStarNegative;
-
-    int m_widestTextWidth;
-    int m_hoveringOver;
-    QPersistentModelIndex m_hoveringItem;
-    mutable QHash< QPair<int, int>, QRect > m_cachedButtonRects;
-    mutable QHash< QPair<int, int>, QRect > m_cachedStarRects;
-};
-
-#endif // GETNEWSTUFFDELEGATE_H

tomahawk-0.4.2.tar.bz2/src/GetNewStuffDialog.cpp Deleted

@@ -1,54 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 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 "GetNewStuffDialog.h"
-
-#include "ui_GetNewStuffDialog.h"
-#include "GetNewStuffDelegate.h"
-#include "GetNewStuffModel.h"
-
-GetNewStuffDialog::GetNewStuffDialog( QWidget* parent, Qt::WindowFlags f )
-    : QDialog( parent, f )
-    , ui( new Ui::GetNewStuffDialog )
-    , m_model( new GetNewStuffModel( this ) )
-{
-    ui->setupUi( this );
-
-    ui->listView->setModel( m_model );
-    GetNewStuffDelegate* del = new GetNewStuffDelegate( ui->listView );
-    connect( del, SIGNAL( update( QModelIndex ) ), ui->listView, SLOT( update( QModelIndex ) ) );
-    ui->listView->setItemDelegate( del );
-    ui->listView->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
-
-    ui->listView->setMouseTracking( true );
-
-    setMinimumSize( 560, 350 );
-
-#ifdef Q_WS_MAC
-    setMaximumSize( 560, 350 );
-    setSizeGripEnabled( false );
-
-    ui->listView->setAttribute( Qt::WA_MacShowFocusRect, false );
-#endif
-}
-
-
-GetNewStuffDialog::~GetNewStuffDialog()
-{
-    delete ui;
-}

tomahawk-0.4.2.tar.bz2/src/GetNewStuffDialog.h Deleted

@@ -1,41 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 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 GETNEWSTUFFDIALOG_H
-#define GETNEWSTUFFDIALOG_H
-
-#include <QDialog>
-
-class GetNewStuffModel;
-namespace Ui {
-    class GetNewStuffDialog;
-}
-
-class GetNewStuffDialog : public QDialog
-{
-    Q_OBJECT
-public:
-    explicit GetNewStuffDialog( QWidget *parent = 0, Qt::WindowFlags f = 0 );
-    ~GetNewStuffDialog();
-
-private:
-    Ui::GetNewStuffDialog *ui;
-    GetNewStuffModel* m_model;
-};
-
-#endif // GETNEWSTUFFDIALOG_H

tomahawk-0.4.2.tar.bz2/src/GetNewStuffDialog.ui Deleted

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>GetNewStuffDialog</class>
- <widget class="QDialog" name="GetNewStuffDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>449</width>
-    <height>282</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Download New Resolvers</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QListView" name="listView"/>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>GetNewStuffDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>GetNewStuffDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

tomahawk-0.4.2.tar.bz2/src/GetNewStuffModel.cpp Deleted

@@ -1,156 +0,0 @@
-/* === 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 "GetNewStuffModel.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include <QPixmap>
-#include <QUrl>
-#include "AtticaManager.h"
-
-GetNewStuffModel::GetNewStuffModel( QObject* parent )
-    : QAbstractListModel ( parent )
-{
-
-    if ( AtticaManager::instance()->resolversLoaded() )
-        m_contentList = AtticaManager::instance()->resolvers();
-
-    connect( AtticaManager::instance(), SIGNAL( resolversReloaded( Attica::Content::List ) ), this, SLOT( resolversReloaded( Attica::Content::List ) ) );
-    connect( AtticaManager::instance(), SIGNAL( resolverStateChanged( QString ) ), this, SLOT( resolverStateChanged( QString ) ) );
-
-}
-
-GetNewStuffModel::~GetNewStuffModel()
-{
-}
-
-void
-GetNewStuffModel::resolversReloaded( const Attica::Content::List& resolvers )
-{
-    beginResetModel();
-    m_contentList = resolvers;
-    endResetModel();
-}
-
-void
-GetNewStuffModel::resolverStateChanged( const QString& resolverId )
-{
-    for ( int i = 0; i < m_contentList.count(); i++ )
-    {
-        const Attica::Content resolver = m_contentList i ;
-        if ( resolver.id() == resolverId )
-        {
-            QModelIndex idx = index( i, 0, QModelIndex() );
-            emit dataChanged( idx, idx );
-        }
-    }
-}
-
-
-QVariant
-GetNewStuffModel::data( const QModelIndex& index, int role ) const
-{
-    if ( !index.isValid() || !hasIndex( index.row(), index.column(), index.parent() ) )
-        return QVariant();
-
-    Attica::Content resolver = m_contentList index.row() ;
-    switch ( role )
-    {
-        case Qt::DisplayRole:
-            return resolver.name();
-        case Qt::DecorationRole:
-            return QVariant::fromValue< QPixmap >( AtticaManager::instance()->iconForResolver( resolver ) );
-        case DownloadUrlRole:
-            // TODO
-            return QUrl();
-        case RatingRole:
-            return resolver.rating() / 20; // rating is out of 100
-        case DownloadCounterRole:
-            return resolver.downloads();
-        case VersionRole:
-            return resolver.version();
-        case DescriptionRole:
-            return resolver.description();
-        case TypeRole:
-            return ResolverType;
-        case AuthorRole:
-            return resolver.author();
-        case StateRole:
-            return (int)AtticaManager::instance()->resolverState( resolver );
-        case UserHasRatedRole:
-            return AtticaManager::instance()->userHasRated( resolver );
-    }
-    return QVariant();
-}
-
-int
-GetNewStuffModel::rowCount( const QModelIndex& parent ) const
-{
-    Q_UNUSED( parent );
-    return m_contentList.count();
-}
-
-bool
-GetNewStuffModel::setData( const QModelIndex &index, const QVariant &value, int role )
-{
-    Q_UNUSED( value );
-    if ( !hasIndex( index.row(), index.column(), index.parent() ) )
-        return false;
-
-
-    Attica::Content resolver = m_contentList index.row() ;
-    AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( resolver );
-    if ( role == Qt::EditRole )
-    {
-        switch( state )
-        {
-            case AtticaManager::Uninstalled:
-                // install
-                AtticaManager::instance()->installResolver( resolver );
-                break;
-            case AtticaManager::Installing:
-            case AtticaManager::Upgrading:
-                // Do nothing, busy
-                break;
-            case AtticaManager::Installed:
-                // Uninstall
-                AtticaManager::instance()->uninstallResolver( resolver );
-                break;
-            case AtticaManager::NeedsUpgrade:
-                AtticaManager::instance()->upgradeResolver( resolver );
-                break;
-            default:
-                //FIXME -- this handles e.g. Failed
-                break;
-        };
-    } else if ( role == RatingRole )
-    {
-        // For now only allow rating if a resolver is installed!
-        if ( state != AtticaManager::Installed && state != AtticaManager::NeedsUpgrade )
-            return false;
-        if ( AtticaManager::instance()->userHasRated( resolver ) )
-            return false;
-        m_contentList index.row() .setRating( value.toInt() * 20 );
-        AtticaManager::instance()->uploadRating( m_contentList index.row()  );
-    }
-    emit dataChanged( index, index );
-
-    return true;
-}

tomahawk-0.4.2.tar.bz2/src/GetNewStuffModel.h Deleted

@@ -1,64 +0,0 @@
-/* === 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 GETNEWSTUFFMODEL_H
-#define GETNEWSTUFFMODEL_H
-
-#include <QModelIndex>
-
-#include <attica/content.h>
-#include <QPixmap>
-
-class GetNewStuffModel: public QAbstractListModel
-{
-    Q_OBJECT
-public:
-    enum NewStuffRoles {
-        // DisplayRole is title
-        // DecorationRole is qicon for item
-        DownloadUrlRole = Qt::UserRole + 1,
-        RatingRole = Qt::UserRole + 2,
-        DownloadCounterRole = Qt::UserRole + 3,
-        VersionRole = Qt::UserRole + 4,
-        DescriptionRole = Qt::UserRole + 5,
-        TypeRole = Qt::UserRole + 6, // Category in attica-speak. What sort of item this is (resolver, etc).
-        AuthorRole = Qt::UserRole + 7,
-        StateRole = Qt::UserRole + 8,
-        UserHasRatedRole = Qt::UserRole + 9
-    };
-
-    enum Types {
-        ResolverType = 0,
-    };
-
-    explicit GetNewStuffModel( QObject* parent = 0 );
-    virtual ~GetNewStuffModel();
-
-    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-    virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const;
-    virtual bool setData( const QModelIndex &index, const QVariant &value, int role );
-
-private slots:
-    void resolversReloaded( const Attica::Content::List& );
-    void resolverStateChanged( const QString& resolverId );
-
-private:
-    Attica::Content::List m_contentList;
-};
-
-#endif // GETNEWSTUFFMODEL_H

tomahawk-0.4.2.tar.bz2/src/PipelineStatusView.cpp Deleted

@@ -1,117 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 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 "JobStatusView.h"
-
-#include <QHeaderView>
-#include <QVBoxLayout>
-
-#include "libtomahawk/pipeline.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-JobStatusView::JobStatusView( AnimatedSplitter* parent )
-    : AnimatedWidget( parent )
-    , m_parent( parent )
-{
-    setHiddenSize( QSize( 0, 0 ) );
-    setLayout( new QVBoxLayout() );
-    m_tree = new QTreeWidget( this );
-
-    layout()->setMargin( 0 );
-    layout()->addWidget( m_tree );
-
-    QStringList headers;
-    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 );
-    m_tree->setColumnWidth( 1, 50 );
-
-    m_tree->header()->setStretchLastSection( true );
-    m_tree->setRootIsDecorated( false );
-
-    m_tree->setFrameShape( QFrame::NoFrame );
-    m_tree->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-    new QTreeWidgetItem( m_tree );
-
-    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();
-}
-
-
-void
-JobStatusView::onPipelineUpdate( const query_ptr& query )
-{
-    QTreeWidgetItem* ti = m_tree->invisibleRootItem()->child( 0 );
-
-    if ( Pipeline::instance()->activeQueryCount() && !query.isNull() )
-    {
-        ti->setText( 0, QString( "%1 - %2" ).arg( query->artist() ).arg( query->track() ) );
-        ti->setText( 1, QString( "%1" ).arg( Pipeline::instance()->activeQueryCount() + Pipeline::instance()->pendingQueryCount() ) );
-
-        if ( isHidden() )
-            emit showWidget();
-    }
-    else
-    {
-        ti->setText( 0, tr( "Idle" ) );
-        ti->setText( 1, QString( "None" ) );
-
-        if ( !isHidden() )
-            emit hideWidget();
-    }
-}
-
-
-QSize
-JobStatusView::sizeHint() const
-{
-    unsigned int y = 0;
-    y += m_tree->header()->height();
-    y += m_tree->contentsMargins().top() + m_tree->contentsMargins().bottom();
-
-    if ( m_tree->invisibleRootItem()->childCount() )
-    {
-        unsigned int rowheight = m_tree->sizeHintForRow( 0 );
-        y += rowheight * m_tree->invisibleRootItem()->childCount() + 2;
-    }
-
-    return QSize( 0, y );
-}

tomahawk-0.4.2.tar.bz2/src/PipelineStatusView.h Deleted

@@ -1,51 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 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 JOBSTATUSVIEW_H
-#define JOBSTATUSVIEW_H
-
-#include <QTreeWidget>
-
-#include "typedefs.h"
-#include "widgets/animatedsplitter.h"
-#include "query.h"
-
-class StreamConnection;
-
-class JobStatusView : public AnimatedWidget
-{
-Q_OBJECT
-
-public:
-    explicit JobStatusView( AnimatedSplitter* parent );
-    virtual ~JobStatusView()
-    {
-    }
-
-    QSize sizeHint() const;
-
-private slots:
-    void onPipelineUpdate( const Tomahawk::query_ptr& query = Tomahawk::query_ptr() );
-
-private:
-    QTreeView* m_tree;
-    AnimatedSplitter* m_parent;
-};
-
-#endif // JOBSTATUSVIEW_H

tomahawk-0.4.2.tar.bz2/src/audiocontrols.cpp Deleted

@@ -1,613 +0,0 @@
-/* === 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
- *   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 "audiocontrols.h"
-#include "ui_audiocontrols.h"
-
-#include <QtNetwork/QNetworkReply>
-#include <QtGui/QDropEvent>
-#include <QtGui/QMouseEvent>
-
-#include "audio/audioengine.h"
-#include "playlist/playlistview.h"
-#include "database/database.h"
-#include "widgets/imagebutton.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "album.h"
-#include "dropjob.h"
-#include "globalactionmanager.h"
-#include "viewmanager.h"
-
-using namespace Tomahawk;
-
-
-AudioControls::AudioControls( QWidget* parent )
-    : QWidget( parent )
-    , ui( new Ui::AudioControls )
-    , m_repeatMode( PlaylistInterface::NoRepeat )
-    , m_shuffled( false )
-    , m_lastSliderCheck( 0 )
-{
-    ui->setupUi( this );
-    setAcceptDrops( true );
-
-    QFont font( ui->artistTrackLabel->font() );
-    font.setPixelSize( 12 );
-
-#ifdef Q_WS_MAC
-    font.setPixelSize( font.pixelSize() - 2 );
-#endif
-
-    ui->artistTrackLabel->setFont( font );
-    ui->artistTrackLabel->setElideMode( Qt::ElideMiddle );
-    ui->artistTrackLabel->setType( QueryLabel::ArtistAndTrack );
-
-    ui->albumLabel->setFont( font );
-    ui->albumLabel->setType( QueryLabel::Album );
-
-    ui->timeLabel->setFont( font );
-    ui->timeLeftLabel->setFont( font );
-
-    font.setPixelSize( 9 );
-    ui->ownerLabel->setFont( font );
-
-    ui->prevButton->setPixmap( RESPATH "images/back-rest.png" );
-    ui->prevButton->setPixmap( RESPATH "images/back-pressed.png", QIcon::Off, QIcon::Active );
-    ui->playPauseButton->setPixmap( RESPATH "images/play-rest.png" );
-    ui->playPauseButton->setPixmap( RESPATH "images/play-pressed.png", QIcon::Off, QIcon::Active );
-    ui->pauseButton->setPixmap( RESPATH "images/pause-rest.png" );
-    ui->pauseButton->setPixmap( RESPATH "images/pause-pressed.png", QIcon::Off, QIcon::Active );
-    ui->nextButton->setPixmap( RESPATH "images/skip-rest.png" );
-    ui->nextButton->setPixmap( RESPATH "images/skip-pressed.png", QIcon::Off, QIcon::Active );
-    ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-rest.png" );
-    ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-pressed.png", QIcon::Off, QIcon::Active );
-    ui->repeatButton->setPixmap( RESPATH "images/repeat-off-rest.png" );
-    ui->repeatButton->setPixmap( RESPATH "images/repeat-off-pressed.png", QIcon::Off, QIcon::Active );
-    ui->volumeLowButton->setPixmap( RESPATH "images/volume-icon-muted.png" );
-    ui->volumeHighButton->setPixmap( RESPATH "images/volume-icon-full.png" );
-    ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
-    ui->loveButton->setCheckable( true );
-
-#ifdef Q_WS_MAC
-    ui->ownerLabel->setForegroundRole( QPalette::Text );
-#else
-    ui->ownerLabel->setForegroundRole( QPalette::Dark );
-#endif
-    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->setEnabled( true );
-    ui->seekSlider->setTimeLine( &m_sliderTimeLine );
-    ui->volumeSlider->setRange( 0, 100 );
-    ui->volumeSlider->setValue( AudioEngine::instance()->volume() );
-
-    m_phononTickCheckTimer.setSingleShot( true );
-
-    connect( &m_phononTickCheckTimer, SIGNAL( timeout() ), SLOT( phononTickCheckTimeout() ) );
-    connect( &m_sliderTimeLine,    SIGNAL( frameChanged( int ) ), ui->seekSlider, SLOT( setValue( int ) ) );
-
-    connect( ui->seekSlider,       SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( seek( int ) ) );
-    connect( ui->volumeSlider,     SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( setVolume( int ) ) );
-    connect( ui->prevButton,       SIGNAL( clicked() ), AudioEngine::instance(), SLOT( previous() ) );
-    connect( ui->playPauseButton,  SIGNAL( clicked() ), AudioEngine::instance(), SLOT( play() ) );
-    connect( ui->pauseButton,      SIGNAL( clicked() ), AudioEngine::instance(), SLOT( pause() ) );
-    connect( ui->nextButton,       SIGNAL( clicked() ), AudioEngine::instance(), SLOT( next() ) );
-    connect( ui->volumeLowButton,  SIGNAL( clicked() ), AudioEngine::instance(), SLOT( lowerVolume() ) );
-    connect( ui->volumeHighButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( raiseVolume() ) );
-
-    connect( ui->playPauseButton,  SIGNAL( clicked() ), SIGNAL( playPressed() ) );
-    connect( ui->pauseButton,      SIGNAL( clicked() ), SIGNAL( pausePressed() ) );
-
-    connect( ui->repeatButton,     SIGNAL( clicked() ), SLOT( onRepeatClicked() ) );
-    connect( ui->shuffleButton,    SIGNAL( clicked() ), SLOT( onShuffleClicked() ) );
-
-    connect( ui->artistTrackLabel, SIGNAL( clickedArtist() ), SLOT( onArtistClicked() ) );
-    connect( ui->artistTrackLabel, SIGNAL( clickedTrack() ), SLOT( onTrackClicked() ) );
-    connect( ui->albumLabel,       SIGNAL( clickedAlbum() ), SLOT( onAlbumClicked() ) );
-    connect( ui->loveButton,       SIGNAL( clicked( bool ) ), SLOT( onLoveButtonClicked( bool ) ) );
-
-    // <From AudioEngine>
-    connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), SLOT( onPlaybackLoading( Tomahawk::result_ptr ) ) );
-    connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( onPlaybackStarted( Tomahawk::result_ptr ) ) );
-    connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( onPlaybackPaused() ) );
-    connect( AudioEngine::instance(), SIGNAL( resumed() ), SLOT( onPlaybackResumed() ) );
-    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ) );
-    connect( AudioEngine::instance(), SIGNAL( seeked( qint64 ) ), SLOT( onPlaybackSeeked( qint64 ) ) );
-    connect( AudioEngine::instance(), SIGNAL( timerMilliSeconds( qint64 ) ), SLOT( onPlaybackTimer( qint64 ) ) );
-    connect( AudioEngine::instance(), SIGNAL( volumeChanged( int ) ), SLOT( onVolumeChanged( int ) ) );
-
-    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
-}
-
-
-AudioControls::~AudioControls()
-{
-    delete ui;
-}
-
-
-void
-AudioControls::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-//            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-AudioControls::phononTickCheckTimeout()
-{
-    onPlaybackTimer( m_lastSliderCheck );
-}
-
-
-void
-AudioControls::onVolumeChanged( int volume )
-{
-    ui->volumeSlider->blockSignals( true );
-    ui->volumeSlider->setValue( volume );
-    ui->volumeSlider->blockSignals( false );
-}
-
-
-void
-AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
-{
-    if ( result.isNull() )
-        return;
-
-    if ( m_currentTrack.isNull() || ( !m_currentTrack.isNull() && m_currentTrack.data()->id() != result.data()->id() ) )
-        onPlaybackLoading( result );
-
-    qint64 duration = AudioEngine::instance()->currentTrackTotalTime();
-
-    if ( duration == -1 )
-        duration = result.data()->duration() * 1000;
-
-    ui->seekSlider->setRange( 0, duration );
-    ui->seekSlider->setValue( 0 );
-    ui->seekSlider->setEnabled( AudioEngine::instance()->canSeek() );
-
-    m_phononTickCheckTimer.stop();
-
-    m_sliderTimeLine.stop();
-    m_sliderTimeLine.setDuration( duration );
-    m_sliderTimeLine.setFrameRange( 0, duration );
-    m_sliderTimeLine.setCurrentTime( 0 );
-    m_seekMsecs = -1;
-    
-    ui->seekSlider->setVisible( true );
-
-    int updateRate = (double)1000 / ( (double)ui->seekSlider->contentsRect().width() / (double)( duration / 1000 ) );
-    m_sliderTimeLine.setUpdateInterval( qBound( 40, updateRate, 500 ) );
-
-    m_noTimeChange = false;
-    m_lastSliderCheck = 0;
-}
-
-
-void
-AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
-{
-    if ( !m_currentTrack.isNull() )
-    {
-        disconnect( m_currentTrack->album().data(), SIGNAL( updated() ), this, SLOT( onAlbumCoverUpdated() ) );
-        disconnect( m_currentTrack->toQuery().data(), SIGNAL( socialActionsLoaded() ), this, SLOT( onSocialActionsLoaded() ) );
-    }
-
-    m_currentTrack = result;
-    connect( m_currentTrack->album().data(), SIGNAL( updated() ), SLOT( onAlbumCoverUpdated() ) );
-    connect( m_currentTrack->toQuery().data(), SIGNAL( socialActionsLoaded() ), SLOT( onSocialActionsLoaded() ) );
-
-    ui->artistTrackLabel->setResult( result );
-    ui->albumLabel->setResult( result );
-    ui->ownerLabel->setText( result->friendlySource() );
-
-    const QString duration = TomahawkUtils::timeToString( result.data()->duration() );
-    ui->timeLabel->setFixedWidth( ui->timeLabel->fontMetrics().width( QString( duration.length(), QChar( '0' ) ) ) );
-    ui->timeLabel->setText( TomahawkUtils::timeToString( 0 ) );
-    ui->timeLeftLabel->setFixedWidth( ui->timeLeftLabel->fontMetrics().width( QString( duration.length() + 1, QChar( '0' ) ) ) );
-    ui->timeLeftLabel->setText( "-" + duration );
-    m_lastTextSecondShown = 0;
-
-    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
-
-    ui->loveButton->setEnabled( true );
-    ui->loveButton->setVisible( true );
-
-    setAlbumCover();
-    setSocialActions();
-}
-
-
-void
-AudioControls::onAlbumCoverUpdated()
-{
-    Album* album = qobject_cast< Album* >( sender() );
-    if ( !album || album != m_currentTrack->album().data() )
-        return;
-
-    setAlbumCover();
-}
-
-
-void
-AudioControls::setAlbumCover()
-{
-    if ( !m_currentTrack->album()->cover( ui->coverImage->size() ).isNull() )
-    {
-        QPixmap cover;
-        cover = m_currentTrack->album()->cover( ui->coverImage->size() );
-        ui->coverImage->setPixmap( cover );
-    }
-    else
-        ui->coverImage->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, ui->coverImage->size() ) );
-}
-
-
-void
-AudioControls::onSocialActionsLoaded()
-{
-    Query* query = qobject_cast< Query* >( sender() );
-    if ( !query || !m_currentTrack || query != m_currentTrack->toQuery().data() )
-        return;
-
-    query_ptr currentQuery = m_currentTrack->toQuery();
-    if ( query->artist() == currentQuery->artist() &&
-         query->track() == currentQuery->track() &&
-         query->album() == currentQuery->album() )
-    {
-        setSocialActions();
-    }
-}
-
-
-void
-AudioControls::setSocialActions()
-{
-    if ( m_currentTrack->toQuery()->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 );
-    }
-}
-
-
-void
-AudioControls::onPlaybackPaused()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
-    m_sliderTimeLine.setPaused( true );
-}
-
-
-void
-AudioControls::onPlaybackResumed()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
-    ui->loveButton->setVisible( true );
-    m_sliderTimeLine.resume();
-}
-
-
-void
-AudioControls::onPlaybackSeeked( qint64 msec )
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO << " setting current timer to " << msec;
-    m_sliderTimeLine.setPaused( true );
-    m_sliderTimeLine.setCurrentTime( msec );
-    m_lastSliderCheck = msec;
-    m_seekMsecs = msec;
-}
-
-
-void
-AudioControls::onPlaybackStopped()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-    m_currentTrack.clear();
-
-    ui->artistTrackLabel->setText( "" );
-    ui->albumLabel->setText( "" );
-    ui->ownerLabel->setText( "" );
-    ui->timeLabel->setText( "" );
-    ui->timeLeftLabel->setText( "" );
-    ui->coverImage->setPixmap( QPixmap() );
-    ui->seekSlider->setVisible( false );
-    m_sliderTimeLine.stop();
-    m_sliderTimeLine.setCurrentTime( 0 );
-
-    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
-    ui->loveButton->setEnabled( false );
-    ui->loveButton->setVisible( false );
-}
-
-
-void
-AudioControls::onPlaybackTimer( qint64 msElapsed )
-{
-    const int seconds = msElapsed / 1000;
-    if ( seconds != m_lastTextSecondShown && !m_currentTrack.isNull() )
-    {
-        ui->timeLabel->setText( TomahawkUtils::timeToString( seconds ) );
-        ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( m_currentTrack->duration() - seconds ) );
-        m_lastTextSecondShown = seconds;
-    }
-    
-    //tDebug( LOGEXTRA ) << Q_FUNC_INFO << "msElapsed =" << msElapsed << "and timer current time =" << m_sliderTimeLine.currentTime() << "and m_seekMsecs =" << m_seekMsecs;
-    if ( msElapsed > 0 && msElapsed != m_lastSliderCheck && m_seekMsecs == -1 && msElapsed - 500 < m_lastSliderCheck )
-        return;
-    m_lastSliderCheck = msElapsed;
-
-    if ( m_currentTrack.isNull() )
-    {
-        m_sliderTimeLine.stop();
-        return;
-    }
-
-    ui->seekSlider->blockSignals( true );
-
-    if ( sender() != &m_phononTickCheckTimer )
-        m_phononTickCheckTimer.start( 1000 );
-    
-    int currentTime = m_sliderTimeLine.currentTime();
-    if ( m_noTimeChange )
-    {
-        if ( currentTime != msElapsed )
-        {
-            m_sliderTimeLine.setPaused( true );
-            m_noTimeChange = false;
-            m_sliderTimeLine.setCurrentTime( msElapsed );
-            m_seekMsecs = -1;
-            m_sliderTimeLine.resume();
-        }
-    }
-    else if ( currentTime >= msElapsed || m_seekMsecs != -1 )
-    {
-        m_sliderTimeLine.setPaused( true );
-
-        m_noTimeChange = false;
-        if ( currentTime == msElapsed )
-            m_noTimeChange = true;
-
-        m_sliderTimeLine.setCurrentTime( msElapsed );
-        m_seekMsecs = -1;
-        if ( AudioEngine::instance()->state() != AudioEngine::Paused && sender() != &m_phononTickCheckTimer )
-            m_sliderTimeLine.resume();
-    }
-    else if ( m_sliderTimeLine.duration() > msElapsed && m_sliderTimeLine.state() == QTimeLine::NotRunning && AudioEngine::instance()->state() == AudioEngine::Playing )
-    {
-        m_sliderTimeLine.start();
-    }
-    else if ( m_sliderTimeLine.state() == QTimeLine::Paused && AudioEngine::instance()->state() != AudioEngine::Paused )
-    {
-        m_sliderTimeLine.resume();
-    }
-
-    ui->seekSlider->blockSignals( false );
-}
-
-
-void
-AudioControls::onRepeatModeChanged( PlaylistInterface::RepeatMode mode )
-{
-    m_repeatMode = mode;
-
-    switch ( m_repeatMode )
-    {
-        case PlaylistInterface::NoRepeat:
-        {
-            // switch to RepeatOne
-            ui->repeatButton->setPixmap( RESPATH "images/repeat-off-rest.png" );
-            ui->repeatButton->setPixmap( RESPATH "images/repeat-off-pressed.png", QIcon::Off, QIcon::Active );
-        }
-        break;
-
-        case PlaylistInterface::RepeatOne:
-        {
-            // switch to RepeatAll
-            ui->repeatButton->setPixmap( RESPATH "images/repeat-1-on-rest.png" );
-            ui->repeatButton->setPixmap( RESPATH "images/repeat-1-on-pressed.png", QIcon::Off, QIcon::Active );
-        }
-        break;
-
-        case PlaylistInterface::RepeatAll:
-        {
-            // switch to NoRepeat
-            ui->repeatButton->setPixmap( RESPATH "images/repeat-all-on-rest.png" );
-            ui->repeatButton->setPixmap( RESPATH "images/repeat-all-on-pressed.png", QIcon::Off, QIcon::Active );
-        }
-        break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-AudioControls::onRepeatClicked()
-{
-    switch ( m_repeatMode )
-    {
-        case PlaylistInterface::NoRepeat:
-        {
-            // switch to RepeatOne
-            ViewManager::instance()->setRepeatMode( PlaylistInterface::RepeatOne );
-        }
-        break;
-
-        case PlaylistInterface::RepeatOne:
-        {
-            // switch to RepeatAll
-            ViewManager::instance()->setRepeatMode( PlaylistInterface::RepeatAll );
-        }
-        break;
-
-        case PlaylistInterface::RepeatAll:
-        {
-            // switch to NoRepeat
-            ViewManager::instance()->setRepeatMode( PlaylistInterface::NoRepeat );
-        }
-        break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-AudioControls::onShuffleModeChanged( bool enabled )
-{
-    m_shuffled = enabled;
-
-    if ( m_shuffled )
-    {
-        ui->shuffleButton->setPixmap( RESPATH "images/shuffle-on-rest.png" );
-        ui->shuffleButton->setPixmap( RESPATH "images/shuffle-on-pressed.png", QIcon::Off, QIcon::Active );
-
-        ui->repeatButton->setEnabled( false );
-    }
-    else
-    {
-        ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-rest.png" );
-        ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-pressed.png", QIcon::Off, QIcon::Active );
-
-        ui->repeatButton->setEnabled( true );
-    }
-}
-
-
-void
-AudioControls::onShuffleClicked()
-{
-    ViewManager::instance()->setShuffled( m_shuffled ^ true );
-}
-
-
-void
-AudioControls::onArtistClicked()
-{
-    ViewManager::instance()->show( m_currentTrack->artist() );
-}
-
-
-void
-AudioControls::onAlbumClicked()
-{
-    ViewManager::instance()->show( m_currentTrack->album() );
-}
-
-
-void
-AudioControls::onTrackClicked()
-{
-    ViewManager::instance()->showCurrentTrack();
-}
-
-
-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();
-        dj->setDropAction( DropJob::Append );
-        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 no matter what
-        GlobalActionManager::instance()->handlePlayTrack( 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 )
-{
-    if ( checked )
-    {
-        ui->loveButton->setPixmap( RESPATH "images/loved.png" );
-
-        m_currentTrack->toQuery()->setLoved( true );
-    }
-    else
-    {
-        ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
-
-        m_currentTrack->toQuery()->setLoved( false );
-    }
-}
-

tomahawk-0.4.2.tar.bz2/src/audiocontrols.h Deleted

@@ -1,106 +0,0 @@
-/* === 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
- *   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 AUDIOCONTROLS_H
-#define AUDIOCONTROLS_H
-
-#include <QtGui/QWidget>
-#include <QtCore/QTimer>
-#include <QtCore/QTimeLine>
-
-#include "result.h"
-#include "playlistinterface.h"
-#include "query.h"
-
-class QDropEvent;
-class QDragEnterEvent;
-class QDragMoveEvent;
-
-namespace Ui
-{
-    class AudioControls;
-}
-
-class AudioControls : public QWidget
-{
-Q_OBJECT
-
-public:
-    AudioControls( QWidget* parent = 0 );
-    ~AudioControls();
-
-signals:
-    void playPressed();
-    void pausePressed();
-
-public slots:
-    void onRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void onShuffleModeChanged( bool enabled );
-    
-protected:
-    void changeEvent( QEvent* e );
-    void dragEnterEvent ( QDragEnterEvent* );
-    void dragMoveEvent ( QDragMoveEvent* );
-    void dropEvent ( QDropEvent* );
-
-private slots:
-    void phononTickCheckTimeout();
-    
-    void onPlaybackStarted( const Tomahawk::result_ptr& result );
-    void onPlaybackLoading( const Tomahawk::result_ptr& result );
-    void onPlaybackPaused();
-    void onPlaybackResumed();
-    void onPlaybackSeeked( qint64 msec );
-    void onPlaybackStopped();
-
-    void onPlaybackTimer( qint64 msElapsed );
-    void onVolumeChanged( int volume );
-
-    void onRepeatClicked();
-    void onShuffleClicked();
-
-    void onArtistClicked();
-    void onAlbumClicked();
-    void onTrackClicked();
-    void onLoveButtonClicked( bool );
-
-    void onAlbumCoverUpdated();
-
-    void droppedTracks( QList<Tomahawk::query_ptr> );
-
-    void onSocialActionsLoaded();
-
-private:
-    void setAlbumCover();
-    void setSocialActions();
-
-    Ui::AudioControls *ui;
-
-    Tomahawk::result_ptr m_currentTrack;
-    Tomahawk::PlaylistInterface::RepeatMode m_repeatMode;
-    bool m_shuffled;
-
-    QTimer m_phononTickCheckTimer;
-    QTimeLine m_sliderTimeLine;
-    qint64 m_seekMsecs;
-    qint64 m_lastSliderCheck;
-    bool m_noTimeChange;
-    qint64 m_lastTextSecondShown;
-};
-
-#endif // AUDIOCONTROLS_H

tomahawk-0.4.2.tar.bz2/src/audiocontrols.ui Deleted

@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AudioControls</class>
- <widget class="QWidget" name="AudioControls">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>929</width>
-    <height>80</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>80</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>80</height>
-   </size>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_4">
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="buttonArea" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>254</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>254</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <layout class="QHBoxLayout" name="buttonAreaLayout">
-      <item>
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="ImageButton" name="prevButton">
-        <property name="text">
-         <string>Prev</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QStackedLayout" name="stackedLayout">
-        <property name="spacing">
-         <number>0</number>
-        </property>
-        <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">
-        <property name="text">
-         <string>Next</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="metaDataArea" native="true">
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>74</height>
-      </size>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
-      <property name="leftMargin">
-       <number>10</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>12</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="coverImage">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>58</width>
-          <height>58</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>58</width>
-          <height>58</height>
-         </size>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <property name="leftMargin">
-         <number>4</number>
-        </property>
-        <property name="topMargin">
-         <number>6</number>
-        </property>
-        <property name="bottomMargin">
-         <number>2</number>
-        </property>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0,0">
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-          <item>
-           <layout class="QVBoxLayout" name="trackLabelLayout">
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QueryLabel" name="artistTrackLabel">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>16</height>
-               </size>
-              </property>
-              <property name="cursor">
-               <cursorShape>PointingHandCursor</cursorShape>
-              </property>
-              <property name="text">
-               <string>Artist</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QueryLabel" name="albumLabel">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>16</height>
-               </size>
-              </property>
-              <property name="cursor">
-               <cursorShape>PointingHandCursor</cursorShape>
-              </property>
-              <property name="text">
-               <string>Album</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>4</width>
-              <height>8</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_2">
-            <item>
-             <widget class="QLabel" name="ownerLabel">
-              <property name="font">
-               <font>
-                <pointsize>7</pointsize>
-               </font>
-              </property>
-              <property name="text">
-               <string>Owner</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTop</set>
-              </property>
-              <property name="margin">
-               <number>0</number>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="socialLayout">
-              <item>
-               <spacer name="socialSpacer">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>20</width>
-                  <height>1</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="ImageButton" name="loveButton">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="cursor">
-                 <cursorShape>PointingHandCursor</cursorShape>
-                </property>
-                <property name="text">
-                 <string>love</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <spacer name="verticalSpacer_2">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>1</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>    
-          </item>
-         </layout>
-        </item>
-        <item>
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>4</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <property name="leftMargin">
-           <number>4</number>
-          </property>
-          <item>
-           <widget class="QLabel" name="timeLabel">
-            <property name="text">
-             <string>Time</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignLeft|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="SeekSlider" name="seekSlider">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>20</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>20</height>
-             </size>
-            </property>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="timeLeftLabel">
-            <property name="text">
-             <string>Time Left</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="widget_4" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>200</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>200</width>
-       <height>66</height>
-      </size>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <property name="spacing">
-       <number>2</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>2</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QWidget" name="widget_6" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout_7">
-         <property name="spacing">
-          <number>2</number>
-         </property>
-         <property name="margin">
-          <number>2</number>
-         </property>
-         <item>
-          <spacer name="horizontalSpacer_6">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="ImageButton" name="shuffleButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Shuffle</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="ImageButton" name="repeatButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Repeat</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_7">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="widget_5" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout_6">
-         <property name="spacing">
-          <number>2</number>
-         </property>
-         <property name="margin">
-          <number>2</number>
-         </property>
-         <item>
-          <widget class="ImageButton" name="volumeLowButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Low</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="SeekSlider" name="volumeSlider">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>20</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>20</height>
-            </size>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="ImageButton" name="volumeHighButton">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>High</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </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>
-   <header>widgets/imagebutton.h</header>
-  </customwidget>
-  <customwidget>
-   <class>QueryLabel</class>
-   <extends>QLabel</extends>
-   <header>widgets/querylabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/config.h.in Deleted

tomahawk-0.4.2.tar.bz2/src/configdelegatebase.cpp Deleted

@@ -1,120 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "configdelegatebase.h"
-
-#include <QPainter>
-#include <QApplication>
-#include <QMouseEvent>
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-ConfigDelegateBase::ConfigDelegateBase ( QObject* parent )
-    : QStyledItemDelegate ( parent )
-{
-
-}
-
-
-QSize
-ConfigDelegateBase::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    int width = QStyledItemDelegate::sizeHint( option, index ).width();
-
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, index );
-
-
-    QFont name = opt.font;
-    name.setPointSize( name.pointSize() + 2 );
-    name.setBold( true );
-
-    QFont path = opt.font;
-    path.setItalic( true );
-    path.setPointSize( path.pointSize() - 1 );
-
-
-    QFontMetrics bfm( name );
-    QFontMetrics sfm( path );
-    return QSize( width, 2 * PADDING + bfm.height() + sfm.height() );
-}
-
-void
-ConfigDelegateBase::drawCheckBox( QStyleOptionViewItemV4& opt, QPainter* p, const QWidget* w ) const
-{
-    QStyle* style = w ? w->style() : QApplication::style();
-    opt.checkState == Qt::Checked ? opt.state |= QStyle::State_On : opt.state |= QStyle::State_Off;
-    style->drawPrimitive( QStyle::PE_IndicatorViewItemCheck, &opt, p, w );
-}
-
-
-void
-ConfigDelegateBase::drawConfigWrench ( QPainter* painter, QStyleOptionViewItemV4& opt, QStyleOptionToolButton& topt ) const
-{
-    const QWidget* w = opt.widget;
-    QStyle* style = w ? w->style() : QApplication::style();
-
-    // draw it the same size as the check belox
-    topt.font = opt.font;
-    topt.icon = QIcon( RESPATH "images/configure.png" );
-    topt.iconSize = QSize( 16, 16 );
-    topt.subControls = QStyle::SC_ToolButton;
-    topt.activeSubControls = QStyle::SC_None;
-    topt.features = QStyleOptionToolButton::None;
-    bool pressed = ( m_configPressed == opt.index );
-    topt.state = pressed ? QStyle::State_On : QStyle::State_Raised;
-    if( opt.state & QStyle::State_MouseOver || pressed )
-        topt.state |= QStyle::State_HasFocus;
-    style->drawComplexControl( QStyle::CC_ToolButton, &topt, painter, w );
-}
-
-bool
-ConfigDelegateBase::editorEvent ( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
-{
-    QStyleOptionViewItemV4 viewOpt( option );
-    initStyleOption( &viewOpt, index );
-
-    if( event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonDblClick ) {
-        m_configPressed = QModelIndex();
-
-        QMouseEvent* me = static_cast< QMouseEvent* >( event );
-        if( me->button() != Qt::LeftButton || !checkRectForIndex( option, index ).contains( me->pos() ) )
-            return false;
-
-        // eat the double click events inside the check rect
-        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 );
-
-    } else if( event->type() == QEvent::MouseButtonPress ) {
-        QMouseEvent* me = static_cast< QMouseEvent* >( event );
-        if( me->button() == Qt::LeftButton && configRectForIndex( option, index ).contains( me->pos() ) ) {
-            m_configPressed = index;
-
-            emit configPressed( index );
-            return true;
-        }
-    }
-
-    return QStyledItemDelegate::editorEvent( event, model, option, index );
-}

tomahawk-0.4.2.tar.bz2/src/configdelegatebase.h Deleted

@@ -1,54 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef CONFIGDELEGATEBASE_H
-#define CONFIGDELEGATEBASE_H
-
-#include "dllmacro.h"
-
-#include <QStyledItemDelegate>
-
-#define PADDING 4
-
-class QPainter;
-class Q_DECL_EXPORT ConfigDelegateBase : public QStyledItemDelegate
-{
-    Q_OBJECT
-public:
-  ConfigDelegateBase( QObject* parent = 0 );
-  virtual QSize sizeHint ( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-  virtual bool editorEvent ( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
-
-  // if you want to use a checkbox, you need to have this say where to paint it
-  virtual QRect checkRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const = 0;
-  // if you want to use a config wrench, you need to have this say where to paint it
-  virtual QRect configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const = 0;
-
-signals:
-    void configPressed( const QModelIndex& idx );
-
-protected:
-    void drawCheckBox( QStyleOptionViewItemV4& opt, QPainter* p, const QWidget* w ) const;
-    void drawConfigWrench( QPainter* painter, QStyleOptionViewItemV4& option, QStyleOptionToolButton& topt ) const;
-
-private:
-    QModelIndex m_configPressed;
-};
-
-#endif // CONFIGDELEGATEBASE_H

tomahawk-0.4.2.tar.bz2/src/delegateconfigwrapper.h Deleted

@@ -1,105 +0,0 @@
-/* === 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 RESOLVER_CONFIG_WRAPPER
-#define RESOLVER_CONFIG_WRAPPER
-
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QVBoxLayout>
-#include <QPushButton>
-
-class DelegateConfigWrapper : public QDialog
-{
-    Q_OBJECT
-public:
-    DelegateConfigWrapper( QWidget* conf, const QString& title, QWidget* parent, Qt::WindowFlags flags = 0 ) : QDialog( parent, flags ), m_widget( conf )
-    {
-        m_widget->setWindowFlags( Qt::Sheet );
-#ifdef Q_WS_MAC
-        m_widget->setVisible( true );
-#endif
-
-        setWindowTitle( title );
-        QVBoxLayout* v = new QVBoxLayout( this );
-        v->setContentsMargins( 0, 0, 0, 0 );
-        v->addWidget( m_widget );
-
-        QDialogButtonBox* buttons = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this );
-        m_okButton = buttons->button( QDialogButtonBox::Ok );
-        connect( buttons, SIGNAL( clicked( QAbstractButton*)  ), this, SLOT( closed( QAbstractButton* ) ) );
-        connect( this, SIGNAL( rejected() ), this, SLOT( rejected() ) );
-        v->addWidget( buttons );
-
-        setLayout( v );
-
-#ifdef Q_WS_MAC
-        setSizeGripEnabled( false );
-        setMinimumSize( sizeHint() );
-        setMaximumSize( sizeHint() ); // to remove the resize grip on osx this is the only way
-
-        if( conf->metaObject()->indexOfSignal( "sizeHintChanged()" ) > -1 )
-            connect( conf, SIGNAL( sizeHintChanged() ), this, SLOT( updateSizeHint() ) );
-#else
-        m_widget->setVisible( true );
-#endif
-
-    }
-public slots:
-    void toggleOkButton( bool dataError )
-    {
-        // if dataError is True we want to set the button enabled to false
-        m_okButton->setEnabled( !dataError );
-    }
-    void closed( QAbstractButton* b )
-    {
-        // let the config widget live to see another day
-        layout()->removeWidget( m_widget );
-        m_widget->setParent( 0 );
-        m_widget->setVisible( false );
-
-        QDialogButtonBox* buttons = qobject_cast< QDialogButtonBox* >( sender() );
-        if( buttons->standardButton( b ) == QDialogButtonBox::Ok )
-            done( QDialog::Accepted );
-        else
-            done( QDialog::Rejected );
-    }
-
-    // we get a rejected() signal emitted if the user presses escape (and no clicked() signal )
-    void rejected()
-    {
-        layout()->removeWidget( m_widget );
-        m_widget->setParent( 0 );
-        m_widget->setVisible( false );
-    }
-
-    void updateSizeHint()
-    {
-        hide();
-        setSizeGripEnabled( false );
-        setMinimumSize( sizeHint() );
-        setMaximumSize( sizeHint() );
-
-        show();
-    }
-
-private:
-    QWidget* m_widget;
-    QPushButton* m_okButton;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/diagnosticsdialog.cpp Deleted

@@ -1,176 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
- *
- *   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 "diagnosticsdialog.h"
-#include "ui_diagnosticsdialog.h"
-
-#include "config.h"
-
-#include <sip/SipHandler.h>
-#include <network/servent.h>
-#include <sourcelist.h>
-
-#include <QTextEdit>
-#include <QDialogButtonBox>
-#include <QPushButton>
-#include <QApplication>
-#include <QClipboard>
-
-#include "utils/logger.h"
-
-
-DiagnosticsDialog::DiagnosticsDialog( QWidget *parent )
-    : QDialog( parent )
-    , ui( new Ui::DiagnosticsDialog )
-{
-    ui->setupUi( this );
-
-    connect( ui->updateButton, SIGNAL( clicked() ), this, SLOT( updateLogView() ) );
-    connect( ui->clipboardButton, SIGNAL( clicked() ), this, SLOT( copyToClipboard() ) );
-    connect( ui->buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );
-
-    updateLogView();
-}
-
-void DiagnosticsDialog::updateLogView()
-{
-    QString log;
-
-    log.append(
-        QString("TOMAHAWK DIAGNOSTICS LOG -%1 \n\n")
-            .arg( QDateTime::currentDateTime().toString() )
-    );
-
-    // network
-    log.append(
-        "TOMAHAWK-VERSION: " TOMAHAWK_VERSION "\n\n\n"
-    );
-
-    // network
-    log.append(
-        "NETWORK:\n"
-        "    General:\n"
-    );
-    if( Servent::instance()->visibleExternally() )
-    {
-        log.append(
-            QString(
-                "      visible: true\n"
-                "      host: %1\n"
-                "      port: %2\n"
-                "\n"
-            ).arg( Servent::instance()->externalAddress() )
-             .arg( Servent::instance()->externalPort() )
-
-        );
-    }
-    else
-    {
-        log.append(
-            QString(
-                "      visible: false"
-            )
-        );
-    }
-    log.append("\n\n");
-
-
-    // Peers
-    log.append("SIP PLUGINS:\n");
-    QList< Tomahawk::source_ptr > sources = SourceList::instance()->sources( true );
-    Q_FOREACH(SipPlugin *sip, SipHandler::instance()->allPlugins())
-    {
-        Q_ASSERT(sip);
-        QString stateString;
-        switch( sip->connectionState() )
-        {
-            case SipPlugin::Connecting:
-                stateString = "Connecting";
-                break;
-
-            case SipPlugin::Connected:
-                stateString = "Connected";
-                break;
-
-            case SipPlugin::Disconnected:
-                stateString = "Disconnected";
-                break;
-            case SipPlugin::Disconnecting:
-                stateString = "Disconnecting";
-        }
-        log.append(
-            QString("  %2 (%1): %3 (%4)\n")
-                .arg(sip->name())
-                .arg(sip->friendlyName())
-                .arg(sip->accountName())
-                .arg(stateString)
-        );
-
-        Q_FOREACH( const QString &peerId, sip->peersOnline() )
-        {
-            /* enable this again, when we check the source has this peerId
-            bool connected = false;
-            Q_FOREACH( const Tomahawk::source_ptr &source, sources )
-            {
-                if( source->controlConnection() )
-                {
-                    connected = true;
-                    break;
-                }
-            }*/
-
-            QString versionString = SipHandler::instance()->versionString( peerId );
-            SipInfo sipInfo = SipHandler::instance()->sipInfo( peerId );
-            if( !sipInfo.isValid() )
-               log.append(
-                    QString("       %1: %2 %3" /*"(%4)"*/ "\n")
-                        .arg( peerId )
-                        .arg( "sipinfo invalid" )
-                        .arg( versionString )
-                        // .arg( connected ? "connected" : "not connected")
-                );
-            else if( sipInfo.isVisible() )
-                log.append(
-                    QString("       %1: %2:%3 %4" /*" (%5)"*/ "\n")
-                        .arg( peerId )
-                        .arg( sipInfo.host().hostName() )
-                        .arg( sipInfo.port() )
-                        .arg( versionString )
-                        // .arg( connected ? "connected" : "not connected")
-
-                );
-            else
-                log.append(
-                    QString("       %1: visible: false %2" /*" (%3)"*/ "\n")
-                        .arg( peerId )
-                        .arg( versionString )
-                        // .arg( connected ? "connected" : "not connected")
-
-                );
-        }
-        log.append("\n");
-    }
-
-    ui->logView->setPlainText(log);
-}
-
-void DiagnosticsDialog::copyToClipboard()
-{
-    QApplication::clipboard()->setText( ui->logView->toPlainText() );
-}
-

tomahawk-0.4.2.tar.bz2/src/diagnosticsdialog.h Deleted

@@ -1,45 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
- *
- *   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 DIGANOSTICSDIALOG_H
-#define DIAGNOSTICSDIALOG_H
-
-#include <QDialog>
-
-namespace Ui
-{
-    class DiagnosticsDialog;
-}
-
-class DiagnosticsDialog : public QDialog
-{
-Q_OBJECT
-
-public:
-    explicit DiagnosticsDialog( QWidget* parent = 0 );
-    ~DiagnosticsDialog() {};
-
-private slots:
-    void updateLogView();
-    void copyToClipboard();
-
-private:
-    Ui::DiagnosticsDialog* ui;
-};
-
-#endif // DIAGNOSTICSDIALOG_H

tomahawk-0.4.2.tar.bz2/src/diagnosticsdialog.ui Deleted

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DiagnosticsDialog</class>
- <widget class="QDialog" name="DiagnosticsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>724</width>
-    <height>433</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>353</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <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>
-      <widget class="QTextEdit" name="logView"/>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="updateButton">
-       <property name="text">
-        <string>Update</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="clipboardButton">
-       <property name="text">
-        <string>Copy to Clipboard</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Close</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/headlesscheck.h Deleted

@@ -1,35 +0,0 @@
-/* === 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
- *   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 HEADLESSCHECK
-#define HEADLESSCHECK
-
-#ifdef ENABLE_HEADLESS
-
-#define TOMAHAWK_APPLICATION QCoreApplication
-#include <QCoreApplication>
-
-#else
-
-#define TOMAHAWK_APPLICATION QApplication
-#include <QApplication>
-#include "tomahawkwindow.h"
-
-#endif
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/accounts/account.h Deleted

@@ -1,74 +0,0 @@
-/* === 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
- *   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 ACCOUNT_H
-#define ACCOUNT_H
-
-#include <QtCore/QObject>
-#include <QtCore/QVariantMap>
-#include <QtGui/QWidget>
-
-#include "typedefs.h"
-#include "dllmacro.h"
-#include "infosystem/infosystem.h"
-#include "sip/SipPlugin.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT Account
-{
-
-    typedef QMap< QString, bool > ACLMap;
-    
-public:
-    enum AccountTypes { InfoType, SipType };
-
-    explicit Account();
-    virtual ~Account();
-
-    QString accountServiceName(); // e.g. "Twitter", "Last.fm"
-    void setAccountServiceName( const QString &serviceName );
-
-    QString accountFriendlyName(); // e.g. screen name on the service, JID, etc.
-    void setAccountFriendlyName( const QString &friendlyName );
-    
-    bool autoConnect();
-    void setAutoConnect( bool autoConnect );
-    
-    QStringMap credentials();
-    void setCredentials( const QStringMap &credentialMap );
-    
-    QVariantMap configuration();
-    void setConfiguration( const QVariantMap &configuration );
-    QWidget* configurationWidget();
-
-    ACLMap acl();
-    void setAcl( const ACLMap &acl );
-    QWidget* aclWidget();
-
-    QSet< AccountTypes > types();
-    void setTypes( const QSet< AccountTypes > types );
-
-    Tomahawk::InfoSystem::InfoPlugin* infoPlugin();
-    SipPlugin* sipPlugin();
-};
-
-};
-
-#endif // ACCOUNT_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/aclsystem.cpp Deleted

@@ -1,152 +0,0 @@
-/* === 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
- *   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 "aclsystem.h"
-
-#include <QMutexLocker>
-#include <QVariant>
-
-#include "tomahawksettings.h"
-
-#include "utils/logger.h"
-
-
-ACLSystem* ACLSystem::s_instance = 0;
-
-ACLSystem*
-ACLSystem::instance()
-{
-    if( !s_instance )
-        new ACLSystem();
-    return s_instance;
-}
-
-
-ACLSystem::ACLSystem( QObject* parent )
-    : QObject( parent ),
-      m_saveTimer( this )
-{
-    s_instance = this;
-    //qRegisterMetaType< QHash< QString, QHash< QString, ACL > > >("ACLSystem::ACLCacheHash");
-
-    QStringList savedEntries = TomahawkSettings::instance()->aclEntries();
-    if( !savedEntries.empty() && savedEntries.size() % 3 == 0 )
-    {
-        int index = 0;
-        while( index < savedEntries.length() )
-        {
-            if( !m_cache.contains( savedEntries.at( index ) ) )
-                m_cachesavedEntries.at( index )  = QHash< QString, ACL >();
-            m_cachesavedEntries.at( index )savedEntries.at( index + 1 ) = (ACL)(savedEntries.at( index + 2 ).toInt() );
-            index += 3;
-        }
-    }
-
-    m_saveTimer.setSingleShot( false );
-    m_saveTimer.setInterval( 60000 );
-    connect( &m_saveTimer, SIGNAL( timeout() ), this, SLOT( saveTimerFired() ) );
-    m_saveTimer.start();
-}
-
-ACLSystem::~ACLSystem()
-{
-    m_saveTimer.stop();
-    saveTimerFired();
-}
-
-ACLSystem::ACL
-ACLSystem::isAuthorizedUser( const QString& dbid )
-{
-//    qDebug() << Q_FUNC_INFO;
-    QMutexLocker locker( &m_cacheMutex );
-    qDebug() << "Current cache keys =" << m_cache.keys();
-//    qDebug() << "Looking up dbid";
-    if( !m_cache.contains( dbid ) )
-        return ACLSystem::NotFound;
-    else
-    {
-        QHash< QString, ACL > peerHash = m_cachedbid;
-        if( peerHash.contains( "global" ) )
-            return peerHash"global";
-        return ACLSystem::NotFound;
-    }
-}
-
-void
-ACLSystem::authorizeUser( const QString& dbid, ACLSystem::ACL globalType )
-{
-//    qDebug() << Q_FUNC_INFO;
-    if( globalType == ACLSystem::NotFound )
-        return;
-
-    QMutexLocker locker( &m_cacheMutex );
-
-    QHash< QString, ACL > peerHash;
-    if( m_cache.contains( dbid ) )
-        peerHash = m_cachedbid;
-    peerHash"global" = globalType;
-    m_cachedbid = peerHash;
-}
-
-ACLSystem::ACL
-ACLSystem::isAuthorizedPath( const QString& dbid, const QString& path )
-{
-    QMutexLocker locker( &m_cacheMutex );
-
-    if( !m_cache.contains( dbid ) )
-        return ACLSystem::NotFound;
-
-    QHash< QString, ACL > peerHash = m_cachedbid;
-    if( !peerHash.contains( path ) )
-    {
-        if( peerHash.contains( "global" ) )
-            return peerHash"global";
-        else
-            return ACLSystem::Deny;
-    }
-    return peerHashpath;
-}
-
-void
-ACLSystem::authorizePath( const QString& dbid, const QString& path, ACLSystem::ACL type )
-{
-    TomahawkSettings *s = TomahawkSettings::instance();
-    if( !s->scannerPaths().contains( path ) )
-    {
-        qDebug() << "path selected is not in our scanner path!";
-        return;
-    }
-    QMutexLocker locker( &m_cacheMutex );
-    QHash< QString, ACLSystem::ACL > peerHash;
-    if ( m_cache.contains( dbid ) )
-        peerHash = m_cachedbid;
-    peerHashpath = type;
-    m_cachedbid = peerHash;
-}
-
-void
-ACLSystem::saveTimerFired()
-{
-    QStringList saveCache;
-    foreach( QString dbid, m_cache.keys() )
-    {
-        foreach( QString path, m_cachedbid.keys() )
-            saveCache << dbid << path << QString::number( (int)(m_cachedbidpath) );
-    }
-    TomahawkSettings::instance()->setAclEntries( saveCache );
-}
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/src/libtomahawk/aclsystem.h Deleted

@@ -1,64 +0,0 @@
-/* === 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
- *   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 TOMAHAWK_ACLSYSTEM_H
-#define TOMAHAWK_ACLSYSTEM_H
-
-#include <QObject>
-#include <QString>
-#include <QHash>
-#include <QTimer>
-#include <QMutex>
-
-#include "dllmacro.h"
-
-class DLLEXPORT ACLSystem : public QObject
-{
-    Q_OBJECT
-
-public:
-
-    static ACLSystem* instance();
-
-    enum ACL {
-        Allow = 0,
-        Deny = 1,
-        NotFound = 2
-    };
-    
-    ACLSystem( QObject *parent = 0 );
-    ~ACLSystem();
-    
-    ACL isAuthorizedUser( const QString &dbid );
-    void authorizeUser( const QString &dbid, ACL globalType );
-    
-    ACL isAuthorizedPath( const QString &dbid, const QString &path );
-    void authorizePath( const QString &dbid, const QString &path, ACL type );
-    
-private slots:
-    void saveTimerFired();
-
-private:
-    QHash< QString, QHash< QString, ACL > > m_cache;
-    QTimer m_saveTimer;
-    QMutex m_cacheMutex;
-    
-    static ACLSystem* s_instance;
-};
-
-#endif // TOMAHAWK_ACLSYSTEM_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/actioncollection.cpp Deleted

@@ -1,108 +0,0 @@
-/* === 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
- *   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 "actioncollection.h"
-#include "tomahawksettings.h"
-#include "audio/audioengine.h"
-#include "utils/tomahawkutils.h"
-
-ActionCollection* ActionCollection::s_instance = 0;
-ActionCollection* ActionCollection::instance()
-{
-    return s_instance;
-}
-
-
-ActionCollection::ActionCollection( QObject *parent )
-    : QObject( parent )
-{
-    s_instance = this;
-    initActions();
-}
-
-
-void
-ActionCollection::initActions()
-{
-    QAction *latchOn = new QAction( tr( "&Listen Along" ), this );
-    latchOn->setIcon( QIcon( RESPATH "images/headphones-sidebar.png" ) );
-    m_actionCollection "latchOn"  = latchOn;
-    QAction *latchOff = new QAction( tr( "Stop &Listening Along" ), this );
-    latchOff->setIcon( QIcon( RESPATH "images/headphones-off.png" ) );
-    m_actionCollection "latchOff"  = latchOff;
-
-    QAction *realtimeFollowingAlong = new QAction( tr( "&Follow in real-time" ), this );
-    realtimeFollowingAlong->setCheckable( true );
-    m_actionCollection "realtimeFollowingAlong"  = realtimeFollowingAlong;
-
-    bool isPublic = TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening;
-    QAction *privacyToggle = new QAction( ( isPublic ? tr( "&Listen Privately" ) : tr( "&Listen Publicly" ) ), this );
-    privacyToggle->setIcon( QIcon( RESPATH "images/private-listening.png" ) );
-    privacyToggle->setIconVisibleInMenu( isPublic );
-    m_actionCollection "togglePrivacy"  = privacyToggle;
-    connect( m_actionCollection "togglePrivacy" , SIGNAL( triggered() ), SLOT( togglePrivateListeningMode() ), Qt::UniqueConnection );
-
-    m_actionCollection "loadPlaylist"  = new QAction( tr( "&Load Playlist" ), this );
-    m_actionCollection "renamePlaylist"  = new QAction( tr( "&Rename Playlist" ), this );
-    m_actionCollection "copyPlaylist"  = new QAction( tr( "&Copy Playlist Link" ), this );
-    m_actionCollection "playPause"  = new QAction( tr( "&Play" ), this );
-    m_actionCollection "stop"  = new QAction( tr( "&Stop" ), this );
-    m_actionCollection "previousTrack"  = new QAction( tr( "&Previous Track" ), this );
-    m_actionCollection "nextTrack"  = new QAction( tr( "&Next Track" ), this );
-    m_actionCollection "quit"  = new QAction( tr( "&Quit" ), this );
-
-    // connect actions to AudioEngine
-    AudioEngine *ae = AudioEngine::instance();
-    connect( m_actionCollection "playPause" ,     SIGNAL( triggered() ), ae,   SLOT( playPause() ), Qt::UniqueConnection );
-    connect( m_actionCollection "stop" ,          SIGNAL( triggered() ), ae,   SLOT( stop() ),      Qt::UniqueConnection );
-    connect( m_actionCollection "previousTrack" , SIGNAL( triggered() ), ae,   SLOT( previous() ),  Qt::UniqueConnection );
-    connect( m_actionCollection "nextTrack" ,     SIGNAL( triggered() ), ae,   SLOT( next() ),      Qt::UniqueConnection );
-}
-
-
-ActionCollection::~ActionCollection()
-{
-    s_instance = 0;
-    foreach( QString key, m_actionCollection.keys() )
-        delete m_actionCollection key ;
-}
-
-
-QAction*
-ActionCollection::getAction( const QString& name )
-{
-    return m_actionCollection.contains( name ) ? m_actionCollection name  : 0;
-}
-
-
-void
-ActionCollection::togglePrivateListeningMode()
-{
-    tDebug() << Q_FUNC_INFO;
-    if ( TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening )
-        TomahawkSettings::instance()->setPrivateListeningMode( TomahawkSettings::FullyPrivate );
-    else
-        TomahawkSettings::instance()->setPrivateListeningMode( TomahawkSettings::PublicListening );
-
-    QAction *privacyToggle = m_actionCollection "togglePrivacy" ;
-    bool isPublic = TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening;
-    privacyToggle->setText( ( isPublic ? tr( "&Listen Privately" ) : tr( "&Listen Publicly" ) ) );
-    privacyToggle->setIconVisibleInMenu( isPublic );
-
-    emit privacyModeChanged();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/actioncollection.h Deleted

@@ -1,52 +0,0 @@
-/* === 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
- *   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 TOMAHAWKACTIONCOLLECTION_H
-#define TOMAHAWKACTIONCOLLECTION_H
-
-#include "dllmacro.h"
-
-#include <QtGui/QAction>
-
-class DLLEXPORT ActionCollection : public QObject
-{
-    Q_OBJECT
-
-public:
-    static ActionCollection* instance();
-
-    ActionCollection( QObject *parent);
-    ~ActionCollection();
-
-    void initActions();
-
-    QAction* getAction( const QString& name );
-
-public slots:
-    void togglePrivateListeningMode();
-
-signals:
-    void privacyModeChanged();
-
-private:
-    static ActionCollection* s_instance;
-
-    QHash< QString, QAction* > m_actionCollection;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/album.cpp Deleted

@@ -1,187 +0,0 @@
-/* === 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
- *   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 "album.h"
-
-#include "artist.h"
-#include "albumplaylistinterface.h"
-#include "database/database.h"
-#include "database/databaseimpl.h"
-#include "query.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-Album::~Album()
-{
-    delete m_cover;
-}
-
-
-album_ptr
-Album::get( const Tomahawk::artist_ptr& artist, const QString& name, bool autoCreate )
-{
-    if ( !Database::instance() || !Database::instance()->impl() )
-        return album_ptr();
-
-    int albid = Database::instance()->impl()->albumId( artist->id(), name, autoCreate );
-    if ( albid < 1 && autoCreate )
-        return album_ptr();
-
-    return Album::get( albid, name, artist );
-}
-
-
-album_ptr
-Album::get( unsigned int id, const QString& name, const Tomahawk::artist_ptr& artist )
-{
-    static QHash< unsigned int, album_ptr > s_albums;
-    static QMutex s_mutex;
-
-    QMutexLocker lock( &s_mutex );
-    if ( s_albums.contains( id ) )
-    {
-        return s_albums.value( id );
-    }
-
-    album_ptr a = album_ptr( new Album( id, name, artist ), &QObject::deleteLater );
-    if ( id > 0 )
-        s_albums.insert( id, a );
-
-    return a;
-}
-
-
-Album::Album( unsigned int id, const QString& name, const Tomahawk::artist_ptr& artist )
-    : QObject()
-    , m_id( id )
-    , m_name( name )
-    , m_artist( artist )
-    , m_cover( 0 )
-    , m_infoLoaded( false )
-{
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(),
-             SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-             SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-}
-
-
-void
-Album::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks )
-{
-    Tomahawk::AlbumPlaylistInterface* api = dynamic_cast< Tomahawk::AlbumPlaylistInterface* >( playlistInterface().data() );
-    if ( api )
-        api->addQueries( tracks );
-
-    emit tracksAdded( tracks );
-}
-
-
-artist_ptr
-Album::artist() const
-{
-    return m_artist;
-}
-
-
-#ifndef ENABLE_HEADLESS
-QPixmap
-Album::cover( const QSize& size, bool forceLoad ) const
-{
-    if ( !m_infoLoaded )
-    {
-        if ( !forceLoad )
-            return QPixmap();
-        m_uuid = uuid();
-
-        Tomahawk::InfoSystem::InfoStringHash trackInfo;
-        trackInfo"artist" = artist()->name();
-        trackInfo"album" = name();
-
-        Tomahawk::InfoSystem::InfoRequestData requestData;
-        requestData.caller = m_uuid;
-        requestData.type = Tomahawk::InfoSystem::InfoAlbumCoverArt;
-        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
-        requestData.customData = QVariantMap();
-
-        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-    }
-
-    if ( !m_cover && !m_coverBuffer.isEmpty() )
-    {
-        m_cover = new QPixmap();
-        m_cover->loadFromData( m_coverBuffer );
-    }
-
-    if ( m_cover && !m_cover->isNull() && !size.isEmpty() )
-    {
-        if ( m_coverCache.contains( size.width() ) )
-        {
-            return m_coverCache.value( size.width() );
-        }
-
-        QPixmap scaledCover;
-        scaledCover = m_cover->scaled( size, Qt::KeepAspectRatio, Qt::SmoothTransformation );
-        m_coverCache.insert( size.width(), scaledCover );
-        return scaledCover;
-    }
-
-    if ( m_cover )
-        return *m_cover;
-    else
-        return QPixmap();
-}
-#endif
-
-
-void
-Album::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
-{
-    if ( requestData.caller != m_uuid ||
-         requestData.type != Tomahawk::InfoSystem::InfoAlbumCoverArt )
-    {
-        return;
-    }
-
-    m_infoLoaded = true;
-    if ( !output.isNull() && output.isValid() )
-    {
-        QVariantMap returnedData = output.value< QVariantMap >();
-        const QByteArray ba = returnedData"imgbytes".toByteArray();
-        if ( ba.length() )
-        {
-            m_coverBuffer = ba;
-        }
-    }
-
-    emit updated();
-}
-
-
-Tomahawk::playlistinterface_ptr
-Album::playlistInterface()
-{
-    if ( m_playlistInterface.isNull() )
-    {
-        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::AlbumPlaylistInterface( this ) );
-    }
-
-    return m_playlistInterface;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/album.h Deleted

@@ -1,86 +0,0 @@
-/* === 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
- *   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 TOMAHAWKALBUM_H
-#define TOMAHAWKALBUM_H
-
-#include "config.h"
-
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#ifndef ENABLE_HEADLESS
-    #include <QtGui/QPixmap>
-#endif
-
-#include "typedefs.h"
-#include "playlistinterface.h"
-#include "dllmacro.h"
-#include "infosystem/infosystem.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT Album : public QObject
-{
-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 );
-
-    explicit Album( unsigned int id, const QString& name, const Tomahawk::artist_ptr& artist );
-    virtual ~Album();
-
-    unsigned int id() const { return m_id; }
-    QString name() const { return m_name; }
-    artist_ptr artist() const;
-#ifndef ENABLE_HEADLESS
-    QPixmap cover( const QSize& size, bool forceLoad = true ) const;
-#endif
-    bool infoLoaded() const { return m_infoLoaded; }
-
-    Tomahawk::playlistinterface_ptr playlistInterface();
-
-signals:
-    void tracksAdded( const QList<Tomahawk::query_ptr>& tracks );
-    void updated();
-
-private slots:
-    void onTracksAdded( const QList<Tomahawk::query_ptr>& tracks );
-
-    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-
-private:
-    Q_DISABLE_COPY( Album )
-
-    unsigned int m_id;
-    QString m_name;
-    artist_ptr m_artist;
-    QByteArray m_coverBuffer;
-    mutable QPixmap* m_cover;
-    bool m_infoLoaded;
-    mutable QString m_uuid;
-
-    mutable QHash< int, QPixmap > m_coverCache;
-
-    Tomahawk::playlistinterface_ptr m_playlistInterface;
-};
-
-} // ns
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/albumplaylistinterface.cpp Deleted

@@ -1,109 +0,0 @@
-/* === 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
- *   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 "albumplaylistinterface.h"
-
-#include "artist.h"
-#include "database/database.h"
-#include "database/databaseimpl.h"
-#include "database/databasecommand_alltracks.h"
-#include "query.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-AlbumPlaylistInterface::AlbumPlaylistInterface() {}
-
-AlbumPlaylistInterface::AlbumPlaylistInterface( Tomahawk::Album *album )
-    : Tomahawk::PlaylistInterface()
-    , m_currentItem( 0 )
-    , m_currentTrack( 0 )
-    , m_album( QWeakPointer< Tomahawk::Album >( album ) )
-{
-}
-
-
-AlbumPlaylistInterface::~AlbumPlaylistInterface()
-{
-    m_album.clear();
-}
-
-
-Tomahawk::result_ptr
-AlbumPlaylistInterface::siblingItem( int itemsAway )
-{
-    int p = m_currentTrack;
-    p += itemsAway;
-
-    if ( p < 0 )
-        return Tomahawk::result_ptr();
-
-    if ( p >= m_queries.count() )
-        return Tomahawk::result_ptr();
-
-    m_currentTrack = p;
-    m_currentItem = m_queries.at( p )->results().first();
-    return m_currentItem;
-}
-
-
-result_ptr
-AlbumPlaylistInterface::currentItem() const
-{
-    return m_currentItem;
-}
-
-
-bool
-AlbumPlaylistInterface::hasNextItem()
-{
-    int p = m_currentTrack;
-    p++;
-    if ( p < 0 || p >= m_queries.count() )
-        return false;
-
-    return true;
-}
-
-
-QList< Tomahawk::query_ptr >
-AlbumPlaylistInterface::tracks()
-{
-    if ( m_queries.isEmpty() && m_album )
-    {
-        DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks();
-        cmd->setAlbum( m_album );
-        cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
-        //this takes discnumber into account as well
-
-        connect( cmd,          SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
-                 m_album.data(), SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ) );
-
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-    }
-
-    return m_queries;
-}
-
-
-void
-AlbumPlaylistInterface::addQueries( const QList< query_ptr >& tracks )
-{
-    m_queries << tracks;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/albumplaylistinterface.h Deleted

@@ -1,82 +0,0 @@
-/* === 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
- *   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 TOMAHAWKALBUMPLAYLISTINTERFACE_H
-#define TOMAHAWKALBUMPLAYLISTINTERFACE_H
-
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-
-#include "album.h"
-#include "typedefs.h"
-#include "playlistinterface.h"
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT AlbumPlaylistInterface : public Tomahawk::PlaylistInterface
-{
-Q_OBJECT
-
-public:
-    AlbumPlaylistInterface( Tomahawk::Album *album );
-    virtual ~AlbumPlaylistInterface();
-
-    QList<Tomahawk::query_ptr> tracks();
-
-    virtual int trackCount() const { return m_queries.count(); }
-    virtual int unfilteredTrackCount() const { return m_queries.count(); }
-
-    virtual Tomahawk::result_ptr siblingItem( int itemsAway );
-
-    virtual bool hasNextItem();
-    virtual Tomahawk::result_ptr currentItem() const;
-
-    virtual PlaylistInterface::RepeatMode repeatMode() const { return PlaylistInterface::NoRepeat; }
-    virtual bool shuffled() const { return false; }
-
-    virtual void setRepeatMode( PlaylistInterface::RepeatMode ) {}
-    virtual void setShuffled( bool ) {}
-
-    virtual void setFilter( const QString& /*pattern*/ ) {}
-
-    virtual void addQueries( const QList<Tomahawk::query_ptr>& tracks );
-
-signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void trackCountChanged( unsigned int tracks );
-    void sourceTrackCountChanged( unsigned int tracks );
-
-    void nextTrackReady();
-
-private:
-    AlbumPlaylistInterface();
-
-    QList< Tomahawk::query_ptr > m_queries;
-    result_ptr m_currentItem;
-    unsigned int m_currentTrack;
-
-    QWeakPointer< Tomahawk::Album > m_album;
-};
-
-}; // ns
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/artist.cpp Deleted

@@ -1,179 +0,0 @@
-/* === 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
- *   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 "artist.h"
-
-#include "artistplaylistinterface.h"
-#include "collection.h"
-#include "database/database.h"
-#include "database/databaseimpl.h"
-#include "query.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-Artist::~Artist()
-{
-    delete m_cover;
-}
-
-
-artist_ptr
-Artist::get( const QString& name, bool autoCreate )
-{
-    if ( !Database::instance() || !Database::instance()->impl() )
-        return artist_ptr();
-
-    int artid = Database::instance()->impl()->artistId( name, autoCreate );
-    if ( artid < 1 && autoCreate )
-        return artist_ptr();
-
-    return Artist::get( artid, name );
-}
-
-
-artist_ptr
-Artist::get( unsigned int id, const QString& name )
-{
-    static QHash< unsigned int, artist_ptr > s_artists;
-    static QMutex s_mutex;
-
-    QMutexLocker lock( &s_mutex );
-    if ( s_artists.contains( id ) )
-    {
-        return s_artists.value( id );
-    }
-
-    artist_ptr a = artist_ptr( new Artist( id, name ), &QObject::deleteLater );
-    if ( id > 0 )
-        s_artists.insert( id, a );
-
-    return a;
-}
-
-
-Artist::Artist( unsigned int id, const QString& name )
-    : QObject()
-    , m_id( id )
-    , m_name( name )
-    , m_cover( 0 )
-    , m_infoLoaded( false )
-{
-    m_sortname = DatabaseImpl::sortname( name, true );
-
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(),
-             SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-             SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-}
-
-
-void
-Artist::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks )
-{
-    Tomahawk::ArtistPlaylistInterface* api = dynamic_cast< Tomahawk::ArtistPlaylistInterface* >( playlistInterface().data() );
-    if ( api )
-        api->addQueries( tracks );
-    emit tracksAdded( tracks );
-}
-
-
-#ifndef ENABLE_HEADLESS
-QPixmap
-Artist::cover( const QSize& size, bool forceLoad ) const
-{
-    if ( !m_infoLoaded )
-    {
-        if ( !forceLoad )
-            return QPixmap();
-        m_uuid = uuid();
-
-        Tomahawk::InfoSystem::InfoStringHash trackInfo;
-        trackInfo"artist" = name();
-
-        Tomahawk::InfoSystem::InfoRequestData requestData;
-        requestData.caller = m_uuid;
-        requestData.type = Tomahawk::InfoSystem::InfoArtistImages;
-        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
-        requestData.customData = QVariantMap();
-
-        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-    }
-
-    if ( !m_cover && !m_coverBuffer.isEmpty() )
-    {
-        m_cover = new QPixmap();
-        m_cover->loadFromData( m_coverBuffer );
-    }
-
-    if ( m_cover && !m_cover->isNull() && !size.isEmpty() )
-    {
-        if ( m_coverCache.contains( size.width() ) )
-        {
-            return m_coverCache.value( size.width() );
-        }
-
-        QPixmap scaledCover;
-        scaledCover = m_cover->scaled( size, Qt::KeepAspectRatio, Qt::SmoothTransformation );
-        m_coverCache.insert( size.width(), scaledCover );
-        return scaledCover;
-    }
-
-    if ( m_cover )
-        return *m_cover;
-    else
-        return QPixmap();
-}
-#endif
-
-
-void
-Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
-{
-    if ( requestData.caller != m_uuid ||
-         requestData.type != Tomahawk::InfoSystem::InfoArtistImages )
-    {
-        return;
-    }
-
-    m_infoLoaded = true;
-    if ( !output.isNull() && output.isValid() )
-    {
-        QVariantMap returnedData = output.value< QVariantMap >();
-        const QByteArray ba = returnedData"imgbytes".toByteArray();
-        if ( ba.length() )
-        {
-            m_coverBuffer = ba;
-        }
-    }
-
-    emit updated();
-}
-
-
-Tomahawk::playlistinterface_ptr
-Artist::playlistInterface()
-{
-    if ( m_playlistInterface.isNull() )
-    {
-        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::ArtistPlaylistInterface( this ) );
-    }
-
-    return m_playlistInterface;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/artist.h Deleted

@@ -1,85 +0,0 @@
-/* === 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
- *   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 TOMAHAWKARTIST_H
-#define TOMAHAWKARTIST_H
-
-#include "config.h"
-
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#ifndef ENABLE_HEADLESS
-    #include <QtGui/QPixmap>
-#endif
-
-#include "typedefs.h"
-#include "dllmacro.h"
-#include "infosystem/infosystem.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT Artist : public QObject
-{
-Q_OBJECT
-
-public:
-    static artist_ptr get( const QString& name, bool autoCreate = false );
-    static artist_ptr get( unsigned int id, const QString& name );
-
-    explicit Artist( unsigned int id, const QString& name );
-    virtual ~Artist();
-
-    unsigned int id() const { return m_id; }
-    QString name() const { return m_name; }
-    QString sortname() const { return m_sortname; }
-#ifndef ENABLE_HEADLESS
-    QPixmap cover( const QSize& size, bool forceLoad = true ) const;
-#endif
-    bool infoLoaded() const { return m_infoLoaded; }
-
-    Tomahawk::playlistinterface_ptr playlistInterface();
-
-signals:
-    void tracksAdded( const QList<Tomahawk::query_ptr>& tracks );
-    void updated();
-
-private slots:
-    void onTracksAdded( const QList<Tomahawk::query_ptr>& tracks );
-
-    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-
-private:
-    Q_DISABLE_COPY( Artist )
-
-    unsigned int m_id;
-    QString m_name;
-    QString m_sortname;
-    QByteArray m_coverBuffer;
-    mutable QPixmap* m_cover;
-    bool m_infoLoaded;
-    mutable QString m_uuid;
-
-    mutable QHash< int, QPixmap > m_coverCache;
-
-    Tomahawk::playlistinterface_ptr m_playlistInterface;
-};
-
-} // ns
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/artistplaylistinterface.cpp Deleted

@@ -1,106 +0,0 @@
-/* === 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
- *   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 "artistplaylistinterface.h"
-
-#include "artist.h"
-#include "collection.h"
-#include "query.h"
-#include "database/database.h"
-#include "database/databasecommand_alltracks.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-ArtistPlaylistInterface::ArtistPlaylistInterface( Tomahawk::Artist *artist )
-    : Tomahawk::PlaylistInterface()
-    , m_currentItem( 0 )
-    , m_currentTrack( 0 )
-    , m_artist( QWeakPointer< Tomahawk::Artist >( artist ) )
-{
-}
-
-
-ArtistPlaylistInterface::~ArtistPlaylistInterface()
-{
-    m_artist.clear();
-}
-
-
-Tomahawk::result_ptr
-ArtistPlaylistInterface::siblingItem( int itemsAway )
-{
-    int p = m_currentTrack;
-    p += itemsAway;
-
-    if ( p < 0 )
-        return Tomahawk::result_ptr();
-
-    if ( p >= m_queries.count() )
-        return Tomahawk::result_ptr();
-
-    m_currentTrack = p;
-    m_currentItem = m_queries.at( p )->results().first();
-    return m_currentItem;
-}
-
-
-bool
-ArtistPlaylistInterface::hasNextItem()
-{
-    int p = m_currentTrack;
-    p++;
-    if ( p < 0 || p >= m_queries.count() )
-        return false;
-
-    return true;
-}
-
-result_ptr
-ArtistPlaylistInterface::currentItem() const
-{
-    return m_currentItem;
-}
-
-
-QList<Tomahawk::query_ptr>
-ArtistPlaylistInterface::tracks()
-{
-    if ( m_queries.isEmpty() && m_artist )
-    {
-        DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks();
-        cmd->setArtist( m_artist );
-        cmd->setSortOrder( DatabaseCommand_AllTracks::Album );
-
-        connect( cmd,           SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
-                 m_artist.data(), SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ) );
-
-        Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
-    }
-
-    return m_queries;
-}
-
-
-void
-ArtistPlaylistInterface::addQueries( const QList< query_ptr >& tracks )
-{
-    m_queries << tracks;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/artistplaylistinterface.h Deleted

@@ -1,73 +0,0 @@
-/* === 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
- *   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 TOMAHAWKARTISTPLAYLISTINTERFACE_H
-#define TOMAHAWKARTISTPLAYLISTINTERFACE_H
-
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-
-#include "artist.h"
-#include "typedefs.h"
-#include "playlistinterface.h"
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT ArtistPlaylistInterface : public Tomahawk::PlaylistInterface
-{
-Q_OBJECT
-
-public:
-    ArtistPlaylistInterface( Tomahawk::Artist *artist );
-    virtual ~ArtistPlaylistInterface();
-
-    virtual QList<Tomahawk::query_ptr> tracks();
-
-    virtual int trackCount() const { return 0; }
-    virtual int unfilteredTrackCount() const { return m_queries.count(); }
-
-    virtual Tomahawk::result_ptr siblingItem( int itemsAway );
-
-    virtual bool hasNextItem();
-    virtual Tomahawk::result_ptr currentItem() const;
-
-    virtual PlaylistInterface::RepeatMode repeatMode() const { return PlaylistInterface::NoRepeat; }
-    virtual bool shuffled() const { return false; }
-
-    virtual void setRepeatMode( PlaylistInterface::RepeatMode ) {}
-    virtual void setShuffled( bool ) {}
-
-    virtual void setFilter( const QString& /*pattern*/ ) {}
-
-    virtual void addQueries( const QList<Tomahawk::query_ptr>& tracks );
-
-private:
-    Q_DISABLE_COPY( ArtistPlaylistInterface )
-
-    QList< Tomahawk::query_ptr > m_queries;
-    result_ptr m_currentItem;
-    unsigned int m_currentTrack;
-
-    QWeakPointer< Tomahawk::Artist > m_artist;
-};
-
-}; // ns
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/audio/audioengine.cpp Deleted

@@ -1,737 +0,0 @@
-/* === 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
- *   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 "audioengine.h"
-
-#include "config.h"
-
-#include <QtCore/QUrl>
-#include <QtNetwork/QNetworkReply>
-
-#include "playlistinterface.h"
-#include "sourceplaylistinterface.h"
-#include "tomahawksettings.h"
-#include "database/database.h"
-#include "database/databasecommand_logplayback.h"
-#include "network/servent.h"
-#include "utils/qnr_iodevicestream.h"
-#include "headlesscheck.h"
-#include "infosystem/infosystem.h"
-#include "album.h"
-
-#include "utils/logger.h"
-
-
-using namespace Tomahawk;
-
-AudioEngine* AudioEngine::s_instance = 0;
-
-static QString s_aeInfoIdentifier = QString( "AUDIOENGINE" );
-
-
-AudioEngine*
-AudioEngine::instance()
-{
-    return s_instance;
-}
-
-
-AudioEngine::AudioEngine()
-    : QObject()
-    , m_queue( 0 )
-    , m_timeElapsed( 0 )
-    , m_expectStop( false )
-    , m_waitingOnNewTrack( false )
-    , m_state( Stopped )
-{
-    s_instance = this;
-    tDebug() << "Init AudioEngine";
-
-    qRegisterMetaType< AudioErrorCode >("AudioErrorCode");
-    qRegisterMetaType< AudioState >("AudioState");
-
-    m_mediaObject = new Phonon::MediaObject( this );
-    m_audioOutput = new Phonon::AudioOutput( Phonon::MusicCategory, this );
-    Phonon::createPath( m_mediaObject, m_audioOutput );
-
-    m_mediaObject->setTickInterval( 150 );
-    connect( m_mediaObject, SIGNAL( stateChanged( Phonon::State, Phonon::State ) ), SLOT( onStateChanged( Phonon::State, Phonon::State ) ) );
-    connect( m_mediaObject, SIGNAL( tick( qint64 ) ), SLOT( timerTriggered( qint64 ) ) );
-    connect( m_mediaObject, SIGNAL( aboutToFinish() ), SLOT( onAboutToFinish() ) );
-
-    connect( m_audioOutput, SIGNAL( volumeChanged( qreal ) ), SLOT( onVolumeChanged( qreal ) ) );
-
-    connect( this, SIGNAL( sendWaitingNotification() ), SLOT( sendWaitingNotificationSlot() ), Qt::QueuedConnection );
-    
-    onVolumeChanged( m_audioOutput->volume() );
-
-#ifndef Q_WS_X11
-    // On mac & win, phonon volume is independent from system volume, so the onVolumeChanged call above just sets our volume to 100%.
-    // Since it's indendent, we'll set it to 75% since that's nicer.
-    setVolume( 75 );
-#endif
-}
-
-
-AudioEngine::~AudioEngine()
-{
-    tDebug() << Q_FUNC_INFO;
-    m_mediaObject->stop();
-//    stop();
-
-    delete m_audioOutput;
-    delete m_mediaObject;
-}
-
-
-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()
-{
-    if ( isPlaying() )
-        pause();
-    else
-        play();
-}
-
-
-void
-AudioEngine::play()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-
-    if ( isPaused() )
-    {
-        setVolume( m_volume );
-        m_mediaObject->play();
-        setVolume( m_volume );
-        emit resumed();
-
-        Tomahawk::InfoSystem::InfoStringHash trackInfo;
-
-        trackInfo"title" = m_currentTrack->track();
-        trackInfo"artist" = m_currentTrack->artist()->name();
-        trackInfo"album" = m_currentTrack->album()->name();
-        Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
-        s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowResumed,
-        QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo ) );
-    }
-    else
-        next();
-}
-
-
-void
-AudioEngine::pause()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-
-    m_volume = volume();
-    m_mediaObject->pause();
-    emit paused();
-
-    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowPaused, QVariant() );
-}
-
-
-void
-AudioEngine::stop()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-
-    emit stopped();
-    if ( isStopped() )
-        return;
-
-    setState( Stopped );
-    m_mediaObject->stop();
-
-    if ( !m_playlist.isNull() )
-        m_playlist.data()->reset();
-    if ( !m_currentTrack.isNull() )
-        emit timerPercentage( ( (double)m_timeElapsed / (double)m_currentTrack->duration() ) * 100.0 );
-
-    setCurrentTrack( Tomahawk::result_ptr() );
-
-    Tomahawk::InfoSystem::InfoTypeMap map;
-    map Tomahawk::InfoSystem::InfoNowStopped  = QVariant();
-
-    if ( m_waitingOnNewTrack )
-        emit sendWaitingNotification();
-    else if ( TomahawkSettings::instance()->verboseNotifications() )
-    {
-        QVariantMap stopInfo;
-        stopInfo"message" = tr( "Tomahawk is stopped." );
-        map Tomahawk::InfoSystem::InfoNotifyUser  = QVariant::fromValue< QVariantMap >( stopInfo );
-    }
-
-    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( s_aeInfoIdentifier, map );
-}
-
-
-void
-AudioEngine::previous()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-
-    if ( canGoPrevious() )
-        loadPreviousTrack();
-}
-
-
-void
-AudioEngine::next()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-
-    if ( canGoNext() )
-        loadNextTrack();
-}
-
-
-bool
-AudioEngine::canGoNext()
-{
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
-
-    if ( m_queue && m_queue->trackCount() )
-        return true;
-
-    if ( m_playlist.isNull() )
-        return false;
-
-    if ( m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkip ||
-         m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkipForwards )
-        return false;
-
-    if ( !m_currentTrack.isNull() && !m_playlist->hasNextItem() &&
-         ( m_playlist->currentItem().isNull() || ( m_currentTrack->id() == m_playlist->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
-        tDebug( LOGEXTRA ) << Q_FUNC_INFO << "catch up, but same track or can't move on because don't have next track or it wasn't resolved";
-        return false;
-    }
-
-    return m_playlist.data()->hasNextItem();
-}
-
-
-bool
-AudioEngine::canGoPrevious()
-{
-    if ( m_playlist.isNull() )
-        return false;
-
-    if ( m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkip ||
-         m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkipBackwards )
-        return false;
-
-    return true;
-}
-
-
-bool
-AudioEngine::canSeek()
-{
-    bool phononCanSeek = true;
-    /* TODO: When phonon properly reports this, re-enable it
-    if ( m_mediaObject && m_mediaObject->isValid() )
-        phononCanSeek = m_mediaObject->isSeekable();
-    */
-    return !m_playlist.isNull() && ( m_playlist.data()->seekRestrictions() != PlaylistInterface::NoSeek ) && phononCanSeek;
-}
-
-
-void
-AudioEngine::seek( qint64 ms )
-{
-    if ( !canSeek() )
-    {
-        tDebug( LOGEXTRA ) << "Could not seek!";
-        return;
-    }
-
-    if ( isPlaying() || isPaused() )
-    {
-        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << ms;
-        m_mediaObject->seek( ms );
-        emit seeked( ms );
-    }
-}
-
-
-void
-AudioEngine::seek( int ms )
-{
-    seek( (qint64) ms );
-}
-
-
-void
-AudioEngine::setVolume( int percentage )
-{
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << percentage;
-
-    percentage = qBound( 0, percentage, 100 );
-    m_audioOutput->setVolume( (qreal)percentage / 100.0 );
-    emit volumeChanged( percentage );
-}
-
-
-void
-AudioEngine::mute()
-{
-    setVolume( 0 );
-}
-
-
-void
-AudioEngine::sendWaitingNotificationSlot() const
-{
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
-    //since it's async, after this is triggered our result could come in, so don't show the popup in that case
-    if ( !m_playlist.isNull() && m_playlist->hasNextItem() )
-        return;
-    
-    QVariantMap retryInfo;
-    retryInfo"message" = QString( "The current track could not be resolved. Tomahawk will pick back up with the next resolvable track from this source." );
-    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
-        s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNotifyUser,
-        QVariant::fromValue< QVariantMap >( retryInfo ) );
-}
-
-
-void
-AudioEngine::sendNowPlayingNotification()
-{
-#ifndef ENABLE_HEADLESS
-    if ( m_currentTrack->album().isNull() || m_currentTrack->album()->infoLoaded() )
-        onNowPlayingInfoReady();
-    else
-    {
-        connect( m_currentTrack->album().data(), SIGNAL( updated() ), SLOT( onNowPlayingInfoReady() ), Qt::UniqueConnection );
-        m_currentTrack->album()->cover( QSize( 0, 0 ) );
-    }
-#endif
-}
-
-
-void
-AudioEngine::onNowPlayingInfoReady()
-{
-    if ( m_currentTrack.isNull() ||
-         m_currentTrack->track().isNull() ||
-         m_currentTrack->artist().isNull() )
-        return;
-
-    if ( !m_currentTrack->album().isNull() && sender() && m_currentTrack->album().data() != sender() )
-        return;
-
-    QVariantMap playInfo;
-    playInfo"message" = tr( "Tomahawk is playing \"%1\" by %2%3." )
-                        .arg( m_currentTrack->track() )
-                        .arg( m_currentTrack->artist()->name() )
-                        .arg( m_currentTrack->album().isNull() ? QString() : QString( " %1" ).arg( tr( "on album %1" ).arg( m_currentTrack->album()->name() ) ) );
-
-    if ( !m_currentTrack->album().isNull() )
-    {
-#ifndef ENABLE_HEADLESS
-        QImage cover;
-        cover = m_currentTrack->album()->cover( QSize( 0, 0 ) ).toImage();
-        playInfo"image" = QVariant( cover );
-#endif
-    }
-
-    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
-        s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNotifyUser,
-        QVariant::fromValue< QVariantMap >( playInfo ) );
-}
-
-
-bool
-AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
-{
-    bool err = false;
-    {
-        QSharedPointer<QIODevice> io;
-
-        if ( result.isNull() )
-            err = true;
-        else
-        {
-            setCurrentTrack( result );
-
-            if ( !isHttpResult( m_currentTrack->url() ) && !isLocalResult( m_currentTrack->url() ) )
-            {
-                io = Servent::instance()->getIODeviceForUrl( m_currentTrack );
-
-                if ( !io || io.isNull() )
-                {
-                    tLog() << "Error getting iodevice for" << result->url();
-                    err = true;
-                }
-            }
-        }
-
-        if ( !err )
-        {
-            tLog() << "Starting new song:" << m_currentTrack->url();
-            emit loading( m_currentTrack );
-
-            if ( !isHttpResult( m_currentTrack->url() ) && !isLocalResult( m_currentTrack->url() ) )
-            {
-                if ( QNetworkReply* qnr_io = qobject_cast< QNetworkReply* >( io.data() ) )
-                    m_mediaObject->setCurrentSource( new QNR_IODeviceStream( qnr_io, this ) );
-                else
-                    m_mediaObject->setCurrentSource( io.data() );
-                m_mediaObject->currentSource().setAutoDelete( false );
-            }
-            else
-            {
-                if ( !isLocalResult( m_currentTrack->url() ) )
-                {
-                    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 );
-                }
-                else
-                {
-                    QString furl = m_currentTrack->url();
-#ifdef Q_WS_WIN
-                    if ( furl.startsWith( "file://" ) )
-                        furl = furl.right( furl.length() - 7 );
-#endif
-                    tLog( LOGVERBOSE ) << "Passing to Phonon:" << furl << furl.toLatin1();
-                    m_mediaObject->setCurrentSource( furl );
-                }
-
-                m_mediaObject->currentSource().setAutoDelete( true );
-            }
-
-            if ( !m_input.isNull() )
-            {
-                m_input->close();
-                m_input.clear();
-            }
-            m_input = io;
-            m_mediaObject->play();
-            emit started( m_currentTrack );
-
-            if ( TomahawkSettings::instance()->verboseNotifications() )
-                sendNowPlayingNotification();
-
-            if ( TomahawkSettings::instance()->privateListeningMode() != TomahawkSettings::FullyPrivate )
-            {
-                DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_currentTrack, DatabaseCommand_LogPlayback::Started );
-                Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
-
-                Tomahawk::InfoSystem::InfoStringHash trackInfo;
-                trackInfo"title" = m_currentTrack->track();
-                trackInfo"artist" = m_currentTrack->artist()->name();
-                trackInfo"album" = m_currentTrack->album()->name();
-
-                Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
-                    s_aeInfoIdentifier,
-                    Tomahawk::InfoSystem::InfoNowPlaying,
-                    QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo ) );
-            }
-        }
-    }
-
-    if ( err )
-    {
-        stop();
-        return false;
-    }
-
-    m_waitingOnNewTrack = false;
-    return true;
-}
-
-
-void
-AudioEngine::loadPreviousTrack()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-
-    if ( m_playlist.isNull() )
-    {
-        stop();
-        return;
-    }
-
-    Tomahawk::result_ptr result = m_playlist.data()->previousItem();
-    if ( !result.isNull() )
-        loadTrack( result );
-    else
-        stop();
-}
-
-
-void
-AudioEngine::loadNextTrack()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-
-    Tomahawk::result_ptr result;
-
-    if ( m_queue && m_queue->trackCount() )
-    {
-        result = m_queue->nextItem();
-    }
-
-    if ( !m_playlist.isNull() && result.isNull() )
-    {
-        tDebug( LOGEXTRA ) << Q_FUNC_INFO << "Loading playlist's next item";
-        result = m_playlist.data()->nextItem();
-        m_currentTrackPlaylist = m_playlist;
-    }
-
-    if ( !result.isNull() )
-    {
-        tDebug( LOGEXTRA ) << Q_FUNC_INFO << "Got next item, loading track";
-        loadTrack( result );
-    }
-    else
-    {
-        if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistInterface::Retry )
-            m_waitingOnNewTrack = true;
-
-        stop();
-    }
-}
-
-
-void
-AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::result_ptr& result )
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : result->url() );
-
-    if ( !m_playlist.isNull() )
-        m_playlist.data()->reset();
-
-    setPlaylist( playlist );
-    m_currentTrackPlaylist = playlist;
-
-    if ( !result.isNull() )
-        loadTrack( result );
-    else if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == PlaylistInterface::Retry )
-    {
-        m_waitingOnNewTrack = true;
-        if ( isStopped() )
-            emit sendWaitingNotification();
-        else
-            stop();
-    }
-}
-
-
-void
-AudioEngine::onPlaylistNextTrackReady()
-{
-    // If in real-time and you have a few seconds left, you're probably lagging -- finish it up
-    if ( m_playlist && m_playlist->latchMode() == PlaylistInterface::RealTime && ( m_waitingOnNewTrack || m_currentTrack.isNull() || m_currentTrack->id() == 0 || ( currentTrackTotalTime() - currentTime() > 6000 ) ) )
-    {
-        m_waitingOnNewTrack = false;
-        loadNextTrack();
-        return;
-    }
-
-    if ( !m_waitingOnNewTrack )
-        return;
-
-    m_waitingOnNewTrack = false;
-    loadNextTrack();
-}
-
-
-void
-AudioEngine::onAboutToFinish()
-{
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
-    m_expectStop = true;
-}
-
-
-void
-AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState )
-{
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << oldState << newState << m_expectStop;
-
-    if ( newState == Phonon::ErrorState )
-    {
-        stop();
-
-        tLog() << "Phonon Error:" << m_mediaObject->errorString() << m_mediaObject->errorType();
-        emit error( UnknownError );
-        return;
-    }
-    if ( newState == Phonon::PlayingState )
-        setState( Playing );
-
-    if ( oldState == Phonon::PlayingState )
-    {
-        bool stopped = false;
-        switch ( newState )
-        {
-            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.";
-            if ( canGoNext() )
-                loadNextTrack();
-            else
-            {
-                if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistInterface::Retry )
-                    m_waitingOnNewTrack = true;
-                stop();
-            }
-        }
-    }
-}
-
-
-void
-AudioEngine::timerTriggered( qint64 time )
-{
-    emit timerMilliSeconds( time );
-
-    if ( m_timeElapsed != time / 1000 )
-    {
-        m_timeElapsed = time / 1000;
-        emit timerSeconds( m_timeElapsed );
-
-        if ( !m_currentTrack.isNull() )
-        {
-            if ( m_currentTrack->duration() == 0 )
-            {
-                emit timerPercentage( 0 );
-            }
-            else
-            {
-                emit timerPercentage( ( (double)m_timeElapsed / (double)m_currentTrack->duration() ) * 100.0 );
-            }
-        }
-    }
-}
-
-
-void
-AudioEngine::setPlaylist( Tomahawk::playlistinterface_ptr playlist )
-{
-    if ( !m_playlist.isNull() )
-    {
-        if ( m_playlist.data() && m_playlist.data()->retryMode() == PlaylistInterface::Retry )
-            disconnect( m_playlist.data(), SIGNAL( nextTrackReady() ) );
-        m_playlist.data()->reset();
-    }
-
-    if ( playlist.isNull() )
-    {
-        m_playlist.clear();
-        emit playlistChanged( playlist );
-        return;
-    }
-
-    m_playlist = playlist;
-
-    if ( !m_playlist.isNull() && m_playlist.data() && m_playlist.data()->retryMode() == PlaylistInterface::Retry )
-        connect( m_playlist.data(), SIGNAL( nextTrackReady() ), SLOT( onPlaylistNextTrackReady() ) );
-
-    emit playlistChanged( playlist );
-}
-
-
-void
-AudioEngine::setCurrentTrack( const Tomahawk::result_ptr& result )
-{
-    m_lastTrack = m_currentTrack;
-    if ( !m_lastTrack.isNull() )
-    {
-        if ( TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening )
-        {
-            DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_lastTrack, DatabaseCommand_LogPlayback::Finished, m_timeElapsed );
-            Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
-        }
-
-        emit finished( m_lastTrack );
-    }
-
-    m_currentTrack = result;
-}
-
-
-bool
-AudioEngine::isHttpResult( const QString& url ) const
-{
-    return url.startsWith( "http://" ) || url.startsWith( "https://" );
-}
-
-
-bool
-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 );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/audio/audioengine.h Deleted

@@ -1,163 +0,0 @@
-/* === 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
- *   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 AUDIOENGINE_H
-#define AUDIOENGINE_H
-
-#include <QtCore/QObject>
-#include <QtCore/QTimer>
-
-#include <phonon/MediaObject>
-#include <phonon/AudioOutput>
-#include <phonon/BackendCapabilities>
-
-#include "result.h"
-#include "typedefs.h"
-#include "playlistinterface.h"
-
-#include "dllmacro.h"
-
-#define AUDIO_VOLUME_STEP 5
-
-
-class DLLEXPORT AudioEngine : public QObject
-{
-Q_OBJECT
-
-public:
-    enum AudioErrorCode { StreamReadError, AudioDeviceError, DecodeError, UnknownError };
-    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
-
-    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_ptr currentTrackPlaylist() const { return m_currentTrackPlaylist; }
-
-    /* Returns the PlaylistInterface of the current playlist. Note: The currently playing track might still be from a different playlist! */
-    Tomahawk::playlistinterface_ptr playlist() const { return m_playlist; }
-
-    Tomahawk::result_ptr currentTrack() const { return m_currentTrack; }
-
-    qint64 currentTime() const { return m_mediaObject->currentTime(); }
-    qint64 currentTrackTotalTime() const { return m_mediaObject->totalTime(); }
-
-public slots:
-    void playPause();
-    void play();
-    void pause();
-    void stop();
-
-    void previous();
-    void next();
-
-    bool canGoPrevious();
-    bool canGoNext();
-    bool canSeek();
-
-    void seek( qint64 ms );
-    void seek( int ms ); // for compatibility with seekbar in audiocontrols
-    void setVolume( int percentage );
-    void lowerVolume() { setVolume( volume() - AUDIO_VOLUME_STEP ); }
-    void raiseVolume() { setVolume( volume() + AUDIO_VOLUME_STEP ); }
-    void mute();
-
-    void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::result_ptr& result );
-    void setPlaylist( Tomahawk::playlistinterface_ptr playlist );
-    void setQueue( Tomahawk::playlistinterface_ptr queue ) { m_queue = queue; }
-
-signals:
-    void loading( const Tomahawk::result_ptr& track );
-    void started( const Tomahawk::result_ptr& track );
-    void finished( const Tomahawk::result_ptr& track );
-    void stopped();
-    void paused();
-    void resumed();
-
-    void seeked( qint64 ms );
-
-    void stateChanged( AudioState newState, AudioState oldState );
-    void volumeChanged( int volume /* in percent */ );
-
-    void timerMilliSeconds( qint64 msElapsed );
-    void timerSeconds( unsigned int secondsElapsed );
-    void timerPercentage( unsigned int percentage );
-
-    void playlistChanged( Tomahawk::playlistinterface_ptr playlist );
-
-    void error( AudioEngine::AudioErrorCode errorCode );
-
-    void sendWaitingNotification();
-
-private slots:
-    bool loadTrack( const Tomahawk::result_ptr& result );
-    void loadPreviousTrack();
-    void loadNextTrack();
-
-    void onAboutToFinish();
-    void onStateChanged( Phonon::State newState, Phonon::State oldState );
-    void onVolumeChanged( qreal volume ) { emit volumeChanged( volume * 100 ); }
-    void timerTriggered( qint64 time );
-
-    void setCurrentTrack( const Tomahawk::result_ptr& result );
-    void onNowPlayingInfoReady();
-    void onPlaylistNextTrackReady();
-
-    void sendWaitingNotificationSlot() const;
-
-private:
-    void setState( AudioState state );
-
-    bool isHttpResult( const QString& ) const;
-    bool isLocalResult( const QString& ) const;
-
-    void sendNowPlayingNotification();
-
-    QSharedPointer<QIODevice> m_input;
-
-    Tomahawk::result_ptr m_currentTrack;
-    Tomahawk::result_ptr m_lastTrack;
-    Tomahawk::playlistinterface_ptr m_playlist;
-    Tomahawk::playlistinterface_ptr m_currentTrackPlaylist;
-    Tomahawk::playlistinterface_ptr m_queue;
-
-    Phonon::MediaObject* m_mediaObject;
-    Phonon::AudioOutput* m_audioOutput;
-
-    unsigned int m_timeElapsed;
-    bool m_expectStop;
-    bool m_waitingOnNewTrack;
-
-    mutable QStringList m_supportedMimeTypes;
-    AudioState m_state;
-    unsigned int m_volume;
-
-    static AudioEngine* s_instance;
-};
-
-#endif // AUDIOENGINE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/collection.cpp Deleted

@@ -1,256 +0,0 @@
-/* === 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
- *   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 "collection.h"
-
-#include <QMetaObject>
-#include <QGenericArgument>
-
-#include "source.h"
-
-#include "utils/logger.h"
-#include <PlaylistUpdaterInterface.h>
-
-using namespace Tomahawk;
-
-
-Collection::Collection( const source_ptr& source, const QString& name, QObject* parent )
-    : QObject( parent )
-    , m_name( name )
-    , m_lastmodified( 0 )
-    , m_changed( false )
-    , m_source( source )
-{
-    qDebug() << Q_FUNC_INFO << name << source->friendlyName();
-
-    connect( source.data(), SIGNAL( synced() ), SLOT( onSynced() ) );
-}
-
-
-Collection::~Collection()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-QString
-Collection::name() const
-{
-    return m_name;
-}
-
-
-const
-source_ptr& Collection::source() const
-{
-    return m_source;
-}
-
-
-void
-Collection::addPlaylist( const Tomahawk::playlist_ptr& p )
-{
-    if ( m_playlists.contains( p->guid() ) )
-        return;
-
-    QList<playlist_ptr> toadd;
-    toadd << p;
-    m_playlists.insert( p->guid(), p );
-
-/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
-                            << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();*/
-    emit playlistsAdded( toadd );
-}
-
-
-void
-Collection::addAutoPlaylist( const Tomahawk::dynplaylist_ptr& p )
-{
-    QList<dynplaylist_ptr> toadd;
-    toadd << p;
-    m_autoplaylists.insert( p->guid(), p );
-
-/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
-                            << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();*/
-    emit autoPlaylistsAdded( toadd );
-}
-
-
-void
-Collection::addStation( const dynplaylist_ptr& s )
-{
-    QList<dynplaylist_ptr> toadd;
-    toadd << s;
-    m_stations.insert( s->guid(), s );
-
-/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
-                            << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();*/
-    emit stationsAdded( toadd );
-}
-
-
-void
-Collection::deletePlaylist( const Tomahawk::playlist_ptr& p )
-{
-    QList<playlist_ptr> todelete;
-    todelete << p;
-    m_playlists.remove( p->guid() );
-
-/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
-                            << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();*/
-    emit playlistsDeleted( todelete );
-}
-
-
-void
-Collection::deleteAutoPlaylist( const Tomahawk::dynplaylist_ptr& p )
-{
-    QList<dynplaylist_ptr> todelete;
-    todelete << p;
-    m_autoplaylists.remove( p->guid() );
-
-/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
-                            << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();*/
-    emit autoPlaylistsDeleted( todelete );
-}
-
-
-void
-Collection::deleteStation( const dynplaylist_ptr& s )
-{
-    QList<dynplaylist_ptr> todelete;
-    todelete << s;
-    m_stations.remove( s->guid() );
-
-/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
-                            << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();*/
-    emit stationsDeleted( todelete );
-}
-
-
-Tomahawk::playlist_ptr
-Collection::playlist( const QString& guid )
-{
-    return m_playlists.value( guid, Tomahawk::playlist_ptr() );
-}
-
-
-Tomahawk::dynplaylist_ptr
-Collection::autoPlaylist( const QString& guid )
-{
-    return m_autoplaylists.value( guid, Tomahawk::dynplaylist_ptr() );
-}
-
-
-Tomahawk::dynplaylist_ptr
-Collection::station( const QString& guid )
-{
-    return m_stations.value( guid, Tomahawk::dynplaylist_ptr() );
-}
-
-
-void
-Collection::setPlaylists( const QList<Tomahawk::playlist_ptr>& plists )
-{
-    foreach ( const playlist_ptr& p, plists )
-    {
-//        qDebug() << "Batch inserting playlist:" << p->guid();
-        m_playlists.insert( p->guid(), p );
-        if ( !m_source.isNull() && m_source->isLocal() )
-            PlaylistUpdaterInterface::loadForPlaylist( p );
-    }
-    emit playlistsAdded( plists );
-}
-
-
-void
-Collection::setAutoPlaylists( const QList< Tomahawk::dynplaylist_ptr >& plists )
-{
-    foreach ( const dynplaylist_ptr& p, plists )
-    {
-//        qDebug() << "Batch inserting dynamic playlist:" << p->guid();
-        m_autoplaylists.insert( p->guid(), p );
-    }
-    emit autoPlaylistsAdded( plists );
-}
-
-
-void
-Collection::setStations( const QList< dynplaylist_ptr >& stations )
-{
-    foreach ( const dynplaylist_ptr& s, stations )
-    {
-//        qDebug() << "Batch inserting station:" << s->guid();
-        m_stations.insert( s->guid(), s );
-    }
-    emit autoPlaylistsAdded( stations );
-}
-
-
-void
-Collection::setTracks( const QList<unsigned int>& ids )
-{
-    tDebug() << Q_FUNC_INFO << ids.count() << name();
-
-    m_changed = true;
-    emit tracksAdded( ids );
-}
-
-
-void
-Collection::delTracks( const QList<unsigned int>& ids )
-{
-    tDebug() << Q_FUNC_INFO << ids.count() << name();
-
-    m_changed = true;
-    emit tracksRemoved( ids );
-}
-
-
-void
-Collection::onSynced()
-{
-    tDebug() << Q_FUNC_INFO << m_changed;
-    if ( m_changed )
-    {
-        m_changed = false;
-        emit changed();
-    }
-}
-
-
-void
-Collection::moveAutoToStation( const QString& guid )
-{
-    if ( m_autoplaylists.contains( guid ) )
-        m_stations.insert( guid, m_autoplaylists.take( guid ) );
-}
-
-
-void
-Collection::moveStationToAuto( const QString& guid )
-{
-    if ( m_stations.contains( guid ) )
-        m_autoplaylists.insert( guid, m_stations.take( guid ) );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/collection.h Deleted

@@ -1,132 +0,0 @@
-/* === 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
- *   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/>.
- */
-
-/*
-    The collection  - acts as container for someones music library
-    load() -> async populate by calling addArtists etc,
-    then finishedLoading() is emitted.
-    then use artists() etc to get the data.
-*/
-
-#ifndef TOMAHAWK_COLLECTION_H
-#define TOMAHAWK_COLLECTION_H
-
-#include <QHash>
-#include <QDir>
-#include <QList>
-#include <QSharedPointer>
-
-#include "typedefs.h"
-#include "functimeout.h"
-#include "playlist.h"
-#include "playlist/dynamic/DynamicPlaylist.h"
-
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT Collection : public QObject
-{
-Q_OBJECT
-
-public:
-    Collection( const source_ptr& source, const QString& name, QObject* parent = 0 );
-    virtual ~Collection();
-
-    virtual QString name() const;
-
-    virtual void loadPlaylists() { qDebug() << Q_FUNC_INFO; }
-    virtual void loadAutoPlaylists() { qDebug() << Q_FUNC_INFO; }
-    virtual void loadStations() { qDebug() << Q_FUNC_INFO; }
-
-    virtual Tomahawk::playlist_ptr playlist( const QString& guid );
-    virtual Tomahawk::dynplaylist_ptr autoPlaylist( const QString& guid );
-    virtual Tomahawk::dynplaylist_ptr station( const QString& guid );
-
-    virtual void addPlaylist( const Tomahawk::playlist_ptr& p );
-    virtual void deletePlaylist( const Tomahawk::playlist_ptr& p );
-
-    virtual void addAutoPlaylist( const Tomahawk::dynplaylist_ptr& p );
-    virtual void deleteAutoPlaylist( const Tomahawk::dynplaylist_ptr& p );
-
-    virtual void addStation( const Tomahawk::dynplaylist_ptr& s );
-    virtual void deleteStation( const Tomahawk::dynplaylist_ptr& s );
-
-    virtual QList< Tomahawk::playlist_ptr > playlists() { return m_playlists.values(); }
-    virtual QList< Tomahawk::dynplaylist_ptr > autoPlaylists() { return m_autoplaylists.values(); }
-    virtual QList< Tomahawk::dynplaylist_ptr > stations() { return m_stations.values(); }
-
-    const source_ptr& source() const;
-    unsigned int lastmodified() const { return m_lastmodified; }
-
-signals:
-    void tracksAdded( const QList<unsigned int>& fileids );
-    void tracksRemoved( const QList<unsigned int>& fileids );
-
-    void playlistsAdded( const QList<Tomahawk::playlist_ptr>& );
-    void playlistsDeleted( const QList<Tomahawk::playlist_ptr>& );
-
-    void autoPlaylistsAdded( const QList<Tomahawk::dynplaylist_ptr>& );
-    void autoPlaylistsDeleted( const QList<Tomahawk::dynplaylist_ptr>& );
-
-    void stationsAdded( const QList<Tomahawk::dynplaylist_ptr>& );
-    void stationsDeleted( const QList<Tomahawk::dynplaylist_ptr>& );
-
-    void changed();
-
-public slots:
-    virtual void addTracks( const QList<QVariant>& newitems ) = 0;
-    virtual void removeTracks( const QDir& dir ) = 0;
-
-    void setPlaylists( const QList<Tomahawk::playlist_ptr>& plists );
-    void setAutoPlaylists( const QList< Tomahawk::dynplaylist_ptr >& autoplists );
-    void setStations( const QList< Tomahawk::dynplaylist_ptr >& stations );
-
-    void setTracks( const QList<unsigned int>& fileids );
-    void delTracks( const QList<unsigned int>& fileids );
-
-protected:
-    QString m_name;
-    unsigned int m_lastmodified; // unix time of last change to collection
-
-private slots:
-    void onSynced();
-
-private:
-    bool m_changed;
-
-    source_ptr m_source;
-    QHash< QString, Tomahawk::playlist_ptr > m_playlists;
-    QHash< QString, Tomahawk::dynplaylist_ptr > m_autoplaylists;
-    QHash< QString, Tomahawk::dynplaylist_ptr > m_stations;
-
-    // HACK see line 99 in the dbcmd for why we need this for backwards-compatibility
-    void moveAutoToStation( const QString& guid );
-    void moveStationToAuto( const QString& guid );
-    friend class ::DatabaseCommand_SetDynamicPlaylistRevision;
-};
-
-}; // ns
-
-inline uint qHash( const QSharedPointer<Tomahawk::Collection>& key )
-{
-    return qHash( (void *)key.data() );
-}
-
-#endif // TOMAHAWK_COLLECTION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/contextmenu.cpp Deleted

@@ -1,265 +0,0 @@
-/* === 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
- *   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 "contextmenu.h"
-
-#include "globalactionmanager.h"
-#include "playlistview.h"
-#include "viewmanager.h"
-#include "query.h"
-#include "source.h"
-#include "artist.h"
-#include "album.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-ContextMenu::ContextMenu( QWidget* parent )
-    : QMenu( parent )
-    , m_loveAction( 0 )
-{
-    m_sigmap = new QSignalMapper( this );
-    connect( m_sigmap, SIGNAL( mapped( int ) ), SLOT( onTriggered( int ) ) );
-
-    m_supportedActions = ActionPlay | ActionQueue | ActionCopyLink | ActionLove;
-}
-
-
-ContextMenu::~ContextMenu()
-{
-}
-
-
-void
-ContextMenu::clear()
-{
-    QMenu::clear();
-
-    m_queries.clear();
-    m_albums.clear();
-    m_artists.clear();
-}
-
-
-unsigned int
-ContextMenu::itemCount() const
-{
-   return m_queries.count() + m_artists.count() + m_albums.count();
-}
-
-
-void
-ContextMenu::setQueries( const QList<Tomahawk::query_ptr>& queries )
-{
-    if ( queries.isEmpty() )
-        return;
-
-    QMenu::clear();
-    m_queries.clear();
-    m_queries << queries;
-
-    if ( m_supportedActions & ActionPlay && itemCount() == 1 )
-        m_sigmap->setMapping( addAction( tr( "&Play" ) ), ActionPlay );
-
-    if ( m_supportedActions & ActionQueue )
-        m_sigmap->setMapping( addAction( tr( "Add to &Queue" ) ), ActionQueue );
-
-    addSeparator();
-
-    if ( m_supportedActions & ActionLove && itemCount() == 1 )
-    {
-        m_loveAction = addAction( tr( "&Love" ) );
-        m_sigmap->setMapping( m_loveAction, ActionLove );
-
-        connect( queries.first().data(), SIGNAL( socialActionsLoaded() ), SLOT( onSocialActionsLoaded() ) );
-        m_queries.first()->loadSocialActions();
-        onSocialActionsLoaded();
-    }
-
-    if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
-        m_sigmap->setMapping( addAction( tr( "&Copy Track Link" ) ), ActionCopyLink );
-
-    addSeparator();
-
-    if ( m_supportedActions & ActionDelete )
-        m_sigmap->setMapping( addAction( queries.count() > 1 ? tr( "&Delete Items" ) : tr( "&Delete Item" ) ), ActionDelete );
-
-    foreach ( QAction* action, actions() )
-    {
-        connect( action, SIGNAL( triggered() ), m_sigmap, SLOT( map() ) );
-    }
-}
-
-
-void
-ContextMenu::setQuery( const Tomahawk::query_ptr& query )
-{
-
-    QList<query_ptr> queries;
-    queries << query;
-    setQueries( queries );
-}
-
-
-void
-ContextMenu::setAlbums( const QList<Tomahawk::album_ptr>& albums )
-{
-    if ( albums.isEmpty() )
-        return;
-
-    QMenu::clear();
-    m_albums.clear();
-    m_albums << albums;
-
-    if ( m_supportedActions & ActionPlay && itemCount() == 1 )
-        m_sigmap->setMapping( addAction( tr( "Show &Album page" ) ), ActionPlay );
-
-    if ( m_supportedActions & ActionQueue )
-        m_sigmap->setMapping( addAction( tr( "Add to &Queue" ) ), ActionQueue );
-
-    //m_sigmap->setMapping( addAction( tr( "&Add to Playlist" ) ), ActionAddToPlaylist );
-
-    addSeparator();
-
-/*    if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
-        m_sigmap->setMapping( addAction( tr( "Copy Album &Link" ) ), ActionCopyLink ); */
-
-    foreach ( QAction* action, actions() )
-    {
-        connect( action, SIGNAL( triggered() ), m_sigmap, SLOT( map() ) );
-    }
-}
-
-
-void
-ContextMenu::setAlbum( const Tomahawk::album_ptr& album )
-{
-    QList<album_ptr> albums;
-    albums << album;
-    setAlbums( albums );
-}
-
-
-void
-ContextMenu::setArtists( const QList<Tomahawk::artist_ptr>& artists )
-{
-    if ( artists.isEmpty() )
-        return;
-
-    QMenu::clear();
-    m_artists.clear();
-    m_artists << artists;
-
-    if ( m_supportedActions & ActionPlay && itemCount() == 1 )
-        m_sigmap->setMapping( addAction( tr( "Show &Artist page" ) ), ActionPlay );
-
-    if ( m_supportedActions & ActionQueue )
-        m_sigmap->setMapping( addAction( tr( "Add to &Queue" ) ), ActionQueue );
-
-    //m_sigmap->setMapping( addAction( tr( "&Add to Playlist" ) ), ActionAddToPlaylist );
-
-    addSeparator();
-
-/*    if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
-        m_sigmap->setMapping( addAction( tr( "Copy Artist &Link" ) ), ActionCopyLink ); */
-
-    foreach ( QAction* action, actions() )
-    {
-        connect( action, SIGNAL( triggered() ), m_sigmap, SLOT( map() ) );
-    }
-}
-
-
-void
-ContextMenu::setArtist( const Tomahawk::artist_ptr& artist )
-{
-    QList<artist_ptr> artists;
-    artists << artist;
-    setArtists( artists );
-}
-
-
-void
-ContextMenu::onTriggered( int action )
-{
-    switch ( action )
-    {
-        case ActionQueue:
-            addToQueue();
-            break;
-
-        case ActionCopyLink:
-            copyLink();
-            break;
-
-        case ActionLove:
-            m_queries.first()->setLoved( !m_queries.first()->loved() );
-            break;
-
-        default:
-            emit triggered( action );
-    }
-}
-
-
-
-void
-ContextMenu::addToQueue()
-{
-    foreach ( const query_ptr& query, m_queries )
-    {
-        ViewManager::instance()->queue()->model()->append( query );
-    }
-    foreach ( const artist_ptr& artist, m_artists )
-    {
-        ViewManager::instance()->queue()->model()->append( artist );
-    }
-    foreach ( const album_ptr& album, m_albums )
-    {
-        ViewManager::instance()->queue()->model()->append( album );
-    }
-
-    ViewManager::instance()->showQueue();
-}
-
-
-void
-ContextMenu::copyLink()
-{
-    if ( m_queries.count() )
-    {
-        GlobalActionManager::instance()->copyToClipboard( m_queries.first() );
-    }
-}
-
-
-void
-ContextMenu::onSocialActionsLoaded()
-{
-    if ( m_queries.first()->loved() )
-    {
-        m_loveAction->setText( tr( "Un-&Love" ) );
-        m_loveAction->setIcon( QIcon( RESPATH "images/not-loved.png" ) );
-    }
-    else
-    {
-        m_loveAction->setText( tr( "&Love" ) );
-        m_loveAction->setIcon( QIcon( RESPATH "images/loved.png" ) );
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/contextmenu.h Deleted

@@ -1,87 +0,0 @@
-/* === 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
- *   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 CONTEXTMENU_H
-#define CONTEXTMENU_H
-
-#include <QtCore/QSignalMapper>
-#include <QtGui/QMenu>
-
-#include "typedefs.h"
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT ContextMenu : public QMenu
-{
-Q_OBJECT
-
-public:
-    enum MenuActions
-    {
-       ActionPlay =         1,
-       ActionQueue =        2,
-       ActionDelete =       4,
-       ActionCopyLink =     8,
-       ActionLove =         16
-    };
-
-    explicit ContextMenu( QWidget* parent = 0 );
-    virtual ~ContextMenu();
-
-    int supportedActions() const { return m_supportedActions; }
-    void setSupportedActions( int actions ) { m_supportedActions = actions; }
-
-    void setQuery( const Tomahawk::query_ptr& query );
-    void setQueries( const QList<Tomahawk::query_ptr>& queries );
-
-    void setArtist( const Tomahawk::artist_ptr& artist );
-    void setArtists( const QList<Tomahawk::artist_ptr>& artists );
-
-    void setAlbum( const Tomahawk::album_ptr& album );
-    void setAlbums( const QList<Tomahawk::album_ptr>& albums );
-
-    void clear();
-
-    unsigned int itemCount() const;
-
-signals:
-    void triggered( int action );
-
-private slots:
-    void onTriggered( int action );
-    void copyLink();
-    void addToQueue();
-
-    void onSocialActionsLoaded();
-
-private:
-    QSignalMapper* m_sigmap;
-    int m_supportedActions;
-
-    QAction* m_loveAction;
-
-    QList<Tomahawk::query_ptr> m_queries;
-    QList<Tomahawk::artist_ptr> m_artists;
-    QList<Tomahawk::album_ptr> m_albums;
-};
-
-}; // ns
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/database.cpp Deleted

@@ -1,131 +0,0 @@
-/* === 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
- *   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 "database.h"
-
-#include "databasecommand.h"
-#include "databaseimpl.h"
-#include "databaseworker.h"
-#include "utils/logger.h"
-
-#define DEFAULT_WORKER_THREADS 4
-#define MAX_WORKER_THREADS 16
-
-Database* Database::s_instance = 0;
-
-
-Database*
-Database::instance()
-{
-    return s_instance;
-}
-
-
-Database::Database( const QString& dbname, QObject* parent )
-    : QObject( parent )
-    , m_ready( false )
-    , m_impl( new DatabaseImpl( dbname, this ) )
-    , m_workerRW( new DatabaseWorker( m_impl, this, true ) )
-{
-    s_instance = this;
-
-    m_maxConcurrentThreads = qBound( DEFAULT_WORKER_THREADS, QThread::idealThreadCount(), MAX_WORKER_THREADS );
-    qDebug() << Q_FUNC_INFO << "Using" << m_maxConcurrentThreads << "threads";
-
-    connect( m_impl, SIGNAL( indexReady() ), SIGNAL( indexReady() ) );
-    connect( m_impl, SIGNAL( indexReady() ), SIGNAL( ready() ) );
-    connect( m_impl, SIGNAL( indexReady() ), SLOT( setIsReadyTrue() ) );
-
-    m_workerRW->start();
-}
-
-
-Database::~Database()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    qDeleteAll( m_workers );
-    delete m_workerRW;
-    delete m_impl;
-}
-
-
-void
-Database::loadIndex()
-{
-    m_impl->loadIndex();
-}
-
-
-void
-Database::enqueue( const QList< QSharedPointer<DatabaseCommand> >& lc )
-{
-    qDebug() << "Enqueueing" << lc.count() << "commands to rw thread";
-    m_workerRW->enqueue( lc );
-}
-
-
-void
-Database::enqueue( const QSharedPointer<DatabaseCommand>& lc )
-{
-    if ( lc->doesMutates() )
-    {
-        qDebug() << "Enqueueing command to rw thread:" << lc->commandname();
-        m_workerRW->enqueue( lc );
-    }
-    else
-    {
-        // find existing amount of worker threads for commandname
-        // create new thread if < WORKER_THREADS
-        if ( m_workers.count() < m_maxConcurrentThreads )
-        {
-            DatabaseWorker* worker = new DatabaseWorker( m_impl, this, false );
-            worker->start();
-
-            m_workers << worker;
-        }
-
-        // find thread for commandname with lowest amount of outstanding jobs and enqueue job
-        int busyThreads = 0;
-        DatabaseWorker* happyThread = 0;
-        for ( int i = 0; i < m_workers.count(); i++ )
-        {
-            DatabaseWorker* worker = m_workers.at( i );
-
-            if ( !worker->busy() )
-            {
-                happyThread = worker;
-                break;
-            }
-            busyThreads++;
-
-            if ( !happyThread || worker->outstandingJobs() < happyThread->outstandingJobs() )
-                happyThread = worker;
-        }
-
-//        qDebug() << "Enqueueing command to thread:" << happyThread << busyThreads << lc->commandname();
-        happyThread->enqueue( lc );
-    }
-}
-
-
-QString
-Database::dbid() const
-{
-    return m_impl->dbid();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/database.h Deleted

@@ -1,91 +0,0 @@
-/* === 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
- *   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 DATABASE_H
-#define DATABASE_H
-
-#include <QSharedPointer>
-#include <QVariant>
-
-#include "artist.h"
-#include "album.h"
-#include "databasecommand.h"
-
-#include "dllmacro.h"
-
-class DatabaseImpl;
-class DatabaseWorker;
-
-/*
-    This class is really a firewall/pimpl - the public functions of LibraryImpl
-    are the ones that operate on the database, without any locks.
-
-    HOWEVER, we're using the command pattern to serialize access to the database
-    and provide an async api. You create a DatabaseCommand object, and add it to
-    the queue of work. There is a threadpool responsible for exec'ing all
-    the non-mutating (readonly) commands and one separate thread for mutating ones,
-    so sqlite doesn't write to the Database from multiple threads.
-*/
-class DLLEXPORT Database : public QObject
-{
-Q_OBJECT
-
-public:
-    static Database* instance();
-
-    explicit Database( const QString& dbname, QObject* parent = 0 );
-    ~Database();
-
-    QString dbid() const;
-    bool indexReady() const { return m_indexReady; }
-
-    void loadIndex();
-
-    bool isReady() const { return m_ready; }
-
-signals:
-    void indexReady(); // search index
-    void ready();
-
-    void newJobRO( QSharedPointer<DatabaseCommand> );
-    void newJobRW( QSharedPointer<DatabaseCommand> );
-
-public slots:
-    void enqueue( const QSharedPointer<DatabaseCommand>& lc );
-    void enqueue( const QList< QSharedPointer<DatabaseCommand> >& lc );
-
-private slots:
-    void setIsReadyTrue() { m_ready = true; }
-
-private:
-    DatabaseImpl* impl() const { return m_impl; }
-
-    bool m_ready;
-    DatabaseImpl* m_impl;
-    DatabaseWorker* m_workerRW;
-    QList<DatabaseWorker*> m_workers;
-    bool m_indexReady;
-    int m_maxConcurrentThreads;
-
-    static Database* s_instance;
-
-    friend class Tomahawk::Artist;
-    friend class Tomahawk::Album;
-};
-
-#endif // DATABASE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecollection.cpp Deleted

@@ -1,167 +0,0 @@
-/* === 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
- *   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 "databasecollection.h"
-
-#include "database/database.h"
-#include "databasecommand_alltracks.h"
-#include "databasecommand_addfiles.h"
-#include "databasecommand_deletefiles.h"
-#include "databasecommand_loadallplaylists.h"
-#include "databasecommand_loadallautoplaylists.h"
-#include "databasecommand_loadallstations.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-DatabaseCollection::DatabaseCollection( const source_ptr& src, QObject* parent )
-    : Collection( src, QString( "dbcollection:%1" ).arg( src->userName() ), parent )
-{
-}
-
-
-void
-DatabaseCollection::loadPlaylists()
-{
-    DatabaseCommand_LoadAllPlaylists* cmd = new DatabaseCommand_LoadAllPlaylists( source() );
-
-    connect( cmd,  SIGNAL( done( const QList<Tomahawk::playlist_ptr>& ) ),
-                     SLOT( setPlaylists( const QList<Tomahawk::playlist_ptr>& ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-DatabaseCollection::loadAutoPlaylists()
-{
-    DatabaseCommand_LoadAllAutoPlaylists* cmd = new DatabaseCommand_LoadAllAutoPlaylists( source() );
-
-    connect( cmd, SIGNAL( autoPlaylistLoaded( Tomahawk::source_ptr, QVariantList ) ),
-                    SLOT( autoPlaylistCreated( const Tomahawk::source_ptr&, const QVariantList& ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-DatabaseCollection::loadStations()
-{
-    DatabaseCommand_LoadAllStations* cmd = new DatabaseCommand_LoadAllStations( source() );
-
-    connect( cmd, SIGNAL( stationLoaded( Tomahawk::source_ptr, QVariantList ) ),
-             SLOT( stationCreated( const Tomahawk::source_ptr&, const QVariantList& ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-DatabaseCollection::addTracks( const QList<QVariant>& newitems )
-{
-    qDebug() << Q_FUNC_INFO << newitems.length();
-    DatabaseCommand_AddFiles* cmd = new DatabaseCommand_AddFiles( newitems, source() );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-DatabaseCollection::removeTracks( const QDir& dir )
-{
-    qDebug() << Q_FUNC_INFO << dir;
-    DatabaseCommand_DeleteFiles* cmd = new DatabaseCommand_DeleteFiles( dir, source() );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-QList< Tomahawk::playlist_ptr >
-DatabaseCollection::playlists()
-{
-    if ( Collection::playlists().isEmpty() )
-    {
-        loadPlaylists();
-    }
-
-    return Collection::playlists();
-}
-
-
-QList< dynplaylist_ptr >
-DatabaseCollection::autoPlaylists()
-{
-    if ( Collection::autoPlaylists().isEmpty() )
-    {
-        loadAutoPlaylists();
-    }
-
-    return Collection::autoPlaylists();
-}
-
-
-QList< dynplaylist_ptr >
-DatabaseCollection::stations()
-{
-    if ( Collection::stations().isEmpty() )
-    {
-        loadStations();
-    }
-
-    return Collection::stations();
-}
-
-
-void
-DatabaseCollection::autoPlaylistCreated( const source_ptr& source, const QVariantList& data )
-{
-    dynplaylist_ptr p( new DynamicPlaylist( source,                  //src
-                                            data0.toString(),  //current rev
-                                            data1.toString(),  //title
-                                            data2.toString(),  //info
-                                            data3.toString(),  //creator
-                                            data4.toUInt(),  // createdOn
-                                            data5.toString(),  // dynamic type
-                                            static_cast<GeneratorMode>(data6.toInt()),  // dynamic mode
-                                            data7.toBool(),    //shared
-                                            data8.toInt(),     //lastmod
-                                            data9.toString() ), &QObject::deleteLater );  //GUID
-    addAutoPlaylist( p );
-}
-
-
-void
-DatabaseCollection::stationCreated( const source_ptr& source, const QVariantList& data )
-{
-    dynplaylist_ptr p( new DynamicPlaylist( source,                  //src
-                                            data0.toString(),  //current rev
-                                            data1.toString(),  //title
-                                            data2.toString(),  //info
-                                            data3.toString(),  //creator
-                                            data4.toUInt(),  // createdOn
-                                            data5.toString(),  // dynamic type
-                                            static_cast<GeneratorMode>(data6.toInt()),  // dynamic mode
-                                            data7.toBool(),    //shared
-                                            data8.toInt(),     //lastmod
-                                            data9.toString() ), &QObject::deleteLater );  //GUID
-    addStation( p );
-}
-
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecollection.h Deleted

@@ -1,58 +0,0 @@
-/* === 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
- *   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 DATABASECOLLECTION_H
-#define DATABASECOLLECTION_H
-
-#include <QDir>
-
-#include "collection.h"
-#include "source.h"
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCollection : public Tomahawk::Collection
-{
-Q_OBJECT
-
-public:
-    explicit DatabaseCollection( const Tomahawk::source_ptr& source, QObject* parent = 0 );
-    ~DatabaseCollection()
-    {
-        qDebug() << Q_FUNC_INFO;
-    }
-
-    virtual void loadPlaylists();
-    virtual void loadAutoPlaylists();
-    virtual void loadStations();
-
-    virtual QList< Tomahawk::playlist_ptr > playlists();
-    virtual QList< Tomahawk::dynplaylist_ptr > autoPlaylists();
-    virtual QList< Tomahawk::dynplaylist_ptr > stations();
-
-public slots:
-    virtual void addTracks( const QList<QVariant>& newitems );
-    virtual void removeTracks( const QDir& dir );
-
-private slots:
-    void stationCreated( const Tomahawk::source_ptr& source, const QVariantList& data );
-    void autoPlaylistCreated( const Tomahawk::source_ptr& source, const QVariantList& data );
-};
-
-#endif // DATABASECOLLECTION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand.cpp Deleted

@@ -1,192 +0,0 @@
-/* === 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
- *   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.h"
-
-#include "databasecommand_addfiles.h"
-#include "databasecommand_createplaylist.h"
-#include "databasecommand_deletefiles.h"
-#include "databasecommand_deleteplaylist.h"
-#include "databasecommand_logplayback.h"
-#include "databasecommand_renameplaylist.h"
-#include "databasecommand_setplaylistrevision.h"
-#include "databasecommand_createdynamicplaylist.h"
-#include "databasecommand_deletedynamicplaylist.h"
-#include "databasecommand_setdynamicplaylistrevision.h"
-#include "databasecommand_socialaction.h"
-
-#include "utils/logger.h"
-#include "databasecommand_setcollectionattributes.h"
-#include "databasecommand_settrackattributes.h"
-
-
-DatabaseCommand::DatabaseCommand( QObject* parent )
-    : QObject( parent )
-    , m_state( PENDING )
-{
-    //qDebug() << Q_FUNC_INFO;
-}
-
-
-DatabaseCommand::DatabaseCommand( const source_ptr& src, QObject* parent )
-    : QObject( parent )
-    , m_state( PENDING )
-    , m_source( src )
-{
-    //qDebug() << Q_FUNC_INFO;
-}
-
-DatabaseCommand::DatabaseCommand( const DatabaseCommand& other )
-    : QObject( other.parent() )
-{
-}
-
-DatabaseCommand::~DatabaseCommand()
-{
-//    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-DatabaseCommand::_exec( DatabaseImpl* lib )
-{
-    //qDebug() << "RUNNING" << thread();
-    m_state = RUNNING;
-    emit running();
-    exec( lib );
-    m_state = FINISHED;
-    //qDebug() << "FINISHED" << thread();
-}
-
-
-void
-DatabaseCommand::setSource( const Tomahawk::source_ptr& s )
-{
-    m_source = s;
-}
-
-
-const Tomahawk::source_ptr&
-DatabaseCommand::source() const
-{
-    return m_source;
-}
-
-
-DatabaseCommand*
-DatabaseCommand::factory( const QVariant& op, const source_ptr& source )
-{
-    const QString name = op.toMap().value( "command" ).toString();
-
-    if( name == "addfiles" )
-    {
-        DatabaseCommand_AddFiles * cmd = new DatabaseCommand_AddFiles;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "deletefiles" )
-    {
-        DatabaseCommand_DeleteFiles * cmd = new DatabaseCommand_DeleteFiles;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "createplaylist" )
-    {
-        DatabaseCommand_CreatePlaylist * cmd = new DatabaseCommand_CreatePlaylist;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "deleteplaylist" )
-    {
-        DatabaseCommand_DeletePlaylist * cmd = new DatabaseCommand_DeletePlaylist;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "logplayback" )
-    {
-        DatabaseCommand_LogPlayback * cmd = new DatabaseCommand_LogPlayback;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "renameplaylist" )
-    {
-        DatabaseCommand_RenamePlaylist * cmd = new DatabaseCommand_RenamePlaylist;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "setplaylistrevision" )
-    {
-        DatabaseCommand_SetPlaylistRevision * cmd = new DatabaseCommand_SetPlaylistRevision;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "createdynamicplaylist" )
-    {
-        DatabaseCommand_CreateDynamicPlaylist * cmd = new DatabaseCommand_CreateDynamicPlaylist;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "deletedynamicplaylist" )
-    {
-        DatabaseCommand_DeleteDynamicPlaylist * cmd = new DatabaseCommand_DeleteDynamicPlaylist;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "setdynamicplaylistrevision" )
-    {
-        qDebug() << "SETDYN CONTENT:" << op;
-        DatabaseCommand_SetDynamicPlaylistRevision * cmd = new DatabaseCommand_SetDynamicPlaylistRevision;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "socialaction" )
-    {
-        DatabaseCommand_SocialAction * cmd = new DatabaseCommand_SocialAction;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "setcollectionattributes" )
-    {
-        DatabaseCommand_SetCollectionAttributes * cmd = new DatabaseCommand_SetCollectionAttributes;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-    else if( name == "settrackattributes" )
-    {
-        DatabaseCommand_SetTrackAttributes * cmd = new DatabaseCommand_SetTrackAttributes;
-        cmd->setSource( source );
-        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
-        return cmd;
-    }
-
-    qDebug() << "Unknown database command" << name;
-//    Q_ASSERT( false );
-    return NULL;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand.h Deleted

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_addclientauth.cpp Deleted

@@ -1,55 +0,0 @@
-/* === 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
- *   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_addclientauth.h"
-
-#include "databaseimpl.h"
-#include "tomahawksqlquery.h"
-#include "utils/logger.h"
-
-
-DatabaseCommand_AddClientAuth::DatabaseCommand_AddClientAuth( const QString& clientToken,
-                                                              const QString& website,
-                                                              const QString& name,
-                                                              const QString& userAgent,
-                                                              QObject* parent )
-    : DatabaseCommand( parent )
-    , m_clientToken( clientToken )
-    , m_website( website )
-    , m_name( name )
-    , m_userAgent( userAgent )
-{
-}
-
-
-void DatabaseCommand_AddClientAuth::exec( DatabaseImpl* lib )
-{
-    TomahawkSqlQuery q = lib->newquery();
-    q.prepare( "INSERT INTO http_client_auth (token, website, name, ua, mtime, permissions) VALUES (?, ?, ?, ?, ?, ?)" );
-    q.addBindValue( m_clientToken );
-    q.addBindValue( m_website );
-    q.addBindValue( m_name );
-    q.addBindValue( m_userAgent );
-    q.addBindValue( 0 );
-    q.addBindValue( "*" );
-
-    if ( !q.exec() )
-    {
-        qWarning() << "Failed to insert http client into auth table!";
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_addclientauth.h Deleted

@@ -1,48 +0,0 @@
-/* === 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
- *   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_ADDCLIENTAUTH_H
-#define DATABASECOMMAND_ADDCLIENTAUTH_H
-
-#include "databasecommand.h"
-#include "dllmacro.h"
-
-#include <QObject>
-
-class DatabaseImpl;
-
-class DLLEXPORT DatabaseCommand_AddClientAuth : public DatabaseCommand
-{
-    Q_OBJECT
-public:
-    explicit DatabaseCommand_AddClientAuth( QObject* parent = 0 )
-            : DatabaseCommand( parent )
-    {}
-
-    explicit DatabaseCommand_AddClientAuth( const QString& clientToken, const QString& website, const QString& name, const QString& userAgent, QObject* parent = 0 );
-
-    QString commandname() const { return "addclientauth"; }
-
-    virtual void exec( DatabaseImpl* lib );
-    virtual bool doesMutates() const { return true; }
-
-private:
-    QString m_clientToken, m_website, m_name, m_userAgent;
-};
-
-#endif // DATABASECOMMAND_ADDCLIENTAUTH_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_addfiles.cpp Deleted

@@ -1,172 +0,0 @@
-/* === 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
- *   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_addfiles.h"
-
-#include <QSqlQuery>
-
-#include "artist.h"
-#include "album.h"
-#include "collection.h"
-#include "database/database.h"
-#include "databaseimpl.h"
-#include "network/dbsyncconnection.h"
-#include "network/servent.h"
-#include "sourcelist.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-// remove file paths when making oplog/for network transmission
-QVariantList
-DatabaseCommand_AddFiles::files() const
-{
-    QVariantList list;
-    foreach ( const QVariant& v, m_files )
-    {
-        // replace url with the id, we don't leak file paths over the network.
-        QVariantMap m = v.toMap();
-        m.remove( "url" );
-        m.insert( "url", QString::number( m.value( "id" ).toInt() ) );
-        list.append( m );
-    }
-    return list;
-}
-
-
-// After changing a collection, we need to tell other bits of the system:
-void
-DatabaseCommand_AddFiles::postCommitHook()
-{
-    // make the collection object emit its tracksAdded signal, so the
-    // collection browser will update/fade in etc.
-    Collection* coll = source()->collection().data();
-
-    connect( this, SIGNAL( notify( QList<unsigned int> ) ),
-             coll,   SLOT( setTracks( QList<unsigned int> ) ), Qt::QueuedConnection );
-
-    emit notify( m_ids );
-
-    if ( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
-}
-
-
-void
-DatabaseCommand_AddFiles::exec( DatabaseImpl* dbi )
-{
-    qDebug() << Q_FUNC_INFO;
-    Q_ASSERT( !source().isNull() );
-
-    TomahawkSqlQuery query_file = dbi->newquery();
-    TomahawkSqlQuery query_filejoin = dbi->newquery();
-    TomahawkSqlQuery query_trackattr = dbi->newquery();
-
-    query_file.prepare( "INSERT INTO file(source, url, size, mtime, md5, mimetype, duration, bitrate) VALUES (?, ?, ?, ?, ?, ?, ?, ?)" );
-    query_filejoin.prepare( "INSERT INTO file_join(file, artist, album, track, albumpos, composer, discnumber) VALUES (?, ?, ?, ?, ?, ?, ?)" );
-    query_trackattr.prepare( "INSERT INTO track_attributes(id, k, v) VALUES (?, ?, ?)" );
-
-    int added = 0;
-    QVariant srcid = source()->isLocal() ? QVariant( QVariant::Int ) : source()->id();
-    qDebug() << "Adding" << m_files.length() << "files to db for source" << srcid;
-
-    QList<QVariant>::iterator it;
-    for ( it = m_files.begin(); it != m_files.end(); ++it )
-    {
-        QVariant& v = *it;
-        QVariantMap m = v.toMap();
-
-        int fileid = 0, artistid = 0, albumid = 0, trackid = 0, composerid = 0;
-
-        QString url      = m.value( "url" ).toString();
-        int mtime        = m.value( "mtime" ).toInt();
-        uint size        = m.value( "size" ).toUInt();
-        QString hash     = m.value( "hash" ).toString();
-        QString mimetype = m.value( "mimetype" ).toString();
-        uint duration    = m.value( "duration" ).toUInt();
-        uint bitrate     = m.value( "bitrate" ).toUInt();
-        QString artist   = m.value( "artist" ).toString();
-        QString album    = m.value( "album" ).toString();
-        QString track    = m.value( "track" ).toString();
-        uint albumpos    = m.value( "albumpos" ).toUInt();
-        QString composer = m.value( "composer" ).toString();
-        uint discnumber  = m.value( "discnumber" ).toUInt();
-        int year         = m.value( "year" ).toInt();
-
-        query_file.bindValue( 0, srcid );
-        query_file.bindValue( 1, url );
-        query_file.bindValue( 2, size );
-        query_file.bindValue( 3, mtime );
-        query_file.bindValue( 4, hash );
-        query_file.bindValue( 5, mimetype );
-        query_file.bindValue( 6, duration );
-        query_file.bindValue( 7, bitrate );
-        query_file.exec();
-
-        if ( added % 1000 == 0 )
-            qDebug() << "Inserted" << added;
-
-        // get internal IDs for art/alb/trk
-        fileid = query_file.lastInsertId().toInt();
-        m.insert( "id", fileid );
-        // this is the qvariant(map) the remote will get
-        v = m;
-
-        artistid = dbi->artistId( artist, true );
-        if ( artistid < 1 )
-            continue;
-        trackid = dbi->trackId( artistid, track, true );
-        if ( trackid < 1 )
-            continue;
-        albumid = dbi->albumId( artistid, album, true );
-
-        if( !composer.trimmed().isEmpty() )
-            composerid = dbi->artistId( composer, true );
-
-        // Now add the association
-        query_filejoin.bindValue( 0, fileid );
-        query_filejoin.bindValue( 1, artistid );
-        query_filejoin.bindValue( 2, albumid > 0 ? albumid : QVariant( QVariant::Int ) );
-        query_filejoin.bindValue( 3, trackid );
-        query_filejoin.bindValue( 4, albumpos );
-        query_filejoin.bindValue( 5, composerid > 0 ? composerid : QVariant( QVariant::Int ) );
-        query_filejoin.bindValue( 6, discnumber );
-        if ( !query_filejoin.exec() )
-        {
-            qDebug() << "Error inserting into file_join table";
-            continue;
-        }
-
-        query_trackattr.bindValue( 0, trackid );
-        query_trackattr.bindValue( 1, "releaseyear" );
-        query_trackattr.bindValue( 2, year );
-        query_trackattr.exec();
-
-        m_ids << fileid;
-        added++;
-    }
-    qDebug() << "Inserted" << added << "tracks to database";
-
-    if ( added )
-        source()->updateIndexWhenSynced();
-
-    tDebug() << "Committing" << added << "tracks...";
-    emit done( m_files, source()->collection() );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_addfiles.h Deleted

@@ -1,65 +0,0 @@
-/* === 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
- *   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_ADDFILES_H
-#define DATABASECOMMAND_ADDFILES_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "database/databasecommandloggable.h"
-#include "typedefs.h"
-#include "query.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_AddFiles : public DatabaseCommandLoggable
-{
-Q_OBJECT
-Q_PROPERTY( QVariantList files READ files WRITE setFiles )
-
-public:
-    explicit DatabaseCommand_AddFiles( QObject* parent = 0 )
-        : DatabaseCommandLoggable( parent )
-    {}
-
-    explicit DatabaseCommand_AddFiles( const QList<QVariant>& files, const Tomahawk::source_ptr& source, QObject* parent = 0 )
-        : DatabaseCommandLoggable( parent ), m_files( files )
-    {
-        setSource( source );
-    }
-
-    virtual QString commandname() const { return "addfiles"; }
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return true; }
-    virtual void postCommitHook();
-
-    QVariantList files() const;
-    void setFiles( const QVariantList& f ) { m_files = f; }
-
-signals:
-    void done( const QList<QVariant>&, const Tomahawk::collection_ptr& );
-    void notify( const QList<unsigned int>& ids );
-
-private:
-    QVariantList m_files;
-    QList<unsigned int> m_ids;
-};
-
-#endif // DATABASECOMMAND_ADDFILES_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_addsource.cpp Deleted

@@ -1,66 +0,0 @@
-/* === 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
- *   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_addsource.h"
-
-#include <QSqlQuery>
-
-#include "databaseimpl.h"
-#include "utils/logger.h"
-
-
-DatabaseCommand_addSource::DatabaseCommand_addSource( const QString& username, const QString& fname, QObject* parent )
-    : DatabaseCommand( parent )
-    , m_username( username )
-    , m_fname( fname )
-{
-}
-
-
-void
-DatabaseCommand_addSource::exec( DatabaseImpl* dbi )
-{
-    Q_ASSERT( !m_fname.isEmpty() );
-
-    TomahawkSqlQuery query = dbi->newquery();
-    query.prepare( "SELECT id FROM source WHERE name = ?" );
-    query.addBindValue( m_username );
-    query.exec();
-
-    if ( query.next() )
-    {
-        unsigned int id = query.value( 0 ).toInt();
-        query.prepare( "UPDATE source SET isonline = 'true', friendlyname = ? WHERE id = ?" );
-        query.addBindValue( m_fname );
-        query.addBindValue( id );
-        query.exec();
-        emit done( id, m_fname );
-        return;
-    }
-
-    query.prepare( "INSERT INTO source(name, friendlyname, isonline) VALUES(?,?,?)" );
-    query.addBindValue( m_username );
-    query.addBindValue( m_fname );
-    query.addBindValue( true );
-    query.exec();
-
-    unsigned int id = query.lastInsertId().toUInt();
-    tDebug() << "Inserted new source to DB, id:" << id << "friendlyname" << m_username;
-
-    emit done( id, m_fname );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_addsource.h Deleted

@@ -1,46 +0,0 @@
-/* === 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
- *   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_ADDSOURCE_H
-#define DATABASECOMMAND_ADDSOURCE_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "databasecommand.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_addSource : public DatabaseCommand
-{
-Q_OBJECT
-
-public:
-    explicit DatabaseCommand_addSource( const QString& username, const QString& fname, QObject* parent = 0 );
-    virtual void exec( DatabaseImpl* lib );
-    virtual bool doesMutates() const { return true; }
-    virtual QString commandname() const { return "addsource"; }
-
-signals:
-    void done( unsigned int, const QString& );
-
-private:
-    QString m_username, m_fname;
-};
-
-#endif // DATABASECOMMAND_ADDSOURCE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_allalbums.cpp Deleted

@@ -1,180 +0,0 @@
-/* === 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
- *   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_allalbums.h"
-
-#include <QSqlQuery>
-
-#include "artist.h"
-#include "databaseimpl.h"
-#include "source.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-
-DatabaseCommand_AllAlbums::DatabaseCommand_AllAlbums( const Tomahawk::collection_ptr &collection, const Tomahawk::artist_ptr &artist, QObject *parent )
-  : DatabaseCommand( parent )
-  , m_collection( collection )
-  , m_artist( artist )
-  , m_amount( 0 )
-  , m_sortOrder( DatabaseCommand_AllAlbums::None )
-  , m_sortDescending( false )
-{}
-
-
-DatabaseCommand_AllAlbums::~DatabaseCommand_AllAlbums()
-{}
-
-
-void
-DatabaseCommand_AllAlbums::setArtist( const Tomahawk::artist_ptr &artist )
-{
-    m_artist = artist;
-}
-
-
-void
-DatabaseCommand_AllAlbums::execForArtist( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    QList<Tomahawk::album_ptr> al;
-    QString orderToken, sourceToken, filterToken, tables;
-
-    switch ( m_sortOrder )
-    {
-        case 0:
-            break;
-
-        case ModificationTime:
-            orderToken = "file.mtime";
-    }
-
-    if ( !m_collection.isNull() )
-        sourceToken = QString( "AND file.source %1 " ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) );
-
-    if ( !m_filter.isEmpty() )
-    {
-        QString filtersql;
-        QStringList sl = m_filter.split( " ", QString::SkipEmptyParts );
-        foreach( QString s, sl )
-        {
-            filtersql += QString( " AND ( artist.name LIKE '%%1%' OR album.name LIKE '%%1%' OR track.name LIKE '%%1%' )" ).arg( TomahawkUtils::sqlEscape( s ) );
-        }
-
-        filterToken = QString( "AND artist.id = file_join.artist AND file_join.track = track.id %1" ).arg( filtersql );
-        tables = "artist, track, file, file_join";
-    }
-    else
-        tables = "file, file_join";
-
-    QString sql = QString(
-        "SELECT DISTINCT album.id, album.name "
-        "FROM %1 "
-        "LEFT OUTER JOIN album ON file_join.album = album.id "
-        "WHERE file.id = file_join.file "
-        "AND file_join.artist = %2 "
-        "%3 %4 %5 %6 %7"
-        ).arg( tables )
-         .arg( m_artist->id() )
-         .arg( sourceToken )
-         .arg( filterToken )
-         .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
-         .arg( m_sortDescending ? "DESC" : QString() )
-         .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );
-
-    query.prepare( sql );
-    query.exec();
-
-    while( query.next() )
-    {
-        unsigned int albumId = query.value( 0 ).toUInt();
-        QString albumName = query.value( 1 ).toString();
-        if ( query.value( 0 ).isNull() )
-        {
-            albumName = tr( "Unknown" );
-        }
-
-        Tomahawk::album_ptr album = Tomahawk::Album::get( albumId, albumName, m_artist );
-        al << album;
-    }
-
-    emit albums( al, data() );
-    emit done();
-}
-
-
-void
-DatabaseCommand_AllAlbums::execForCollection( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    QList<Tomahawk::album_ptr> al;
-    QString orderToken, sourceToken;
-
-    switch ( m_sortOrder )
-    {
-        case 0:
-            break;
-
-        case ModificationTime:
-            orderToken = "file.mtime";
-    }
-
-    if ( !m_collection.isNull() )
-        sourceToken = QString( "AND file.source %1 " ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) );
-
-    QString sql = QString(
-        "SELECT DISTINCT album.id, album.name, album.artist, artist.name "
-        "FROM album, file, file_join "
-        "LEFT OUTER JOIN artist ON album.artist = artist.id "
-        "WHERE file.id = file_join.file "
-        "AND file_join.album = album.id "
-        "%1 "
-        "%2 %3 %4"
-        ).arg( sourceToken )
-         .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
-         .arg( m_sortDescending ? "DESC" : QString() )
-         .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );
-
-    query.prepare( sql );
-    query.exec();
-
-    while( query.next() )
-    {
-        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( query.value( 2 ).toUInt(), query.value( 3 ).toString() );
-        Tomahawk::album_ptr album = Tomahawk::Album::get( query.value( 0 ).toUInt(), query.value( 1 ).toString(), artist );
-
-        al << album;
-    }
-
-    emit albums( al, data() );
-    emit done();
-}
-
-
-void
-DatabaseCommand_AllAlbums::exec( DatabaseImpl* dbi )
-{
-    if ( !m_artist.isNull() )
-    {
-        execForArtist( dbi );
-    }
-    else
-    {
-        execForCollection( dbi );
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_allalbums.h Deleted

@@ -1,73 +0,0 @@
-/* === 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
- *   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_ALLALBUMS_H
-#define DATABASECOMMAND_ALLALBUMS_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "album.h"
-#include "artist.h"
-#include "collection.h"
-#include "typedefs.h"
-#include "databasecommand.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_AllAlbums : public DatabaseCommand
-{
-Q_OBJECT
-public:
-    enum SortOrder {
-        None = 0,
-        ModificationTime = 1
-    };
-
-    explicit DatabaseCommand_AllAlbums( const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr(), const Tomahawk::artist_ptr& artist = Tomahawk::artist_ptr(), QObject* parent = 0 );
-    virtual ~DatabaseCommand_AllAlbums();
-
-    virtual void exec( DatabaseImpl* );
-
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "allalbums"; }
-
-    void execForCollection( DatabaseImpl* );
-    void execForArtist( DatabaseImpl* );
-
-    void setArtist( const Tomahawk::artist_ptr& 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; }
-    void setFilter( const QString& filter ) { m_filter = filter; }
-
-signals:
-    void albums( const QList<Tomahawk::album_ptr>&, const QVariant& data );
-    void done();
-
-private:
-    Tomahawk::collection_ptr m_collection;
-    Tomahawk::artist_ptr m_artist;
-
-    unsigned int m_amount;
-    DatabaseCommand_AllAlbums::SortOrder m_sortOrder;
-    bool m_sortDescending;
-    QString m_filter;
-};
-
-#endif // DATABASECOMMAND_ALLALBUMS_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_allartists.cpp Deleted

@@ -1,103 +0,0 @@
-/* === 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
- *   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_allartists.h"
-
-#include <QSqlQuery>
-
-#include "artist.h"
-#include "databaseimpl.h"
-#include "source.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-DatabaseCommand_AllArtists::DatabaseCommand_AllArtists( const Tomahawk::collection_ptr &collection, QObject *parent )
-    : DatabaseCommand( parent )
-    , m_collection( collection )
-    , m_amount( 0 )
-    , m_sortOrder( DatabaseCommand_AllArtists::None )
-    , m_sortDescending( false )
-{}
-
-DatabaseCommand_AllArtists::~DatabaseCommand_AllArtists()
-{
-}
-
-void
-DatabaseCommand_AllArtists::exec( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    QList<Tomahawk::artist_ptr> al;
-    QString orderToken, sourceToken, filterToken, tables, joins;
-
-    switch ( m_sortOrder )
-    {
-        case 0:
-            break;
-
-        case ModificationTime:
-            orderToken = "file.mtime";
-    }
-
-    if ( !m_collection.isNull() )
-        sourceToken = QString( "AND file.source %1" ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) );
-
-    if ( !m_filter.isEmpty() )
-    {
-        QString filtersql;
-        QStringList sl = m_filter.split( " ", QString::SkipEmptyParts );
-        foreach( QString s, sl )
-        {
-            filtersql += QString( " AND ( artist.name LIKE '%%1%' OR album.name LIKE '%%1%' OR track.name LIKE '%%1%' )" ).arg( TomahawkUtils::sqlEscape( s ) );
-        }
-
-        filterToken = QString( "AND file_join.track = track.id %1" ).arg( filtersql );
-        joins = "LEFT JOIN album ON album.id = file_join.album";
-        tables = "artist, track, file, file_join";
-    }
-    else
-        tables = "artist, file, file_join";
-
-    QString sql = QString(
-            "SELECT DISTINCT artist.id, artist.name "
-            "FROM %1 "
-            "%2 "
-            "WHERE file.id = file_join.file "
-            "AND file_join.artist = artist.id "
-            "%3 %4 %5 %6 %7"
-            ).arg( tables )
-             .arg( joins )
-             .arg( sourceToken )
-             .arg( filterToken )
-             .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
-             .arg( m_sortDescending ? "DESC" : QString() )
-             .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );
-
-    query.prepare( sql );
-    query.exec();
-
-    while( query.next() )
-    {
-        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( query.value( 0 ).toUInt(), query.value( 1 ).toString() );
-
-        al << artist;
-    }
-
-    emit artists( al );
-    emit done();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_allartists.h Deleted

@@ -1,66 +0,0 @@
-/* === 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
- *   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_ALLARTISTS_H
-#define DATABASECOMMAND_ALLARTISTS_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "artist.h"
-#include "collection.h"
-#include "typedefs.h"
-#include "databasecommand.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_AllArtists : public DatabaseCommand
-{
-Q_OBJECT
-public:
-    enum SortOrder {
-        None = 0,
-        ModificationTime = 1
-    };
-
-    explicit DatabaseCommand_AllArtists( const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr(), QObject* parent = 0 );
-    virtual ~DatabaseCommand_AllArtists();
-
-    virtual void exec( DatabaseImpl* );
-
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "allartists"; }
-
-    void setLimit( unsigned int amount ) { m_amount = amount; }
-    void setSortOrder( DatabaseCommand_AllArtists::SortOrder order ) { m_sortOrder = order; }
-    void setSortDescending( bool descending ) { m_sortDescending = descending; }
-    void setFilter( const QString& filter ) { m_filter = filter; }
-
-signals:
-    void artists( const QList<Tomahawk::artist_ptr>& );
-    void done();
-
-private:
-    Tomahawk::collection_ptr m_collection;
-    unsigned int m_amount;
-    DatabaseCommand_AllArtists::SortOrder m_sortOrder;
-    bool m_sortDescending;
-    QString m_filter;
-};
-
-#endif // DATABASECOMMAND_ALLARTISTS_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_alltracks.cpp Deleted

@@ -1,169 +0,0 @@
-/* === 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
- *   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_alltracks.h"
-
-#include <QSqlQuery>
-
-#include "databaseimpl.h"
-#include "artist.h"
-#include "album.h"
-#include "sourcelist.h"
-#include "utils/logger.h"
-
-
-void
-DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    QList<Tomahawk::query_ptr> ql;
-
-    QString m_orderToken, sourceToken;
-    switch ( m_sortOrder )
-    {
-        case 0:
-            break;
-
-        case Album:
-            m_orderToken = "album.name, file_join.discnumber, file_join.albumpos";
-            break;
-
-        case ModificationTime:
-            m_orderToken = "file.mtime";
-            break;
-
-        case AlbumPosition:
-            m_orderToken = "file_join.discnumber, file_join.albumpos";
-            break;
-    }
-
-    if ( !m_collection.isNull() )
-        sourceToken = QString( "AND file.source %1" ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) );
-
-    QString albumToken;
-    if ( m_album )
-    {
-        if ( m_album->id() == 0 )
-        {
-            m_artist = m_album->artist();
-            albumToken = QString( "AND album.id IS NULL" );
-        }
-        else
-            albumToken = QString( "AND album.id = %1" ).arg( m_album->id() );
-    }
-
-    QString sql = QString(
-            "SELECT file.id, artist.name, album.name, track.name, composer.name, file.size, "   //0
-                   "file.duration, file.bitrate, file.url, file.source, file.mtime, "           //6
-                   "file.mimetype, file_join.discnumber, file_join.albumpos, artist.id, "       //11
-                   "album.id, track.id, composer.id "                                           //15
-            "FROM file, artist, track, file_join "
-            "LEFT OUTER JOIN album "
-            "ON file_join.album = album.id "
-            "LEFT OUTER JOIN artist AS composer "
-            "ON file_join.composer = composer.id "
-            "WHERE file.id = file_join.file "
-            "AND file_join.artist = artist.id "
-            "AND file_join.track = track.id "
-            "%1 "
-            "%2 %3 "
-            "%4 %5 %6"
-            ).arg( sourceToken )
-             .arg( !m_artist ? QString() : QString( "AND artist.id = %1" ).arg( m_artist->id() ) )
-             .arg( !m_album ? QString() : albumToken )
-             .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( m_orderToken ) : QString() )
-             .arg( m_sortDescending ? "DESC" : QString() )
-             .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );
-
-    query.prepare( sql );
-    query.exec();
-
-    while( query.next() )
-    {
-        Tomahawk::source_ptr s;
-        QString url = query.value( 8 ).toString();
-
-        if ( query.value( 9 ).toUInt() == 0 )
-        {
-            s = SourceList::instance()->getLocal();
-        }
-        else
-        {
-            s = SourceList::instance()->get( query.value( 9 ).toUInt() );
-            if ( s.isNull() )
-            {
-                Q_ASSERT( false );
-                continue;
-            }
-
-            url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
-        }
-
-        QString artist, track, album, composer;
-        artist = query.value( 1 ).toString();
-        album = query.value( 2 ).toString();
-        track = query.value( 3 ).toString();
-        composer = query.value( 4 ).toString();
-
-        Tomahawk::result_ptr result = Tomahawk::Result::get( url );
-        Tomahawk::query_ptr qry = Tomahawk::Query::get( artist, track, album );
-        Tomahawk::artist_ptr artistptr = Tomahawk::Artist::get( query.value( 14 ).toUInt(), artist );
-        Tomahawk::artist_ptr composerptr = Tomahawk::Artist::get( query.value( 17 ).toUInt(), composer );
-        Tomahawk::album_ptr albumptr = Tomahawk::Album::get( query.value( 15 ).toUInt(), album, artistptr );
-
-        result->setTrackId( query.value( 16 ).toUInt() );
-        result->setArtist( artistptr );
-        result->setAlbum( albumptr );
-        result->setTrack( query.value( 3 ).toString() );
-        result->setComposer( composerptr );
-        result->setSize( query.value( 5 ).toUInt() );
-        result->setDuration( query.value( 6 ).toUInt() );
-        result->setBitrate( query.value( 7 ).toUInt() );
-        result->setModificationTime( query.value( 10 ).toUInt() );
-        result->setMimetype( query.value( 11 ).toString() );
-        result->setDiscNumber( query.value( 12 ).toUInt() );
-        result->setAlbumPos( query.value( 13 ).toUInt() );
-        result->setScore( 1.0 );
-        result->setCollection( s->collection() );
-
-        TomahawkSqlQuery attrQuery = dbi->newquery();
-        QVariantMap attr;
-
-        attrQuery.prepare( "SELECT k, v FROM track_attributes WHERE id = ?" );
-        attrQuery.bindValue( 0, result->trackId() );
-        attrQuery.exec();
-        while ( attrQuery.next() )
-        {
-            attr attrQuery.value( 0 ).toString()  = attrQuery.value( 1 ).toString();
-        }
-
-        result->setAttributes( attr );
-
-        QList<Tomahawk::result_ptr> results;
-        results << result;
-        qry->addResults( results );
-        qry->setResolveFinished( true );
-
-        ql << qry;
-    }
-
-    qDebug() << Q_FUNC_INFO << ql.length();
-
-    emit tracks( ql, data() );
-    emit done( m_collection );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_alltracks.h Deleted

@@ -1,82 +0,0 @@
-/* === 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
- *   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_ALLTRACKS_H
-#define DATABASECOMMAND_ALLTRACKS_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "databasecommand.h"
-#include "collection.h"
-#include "typedefs.h"
-#include "query.h"
-#include "artist.h"
-#include "album.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_AllTracks : public DatabaseCommand
-{
-Q_OBJECT
-public:
-    enum SortOrder {
-        None = 0,
-        Album = 1,
-        ModificationTime = 2,
-        AlbumPosition = 3
-    };
-
-    explicit DatabaseCommand_AllTracks( const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr(), QObject* parent = 0 )
-        : DatabaseCommand( parent )
-        , m_collection( collection )
-        , m_artist( 0 )
-        , m_album( 0 )
-        , m_amount( 0 )
-        , m_sortOrder( DatabaseCommand_AllTracks::None )
-        , m_sortDescending( false )
-    {}
-
-    virtual void exec( DatabaseImpl* );
-
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "alltracks"; }
-
-    void setArtist( const Tomahawk::artist_ptr& artist ) { m_artist = artist; }
-    void setAlbum( const Tomahawk::album_ptr& album ) { m_album = album; }
-
-    void setLimit( unsigned int amount ) { m_amount = amount; }
-    void setSortOrder( DatabaseCommand_AllTracks::SortOrder order ) { m_sortOrder = order; }
-    void setSortDescending( bool descending ) { m_sortDescending = descending; }
-
-signals:
-    void tracks( const QList<Tomahawk::query_ptr>&, const QVariant& data );
-    void done( const Tomahawk::collection_ptr& );
-
-private:
-    Tomahawk::collection_ptr m_collection;
-
-    Tomahawk::artist_ptr m_artist;
-    Tomahawk::album_ptr m_album;
-
-    unsigned int m_amount;
-    DatabaseCommand_AllTracks::SortOrder m_sortOrder;
-    bool m_sortDescending;
-};
-
-#endif // DATABASECOMMAND_ALLTRACKS_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_clientauthvalid.cpp Deleted

@@ -1,55 +0,0 @@
-/* === 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
- *   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_clientauthvalid.h"
-
-#include "databaseimpl.h"
-#include "tomahawksqlquery.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 )
-{
-    TomahawkSqlQuery q = lib->newquery();
-    q.prepare( "SELECT name FROM http_client_auth WHERE token = ?" );
-    q.addBindValue( m_clientToken );
-
-    if ( q.exec() )
-    {
-        if ( q.next() )
-        {
-            QString name = q.value( 0 ).toString();
-            emit authValid( m_clientToken, name, true );
-        }
-        else
-        {
-            emit authValid( m_clientToken, QString(), false );
-        }
-    }
-    else
-    {
-        qWarning() << "Failed to query http auth table for client:" << m_clientToken;
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_clientauthvalid.h Deleted

@@ -1,50 +0,0 @@
-/* === 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
- *   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_CLIENTAUTHVALID_H
-#define DATABASECOMMAND_CLIENTAUTHVALID_H
-
-#include "databasecommand.h"
-#include "dllmacro.h"
-
-#include <QObject>
-
-class DLLEXPORT DatabaseCommand_ClientAuthValid : public DatabaseCommand
-{
-    Q_OBJECT
-public:
-    explicit DatabaseCommand_ClientAuthValid( QObject* parent = 0 )
-            : DatabaseCommand( parent )
-    {}
-
-    explicit DatabaseCommand_ClientAuthValid( const QString& clientToken, QObject* parent = 0 );
-
-    QString commandname() const { return "clientauthvalid"; }
-
-    virtual void exec( DatabaseImpl* lib );
-    virtual bool doesMutates() const { return false; }
-
-signals:
-    // if auth is invalid name is empty
-    void authValid( const QString& clientToken, const QString& name, bool valid );
-
-private:
-    QString m_clientToken;
-};
-
-#endif // DATABASECOMMAND_CLIENTAUTHVALID_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_collectionattributes.cpp Deleted

@@ -1,58 +0,0 @@
-/* === 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_collectionattributes.h"
-
-#include "databaseimpl.h"
-#include "source.h"
-
-DatabaseCommand_CollectionAttributes::DatabaseCommand_CollectionAttributes( DatabaseCommand_SetCollectionAttributes::AttributeType type )
-    : DatabaseCommand()
-    , m_type( type )
-{
-}
-
-void
-DatabaseCommand_CollectionAttributes::exec( DatabaseImpl *lib )
-{
-    TomahawkSqlQuery query = lib->newquery();
-
-//    QString sourceStr;
-//    if ( source().isNull() )
-//        sourceStr = "id IS NULL";
-//    else
-//        sourceStr = QString( "id == %1" ).arg( source()->id() );
-
-    QString typeStr;
-    if ( m_type == DatabaseCommand_SetCollectionAttributes::EchonestSongCatalog )
-        typeStr = "echonest_song";
-    else if ( m_type == DatabaseCommand_SetCollectionAttributes::EchonestArtistCatalog )
-        typeStr = "echonest_artist";
-
-    QString queryStr = QString( "SELECT id, v FROM collection_attributes WHERE k = \"%1\"" ).arg( typeStr );
-    qDebug() << "Doing queryL" << queryStr;
-    query.exec( queryStr );
-    PairList data;
-    while ( query.next() )
-    {
-        QPair< QString, QString  > part;
-        part.first = query.value( 0 ).toString();
-        part.second = query.value( 1 ).toString();
-        data << part;
-    }
-    emit collectionAttributes( data );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_collectionattributes.h Deleted

@@ -1,45 +0,0 @@
-/* === 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_COLLECTIONATTRIBUTES_H
-#define DATABASECOMMAND_COLLECTIONATTRIBUTES_H
-
-#include "typedefs.h"
-#include "databasecommand.h"
-#include "databasecommand_setcollectionattributes.h"
-#include <QByteArray>
-
-class DatabaseCommand_CollectionAttributes : public DatabaseCommand
-{
-    Q_OBJECT
-public:
-
-    DatabaseCommand_CollectionAttributes( DatabaseCommand_SetCollectionAttributes::AttributeType type );
-    virtual void exec( DatabaseImpl* lib );
-    virtual bool doesMutates() const { return false; }
-
-    virtual QString commandname() const { return "collectionattributes"; }
-
-signals:
-    void collectionAttributes( PairList );
-
-private:
-    DatabaseCommand_SetCollectionAttributes::AttributeType m_type;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_collectionstats.cpp Deleted

@@ -1,65 +0,0 @@
-/* === 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
- *   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_collectionstats.h"
-
-#include "databaseimpl.h"
-#include "source.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-DatabaseCommand_CollectionStats::DatabaseCommand_CollectionStats( const source_ptr& source, QObject* parent )
-    : DatabaseCommand( source, parent )
-{
-}
-
-
-void
-DatabaseCommand_CollectionStats::exec( DatabaseImpl* dbi )
-{
-    Q_ASSERT( source()->isLocal() || source()->id() >= 1 );
-    TomahawkSqlQuery query = dbi->newquery();
-
-    QVariantMap m;
-    if ( source()->isLocal() )
-    {
-        query.exec( "SELECT count(*), max(mtime), (SELECT guid FROM oplog WHERE source IS NULL ORDER BY id DESC LIMIT 1) "
-                    "FROM file "
-                    "WHERE source IS NULL" );
-    }
-    else
-    {
-        query.prepare( "SELECT count(*), max(mtime), (SELECT lastop FROM source WHERE id = ?) "
-                       "FROM file "
-                       "WHERE source = ?" );
-        query.addBindValue( source()->id() );
-        query.addBindValue( source()->id() );
-        query.exec();
-    }
-
-    if ( query.next() )
-    {
-        m.insert( "numfiles", query.value( 0 ).toInt() );
-        m.insert( "lastmodified", query.value( 1 ).toInt() );
-        m.insert( "lastop", query.value( 2 ).toString() );
-    }
-
-    emit done( m );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_collectionstats.h Deleted

@@ -1,43 +0,0 @@
-/* === 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
- *   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_COLLECTIONSTATS_H
-#define DATABASECOMMAND_COLLECTIONSTATS_H
-
-#include <QVariantMap>
-
-#include "databasecommand.h"
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_CollectionStats : public DatabaseCommand
-{
-Q_OBJECT
-
-public:
-    explicit DatabaseCommand_CollectionStats( const Tomahawk::source_ptr& source, QObject* parent = 0 );
-    virtual void exec( DatabaseImpl* lib );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "collectionstats"; }
-
-signals:
-    void done( const QVariantMap& );
-};
-
-#endif // DATABASECOMMAND_COLLECTIONSTATS_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp Deleted

@@ -1,129 +0,0 @@
-/* === 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_createdynamicplaylist.h"
-
-#include <QSqlQuery>
-#include <QSqlDriver>
-
-#include "databaseimpl.h"
-#include "tomahawksqlquery.h"
-#include "dynamic/DynamicPlaylist.h"
-#include "dynamic/DynamicControl.h"
-#include "dynamic/GeneratorInterface.h"
-
-#include "source.h"
-#include "network/servent.h"
-#include "utils/logger.h"
-
-#ifndef ENABLE_HEADLESS
-    #include "viewmanager.h"
-#endif
-
-using namespace Tomahawk;
-
-
-DatabaseCommand_CreateDynamicPlaylist::DatabaseCommand_CreateDynamicPlaylist( QObject* parent )
-    : DatabaseCommand_CreatePlaylist( parent )
-    , m_autoLoad( true )
-{
-    tDebug() << Q_FUNC_INFO << "creating dynamiccreatecommand 1";
-}
-
-
-DatabaseCommand_CreateDynamicPlaylist::DatabaseCommand_CreateDynamicPlaylist( const source_ptr& author,
-                                                                const dynplaylist_ptr& playlist, bool autoLoad )
-    : DatabaseCommand_CreatePlaylist( author, playlist.staticCast<Playlist>() )
-    , m_playlist( playlist )
-    , m_autoLoad( autoLoad )
-{
-    tDebug() << Q_FUNC_INFO << "creating dynamiccreatecommand 2";
-}
-
-DatabaseCommand_CreateDynamicPlaylist::~DatabaseCommand_CreateDynamicPlaylist()
-{}
-
-QVariant
-DatabaseCommand_CreateDynamicPlaylist::playlistV() const
-{
-        if( m_v.isNull() )
-            return QJson::QObjectHelper::qobject2qvariant( (QObject*)m_playlist.data() );
-        else
-            return m_v;
-}
-
-void
-DatabaseCommand_CreateDynamicPlaylist::exec( DatabaseImpl* lib )
-{
-    qDebug() << Q_FUNC_INFO;
-    Q_ASSERT( !( m_playlist.isNull() && m_v.isNull() ) );
-    Q_ASSERT( !source().isNull() );
-
-    DatabaseCommand_CreatePlaylist::createPlaylist( lib, true );
-    qDebug() << "Created normal playlist, now creating additional dynamic info!";
-
-    qDebug() << "Create dynamic execing!" << m_playlist << m_v;
-    TomahawkSqlQuery cre = lib->newquery();
-
-    cre.prepare( "INSERT INTO dynamic_playlist( guid, pltype, plmode, autoload ) "
-                 "VALUES( ?, ?, ?, ? )" );
-
-    if( m_playlist.isNull() ) {
-        QVariantMap m = m_v.toMap();
-        cre.addBindValue( m.value( "guid" ) );
-        cre.addBindValue( m.value( "type" ) );
-        cre.addBindValue( m.value( "mode" ) );
-    } else {
-        cre.addBindValue( m_playlist->guid() );
-        cre.addBindValue( m_playlist->type() );
-        cre.addBindValue( m_playlist->mode() );
-    }
-    cre.addBindValue( m_autoLoad );
-    cre.exec();
-}
-
-
-void
-DatabaseCommand_CreateDynamicPlaylist::postCommitHook()
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( source().isNull() || source()->collection().isNull() )
-    {
-        qDebug() << "Source has gone offline, not emitting to GUI.";
-        return;
-    }
-
-    if(  !DatabaseCommand_CreatePlaylist::report() || report() == false )
-        return;
-
-    qDebug() << Q_FUNC_INFO << "..reporting..";
-    if( m_playlist.isNull() ) {
-        source_ptr src = source();
-#ifndef ENABLE_HEADLESS
-        QMetaObject::invokeMethod( ViewManager::instance(),
-                                   "createDynamicPlaylist",
-                                   Qt::BlockingQueuedConnection,
-                                   QGenericArgument( "Tomahawk::source_ptr", (const void*)&src ),
-                                   Q_ARG( QVariant, m_v ) );
-#endif
-    } else {
-        m_playlist->reportCreated( m_playlist );
-    }
-    if( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_createdynamicplaylist.h Deleted

@@ -1,65 +0,0 @@
-/* === 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_CREATEDYNAMICPLAYLIST_H
-#define DATABASECOMMAND_CREATEDYNAMICPLAYLIST_H
-
-#include "typedefs.h"
-#include "databasecommand_createplaylist.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, bool autoLoad = true );
-    virtual ~DatabaseCommand_CreateDynamicPlaylist();
-
-    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;
-
-    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

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_createplaylist.cpp Deleted

@@ -1,145 +0,0 @@
-/* === 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
- *   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_createplaylist.h"
-
-#include <QSqlQuery>
-
-#include "source.h"
-#include "databaseimpl.h"
-#include "tomahawksqlquery.h"
-#include "network/servent.h"
-#include "utils/logger.h"
-
-#ifndef ENABLE_HEADLESS
-    #include "viewmanager.h"
-#endif
-
-using namespace Tomahawk;
-
-
-DatabaseCommand_CreatePlaylist::DatabaseCommand_CreatePlaylist( QObject* parent )
-    : DatabaseCommandLoggable( parent )
-    , m_report( true )
-{
-}
-
-
-DatabaseCommand_CreatePlaylist::DatabaseCommand_CreatePlaylist( const source_ptr& author,
-                                                                const playlist_ptr& playlist )
-    : DatabaseCommandLoggable( author )
-    , m_playlist( playlist )
-    , m_report( false ) //this ctor used when creating locally, reporting done elsewhere
-{
-}
-
-DatabaseCommand_CreatePlaylist::~DatabaseCommand_CreatePlaylist()
-{}
-
-void
-DatabaseCommand_CreatePlaylist::exec( DatabaseImpl* lib )
-{
-    createPlaylist( lib, false );
-}
-
-QVariant
-DatabaseCommand_CreatePlaylist::playlistV() const
-{
-    if( m_v.isNull() )
-        return QJson::QObjectHelper::qobject2qvariant( (QObject*)m_playlist.data() );
-    else
-        return m_v;
- }
-
-
-void
-DatabaseCommand_CreatePlaylist::postCommitHook()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
-
-    if ( m_report == false )
-        return;
-
-    tDebug() << Q_FUNC_INFO << "reporting...";
-    if ( m_playlist.isNull() )
-    {
-        source_ptr src = source();
-#ifndef ENABLE_HEADLESS
-        QMetaObject::invokeMethod( ViewManager::instance(),
-                                   "createPlaylist",
-                                   Qt::BlockingQueuedConnection,
-                                   QGenericArgument( "Tomahawk::source_ptr", (const void*)&src ),
-                                   Q_ARG( QVariant, m_v ) );
-#endif
-    }
-    else
-    {
-        m_playlist->reportCreated( m_playlist );
-    }
-}
-
-
-void
-DatabaseCommand_CreatePlaylist::createPlaylist( DatabaseImpl* lib, bool dynamic)
-{
-    Q_ASSERT( !( m_playlist.isNull() && m_v.isNull() ) );
-    Q_ASSERT( !source().isNull() );
-
-    uint now = 0;
-    if ( m_playlist.isNull() )
-    {
-        now = m_v.toMap() "createdon" .toUInt();
-    }
-    else
-    {
-        now = QDateTime::currentDateTime().toTime_t();
-        m_playlist->setCreatedOn( now );
-    }
-
-    TomahawkSqlQuery cre = lib->newquery();
-    cre.prepare( "INSERT INTO playlist( guid, source, shared, title, info, creator, lastmodified, dynplaylist, createdOn ) "
-                 "VALUES( :guid, :source, :shared, :title, :info, :creator, :lastmodified, :dynplaylist, :createdOn )" );
-
-    cre.bindValue( ":source", source()->isLocal() ? QVariant(QVariant::Int) : source()->id() );
-    cre.bindValue( ":dynplaylist", dynamic );
-    cre.bindValue( ":createdOn", now );
-    if ( !m_playlist.isNull() )
-    {
-        cre.bindValue( ":guid", m_playlist->guid() );
-        cre.bindValue( ":shared", m_playlist->shared() );
-        cre.bindValue( ":title", m_playlist->title() );
-        cre.bindValue( ":info", m_playlist->info() );
-        cre.bindValue( ":creator", m_playlist->creator() );
-        cre.bindValue( ":lastmodified", m_playlist->lastmodified() );
-    }
-    else
-    {
-        QVariantMap m = m_v.toMap();
-        cre.bindValue( ":guid", m.value( "guid" ) );
-        cre.bindValue( ":shared", m.value( "shared" ) );
-        cre.bindValue( ":title", m.value( "title" ) );
-        cre.bindValue( ":info", m.value( "info" ) );
-        cre.bindValue( ":creator", m.value( "creator" ) );
-        cre.bindValue( ":lastmodified", m.value( "lastmodified", 0 ) );
-    }
-
-    cre.exec();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_createplaylist.h Deleted

@@ -1,65 +0,0 @@
-/* === 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
- *   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_CREATEPLAYLIST_H
-#define DATABASECOMMAND_CREATEPLAYLIST_H
-
-#include "typedefs.h"
-#include "databasecommandloggable.h"
-#include "qjson/qobjecthelper.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_CreatePlaylist : public DatabaseCommandLoggable
-{
-Q_OBJECT
-Q_PROPERTY( QVariant playlist READ playlistV WRITE setPlaylistV )
-
-public:
-    explicit DatabaseCommand_CreatePlaylist( QObject* parent = 0 );
-    explicit DatabaseCommand_CreatePlaylist( const Tomahawk::source_ptr& author, const Tomahawk::playlist_ptr& playlist );
-    virtual ~DatabaseCommand_CreatePlaylist();
-
-    QString commandname() const { return "createplaylist"; }
-
-    virtual void exec( DatabaseImpl* lib );
-    virtual void postCommitHook();
-    virtual bool doesMutates() const { return true; }
-
-    QVariant playlistV() const;
-
-    void setPlaylistV( const QVariant& v )
-    {
-        m_v = v;
-    }
-
-protected:
-    void createPlaylist( DatabaseImpl* lib, bool dynamic = false );
-
-    virtual bool report() { return m_report; }
-
-    void setPlaylist( const Tomahawk::playlist_ptr& playlist );
-
-    QVariant m_v;
-
-private:
-    Tomahawk::playlist_ptr m_playlist;
-    bool m_report; // call Playlist::reportCreated?
-};
-
-#endif // DATABASECOMMAND_CREATEPLAYLIST_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_deletedynamicplaylist.cpp Deleted

@@ -1,72 +0,0 @@
-/* === 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
- *   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_deletedynamicplaylist.h"
-
-#include <QSqlQuery>
-
-#include "dynamic/DynamicPlaylist.h"
-#include "network/servent.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-DatabaseCommand_DeleteDynamicPlaylist::DatabaseCommand_DeleteDynamicPlaylist( const source_ptr& source, const QString& playlistguid )
-    : DatabaseCommand_DeletePlaylist( source, playlistguid )
-{
-}
-
-
-void
-DatabaseCommand_DeleteDynamicPlaylist::exec( DatabaseImpl* lib )
-{
-    qDebug() << Q_FUNC_INFO;
-    qDebug() << "deleting dynamic playlist:" << m_playlistguid;
-    DatabaseCommand_DeletePlaylist::exec( lib );
-    TomahawkSqlQuery cre = lib->newquery();
-
-    cre.prepare( "DELETE FROM dynamic_playlist WHERE guid = :id" );
-    cre.bindValue( ":id", m_playlistguid );
-
-    cre.exec();
-}
-
-
-void
-DatabaseCommand_DeleteDynamicPlaylist::postCommitHook()
-{
-    qDebug() << Q_FUNC_INFO << "..reporting..:" << m_playlistguid;
-    if ( source().isNull() || source()->collection().isNull() )
-    {
-        qDebug() << "Source has gone offline, not emitting to GUI.";
-        return;
-    }
-    // we arent sure which it is, but it can't be more th an one. so try both
-    dynplaylist_ptr playlist = source()->collection()->autoPlaylist( m_playlistguid );
-    if( playlist.isNull() )
-        playlist = source()->collection()->station( m_playlistguid );
-
-    qDebug() << "Just tried to load playlist for deletion:" << m_playlistguid << "Did we get a null one?" << playlist.isNull() << "is it a station?" << (playlist->mode() == OnDemand);
-    Q_ASSERT( !playlist.isNull() );
-
-    playlist->reportDeleted( playlist );
-
-    if( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_deletedynamicplaylist.h Deleted

@@ -1,43 +0,0 @@
-/* === 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
- *   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_DELETEDYNAMICPLAYLIST_H
-#define DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H
-
-#include "databasecommand_deleteplaylist.h"
-#include "typedefs.h"
-
-class DatabaseCommand_DeleteDynamicPlaylist : public DatabaseCommand_DeletePlaylist
-{
-    Q_OBJECT
-public:
-    explicit DatabaseCommand_DeleteDynamicPlaylist( QObject* parent = 0 )
-    : DatabaseCommand_DeletePlaylist( parent )
-    {}
-
-    explicit DatabaseCommand_DeleteDynamicPlaylist( const Tomahawk::source_ptr& source, const QString& playlistguid );
-
-    QString commandname() const { return "deletedynamicplaylist"; }
-
-    virtual void exec( DatabaseImpl* lib );
-    virtual void postCommitHook();
-    virtual bool doesMutates() const { return true; }
-
-};
-
-#endif // DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_deletefiles.cpp Deleted

@@ -1,139 +0,0 @@
-/* === 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
- *   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_deletefiles.h"
-
-#include <QtSql/QSqlQuery>
-
-#include "artist.h"
-#include "album.h"
-#include "collection.h"
-#include "source.h"
-#include "database/database.h"
-#include "database/databaseimpl.h"
-#include "network/servent.h"
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-
-using namespace Tomahawk;
-
-
-// After changing a collection, we need to tell other bits of the system:
-void
-DatabaseCommand_DeleteFiles::postCommitHook()
-{
-    if ( !m_idList.count() )
-        return;
-
-    // make the collection object emit its tracksAdded signal, so the
-    // collection browser will update/fade in etc.
-    Collection* coll = source()->collection().data();
-
-    connect( this, SIGNAL( notify( QList<unsigned int> ) ),
-             coll,   SLOT( delTracks( QList<unsigned int> ) ), Qt::QueuedConnection );
-
-    tDebug() << "Notifying of deleted tracks:" << m_idList.size() << "from source" << source()->id();
-    emit notify( m_idList );
-
-    if ( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
-}
-
-
-void
-DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
-{
-    Q_ASSERT( !source().isNull() );
-
-    int srcid = source()->isLocal() ? 0 : source()->id();
-    TomahawkSqlQuery delquery = dbi->newquery();
-
-    if ( m_deleteAll )
-    {
-        TomahawkSqlQuery dirquery = dbi->newquery();
-        dirquery.prepare( QString( "SELECT id FROM file WHERE source %1" )
-                    .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ) );
-        dirquery.exec();
-        
-        while ( dirquery.next() )
-            m_idList << dirquery.value( 0 ).toUInt();
-    }
-    else if ( source()->isLocal() )
-    {
-        if ( m_dir.path() != QString( "." ) )
-        {
-            tDebug() << "Deleting" << m_dir.path() << "from db for localsource" << srcid;
-            TomahawkSqlQuery dirquery = dbi->newquery();
-            QString path( "file://" + m_dir.canonicalPath() + "/%" );
-            dirquery.prepare( QString( "SELECT id FROM file WHERE source IS NULL AND url LIKE '%1'" ).arg( TomahawkUtils::sqlEscape( path ) ) );
-            dirquery.exec();
-
-            while ( dirquery.next() )
-            {
-                m_ids << dirquery.value( 0 );
-                m_idList << dirquery.value( 0 ).toUInt();
-            }
-        }
-        else if ( !m_ids.isEmpty() )
-        {
-            tDebug() << Q_FUNC_INFO << "deleting given ids";
-            foreach ( const QVariant& id, m_ids )
-                m_idList << id.toUInt();
-        }
-    }
-
-    if ( m_deleteAll )
-    {
-        delquery.prepare( QString( "DELETE FROM file WHERE source %1" )
-                    .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ) );
-        delquery.exec();
-    }
-    else if ( !m_ids.isEmpty() )
-    {
-        QString idstring;
-        foreach ( const QVariant& id, m_ids )
-            idstring.append( id.toString() + ", " );
-        idstring.chop( 2 ); //remove the trailing ", "
-
-        if ( !source()->isLocal() )
-        {
-            delquery.prepare( QString( "SELECT id FROM file WHERE source = %1 AND url IN ( %2 )" )
-                        .arg( source()->id() )
-                        .arg( idstring ) );
-            delquery.exec();
-            
-            idstring = QString();
-            while ( delquery.next() )
-            {
-                idstring.append( delquery.value( 0 ).toString() + ", " );
-                m_idList << delquery.value( 0 ).toUInt();
-            }
-            idstring.chop( 2 ); //remove the trailing ", "
-        }
-
-        delquery.prepare( QString( "DELETE FROM file WHERE source %1 AND id IN ( %2 )" )
-                             .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) )
-                             .arg( idstring ) );
-        delquery.exec();
-    }
-
-    if ( m_idList.count() )
-        source()->updateIndexWhenSynced();
-
-    emit done( m_idList, source()->collection() );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_deletefiles.h Deleted

@@ -1,87 +0,0 @@
-/* === 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
- *   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_DELETEFILES_H
-#define DATABASECOMMAND_DELETEFILES_H
-
-#include <QtCore/QObject>
-#include <QtCore/QDir>
-#include <QtCore/QVariantMap>
-
-#include "database/databasecommandloggable.h"
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-#include "utils/logger.h"
-
-class DLLEXPORT DatabaseCommand_DeleteFiles : public DatabaseCommandLoggable
-{
-Q_OBJECT
-Q_PROPERTY( QVariantList ids READ ids WRITE setIds )
-Q_PROPERTY( bool deleteAll READ deleteAll WRITE setDeleteAll )
-
-public:
-    explicit DatabaseCommand_DeleteFiles( QObject* parent = 0 )
-        : DatabaseCommandLoggable( parent )
-    {}
-
-    explicit DatabaseCommand_DeleteFiles( const Tomahawk::source_ptr& source, QObject* parent = 0 )
-    : DatabaseCommandLoggable( parent ), m_deleteAll( true )
-    {
-        setSource( source );
-    }
-
-    explicit DatabaseCommand_DeleteFiles( const QDir& dir, const Tomahawk::source_ptr& source, QObject* parent = 0 )
-    : DatabaseCommandLoggable( parent ), m_dir( dir ), m_deleteAll( false )
-    {
-        setSource( source );
-    }
-
-    explicit DatabaseCommand_DeleteFiles( const QVariantList& ids, const Tomahawk::source_ptr& source, QObject* parent = 0 )
-    : DatabaseCommandLoggable( parent ), m_ids( ids ), m_deleteAll( false )
-    {
-        setSource( source );
-    }
-
-    virtual QString commandname() const { return "deletefiles"; }
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return true; }
-    virtual bool localOnly() const { return false; }
-    virtual bool groupable() const { return true; }
-    virtual void postCommitHook();
-
-    QVariantList ids() const { return m_ids; }
-    void setIds( const QVariantList& i ) { m_ids = i; }
-
-    bool deleteAll() const { return m_deleteAll; }
-    void setDeleteAll( const bool deleteAll ) { m_deleteAll = deleteAll; }
-
-signals:
-    void done( const QList<unsigned int>&, const Tomahawk::collection_ptr& );
-    void notify( const QList<unsigned int>& ids );
-
-private:
-    QDir m_dir;
-    QVariantList m_ids;
-    QList<unsigned int> m_idList;
-    bool m_deleteAll;
-};
-
-#endif // DATABASECOMMAND_DELETEFILES_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_deleteplaylist.cpp Deleted

@@ -1,69 +0,0 @@
-/* === 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
- *   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_deleteplaylist.h"
-
-#include <QSqlQuery>
-
-#include "network/servent.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-DatabaseCommand_DeletePlaylist::DatabaseCommand_DeletePlaylist( const source_ptr& source, const QString& playlistguid )
-    : DatabaseCommandLoggable( source )
-{
-    setPlaylistguid( playlistguid );
-}
-
-
-void
-DatabaseCommand_DeletePlaylist::exec( DatabaseImpl* lib )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    TomahawkSqlQuery cre = lib->newquery();
-
-    QString sql = QString( "DELETE FROM playlist WHERE guid = :id AND source %1" )
-                  .arg( source()->isLocal() ? "IS NULL" : QString("= %1").arg( source()->id() ) );
-    cre.prepare( sql );
-    cre.bindValue( ":id", m_playlistguid );
-
-    cre.exec();
-}
-
-
-void
-DatabaseCommand_DeletePlaylist::postCommitHook()
-{
-    qDebug() << Q_FUNC_INFO << "..reporting..";
-    if ( source().isNull() || source()->collection().isNull() )
-    {
-        qDebug() << "Source has gone offline, not emitting to GUI.";
-        return;
-    }
-
-    playlist_ptr playlist = source()->collection()->playlist( m_playlistguid );
-    Q_ASSERT( !playlist.isNull() );
-
-    playlist->reportDeleted( playlist );
-
-    if( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_deleteplaylist.h Deleted

@@ -1,54 +0,0 @@
-/* === 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
- *   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_DELETEPLAYLIST_H
-#define DATABASECOMMAND_DELETEPLAYLIST_H
-
-#include "databaseimpl.h"
-#include "databasecommandloggable.h"
-#include "source.h"
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_DeletePlaylist : public DatabaseCommandLoggable
-{
-Q_OBJECT
-Q_PROPERTY( QString playlistguid READ playlistguid WRITE setPlaylistguid )
-
-public:
-    explicit DatabaseCommand_DeletePlaylist( QObject* parent = 0 )
-            : DatabaseCommandLoggable( parent )
-    {}
-
-    explicit DatabaseCommand_DeletePlaylist( const Tomahawk::source_ptr& source, const QString& playlistguid );
-
-    QString commandname() const { return "deleteplaylist"; }
-
-    virtual void exec( DatabaseImpl* lib );
-    virtual void postCommitHook();
-    virtual bool doesMutates() const { return true; }
-
-    QString playlistguid() const { return m_playlistguid; }
-    void setPlaylistguid( const QString& s ) { m_playlistguid = s; }
-
-protected:
-    QString m_playlistguid;
-};
-
-#endif // DATABASECOMMAND_DELETEPLAYLIST_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_dirmtimes.cpp Deleted

@@ -1,93 +0,0 @@
-/* === 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
- *   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_dirmtimes.h"
-
-#include <QSqlQuery>
-
-#include "databaseimpl.h"
-#include "utils/logger.h"
-
-
-void
-DatabaseCommand_DirMtimes::exec( DatabaseImpl* dbi )
-{
-    if( m_update )
-        execUpdate( dbi );
-    else
-        execSelect( dbi );
-}
-
-
-void
-DatabaseCommand_DirMtimes::execSelect( DatabaseImpl* dbi )
-{
-    QMap<QString,unsigned int> mtimes;
-    TomahawkSqlQuery query = dbi->newquery();
-    if( m_prefix.isEmpty() && m_prefixes.isEmpty() )
-    {
-        query.exec( "SELECT name, mtime FROM dirs_scanned" );
-        while( query.next() )
-            mtimes.insert( query.value( 0 ).toString(), query.value( 1 ).toUInt() );
-    }
-    else if( m_prefixes.isEmpty() )
-        execSelectPath( dbi, m_prefix, mtimes );
-    else
-    {
-        if( !m_prefix.isEmpty() )
-            execSelectPath( dbi, m_prefix, mtimes );
-        foreach( QString path, m_prefixes )
-            execSelectPath( dbi, path, mtimes );
-    }
-    emit done( mtimes );
-}
-
-void
-DatabaseCommand_DirMtimes::execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap<QString, unsigned int> &mtimes )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    query.prepare( QString( "SELECT name, mtime "
-                            "FROM dirs_scanned "
-                            "WHERE name LIKE :prefix" ) );
-
-    query.bindValue( ":prefix", path.canonicalPath() + "%" );
-    query.exec();
-
-    while( query.next() )
-        mtimes.insert( query.value( 0 ).toString(), query.value( 1 ).toUInt() );
-}
-
-
-void
-DatabaseCommand_DirMtimes::execUpdate( DatabaseImpl* dbi )
-{
-    qDebug() << "Saving mtimes...";
-    TomahawkSqlQuery query = dbi->newquery();
-    query.exec( "DELETE FROM dirs_scanned" );
-    query.prepare( "INSERT INTO dirs_scanned(name, mtime) VALUES(?, ?)" );
-
-    foreach( const QString& k, m_tosave.keys() )
-    {
-        query.bindValue( 0, k );
-        query.bindValue( 1, m_tosave.value( k ) );
-        query.exec();
-    }
-
-    qDebug() << "Saved mtimes for" << m_tosave.size() << "dirs.";
-    emit done( QMap< QString, unsigned int >() );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_dirmtimes.h Deleted

@@ -1,70 +0,0 @@
-/* === 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
- *   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_DIRMTIMES_H
-#define DATABASECOMMAND_DIRMTIMES_H
-
-#include <QObject>
-#include <QVariantMap>
-#include <QDir>
-#include <QMap>
-
-#include "databasecommand.h"
-
-#include "dllmacro.h"
-
-// Not loggable, mtimes only used to speed up our local scanner.
-
-class DLLEXPORT DatabaseCommand_DirMtimes : public DatabaseCommand
-{
-Q_OBJECT
-
-public:
-    explicit DatabaseCommand_DirMtimes( const QString& prefix = QString(), QObject* parent = 0 )
-        : DatabaseCommand( parent ), m_prefix( prefix ), m_update( false )
-    {}
-
-    explicit DatabaseCommand_DirMtimes( const QStringList& prefixes, QObject* parent = 0 )
-    : DatabaseCommand( parent ), m_prefixes( prefixes ), m_update( false )
-    {}
-
-    explicit DatabaseCommand_DirMtimes( QMap<QString, unsigned int> tosave, QObject* parent = 0 )
-        : DatabaseCommand( parent ), m_update( true ), m_tosave( tosave )
-    {}
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return m_update; }
-    virtual QString commandname() const { return "dirmtimes"; }
-
-signals:
-    void done( const QMap<QString, unsigned int>& );
-
-public slots:
-
-private:
-    void execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap<QString, unsigned int> &mtimes );
-
-    void execSelect( DatabaseImpl* dbi );
-    void execUpdate( DatabaseImpl* dbi );
-    QString m_prefix;
-    QStringList m_prefixes;
-    bool m_update;
-    QMap<QString, unsigned int> m_tosave;
-};
-
-#endif // DATABASECOMMAND_DIRMTIMES_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_filemtimes.cpp Deleted

@@ -1,82 +0,0 @@
-/* === 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
- *   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_filemtimes.h"
-
-#include <QSqlQuery>
-
-#include "databaseimpl.h"
-#include "utils/logger.h"
-
-
-void
-DatabaseCommand_FileMtimes::exec( DatabaseImpl* dbi )
-{
-    execSelect( dbi );
-}
-
-
-void
-DatabaseCommand_FileMtimes::execSelect( DatabaseImpl* dbi )
-{
-    qDebug() << Q_FUNC_INFO;
-    //FIXME: If ever needed for a non-local source this will have to be fixed/updated
-    QMap< QString, QMap< unsigned int, unsigned int > > mtimes;
-    TomahawkSqlQuery query = dbi->newquery();
-    if( m_prefix.isEmpty() && m_prefixes.isEmpty() )
-    {
-        QString limit( m_checkonly ? QString( "LIMIT 1" ) : QString() );
-        query.exec( QString( "SELECT url, id, mtime FROM file WHERE source IS NULL %1" ).arg( limit ) );
-        while( query.next() )
-        {
-            QMap< unsigned int, unsigned int > map;
-            map.insert( query.value( 1 ).toUInt(), query.value( 2 ).toUInt() );
-            mtimes.insert( query.value( 0 ).toString(), map );
-        }
-    }
-    else if( m_prefixes.isEmpty() )
-        execSelectPath( dbi, m_prefix, mtimes );
-    else
-    {
-        if( !m_prefix.isEmpty() )
-            execSelectPath( dbi, m_prefix, mtimes );
-        foreach( QString path, m_prefixes )
-            execSelectPath( dbi, path, mtimes );
-    }
-    emit done( mtimes );
-}
-
-void
-DatabaseCommand_FileMtimes::execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap<QString, QMap< unsigned int, unsigned int > > &mtimes )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    query.prepare( QString( "SELECT url, id, mtime "
-                            "FROM file "
-                            "WHERE source IS NULL "
-                            "AND url LIKE :prefix" ) );
-
-    query.bindValue( ":prefix", "file://" + path.canonicalPath() + "%" );
-    query.exec();
-
-    while( query.next() )
-    {
-        QMap< unsigned int, unsigned int > map;
-        map.insert( query.value( 1 ).toUInt(), query.value( 2 ).toUInt() );
-        mtimes.insert( query.value( 0 ).toString(), map );
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_filemtimes.h Deleted

@@ -1,68 +0,0 @@
-/* === 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
- *   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_FILEMTIMES_H
-#define DATABASECOMMAND_FILEMTIMES_H
-
-#include <QObject>
-#include <QVariantMap>
-#include <QMap>
-#include <QDir>
-
-#include "databasecommand.h"
-
-#include "dllmacro.h"
-
-// Not loggable, mtimes only used to speed up our local scanner.
-
-class DLLEXPORT DatabaseCommand_FileMtimes : public DatabaseCommand
-{
-Q_OBJECT
-
-public:
-    explicit DatabaseCommand_FileMtimes( const QString& prefix = QString(), QObject* parent = 0 )
-        : DatabaseCommand( parent ), m_prefix( prefix ), m_checkonly( false )
-    {}
-
-    explicit DatabaseCommand_FileMtimes( const QStringList& prefixes, QObject* parent = 0 )
-    : DatabaseCommand( parent ), m_prefixes( prefixes ), m_checkonly( false )
-    {}
-
-    //NOTE: when this is called we actually ignore the boolean flag; it's just used to give us the right constructor
-    explicit DatabaseCommand_FileMtimes( bool /*checkonly*/, QObject* parent = 0 )
-    : DatabaseCommand( parent ), m_checkonly( true )
-    {}
-    
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "filemtimes"; }
-
-signals:
-    void done( const QMap< QString, QMap< unsigned int, unsigned int > >& );
-
-public slots:
-
-private:
-    void execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap< QString, QMap< unsigned int, unsigned int > > &mtimes );
-    void execSelect( DatabaseImpl* dbi );
-    QString m_prefix;
-    QStringList m_prefixes;
-    bool m_checkonly;
-};
-
-#endif // DATABASECOMMAND_FILEMTIMES_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_genericselect.cpp Deleted

@@ -1,147 +0,0 @@
-/* === 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 "sourcelist.h"
-#include "artist.h"
-#include "album.h"
-#include "pipeline.h"
-#include "utils/logger.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 )
-    , m_raw( false )
-{
-}
-
-DatabaseCommand_GenericSelect::DatabaseCommand_GenericSelect( const QString& sqlSelect, QueryType type, bool rawData, QObject* parent )
-    : DatabaseCommand( parent )
-    , m_sqlSelect( sqlSelect )
-    , m_queryType( type )
-    , m_limit( -1 )
-    , m_raw( rawData )
-{
-}
-
-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;
-
-    if ( m_raw )
-    {
-        QList< QStringList > rawDataItems;
-
-        while( query.next() )
-        {
-            QStringList rawRow;
-            int count = 0;
-            while ( query.value( count ).isValid() )
-            {
-                rawRow << query.value( count ).toString();
-                ++count;
-            }
-            rawDataItems << rawRow;
-        }
-        emit rawData( rawDataItems );
-        return;
-    }
-
-    // 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() );
-        }
-        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 );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_genericselect.h Deleted

@@ -1,87 +0,0 @@
-/* === 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 "typedefs.h"
-
-#include <QStringList>
-#include <QMetaType>
-
-#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 );
-    explicit DatabaseCommand_GenericSelect( const QString& sqlSelect, QueryType type, bool rawData, 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 );
-
-    void rawData( const QList< QStringList >& data );
-private:
-    QString m_sqlSelect;
-    QueryType m_queryType;
-    int m_limit;
-    bool m_raw;
-};
-
-Q_DECLARE_METATYPE(QList<QStringList>);
-
-#endif // DATABASECOMMAND_GENERICSELECT_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_importplaylist.cpp Deleted

@@ -1,61 +0,0 @@
-/* === 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
- *   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_importplaylist.h"
-
-#include <QSqlQuery>
-
-#include "tomahawk/query.h"
-#include "tomahawk/playlist.h"
-#include "databaseimpl.h"
-#include "utils/logger.h"
-
-
-void
-DatabaseCommand_ImportPlaylist::exec( DatabaseImpl * dbi )
-{
-    /*
-    qDebug() << "Importing playlist of" << m_playlist->length() << "tracks";
-    TomahawkSqlQuery query = dbi->newquery();
-    query.prepare("INSERT INTO playlist(title, info, creator, lastmodified) "
-                  "VALUES(?,?,?,?)");
-    query.addBindValue(m_playlist->title());
-    query.addBindValue(m_playlist->info());
-    query.addBindValue(m_playlist->creator());
-    query.addBindValue(m_playlist->lastmodified());
-    query.exec();
-    int pid = query.lastInsertId().toInt();
-    int pos = 0;
-    query.prepare("INSERT INTO playlist_tracks( "
-                  "playlist, position, trackname, albumname, artistname) "
-                  "VALUES (?,?,?,?,?)");
-
-    for(int k = 0; k < m_playlist->length(); k++)
-    {
-        pos++;
-        query.addBindValue(pid);
-        query.addBindValue(pos);
-        query.addBindValue(m_playlist->at(k)->artist());
-        query.addBindValue(m_playlist->at(k)->album());
-        query.addBindValue(m_playlist->at(k)->track());
-        query.exec();
-    }
-    emit done(pid);
-    */
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_importplaylist.h Deleted

@@ -1,50 +0,0 @@
-/* === 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
- *   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_IMPORTPLAYLIST_H
-#define DATABASECOMMAND_IMPORTPLAYLIST_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "databasecommand.h"
-
-#include "dllmacro.h"
-
-class Playlist;
-
-class DLLEXPORT DatabaseCommand_ImportPlaylist : public DatabaseCommand
-{
-    Q_OBJECT
-public:
-    explicit DatabaseCommand_ImportPlaylist(Playlist * p, QObject *parent = 0)
-        : DatabaseCommand(parent), m_playlist(p)
-    {}
-
-    virtual void exec(DatabaseImpl *);
-    virtual bool doesMutates() const { return true; }
-    virtual QString commandname() const { return "importplaylist"; }
-
-signals:
-    void done(int id);
-
-private:
-    Playlist * m_playlist;
-};
-
-#endif // DATABASECOMMAND_ADDFILES_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp Deleted

@@ -1,79 +0,0 @@
-/* === 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_loadallautoplaylists.h"
-
-#include <QSqlQuery>
-
-#include "databaseimpl.h"
-#include "source.h"
-#include "dynamic/DynamicPlaylist.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-void
-DatabaseCommand_LoadAllAutoPlaylists::exec( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    QString orderToken, sourceToken;
-
-    switch ( m_sortOrder )
-    {
-        case 0:
-            break;
-
-        case DatabaseCommand_LoadAllPlaylists::ModificationTime:
-            orderToken = "playlist.createdOn";
-    }
-
-    if ( !source().isNull() )
-        sourceToken = QString( "AND source %1 " ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
-
-
-    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 dynplaylist = 'true' AND playlist.guid = dynamic_playlist.guid AND dynamic_playlist.plmode = %1 AND dynamic_playlist.autoload = 'true' "
-                         "%2"
-                         "%3 %4 %5"
-                       )
-                       .arg( Static )
-                       .arg( sourceToken )
-                       .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
-                       .arg( m_sortDescending ? "DESC" : QString() )
-                       .arg( m_limitAmount > 0 ? QString( "LIMIT 0, %1" ).arg( m_limitAmount ) : QString() ) );
-
-    QList<dynplaylist_ptr> plists;
-    while ( query.next() )
-    {
-            QVariantList data = QVariantList()  <<      query.value(7).toString()  //current rev
-                                                <<      query.value(1).toString()  //title
-                                                <<      query.value(2).toString()  //info
-                                                <<      query.value(3).toString()  //creator
-                                                <<      query.value(4).toString()  //createdOn
-                                                <<      query.value(8).toString()  // dynamic type
-                                                <<      static_cast<GeneratorMode>(query.value(9).toInt())  // dynamic mode
-                                                <<      query.value(6).toBool()    //shared
-                                                <<      query.value(5).toInt()     //lastmod
-                                                <<      query.value(0).toString();  //GUID
-            emit autoPlaylistLoaded( source(), data );
-    }
-
-    emit done();
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadallautoplaylists.h Deleted

@@ -1,59 +0,0 @@
-/* === 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_LOADALLAUTOPLAYLISTS_H
-#define DATABASECOMMAND_LOADALLAUTOPLAYLISTS_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "databasecommand.h"
-#include "typedefs.h"
-#include "databasecommand_loadallplaylists.h"
-
-class DatabaseCommand_LoadAllAutoPlaylists : public DatabaseCommand
-{
-    Q_OBJECT
-
-public:
-    explicit DatabaseCommand_LoadAllAutoPlaylists( const Tomahawk::source_ptr& s, QObject* parent = 0 )
-    : DatabaseCommand( s, parent )
-    , m_limitAmount( 0 )
-    , m_sortOrder( DatabaseCommand_LoadAllPlaylists::None )
-    , m_sortDescending( false )
-    {}
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "loadallautoplaylists"; }
-
-    void setLimit( unsigned int limit ) { m_limitAmount = limit; }
-    void setSortOrder( DatabaseCommand_LoadAllPlaylists::SortOrder order ) { m_sortOrder = order; }
-    void setSortDescending( bool descending ) { m_sortDescending = descending; }
-
-signals:
-    void autoPlaylistLoaded( const Tomahawk::source_ptr& source, const QVariantList& data );
-    void done();
-
-private:
-    unsigned int m_limitAmount;
-    DatabaseCommand_LoadAllPlaylists::SortOrder m_sortOrder;
-    bool m_sortDescending;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadallplaylists.cpp Deleted

@@ -1,80 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 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_loadallplaylists.h"
-
-#include <QSqlQuery>
-
-#include "playlist.h"
-#include "source.h"
-#include "databaseimpl.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-void
-DatabaseCommand_LoadAllPlaylists::exec( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    QString orderToken, sourceToken;
-
-    switch ( m_sortOrder )
-    {
-        case 0:
-            break;
-
-        case ModificationTime:
-            orderToken = "playlist.createdOn";
-    }
-
-    if ( !source().isNull() )
-        sourceToken = QString( "AND source %1 " ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
-
-
-    query.exec( QString( "SELECT guid, title, info, creator, lastmodified, shared, currentrevision, createdOn "
-                         "FROM playlist "
-                         "WHERE dynplaylist = 'false' "
-                         "%1 "
-                         "%2 %3 %4"
-                       )
-                       .arg( sourceToken )
-                       .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
-                       .arg( m_sortDescending ? "DESC" : QString() )
-                       .arg( m_limitAmount > 0 ? QString( "LIMIT 0, %1" ).arg( m_limitAmount ) : QString() ) );
-
-    QList<playlist_ptr> plists;
-    while ( query.next() )
-    {
-        playlist_ptr p( new Playlist( source(),                  //src
-                                      query.value(6).toString(), //current rev
-                                      query.value(1).toString(), //title
-                                      query.value(2).toString(), //info
-                                      query.value(3).toString(), //creator
-                                      query.value(7).toInt(),    //lastmod
-                                      query.value(5).toBool(),   //shared
-                                      query.value(4).toInt(),    //lastmod
-                                      query.value(0).toString()  //GUID
-                                    ), &QObject::deleteLater );
-        plists.append( p );
-    }
-
-    emit done( plists );
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadallplaylists.h Deleted

@@ -1,70 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 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_LOADALLPLAYLIST_H
-#define DATABASECOMMAND_LOADALLPLAYLIST_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "typedefs.h"
-#include "databasecommand.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_LoadAllPlaylists : public DatabaseCommand
-{
-    Q_OBJECT
-
-public:
-    enum SortOrder {
-        None = 0,
-        ModificationTime = 1
-    };
-    enum SortAscDesc {
-        NoOrder = 0,
-        Ascending = 1,
-        Descending = 2
-    };
-
-    explicit DatabaseCommand_LoadAllPlaylists( const Tomahawk::source_ptr& s, QObject* parent = 0 )
-        : DatabaseCommand( s, parent )
-        , m_limitAmount( 0 )
-        , m_sortOrder( None )
-        , m_sortDescending( false )
-    {}
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "loadallplaylists"; }
-
-    void setLimit( unsigned int limit ) { m_limitAmount = limit; }
-    void setSortOrder( SortOrder order ) { m_sortOrder = order; }
-    void setSortDescending( bool descending ) { m_sortDescending = descending; }
-
-signals:
-    void done( const QList<Tomahawk::playlist_ptr>& playlists );
-
-private:
-    unsigned int m_limitAmount;
-    SortOrder m_sortOrder;
-    bool m_sortDescending;
-};
-
-#endif // DATABASECOMMAND_LOADALLPLAYLIST_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadallsortedplaylists.cpp Deleted

@@ -1,108 +0,0 @@
-/* === 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_loadallsortedplaylists.h"
-#include "databaseimpl.h"
-
-#include "playlist.h"
-#include <libtomahawk/sourcelist.h>
-
-using namespace Tomahawk;
-
-void
-DatabaseCommand_LoadAllSortedPlaylists::exec( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    QString orderToken, sourceToken, ascDescToken;
-
-    switch ( m_sortOrder )
-    {
-        case 0:
-            break;
-
-        case DatabaseCommand_LoadAllPlaylists::ModificationTime:
-            orderToken = "playlist.createdOn";
-    }
-
-    switch ( m_sortAscDesc )
-    {
-        case DatabaseCommand_LoadAllPlaylists::NoOrder:
-            break;
-        case DatabaseCommand_LoadAllPlaylists::Ascending:
-            ascDescToken = "ASC";
-            break;
-        case DatabaseCommand_LoadAllPlaylists::Descending:
-            ascDescToken = "DESC";
-            break;
-    }
-
-    if ( !source().isNull() )
-        sourceToken = QString( "AND source %1 " ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
-
-
-    query.exec( QString( "SELECT playlist.guid as guid, title, info, creator, lastmodified, shared, currentrevision, createdOn, dynplaylist, source, dynamic_playlist.pltype, dynamic_playlist.plmode "
-                         "FROM playlist "
-                         "LEFT JOIN dynamic_playlist ON playlist.guid = dynamic_playlist.guid  "
-                         "%1 "
-                         "%2 %3 %4"
-    )
-    .arg( sourceToken )
-    .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
-    .arg( ascDescToken )
-    .arg( m_limitAmount > 0 ? QString( "LIMIT 0, %1" ).arg( m_limitAmount ) : QString() ) );
-
-    QList<SourcePlaylistPair> plists;
-    while ( query.next() )
-    {
-        plists << QPair< int, QString >( query.value(9).toInt(), query.value(0).toString() );
-//         playlist_ptr p;
-//         bool dynamic = query.value(8).toBool();
-//         source_ptr s = SourceList::instance()->get( query.value(9).toInt() );
-//
-//         if ( dynamic )
-//         {
-//             p = dynplaylist_ptr( new DynamicPlaylist( s,
-//                                                         query.value(6).toString(), //current rev
-//                                                         query.value(1).toString(), //title
-//                                                         query.value(2).toString(), //info
-//                                                         query.value(3).toString(), //creator
-//                                                         query.value(7).toInt(),    //createdOn
-//                                                         query.value(10).toString(), //type
-//                                                         (GeneratorMode)query.value(11).toInt(), // mode
-//                                                         query.value(5).toBool(),   //shared
-//                                                         query.value(4).toInt(),    //lastmod
-//                                                         query.value(0).toString()  //GUID
-//                 ) );
-//         } else
-//         {
-//             p = playlist_ptr( new Playlist( s,                  //src
-//                                         query.value(6).toString(), //current rev
-//                                         query.value(1).toString(), //title
-//                                         query.value(2).toString(), //info
-//                                         query.value(3).toString(), //creator
-//                                         query.value(7).toInt(),    //createdOn
-//                                         query.value(5).toBool(),   //shared
-//                                         query.value(4).toInt(),    //lastmod
-//                                         query.value(0).toString()  //GUID
-//             ) );
-//         }
-//         plists.append( p );
-    }
-
-    emit done( plists );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadallsortedplaylists.h Deleted

@@ -1,65 +0,0 @@
-/* === 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_LOADALLSORTEDPLAYLISTS_H
-#define DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H
-
-#include "databasecommand.h"
-#include "databasecommand_loadallplaylists.h"
-
-/**
- * Loads *all* playlists, automatic playlists, and stations. Another dbcmd because otherwise loading them all
- * is fragmented across 3 dbcmds with a different interface.
- *
- * You probably want to limit / sort the output.
- */
-class DatabaseCommand_LoadAllSortedPlaylists : public DatabaseCommand
-{
-    Q_OBJECT
-
-public:
-    // don't macros rock... not
-    typedef QPair<int,QString> SourcePlaylistPair;
-    explicit DatabaseCommand_LoadAllSortedPlaylists( const Tomahawk::source_ptr& s, QObject* parent = 0 )
-        : DatabaseCommand( s, parent )
-        , m_limitAmount( 0 )
-        , m_sortOrder( DatabaseCommand_LoadAllPlaylists::None )
-        , m_sortAscDesc( DatabaseCommand_LoadAllPlaylists::NoOrder )
-    {
-        qRegisterMetaType<QList<DatabaseCommand_LoadAllSortedPlaylists::SourcePlaylistPair> >("QList<DatabaseCommand_LoadAllSortedPlaylists::SourcePlaylistPair>");
-    }
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "loadallsortedplaylists"; }
-
-    void setLimit( unsigned int limit ) { m_limitAmount = limit; }
-    void setSortOrder( DatabaseCommand_LoadAllPlaylists::SortOrder order ) { m_sortOrder = order; }
-    void setSortAscDesc( DatabaseCommand_LoadAllPlaylists::SortAscDesc asc  ) { m_sortAscDesc = asc; }
-
-signals:
-    void done( const QList<DatabaseCommand_LoadAllSortedPlaylists::SourcePlaylistPair>& playlistGuids ); // QPair< sourceid, playlistguid>
-
-private:
-    unsigned int m_limitAmount;
-    DatabaseCommand_LoadAllPlaylists::SortOrder m_sortOrder;
-    DatabaseCommand_LoadAllPlaylists::SortAscDesc m_sortAscDesc;
-};
-
-Q_DECLARE_METATYPE(QList<DatabaseCommand_LoadAllSortedPlaylists::SourcePlaylistPair>)
-#endif // DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadallsources.cpp Deleted

@@ -1,49 +0,0 @@
-/* === 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
- *   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_loadallsources.h"
-
-#include <QSqlQuery>
-
-#include "network/servent.h"
-#include "source.h"
-#include "databaseimpl.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-void
-DatabaseCommand_LoadAllSources::exec( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-
-    query.exec( QString( "SELECT id, name, friendlyname "
-                         "FROM source" ) );
-
-    QList<source_ptr> sources;
-    while ( query.next() )
-    {
-        source_ptr src( new Source( query.value( 0 ).toUInt(), query.value( 1 ).toString() ) );
-        src->setFriendlyName( query.value( 2 ).toString() );
-        sources << src;
-    }
-
-    emit done( sources );
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadallsources.h Deleted

@@ -1,47 +0,0 @@
-/* === 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
- *   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_LOADALLSOURCES_H
-#define DATABASECOMMAND_LOADALLSOURCES_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "databasecommand.h"
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_LoadAllSources : public DatabaseCommand
-{
-Q_OBJECT
-
-public:
-    explicit DatabaseCommand_LoadAllSources( QObject* parent = 0 )
-        : DatabaseCommand( parent )
-    {}
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "loadallsources"; }
-
-signals:
-    void done( const QList<Tomahawk::source_ptr>& sources );
-};
-
-#endif // DATABASECOMMAND_LOADALLSOURCES_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadallstations.cpp Deleted

@@ -1,80 +0,0 @@
-/* === 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_loadallstations.h"
-
-#include <QSqlQuery>
-
-#include "databaseimpl.h"
-#include "source.h"
-#include "dynamic/DynamicPlaylist.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-void
-DatabaseCommand_LoadAllStations::exec( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    QString orderToken, sourceToken;
-
-    switch ( m_sortOrder )
-    {
-        case 0:
-            break;
-
-        case DatabaseCommand_LoadAllPlaylists::ModificationTime:
-            orderToken = "playlist.createdOn";
-    }
-
-    if ( !source().isNull() )
-        sourceToken = QString( "AND source %1 " ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
-
-
-    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 "
-                         "dynplaylist = 'true' AND playlist.guid = dynamic_playlist.guid AND dynamic_playlist.plmode = %1 AND dynamic_playlist.autoload = 'true' "
-                         "%2"
-                         "%3 %4 %5"
-                       )
-                       .arg( OnDemand )
-                       .arg( sourceToken )
-                       .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
-                       .arg( m_sortDescending ? "DESC" : QString() )
-                       .arg( m_limitAmount > 0 ? QString( "LIMIT 0, %1" ).arg( m_limitAmount ) : QString() ) );
-
-    QList<dynplaylist_ptr> plists;
-    while ( query.next() )
-    {
-            QVariantList data = QVariantList()  <<      query.value(7).toString()  //current rev
-                                                <<      query.value(1).toString()  //title
-                                                <<      query.value(2).toString()  //info
-                                                <<      query.value(3).toString()  //creator
-                                                <<      query.value(4).toString()  //createdOn
-                                                <<      query.value(8).toString()  // dynamic type
-                                                <<      static_cast<GeneratorMode>(query.value(9).toInt())  // dynamic mode
-                                                <<      query.value(6).toBool()    //shared
-                                                <<      query.value(5).toInt()     //lastmod
-                                                <<      query.value(0).toString();  //GUID
-            emit stationLoaded( source(), data );
-    }
-
-    emit done();
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadallstations.h Deleted

@@ -1,59 +0,0 @@
-/* === 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_LOADALLSTATIONS_H
-#define DATABASECOMMAND_LOADALLSTATIONS_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "databasecommand.h"
-#include "typedefs.h"
-#include "databasecommand_loadallplaylists.h"
-
-class DatabaseCommand_LoadAllStations : public DatabaseCommand
-{
-    Q_OBJECT
-
-public:
-    explicit DatabaseCommand_LoadAllStations( const Tomahawk::source_ptr& s, QObject* parent = 0 )
-    : DatabaseCommand( s, parent )
-    , m_limitAmount( 0 )
-    , m_sortOrder( DatabaseCommand_LoadAllPlaylists::None )
-    , m_sortDescending( false )
-    {}
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "loadallstations"; }
-
-    void setLimit( unsigned int limit ) { m_limitAmount = limit; }
-    void setSortOrder( DatabaseCommand_LoadAllPlaylists::SortOrder order ) { m_sortOrder = order; }
-    void setSortDescending( bool descending ) { m_sortDescending = descending; }
-
-signals:
-    void stationLoaded( const Tomahawk::source_ptr& source, const QVariantList& data );
-    void done();
-
-private:
-    unsigned int m_limitAmount;
-    DatabaseCommand_LoadAllPlaylists::SortOrder m_sortOrder;
-    bool m_sortDescending;
-};
-
-#endif
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loaddynamicplaylist.cpp Deleted

@@ -1,78 +0,0 @@
-/* === 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_loaddynamicplaylist.h"
-
-#include <QSqlQuery>
-
-#include "databaseimpl.h"
-#include "source.h"
-#include "dynamic/DynamicPlaylist.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-Tomahawk::DatabaseCommand_LoadDynamicPlaylist::DatabaseCommand_LoadDynamicPlaylist( const source_ptr& s, const QString& guid, QObject* parent )
-    : DatabaseCommand( s, parent )
-    , m_plid( guid )
-{
-
-}
-
-
-void
-Tomahawk::DatabaseCommand_LoadDynamicPlaylist::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 playlist.guid = '%2'" )
-    .arg( source()->isLocal() ? "IS NULL" : QString( "=%1" ).arg( source()->id() ) ).arg( m_plid ) );
-
-    QList<dynplaylist_ptr> plists;
-    if( query.next() )
-    {
-        dynplaylist_ptr p( new DynamicPlaylist( source(),
-                                                query.value(7).toString(),  //current rev
-                                                query.value(1).toString(),  //title
-                                                query.value(2).toString(),  //info
-                                                query.value(3).toString(),  //creator
-                                                query.value(4).toUInt(),  //createdOn
-                                                query.value(8).toString(),  // dynamic type
-                                                static_cast<GeneratorMode>(query.value(9).toInt()),  // dynamic mode
-                                                query.value(6).toBool(),    //shared
-                                                query.value(5).toInt(),     //lastmod
-                                                query.value(0).toString() ) );  //GUID
-
-        tLog() << "Loaded individual dynamic playlist:" <<      query.value(7).toString()  //current rev
-        <<      query.value(1).toString()  //title
-        <<      query.value(2).toString()  //info
-        <<      query.value(3).toString()  //creator
-        <<      query.value(4).toString()  //createdOn
-        <<      query.value(8).toString()  // dynamic type
-        <<      static_cast<GeneratorMode>(query.value(9).toInt())  // dynamic mode
-        <<      query.value(6).toBool()    //shared
-        <<      query.value(5).toInt()     //lastmod
-        <<      query.value(0).toString();  //GUID
-
-        emit dynamicPlaylistLoaded( p );
-    }
-
-    emit done();
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loaddynamicplaylist.h Deleted

@@ -1,52 +0,0 @@
-/* === 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_LOADDYNAMICPLAYLIST_H
-#define DATABASECOMMAND_LOADDYNAMICPLAYLIST_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "databasecommand.h"
-#include "typedefs.h"
-
-namespace Tomahawk
-{
-
-class DatabaseCommand_LoadDynamicPlaylist : public DatabaseCommand
-{
-    Q_OBJECT
-
-public:
-    explicit DatabaseCommand_LoadDynamicPlaylist( const source_ptr& s, const QString& guid, QObject* parent = 0 );
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "loadsingledynamicplaylist"; }
-
-signals:
-    void dynamicPlaylistLoaded( const Tomahawk::dynplaylist_ptr& pl );
-    void done();
-
-private:
-    QString m_plid;
-};
-
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.cpp Deleted

@@ -1,111 +0,0 @@
-/* === 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_loaddynamicplaylistentries.h"
-
-#include <QSqlQuery>
-#include <QString>
-
-#include "databaseimpl.h"
-#include "tomahawksqlquery.h"
-#include "dynamic/DynamicControl.h"
-#include "dynamic/GeneratorInterface.h"
-#include "dynamic/GeneratorFactory.h"
-#include "qjson/parser.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-void
-DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
-{
-//    qDebug() << "Loading dynamic playlist guid" << guid();
-    // load the entries first
-    generateEntries( dbi );
-
-    // now load the controls etc
-
-    TomahawkSqlQuery controlsQuery = dbi->newquery();
-    controlsQuery.prepare("SELECT playlist_revision.playlist, controls, plmode, pltype "
-                          "FROM dynamic_playlist_revision, playlist_revision "
-                          "WHERE dynamic_playlist_revision.guid = ? AND playlist_revision.guid = dynamic_playlist_revision.guid");
-    controlsQuery.addBindValue( revisionGuid() );
-    controlsQuery.exec();
-
-    QString type;
-    GeneratorMode mode;
-
-    QList< QVariantMap > controls;
-    QString playlist_guid;
-//    qDebug() << "Loading controls..." << revisionGuid();
-//    qDebug() << "SELECT playlist_revision.playlist, controls, plmode, pltype "
-//    "FROM dynamic_playlist_revision, playlist_revision "
-//    "WHERE dynamic_playlist_revision.guid = "<< revisionGuid() << " AND playlist_revision.guid = dynamic_playlist_revision.guid";
-
-    if( controlsQuery.first() )
-    {
-        playlist_guid = controlsQuery.value( 0 ).toString();
-        QJson::Parser parser;
-        bool ok;
-        QVariant v = parser.parse( controlsQuery.value(1).toByteArray(), &ok );
-        Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
-
-
-        type = controlsQuery.value( 3 ).toString();
-        mode = static_cast<GeneratorMode>( controlsQuery.value( 2 ).toInt() );
-
-        QStringList controlIds = v.toStringList();
-//        qDebug() << "Got controls in dynamic playlist, loading:" << controlIds << controlsQuery.value(1);
-        foreach( const QString& controlId, controlIds )
-        {
-            TomahawkSqlQuery controlQuery = dbi->newquery();
-            controlQuery.prepare( "SELECT selectedType, match, input "
-                                  "FROM dynamic_playlist_controls "
-                                  "WHERE id = :id" );
-            controlQuery.bindValue( ":id", controlId );
-            controlQuery.exec();
-            if( controlQuery.next() )
-            {
-                QVariantMap c;
-                c "type"  = type;
-                c "id"  = controlId;
-                c "selectedType"  = controlQuery.value( 0 ).toString();
-                c "match"  = controlQuery.value( 1 ).toString();
-                c "input"  = controlQuery.value( 2 ).toString();
-                controls << c;
-            }
-        }
-    }
-    else
-    {
-        // No controls or plguid is null, but that's okay. We'll get a setdynrevision command with a proper revision some point later
-        return;
-    }
-
-    if( mode == OnDemand )
-    {
-//        Q_ASSERT( m_entrymap.isEmpty() ); // ondemand should have no entry
-
-        emit done( revisionGuid(), m_islatest, type, controls, true );
-    }
-    else
-    {
-        emit done( revisionGuid(), m_guids, m_oldentries, type, controls, m_islatest, m_entrymap, true );
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loaddynamicplaylistentries.h Deleted

@@ -1,65 +0,0 @@
-/* === 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_LOADDYNAMICPLAYLISTENTRIES_H
-#define DATABASECOMMAND_LOADDYNAMICPLAYLISTENTRIES_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "typedefs.h"
-#include "databasecommand.h"
-#include "databasecommand_loadplaylistentries.h"
-#include "playlist.h"
-
-class DatabaseCommand_LoadDynamicPlaylistEntries : public DatabaseCommand_LoadPlaylistEntries
-{
-    Q_OBJECT
-
-public:
-    explicit DatabaseCommand_LoadDynamicPlaylistEntries( QString revision_guid, QObject* parent = 0 )
-    : DatabaseCommand_LoadPlaylistEntries( revision_guid, parent )
-    {
-//        qDebug() << "loaded with:" << revision_guid << guid();
-    }
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "loaddynamicplaylist"; }
-
-signals:
-    // used if loading an ondemand playlist
-    void done( QString,
-                     bool,
-                     QString,
-                     QList< QVariantMap>,
-                     bool );
-    // used when loading a static playlist
-    void done( QString,
-               QList< QString >,
-               QList< QString >,
-               QString,
-               QList< QVariantMap>,
-               bool,
-               QMap< QString, Tomahawk::plentry_ptr >,
-               bool );
-
-private:
-};
-
-#endif // DATABASECOMMAND_LOADDYNAMICPLAYLIST_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadfiles.cpp Deleted

@@ -1,58 +0,0 @@
-/* === 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
- *   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_loadfiles.h"
-
-#include "databaseimpl.h"
-#include "collection.h"
-#include "utils/logger.h"
-
-
-DatabaseCommand_LoadFiles::DatabaseCommand_LoadFiles( unsigned int id, QObject* parent )
-    : DatabaseCommand( parent )
-    , m_single( true )
-{
-    m_ids << id;
-}
-
-DatabaseCommand_LoadFiles::DatabaseCommand_LoadFiles( const QList<unsigned int>& ids, QObject* parent )
-    : DatabaseCommand( parent )
-    , m_single( false )
-    , m_ids( ids )
-{
-}
-
-
-void
-DatabaseCommand_LoadFiles::exec( DatabaseImpl* dbi )
-{
-    QList<Tomahawk::result_ptr> resultList;
-    // file ids internally are really ints, at least for now:
-    foreach ( unsigned int id, m_ids )
-    {
-        qDebug() << "Loading file from db with id:" << id;
-        resultList << dbi->file( id );
-    }
-
-    Q_ASSERT( !m_single || resultList.size() <= 1 );
-
-    if ( m_single && !resultList.isEmpty() )
-        emit result( resultList.first() );
-    else
-        emit results( resultList );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadfiles.h Deleted

@@ -1,57 +0,0 @@
-/* === 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
- *   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_LOADFILES_H
-#define DATABASECOMMAND_LOADFILES_H
-
-#include <QObject>
-#include <QVariantMap>
-#include <QStringList>
-#include <QMap>
-
-#include "databasecommand.h"
-#include "result.h"
-#include "dllmacro.h"
-
-/**
-  Loads a result_ptr from the database from a track dbid.
-
-  If use use the QStringList constructor, isten to results() instead of result()
-  */
-class DLLEXPORT DatabaseCommand_LoadFiles : public DatabaseCommand
-{
-Q_OBJECT
-
-public:
-    explicit DatabaseCommand_LoadFiles( unsigned int id, QObject* parent = 0 );
-    explicit DatabaseCommand_LoadFiles( const QList<unsigned int>& ids, QObject* parent = 0 );
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "loadfiles"; }
-
-signals:
-    void result( const Tomahawk::result_ptr& result );
-    void results( const QList<Tomahawk::result_ptr>& results );
-
-private:
-    bool m_single;
-    QList<unsigned int> m_ids;
-};
-
-#endif // DATABASECOMMAND_LOADFILE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadops.cpp Deleted

@@ -1,76 +0,0 @@
-/* === 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
- *   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_loadops.h"
-
-#include "databaseimpl.h"
-#include "tomahawksqlquery.h"
-#include "source.h"
-#include "utils/logger.h"
-
-
-void
-DatabaseCommand_loadOps::exec( DatabaseImpl* dbi )
-{
-    QList< dbop_ptr > ops;
-
-    if ( !m_since.isEmpty() )
-    {
-        TomahawkSqlQuery query = dbi->newquery();
-        query.prepare( QString( "SELECT id FROM oplog WHERE guid = ?" ) );
-        query.addBindValue( m_since );
-        query.exec();
-
-        if ( !query.next() )
-        {
-            tLog() << "Unknown oplog guid, requested, not replying:" << m_since;
-            Q_ASSERT( false );
-            emit done( m_since, m_since, ops );
-            return;
-        }
-    }
-
-    TomahawkSqlQuery query = dbi->newquery();
-    query.prepare( QString(
-                   "SELECT guid, command, json, compressed, singleton "
-                   "FROM oplog "
-                   "WHERE source %1 "
-                   "AND id > coalesce((SELECT id FROM oplog WHERE guid = ?),0) "
-                   "ORDER BY id ASC"
-                   ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) )
-                  );
-    query.addBindValue( m_since );
-    query.exec();
-
-    QString lastguid = m_since;
-    while( query.next() )
-    {
-        dbop_ptr op( new DBOp );
-        op->guid = query.value( 0 ).toString();
-        op->command = query.value( 1 ).toString();
-        op->payload = query.value( 2 ).toByteArray();
-        op->compressed = query.value( 3 ).toBool();
-        op->singleton = query.value( 4 ).toBool();
-
-        lastguid = op->guid;
-        ops << op;
-    }
-
-//    qDebug() << "Loaded" << ops.length() << "ops from db";
-    emit done( m_since, lastguid, ops );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadops.h Deleted

@@ -1,49 +0,0 @@
-/* === 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
- *   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_LOADOPS_H
-#define DATABASECOMMAND_LOADOPS_H
-
-#include "typedefs.h"
-#include "databasecommand.h"
-#include "op.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_loadOps : public DatabaseCommand
-{
-Q_OBJECT
-public:
-    explicit DatabaseCommand_loadOps( const Tomahawk::source_ptr& src, QString since, QObject* parent = 0 )
-        : DatabaseCommand( src ), m_since( since )
-    {
-        Q_UNUSED( parent );
-    }
-
-    virtual void exec( DatabaseImpl* db );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "loadops"; }
-
-signals:
-    void done( QString sinceguid, QString lastguid, QList< dbop_ptr > ops );
-
-private:
-    QString m_since; // guid to load from
-};
-
-#endif // DATABASECOMMAND_LOADOPS_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadplaylistentries.cpp Deleted

@@ -1,117 +0,0 @@
-/* === 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
- *   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_loadplaylistentries.h"
-
-#include <QSqlQuery>
-
-#include "databaseimpl.h"
-#include "query.h"
-#include "qjson/parser.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-void
-DatabaseCommand_LoadPlaylistEntries::exec( DatabaseImpl* dbi )
-{
-    generateEntries( dbi );
-
-    emit done( m_revguid, m_guids, m_oldentries, m_islatest, m_entrymap, true );
-}
-
-
-void
-DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query_entries = dbi->newquery();
-    query_entries.prepare( "SELECT entries, playlist, author, timestamp, previous_revision "
-                           "FROM playlist_revision "
-                           "WHERE guid = :guid" );
-    query_entries.bindValue( ":guid", m_revguid );
-    query_entries.exec();
-
-    tLog( LOGVERBOSE ) << "trying to load playlist entries for guid:" << m_revguid;
-    QString prevrev;
-    QJson::Parser parser; bool ok;
-
-    if ( query_entries.next() )
-    {
-        // entries should be a list of strings:
-        QVariant v = parser.parse( query_entries.value( 0 ).toByteArray(), &ok );
-        Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
-        m_guids = v.toStringList();
-        QString inclause = QString( "('%1')" ).arg( m_guids.join( "', '" ) );
-
-        TomahawkSqlQuery query = dbi->newquery();
-        QString sql = QString( "SELECT guid, trackname, artistname, albumname, annotation, "
-                               "duration, addedon, addedby, result_hint "
-                               "FROM playlist_item "
-                               "WHERE guid IN %1" ).arg( inclause );
-
-        query.exec( sql );
-        while ( query.next() )
-        {
-            plentry_ptr e( new PlaylistEntry );
-            e->setGuid( query.value( 0 ).toString() );
-            e->setAnnotation( query.value( 4 ).toString() );
-            e->setDuration( query.value( 5 ).toUInt() );
-            e->setLastmodified( 0 ); // TODO e->lastmodified = query.value( 6 ).toInt();
-            e->setResultHint( query.value( 8 ).toString() );
-
-            Tomahawk::query_ptr q = Tomahawk::Query::get( query.value( 2 ).toString(), query.value( 1 ).toString(), query.value( 3 ).toString() );
-            q->setResultHint( query.value( 8 ).toString() );
-            e->setQuery( q );
-
-            m_entrymap.insert( e->guid(), e );
-        }
-
-        prevrev = query_entries.value( 4 ).toString();
-    }
-    else
-    {
-//        qDebug() << "Playlist has no current revision data";
-    }
-
-    if ( prevrev.length() )
-    {
-        TomahawkSqlQuery query_entries_old = dbi->newquery();
-        query_entries_old.prepare( "SELECT entries, "
-                                   "(SELECT currentrevision = ? FROM playlist WHERE guid = ?) "
-                                   "FROM playlist_revision "
-                                   "WHERE guid = ?" );
-        query_entries_old.addBindValue( m_revguid );
-        query_entries_old.addBindValue( query_entries.value( 1 ).toString() );
-        query_entries_old.addBindValue( prevrev );
-
-        query_entries_old.exec();
-        if ( !query_entries_old.next() )
-        {
-            return;
-            Q_ASSERT( false );
-        }
-
-        QVariant v = parser.parse( query_entries_old.value( 0 ).toByteArray(), &ok );
-        Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
-        m_oldentries = v.toStringList();
-        m_islatest = query_entries_old.value( 1 ).toBool();
-    }
-
-//    qDebug() << Q_FUNC_INFO << "entrymap:" << m_entrymap;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadplaylistentries.h Deleted

@@ -1,65 +0,0 @@
-/* === 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
- *   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_LOADPLAYLIST_H
-#define DATABASECOMMAND_LOADPLAYLIST_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "databasecommand.h"
-#include "playlist.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_LoadPlaylistEntries : public DatabaseCommand
-{
-Q_OBJECT
-
-public:
-    explicit DatabaseCommand_LoadPlaylistEntries( QString revision_guid, QObject* parent = 0 )
-    : DatabaseCommand( parent ), m_islatest( true ), m_revguid( revision_guid )
-    {}
-
-    virtual void exec( DatabaseImpl* );
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "loadplaylistentries"; }
-
-    QString revisionGuid() const { return m_revguid; }
-
-signals:
-    void done( const QString& rev,
-               const QList<QString>& orderedguid,
-               const QList<QString>& oldorderedguid,
-               bool islatest,
-               const QMap< QString, Tomahawk::plentry_ptr >& added,
-               bool applied );
-
-protected:
-    void generateEntries( DatabaseImpl* dbi );
-
-    QStringList m_guids;
-    QMap< QString, Tomahawk::plentry_ptr > m_entrymap;
-    bool m_islatest;
-    QStringList m_oldentries;
-
-private:
-    QString m_revguid;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadsocialactions.cpp Deleted

@@ -1,75 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christopher Reichert <creichert07@gmail.com>
- *
- *   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_loadsocialactions.h"
-
-#include <QSqlQuery>
-
-#include "database/database.h"
-#include "databaseimpl.h"
-#include "network/servent.h"
-#include "result.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-void
-DatabaseCommand_LoadSocialActions::exec( DatabaseImpl* dbi )
-{
-    qDebug() << Q_FUNC_INFO;
-    Q_ASSERT( !source().isNull() );
-
-    TomahawkSqlQuery query = dbi->newquery();
-
-    QVariant srcid = source()->isLocal() ? QVariant( QVariant::Int ) : source()->id();
-
-    int artid = dbi->artistId( m_artist, false );
-    if( artid < 1 )
-        return;
-
-    int trkid = dbi->trackId( artid, m_track, false );
-    if( trkid < 1 )
-        return;
-
-    QString whereToken;
-    whereToken = QString( "WHERE id IS %1" ).arg( trkid );
-
-    QString sql = QString(
-            "SELECT k, v, timestamp, source "
-            "FROM social_attributes %1 "
-            "ORDER BY timestamp ASC" ).arg( whereToken );
-
-    query.prepare( sql );
-    query.exec();
-
-    QList< Tomahawk::SocialAction > allSocialActions;
-    while ( query.next() )
-    {
-        Tomahawk::SocialAction action;
-        action.action    = query.value( 0 );  // action
-        action.value     = query.value( 1 );  // comment
-        action.timestamp = query.value( 2 );  // timestamp
-        action.source    = query.value( 3 );  // source
-
-        allSocialActions.append( action );
-    }
-
-    m_query->setAllSocialActions( allSocialActions );
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_loadsocialactions.h Deleted

@@ -1,134 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Christopher Reichert <creichert07@gmail.com>
- *
- *   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_LOADSOCIALACTIONS_H
-#define DATABASECOMMAND_LOADSOCIALACTIONS_H
-
-#include <QDateTime>
-#include <QList>
-#include "database/databasecommand.h"
-
-#include "sourcelist.h"
-#include "typedefs.h"
-#include "artist.h"
-
-#include "dllmacro.h"
-
-/**
- * \class DatabaseCommand_LoadSocialActions
- * \brief Database command used to load social actions from the database.
- *
- * This Database command allows Tomahawk to load social actions from
- * the local database. The loaded social actions can be used to create
- * dynamic playlists, generate statistics and provide data to share with
- * friends on tomahawk.
- *
- * \see DatabaseCommand_SocialAction
- */
-class DLLEXPORT DatabaseCommand_LoadSocialActions : public DatabaseCommand
-{
-Q_OBJECT
-
-public:
-    /**
-     * \brief Default constructor for DatabaseCommand_LoadSocialActions.
-     *
-     * Constructs an empty database command for loading social actions.
-     */
-    explicit DatabaseCommand_LoadSocialActions( QObject* parent = 0 )
-        : DatabaseCommand( parent )
-    {}
-
-    /**
-     * \brief Overloaded constructor for DatabaseCommand_LoadSocialAction.
-     * \param result A Tomahawk Query object.
-     * \param parent Parent class.
-     *
-     * Constructor which creates a new database command for loading all social actions.
-     */
-    explicit DatabaseCommand_LoadSocialActions( const Tomahawk::query_ptr& query, QObject* parent = 0 )
-        : DatabaseCommand( parent ), m_query( query )
-    {
-        setSource( SourceList::instance()->getLocal() );
-        setArtist( query->artist() );
-        setTrack( query->track() );
-    }
-
-    /**
-     * \brief Returns the name of this database command.
-     * \return QString containing the database command name 'loadsocialaction'.
-     */
-    virtual QString commandname() const { return "loadsocialactions"; }
-
-    /**
-     * \brief Executes the database command.
-     * \param dbi Database instance.
-     *
-     * This method prepares an sql query to load the social actions
-     * from the database into a list of all social actions.
-     *
-     * \see Result::setAllSocialActions()
-     */
-    virtual void exec( DatabaseImpl* );
-
-    /**
-     * \brief Returns the artist associated with this database command.
-     * \return Name of the artist.
-     * \see setArtist()
-     */
-    QString artist() const { return m_artist; }
-
-    /**
-     * \brief Sets the artist name for this database command.
-     * \param s QString containing the artist name.
-     * \see artist()
-     */
-    void setArtist( const QString& s ) { m_artist = s; }
-
-    /**
-     * \brief Returns the track name associated with this social action.
-     * \return QString containing the track name.
-     * \see setTrack()
-     */
-    QString track() const { return m_track; }
-
-    /**
-     * \brief Sets the track name associated with this database command.
-     * \param track QString containing the track name.
-     * \see track()
-     */
-    void setTrack( const QString& s ) { m_track = s; }
-
-signals:
-
-    /**
-     * \brief Emitted when the database command has finished the Query successfully
-     *
-     * \param QList of all social actions
-     * \see QList
-     */
-    void done( QList< Tomahawk::SocialAction >& allSocialActions );
-
-private:
-    Tomahawk::query_ptr m_query;
-    QString m_artist;
-    QString m_track;
-
-};
-
-#endif // DATABASECOMMAND_LOADSOCIALACTIONS_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_logplayback.cpp Deleted

@@ -1,118 +0,0 @@
-/* === 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
- *   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_logplayback.h"
-
-#include <QSqlQuery>
-
-#include "collection.h"
-#include "database/database.h"
-#include "databaseimpl.h"
-#include "network/servent.h"
-#include "utils/logger.h"
-
-#define STARTED_THRESHOLD 600   // Don't advertise tracks older than X seconds as currently playing
-#define FINISHED_THRESHOLD 10   // Don't store tracks played less than X seconds in the playback log
-#define SUBMISSION_THRESHOLD 20 // Don't broadcast playback logs when a track was played less than X seconds
-
-using namespace Tomahawk;
-
-
-void
-DatabaseCommand_LogPlayback::postCommitHook()
-{
-    connect( this, SIGNAL( trackPlaying( Tomahawk::query_ptr, unsigned int ) ),
-             source().data(), SLOT( onPlaybackStarted( Tomahawk::query_ptr, unsigned int ) ), Qt::QueuedConnection );
-    connect( this, SIGNAL( trackPlayed( Tomahawk::query_ptr ) ),
-             source().data(), SLOT( onPlaybackFinished( Tomahawk::query_ptr ) ), Qt::QueuedConnection );
-
-    Tomahawk::query_ptr q;
-    if ( !m_result.isNull() )
-    {
-        q = m_result->toQuery();
-    }
-    else
-    {
-        // do not auto resolve this track
-        q = Tomahawk::Query::get( m_artist, m_track, QString() );
-    }
-    q->setPlayedBy( source(), m_playtime );
-
-    if ( m_action == Finished )
-    {
-        emit trackPlayed( q );
-    }
-    // if the play time is more than 10 minutes in the past, ignore
-    else if ( m_action == Started && QDateTime::fromTime_t( playtime() ).secsTo( QDateTime::currentDateTime() ) < STARTED_THRESHOLD )
-    {
-        emit trackPlaying( q, m_trackDuration );
-    }
-
-    if ( source()->isLocal() )
-    {
-        Servent::instance()->triggerDBSync();
-    }
-}
-
-
-void
-DatabaseCommand_LogPlayback::exec( DatabaseImpl* dbi )
-{
-    Q_ASSERT( !source().isNull() );
-
-    if ( m_action != Finished )
-        return;
-    if ( m_secsPlayed < FINISHED_THRESHOLD )
-        return;
-
-    TomahawkSqlQuery query = dbi->newquery();
-    query.prepare( "INSERT INTO playback_log(source, track, playtime, secs_played) "
-                   "VALUES (?, ?, ?, ?)" );
-
-    QVariant srcid = source()->isLocal() ? QVariant( QVariant::Int ) : source()->id();
-    qDebug() << "Logging playback of" << m_artist << "-" << m_track << "for source" << srcid;
-    query.bindValue( 0, srcid );
-
-    // If there's no artist, becuase it's a resolver result with bad metadata for example, don't save it
-    bool autoCreate = m_artist.isEmpty();
-    int artid = dbi->artistId( m_artist, autoCreate );
-    if( artid < 1 )
-        return;
-
-    autoCreate = true; // artistId overwrites autoCreate (reference)
-    int trkid = dbi->trackId( artid, m_track, autoCreate );
-    if( trkid < 1 )
-        return;
-
-    query.bindValue( 1, trkid );
-    query.bindValue( 2, m_playtime );
-    query.bindValue( 3, m_secsPlayed );
-
-    query.exec();
-}
-
-
-bool
-DatabaseCommand_LogPlayback::localOnly() const
-{
-    if ( m_action == Finished )
-        return m_secsPlayed < SUBMISSION_THRESHOLD;
-
-    return false;
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_logplayback.h Deleted

@@ -1,108 +0,0 @@
-/* === 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
- *   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_LOGPLAYBACK_H
-#define DATABASECOMMAND_LOGPLAYBACK_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "database/databasecommandloggable.h"
-#include "sourcelist.h"
-#include "typedefs.h"
-#include "artist.h"
-#include "query.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_LogPlayback : public DatabaseCommandLoggable
-{
-Q_OBJECT
-Q_PROPERTY( QString artist READ artist WRITE setArtist )
-Q_PROPERTY( QString track READ track WRITE setTrack )
-Q_PROPERTY( unsigned int playtime READ playtime WRITE setPlaytime )
-Q_PROPERTY( unsigned int secsPlayed READ secsPlayed WRITE setSecsPlayed )
-Q_PROPERTY( unsigned int trackDuration READ trackDuration WRITE setTrackDuration )
-Q_PROPERTY( int action READ action WRITE setAction )
-
-public:
-    enum Action
-    {
-        Started = 1,
-        Finished = 2
-    };
-
-    explicit DatabaseCommand_LogPlayback( QObject* parent = 0 )
-        : DatabaseCommandLoggable( parent ), m_playtime( 0 ), m_secsPlayed( 0 ), m_trackDuration( 0 )
-    {}
-
-    explicit DatabaseCommand_LogPlayback( const Tomahawk::result_ptr& result, Action action, unsigned int secsPlayed = 0, QObject* parent = 0 )
-        : DatabaseCommandLoggable( parent ), m_result( result ), m_secsPlayed( secsPlayed ), m_action( action )
-    {
-        m_playtime = QDateTime::currentDateTimeUtc().toTime_t();
-        m_trackDuration = result->duration();
-        setSource( SourceList::instance()->getLocal() );
-
-        setArtist( result->artist()->name() );
-        setTrack( result->track() );
-    }
-
-    virtual QString commandname() const { return "logplayback"; }
-
-    virtual void exec( DatabaseImpl* );
-    virtual void postCommitHook();
-
-    virtual bool doesMutates() const { return true; }
-    virtual bool singletonCmd() const { return ( m_action == Started ); }
-    virtual bool localOnly() const;
-    virtual bool groupable() const { return true; }
-
-    QString artist() const { return m_artist; }
-    void setArtist( const QString& s ) { m_artist = s; }
-
-    QString track() const { return m_track; }
-    void setTrack( const QString& s ) { m_track = s; }
-
-    unsigned int playtime() const { return m_playtime; }
-    void setPlaytime( unsigned int i ) { m_playtime = i; }
-
-    unsigned int secsPlayed() const { return m_secsPlayed; }
-    void setSecsPlayed( unsigned int i ) { m_secsPlayed = i; }
-
-    unsigned int trackDuration() const { return m_trackDuration; }
-    void setTrackDuration( unsigned int trackDuration ) { m_trackDuration = trackDuration; }
-
-    int action() const { return m_action; }
-    void setAction( int a ) { m_action = (Action)a; }
-
-signals:
-    void trackPlaying( const Tomahawk::query_ptr& query, unsigned int duration );
-    void trackPlayed( const Tomahawk::query_ptr& query );
-
-private:
-    Tomahawk::result_ptr m_result;
-
-    QString m_artist;
-    QString m_track;
-    unsigned int m_playtime;
-    unsigned int m_secsPlayed;
-    unsigned int m_trackDuration;
-    Action m_action;
-};
-
-#endif // DATABASECOMMAND_LOGPLAYBACK_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_modifyplaylist.cpp Deleted

@@ -1,42 +0,0 @@
-/* === 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
- *   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_modifyplaylist.h"
-
-#include "utils/logger.h"
-#include "playlist.h"
-
-using namespace Tomahawk;
-
-
-DatabaseCommand_ModifyPlaylist::DatabaseCommand_ModifyPlaylist( Playlist* playlist, const QList< plentry_ptr >& entries, Mode mode )
-    : DatabaseCommand()
-    , m_playlist( playlist )
-    , m_entries( entries )
-    , m_mode( mode )
-{
-}
-
-DatabaseCommand_ModifyPlaylist::~DatabaseCommand_ModifyPlaylist()
-{}
-
-void
-DatabaseCommand_ModifyPlaylist::exec( DatabaseImpl* lib )
-{
-    Q_UNUSED( lib );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_modifyplaylist.h Deleted

@@ -1,59 +0,0 @@
-/* === 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
- *   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_MODIFYPLAYLIST_H
-#define DATABASECOMMAND_MODIFYPLAYLIST_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "typedefs.h"
-#include "databasecommand.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_ModifyPlaylist : public DatabaseCommand
-{
-Q_OBJECT
-Q_PROPERTY( int mode READ mode WRITE setMode )
-
-public:
-    enum Mode
-    {
-        ADD = 1,
-        REMOVE = 2,
-        UPDATE = 3
-    };
-
-    explicit DatabaseCommand_ModifyPlaylist( Tomahawk::Playlist* playlist, const QList< Tomahawk::plentry_ptr >& entries, Mode mode );
-    virtual ~DatabaseCommand_ModifyPlaylist();
-
-    virtual bool doesMutates() const { return true; }
-
-    virtual void exec( DatabaseImpl* lib );
-
-    int mode() const { return m_mode; }
-    void setMode( int m ) { m_mode = (Mode)m; }
-
-private:
-    Tomahawk::Playlist* m_playlist;
-    QList< Tomahawk::plentry_ptr > m_entries;
-    Mode m_mode;
-};
-
-#endif // DATABASECOMMAND_MODIFYPLAYLIST_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_playbackhistory.cpp Deleted

@@ -1,85 +0,0 @@
-/* === 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
- *   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_playbackhistory.h"
-
-#include <QSqlQuery>
-
-#include "databaseimpl.h"
-#include "sourcelist.h"
-
-#include "utils/logger.h"
-
-
-void
-DatabaseCommand_PlaybackHistory::exec( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery query = dbi->newquery();
-    QList<Tomahawk::query_ptr> ql;
-
-    QString whereToken;
-    if ( !source().isNull() )
-    {
-        whereToken = QString( "WHERE source %1" ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
-    }
-
-    QString sql = QString(
-            "SELECT track, playtime, secs_played, source "
-            "FROM playback_log "
-            "%1 "
-            "ORDER BY playtime DESC "
-            "%2" ).arg( whereToken )
-                  .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );
-
-    query.prepare( sql );
-    query.exec();
-
-    while( query.next() )
-    {
-        TomahawkSqlQuery query_track = dbi->newquery();
-
-        QString sql = QString(
-                "SELECT track.name, artist.name "
-                "FROM track, artist "
-                "WHERE artist.id = track.artist "
-                "AND track.id = %1"
-                ).arg( query.value( 0 ).toUInt() );
-
-        query_track.prepare( sql );
-        query_track.exec();
-
-        if ( query_track.next() )
-        {
-            Tomahawk::query_ptr q = Tomahawk::Query::get( query_track.value( 1 ).toString(), query_track.value( 0 ).toString(), QString() );
-
-            if ( query.value( 3 ).toUInt() == 0 )
-            {
-                q->setPlayedBy( SourceList::instance()->getLocal(), query.value( 1 ).toUInt() );
-            }
-            else
-            {
-                q->setPlayedBy( SourceList::instance()->get( query.value( 3 ).toUInt() ), query.value( 1 ).toUInt() );
-            }
-
-            ql << q;
-        }
-    }
-
-    if ( ql.count() )
-        emit tracks( ql );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_playbackhistory.h Deleted

@@ -1,55 +0,0 @@
-/* === 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
- *   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_PLAYBACKHISTORY_H
-#define DATABASECOMMAND_PLAYBACKHISTORY_H
-
-#include <QObject>
-#include <QVariantMap>
-
-#include "databasecommand.h"
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_PlaybackHistory : public DatabaseCommand
-{
-Q_OBJECT
-public:
-    explicit DatabaseCommand_PlaybackHistory( const Tomahawk::source_ptr& source, QObject* parent = 0 )
-        : DatabaseCommand( parent )
-        , m_amount( 0 )
-    {
-        setSource( source );
-    }
-
-    virtual void exec( DatabaseImpl* );
-
-    virtual bool doesMutates() const { return false; }
-    virtual QString commandname() const { return "playbackhistory"; }
-
-    void setLimit( unsigned int amount ) { m_amount = amount; }
-
-signals:
-    void tracks( const QList<Tomahawk::query_ptr>& queries );
-
-private:
-    unsigned int m_amount;
-};
-
-#endif // DATABASECOMMAND_PLAYBACKHISTORY_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_renameplaylist.cpp Deleted

@@ -1,75 +0,0 @@
-/* === 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
- *   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_renameplaylist.h"
-
-#include <QSqlQuery>
-
-#include "databaseimpl.h"
-#include "collection.h"
-#include "source.h"
-#include "network/servent.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-DatabaseCommand_RenamePlaylist::DatabaseCommand_RenamePlaylist( const source_ptr& source, const QString& playlistguid, const QString& playlistTitle )
-    : DatabaseCommandLoggable( source )
-{
-    setPlaylistguid( playlistguid );
-    setPlaylistTitle( playlistTitle );
-}
-
-
-void
-DatabaseCommand_RenamePlaylist::exec( DatabaseImpl* lib )
-{
-    TomahawkSqlQuery cre = lib->newquery();
-
-    QString sql = QString( "UPDATE playlist SET title = :title WHERE guid = :id AND source %1" )
-                     .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
-
-    cre.prepare( sql );
-    cre.bindValue( ":id", m_playlistguid );
-    cre.bindValue( ":title", m_playlistTitle );
-
-    qDebug() << Q_FUNC_INFO << m_playlistTitle << m_playlistguid;
-
-    cre.exec();
-}
-
-
-void
-DatabaseCommand_RenamePlaylist::postCommitHook()
-{
-    playlist_ptr playlist = source()->collection()->playlist( m_playlistguid );
-    // fallback, check for auto and stations too
-    if( playlist.isNull() )
-        playlist = source()->collection()->autoPlaylist( m_playlistguid );
-    if( playlist.isNull() )
-        playlist = source()->collection()->station( m_playlistguid );
-
-    Q_ASSERT( !playlist.isNull() );
-
-    qDebug() << "Renaming old playlist" << playlist->title() << "to" << m_playlistTitle << m_playlistguid;
-    playlist->setTitle( m_playlistTitle );
-
-    if( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_renameplaylist.h Deleted

@@ -1,59 +0,0 @@
-/* === 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
- *   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_RENAMEPLAYLIST_H
-#define DATABASECOMMAND_RENAMEPLAYLIST_H
-
-#include "typedefs.h"
-#include "databasecommandloggable.h"
-
-#include "dllmacro.h"
-
-class DatabaseImpl;
-
-class DLLEXPORT DatabaseCommand_RenamePlaylist : public DatabaseCommandLoggable
-{
-Q_OBJECT
-Q_PROPERTY( QString playlistguid READ playlistguid WRITE setPlaylistguid )
-Q_PROPERTY( QString playlistTitle READ playlistTitle WRITE setPlaylistTitle )
-
-public:
-    explicit DatabaseCommand_RenamePlaylist( QObject* parent = 0 )
-            : DatabaseCommandLoggable( parent )
-    {}
-
-    explicit DatabaseCommand_RenamePlaylist( const Tomahawk::source_ptr& source, const QString& playlistguid, const QString& playlistTitle );
-
-    QString commandname() const { return "renameplaylist"; }
-
-    virtual void exec( DatabaseImpl* lib );
-    virtual void postCommitHook();
-    virtual bool doesMutates() const { return true; }
-
-    QString playlistguid() const { return m_playlistguid; }
-    void setPlaylistguid( const QString& s ) { m_playlistguid = s; }
-
-    QString playlistTitle() const { return m_playlistTitle; }
-    void setPlaylistTitle( const QString& s ) { m_playlistTitle = s; }
-
-private:
-    QString m_playlistguid;
-    QString m_playlistTitle;
-};
-
-#endif // DATABASECOMMAND_RENAMEPLAYLIST_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_resolve.cpp Deleted

@@ -1,339 +0,0 @@
-/* === 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
- *   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_resolve.h"
-
-#include "artist.h"
-#include "album.h"
-#include "pipeline.h"
-#include "sourcelist.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-DatabaseCommand_Resolve::DatabaseCommand_Resolve( const query_ptr& query )
-    : DatabaseCommand()
-    , m_query( query )
-{
-    Q_ASSERT( Pipeline::instance()->isRunning() );
-}
-
-
-DatabaseCommand_Resolve::~DatabaseCommand_Resolve()
-{
-}
-
-
-void
-DatabaseCommand_Resolve::exec( DatabaseImpl* lib )
-{
-    /*
-     *        Resolving is a 2 stage process.
-     *        1) find list of trk/art/alb IDs that are reasonable matches to the metadata given
-     *        2) find files in database by permitted sources and calculate score, ignoring
-     *           results that are less than MINSCORE
-     */
-
-    if ( !m_query->resultHint().isEmpty() )
-    {
-        qDebug() << "Using result-hint to speed up resolving:" << m_query->resultHint();
-
-        Tomahawk::result_ptr result = lib->resultFromHint( m_query );
-        if ( !result.isNull() && !result->collection().isNull() && result->collection()->source()->isOnline() )
-        {
-            QList<Tomahawk::result_ptr> res;
-            res << result;
-            emit results( m_query->id(), res );
-            return;
-        }
-    }
-
-    if ( m_query->isFullTextQuery() )
-        fullTextResolve( lib );
-    else
-        resolve( lib );
-}
-
-
-void
-DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
-{
-    QList<Tomahawk::result_ptr> res;
-    typedef QPair<int, float> scorepair_t;
-
-    // STEP 1
-    QList< QPair<int, float> > tracks = lib->search( m_query );
-
-    if ( tracks.length() == 0 )
-    {
-        qDebug() << "No candidates found in first pass, aborting resolve" << m_query->artist() << m_query->track();
-        emit results( m_query->id(), res );
-        return;
-    }
-
-    // STEP 2
-    TomahawkSqlQuery files_query = lib->newquery();
-
-    QStringList trksl;
-    for ( int k = 0; k < tracks.count(); k++ )
-        trksl.append( QString::number( tracks.at( k ).first ) );
-
-    QString trksToken = QString( "file_join.track IN (%1)" ).arg( trksl.join( "," ) );
-
-    QString sql = QString( "SELECT "
-                            "url, mtime, size, md5, mimetype, duration, bitrate, "  //0
-                            "file_join.artist, file_join.album, file_join.track, "  //7
-                            "file_join.composer, file_join.discnumber, "            //10
-                            "artist.name as artname, "                              //12
-                            "album.name as albname, "                               //13
-                            "track.name as trkname, "                               //14
-                            "composer.name as cmpname, "                            //15
-                            "file.source, "                                         //16
-                            "file_join.albumpos, "                                  //17
-                            "artist.id as artid, "                                  //18
-                            "album.id as albid, "                                   //19
-                            "composer.id as cmpid "                                 //20
-                            "FROM file, file_join, artist, track "
-                            "LEFT JOIN album ON album.id = file_join.album "
-                            "LEFT JOIN artist AS composer ON composer.id = file_join.composer "
-                            "WHERE "
-                            "artist.id = file_join.artist AND "
-                            "track.id = file_join.track AND "
-                            "file.id = file_join.file AND "
-                            "(%1)" )
-         .arg( trksToken );
-
-    files_query.prepare( sql );
-    files_query.exec();
-
-    while ( files_query.next() )
-    {
-        source_ptr s;
-        QString url = files_query.value( 0 ).toString();
-
-        if ( files_query.value( 16 ).toUInt() == 0 )
-        {
-            s = SourceList::instance()->getLocal();
-        }
-        else
-        {
-            s = SourceList::instance()->get( files_query.value( 16 ).toUInt() );
-            if ( s.isNull() )
-            {
-                qDebug() << "Could not find source" << files_query.value( 16 ).toUInt();
-                continue;
-            }
-
-            url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
-        }
-
-        bool cached = Tomahawk::Result::isCached( url );
-        Tomahawk::result_ptr result = Tomahawk::Result::get( url );
-        if ( cached )
-        {
-            qDebug() << "Result already cached:" << result->toString();
-            res << result;
-            continue;
-        }
-
-        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( files_query.value( 18 ).toUInt(), files_query.value( 12 ).toString() );
-        Tomahawk::album_ptr album = Tomahawk::Album::get( files_query.value( 19 ).toUInt(), files_query.value( 13 ).toString(), artist );
-        Tomahawk::artist_ptr composer = Tomahawk::Artist::get( files_query.value( 20 ).toUInt(), files_query.value( 15 ).toString() );
-
-        result->setModificationTime( files_query.value( 1 ).toUInt() );
-        result->setSize( files_query.value( 2 ).toUInt() );
-        result->setMimetype( files_query.value( 4 ).toString() );
-        result->setDuration( files_query.value( 5 ).toUInt() );
-        result->setBitrate( files_query.value( 6 ).toUInt() );
-        result->setArtist( artist );
-        result->setComposer( composer );
-        result->setAlbum( album );
-        result->setDiscNumber( files_query.value( 11 ).toUInt() );
-        result->setTrack( files_query.value( 14 ).toString() );
-        result->setRID( uuid() );
-        result->setAlbumPos( files_query.value( 17 ).toUInt() );
-        result->setTrackId( files_query.value( 9 ).toUInt() );
-
-        TomahawkSqlQuery attrQuery = lib->newquery();
-        QVariantMap attr;
-
-        attrQuery.prepare( "SELECT k, v FROM track_attributes WHERE id = ?" );
-        attrQuery.bindValue( 0, result->trackId() );
-        attrQuery.exec();
-        while ( attrQuery.next() )
-        {
-            attr attrQuery.value( 0 ).toString()  = attrQuery.value( 1 ).toString();
-        }
-
-        result->setAttributes( attr );
-        result->setCollection( s->collection() );
-
-        res << result;
-    }
-
-    emit results( m_query->id(), res );
-}
-
-
-void
-DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
-{
-    QList<Tomahawk::result_ptr> res;
-    typedef QPair<int, float> scorepair_t;
-
-    // STEP 1
-    QList< QPair<int, float> > trackPairs = lib->search( m_query );
-    QList< QPair<int, float> > albumPairs = lib->searchAlbum( m_query, 20 );
-
-    foreach ( const scorepair_t& albumPair, albumPairs )
-    {
-        TomahawkSqlQuery query = lib->newquery();
-
-        QString sql = QString( "SELECT album.name, artist.id, artist.name FROM album, artist WHERE artist.id = album.artist AND album.id = %1" ).arg( albumPair.first );
-        query.prepare( sql );
-        query.exec();
-
-        QList<Tomahawk::album_ptr> albumList;
-        while ( query.next() )
-        {
-            Tomahawk::artist_ptr artist = Tomahawk::Artist::get( query.value( 1 ).toUInt(), query.value( 2 ).toString() );
-            Tomahawk::album_ptr album = Tomahawk::Album::get( albumPair.first, query.value( 0 ).toString(), artist );
-            albumList << album;
-        }
-
-        emit albums( m_query->id(), albumList );
-    }
-    
-    if ( trackPairs.length() == 0 )
-    {
-        qDebug() << "No candidates found in first pass, aborting resolve" << m_query->fullTextQuery();
-        emit results( m_query->id(), res );
-        return;
-    }
-
-    // STEP 2
-    TomahawkSqlQuery files_query = lib->newquery();
-
-    QStringList trksl;
-    for ( int k = 0; k < trackPairs.count(); k++ )
-        trksl.append( QString::number( trackPairs.at( k ).first ) );
-
-    QString trksToken = QString( "file_join.track IN (%1)" ).arg( trksl.join( "," ) );
-    QString sql = QString( "SELECT "
-                            "url, mtime, size, md5, mimetype, duration, bitrate, "  //0
-                            "file_join.artist, file_join.album, file_join.track, "  //7
-                            "file_join.composer, file_join.discnumber, "            //10
-                            "artist.name as artname, "                              //12
-                            "album.name as albname, "                               //13
-                            "track.name as trkname, "                               //14
-                            "composer.name as cmpname, "                            //15
-                            "file.source, "                                         //16
-                            "file_join.albumpos, "                                  //17
-                            "artist.id as artid, "                                  //18
-                            "album.id as albid, "                                   //19
-                            "composer.id as cmpid "                                 //20
-                            "FROM file, file_join, artist, track "
-                            "LEFT JOIN album ON album.id = file_join.album "
-                            "LEFT JOIN artist AS composer ON composer.id = file_join.composer "
-                            "WHERE "
-                            "artist.id = file_join.artist AND "
-                            "track.id = file_join.track AND "
-                            "file.id = file_join.file AND "
-                            "%1" )
-                        .arg( trksl.length() > 0 ? trksToken : QString( "0" ) );
-
-    files_query.prepare( sql );
-    files_query.exec();
-
-    while ( files_query.next() )
-    {
-        source_ptr s;
-        QString url = files_query.value( 0 ).toString();
-
-        if ( files_query.value( 16 ).toUInt() == 0 )
-        {
-            s = SourceList::instance()->getLocal();
-        }
-        else
-        {
-            s = SourceList::instance()->get( files_query.value( 16 ).toUInt() );
-            if ( s.isNull() )
-            {
-                qDebug() << "Could not find source" << files_query.value( 16 ).toUInt();
-                continue;
-            }
-
-            url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
-        }
-
-        bool cached = Tomahawk::Result::isCached( url );
-        Tomahawk::result_ptr result = Tomahawk::Result::get( url );
-        if ( cached )
-        {
-            qDebug() << "Result already cached:" << result->toString();
-            res << result;
-            continue;
-        }
-
-        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( files_query.value( 18 ).toUInt(), files_query.value( 12 ).toString() );
-        Tomahawk::album_ptr album = Tomahawk::Album::get( files_query.value( 19 ).toUInt(), files_query.value( 13 ).toString(), artist );
-        Tomahawk::artist_ptr composer = Tomahawk::Artist::get( files_query.value( 20 ).toUInt(), files_query.value( 15 ).toString() );
-
-        result->setModificationTime( files_query.value( 1 ).toUInt() );
-        result->setSize( files_query.value( 2 ).toUInt() );
-        result->setMimetype( files_query.value( 4 ).toString() );
-        result->setDuration( files_query.value( 5 ).toUInt() );
-        result->setBitrate( files_query.value( 6 ).toUInt() );
-        result->setArtist( artist );
-        result->setComposer( composer );
-        result->setAlbum( album );
-        result->setDiscNumber( files_query.value( 11 ).toUInt() );
-        result->setTrack( files_query.value( 14 ).toString() );
-        result->setRID( uuid() );
-        result->setAlbumPos( files_query.value( 17 ).toUInt() );
-        result->setTrackId( files_query.value( 9 ).toUInt() );
-
-        for ( int k = 0; k < trackPairs.count(); k++ )
-        {
-            if ( trackPairs.at( k ).first == (int)result->trackId() )
-            {
-                result->setScore( trackPairs.at( k ).second );
-                break;
-            }
-        }
-
-        TomahawkSqlQuery attrQuery = lib->newquery();
-        QVariantMap attr;
-
-        attrQuery.prepare( "SELECT k, v FROM track_attributes WHERE id = ?" );
-        attrQuery.bindValue( 0, result->trackId() );
-        attrQuery.exec();
-        while ( attrQuery.next() )
-        {
-            attr attrQuery.value( 0 ).toString()  = attrQuery.value( 1 ).toString();
-        }
-
-        result->setAttributes( attr );
-        result->setCollection( s->collection() );
-
-        res << result;
-    }
-
-    emit results( m_query->id(), res );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_resolve.h Deleted

@@ -1,58 +0,0 @@
-/* === 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
- *   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_RESOLVE_H
-#define DATABASECOMMAND_RESOLVE_H
-
-#include "databasecommand.h"
-#include "databaseimpl.h"
-#include "result.h"
-#include "artist.h"
-#include "album.h"
-
-#include <QVariant>
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_Resolve : public DatabaseCommand
-{
-Q_OBJECT
-public:
-    explicit DatabaseCommand_Resolve( const Tomahawk::query_ptr& query );
-    virtual ~DatabaseCommand_Resolve();
-
-    virtual QString commandname() const { return "dbresolve"; }
-    virtual bool doesMutates() const { return false; }
-
-    virtual void exec( DatabaseImpl *lib );
-
-signals:
-    void results( Tomahawk::QID qid, QList<Tomahawk::result_ptr> results );
-    void albums( Tomahawk::QID qid, QList<Tomahawk::album_ptr> albums );
-    void artists( Tomahawk::QID qid, QList<Tomahawk::artist_ptr> artists );
-
-private:
-    DatabaseCommand_Resolve();
-
-    void fullTextResolve( DatabaseImpl* lib );
-    void resolve( DatabaseImpl* lib );
-
-    Tomahawk::query_ptr m_query;
-};
-
-#endif // DATABASECOMMAND_RESOLVE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_setcollectionattributes.cpp Deleted

@@ -1,82 +0,0 @@
-/* === 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_setcollectionattributes.h"
-
-#include "databaseimpl.h"
-#include "source.h"
-#include "network/servent.h"
-#include "sourcelist.h"
-#include "EchonestCatalogSynchronizer.h"
-
-DatabaseCommand_SetCollectionAttributes::DatabaseCommand_SetCollectionAttributes( AttributeType type, const QByteArray& id )
-    : DatabaseCommandLoggable( )
-    , m_delete( false )
-    , m_type( type )
-    , m_id( id )
-{
-}
-
-DatabaseCommand_SetCollectionAttributes::DatabaseCommand_SetCollectionAttributes( DatabaseCommand_SetCollectionAttributes::AttributeType type, bool toDelete )
-    : DatabaseCommandLoggable()
-    , m_delete( toDelete )
-    , m_type( type )
-{
-}
-
-
-void
-DatabaseCommand_SetCollectionAttributes::exec( DatabaseImpl *lib )
-{
-    TomahawkSqlQuery query = lib->newquery();
-
-    QString sourceStr;
-    if ( source().isNull() )
-        setSource( SourceList::instance()->getLocal() );
-
-    if ( source().isNull() || source()->isLocal() )
-        sourceStr = "NULL";
-    else
-        sourceStr = QString( "%1" ).arg( source()->id() );
-
-    QString typeStr;
-    if ( m_type == EchonestSongCatalog )
-        typeStr = "echonest_song";
-    else if ( m_type == EchonestArtistCatalog )
-        typeStr = "echonest_artist";
-
-    TomahawkSqlQuery delQuery = lib->newquery();
-    delQuery.exec( QString( "DELETE FROM collection_attributes WHERE id %1" ).arg( source()->isLocal() ? QString("IS NULL") : QString( "= %1" ).arg( source()->id() )));
-
-    if ( m_delete )
-        return;
-
-    QString queryStr = QString( "INSERT INTO collection_attributes ( id, k, v ) VALUES( %1, \"%2\", \"%3\" )" ).arg( sourceStr ).arg( typeStr ).arg( QString::fromUtf8( m_id ) );
-    qDebug() << "Doing query:" << queryStr;
-    query.exec( queryStr );
-}
-
-void
-DatabaseCommand_SetCollectionAttributes::postCommitHook()
-{
-    if ( m_type == EchonestSongCatalog ||
-         m_type == EchonestArtistCatalog )
-        Tomahawk::EchonestCatalogSynchronizer::instance()->knownCatalogsChanged();
-
-    if ( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_setcollectionattributes.h Deleted

@@ -1,63 +0,0 @@
-/* === 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_SETCOLLECTIONATTRIBUTES
-#define DATABASECOMMAND_SETCOLLECTIONATTRIBUTES
-
-#include "typedefs.h"
-#include "databasecommandloggable.h"
-#include <QByteArray>
-
-class DatabaseCommand_SetCollectionAttributes : public DatabaseCommandLoggable
-{
-    Q_OBJECT
-    Q_PROPERTY( QByteArray     id                    READ id          WRITE setId )
-    Q_PROPERTY( int           type                   READ type        WRITE setType )
-    Q_PROPERTY( bool          del                    READ del         WRITE setDel )
-
-public:
-    enum AttributeType {
-        EchonestSongCatalog = 0,
-        EchonestArtistCatalog = 1
-    };
-
-    DatabaseCommand_SetCollectionAttributes( AttributeType type, const QByteArray& id );
-    // Delete all attributes for the source+type
-    DatabaseCommand_SetCollectionAttributes( AttributeType type, bool toDelete );
-    DatabaseCommand_SetCollectionAttributes() : m_delete( false ) {} // JSON
-    virtual void exec( DatabaseImpl* lib );
-    virtual bool doesMutates() const { return true; }
-    virtual void postCommitHook();
-
-    virtual QString commandname() const { return "setcollectionattributes"; }
-
-    void setId( const QByteArray& id ) { m_id = id; }
-    QByteArray id() const { return m_id; }
-
-    void setType( int type ) { m_type = (AttributeType)type; }
-    int type() const { return (int)m_type; }
-
-    void setDel( bool del ) { m_delete = del; }
-    bool del() const { return m_delete; }
-private:
-    bool m_delete;
-    AttributeType m_type;
-    QByteArray m_id;
-};
-
-#endif // DATABASECOMMAND_SETCOLLECTIONATTRIBUTES

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.cpp Deleted

@@ -1,271 +0,0 @@
-/* === 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_setdynamicplaylistrevision.h"
-
-#include <QSqlQuery>
-
-#include "source.h"
-#include "databaseimpl.h"
-#include "tomahawksqlquery.h"
-#include "dynamic/DynamicPlaylist.h"
-#include "dynamic/DynamicControl.h"
-#include "network/servent.h"
-#include "utils/logger.h"
-
-
-DatabaseCommand_SetDynamicPlaylistRevision::DatabaseCommand_SetDynamicPlaylistRevision( const Tomahawk::source_ptr& s,
-                                                                                const QString& playlistguid,
-                                                                                const QString& newrev,
-                                                                                const QString& oldrev,
-                                                                                const QStringList& orderedguids,
-                                                                                const QList< plentry_ptr >& addedentries,
-                                                                                const QList<plentry_ptr>& entries,
-                                                                                const QString& type,
-                                                                                GeneratorMode mode,
-                                                                                const QList< dyncontrol_ptr >& controls )
-    : DatabaseCommand_SetPlaylistRevision( s, playlistguid, newrev, oldrev, orderedguids, addedentries, entries )
-    , m_type( type )
-    , m_mode( mode )
-    , m_controls( controls )
-    , m_playlist( 0 )
-{
-
-}
-
-
-DatabaseCommand_SetDynamicPlaylistRevision::DatabaseCommand_SetDynamicPlaylistRevision( const Tomahawk::source_ptr& s,
-                                                                                const QString& playlistguid,
-                                                                                const QString& newrev,
-                                                                                const QString& oldrev,
-                                                                                const QString& type,
-                                                                                GeneratorMode mode,
-                                                                                const QList< dyncontrol_ptr >& controls )
-    : DatabaseCommand_SetPlaylistRevision( s, playlistguid, newrev, oldrev, QStringList(), QList< plentry_ptr >(), QList< plentry_ptr >() )
-    , m_type( type )
-    , m_mode( mode )
-    , m_controls( controls )
-    , m_playlist( 0 )
-{
-
-}
-
-
-QVariantList
-DatabaseCommand_SetDynamicPlaylistRevision::controlsV()
-{
-    if ( m_controls.isEmpty() )
-        return m_controlsV;
-
-    if ( !m_controls.isEmpty() && m_controlsV.isEmpty() )
-    {
-        foreach ( const dyncontrol_ptr& control, m_controls )
-        {
-            m_controlsV << QJson::QObjectHelper::qobject2qvariant( control.data() );
-        }
-    }
-
-    return m_controlsV;
-}
-
-
-void
-DatabaseCommand_SetDynamicPlaylistRevision::postCommitHook()
-{
-    if ( source().isNull() || source()->collection().isNull() )
-    {
-        tDebug() << "Source has gone offline, not emitting to GUI.";
-        return;
-    }
-
-    QStringList orderedentriesguids;
-    foreach( const QVariant& v, orderedguids() )
-        orderedentriesguids << v.toString();
-
-    Q_ASSERT( !source().isNull() );
-    Q_ASSERT( !source()->collection().isNull() );
-    tLog() << "Postcommitting this playlist:" << playlistguid() << source().isNull();
-
-    // private, but we are a friend. will recall itself in its own thread:
-    dynplaylist_ptr playlist = source()->collection()->autoPlaylist( playlistguid() );
-    if ( playlist.isNull() )
-        playlist = source()->collection()->station( playlistguid() );
-    // UGH we don't have a sharedptr from DynamicPlaylist+
-
-    DynamicPlaylist* rawPl = playlist.data();
-    if( playlist.isNull() ) // if it's neither an auto or station, it must not be auto-loaded, so we MUST have been told about it directly
-        rawPl = m_playlist;
-
-    // workaround a bug in pre-0.1.0 tomahawks. they created dynamic playlists in OnDemand mode *always*, and then set the mode to the real one.
-    // now that we separate them, if we get them as one and then get a changed mode, the playlist ends up in the wrong bucket in Collection.
-    // so here we fix it if we have to.
-    // HACK
-        tDebug() << "Does this need the 0.3->0.1 playlist category hack fix?" << ( rawPl->mode() == Static && source()->collection()->autoPlaylist( playlistguid() ).isNull() )
-        <<  ( rawPl->mode() == OnDemand && source()->collection()->station( playlistguid() ).isNull() )
-                    << rawPl->mode() << source()->collection()->autoPlaylist( playlistguid() ).isNull() << source()->collection()->station( playlistguid() ).isNull();
-    if( rawPl->mode() == Static && source()->collection()->autoPlaylist( playlistguid() ).isNull() ) // should be here
-        source()->collection()->moveStationToAuto( playlistguid() );
-    else if ( rawPl->mode() == OnDemand && source()->collection()->station( playlistguid() ).isNull() ) // should be here
-        source()->collection()->moveAutoToStation( playlistguid() );
-
-    if ( rawPl == 0 )
-    {
-        tLog() <<"Got null playlist with guid:" << playlistguid() << "from source and collection:" << source()->friendlyName() << source()->collection()->name() << "and mode is static?:" << (m_mode == Static);
-        Q_ASSERT( false );
-        return;
-    }
-    if ( !m_controlsV.isEmpty() && m_controls.isEmpty() )
-    {
-        QList<QVariantMap> controlMap;
-        foreach( const QVariant& v, m_controlsV )
-            controlMap << v.toMap();
-
-        if ( m_mode == OnDemand )
-            rawPl->setRevision(  newrev(),
-                                    true, // this *is* the newest revision so far
-                                    m_type,
-                                    controlMap,
-                                    m_applied );
-        else
-            rawPl->setRevision(  newrev(),
-                                    orderedentriesguids,
-                                    m_previous_rev_orderedguids,
-                                    m_type,
-                                    controlMap,
-                                    true, // this *is* the newest revision so far
-                                    m_addedmap,
-                                    m_applied );
-    }
-    else
-    {
-        if ( m_mode == OnDemand )
-            rawPl->setRevision(  newrev(),
-                                    true, // this *is* the newest revision so far
-                                    m_type,
-                                    m_controls,
-                                    m_applied );
-        else
-            rawPl->setRevision(  newrev(),
-                                    orderedentriesguids,
-                                    m_previous_rev_orderedguids,
-                                    m_type,
-                                    m_controls,
-                                    true, // this *is* the newest revision so far
-                                    m_addedmap,
-                                    m_applied );
-    }
-
-    if ( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
-}
-
-
-void
-DatabaseCommand_SetDynamicPlaylistRevision::exec( DatabaseImpl* lib )
-{
-    DatabaseCommand_SetPlaylistRevision::exec( lib );
-
-    QVariantList newcontrols;
-    if ( m_controlsV.isEmpty() && !m_controls.isEmpty() )
-    {
-        foreach( const dyncontrol_ptr& control, m_controls )
-        {
-            newcontrols << control->id();
-        }
-    }
-    else if( !m_controlsV.isEmpty() )
-    {
-        foreach( const QVariant& v, m_controlsV )
-        {
-            newcontrols << v.toMap().value( "id" );
-        }
-    }
-
-    QJson::Serializer ser;
-    const QByteArray newcontrols_data = ser.serialize( newcontrols );
-
-    TomahawkSqlQuery query = lib->newquery();
-    QString sql = "INSERT INTO dynamic_playlist_revision (guid, controls, plmode, pltype) "
-                  "VALUES(?, ?, ?, ?)";
-
-    query.prepare( sql );
-    query.addBindValue( m_newrev );
-    query.addBindValue( newcontrols_data );
-    query.addBindValue( QString::number( (int) m_mode ) );
-    query.addBindValue( m_type );
-    query.exec();
-
-    // delete all the old controls, replace with new onws
-    qDebug() << "Deleting controls with playlist id" << m_playlistguid;
-    TomahawkSqlQuery delQuery = lib->newquery();
-    delQuery.prepare( "DELETE FROM dynamic_playlist_controls WHERE playlist = ?" );
-    delQuery.addBindValue( m_playlistguid );
-    if ( !delQuery.exec() )
-        tLog() << "Failed to delete controls from dynamic playlist controls table";
-
-    TomahawkSqlQuery controlsQuery = lib->newquery();
-    controlsQuery.prepare( "INSERT INTO dynamic_playlist_controls( id, playlist, selectedType, match, input ) "
-                            "VALUES( ?, ?, ?, ?, ? )" );
-    if ( m_controlsV.isEmpty() && !m_controls.isEmpty() )
-    {
-        foreach ( const dyncontrol_ptr& control, m_controls )
-        {
-            qDebug() << "inserting dynamic control:" << control->id() << m_playlistguid << control->selectedType() << control->match() << control->input();
-            controlsQuery.addBindValue( control->id() );
-            controlsQuery.addBindValue( m_playlistguid );
-            controlsQuery.addBindValue( control->selectedType() );
-            controlsQuery.addBindValue( control->match() );
-            controlsQuery.addBindValue( control->input() );
-
-            controlsQuery.exec();
-        }
-    }
-    else
-    {
-        foreach ( const QVariant& v, m_controlsV )
-        {
-            QVariantMap control = v.toMap();
-            qDebug() << "inserting dynamic control from JSON:" << control.value( "id" ) << m_playlistguid << control.value( "selectedType" ) << control.value( "match" ) << control.value( "input" );
-            controlsQuery.addBindValue( control.value( "id" ) );
-            controlsQuery.addBindValue( m_playlistguid );
-            controlsQuery.addBindValue( control.value( "selectedType" ) );
-            controlsQuery.addBindValue( control.value( "match" ) );
-            controlsQuery.addBindValue( control.value( "input" ) );
-
-            controlsQuery.exec();
-        }
-    }
-
-    if ( m_applied )
-    {
-        tLog() << "updating dynamic playlist, optimistic locking okay";
-
-        TomahawkSqlQuery query2 = lib->newquery();
-        query2.prepare( "UPDATE dynamic_playlist SET pltype = ?, plmode = ? WHERE guid = ?" );
-        query2.bindValue( 0, m_type );
-        query2.bindValue( 1, m_mode );
-        query2.bindValue( 2, m_playlistguid );
-        query2.exec();
-    }
-}
-
-void
-DatabaseCommand_SetDynamicPlaylistRevision::setPlaylist( DynamicPlaylist* pl )
-{
-    m_playlist = pl;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_setdynamicplaylistrevision.h Deleted

@@ -1,90 +0,0 @@
-/* === 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_SETDYNAMICPLAYLISTREVISION_H
-#define DATABASECOMMAND_SETDYNAMICPLAYLISTREVISION_H
-
-#include "databasecommand_setplaylistrevision.h"
-#include "dynamic/GeneratorInterface.h"
-
-using namespace Tomahawk;
-
-class DatabaseCommand_SetDynamicPlaylistRevision : public DatabaseCommand_SetPlaylistRevision
-{
-    Q_OBJECT
-    Q_PROPERTY( QString type                     READ type          WRITE setType )
-    Q_PROPERTY( int           mode               READ mode          WRITE setMode )
-    Q_PROPERTY( QVariantList controls            READ controlsV     WRITE setControlsV )
-
-public:
-    explicit DatabaseCommand_SetDynamicPlaylistRevision( QObject* parent = 0 )
-    : DatabaseCommand_SetPlaylistRevision( parent )
-    {}
-
-    explicit DatabaseCommand_SetDynamicPlaylistRevision( const source_ptr& s,
-                                                  const QString& playlistguid,
-                                                  const QString& newrev,
-                                                  const QString& oldrev,
-                                                  const QStringList& orderedguids,
-                                                  const QList<Tomahawk::plentry_ptr>& addedentries,
-                                                  const QList<plentry_ptr>& entries,
-                                                  const QString& type,
-                                                  GeneratorMode mode,
-                                                  const QList< dyncontrol_ptr >& controls );
-
-    explicit DatabaseCommand_SetDynamicPlaylistRevision( const source_ptr& s,
-                                                  const QString& playlistguid,
-                                                  const QString& newrev,
-                                                  const QString& oldrev,
-                                                  const QString& type,
-                                                  GeneratorMode mode,
-                                                  const QList< dyncontrol_ptr >& controls );
-
-    QString commandname() const { return "setdynamicplaylistrevision"; }
-
-    virtual void exec( DatabaseImpl* lib );
-    virtual void postCommitHook();
-    virtual bool doesMutates() const { return true; }
-    virtual bool groupable() const { return true; }
-
-    void setControlsV( const QVariantList& vlist )
-    {
-        m_controlsV = vlist;
-    }
-
-    QVariantList controlsV();
-
-    QString type() const { return m_type; }
-    int mode() const { return (int)m_mode; }
-
-    void setType( const QString& type ) { m_type = type; }
-    void setMode( int mode ) { m_mode = (GeneratorMode)mode; }
-
-    void setPlaylist( DynamicPlaylist* pl ); // raw pointer b/c we don't have the shared pointer from inside the shared pointer
-
-private:
-    QString m_type;
-    GeneratorMode m_mode;
-    QList< dyncontrol_ptr > m_controls;
-    QList< QVariant > m_controlsV;
-
-    // ARG i hate sharedpointers sometimes
-    DynamicPlaylist* m_playlist; // Only used if setting revision of a non-autoloaded playlist, as those aren't able to be looked up by guid
-};
-
-#endif // DATABASECOMMAND_SETDYNAMICPLAYLISTREVISION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_setplaylistrevision.cpp Deleted

@@ -1,218 +0,0 @@
-/* === 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
- *   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_setplaylistrevision.h"
-
-#include <QSqlQuery>
-
-#include "source.h"
-#include "databaseimpl.h"
-#include "tomahawksqlquery.h"
-#include "network/servent.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-DatabaseCommand_SetPlaylistRevision::DatabaseCommand_SetPlaylistRevision(
-                      const source_ptr& s,
-                      const QString& playlistguid,
-                      const QString& newrev,
-                      const QString& oldrev,
-                      const QStringList& orderedguids,
-                      const QList<plentry_ptr>& addedentries,
-                      const QList<plentry_ptr>& entries )
-    : DatabaseCommandLoggable( s )
-    , m_applied( false )
-    , m_newrev( newrev )
-    , m_oldrev( oldrev )
-    , m_addedentries( addedentries )
-    , m_entries( entries )
-{
-    Q_ASSERT( !newrev.isEmpty() );
-    m_localOnly = ( newrev == oldrev );
-
-    setPlaylistguid( playlistguid );
-
-    QVariantList tmp;
-    foreach( const QString& s, orderedguids )
-        tmp << s;
-
-    setOrderedguids( tmp );
-}
-
-
-void
-DatabaseCommand_SetPlaylistRevision::postCommitHook()
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( m_localOnly )
-        return;
-
-    QStringList orderedentriesguids;
-    foreach( const QVariant& v, m_orderedguids )
-        orderedentriesguids << v.toString();
-
-    // private, but we are a friend. will recall itself in its own thread:
-    playlist_ptr playlist = source()->collection()->playlist( m_playlistguid );
-    if ( playlist.isNull() )
-    {
-        qDebug() << m_playlistguid;
-        Q_ASSERT( !playlist.isNull() );
-        return;
-    }
-
-    playlist->setRevision( m_newrev,
-                           orderedentriesguids,
-                           m_previous_rev_orderedguids,
-                           true, // this *is* the newest revision so far
-                           m_addedmap,
-                           m_applied );
-
-    if ( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
-}
-
-
-void
-DatabaseCommand_SetPlaylistRevision::exec( DatabaseImpl* lib )
-{
-    // get the current revision for this playlist
-    // this also serves to check the playlist exists.
-    TomahawkSqlQuery chkq = lib->newquery();
-    chkq.prepare( "SELECT currentrevision FROM playlist WHERE guid = ?" );
-    chkq.addBindValue( m_playlistguid );
-    if( chkq.exec() && chkq.next() )
-    {
-        m_currentRevision = chkq.value( 0 ).toString();
-        qDebug() << Q_FUNC_INFO << "pl guid" << m_playlistguid << "- curr rev" << m_currentRevision;
-    }
-    else
-    {
-        tDebug() << "Playlist:" << m_playlistguid << m_currentRevision << source()->friendlyName() << source()->id();
-        throw "No such playlist, WTF?";
-        return;
-    }
-
-    QVariantList vlist = m_orderedguids;
-    QJson::Serializer ser;
-    const QByteArray entries = ser.serialize( vlist );
-
-    // add any new items:
-    TomahawkSqlQuery adde = lib->newquery();
-    if ( m_localOnly )
-    {
-        QString sql = "UPDATE playlist_item SET result_hint = ? WHERE guid = ?";
-        adde.prepare( sql );
-
-        foreach( const plentry_ptr& e, m_entries )
-        {
-            if ( e->query()->results().isEmpty() )
-                continue;
-
-            adde.bindValue( 0, e->query()->results().first()->url() );
-            adde.bindValue( 1, e->guid() );
-            adde.exec();
-        }
-
-        return;
-    }
-    else
-    {
-        QString sql = "INSERT INTO playlist_item( guid, playlist, trackname, artistname, albumname, "
-                                                 "annotation, duration, addedon, addedby, result_hint ) "
-                      "VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
-        adde.prepare( sql );
-
-        qDebug() << "Num new playlist_items to add:" << m_addedentries.length();
-        foreach( const plentry_ptr& e, m_addedentries )
-        {
-            m_addedmap.insert( e->guid(), e ); // needed in postcommithook
-
-            QString resultHint;
-            if ( !e->query()->results().isEmpty() )
-                resultHint = e->query()->results().first()->url();
-            else if ( !e->query()->resultHint().isEmpty() )
-                resultHint = e->query()->resultHint();
-
-            adde.bindValue( 0, e->guid() );
-            adde.bindValue( 1, m_playlistguid );
-            adde.bindValue( 2, e->query()->track() );
-            adde.bindValue( 3, e->query()->artist() );
-            adde.bindValue( 4, e->query()->album() );
-            adde.bindValue( 5, e->annotation() );
-            adde.bindValue( 6, (int) e->duration() );
-            adde.bindValue( 7, e->lastmodified() );
-            adde.bindValue( 8, source()->isLocal() ? QVariant(QVariant::Int) : source()->id() );
-            adde.bindValue( 9, resultHint );
-            adde.exec();
-        }
-    }
-
-    // add / update the revision:
-    TomahawkSqlQuery query = lib->newquery();
-    QString sql = "INSERT INTO playlist_revision(guid, playlist, entries, author, timestamp, previous_revision) "
-                  "VALUES(?, ?, ?, ?, ?, ?)";
-    query.prepare( sql );
-
-    query.addBindValue( m_newrev );
-    query.addBindValue( m_playlistguid );
-    query.addBindValue( entries );
-    query.addBindValue( source()->isLocal() ? QVariant(QVariant::Int) : source()->id() );
-    query.addBindValue( 0 ); //ts
-    query.addBindValue( m_oldrev.isEmpty() ? QVariant(QVariant::String) : m_oldrev );
-    query.exec();
-
-    qDebug() << "Currentrevision:" << m_currentRevision << "oldrev:" << m_oldrev;
-    // if optimistic locking is ok, update current revision to this new one
-    if ( m_currentRevision == m_oldrev )
-    {
-        qDebug() << "Updating current revision, optimistic locking ok";
-
-        TomahawkSqlQuery query2 = lib->newquery();
-        query2.prepare( "UPDATE playlist SET currentrevision = ? WHERE guid = ?" );
-        query2.bindValue( 0, m_newrev );
-        query2.bindValue( 1, m_playlistguid );
-        query2.exec();
-
-        m_applied = true;
-
-        // load previous revision entries, which we need to pass on
-        // so the change can be diffed
-        TomahawkSqlQuery query_entries = lib->newquery();
-        query_entries.prepare( "SELECT entries, playlist, author, timestamp, previous_revision "
-                               "FROM playlist_revision "
-                               "WHERE guid = :guid" );
-        query_entries.bindValue( ":guid", m_oldrev );
-        query_entries.exec();
-        if ( query_entries.next() )
-        {
-            bool ok;
-            QJson::Parser parser;
-            QVariant v = parser.parse( query_entries.value( 0 ).toByteArray(), &ok );
-            Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
-
-            m_previous_rev_orderedguids = v.toStringList();
-        }
-    }
-    else if ( !m_oldrev.isEmpty() )
-    {
-        tDebug() << "Not updating current revision, optimistic locking fail";
-//        Q_ASSERT( false );
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_setplaylistrevision.h Deleted

@@ -1,112 +0,0 @@
-/* === 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
- *   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_SETPLAYLISTREVISION_H
-#define DATABASECOMMAND_SETPLAYLISTREVISION_H
-
-#include "databasecommandloggable.h"
-#include "playlist.h"
-#include "qjson/qobjecthelper.h"
-
-#include "dllmacro.h"
-
-using namespace Tomahawk;
-
-class DLLEXPORT DatabaseCommand_SetPlaylistRevision : public DatabaseCommandLoggable
-{
-Q_OBJECT
-Q_PROPERTY( QString playlistguid      READ playlistguid  WRITE setPlaylistguid )
-Q_PROPERTY( QString newrev            READ newrev        WRITE setNewrev )
-Q_PROPERTY( QString oldrev            READ oldrev        WRITE setOldrev )
-Q_PROPERTY( QVariantList orderedguids READ orderedguids  WRITE setOrderedguids )
-Q_PROPERTY( QVariantList addedentries READ addedentriesV WRITE setAddedentriesV )
-
-public:
-    explicit DatabaseCommand_SetPlaylistRevision( QObject* parent = 0 )
-        : DatabaseCommandLoggable( parent )
-        , m_applied( false )
-        , m_localOnly( false )
-    {}
-
-    explicit DatabaseCommand_SetPlaylistRevision( const source_ptr& s,
-                                                  const QString& playlistguid,
-                                                  const QString& newrev,
-                                                  const QString& oldrev,
-                                                  const QStringList& orderedguids,
-                                                  const QList<Tomahawk::plentry_ptr>& addedentries,
-                                                  const QList<Tomahawk::plentry_ptr>& entries );
-
-    QString commandname() const { return "setplaylistrevision"; }
-
-    virtual void exec( DatabaseImpl* lib );
-    virtual void postCommitHook();
-
-    virtual bool doesMutates() const { return true; }
-    virtual bool localOnly() const { return m_localOnly; }
-    virtual bool groupable() const { return true; }
-
-    void setAddedentriesV( const QVariantList& vlist )
-    {
-        m_addedentries.clear();
-        foreach( const QVariant& v, vlist )
-        {
-            PlaylistEntry * pep = new PlaylistEntry;
-            QJson::QObjectHelper::qvariant2qobject( v.toMap(), pep );
-            m_addedentries << plentry_ptr(pep);
-        }
-    }
-
-    QVariantList addedentriesV() const
-    {
-        QVariantList vlist;
-        foreach( const plentry_ptr& pe, m_addedentries )
-        {
-            QVariant v = QJson::QObjectHelper::qobject2qvariant( pe.data() );
-            vlist << v;
-        }
-        return vlist;
-    }
-
-    void setPlaylistguid( const QString& s ) { m_playlistguid = s; }
-
-    void setNewrev( const QString& s ) { m_newrev = s; }
-    void setOldrev( const QString& s ) { m_oldrev = s; }
-    QString newrev() const { return m_newrev; }
-    QString oldrev() const { return m_oldrev; }
-    QString playlistguid() const { return m_playlistguid; }
-
-    void setOrderedguids( const QVariantList& l ) { m_orderedguids = l; }
-    QVariantList orderedguids() const { return m_orderedguids; }
-
-protected:
-    bool m_applied;
-    QStringList m_previous_rev_orderedguids;
-    QString m_playlistguid;
-    QString m_newrev, m_oldrev;
-    QMap<QString, Tomahawk::plentry_ptr> m_addedmap;
-
-    QString m_currentRevision;
-
-private:
-    QVariantList m_orderedguids;
-    QList<Tomahawk::plentry_ptr> m_addedentries, m_entries;
-
-    bool m_localOnly;
-};
-
-#endif // DATABASECOMMAND_SETPLAYLISTREVISION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_settrackattributes.cpp Deleted

@@ -1,97 +0,0 @@
-/* === 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_settrackattributes.h"
-#include "tomahawksqlquery.h"
-#include "databaseimpl.h"
-
-using namespace Tomahawk;
-
-DatabaseCommand_SetTrackAttributes::DatabaseCommand_SetTrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type, QList< QPair< QID, QString > > ids, bool toDelete )
-    : DatabaseCommandLoggable()
-    , m_loggable( false )
-    , m_delete( toDelete )
-    , m_type( type )
-    , m_tracks( ids )
-{
-}
-
-DatabaseCommand_SetTrackAttributes::DatabaseCommand_SetTrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type )
-    : DatabaseCommandLoggable()
-    , m_loggable( false )
-    , m_delete( true )
-    , m_type( type )
-{
-
-}
-
-
-void
-DatabaseCommand_SetTrackAttributes::exec( DatabaseImpl* dbi )
-{
-    TomahawkSqlQuery checkquery = dbi->newquery();
-    TomahawkSqlQuery delquery = dbi->newquery();
-    TomahawkSqlQuery insertquery = dbi->newquery();
-
-    QString k;
-    switch ( m_type )
-    {
-    case EchonestCatalogId:
-        k = "echonestcatalogid";
-        break;
-    }
-
-    if ( m_delete && m_tracks.isEmpty() )
-    {
-        //delete all
-        TomahawkSqlQuery delAll = dbi->newquery();
-        delAll.prepare( "DELETE FROM track_attributes WHERE k = ?" );
-        delAll.bindValue( 0, k );
-        delAll.exec();
-        return;
-    }
-
-    checkquery.prepare( "SELECT id, sortname FROM track WHERE id = ?" );
-    delquery.prepare( "DELETE FROM track_attributes WHERE id = ? AND k = ?" );
-    insertquery.prepare( "INSERT INTO track_attributes ( id, k, v ) VALUES( ?, ?, ? )" );
-
-    QPair< QID, QString > track;
-    foreach ( track, m_tracks )
-    {
-        checkquery.bindValue( 0, track.first );
-        if ( !checkquery.exec() )
-        {
-            tLog() << "No track in track table for set track attribute command...aborting:" << track.first;
-            continue;
-        }
-
-        delquery.bindValue( 0, track.first );
-        delquery.bindValue( 1, k );
-        delquery.exec();
-
-        if ( m_delete )
-            continue; // stop at deleting, don't insert
-
-        insertquery.bindValue( 0, track.first );
-        insertquery.bindValue( 1, k );
-        insertquery.bindValue( 2, track.second );
-        if ( !insertquery.exec() )
-            tLog() << "Failed to insert track attribute:" << k << track.first << track.second;
-
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_settrackattributes.h Deleted

@@ -1,57 +0,0 @@
-/* === 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_SETTRACKATTRIBUTES
-#define DATABASECOMMAND_SETTRACKATTRIBUTES
-
-#include "typedefs.h"
-#include "databasecommandloggable.h"
-
-#include <QByteArray>
-
-class DatabaseCommand_SetTrackAttributes : public DatabaseCommandLoggable
-{
-    Q_OBJECT
-public:
-    enum AttributeType {
-        EchonestCatalogId = 0,
-    };
-
-    // Takes a list of <track_id, value> pairs. key is always type
-    DatabaseCommand_SetTrackAttributes( AttributeType type, QList< QPair< Tomahawk::QID, QString > > ids, bool toDelete = false );
-    // Deletes *all tracks with attribute*
-    DatabaseCommand_SetTrackAttributes( AttributeType type );
-    DatabaseCommand_SetTrackAttributes() {} // JSON
-
-    virtual void exec( DatabaseImpl* lib );
-    virtual bool doesMutates() const { return true; }
-    virtual bool loggable() const { return m_loggable; }
-
-    virtual QString commandname() const { return "settrackattributes"; }
-
-    void setType( int type ) { m_type = (AttributeType)type; }
-    int type() const { return (int)m_type; }
-
-private:
-    bool m_loggable, m_delete;
-
-    AttributeType m_type;
-    QList< QPair< Tomahawk::QID, QString > > m_tracks;
-};
-
-#endif // DATABASECOMMAND_SETTRACKATTRIBUTES

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_socialaction.cpp Deleted

@@ -1,93 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christopher Reichert <creichert07@gmail.com>
- *
- *   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_socialaction.h"
-
-#include <QSqlQuery>
-
-#include "database/database.h"
-#include "databaseimpl.h"
-#include "network/servent.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-void
-DatabaseCommand_SocialAction::postCommitHook()
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( source()->isLocal() )
-    {
-        Servent::instance()->triggerDBSync();
-    }
-
-    source()->reportSocialAttributesChanged( this );
-}
-
-
-void
-DatabaseCommand_SocialAction::exec( DatabaseImpl* dbi )
-{
-    qDebug() << Q_FUNC_INFO;
-    Q_ASSERT( !source().isNull() );
-
-    TomahawkSqlQuery query = dbi->newquery();
-
-    QVariant srcid = source()->isLocal() ? QVariant( QVariant::Int ) : source()->id();
-
-    if ( m_artist.isNull() || m_track.isEmpty() )
-        return;
-
-    int artid = dbi->artistId( m_artist, true );
-    if ( artid < 1 )
-        return;
-    int trkid = dbi->trackId( artid, m_track, true );
-    if ( trkid < 1 )
-        return;
-
-    // update if it already exists
-    TomahawkSqlQuery find = dbi->newquery();
-    find.prepare( QString( "SELECT id, k, v FROM social_attributes WHERE social_attributes.id = ? AND social_attributes.source %1 AND social_attributes.k = ?" ).arg( source()->isLocal() ? "IS NULL" : QString( "=%1" ).arg( source()->id() ) ) );
-    find.addBindValue( trkid );
-    find.addBindValue( m_action );
-    if ( find.exec() && find.next() )
-    {
-        // update
-        query.prepare( QString( "UPDATE social_attributes SET v = '%1', timestamp = %2 WHERE social_attributes.id = %3 AND social_attributes.source %4 AND social_attributes.k = '%5'" )
-                               .arg( m_comment )
-                               .arg( m_timestamp )
-                               .arg( trkid )
-                               .arg( source()->isLocal() ? "IS NULL" : QString( "=%1" ).arg( source()->id() ) )
-                               .arg( m_action ) );
-    }
-    else
-    {
-        query.prepare( "INSERT INTO social_attributes(id, source, k, v, timestamp) "
-                       "VALUES (?, ?, ?, ?, ?)" );
-
-        query.bindValue( 0, trkid );
-        query.bindValue( 1, srcid );
-        query.bindValue( 2, m_action );
-        query.bindValue( 3, m_comment );
-        query.bindValue( 4, m_timestamp );
-    }
-
-    query.exec();
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_socialaction.h Deleted

@@ -1,185 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Christopher Reichert <creichert07@gmail.com>
- *
- *   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_SOCIALACTION_H
-#define DATABASECOMMAND_SOCIALACTION_H
-
-#include <QDateTime>
-#include "database/databasecommandloggable.h"
-
-#include "sourcelist.h"
-#include "typedefs.h"
-#include "artist.h"
-
-#include "dllmacro.h"
-
-/**
- * \class DatabaseCommand_SocialAction
- * \brief Database command used to write social actions to database.
- *
- * This Database command allows Tomahawk to write social actions to
- * the local database. These social actions can be interfaced with social
- * networking API's such as LastFm, Facebook, or Twitter to allow the user
- * to sync these actions with their accounts on these sites.
- *
- * \see DatabaseCommand_LoadSocialActions
- */
-class DLLEXPORT DatabaseCommand_SocialAction : public DatabaseCommandLoggable
-{
-    Q_OBJECT
-    Q_PROPERTY( QString action READ action WRITE setAction )
-    Q_PROPERTY( QString comment READ comment WRITE setComment )
-    Q_PROPERTY( int timestamp READ timestamp WRITE setTimestamp )
-    Q_PROPERTY( QString artist READ artist WRITE setArtist )
-    Q_PROPERTY( QString track READ track WRITE setTrack )
-
-public:
-
-    /**
-     * \brief Default constructor for DatabaseCommand_SocialAction.
-     *
-     * Constructs an empty database command for a social action.
-     */
-    explicit DatabaseCommand_SocialAction( QObject* parent = 0 )
-        : DatabaseCommandLoggable( parent )
-    {}
-
-    /**
-     * \brief Overloaded constructor for DatabaseCommand_SocialAction.
-     * \param query A Tomahawk Query object.
-     * \param action Name of the social action to be written to the database.
-     * \param comment Comment associated with this social action.
-     * \param parent Parent class.
-     *
-     * Constructor which creates a new database command for the specified social action.
-     */
-    explicit DatabaseCommand_SocialAction( const Tomahawk::query_ptr& query, QString action, QString comment = "", QObject* parent = 0 )
-        : DatabaseCommandLoggable( parent ), m_query( query ), m_action( action )
-    {
-        setSource( SourceList::instance()->getLocal() );
-
-        setArtist( query->artist() );
-        setTrack( query->track() );
-        setComment( comment );
-        setTimestamp( QDateTime::currentDateTime().toTime_t() );
-    }
-
-    /**
-     * \brief Returns the name of this database command.
-     * \return QString containing the database command name 'socialaction'.
-     */
-    virtual QString commandname() const { return "socialaction"; }
-
-    /**
-     * \brief Executes the database command.
-     * \param dbi Database instance.
-     *
-     * This method prepares an sql query to write this social action
-     * into the local database.
-     */
-    virtual void exec( DatabaseImpl* dbi );
-
-    /**
-     * \brief Triggers a Database Sync.
-     */
-    virtual void postCommitHook();
-
-    /**
-     * \brief Returns the artist associated with this database command.
-     * \return Name of the artist.
-     * \see setArtist()
-     */
-    QString artist() const { return m_artist; }
-
-    /**
-     * \brief Sets the artist name for this database command.
-     * \param s QString containing the artist name.
-     * \see artist()
-     */
-    void setArtist( const QString& s ) { m_artist = s; }
-
-    /**
-     * \brief Returns the track name associated with this social action.
-     * \return QString containing the track name.
-     * \see setTrack()
-     */
-    QString track() const { return m_track; }
-
-    /**
-     * \brief Sets the track name associated with this database command.
-     * \param track QString containing the track name.
-     * \see track()
-     */
-    void setTrack( const QString& track ) { m_track = track; }
-
-    /**
-     * \brief Returns the social action for this database command instance.
-     * \return QString containing the action name.
-     * \see setAction()
-     */
-    QString action() const { return m_action; }
-
-    /**
-     * \brief Sets the social actions
-     * \param a QString containing action to be set in this class.
-     * \see action()
-     */
-    void setAction( QString a ) { m_action = a; }
-
-    /**
-     * \brief Returns comment associated with this social action.
-     * \return QString containing comment associated with this social action.
-     * \see setComment()
-     */
-    QString comment() const { return m_comment; }
-
-    /**
-     * \brief Sets the comment associated with this social action.
-     * \param com Comment associated with this social action.
-     * \see comment()
-     */
-    void setComment( const QString& com ) { m_comment = com; }
-
-    /**
-     * \brief Returns the timestamp associated with this social action.
-     * \return unsigned integer containing timestamp
-     * \see setTimesetamp()
-     */
-    int timestamp() const { return m_timestamp; }
-
-    /**
-     * \brief Sets the timestamp associated with this social action.
-     * \param ts unsigned integer associated with this social action.
-     * \see timestamp()
-     */
-    void setTimestamp( const int ts ) { m_timestamp = ts; }
-
-    virtual bool doesMutates() const { return true; }
-    virtual bool groupable() const { return true; }
-
-private:
-    Tomahawk::query_ptr m_query;
-
-    QString m_artist;
-    QString m_track;
-    int m_timestamp;
-    QString m_comment;
-    QString m_action;
-};
-
-#endif // DATABASECOMMAND_SOCIALACTION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_sourceoffline.cpp Deleted

@@ -1,39 +0,0 @@
-/* === 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
- *   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_sourceoffline.h"
-
-#include "databaseimpl.h"
-#include "tomahawksqlquery.h"
-#include "utils/logger.h"
-
-
-DatabaseCommand_SourceOffline::DatabaseCommand_SourceOffline( int id )
-    : DatabaseCommand()
-    , m_id( id )
-{
-}
-
-
-void
-DatabaseCommand_SourceOffline::exec( DatabaseImpl* lib )
-{
-    TomahawkSqlQuery q = lib->newquery();
-    q.exec( QString( "UPDATE source SET isonline = 'false' WHERE id = %1" )
-            .arg( m_id ) );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_sourceoffline.h Deleted

@@ -1,41 +0,0 @@
-/* === 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
- *   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_SOURCEOFFLINE_H
-#define DATABASECOMMAND_SOURCEOFFLINE_H
-
-#include "databasecommand.h"
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseCommand_SourceOffline : public DatabaseCommand
-{
-Q_OBJECT
-
-public:
-    explicit DatabaseCommand_SourceOffline( int id );
-
-    virtual QString commandname() const { return "sourceoffline"; }
-
-    bool doesMutates() const { return true; }
-    void exec( DatabaseImpl* lib );
-
-private:
-    int m_id;
-};
-
-#endif // DATABASECOMMAND_SOURCEOFFLINE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_trackattributes.cpp Deleted

@@ -1,71 +0,0 @@
-/* === 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_trackattributes.h"
-#include "databaseimpl.h"
-
-using namespace Tomahawk;
-DatabaseCommand_TrackAttributes::DatabaseCommand_TrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type, const QList< Tomahawk::QID > ids )
-    : DatabaseCommand()
-    , m_type( type )
-    , m_ids( ids )
-{
-}
-
-DatabaseCommand_TrackAttributes::DatabaseCommand_TrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type )
-    : DatabaseCommand()
-    , m_type( type )
-{
-}
-
-void DatabaseCommand_TrackAttributes::exec( DatabaseImpl* lib )
-{
-    TomahawkSqlQuery query = lib->newquery();
-
-    QString k;
-    switch ( m_type )
-    {
-        case DatabaseCommand_SetTrackAttributes::EchonestCatalogId:
-            k = "echonestcatalogid";
-            break;
-    }
-
-    PairList results;
-    if ( !m_ids.isEmpty() )
-    {
-
-        foreach ( const QID id, m_ids )
-        {
-            query.prepare( "SELECT v FROM track_attributes WHERE id = ? AND k = ?" );
-            query.bindValue( 0, id );
-            query.bindValue( 1, k );
-            if ( query.exec() )
-                results.append( QPair< QID, QString >( id, query.value( 0 ).toString() ) );
-        }
-    } else {
-        query.prepare( "SELECT id, v FROM track_attributes WHERE k = ?" );
-        query.bindValue( 0, k );
-        query.exec();
-        while ( !query.next() )
-        {
-            results.append( QPair< QID, QString >( query.value( 0 ).toString(), query.value( 1 ).toString() ) );
-        }
-    }
-
-    emit trackAttributes( results );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_trackattributes.h Deleted

@@ -1,51 +0,0 @@
-/* === 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_TRACKATTRIBUTES_H
-#define DATABASECOMMAND_TRACKATTRIBUTES_H
-
-#include "typedefs.h"
-#include "databasecommand.h"
-#include "databasecommand_collectionattributes.h"
-#include "databasecommand_settrackattributes.h"
-#include <QByteArray>
-
-class DatabaseCommand_TrackAttributes : public DatabaseCommand
-{
-    Q_OBJECT
-public:
-
-    // Get all tracks with this attribute
-    DatabaseCommand_TrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type );
-    // Get the specific tracks with this attribute
-    DatabaseCommand_TrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type, const QList< Tomahawk::QID > ids );
-
-    virtual void exec( DatabaseImpl* lib );
-    virtual bool doesMutates() const { return false; }
-
-    virtual QString commandname() const { return "trackattributes"; }
-
-signals:
-    void trackAttributes( PairList );
-
-private:
-    DatabaseCommand_SetTrackAttributes::AttributeType m_type;
-    QList< Tomahawk::QID > m_ids;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_updatesearchindex.cpp Deleted

@@ -1,83 +0,0 @@
-/* === 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
- *   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_updatesearchindex.h"
-
-#include "databaseimpl.h"
-#include "tomahawksqlquery.h"
-#include "utils/logger.h"
-#include "jobview/IndexingJobItem.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-
-#include <QSqlRecord>
-
-
-DatabaseCommand_UpdateSearchIndex::DatabaseCommand_UpdateSearchIndex()
-    : DatabaseCommand()
-    , m_statusJob( new IndexingJobItem )
-{
-    tLog() << Q_FUNC_INFO << "Updating index.";
-
-    JobStatusView::instance()->model()->addJob( m_statusJob );
-}
-
-
-DatabaseCommand_UpdateSearchIndex::~DatabaseCommand_UpdateSearchIndex()
-{
-    m_statusJob->done();
-}
-
-
-void
-DatabaseCommand_UpdateSearchIndex::exec( DatabaseImpl* db )
-{
-    db->m_fuzzyIndex->beginIndexing();
-
-    QMap< unsigned int, QMap< QString, QString > > data;
-    TomahawkSqlQuery q = db->newquery();
-
-    q.exec( "SELECT track.id, track.name, artist.name, artist.id FROM track, artist WHERE artist.id = track.artist" );
-    while ( q.next() )
-    {
-        QMap< QString, QString > track;
-        track.insert( "track", q.value( 1 ).toString() );
-        track.insert( "artist", q.value( 2 ).toString() );
-        track.insert( "artistid", q.value( 3 ).toString() );
-
-        data.insert( q.value( 0 ).toUInt(), track );
-    }
-
-    db->m_fuzzyIndex->appendFields( data );
-    data.clear();
-
-    q.exec( "SELECT album.id, album.name FROM album" );
-    while ( q.next() )
-    {
-        QMap< QString, QString > album;
-        album.insert( "album", q.value( 1 ).toString() );
-
-        data.insert( q.value( 0 ).toUInt(), album );
-    }
-
-    db->m_fuzzyIndex->appendFields( data );
-
-    qDebug() << "Building index finished.";
-
-    db->m_fuzzyIndex->endIndexing();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommand_updatesearchindex.h Deleted

@@ -1,42 +0,0 @@
-/* === 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
- *   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_UPDATESEARCHINDEX_H
-#define DATABASECOMMAND_UPDATESEARCHINDEX_H
-
-#include "databasecommand.h"
-#include "dllmacro.h"
-
-class IndexingJobItem;
-
-class DLLEXPORT DatabaseCommand_UpdateSearchIndex : public DatabaseCommand
-{
-Q_OBJECT
-public:
-    explicit DatabaseCommand_UpdateSearchIndex();
-    virtual ~DatabaseCommand_UpdateSearchIndex();
-
-    virtual QString commandname() const { return "updatesearchindex"; }
-    virtual bool doesMutates() const { return true; }
-    virtual void exec( DatabaseImpl* db );
-
-private:
-    IndexingJobItem* m_statusJob;
-};
-
-#endif // DATABASECOMMAND_UPDATESEARCHINDEX_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommandloggable.cpp Deleted

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databasecommandloggable.h Deleted

@@ -1,45 +0,0 @@
-/* === 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
- *   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 DATABASECOMMANDLOGGABLE_H
-#define DATABASECOMMANDLOGGABLE_H
-
-#include "database/databasecommand.h"
-#include "dllmacro.h"
-
-/// A Database Command that will be added to the oplog and sent over the network
-/// so peers can sync up and changes to our collection in their cached copy.
-class DLLEXPORT DatabaseCommandLoggable : public DatabaseCommand
-{
-Q_OBJECT
-Q_PROPERTY(QString command READ commandname)
-
-public:
-
-    explicit DatabaseCommandLoggable( QObject* parent = 0 )
-        : DatabaseCommand( parent )
-    {}
-
-    explicit DatabaseCommandLoggable( const Tomahawk::source_ptr& s, QObject* parent = 0 )
-        : DatabaseCommand( s, parent )
-    {}
-
-    virtual bool loggable() const { return true; }
-};
-
-#endif // DATABASECOMMANDLOGGABLE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databaseimpl.cpp Deleted

@@ -1,732 +0,0 @@
-/* === 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
- *   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 "databaseimpl.h"
-
-#include <QCoreApplication>
-#include <QRegExp>
-#include <QStringList>
-#include <QtAlgorithms>
-#include <QFile>
-
-#include "database/database.h"
-#include "databasecommand_updatesearchindex.h"
-#include "sourcelist.h"
-#include "result.h"
-#include "artist.h"
-#include "album.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-/* !!!! You need to manually generate schema.sql.h when the schema changes:
-    cd src/libtomahawk/database
-   ./gen_schema.h.sh ./schema.sql tomahawk > schema.sql.h
-*/
-#include "schema.sql.h"
-
-#define CURRENT_SCHEMA_VERSION 28
-
-
-DatabaseImpl::DatabaseImpl( const QString& dbname, Database* parent )
-    : QObject( (QObject*) parent )
-    , m_lastartid( 0 )
-    , m_lastalbid( 0 )
-    , m_lasttrkid( 0 )
-{
-    QTime t;
-    t.start();
-
-    bool schemaUpdated = openDatabase( dbname );
-    tDebug( LOGVERBOSE ) << "Opened database:" << t.elapsed();
-
-    TomahawkSqlQuery query = newquery();
-    query.exec( "SELECT v FROM settings WHERE k='dbid'" );
-    if ( query.next() )
-    {
-        m_dbid = query.value( 0 ).toString();
-    }
-    else
-    {
-        m_dbid = uuid();
-        query.exec( QString( "INSERT INTO settings(k,v) VALUES('dbid','%1')" ).arg( m_dbid ) );
-    }
-    tLog() << "Database ID:" << m_dbid;
-
-     // make sqlite behave how we want:
-    query.exec( "PRAGMA auto_vacuum = FULL" );
-    query.exec( "PRAGMA synchronous  = ON" );
-    query.exec( "PRAGMA foreign_keys = ON" );
-    //query.exec( "PRAGMA temp_store = MEMORY" );
-    tDebug( LOGVERBOSE ) << "Tweaked db pragmas:" << t.elapsed();
-
-    // in case of unclean shutdown last time:
-    query.exec( "UPDATE source SET isonline = 'false'" );
-
-    m_fuzzyIndex = new FuzzyIndex( *this, schemaUpdated );
-    if ( schemaUpdated )
-        QTimer::singleShot( 0, this, SLOT( updateIndex() ) );
-
-    tDebug( LOGVERBOSE ) << "Loaded index:" << t.elapsed();
-
-    if ( qApp->arguments().contains( "--dumpdb" ) )
-    {
-        dumpDatabase();
-        ::exit( 0 );
-    }
-}
-
-
-DatabaseImpl::~DatabaseImpl()
-{
-    delete m_fuzzyIndex;
-}
-
-
-void
-DatabaseImpl::dumpDatabase()
-{
-    QFile dump( "dbdump.txt" );
-    if ( !dump.open( QIODevice::WriteOnly | QIODevice::Text ) )
-    {
-        tDebug() << "Couldn't open dbdump.txt for writing!";
-        Q_ASSERT( false );
-    }
-    else
-    {
-        QTextStream dumpout( &dump );
-        TomahawkSqlQuery query = newquery();
-
-        query.exec( "SELECT * FROM oplog" );
-        while ( query.next() )
-        {
-            dumpout << "ID: " << query.value( 0 ).toInt() << endl
-                    << "GUID: " << query.value( 2 ).toString() << endl
-                    << "Command: " << query.value( 3 ).toString() << endl
-                    << "Singleton: " << query.value( 4 ).toBool() << endl
-                    << "JSON: " << ( query.value( 5 ).toBool() ? qUncompress( query.value( 6 ).toByteArray() ) : query.value( 6 ).toByteArray() )
-                    << endl << endl << endl;
-        }
-    }
-}
-
-
-void
-DatabaseImpl::loadIndex()
-{
-    connect( m_fuzzyIndex, SIGNAL( indexReady() ), SIGNAL( indexReady() ) );
-    m_fuzzyIndex->loadLuceneIndex();
-}
-
-
-bool
-DatabaseImpl::updateSchema( int oldVersion )
-{
-    // we are called here with the old database. we must migrate it to the CURRENT_SCHEMA_VERSION from the oldVersion
-    if ( oldVersion == 0 ) // empty database, so create our tables and stuff
-    {
-        tLog() << "Create tables... old version is" << oldVersion;
-        QString sql( get_tomahawk_sql() );
-        QStringList statements = sql.split( ";", QString::SkipEmptyParts );
-        m_db.transaction();
-
-        foreach ( const QString& sl, statements )
-        {
-            QString s( sl.trimmed() );
-            if ( s.length() == 0 )
-                continue;
-
-            tLog() << "Executing:" << s;
-            TomahawkSqlQuery query = newquery();
-            query.exec( s );
-        }
-
-        m_db.commit();
-        return true;
-    }
-    else // update in place! run the proper upgrade script
-    {
-        int cur = oldVersion;
-        m_db.transaction();
-        while ( cur < CURRENT_SCHEMA_VERSION )
-        {
-            cur++;
-
-            QString path = QString( RESPATH "sql/dbmigrate-%1_to_%2.sql" ).arg( cur - 1 ).arg( cur );
-            QFile script( path );
-            if ( !script.exists() || !script.open( QIODevice::ReadOnly ) )
-            {
-                tLog() << "Failed to find or open upgrade script from" << (cur-1) << "to" << cur << " (" << path << ")! Aborting upgrade...";
-                return false;
-            }
-
-            QString sql = QString::fromUtf8( script.readAll() ).trimmed();
-            QStringList statements = sql.split( ";", QString::SkipEmptyParts );
-            foreach ( const QString& sql, statements )
-            {
-                QString clean = cleanSql( sql ).trimmed();
-                if ( clean.isEmpty() )
-                    continue;
-
-                tLog() << "Executing upgrade statement:" << clean;
-                TomahawkSqlQuery q = newquery();
-                q.exec( clean );
-            }
-        }
-        m_db.commit();
-        tLog() << "DB Upgrade successful!";
-        return true;
-    }
-}
-
-
-QString
-DatabaseImpl::cleanSql( const QString& sql )
-{
-    QString fixed = sql;
-    QRegExp r( "--^\\n*" );
-    fixed.replace( r, QString() );
-    return fixed.trimmed();
-}
-
-
-Tomahawk::result_ptr
-DatabaseImpl::file( int fid )
-{
-    Tomahawk::result_ptr r;
-    TomahawkSqlQuery query = newquery();
-    query.exec( QString( "SELECT url, mtime, size, md5, mimetype, duration, bitrate, "
-                         "file_join.artist, file_join.album, file_join.track, file_join.composer, "
-                         "(select name from artist where id = file_join.artist) as artname, "
-                         "(select name from album  where id = file_join.album)  as albname, "
-                         "(select name from track  where id = file_join.track)  as trkname, "
-                         "(select name from artist where id = file_join.composer) as cmpname, "
-                         "source "
-                         "FROM file, file_join "
-                         "WHERE file.id = file_join.file AND file.id = %1" )
-                .arg( fid ) );
-
-    if ( query.next() )
-    {
-        Tomahawk::source_ptr s;
-        QString url = query.value( 0 ).toString();
-
-        if ( query.value( 15 ).toUInt() == 0 )
-        {
-            s = SourceList::instance()->getLocal();
-        }
-        else
-        {
-            s = SourceList::instance()->get( query.value( 15 ).toUInt() );
-            if ( s.isNull() )
-            {
-                return r;
-            }
-
-            url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
-        }
-
-        r = Tomahawk::Result::get( url );
-        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( query.value( 7 ).toUInt(), query.value( 11 ).toString() );
-        Tomahawk::album_ptr album = Tomahawk::Album::get( query.value( 8 ).toUInt(), query.value( 12 ).toString(), artist );
-        Tomahawk::artist_ptr composer = Tomahawk::Artist::get( query.value( 10 ).toUInt(), query.value( 14 ).toString() );
-
-        r->setModificationTime( query.value( 1 ).toUInt() );
-        r->setSize( query.value( 2 ).toUInt() );
-        r->setMimetype( query.value( 4 ).toString() );
-        r->setDuration( query.value( 5 ).toUInt() );
-        r->setBitrate( query.value( 6 ).toUInt() );
-        r->setArtist( artist );
-        r->setAlbum( album );
-        r->setComposer( composer );
-        r->setTrack( query.value( 13 ).toString() );
-        r->setTrackId( query.value( 9 ).toUInt() );
-        r->setCollection( s->collection() );
-        r->setScore( 1.0 );
-        r->setFileId( fid );
-    }
-
-    return r;
-}
-
-
-int
-DatabaseImpl::artistId( const QString& name_orig, bool autoCreate )
-{
-    if ( m_lastart == name_orig )
-        return m_lastartid;
-
-    int id = 0;
-    QString sortname = DatabaseImpl::sortname( name_orig );
-
-    TomahawkSqlQuery query = newquery();
-    query.prepare( "SELECT id FROM artist WHERE sortname = ?" );
-    query.addBindValue( sortname );
-    query.exec();
-    if ( query.next() )
-    {
-        id = query.value( 0 ).toInt();
-    }
-    if ( id )
-    {
-        m_lastart = name_orig;
-        m_lastartid = id;
-        return id;
-    }
-
-    if ( autoCreate )
-    {
-        // not found, insert it.
-        query.prepare( "INSERT INTO artist(id,name,sortname) VALUES(NULL,?,?)" );
-        query.addBindValue( name_orig );
-        query.addBindValue( sortname );
-        if ( !query.exec() )
-        {
-            tDebug() << "Failed to insert artist:" << name_orig;
-            return 0;
-        }
-
-        id = query.lastInsertId().toInt();
-        m_lastart = name_orig;
-        m_lastartid = id;
-    }
-
-    return id;
-}
-
-
-int
-DatabaseImpl::trackId( int artistid, const QString& name_orig, bool autoCreate )
-{
-    int id = 0;
-    QString sortname = DatabaseImpl::sortname( name_orig );
-    //if( ( id = m_artistcachesortname ) ) return id;
-
-    TomahawkSqlQuery query = newquery();
-    query.prepare( "SELECT id FROM track WHERE artist = ? AND sortname = ?" );
-    query.addBindValue( artistid );
-    query.addBindValue( sortname );
-    query.exec();
-
-    if ( query.next() )
-    {
-        id = query.value( 0 ).toInt();
-    }
-    if ( id )
-    {
-        //m_trackcachesortname=id;
-        return id;
-    }
-
-    if ( autoCreate )
-    {
-        // not found, insert it.
-        query.prepare( "INSERT INTO track(id,artist,name,sortname) VALUES(NULL,?,?,?)" );
-        query.addBindValue( artistid );
-        query.addBindValue( name_orig );
-        query.addBindValue( sortname );
-        if ( !query.exec() )
-        {
-            tDebug() << "Failed to insert track:" << name_orig;
-            return 0;
-        }
-
-        id = query.lastInsertId().toInt();
-    }
-
-    return id;
-}
-
-
-int
-DatabaseImpl::albumId( int artistid, const QString& name_orig, bool autoCreate )
-{
-    if ( name_orig.isEmpty() )
-    {
-        //qDebug() << Q_FUNC_INFO << "empty album name";
-        return 0;
-    }
-
-    if ( m_lastartid == artistid && m_lastalb == name_orig )
-        return m_lastalbid;
-
-    int id = 0;
-    QString sortname = DatabaseImpl::sortname( name_orig );
-    //if( ( id = m_albumcachesortname ) ) return id;
-
-    TomahawkSqlQuery query = newquery();
-    query.prepare( "SELECT id FROM album WHERE artist = ? AND sortname = ?" );
-    query.addBindValue( artistid );
-    query.addBindValue( sortname );
-    query.exec();
-    if ( query.next() )
-    {
-        id = query.value( 0 ).toInt();
-    }
-    if ( id )
-    {
-        m_lastalb = name_orig;
-        m_lastalbid = id;
-        return id;
-    }
-
-    if ( autoCreate )
-    {
-        // not found, insert it.
-        query.prepare( "INSERT INTO album(id,artist,name,sortname) VALUES(NULL,?,?,?)" );
-        query.addBindValue( artistid );
-        query.addBindValue( name_orig );
-        query.addBindValue( sortname );
-        if( !query.exec() )
-        {
-            tDebug() << "Failed to insert album:" << name_orig;
-            return 0;
-        }
-
-        id = query.lastInsertId().toInt();
-        m_lastalb = name_orig;
-        m_lastalbid = id;
-    }
-
-    return id;
-}
-
-
-QList< QPair<int, float> >
-DatabaseImpl::search( const Tomahawk::query_ptr& query, uint limit )
-{
-    QList< QPair<int, float> > resultslist;
-
-    QMap< int, float > resultsmap = m_fuzzyIndex->search( query );
-    foreach ( int i, resultsmap.keys() )
-    {
-        resultslist << QPair<int, float>( i, (float)resultsmap.value( i ) );
-    }
-    qSort( resultslist.begin(), resultslist.end(), DatabaseImpl::scorepairSorter );
-
-    if ( !limit )
-        return resultslist;
-
-    QList< QPair<int, float> > resultscapped;
-    for ( int i = 0; i < (int)limit && i < resultsmap.count(); i++ )
-    {
-        resultscapped << resultslist.at( i );
-    }
-
-    return resultscapped;
-}
-
-
-QList< QPair<int, float> >
-DatabaseImpl::searchAlbum( const Tomahawk::query_ptr& query, uint limit )
-{
-    QList< QPair<int, float> > resultslist;
-
-    QMap< int, float > resultsmap = m_fuzzyIndex->searchAlbum( query );
-    foreach ( int i, resultsmap.keys() )
-    {
-        resultslist << QPair<int, float>( i, (float)resultsmap.value( i ) );
-    }
-    qSort( resultslist.begin(), resultslist.end(), DatabaseImpl::scorepairSorter );
-
-    if ( !limit )
-        return resultslist;
-
-    QList< QPair<int, float> > resultscapped;
-    for ( int i = 0; i < (int)limit && i < resultsmap.count(); i++ )
-    {
-        resultscapped << resultslist.at( i );
-    }
-
-    return resultscapped;
-}
-
-
-QList< int >
-DatabaseImpl::getTrackFids( int tid )
-{
-    QList< int > ret;
-
-    TomahawkSqlQuery query = newquery();
-    query.exec( QString( "SELECT file.id FROM file, file_join "
-                         "WHERE file_join.file=file.id "
-                         "AND file_join.track = %1 ").arg( tid ) );
-    query.exec();
-
-    while( query.next() )
-        ret.append( query.value( 0 ).toInt() );
-
-    return ret;
-}
-
-
-QString
-DatabaseImpl::sortname( const QString& str, bool replaceArticle )
-{
-    QString s = str.toLower().trimmed().replace( QRegExp( "\\s{2,}" ), " " );
-
-    if ( replaceArticle && s.startsWith( "the " ) )
-    {
-        s = s.right( s.length() - 4 );
-    }
-
-    return s;
-}
-
-
-QVariantMap
-DatabaseImpl::artist( int id )
-{
-    TomahawkSqlQuery query = newquery();
-    query.exec( QString( "SELECT id, name, sortname FROM artist WHERE id = %1" ).arg( id ) );
-
-    QVariantMap m;
-    if( !query.next() )
-        return m;
-
-    m"id" = query.value( 0 );
-    m"name" = query.value( 1 );
-    m"sortname" = query.value( 2 );
-    return m;
-}
-
-
-QVariantMap
-DatabaseImpl::track( int id )
-{
-    TomahawkSqlQuery query = newquery();
-    query.exec( QString( "SELECT id, artist, name, sortname FROM track WHERE id = %1" ).arg( id ) );
-
-    QVariantMap m;
-    if( !query.next() )
-        return m;
-
-    m"id" = query.value( 0 );
-    m"artist" = query.value( 1 );
-    m"name" = query.value( 2 );
-    m"sortname" = query.value( 3 );
-    return m;
-}
-
-
-QVariantMap
-DatabaseImpl::album( int id )
-{
-    TomahawkSqlQuery query = newquery();
-    query.exec( QString( "SELECT id, artist, name, sortname FROM album WHERE id = %1" ).arg( id ) );
-
-    QVariantMap m;
-    if( !query.next() )
-        return m;
-
-    m"id" = query.value( 0 );
-    m"artist" = query.value( 1 );
-    m"name" = query.value( 2 );
-    m"sortname" = query.value( 3 );
-    return m;
-}
-
-
-Tomahawk::result_ptr
-DatabaseImpl::resultFromHint( const Tomahawk::query_ptr& origquery )
-{
-    QString url = origquery->resultHint();
-    TomahawkSqlQuery query = newquery();
-    Tomahawk::source_ptr s;
-    Tomahawk::result_ptr res;
-    QString fileUrl;
-
-    if ( url.contains( "servent://" ) )
-    {
-        QStringList parts = url.mid( QString( "servent://" ).length() ).split( "\t" );
-        s = SourceList::instance()->get( parts.at( 0 ) );
-        fileUrl = parts.at( 1 );
-
-        if ( s.isNull() )
-            return res;
-    }
-    else if ( url.contains( "file://" ) )
-    {
-        s = SourceList::instance()->getLocal();
-        fileUrl = url;
-    }
-    else
-    {
-//        Q_ASSERT( false );
-/*        res = Tomahawk::result_ptr( new Tomahawk::Result() );
-        s = SourceList::instance()->webSource();
-        res->setUrl( url );
-        res->setCollection( s->collection() );
-        res->setRID( uuid() );
-        res->setScore( 1.0 );
-        res->setArtist( Tomahawk::artist_ptr( new Tomahawk::Artist( 0, origquery->artist() ) ) );
-        res->setAlbum( Tomahawk::album_ptr( new Tomahawk::Album( 0, origquery->album(), res->artist() ) ) );
-        res->setTrack( origquery->track() );
-        res->setDuration( origquery->duration() );
-        res->setFriendlySource( url );*/
-
-        return res;
-    }
-
-    bool searchlocal = s->isLocal();
-
-    QString sql = QString( "SELECT "
-                            "url, mtime, size, md5, mimetype, duration, bitrate, "  //0
-                            "file_join.artist, file_join.album, file_join.track, "  //7
-                            "file_join.composer, "                                  //10
-                            "artist.name as artname, "                              //11
-                            "album.name as albname, "                               //12
-                            "track.name as trkname, "                               //13
-                            "composer.name as cmpname, "                            //14
-                            "file.source, "                                         //15
-                            "file_join.albumpos, "                                  //16
-                            "file_join.discnumber, "                                //17
-                            "artist.id as artid, "                                  //18
-                            "album.id as albid, "                                   //19
-                            "composer.id as cmpid, "                                //20
-                            "track_attributes.v as year "                           //21
-                            "FROM file, file_join, artist, track, track_attributes "
-                            "LEFT JOIN album ON album.id = file_join.album "
-                            "LEFT JOIN artist AS composer on composer.id = file_join.composer "
-                            "WHERE "
-                            "artist.id = file_join.artist AND "
-                            "track.id = file_join.track AND "
-                            "file.source %1 AND "
-                            "file_join.file = file.id AND "
-                            "file.id = track_attributes.id AND "
-                            "file.url = ?"
-        ).arg( searchlocal ? "IS NULL" : QString( "= %1" ).arg( s->id() ) );
-
-    query.prepare( sql );
-    query.bindValue( 0, fileUrl );
-    query.exec();
-
-    if( query.next() )
-    {
-        Tomahawk::source_ptr s;
-        QString url = query.value( 0 ).toString();
-
-        if ( query.value( 15 ).toUInt() == 0 )
-        {
-            s = SourceList::instance()->getLocal();
-        }
-        else
-        {
-            s = SourceList::instance()->get( query.value( 15 ).toUInt() );
-            if ( s.isNull() )
-            {
-                return res;
-            }
-
-            url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
-        }
-
-        res = Tomahawk::Result::get( url );
-        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( query.value( 18 ).toUInt(), query.value( 11 ).toString() );
-        Tomahawk::album_ptr album = Tomahawk::Album::get( query.value( 19 ).toUInt(), query.value( 12 ).toString(), artist );
-        Tomahawk::artist_ptr composer = Tomahawk::Artist::get( query.value( 20 ).toUInt(), query.value( 14 ).toString() );
-
-        res->setModificationTime( query.value( 1 ).toUInt() );
-        res->setSize( query.value( 2 ).toUInt() );
-        res->setMimetype( query.value( 4 ).toString() );
-        res->setDuration( query.value( 5 ).toInt() );
-        res->setBitrate( query.value( 6 ).toInt() );
-        res->setArtist( artist );
-        res->setAlbum( album );
-        res->setComposer( composer );
-        res->setScore( 1.0 );
-        res->setTrack( query.value( 13 ).toString() );
-        res->setAlbumPos( query.value( 16 ).toUInt() );
-        res->setDiscNumber( query.value( 17 ).toUInt() );
-        res->setRID( uuid() );
-        res->setTrackId( query.value( 9 ).toUInt() );
-        res->setCollection( s->collection() );
-        res->setYear( query.value( 21 ).toUInt() );
-    }
-
-    return res;
-}
-
-
-bool
-DatabaseImpl::openDatabase( const QString& dbname )
-{
-    bool schemaUpdated = false;
-    int version = -1;
-    {
-        QSqlDatabase db = QSqlDatabase::addDatabase( "QSQLITE", "tomahawk" );
-        db.setDatabaseName( dbname );
-        if ( !db.open() )
-        {
-            tLog() << "Failed to open database" << dbname;
-            throw "failed to open db"; // TODO
-        }
-
-        QSqlQuery qry = QSqlQuery( db );
-        qry.exec( "SELECT v FROM settings WHERE k='schema_version'" );
-        if ( qry.next() )
-        {
-            version = qry.value( 0 ).toInt();
-            tLog() << "Database schema of" << dbname << "is" << version;
-        }
-
-        if ( version < 0 || version == CURRENT_SCHEMA_VERSION )
-            m_db = db;
-    }
-
-    if ( version > 0 && version != CURRENT_SCHEMA_VERSION )
-    {
-        QSqlDatabase::removeDatabase( "tomahawk" );
-
-        QString newname = QString( "%1.v%2" ).arg( dbname ).arg( version );
-        tLog() << endl << "****************************" << endl;
-        tLog() << "Schema version too old: " << version << ". Current version is:" << CURRENT_SCHEMA_VERSION;
-        tLog() << "Moving" << dbname << newname;
-        tLog() << "If the migration fails, you can recover your DB by copying" << newname << "back to" << dbname;
-        tLog() << endl << "****************************" << endl;
-
-        QFile::copy( dbname, newname );
-        {
-            m_db = QSqlDatabase::addDatabase( "QSQLITE", "tomahawk" );
-            m_db.setDatabaseName( dbname );
-            if ( !m_db.open() )
-                throw "db moving failed";
-
-            schemaUpdated = updateSchema( version );
-            if ( !schemaUpdated )
-            {
-                Q_ASSERT( false );
-                QTimer::singleShot( 0, qApp, SLOT( quit() ) );
-            }
-        }
-    }
-    else if ( version < 0 )
-    {
-            schemaUpdated = updateSchema( 0 );
-    }
-
-    return schemaUpdated;
-}
-
-
-void
-DatabaseImpl::updateIndex()
-{
-    DatabaseCommand* cmd = new DatabaseCommand_UpdateSearchIndex();
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databaseimpl.h Deleted

@@ -1,101 +0,0 @@
-/* === 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
- *   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 DATABASEIMPL_H
-#define DATABASEIMPL_H
-
-#include <QObject>
-#include <QList>
-#include <QPair>
-#include <QVariant>
-#include <QVariantMap>
-#include <QSqlDatabase>
-#include <QSqlError>
-#include <QSqlQuery>
-#include <QHash>
-#include <QThread>
-
-#include "tomahawksqlquery.h"
-#include "fuzzyindex.h"
-#include "typedefs.h"
-
-class Database;
-
-class DatabaseImpl : public QObject
-{
-Q_OBJECT
-
-friend class FuzzyIndex;
-friend class DatabaseCommand_UpdateSearchIndex;
-
-public:
-    DatabaseImpl( const QString& dbname, Database* parent = 0 );
-    ~DatabaseImpl();
-
-    bool openDatabase( const QString& dbname );
-
-    TomahawkSqlQuery newquery() { return TomahawkSqlQuery( m_db ); }
-    QSqlDatabase& database() { return m_db; }
-
-    int artistId( const QString& name_orig, bool autoCreate ); //also for composers!
-    int trackId( int artistid, const QString& name_orig, bool autoCreate );
-    int albumId( int artistid, const QString& name_orig, bool autoCreate );
-
-    QList< QPair<int, float> > search( const Tomahawk::query_ptr& query, uint limit = 0 );
-    QList< QPair<int, float> > searchAlbum( const Tomahawk::query_ptr& query, uint limit = 0 );
-    QList< int > getTrackFids( int tid );
-
-    static QString sortname( const QString& str, bool replaceArticle = false );
-
-    QVariantMap artist( int id );
-    QVariantMap album( int id );
-    QVariantMap track( int id );
-    Tomahawk::result_ptr file( int fid );
-    Tomahawk::result_ptr resultFromHint( const Tomahawk::query_ptr& query );
-
-    static bool scorepairSorter( const QPair<int,float>& left, const QPair<int,float>& right )
-    {
-        return left.second > right.second;
-    }
-
-    QString dbid() const { return m_dbid; }
-
-    void loadIndex();
-
-signals:
-    void indexReady();
-
-private slots:
-    void updateIndex();
-
-private:
-    QString cleanSql( const QString& sql );
-    bool updateSchema( int oldVersion );
-    void dumpDatabase();
-
-    bool m_ready;
-    QSqlDatabase m_db;
-
-    QString m_lastart, m_lastalb, m_lasttrk;
-    int m_lastartid, m_lastalbid, m_lasttrkid;
-
-    QString m_dbid;
-    FuzzyIndex* m_fuzzyIndex;
-};
-
-#endif // DATABASEIMPL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databaseresolver.cpp Deleted

@@ -1,80 +0,0 @@
-/* === 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
- *   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 "databaseresolver.h"
-
-#include "pipeline.h"
-#include "network/servent.h"
-#include "database/database.h"
-#include "database/databasecommand_resolve.h"
-
-#include "utils/logger.h"
-
-
-DatabaseResolver::DatabaseResolver( int weight )
-    : Resolver()
-    , m_weight( weight )
-{
-}
-
-
-void
-DatabaseResolver::resolve( const Tomahawk::query_ptr& query )
-{
-    DatabaseCommand_Resolve* cmd = new DatabaseCommand_Resolve( query );
-
-    connect( cmd, SIGNAL( results( Tomahawk::QID, QList< Tomahawk::result_ptr > ) ),
-                    SLOT( gotResults( Tomahawk::QID, QList< Tomahawk::result_ptr > ) ), Qt::QueuedConnection );
-    connect( cmd, SIGNAL( albums( Tomahawk::QID, QList< Tomahawk::album_ptr > ) ),
-                    SLOT( gotAlbums( Tomahawk::QID, QList< Tomahawk::album_ptr > ) ), Qt::QueuedConnection );
-    connect( cmd, SIGNAL( artists( Tomahawk::QID, QList< Tomahawk::artist_ptr > ) ),
-                    SLOT( gotArtists( Tomahawk::QID, QList< Tomahawk::artist_ptr > ) ), Qt::QueuedConnection );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-
-}
-
-
-void
-DatabaseResolver::gotResults( const Tomahawk::QID qid, QList< Tomahawk::result_ptr> results )
-{
-    qDebug() << Q_FUNC_INFO << qid << results.length();
-
-    Tomahawk::Pipeline::instance()->reportResults( qid, results );
-}
-
-
-void
-DatabaseResolver::gotAlbums( const Tomahawk::QID qid, QList< Tomahawk::album_ptr> albums )
-{
-    Tomahawk::Pipeline::instance()->reportAlbums( qid, albums );
-}
-
-
-void
-DatabaseResolver::gotArtists( const Tomahawk::QID qid, QList< Tomahawk::artist_ptr> artists )
-{
-    Tomahawk::Pipeline::instance()->reportArtists( qid, artists );
-}
-
-
-QString
-DatabaseResolver::name() const
-{
-    return QString( "DatabaseResolver" );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databaseresolver.h Deleted

@@ -1,53 +0,0 @@
-/* === 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
- *   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 DATABASERESOLVER_H
-#define DATABASERESOLVER_H
-
-#include "resolver.h"
-#include "result.h"
-#include "artist.h"
-#include "album.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT DatabaseResolver : public Tomahawk::Resolver
-{
-Q_OBJECT
-
-public:
-    explicit DatabaseResolver( int weight );
-
-    virtual QString name() const;
-    virtual unsigned int weight() const { return m_weight; }
-    virtual unsigned int preference() const { return 100; }
-    virtual unsigned int timeout() const { return 0; }
-
-public slots:
-    virtual void resolve( const Tomahawk::query_ptr& query );
-
-private slots:
-    void gotResults( const Tomahawk::QID qid, QList< Tomahawk::result_ptr> results );
-    void gotAlbums( const Tomahawk::QID qid, QList< Tomahawk::album_ptr> albums );
-    void gotArtists( const Tomahawk::QID qid, QList< Tomahawk::artist_ptr> artists );
-
-private:
-    int m_weight;
-};
-
-#endif // DATABASERESOLVER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databaseworker.cpp Deleted

@@ -1,301 +0,0 @@
-/* === 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
- *   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 "databaseworker.h"
-
-#include <QTimer>
-#include <QTime>
-#include <QSqlQuery>
-
-#include "source.h"
-#include "database.h"
-#include "databaseimpl.h"
-#include "databasecommandloggable.h"
-#include "tomahawksqlquery.h"
-#include "utils/logger.h"
-
-#ifndef QT_NO_DEBUG
-    //#define DEBUG_TIMING TRUE
-#endif
-
-DatabaseWorker::DatabaseWorker( DatabaseImpl* lib, Database* db, bool mutates )
-    : QThread()
-    , m_dbimpl( lib )
-    , m_outstanding( 0 )
-{
-    Q_UNUSED( db );
-    Q_UNUSED( mutates );
-
-    moveToThread( this );
-
-    qDebug() << "CTOR DatabaseWorker" << this->thread();
-}
-
-
-DatabaseWorker::~DatabaseWorker()
-{
-    tDebug() << Q_FUNC_INFO << m_outstanding;
-
-    if ( m_outstanding )
-    {
-        foreach ( const QSharedPointer<DatabaseCommand>& cmd, m_commands )
-        {
-            tDebug() << "Outstanding db command to finish:" << cmd->guid() << cmd->commandname();
-        }
-    }
-
-    thread()->quit();
-    wait();
-}
-
-
-void
-DatabaseWorker::run()
-{
-    exec();
-    qDebug() << Q_FUNC_INFO << "DatabaseWorker finishing...";
-}
-
-
-void
-DatabaseWorker::enqueue( const QList< QSharedPointer<DatabaseCommand> >& cmds )
-{
-    QMutexLocker lock( &m_mut );
-    m_outstanding += cmds.count();
-    m_commands << cmds;
-
-    if ( m_outstanding == cmds.count() )
-        QTimer::singleShot( 0, this, SLOT( doWork() ) );
-}
-
-
-void
-DatabaseWorker::enqueue( const QSharedPointer<DatabaseCommand>& cmd )
-{
-    QMutexLocker lock( &m_mut );
-    m_outstanding++;
-    m_commands << cmd;
-
-    if ( m_outstanding == 1 )
-        QTimer::singleShot( 0, this, SLOT( doWork() ) );
-}
-
-
-void
-DatabaseWorker::doWork()
-{
-    /*
-        Run the dbcmd. Only inside a transaction if the cmd does mutates.
-
-        If the cmd is modifying local content (ie source->isLocal()) then
-        log to the database oplog for replication to peers.
-
-     */
-
-#ifdef DEBUG_TIMING
-    QTime timer;
-    timer.start();
-#endif
-
-    QList< QSharedPointer<DatabaseCommand> > cmdGroup;
-    QSharedPointer<DatabaseCommand> cmd;
-    {
-        QMutexLocker lock( &m_mut );
-        cmd = m_commands.takeFirst();
-    }
-
-    if ( cmd->doesMutates() )
-    {
-        bool transok = m_dbimpl->database().transaction();
-        Q_ASSERT( transok );
-        Q_UNUSED( transok );
-    }
-
-    unsigned int completed = 0;
-    try
-    {
-        bool finished = false;
-        {
-            while ( !finished )
-            {
-                completed++;
-                cmd->_exec( m_dbimpl ); // runs actual SQL stuff
-
-                if ( cmd->loggable() )
-                {
-                    // We only save our own ops to the oplog, since incoming ops from peers
-                    // are applied immediately.
-                    //
-                    // Crazy idea: if peers had keypairs and could sign ops/msgs, in theory it
-                    // would be safe to sync ops for friend A from friend B's cache, if he saved them,
-                    // which would mean you could get updates even if a peer was offline.
-                    if ( cmd->source()->isLocal() && !cmd->localOnly() )
-                    {
-                        // save to op-log
-                        DatabaseCommandLoggable* command = (DatabaseCommandLoggable*)cmd.data();
-                        logOp( command );
-                    }
-                    else
-                    {
-                        // Make a note of the last guid we applied for this source
-                        // so we can always request just the newer ops in future.
-                        //
-                        if ( !cmd->singletonCmd() )
-                        {
-                            TomahawkSqlQuery query = m_dbimpl->newquery();
-                            query.prepare( "UPDATE source SET lastop = ? WHERE id = ?" );
-                            query.addBindValue( cmd->guid() );
-                            query.addBindValue( cmd->source()->id() );
-
-                            if ( !query.exec() )
-                            {
-                                throw "Failed to set lastop";
-                            }
-                        }
-                    }
-                }
-
-                cmdGroup << cmd;
-                if ( cmd->groupable() && !m_commands.isEmpty() )
-                {
-                    QMutexLocker lock( &m_mut );
-                    if ( m_commands.first()->groupable() )
-                    {
-                        cmd = m_commands.takeFirst();
-                    }
-                    else
-                    {
-                        finished = true;
-                    }
-                }
-                else
-                    finished = true;
-            }
-
-            if ( cmd->doesMutates() )
-            {
-                qDebug() << "Committing" << cmd->commandname() << cmd->guid();
-                if ( !m_dbimpl->database().commit() )
-                {
-                    tDebug() << "FAILED TO COMMIT TRANSACTION*";
-                    throw "commit failed";
-                }
-            }
-
-#ifdef DEBUG_TIMING
-            uint duration = timer.elapsed();
-            tDebug() << "DBCmd Duration:" << duration << "ms, now running postcommit for" << cmd->commandname();
-#endif
-
-            foreach ( QSharedPointer<DatabaseCommand> c, cmdGroup )
-                c->postCommit();
-
-#ifdef DEBUG_TIMING
-            tDebug() << "Post commit finished in" << timer.elapsed() - duration << "ms for" << cmd->commandname();
-#endif
-        }
-    }
-    catch( const char * msg )
-    {
-        tLog() << endl
-                 << "*ERROR* processing databasecommand:"
-                 << cmd->commandname()
-                 << msg
-                 << m_dbimpl->database().lastError().databaseText()
-                 << m_dbimpl->database().lastError().driverText()
-                 << endl;
-
-        if ( cmd->doesMutates() )
-            m_dbimpl->database().rollback();
-
-        Q_ASSERT( false );
-    }
-    catch(...)
-    {
-        qDebug() << "Uncaught exception processing dbcmd";
-        if ( cmd->doesMutates() )
-            m_dbimpl->database().rollback();
-
-        Q_ASSERT( false );
-        throw;
-    }
-
-    foreach ( QSharedPointer<DatabaseCommand> c, cmdGroup )
-        c->emitFinished();
-
-    QMutexLocker lock( &m_mut );
-    m_outstanding -= completed;
-    if ( m_outstanding > 0 )
-        QTimer::singleShot( 0, this, SLOT( doWork() ) );
-}
-
-
-// this should take a const command, need to check/make json stuff mutable for some objs tho maybe.
-void
-DatabaseWorker::logOp( DatabaseCommandLoggable* command )
-{
-    TomahawkSqlQuery oplogquery = m_dbimpl->newquery();
-    oplogquery.prepare( "INSERT INTO oplog(source, guid, command, singleton, compressed, json) "
-                        "VALUES(?, ?, ?, ?, ?, ?)" );
-
-    QVariantMap variant = QJson::QObjectHelper::qobject2qvariant( command );
-    QByteArray ba = m_serializer.serialize( variant );
-
-//     qDebug() << "OP JSON:" << ba.isNull() << ba << "from:" << variant; // debug
-
-    bool compressed = false;
-    if( ba.length() >= 512 )
-    {
-        // We need to compress this in this thread, since inserting into the log
-        // has to happen as part of the same transaction as the dbcmd.
-        // (we are in a worker thread for RW dbcmds anyway, so it's ok)
-        //qDebug() << "Compressing DB OP JSON, uncompressed size:" << ba.length();
-        ba = qCompress( ba, 9 );
-        compressed = true;
-        //qDebug() << "Compressed DB OP JSON size:" << ba.length();
-    }
-
-    if ( command->singletonCmd() )
-    {
-        tDebug() << "Singleton command, deleting previous oplog commands";
-
-        TomahawkSqlQuery oplogdelquery = m_dbimpl->newquery();
-        oplogdelquery.prepare( QString( "DELETE FROM oplog WHERE source %1 AND singleton = 'true' AND command = ?" )
-                                  .arg( command->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( command->source()->id() ) ) );
-
-        oplogdelquery.bindValue( 0, command->commandname() );
-        oplogdelquery.exec();
-    }
-
-    tDebug() << "Saving to oplog:" << command->commandname()
-             << "bytes:" << ba.length()
-             << "guid:" << command->guid();
-
-    oplogquery.bindValue( 0, command->source()->isLocal() ?
-                          QVariant(QVariant::Int) : command->source()->id() );
-    oplogquery.bindValue( 1, command->guid() );
-    oplogquery.bindValue( 2, command->commandname() );
-    oplogquery.bindValue( 3, command->singletonCmd() );
-    oplogquery.bindValue( 4, compressed );
-    oplogquery.bindValue( 5, ba );
-    if( !oplogquery.exec() )
-    {
-        tLog() << "Error saving to oplog";
-        throw "Failed to save to oplog";
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/databaseworker.h Deleted

@@ -1,69 +0,0 @@
-/* === 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
- *   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 DATABASEWORKER_H
-#define DATABASEWORKER_H
-
-#include <QObject>
-#include <QThread>
-#include <QMutex>
-#include <QList>
-#include <QSharedPointer>
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-#include <qjson/qobjecthelper.h>
-
-#include "databasecommand.h"
-
-class Database;
-class DatabaseCommandLoggable;
-
-class DatabaseWorker : public QThread
-{
-Q_OBJECT
-
-public:
-    DatabaseWorker( DatabaseImpl*, Database*, bool mutates );
-    ~DatabaseWorker();
-
-    bool busy() const { return m_outstanding > 0; }
-    unsigned int outstandingJobs() const { return m_outstanding; }
-
-public slots:
-    void enqueue( const QSharedPointer<DatabaseCommand>& );
-    void enqueue( const QList< QSharedPointer<DatabaseCommand> >& );
-
-protected:
-    void run();
-
-private slots:
-    void doWork();
-
-private:
-    void logOp( DatabaseCommandLoggable* command );
-
-    QMutex m_mut;
-    DatabaseImpl* m_dbimpl;
-    QList< QSharedPointer<DatabaseCommand> > m_commands;
-    int m_outstanding;
-
-    QJson::Serializer m_serializer;
-};
-
-#endif // DATABASEWORKER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/fuzzyindex.cpp Deleted

@@ -1,312 +0,0 @@
-/* === 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
- *   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 "fuzzyindex.h"
-
-#include <QDir>
-#include <QTime>
-
-#include <CLucene.h>
-#include <CLucene/queryParser/MultiFieldQueryParser.h>
-
-#include "databaseimpl.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-using namespace lucene::analysis;
-using namespace lucene::analysis::standard;
-using namespace lucene::document;
-using namespace lucene::store;
-using namespace lucene::index;
-using namespace lucene::queryParser;
-using namespace lucene::search;
-
-
-FuzzyIndex::FuzzyIndex( DatabaseImpl& db, bool wipeIndex )
-    : QObject()
-    , m_db( db )
-    , m_luceneReader( 0 )
-    , m_luceneSearcher( 0 )
-{
-    QString m_lucenePath = TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.lucene" );
-    m_luceneDir = FSDirectory::getDirectory( m_lucenePath.toStdString().c_str() );
-    m_analyzer = _CLNEW SimpleAnalyzer();
-
-    if ( wipeIndex )
-    {
-        tLog( LOGVERBOSE ) << "Wiping fuzzy index...";
-        beginIndexing();
-        endIndexing();
-    }
-}
-
-
-FuzzyIndex::~FuzzyIndex()
-{
-    delete m_luceneSearcher;
-    delete m_luceneReader;
-    delete m_analyzer;
-    delete m_luceneDir;
-}
-
-
-void
-FuzzyIndex::beginIndexing()
-{
-    m_mutex.lock();
-
-    try
-    {
-        qDebug() << Q_FUNC_INFO << "Starting indexing.";
-        if ( m_luceneReader != 0 )
-        {
-            qDebug() << "Deleting old lucene stuff.";
-            m_luceneSearcher->close();
-            m_luceneReader->close();
-            delete m_luceneSearcher;
-            delete m_luceneReader;
-            m_luceneSearcher = 0;
-            m_luceneReader = 0;
-        }
-
-        qDebug() << "Creating new index writer.";
-        IndexWriter luceneWriter( m_luceneDir, m_analyzer, true );
-    }
-    catch( CLuceneError& error )
-    {
-        qDebug() << "Caught CLucene error:" << error.what();
-        Q_ASSERT( false );
-    }
-}
-
-
-void
-FuzzyIndex::endIndexing()
-{
-    m_mutex.unlock();
-    emit indexReady();
-}
-
-
-void
-FuzzyIndex::appendFields( const QMap< unsigned int, QMap< QString, QString > >& trackData )
-{
-    try
-    {
-        tDebug() << "Appending to index:" << trackData.count();
-        bool create = !IndexReader::indexExists( TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.lucene" ).toStdString().c_str() );
-        IndexWriter luceneWriter( m_luceneDir, m_analyzer, create );
-        Document doc;
-
-        QMapIterator< unsigned int, QMap< QString, QString > > it( trackData );
-        while ( it.hasNext() )
-        {
-            it.next();
-            unsigned int id = it.key();
-            QMap< QString, QString > values = it.value();
-
-            if ( values.contains( "track" ) )
-            {
-                doc.add( *( _CLNEW Field( _T( "fulltext" ), DatabaseImpl::sortname( QString( "%1 %2" ).arg( values.value( "artist" ) ).arg( values.value( "track" ) ) ).toStdWString().c_str(),
-                                          Field::STORE_NO | Field::INDEX_UNTOKENIZED ) ) );
-
-                doc.add( *( _CLNEW Field( _T( "track" ), DatabaseImpl::sortname( values.value( "track" ) ).toStdWString().c_str(),
-                                          Field::STORE_NO | Field::INDEX_UNTOKENIZED ) ) );
-
-                doc.add( *( _CLNEW Field( _T( "artist" ), DatabaseImpl::sortname( values.value( "artist" ) ).toStdWString().c_str(),
-                                          Field::STORE_NO | Field::INDEX_UNTOKENIZED ) ) );
-
-                doc.add( *( _CLNEW Field( _T( "artistid" ), values.value( "artistid" ).toStdWString().c_str(),
-                                          Field::STORE_YES | Field::INDEX_NO ) ) );
-
-                doc.add( *( _CLNEW Field( _T( "trackid" ), QString::number( id ).toStdWString().c_str(),
-                                          Field::STORE_YES | Field::INDEX_NO ) ) );
-            }
-            else if ( values.contains( "album" ) )
-            {
-                doc.add( *( _CLNEW Field( _T( "album" ), DatabaseImpl::sortname( values.value( "album" ) ).toStdWString().c_str(),
-                                          Field::STORE_NO | Field::INDEX_UNTOKENIZED ) ) );
-
-                doc.add( *( _CLNEW Field( _T( "albumid" ), QString::number( id ).toStdWString().c_str(),
-                                          Field::STORE_YES | Field::INDEX_NO ) ) );
-            }
-            else
-                Q_ASSERT( false );
-
-            luceneWriter.addDocument( &doc );
-            doc.clear();
-        }
-
-        luceneWriter.optimize();
-        luceneWriter.close();
-    }
-    catch( CLuceneError& error )
-    {
-        qDebug() << "Caught CLucene error:" << error.what();
-        Q_ASSERT( false );
-    }
-}
-
-
-void
-FuzzyIndex::loadLuceneIndex()
-{
-    emit indexReady();
-}
-
-
-QMap< int, float >
-FuzzyIndex::search( const Tomahawk::query_ptr& query )
-{
-    QMutexLocker lock( &m_mutex );
-
-    QMap< int, float > resultsmap;
-    try
-    {
-        if ( !m_luceneReader )
-        {
-            if ( !IndexReader::indexExists( TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.lucene" ).toStdString().c_str() ) )
-            {
-                qDebug() << Q_FUNC_INFO << "index didn't exist.";
-                return resultsmap;
-            }
-
-            m_luceneReader = IndexReader::open( m_luceneDir );
-            m_luceneSearcher = _CLNEW IndexSearcher( m_luceneReader );
-        }
-
-        float minScore;
-        const TCHAR** fields = 0;
-        MultiFieldQueryParser parser( fields, m_analyzer );
-        BooleanQuery* qry = _CLNEW BooleanQuery();
-
-        if ( query->isFullTextQuery() )
-        {
-            QString escapedQuery = QString::fromWCharArray( parser.escape( DatabaseImpl::sortname( query->fullTextQuery() ).toStdWString().c_str() ) );
-            
-            Term* term = _CLNEW Term( _T( "track" ), escapedQuery.toStdWString().c_str() );
-            Query* fqry = _CLNEW FuzzyQuery( term );
-            qry->add( fqry, true, BooleanClause::SHOULD );
-
-            term = _CLNEW Term( _T( "artist" ), escapedQuery.toStdWString().c_str() );
-            fqry = _CLNEW FuzzyQuery( term );
-            qry->add( fqry, true, BooleanClause::SHOULD );
-
-            term = _CLNEW Term( _T( "fulltext" ), escapedQuery.toStdWString().c_str() );
-            fqry = _CLNEW FuzzyQuery( term );
-            qry->add( fqry, true, BooleanClause::SHOULD );
-
-            minScore = 0.00;
-        }
-        else
-        {
-            QString track = QString::fromWCharArray( parser.escape( DatabaseImpl::sortname( query->track() ).toStdWString().c_str() ) );
-            QString artist = QString::fromWCharArray( parser.escape( DatabaseImpl::sortname( query->artist() ).toStdWString().c_str() ) );
-//            QString album = QString::fromWCharArray( parser.escape( query->album().toStdWString().c_str() ) );
-
-            Term* term = _CLNEW Term( _T( "track" ), track.toStdWString().c_str() );
-            Query* fqry = _CLNEW FuzzyQuery( term );
-            qry->add( fqry, true, BooleanClause::MUST );
-
-            term = _CLNEW Term( _T( "artist" ), artist.toStdWString().c_str() );
-            fqry = _CLNEW FuzzyQuery( term );
-            qry->add( fqry, true, BooleanClause::MUST );
-
-            minScore = 0.00;
-        }
-
-        Hits* hits = m_luceneSearcher->search( qry );
-        for ( uint i = 0; i < hits->length(); i++ )
-        {
-            Document* d = &hits->doc( i );
-
-            float score = hits->score( i );
-            int id = QString::fromWCharArray( d->get( _T( "trackid" ) ) ).toInt();
-
-            if ( score > minScore )
-            {
-                resultsmap.insert( id, score );
-//                tDebug() << "Index hit:" << id << score << QString::fromWCharArray( ((Query*)qry)->toString() );
-            }
-        }
-
-        delete hits;
-        delete qry;
-    }
-    catch( CLuceneError& error )
-    {
-        tDebug() << "Caught CLucene error:" << error.what();
-        Q_ASSERT( false );
-    }
-
-    return resultsmap;
-}
-
-
-QMap< int, float >
-FuzzyIndex::searchAlbum( const Tomahawk::query_ptr& query )
-{
-    Q_ASSERT( query->isFullTextQuery() );
-
-    QMutexLocker lock( &m_mutex );
-
-    QMap< int, float > resultsmap;
-    try
-    {
-        if ( !m_luceneReader )
-        {
-            if ( !IndexReader::indexExists( TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.lucene" ).toStdString().c_str() ) )
-            {
-                qDebug() << Q_FUNC_INFO << "index didn't exist.";
-                return resultsmap;
-            }
-
-            m_luceneReader = IndexReader::open( m_luceneDir );
-            m_luceneSearcher = _CLNEW IndexSearcher( m_luceneReader );
-        }
-
-        QueryParser parser( _T( "album" ), m_analyzer );
-        QString escapedName = QString::fromWCharArray( parser.escape( DatabaseImpl::sortname( query->fullTextQuery() ).toStdWString().c_str() ) );
-
-        Query* qry = _CLNEW FuzzyQuery( _CLNEW Term( _T( "album" ), escapedName.toStdWString().c_str() ) );
-        Hits* hits = m_luceneSearcher->search( qry );
-        for ( uint i = 0; i < hits->length(); i++ )
-        {
-            Document* d = &hits->doc( i );
-
-            float score = hits->score( i );
-            int id = QString::fromWCharArray( d->get( _T( "albumid" ) ) ).toInt();
-
-            if ( score > 0.30 )
-            {
-                resultsmap.insert( id, score );
-//                tDebug() << "Index hit:" << id << score;
-            }
-        }
-
-        delete hits;
-        delete qry;
-    }
-    catch( CLuceneError& error )
-    {
-        tDebug() << "Caught CLucene error:" << error.what();
-        Q_ASSERT( false );
-    }
-
-    return resultsmap;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/fuzzyindex.h Deleted

@@ -1,85 +0,0 @@
-/* === 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
- *   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 FUZZYINDEX_H
-#define FUZZYINDEX_H
-
-#include <QObject>
-#include <QMap>
-#include <QHash>
-#include <QString>
-#include <QMutex>
-
-#include "query.h"
-
-namespace lucene
-{
-    namespace analysis
-    {
-      class SimpleAnalyzer;
-    }
-    namespace store
-    {
-      class Directory;
-    }
-    namespace index
-    {
-      class IndexReader;
-      class IndexWriter;
-    }
-    namespace search
-    {
-      class IndexSearcher;
-    }
-}
-
-class DatabaseImpl;
-
-class FuzzyIndex : public QObject
-{
-Q_OBJECT
-
-public:
-    explicit FuzzyIndex( DatabaseImpl& db, bool wipeIndex = false );
-    ~FuzzyIndex();
-
-    void beginIndexing();
-    void endIndexing();
-    void appendFields( const QMap< unsigned int, QMap< QString, QString > >& trackData );
-    
-signals:
-    void indexReady();
-
-public slots:
-    void loadLuceneIndex();
-
-    QMap< int, float > search( const Tomahawk::query_ptr& query );
-    QMap< int, float > searchAlbum( const Tomahawk::query_ptr& query );
-
-private:
-    DatabaseImpl& m_db;
-    QMutex m_mutex;
-    QString m_lucenePath;
-
-    lucene::analysis::SimpleAnalyzer* m_analyzer;
-    lucene::store::Directory* m_luceneDir;
-    lucene::index::IndexReader* m_luceneReader;
-    lucene::search::IndexSearcher* m_luceneSearcher;
-};
-
-#endif // FUZZYINDEX_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/localcollection.cpp Deleted

@@ -1,71 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-
-    This program 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 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-
-#include "localcollection.h"
-
-#include "sourcelist.h"
-#include <tomahawksettings.h>
-#include "utils/logger.h"
-
-#ifndef ENABLE_HEADLESS
-    #include "viewmanager.h"
-#endif
-
-
-LocalCollection::LocalCollection( const Tomahawk::source_ptr& source, QObject* parent )
-    : DatabaseCollection( source, parent )
-{
-
-}
-
-
-Tomahawk::playlist_ptr
-LocalCollection::bookmarksPlaylist()
-{
-    if( TomahawkSettings::instance()->bookmarkPlaylist().isEmpty() )
-        return Tomahawk::playlist_ptr();
-
-    return playlist( TomahawkSettings::instance()->bookmarkPlaylist() );
-}
-
-
-void
-LocalCollection::createBookmarksPlaylist()
-{
-    if( bookmarksPlaylist().isNull() ) {
-        QString guid = uuid();
-        Tomahawk::playlist_ptr p = Tomahawk::Playlist::create( SourceList::instance()->getLocal(), guid, tr( "Bookmarks" ), tr( "Saved tracks" ), QString(), false );
-
-#ifndef ENABLE_HEADLESS
-        ViewManager::instance()->createPageForPlaylist( p );
-//         connect( p.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( loaded( Tomahawk::PlaylistRevision ) ), Qt::QueuedConnection );
-        connect( p.data(), SIGNAL( created() ), this, SLOT( created() ) );
-#endif
-        TomahawkSettings::instance()->setBookmarkPlaylist( guid );
-//         p->createNewRevision( uuid(), p->currentrevision(), QList< Tomahawk::plentry_ptr >() );
-    }
-}
-
-
-void
-LocalCollection::created()
-{
-    emit bookmarkPlaylistCreated( bookmarksPlaylist() );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/localcollection.h Deleted

@@ -1,46 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-    This program 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 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-
-#ifndef LOCALCOLLECTION_H
-#define LOCALCOLLECTION_H
-
-#include "databasecollection.h"
-#include "dllmacro.h"
-#include "playlist.h"
-
-class DLLEXPORT LocalCollection : public DatabaseCollection
-{
-    Q_OBJECT
-public:
-    explicit LocalCollection( const Tomahawk::source_ptr& source, QObject* parent = 0 );
-
-    // gets the playlist used for storing stuff from the web, if it already exists. if the returned playlist
-    // is invalid ask to create and listen to the signal
-    Tomahawk::playlist_ptr bookmarksPlaylist();
-    void createBookmarksPlaylist();
-
-signals:
-    void bookmarkPlaylistCreated( const Tomahawk::playlist_ptr& p );
-
-private slots:
-    void created();
-
-};
-
-#endif // LOCALCOLLECTION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/schema.sql.h Deleted

@@ -1,202 +0,0 @@
-/*
-    This file was automatically generated from ./schema.sql on Fri Nov 18 14:00:37 CET 2011.
-*/
-
-static const char * tomahawk_schema_sql = 
-"CREATE TABLE IF NOT EXISTS oplog ("
-"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
-"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE, "
-"    guid TEXT NOT NULL,"
-"    command TEXT NOT NULL,"
-"    singleton BOOLEAN NOT NULL,"
-"    compressed BOOLEAN NOT NULL,"
-"    json TEXT NOT NULL"
-");"
-"CREATE UNIQUE INDEX oplog_guid ON oplog(guid);"
-"CREATE INDEX oplog_source ON oplog(source);"
-"CREATE TABLE IF NOT EXISTS artist ("
-"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
-"    name TEXT NOT NULL,"
-"    sortname TEXT NOT NULL"
-");"
-"CREATE UNIQUE INDEX artist_sortname ON artist(sortname);"
-"CREATE TABLE IF NOT EXISTS track ("
-"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
-"    artist INTEGER NOT NULL REFERENCES artist(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    name TEXT NOT NULL,"
-"    sortname TEXT NOT NULL"
-");"
-"CREATE UNIQUE INDEX track_artist_sortname ON track(artist,sortname);"
-"CREATE TABLE IF NOT EXISTS album ("
-"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
-"    artist INTEGER NOT NULL REFERENCES artist(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    name TEXT NOT NULL,"
-"    sortname TEXT NOT NULL"
-");"
-"CREATE UNIQUE INDEX album_artist_sortname ON album(artist,sortname);"
-"CREATE TABLE IF NOT EXISTS source ("
-"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
-"    name TEXT NOT NULL,"
-"    friendlyname TEXT,"
-"    lastop TEXT NOT NULL DEFAULT \"\",       "
-"    isonline BOOLEAN NOT NULL DEFAULT false"
-");"
-"CREATE UNIQUE INDEX source_name ON source(name);"
-"CREATE TABLE IF NOT EXISTS playlist ("
-"    guid TEXT PRIMARY KEY,"
-"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED, "
-"    shared BOOLEAN DEFAULT false,"
-"    title TEXT,"
-"    info TEXT,"
-"    creator TEXT,"
-"    lastmodified INTEGER NOT NULL DEFAULT 0,"
-"    currentrevision TEXT REFERENCES playlist_revision(guid) DEFERRABLE INITIALLY DEFERRED,"
-"    dynplaylist BOOLEAN DEFAULT false,"
-"    createdOn INTEGER NOT NULL DEFAULT 0"
-");"
-"CREATE TABLE IF NOT EXISTS playlist_item ("
-"    guid TEXT PRIMARY KEY,"
-"    playlist TEXT NOT NULL REFERENCES playlist(guid) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    trackname  TEXT NOT NULL,"
-"    artistname TEXT NOT NULL,"
-"    albumname  TEXT,"
-"    annotation TEXT,"
-"    duration INTEGER,       "
-"    addedon INTEGER NOT NULL DEFAULT 0,   "
-"    addedby INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED, "
-"    result_hint TEXT        "
-");"
-"CREATE INDEX playlist_item_playlist ON playlist_item(playlist);"
-"CREATE TABLE IF NOT EXISTS playlist_revision ("
-"    guid TEXT PRIMARY KEY,"
-"    playlist TEXT NOT NULL REFERENCES playlist(guid) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    entries TEXT, "
-"    author INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    timestamp INTEGER NOT NULL DEFAULT 0,"
-"    previous_revision TEXT REFERENCES playlist_revision(guid) DEFERRABLE INITIALLY DEFERRED"
-");"
-"CREATE TABLE IF NOT EXISTS dynamic_playlist ("
-"    guid TEXT NOT NULL REFERENCES playlist(guid) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    pltype TEXT, "
-"    plmode INTEGER, "
-"    autoload BOOLEAN DEFAULT true "
-");"
-"CREATE TABLE IF NOT EXISTS dynamic_playlist_controls ("
-"    id TEXT PRIMARY KEY,"
-"    playlist TEXT NOT NULL REFERENCES playlist(guid) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    selectedType TEXT,"
-"    match TEXT,"
-"    input TEXT"
-");"
-"CREATE TABLE IF NOT EXISTS dynamic_playlist_revision ("
-"    guid TEXT PRIMARY KEY NOT NULL REFERENCES playlist_revision(guid) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    controls TEXT, "
-"    plmode INTEGER,"
-"    pltype TEXT"
-");"
-"CREATE TABLE IF NOT EXISTS file ("
-"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
-"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    url TEXT NOT NULL,                   "
-"    size INTEGER NOT NULL,               "
-"    mtime INTEGER NOT NULL,              "
-"    md5 TEXT,                            "
-"    mimetype TEXT,                       "
-"    duration INTEGER NOT NULL DEFAULT 0, "
-"    bitrate INTEGER NOT NULL DEFAULT 0   "
-");"
-"CREATE UNIQUE INDEX file_url_src_uniq ON file(source, url);"
-"CREATE INDEX file_source ON file(source);"
-"CREATE TABLE IF NOT EXISTS dirs_scanned ("
-"    name TEXT PRIMARY KEY,"
-"    mtime INTEGER NOT NULL"
-");"
-"CREATE TABLE IF NOT EXISTS file_join ("
-"    file INTEGER PRIMARY KEY REFERENCES file(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    artist INTEGER NOT NULL REFERENCES artist(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    track INTEGER NOT NULL REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    album INTEGER REFERENCES album(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    albumpos INTEGER,"
-"    composer INTEGER REFERENCES artist(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    discnumber INTEGER"
-");"
-"CREATE INDEX file_join_track  ON file_join(track);"
-"CREATE INDEX file_join_artist ON file_join(artist);"
-"CREATE INDEX file_join_album  ON file_join(album);"
-"CREATE TABLE IF NOT EXISTS track_tags ("
-"    id INTEGER PRIMARY KEY,   "
-"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    tag TEXT NOT NULL,        "
-"    ns TEXT,                  "
-"    weight float DEFAULT 1.0  "
-");"
-"CREATE INDEX track_tags_tag ON track_tags(tag);"
-"CREATE TABLE IF NOT EXISTS album_tags ("
-"    id INTEGER PRIMARY KEY,   "
-"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    tag TEXT NOT NULL,        "
-"    ns TEXT,                  "
-"    weight float DEFAULT 1.0  "
-");"
-"CREATE INDEX album_tags_tag ON album_tags(tag);"
-"CREATE TABLE IF NOT EXISTS artist_tags ("
-"    id INTEGER PRIMARY KEY,   "
-"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    tag TEXT NOT NULL,        "
-"    ns TEXT,                  "
-"    weight float DEFAULT 1.0  "
-");"
-"CREATE INDEX artist_tags_tag ON artist_tags(tag);"
-"CREATE TABLE IF NOT EXISTS track_attributes ("
-"    id INTEGER REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,   "
-"    k TEXT NOT NULL,"
-"    v TEXT NOT NULL"
-");"
-"CREATE INDEX track_attrib_id ON track_attributes(id);"
-"CREATE INDEX track_attrib_k  ON track_attributes(k);"
-"CREATE TABLE IF NOT EXISTS collection_attributes ("
-"    id INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED, "
-"    k TEXT NOT NULL,"
-"    v TEXT NOT NULL"
-");"
-"CREATE TABLE IF NOT EXISTS social_attributes ("
-"    id INTEGER REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,   "
-"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE, "
-"    k TEXT NOT NULL,"
-"    v TEXT NOT NULL,"
-"    timestamp INTEGER NOT NULL DEFAULT 0"
-");"
-"CREATE INDEX social_attrib_id        ON social_attributes(id);"
-"CREATE INDEX social_attrib_source    ON social_attributes(source);"
-"CREATE INDEX social_attrib_k         ON social_attributes(k);"
-"CREATE INDEX social_attrib_timestamp ON social_attributes(timestamp);"
-"CREATE TABLE IF NOT EXISTS playback_log ("
-"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
-"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    track INTEGER REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
-"    playtime INTEGER NOT NULL,              "
-"    secs_played INTEGER NOT NULL"
-");"
-"CREATE INDEX playback_log_source ON playback_log(source);"
-"CREATE INDEX playback_log_track ON playback_log(track);"
-"CREATE TABLE IF NOT EXISTS http_client_auth ("
-"    token TEXT NOT NULL PRIMARY KEY,"
-"    website TEXT NOT NULL,"
-"    name TEXT NOT NULL,"
-"    ua TEXT,"
-"    mtime INTEGER,"
-"    permissions TEXT NOT NULL"
-");"
-"CREATE TABLE IF NOT EXISTS settings ("
-"    k TEXT NOT NULL PRIMARY KEY,"
-"    v TEXT NOT NULL DEFAULT ''"
-");"
-"INSERT INTO settings(k,v) VALUES('schema_version', '28');"
-    ;
-
-const char * get_tomahawk_sql()
-{
-    return tomahawk_schema_sql;
-}
-
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/tomahawksqlquery.h Deleted

@@ -1,79 +0,0 @@
-/* === 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
- *   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 TOMAHAWKSQLQUERY_H
-#define TOMAHAWKSQLQUERY_H
-// subclass QSqlQuery so that it prints the error msg if a query fails
-
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QTime>
-
-#include "utils/logger.h"
-
-#define TOMAHAWK_QUERY_THRESHOLD 60
-
-class TomahawkSqlQuery : public QSqlQuery
-{
-
-public:
-
-    TomahawkSqlQuery()
-        : QSqlQuery()
-    {}
-
-    TomahawkSqlQuery( const QSqlDatabase& db )
-        : QSqlQuery( db )
-    {}
-
-    bool exec( const QString& query )
-    {
-        prepare( query );
-
-        return exec();
-    }
-
-    bool exec()
-    {
-        QTime t;
-        t.start();
-
-        bool ret = QSqlQuery::exec();
-        if( !ret )
-            showError();
-
-        int e = t.elapsed();
-        if ( e >= TOMAHAWK_QUERY_THRESHOLD )
-            tLog( LOGVERBOSE ) << "TomahawkSqlQuery (" << lastQuery() << ") finished in" << t.elapsed() << "ms";
-
-        return ret;
-    }
-
-private:
-    void showError()
-    {
-        tLog() << "\n" << "*** DATABASE ERROR ***" << "\n"
-                << this->lastQuery() << "\n"
-                << "boundValues:" << this->boundValues() << "\n"
-                << this->lastError().text() << "\n"
-                ;
-        Q_ASSERT( false );
-    }
-};
-
-#endif // TOMAHAWKSQLQUERY_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/dllmacro.h Deleted

@@ -1,32 +0,0 @@
-/* === 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
- *   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 DLLMACRO_H
-#define DLLMACRO_H
-
-#include <QtCore/qglobal.h>
-
-#ifndef DLLEXPORT
-# if defined (DLLEXPORT_PRO)
-#  define DLLEXPORT Q_DECL_EXPORT
-# else
-#  define DLLEXPORT Q_DECL_IMPORT
-# endif
-#endif
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/dropjob.cpp Deleted

@@ -1,930 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Michael Zanetti <mzanetti@kde.org>
- *   Copyright 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 "dropjob.h"
-
-#include "artist.h"
-#include "album.h"
-#include "source.h"
-
-#include "utils/spotifyparser.h"
-#include "utils/itunesparser.h"
-#include "utils/rdioparser.h"
-#include "utils/m3uloader.h"
-#include "utils/shortenedlinkparser.h"
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-#include "globalactionmanager.h"
-#include "infosystem/infosystem.h"
-#include "utils/xspfloader.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
-#include "pipeline.h"
-
-#ifdef QCA2_FOUND
-#include "utils/groovesharkparser.h"
-#endif //QCA2_FOUND
-
-
-using namespace Tomahawk;
-
-bool DropJob::s_canParseSpotifyPlaylists = false;
-static QString s_dropJobInfoId = "dropjob";
-
-DropJob::DropJob( QObject *parent )
-    : QObject( parent )
-    , m_queryCount( 0 )
-    , m_onlyLocal( false )
-    , m_getWholeArtists( false )
-    , m_getWholeAlbums( false )
-    , m_top10( false )
-    , m_dropAction( Default )
-    , m_dropJob( 0 )
-{
-}
-
-
-DropJob::~DropJob()
-{
-    qDebug() << "destryong DropJob";
-}
-
-
-/// QMIMEDATA HANDLING
-
-QStringList
-DropJob::mimeTypes()
-{
-    QStringList mimeTypes;
-    mimeTypes << "application/tomahawk.query.list"
-              << "application/tomahawk.plentry.list"
-              << "application/tomahawk.result.list"
-              << "application/tomahawk.result"
-              << "application/tomahawk.metadata.artist"
-              << "application/tomahawk.metadata.album"
-              << "application/tomahawk.mixed"
-              << "text/plain"
-              << "text/uri-list";
-
-    return mimeTypes;
-}
-
-
-bool
-DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType, DropJob::DropAction acceptedAction )
-{
-    Q_UNUSED( acceptedAction );
-
-    if ( data->hasFormat( "application/tomahawk.query.list" )
-        || data->hasFormat( "application/tomahawk.plentry.list" )
-        || data->hasFormat( "application/tomahawk.result.list" )
-        || data->hasFormat( "application/tomahawk.result" )
-        || data->hasFormat( "application/tomahawk.mixed" )
-        || data->hasFormat( "application/tomahawk.metadata.album" )
-        || data->hasFormat( "application/tomahawk.metadata.artist" ) )
-    {
-        return true;
-    }
-
-    // check plain text url types
-    if ( !data->hasFormat( "text/plain" ) )
-        if ( !data->hasFormat( "text/uri-list" ) )
-            return false;
-
-
-    const QString url = data->data( "text/plain" );
-    if ( acceptedType.testFlag( Playlist ) )
-    {
-        if ( url.contains( "xspf" ) )
-            return true;
-
-        if ( url.contains( "m3u" ) )
-            return true;
-
-        if ( data->data( "text/uri-list" ).contains( "xspf" ) )
-            return true;
-
-        if ( data->data( "text/uri-list" ).contains( "m3u" ) )
-            return true;
-
-        // Not the most elegant
-        if ( url.contains( "spotify" ) && url.contains( "playlist" ) && s_canParseSpotifyPlaylists )
-            return true;
-
-        if ( url.contains( "grooveshark.com" ) && url.contains( "playlist" ) )
-            return true;
-    }
-
-    if ( acceptedType.testFlag( Track ) )
-    {
-        if ( url.contains( "m3u" ) )
-            return true;
-
-        if ( data->data( "text/uri-list" ).contains( "m3u" ) )
-            return true;
-
-        if ( url.contains( "itunes" ) && url.contains( "album" ) ) // YES itunes is fucked up and song links have album/ in the url.
-            return true;
-
-        if ( url.contains( "spotify" ) && url.contains( "track" ) )
-            return true;
-
-        if ( url.contains( "rdio.com" ) && ( ( ( url.contains( "track" ) && url.contains( "artist" ) && url.contains( "album" ) )
-                                               || url.contains( "playlists" )  ) ) )
-            return true;
-    }
-
-    if ( acceptedType.testFlag( Album ) )
-    {
-        if ( url.contains( "itunes" ) && url.contains( "album" ) ) // YES itunes is fucked up and song links have album/ in the url.
-            return true;
-        if ( url.contains( "spotify" ) && url.contains( "album" ) )
-            return true;
-        if ( url.contains( "rdio.com" ) && ( url.contains( "artist" ) && url.contains( "album" ) && !url.contains( "track" ) )  )
-            return true;
-    }
-
-    if ( acceptedType.testFlag( Artist ) )
-    {
-        if ( url.contains( "itunes" ) && url.contains( "artist" ) ) // YES itunes is fucked up and song links have album/ in the url.
-            return true;
-        if ( url.contains( "spotify" ) && url.contains( "artist" ) )
-            return true;
-        if ( url.contains( "rdio.com" ) && ( url.contains( "artist" ) && !url.contains( "album" ) && !url.contains( "track" ) )  )
-            return true;
-    }
-
-    // We whitelist certain url-shorteners since they do some link checking. Often playable (e.g. spotify) links hide behind them,
-    // so we do an extra level of lookup
-    if ( ShortenedLinkParser::handlesUrl( url ) )
-        return true;
-
-    return false;
-}
-
-
-bool
-DropJob::isDropType( DropJob::DropType desired, const QMimeData* data )
-{
-    const QString url = data->data( "text/plain" );
-    if ( desired == Playlist )
-    {
-        if( url.contains( "xspf" ) || data->data( "text/uri-list").contains( "xspf" ) )
-            return true;
-
-        if( url.contains( "m3u" ) || data->data( "text/uri-list").contains( "m3u" ) )
-            return true;
-
-        // Not the most elegant
-        if ( url.contains( "spotify" ) && url.contains( "playlist" ) && s_canParseSpotifyPlaylists )
-            return true;
-
-        if ( url.contains( "rdio.com" ) && url.contains( "people" ) && url.contains( "playlist" ) )
-            return true;
-#ifdef QCA2_FOUND
-        if ( url.contains( "grooveshark.com" ) && url.contains( "playlist" ) )
-            return true;
-#endif //QCA2_FOUND
-        if ( ShortenedLinkParser::handlesUrl( url ) )
-            return true;
-    }
-
-    return false;
-}
-
-
-void
-DropJob::setGetWholeArtists( bool getWholeArtists )
-{
-    m_getWholeArtists = getWholeArtists;
-}
-
-
-void
-DropJob::setGetWholeAlbums( bool getWholeAlbums )
-{
-    m_getWholeAlbums = getWholeAlbums;
-}
-
-
-void
-DropJob::tracksFromMimeData( const QMimeData* data, bool allowDuplicates, bool onlyLocal, bool top10 )
-{
-    m_allowDuplicates = allowDuplicates;
-    m_onlyLocal = onlyLocal;
-    m_top10 = top10;
-
-    parseMimeData( data );
-
-    if ( m_queryCount == 0 )
-    {
-        if ( onlyLocal )
-            removeRemoteSources();
-
-        if ( !allowDuplicates )
-            removeDuplicates();
-
-        emit tracks( m_resultList );
-        deleteLater();
-    }
-}
-
-
-void
-DropJob::parseMimeData( const QMimeData *data )
-{
-    QList< query_ptr > results;
-
-    if ( data->hasFormat( "application/tomahawk.query.list" ) )
-        results = tracksFromQueryList( data );
-    else if ( data->hasFormat( "application/tomahawk.result.list" ) )
-        results = tracksFromResultList( data );
-    else if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
-        results = tracksFromAlbumMetaData( data );
-    else if ( data->hasFormat( "application/tomahawk.metadata.artist" ) )
-        results = tracksFromArtistMetaData( data );
-    else if ( data->hasFormat( "application/tomahawk.mixed" ) )
-        tracksFromMixedData( data );
-    else if ( data->hasFormat( "text/plain" ) && !data->data( "text/plain" ).isEmpty() )
-    {
-        const QString plainData = QString::fromUtf8( data->data( "text/plain" ) );
-        handleAllUrls( plainData );
-
-    }
-    else if ( data->hasFormat( "text/uri-list" ) )
-    {
-        const QString plainData = QString::fromUtf8( data->data( "text/uri-list" ).trimmed() );
-        handleAllUrls( plainData );
-    }
-
-    m_resultList.append( results );
-}
-
-
-QList< query_ptr >
-DropJob::tracksFromQueryList( const QMimeData* data )
-{
-    QList< query_ptr > queries;
-    QByteArray itemData = data->data( "application/tomahawk.query.list" );
-    QDataStream stream( &itemData, QIODevice::ReadOnly );
-
-    while ( !stream.atEnd() )
-    {
-        qlonglong qptr;
-        stream >> qptr;
-
-        query_ptr* query = reinterpret_cast<query_ptr*>(qptr);
-        if ( query && !query->isNull() )
-        {
-            tDebug() << "Dropped query item:" << query->data()->artist() << "-" << query->data()->track();
-
-            if ( m_top10 )
-            {
-                getTopTen( query->data()->artist() );
-            }
-            else if ( m_getWholeArtists )
-            {
-                queries << getArtist( query->data()->artist() );
-            }
-            else if ( m_getWholeAlbums )
-            {
-                queries << getAlbum( query->data()->artist(), query->data()->album() );
-            }
-            else
-            {
-                queries << *query;
-            }
-        }
-    }
-
-    return queries;
-}
-
-
-QList< query_ptr >
-DropJob::tracksFromResultList( const QMimeData* data )
-{
-    QList< query_ptr > queries;
-    QByteArray itemData = data->data( "application/tomahawk.result.list" );
-    QDataStream stream( &itemData, QIODevice::ReadOnly );
-
-    while ( !stream.atEnd() )
-    {
-        qlonglong qptr;
-        stream >> qptr;
-
-        result_ptr* result = reinterpret_cast<result_ptr*>(qptr);
-        if ( result && !result->isNull() )
-        {
-            tDebug() << "Dropped result item:" << result->data()->artist()->name() << "-" << result->data()->track();
-            query_ptr q = result->data()->toQuery();
-
-            if ( m_top10 )
-            {
-                getTopTen( q->artist() );
-            }
-            else if ( m_getWholeArtists )
-            {
-                queries << getArtist( q->artist() );
-            }
-            else if ( m_getWholeAlbums )
-            {
-                queries << getAlbum( q->artist(), q->album() );
-            }
-            else
-            {
-                q->addResults( QList< result_ptr >() << *result );
-                queries << q;
-            }
-        }
-    }
-
-    return queries;
-}
-
-
-QList< query_ptr >
-DropJob::tracksFromAlbumMetaData( const QMimeData *data )
-{
-    QList<query_ptr> queries;
-    QByteArray itemData = data->data( "application/tomahawk.metadata.album" );
-    QDataStream stream( &itemData, QIODevice::ReadOnly );
-
-    while ( !stream.atEnd() )
-    {
-        QString artist;
-        stream >> artist;
-        QString album;
-        stream >> album;
-
-        if ( m_top10 )
-            getTopTen( artist );
-        else if ( m_getWholeArtists )
-            queries << getArtist( artist );
-        else
-            queries << getAlbum( artist, album );
-    }
-
-    return queries;
-}
-
-
-QList< query_ptr >
-DropJob::tracksFromArtistMetaData( const QMimeData *data )
-{
-    QList<query_ptr> queries;
-    QByteArray itemData = data->data( "application/tomahawk.metadata.artist" );
-    QDataStream stream( &itemData, QIODevice::ReadOnly );
-
-    while ( !stream.atEnd() )
-    {
-        QString artist;
-        stream >> artist;
-
-        if ( !m_top10 )
-        {
-            queries << getArtist( artist );
-        }
-        else
-        {
-            getTopTen( artist );
-        }
-    }
-    return queries;
-}
-
-
-QList< query_ptr >
-DropJob::tracksFromMixedData( const QMimeData *data )
-{
-    QList< query_ptr > queries;
-    QByteArray itemData = data->data( "application/tomahawk.mixed" );
-    QDataStream stream( &itemData, QIODevice::ReadOnly );
-
-    QString mimeType;
-
-    while ( !stream.atEnd() )
-    {
-        stream >> mimeType;
-        qDebug() << "mimetype is" << mimeType;
-
-        QByteArray singleData;
-        QDataStream singleStream( &singleData, QIODevice::WriteOnly );
-
-        QMimeData singleMimeData;
-        if ( mimeType == "application/tomahawk.query.list" || mimeType == "application/tomahawk.result.list" )
-        {
-            qlonglong query;
-            stream >> query;
-            singleStream << query;
-        }
-        else if ( mimeType == "application/tomahawk.metadata.album" )
-        {
-            QString artist;
-            stream >> artist;
-            singleStream << artist;
-            QString album;
-            stream >> album;
-            singleStream << album;
-            qDebug() << "got artist" << artist << "and album" << album;
-        }
-        else if ( mimeType == "application/tomahawk.metadata.artist" )
-        {
-            QString artist;
-            stream >> artist;
-            singleStream << artist;
-            qDebug() << "got artist" << artist;
-        }
-
-        singleMimeData.setData( mimeType, singleData );
-        parseMimeData( &singleMimeData );
-    }
-
-    return queries;
-}
-
-
-void
-DropJob::handleM3u( const QString& fileUrls )
-{
-    tDebug() << Q_FUNC_INFO << "Got M3U playlist!" << fileUrls;
-    QStringList urls = fileUrls.split( QRegExp( "\n" ), QString::SkipEmptyParts );
-
-    if ( dropAction() == Default )
-        setDropAction( Create );
-
-    tDebug() << "Got a M3U playlist url to parse!" << urls;
-    M3uLoader* m = new M3uLoader( urls, dropAction() == Create, this );
-
-    if ( dropAction() == Append )
-    {
-        tDebug() << Q_FUNC_INFO << "Trying to append contents from" << urls;
-        connect( m, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-        m_queryCount++;
-    }
-    m->parse();
-}
-
-
-void
-DropJob::handleXspfs( const QString& fileUrls )
-{
-    tDebug() << Q_FUNC_INFO << "Got XSPF playlist!" << fileUrls;
-    bool error = false;
-    QStringList urls = fileUrls.split( QRegExp( "\n" ), QString::SkipEmptyParts );
-
-    if ( dropAction() == Default )
-        setDropAction( Create );
-
-    foreach ( const QString& url, urls )
-    {
-        XSPFLoader* l = 0;
-        QFile xspfFile( QUrl::fromUserInput( url ).toLocalFile() );
-
-        if ( xspfFile.exists() )
-        {
-            l = new XSPFLoader(  dropAction() == Create, this );
-            tDebug( LOGINFO ) << "Loading local XSPF" << xspfFile.fileName();
-            l->load( xspfFile );
-        }
-        else if ( QUrl( url ).isValid() )
-        {
-            l = new XSPFLoader(  dropAction() == Create, this );
-            tDebug( LOGINFO ) << "Loading remote XSPF" << url;
-            l->load( QUrl( url ) );
-        }
-        else
-        {
-            error = true;
-            tLog() << "Failed to load or parse dropped XSPF";
-        }
-
-        if ( dropAction() == Append && !error && l )
-        {
-            qDebug() << Q_FUNC_INFO << "Trying to append XSPF";
-            connect( l, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-            m_queryCount++;
-        }
-    }
-}
-
-
-void
-DropJob::handleSpotifyUrls( const QString& urlsRaw )
-{
-    QStringList urls = urlsRaw.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-    qDebug() << "Got spotify browse uris!" << urls;
-
-    /// Lets allow parsing all spotify uris here, if parse server is not available
-    /// fallback to spotify metadata for tracks /hugo
-    if ( dropAction() == Default )
-        setDropAction( Create );
-
-    tDebug() << "Got a spotify browse uri in dropjob!" << urls;
-    SpotifyParser* spot = new SpotifyParser( urls, dropAction() == Create, this );
-    spot->setSingleMode( false );
-
-    /// This currently supports draging and dropping a spotify playlist and artist
-    if ( dropAction() == Append )
-    {
-        tDebug() << Q_FUNC_INFO << "Asking for spotify browse contents from" << urls;
-        connect( spot, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-        m_queryCount++;
-    }
-}
-
-
-void
-DropJob::handleRdioUrls( const QString& urlsRaw )
-{
-    QStringList urls = urlsRaw.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-    qDebug() << "Got Rdio urls!" << urls;
-
-    if ( dropAction() == Default )
-        setDropAction( Create );
-
-    RdioParser* rdio = new RdioParser( this );
-    connect( rdio, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-
-    m_queryCount++;
-    rdio->setCreatePlaylist( dropAction() == Create  );
-    rdio->parse( urls );
-}
-
-void
-DropJob::handleGroovesharkUrls ( const QString& urlsRaw )
-{
-#ifdef QCA2_FOUND
-    QStringList urls = urlsRaw.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-    tDebug() << "Got Grooveshark urls!" << urls;
-
-    if ( dropAction() == Default )
-        setDropAction( Create );
-
-    GroovesharkParser* groove = new GroovesharkParser( urls, dropAction() == Create, this );
-    connect( groove, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-
-    if ( dropAction() == Append )
-    {
-        tDebug() << Q_FUNC_INFO << "Asking for grooveshark contents from" << urls;
-        connect( groove, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-        m_queryCount++;
-    }
-#else
-    tLog() << "Tomahawk compiled without QCA support, cannot use groovesharkparser";
-#endif
-}
-
-
-
-void
-DropJob::handleAllUrls( const QString& urls )
-{
-    if ( urls.contains( "xspf" ) )
-        handleXspfs( urls );
-    else if ( urls.contains( "m3u" ) )
-        handleM3u( urls );
-    else if ( urls.contains( "spotify" ) /// Handle all the spotify uris on internal server, if not avail. fallback to spotify
-              && ( urls.contains( "playlist" ) || urls.contains( "artist" ) || urls.contains( "album" ) || urls.contains( "track" ) )
-              && s_canParseSpotifyPlaylists )
-        handleSpotifyUrls( urls );
-    else if ( urls.contains( "rdio.com" ) )
-        handleRdioUrls( urls );
-#ifdef QCA2_FOUND
-    else if ( urls.contains( "grooveshark.com" ) )
-        handleGroovesharkUrls( urls );
-#endif
-    else
-        handleTrackUrls ( urls );
-}
-
-
-void
-DropJob::handleTrackUrls( const QString& urls )
-{
-    if ( urls.contains( "itunes.apple.com") )
-    {
-        QStringList tracks = urls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-
-        tDebug() << "Got a list of itunes urls!" << tracks;
-        ItunesParser* itunes = new ItunesParser( tracks, this );
-        connect( itunes, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-        m_queryCount++;
-    }
-    else if ( urls.contains( "open.spotify.com/track") || urls.contains( "spotify:track" ) )
-    {
-        QStringList tracks = urls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-
-        tDebug() << "Got a list of spotify urls!" << tracks;
-        SpotifyParser* spot = new SpotifyParser( tracks, this );
-        connect( spot, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-        m_queryCount++;
-    }
-    else if ( urls.contains( "rdio.com" ) )
-    {
-        QStringList tracks = urls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-
-        tDebug() << "Got a list of rdio urls!" << tracks;
-        RdioParser* rdio = new RdioParser( this );
-        connect( rdio, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
-        m_queryCount++;
-
-        rdio->parse( tracks );
-    }
-    else if ( ShortenedLinkParser::handlesUrl( urls ) )
-    {
-        QStringList tracks = urls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
-
-        tDebug() << "Got a list of shortened urls!" << tracks;
-        ShortenedLinkParser* parser = new ShortenedLinkParser( tracks, this );
-        connect( parser, SIGNAL( urls( QStringList ) ), this, SLOT( expandedUrls( QStringList ) ) );
-        m_queryCount++;
-    }
-}
-
-
-void
-DropJob::expandedUrls( QStringList urls )
-{
-    m_queryCount--;
-    handleAllUrls( urls.join( "\n" ) );
-}
-
-
-void
-DropJob::onTracksAdded( const QList<Tomahawk::query_ptr>& tracksList )
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( m_dropJob )
-    {
-        m_dropJob->setFinished();
-        m_dropJob = 0;
-    }
-
-    m_resultList.append( tracksList );
-
-    if ( --m_queryCount == 0 )
-    {
-        if ( m_onlyLocal )
-            removeRemoteSources();
-
-        if ( !m_allowDuplicates )
-            removeDuplicates();
-
-        emit tracks( m_resultList );
-        deleteLater();
-    }
-}
-
-
-void
-DropJob::tracksFromDB( const QList< query_ptr >& tracks )
-{
-    // Tracks that we get from databasecommand_alltracks are resolved only against the database and explicitly marked
-    // as finished. if the source they resolve to is offline they will not resolve against any resolver.
-    // explicitly resolve them if they fall in that case first
-    foreach( const query_ptr& track, tracks )
-    {
-        if ( !track->playable() && !track->solved() && track->results().size() ) // we have offline results
-        {
-            track->setResolveFinished( false );
-            Pipeline::instance()->resolve( track );
-        }
-    }
-
-    album_ptr albumPtr;
-    artist_ptr artistPtr;
-    if ( Tomahawk::Album* album = qobject_cast< Tomahawk::Album* >( sender() ) )
-    {
-        foreach ( const album_ptr& ptr, m_albumsToKeep )
-            if ( ptr.data() == album )
-            {
-                albumPtr = ptr;
-                m_albumsToKeep.remove( ptr );
-            }
-    }
-    else if ( Tomahawk::Artist* artist = qobject_cast< Tomahawk::Artist* >( sender() ) )
-    {
-        foreach ( const artist_ptr& ptr, m_artistsToKeep )
-            if ( ptr.data() == artist )
-            {
-                artistPtr = ptr;
-                m_artistsToKeep.remove( ptr );
-            }
-    }
-
-    // If we have no tracks, this means no sources in our network have the give request (artist or album)
-    // Since we really do want to try to drop them, we ask the infosystem as well.
-    if ( tracks.isEmpty() )
-    {
-        if ( !albumPtr.isNull() && !albumPtr->artist().isNull() )
-        {
-            Q_ASSERT( artistPtr.isNull() );
-            --m_queryCount; // This query is done. New query is infosystem query
-            getAlbumFromInfoystem( albumPtr->artist()->name(), albumPtr->name() );
-        }
-        else if ( !artistPtr.isNull() )
-        {
-            Q_ASSERT( albumPtr.isNull() );
-            --m_queryCount;
-            getTopTen( artistPtr->name() );
-        }
-    }
-    else
-    {
-        onTracksAdded( tracks );
-    }
-
-}
-
-
-void
-DropJob::removeDuplicates()
-{
-    QList< Tomahawk::query_ptr > list;
-    foreach ( const Tomahawk::query_ptr& item, m_resultList )
-    {
-        bool contains = false;
-        foreach( const Tomahawk::query_ptr &tmpItem, list )
-        {
-            if ( item->album() == tmpItem->album()
-                 && item->artist() == tmpItem->artist()
-                 && item->track() == tmpItem->track() )
-            {
-                if ( item->playable() && !tmpItem->playable() )
-                    list.replace( list.indexOf( tmpItem ), item );
-
-                contains = true;
-                break;
-            }
-        }
-        if ( !contains )
-            list.append( item );
-    }
-
-    m_resultList = list;
-}
-
-
-void
-DropJob::removeRemoteSources()
-{
-    QList< Tomahawk::query_ptr > list;
-    foreach ( const Tomahawk::query_ptr& item, m_resultList )
-    {
-        bool hasLocalSource = false;
-        foreach ( const Tomahawk::result_ptr& result, item->results() )
-        {
-            if ( !result->collection()->source().isNull() && result->collection()->source()->isLocal() )
-                hasLocalSource = true;
-        }
-        if ( hasLocalSource )
-            list.append( item );
-    }
-    m_resultList = list;
-}
-
-
-void
-DropJob::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
-{
-    if ( requestData.caller == s_dropJobInfoId )
-    {
-        const Tomahawk::InfoSystem::InfoStringHash info = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-
-        const QString artist = info"artist";
-        const QString album  = info"album";
-
-        qDebug() << "Got requestData response for artist" << artist << "and album:" << album << output;
-
-        QList< query_ptr > results;
-
-        int i = 0;
-        foreach ( const QVariant& title, output.toMap().value( "tracks" ).toList() )
-        {
-            results << Query::get( artist, title.toString(), QString(), uuid() );
-
-            if ( ++i == 10 ) // Only getting top ten for now. Would make sense to make it configurable
-                break;
-        }
-
-        if ( results.isEmpty() )
-        {
-            const QString which = album.isEmpty() ? "artist" : "album";
-            JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "No tracks found for given %1" ).arg( which ), 5 ) );
-        }
-        onTracksAdded( results );
-    }
-}
-
-
-QList< query_ptr >
-DropJob::getArtist( const QString &artist )
-{
-    artist_ptr artistPtr = Artist::get( artist );
-    if ( artistPtr->playlistInterface()->tracks().isEmpty() )
-    {
-        m_artistsToKeep.insert( artistPtr );
-
-        connect( artistPtr.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr> ) ),
-                                     SLOT( tracksFromDB( QList<Tomahawk::query_ptr> ) ) );
-        m_queryCount++;
-        return QList< query_ptr >();
-    }
-    else
-        return artistPtr->playlistInterface()->tracks();
-}
-
-
-QList< query_ptr >
-DropJob::getAlbum(const QString &artist, const QString &album)
-{
-    artist_ptr artistPtr = Artist::get( artist );
-    album_ptr albumPtr = Album::get( artistPtr, album );
-
-    if ( albumPtr.isNull() )
-        return QList< query_ptr >();
-
-    if ( albumPtr->playlistInterface()->tracks().isEmpty() )
-    {
-        // For albums that don't exist until this moment, we are the main shared pointer holding on.
-        // fetching the tracks is asynchronous, so the resulting signal is queued. when we go out of scope we delete
-        // the artist_ptr which means we never get the signal delivered. so we hold on to the album pointer till we're done
-        m_albumsToKeep.insert( albumPtr );
-
-        m_dropJob = new DropJobNotifier( QPixmap( RESPATH "images/album-icon.png" ), Album );
-        connect( albumPtr.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr> ) ),
-                                    SLOT( tracksFromDB( QList<Tomahawk::query_ptr> ) ) );
-        JobStatusView::instance()->model()->addJob( m_dropJob );
-
-        m_queryCount++;
-        return QList< query_ptr >();
-    }
-    else
-        return albumPtr->playlistInterface()->tracks();
-}
-
-
-void
-DropJob::getTopTen( const QString &artist )
-{
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(),
-             SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-             SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-
-    Tomahawk::InfoSystem::InfoStringHash artistInfo;
-    artistInfo"artist" = artist;
-
-    Tomahawk::InfoSystem::InfoRequestData requestData;
-    requestData.caller = s_dropJobInfoId;
-    requestData.customData = QVariantMap();
-
-    requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
-
-    requestData.type = Tomahawk::InfoSystem::InfoArtistSongs;
-    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-
-    m_queryCount++;
-}
-
-
-void
-DropJob::getAlbumFromInfoystem( const QString& artist, const QString& album )
-{
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(),
-             SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-             SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-
-    Tomahawk::InfoSystem::InfoStringHash artistInfo;
-    artistInfo"artist" = artist;
-    artistInfo"album" = album;
-
-    Tomahawk::InfoSystem::InfoRequestData requestData;
-    requestData.caller = s_dropJobInfoId;
-    requestData.customData = QVariantMap();
-
-    requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
-
-    requestData.type = Tomahawk::InfoSystem::InfoAlbumSongs;
-    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-
-    m_queryCount++;
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/dropjob.h Deleted

@@ -1,164 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Michael Zanetti <mzanetti@kde.org>
- *   Copyright 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 DROPJOB_H
-#define DROPJOB_H
-
-#include "query.h"
-
-#include "infosystem/infosystem.h"
-#include "utils/xspfloader.h"
-
-#include <QObject>
-#include <QStringList>
-#include <QMimeData>
-
-namespace Tomahawk {
-class DropJobNotifier;
-}
-
-
-class DLLEXPORT DropJob : public QObject
-{
-    Q_OBJECT
-public:
-    explicit DropJob( QObject *parent = 0 );
-    ~DropJob();
-
-    /**
-     * QMimeData helpers
-     *
-     *  Call this to parse the tracks in a QMimeData object to query_ptrs. This will parse internal tomahawk
-     *   data as well as all other formats supported (spotify, etc).
-     *
-     * Connect to tracks( QList< query_ptr> ); for the extracted tracks.
-     */
-
-    enum DropType {
-        None =      0x00,
-        Playlist =  0x01,
-        Track =     0x02,
-        Album =     0x04,
-        Artist =    0x08,
-
-        All =       0xFF
-    };
-    Q_DECLARE_FLAGS(DropTypes, DropType)
-
-    enum DropAction {
-        Default = 0,
-        Append,
-        Create,
-        Move
-    };
-
-    /**
-     * Returns if the caller should accept this mimetype.
-     *
-     * \param data The mimetype object to check
-     * \param type The type of drop content to accept
-     * \param action What action is requested from the content, if not all data types support all actions
-     */
-    static bool acceptsMimeData( const QMimeData* data, DropJob::DropTypes type = All, DropAction action = Append );
-
-    /**
-     * Return if the drop is primarily of the given type. Does not auto-convert (e.g. if the drop is of type playlist,
-     *  even thougha playlist can be converted into tracks, this will return true only for the Playlist drop type).
-     *
-     * TODO Only implemented for Playlist atm. Extend when you need it.
-     */
-    static bool isDropType( DropJob::DropType desired, const QMimeData* data );
-
-    static QStringList mimeTypes();
-
-    /// Set the drop types that should be extracted from this drop
-    void setDropTypes( DropTypes types ) { m_dropTypes = types; }
-
-    /// Set the action that the drop should do. For example, if dropping a playlist, Create will create a new playlist but Append will generate the raw tracks
-    void setDropAction( DropAction action ) { m_dropAction = action; }
-
-    DropTypes dropTypes() const { return m_dropTypes; }
-    DropAction dropAction() const { return m_dropAction; }
-
-    /**
-     * Begin the parsing of the mime data. The resulting tracks are exposed in the various signals
-     */
-    void parseMimeData( const QMimeData* data );
-
-    void setGetWholeArtists( bool getWholeArtists );
-    void setGetWholeAlbums( bool getWholeAlbums );
-    void tracksFromMimeData( const QMimeData* data, bool allowDuplicates = false, bool onlyLocal = false, bool top10 = false );
-    void handleXspfs( const QString& files );
-    void handleM3u( const QString& urls );
-    void handleSpotifyUrls( const QString& urls );
-    void handleRdioUrls( const QString& urls );
-    void handleGroovesharkUrls( const QString& urls );
-
-    static bool canParseSpotifyPlaylists() { return s_canParseSpotifyPlaylists; }
-    static void setCanParseSpotifyPlaylists( bool parseable ) { s_canParseSpotifyPlaylists = parseable; }
-
-signals:
-    /// QMimeData parsing results
-    void tracks( const QList< Tomahawk::query_ptr >& tracks );
-
-private slots:
-    void expandedUrls( QStringList );
-    void onTracksAdded( const QList<Tomahawk::query_ptr>& );
-    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-
-    void tracksFromDB( const QList< Tomahawk::query_ptr >& );
-private:
-    /// handle parsing mime data
-    void handleAllUrls( const QString& urls );
-    void handleTrackUrls( const QString& urls );
-    QList< Tomahawk::query_ptr > tracksFromQueryList( const QMimeData* d );
-    QList< Tomahawk::query_ptr > tracksFromResultList( const QMimeData* d );
-    QList< Tomahawk::query_ptr > tracksFromArtistMetaData( const QMimeData* d );
-    QList< Tomahawk::query_ptr > tracksFromAlbumMetaData( const QMimeData* d );
-    QList< Tomahawk::query_ptr > tracksFromMixedData( const QMimeData* d );
-
-    QList< Tomahawk::query_ptr > getArtist( const QString& artist );
-    QList< Tomahawk::query_ptr > getAlbum( const QString& artist, const QString& album );
-
-    void getTopTen( const QString& artist );
-    void getAlbumFromInfoystem( const QString& artist, const QString& album );
-
-    void removeDuplicates();
-    void removeRemoteSources();
-
-    int m_queryCount;
-    bool m_allowDuplicates;
-    bool m_onlyLocal;
-    bool m_getWholeArtists;
-    bool m_getWholeAlbums;
-    bool m_top10;
-    DropTypes m_dropTypes;
-    DropAction m_dropAction;
-
-    Tomahawk::DropJobNotifier* m_dropJob;
-
-    QList< Tomahawk::query_ptr > m_resultList;
-    QSet< Tomahawk::album_ptr > m_albumsToKeep;
-    QSet< Tomahawk::artist_ptr > m_artistsToKeep;
-
-    static bool s_canParseSpotifyPlaylists;
-};
-
-Q_DECLARE_OPERATORS_FOR_FLAGS(DropJob::DropTypes)
-#endif // DROPJOB_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/functimeout.h Deleted

@@ -1,74 +0,0 @@
-/* === 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
- *   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 FUNCTIMEOUT_H
-#define FUNCTIMEOUT_H
-
-#include <QObject>
-#include <QTimer>
-#include <QWeakPointer>
-
-#include "boost/function.hpp"
-#include "boost/bind.hpp"
-
-#include "dllmacro.h"
-
-/*
-    I want to do:
-        QTimer::singleShot(1000, this, SLOT(doSomething(x)));
-    instead, I'm doing:
-        new FuncTimeout(1000, boost::bind(&MyClass::doSomething, this, x));
-
- */
-namespace Tomahawk
-{
-
-class DLLEXPORT FuncTimeout : public QObject
-{
-Q_OBJECT
-
-public:
-    FuncTimeout( int ms, boost::function<void()> func, QObject* besafe )
-        : m_func( func )
-        , m_watch( QWeakPointer< QObject >( besafe ) )
-    {
-        //qDebug() << Q_FUNC_INFO;
-        QTimer::singleShot( ms, this, SLOT( exec() ) );
-    };
-
-    ~FuncTimeout()
-    {
-        //qDebug() << Q_FUNC_INFO;
-    };
-
-public slots:
-    void exec()
-    {
-        if( !m_watch.isNull() )
-            m_func();
-        this->deleteLater();
-    };
-
-private:
-    boost::function<void()> m_func;
-    QWeakPointer< QObject > m_watch;
-};
-
-}; // ns
-
-#endif // FUNCTIMEOUT_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/globalactionmanager.cpp Deleted

@@ -1,1058 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-    This program 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 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "globalactionmanager.h"
-
-#include "artist.h"
-#include "album.h"
-#include "sourcelist.h"
-#include "pipeline.h"
-#include "tomahawksettings.h"
-#include "audio/audioengine.h"
-#include "database/localcollection.h"
-#include "playlist/dynamic/GeneratorInterface.h"
-
-#include "echonest/Playlist.h"
-
-#include "utils/xspfloader.h"
-#include "utils/xspfgenerator.h"
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-
-#include "utils/jspfloader.h"
-#include "utils/spotifyparser.h"
-#include "utils/shortenedlinkparser.h"
-#include "utils/rdioparser.h"
-
-#include "widgets/searchwidget.h"
-#include "viewmanager.h"
-#include "playlist/topbar/topbar.h"
-#include "playlist/playlistview.h"
-
-
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkProxy>
-
-#include <QtCore/QMimeData>
-#include <QtCore/QUrl>
-
-
-GlobalActionManager* GlobalActionManager::s_instance = 0;
-
-using namespace Tomahawk;
-
-
-GlobalActionManager*
-GlobalActionManager::instance()
-{
-    if ( !s_instance )
-        s_instance = new GlobalActionManager;
-
-    return s_instance;
-}
-
-
-GlobalActionManager::GlobalActionManager( QObject* parent )
-    : QObject( parent )
-{
-}
-
-
-GlobalActionManager::~GlobalActionManager()
-{
-}
-
-
-QUrl
-GlobalActionManager::openLinkFromQuery( const query_ptr& query ) const
-{
-    QString title, artist, album;
-
-    if( !query->results().isEmpty() && !query->results().first().isNull() )
-    {
-        title = query->results().first()->track();
-        artist = query->results().first()->artist().isNull() ? QString() : query->results().first()->artist()->name();
-        album = query->results().first()->album().isNull() ? QString() : query->results().first()->album()->name();
-    } else
-    {
-        title = query->track();
-        artist = query->artist();
-        album = query->album();
-    }
-
-    return openLink( title, artist, album );
-}
-
-
-QUrl
-GlobalActionManager::openLink( const QString& title, const QString& artist, const QString& album ) const
-{
-    QUrl link( QString( "%1/open/track/" ).arg( hostname() ) );
-
-    if( !title.isEmpty() )
-        link.addQueryItem( "title", title );
-    if( !artist.isEmpty() )
-        link.addQueryItem( "artist", artist );
-    if( !album.isEmpty() )
-        link.addQueryItem( "album", album );
-
-    return link;
-}
-
-
-void
-GlobalActionManager::shortenLink( const QUrl& url )
-{
-    if ( QThread::currentThread() != thread() )
-    {
-        qDebug() << "Reinvoking in correct thread:" << Q_FUNC_INFO;
-        QMetaObject::invokeMethod( this, "shortenLink", Qt::QueuedConnection, Q_ARG( QUrl, url ) );
-        return;
-    }
-
-    QNetworkRequest request;
-    request.setUrl( url );
-
-    QNetworkReply *reply = TomahawkUtils::nam()->get( request );
-    connect( reply, SIGNAL( finished() ), SLOT( shortenLinkRequestFinished() ) );
-    connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), SLOT( shortenLinkRequestError( QNetworkReply::NetworkError ) ) );
-}
-
-
-QString
-GlobalActionManager::copyPlaylistToClipboard( const dynplaylist_ptr& playlist )
-{
-    QUrl link( QString( "%1/%2/create/" ).arg( hostname() ).arg( playlist->mode() == OnDemand ? "station" : "autoplaylist" ) );
-
-    if( playlist->generator()->type() != "echonest" ) {
-        tLog() << "Only echonest generators are supported";
-        return QString();
-    }
-
-    link.addEncodedQueryItem( "type", "echonest" );
-    link.addQueryItem( "title", playlist->title() );
-
-    QList< dyncontrol_ptr > controls = playlist->generator()->controls();
-    foreach( const dyncontrol_ptr& c, controls ) {
-        if( c->selectedType() == "Artist" ) {
-            if( c->match().toInt() == Echonest::DynamicPlaylist::ArtistType )
-                link.addQueryItem( "artist_limitto", c->input() );
-            else
-                link.addQueryItem( "artist", c->input() );
-        } else if( c->selectedType() == "Artist Description" ) {
-            link.addQueryItem( "description", c->input() );
-        } else {
-            QString name = c->selectedType().toLower().replace( " ", "_" );
-            Echonest::DynamicPlaylist::PlaylistParam p = static_cast< Echonest::DynamicPlaylist::PlaylistParam >( c->match().toInt() );
-            // if it is a max, set that too
-            if( p == Echonest::DynamicPlaylist::MaxTempo || p == Echonest::DynamicPlaylist::MaxDuration || p == Echonest::DynamicPlaylist::MaxLoudness
-               || p == Echonest::DynamicPlaylist::MaxDanceability || p == Echonest::DynamicPlaylist::MaxEnergy || p == Echonest::DynamicPlaylist::ArtistMaxFamiliarity
-               || p == Echonest::DynamicPlaylist::ArtistMaxHotttnesss || p == Echonest::DynamicPlaylist::SongMaxHotttnesss || p == Echonest::DynamicPlaylist::ArtistMaxLatitude
-               || p == Echonest::DynamicPlaylist::ArtistMaxLongitude )
-                name += "_max";
-
-            link.addQueryItem( name, c->input() );
-        }
-    }
-
-    QClipboard* cb = QApplication::clipboard();
-    QByteArray data = link.toEncoded();
-    data.replace( "'", "%27" ); // QUrl doesn't encode ', which it doesn't have to. Some apps don't like ' though, and want %27. Both are valid.
-    cb->setText( data );
-
-    return link.toString();
-}
-
-
-void
-GlobalActionManager::savePlaylistToFile( const playlist_ptr& playlist, const QString& filename )
-{
-    XSPFGenerator* g = new XSPFGenerator( playlist, this );
-    g->setProperty( "filename", filename );
-
-    connect( g, SIGNAL( generated( QByteArray ) ), this, SLOT( xspfCreated( QByteArray ) ) );
-}
-
-
-void
-GlobalActionManager::xspfCreated( const QByteArray& xspf )
-{
-    QString filename = sender()->property( "filename" ).toString();
-
-    QFile f( filename );
-    if( !f.open( QIODevice::WriteOnly ) ) {
-        qWarning() << "Failed to open file to save XSPF:" << filename;
-        return;
-    }
-
-    f.write( xspf );
-    f.close();
-
-    sender()->deleteLater();
-}
-
-
-void
-GlobalActionManager::copyToClipboard( const query_ptr& query )
-{
-    m_clipboardLongUrl = openLinkFromQuery( query );
-    GlobalActionManager::instance()->shortenLink( m_clipboardLongUrl );
-}
-
-
-bool
-GlobalActionManager::parseTomahawkLink( const QString& urlIn )
-{
-    QString url = urlIn;
-    if( urlIn.startsWith( "http://toma.hk" ) )
-        url.replace( "http://toma.hk/", "tomahawk://" );
-
-    if( url.contains( "tomahawk://" ) ) {
-        QString cmd = url.mid( 11 );
-        cmd.replace( "%2B", "%20" );
-        tLog() << "Parsing tomahawk link command" << cmd;
-
-        QString cmdType = cmd.split( "/" ).first();
-        QUrl u = QUrl::fromEncoded( cmd.toUtf8() );
-
-        // for backwards compatibility
-        if( cmdType == "load" ) {
-            if( u.hasQueryItem( "xspf" ) ) {
-                QUrl xspf = QUrl::fromUserInput( u.queryItemValue( "xspf" ) );
-                XSPFLoader* l = new XSPFLoader( true, this );
-                tDebug() << "Loading spiff:" << xspf.toString();
-                l->load( xspf );
-                connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), ViewManager::instance(), SLOT( show( Tomahawk::playlist_ptr ) ) );
-
-                return true;
-            } else if( u.hasQueryItem( "jspf" ) ) {
-                QUrl jspf = QUrl::fromUserInput( u.queryItemValue( "jspf" ) );
-                JSPFLoader* l = new JSPFLoader( true, this );
-
-                tDebug() << "Loading jspiff:" << jspf.toString();
-                l->load( jspf );
-                connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), ViewManager::instance(), SLOT( show( Tomahawk::playlist_ptr ) ) );
-
-                return true;
-            }
-        }
-
-        if( cmdType == "playlist" ) {
-            return handlePlaylistCommand( u );
-        } else if( cmdType == "collection" ) {
-            return handleCollectionCommand( u );
-        } else if( cmdType == "queue" ) {
-            return handleQueueCommand( u );
-        } else if( cmdType == "station" ) {
-            return handleStationCommand( u );
-        } else if( cmdType == "autoplaylist" ) {
-            return handleAutoPlaylistCommand( u );
-        } else if( cmdType == "search" ) {
-            return handleSearchCommand( u );
-        } else if( cmdType == "play" ) {
-            return handlePlayCommand( u );
-        } else if( cmdType == "bookmark" ) {
-            return handlePlayCommand( u );
-        } else if( cmdType == "open" ) {
-            return handleOpenCommand( u );
-        } else if( cmdType == "view" ) {
-            return handleViewCommand( u );
-        } else {
-            tLog() << "Tomahawk link not supported, command not known!" << cmdType << u.path();
-            return false;
-        }
-    } else {
-        tLog() << "Not a tomahawk:// link!";
-        return false;
-    }
-}
-
-
-bool
-GlobalActionManager::handlePlaylistCommand( const QUrl& url )
-{
-    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
-    if( parts.isEmpty() ) {
-        tLog() << "No specific playlist command:" << url.toString();
-        return false;
-    }
-
-    if( parts 0  == "import" ) {
-        if( !url.hasQueryItem( "xspf" ) ) {
-            tDebug() << "No xspf to load...";
-            return false;
-        }
-        QUrl xspf = QUrl::fromUserInput( url.queryItemValue( "xspf" ) );
-        QString title =  url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString();
-        XSPFLoader* l= new XSPFLoader( true, this );
-        l->setOverrideTitle( title );
-        l->load( xspf );
-        connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), this, SLOT( playlistCreatedToShow( Tomahawk::playlist_ptr) ) );
-
-    } else if( parts  0  == "new" ) {
-        if( !url.hasQueryItem( "title" ) ) {
-            tLog() << "New playlist command needs a title...";
-            return false;
-        }
-        playlist_ptr pl = Playlist::create( SourceList::instance()->getLocal(), uuid(), url.queryItemValue( "title" ), QString(), QString(), false );
-        ViewManager::instance()->show( pl );
-    } else if( parts 0  == "add" ) {
-        if( !url.hasQueryItem( "playlistid" ) || !url.hasQueryItem( "title" ) || !url.hasQueryItem( "artist" ) ) {
-            tLog() << "Add to playlist command needs playlistid, track, and artist..." << url.toString();
-            return false;
-        }
-        // TODO implement. Let the user select what playlist to add to
-        return false;
-    }
-
-    return false;
-}
-
-void
-GlobalActionManager::playlistCreatedToShow( const playlist_ptr& pl )
-{
-    connect( pl.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistReadyToShow() ) );
-    pl->setProperty( "sharedptr", QVariant::fromValue<Tomahawk::playlist_ptr>( pl ) );
-}
-
-void GlobalActionManager::playlistReadyToShow()
-{
-    playlist_ptr pl = sender()->property( "sharedptr" ).value<Tomahawk::playlist_ptr>();
-    if ( !pl.isNull() )
-        ViewManager::instance()->show( pl );
-
-    disconnect( sender(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistReadyToShow() ) );
-}
-
-
-bool
-GlobalActionManager::handleCollectionCommand( const QUrl& url )
-{
-    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
-    if( parts.isEmpty() ) {
-        tLog() << "No specific collection command:" << url.toString();
-        return false;
-    }
-
-    if( parts 0  == "add" ) {
-        // TODO implement
-    }
-
-    return false;
-}
-
-
-bool
-GlobalActionManager::handleOpenCommand(const QUrl& url)
-{
-    QStringList parts = url.path().split( "/" ).mid( 1 );
-    if( parts.isEmpty() ) {
-        tLog() << "No specific type to open:" << url.toString();
-        return false;
-    }
-    // TODO user configurable in the UI
-    return doQueueAdd( parts, url.queryItems() );
-}
-
-
-void
-GlobalActionManager::handleOpenTrack ( const query_ptr& q )
-{
-    ViewManager::instance()->queue()->model()->append( q );
-    ViewManager::instance()->showQueue();
-
-    if( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() ) {
-        connect( q.data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( waitingForResolved( bool ) ) );
-        m_waitingToPlay = q;
-    }
-}
-
-void
-GlobalActionManager::handlePlayTrack( const query_ptr& qry )
-{
-    playNow( qry );
-}
-
-
-
-bool
-GlobalActionManager::handleQueueCommand( const QUrl& url )
-{
-    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
-    if( parts.isEmpty() ) {
-        tLog() << "No specific queue command:" << url.toString();
-        return false;
-    }
-
-    if( parts 0  == "add" ) {
-        doQueueAdd( parts.mid( 1 ), url.queryItems() );
-    } else {
-        tLog() << "Only queue/add/track is support at the moment, got:" << parts;
-        return false;
-    }
-
-    return false;
-}
-
-
-bool
-GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems )
-{
-    if( parts.size() && parts 0  == "track" ) {
-
-        if( queueSpotify( parts, queryItems ) )
-            return true;
-        else if( queueRdio( parts, queryItems ) )
-            return true;
-
-        QPair< QString, QString > pair;
-
-        QString title, artist, album, urlStr;
-        foreach( pair, queryItems ) {
-            pair.second = pair.second.replace( "+", " " ); // QUrl::queryItems doesn't decode + to a space :(
-            if( pair.first == "title" )
-                title = pair.second;
-            else if( pair.first == "artist" )
-                artist = pair.second;
-            else if( pair.first == "album" )
-                album = pair.second;
-            else if( pair.first == "url" )
-                urlStr = pair.second;
-        }
-
-        if( !title.isEmpty() || !artist.isEmpty() || !album.isEmpty() ) { // an individual; query to add to queue
-            query_ptr q = Query::get( artist, title, album, uuid(), false );
-            if( !urlStr.isEmpty() )
-                q->setResultHint( urlStr );
-            Pipeline::instance()->resolve( q, true );
-
-            handleOpenTrack( q );
-            return true;
-
-        } else { // a list of urls to add to the queue
-            foreach( pair, queryItems ) {
-                if( pair.first != "url" )
-                    continue;
-                QUrl track = QUrl::fromUserInput( pair.second );
-                //FIXME: isLocalFile is Qt 4.8
-                if( track.toString().startsWith( "file://" ) ) { // it's local, so we see if it's in the DB and load it if so
-                    // TODO
-                } else { // give it a web result hint
-                    QFileInfo info( track.path() );
-                    query_ptr q = Query::get( QString(), info.baseName(), QString(), uuid(), false );
-                    q->setResultHint( track.toString() );
-
-                    Pipeline::instance()->resolve( q, true );
-
-                    ViewManager::instance()->queue()->model()->append( q );
-                    ViewManager::instance()->showQueue();
-                }
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-
-bool
-GlobalActionManager::queueSpotify( const QStringList& , const QList< QPair< QString, QString > >& queryItems )
-{
-    QString url;
-
-    QPair< QString, QString > pair;
-    foreach( pair, queryItems ) {
-        if( pair.first == "spotifyURL" )
-            url = pair.second;
-        else if( pair.first == "spotifyURI" )
-            url = pair.second;
-    }
-
-    if( url.isEmpty() )
-        return false;
-
-    openSpotifyLink( url );
-
-    return true;
-}
-
-
-bool
-GlobalActionManager::queueRdio( const QStringList& , const QList< QPair< QString, QString > >& queryItems )
-{
-    QString url;
-
-    QPair< QString, QString > pair;
-    foreach( pair, queryItems ) {
-        if( pair.first == "rdioURL" )
-            url = pair.second;
-        else if( pair.first == "rdioURI" )
-            url = pair.second;
-    }
-
-    if( url.isEmpty() )
-        return false;
-
-    openRdioLink( url );
-
-    return true;
-}
-
-
-bool
-GlobalActionManager::handleSearchCommand( const QUrl& url )
-{
-    // open the super collection and set this as the search filter
-    QString queryStr;
-    if ( url.hasQueryItem( "query" ) )
-        queryStr = url.queryItemValue( "query" );
-    else
-    {
-        QStringList query;
-        if( url.hasQueryItem( "artist" ) )
-            query << url.queryItemValue( "artist" );
-        if( url.hasQueryItem( "album" ) )
-            query << url.queryItemValue( "album" );
-        if( url.hasQueryItem( "title" ) )
-            query << url.queryItemValue( "title" );
-        queryStr = query.join( " " );
-    }
-
-    if( queryStr.trimmed().isEmpty() )
-        return false;
-
-    ViewManager::instance()->show( new SearchWidget( queryStr.trimmed() ) );
-
-    return true;
-}
-
-bool
-GlobalActionManager::handleViewCommand( const QUrl& url )
-{
-    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
-    if( parts.isEmpty() ) {
-        tLog() << "No specific view command:" << url.toString();
-        return false;
-    }
-
-    if ( parts 0  == "artist" )
-    {
-        const QString artist = url.queryItemValue( "name" );
-        if ( artist.isEmpty() )
-        {
-            tLog() << "Not artist supplied for view/artist command.";
-            return false;
-        }
-        artist_ptr artistPtr = Artist::get( artist );
-        if ( !artistPtr.isNull() )
-            ViewManager::instance()->show( artistPtr );
-
-        return true;
-    }
-    else if ( parts 0  == "album" )
-    {
-        const QString artist = url.queryItemValue( "artist" );
-        const QString album = url.queryItemValue( "name" );
-        if ( artist.isEmpty() || album.isEmpty() )
-        {
-            tLog() << "Not artist or album supplied for view/artist command:" << url;
-            return false;
-        }
-        album_ptr albumPtr = Album::get( Artist::get( artist, false ), album, false );
-        if ( !albumPtr.isNull() )
-            ViewManager::instance()->show( albumPtr );
-
-        return true;
-    }
-
-    return false;
-}
-
-
-bool
-GlobalActionManager::handleAutoPlaylistCommand( const QUrl& url )
-{
-    return !loadDynamicPlaylist( url, false ).isNull();
-}
-
-
-Tomahawk::dynplaylist_ptr
-GlobalActionManager::loadDynamicPlaylist( const QUrl& url, bool station )
-{
-    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
-    if( parts.isEmpty() ) {
-        tLog() << "No specific station command:" << url.toString();
-        return Tomahawk::dynplaylist_ptr();
-    }
-
-    if( parts 0  == "create" ) {
-        if( !url.hasQueryItem( "title" ) || !url.hasQueryItem( "type" ) ) {
-            tLog() << "Station create command needs title and type..." << url.toString();
-            return Tomahawk::dynplaylist_ptr();
-        }
-        QString title = url.queryItemValue( "title" );
-        QString type = url.queryItemValue( "type" );
-        GeneratorMode m = Static;
-        if( station )
-            m = OnDemand;
-
-        dynplaylist_ptr pl = DynamicPlaylist::create( SourceList::instance()->getLocal(), uuid(), title, QString(), QString(), m, false, type );
-        pl->setMode( m );
-        QList< dyncontrol_ptr > controls;
-        QPair< QString, QString > param;
-        foreach( param, url.queryItems() ) {
-            if( param.first == "artist" ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Artist" );
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistRadioType ) );
-                controls << c;
-            } else if( param.first == "artist_limitto" ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Artist" );
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistType ) );
-                controls << c;
-            } else if( param.first == "description" ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Artist Description" );
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistDescriptionType ) );
-                controls << c;
-            } else if( param.first == "variety" ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Variety" );
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Variety ) );
-                controls << c;
-            } else if( param.first.startsWith( "tempo" ) ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Tempo" );
-                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinTempo + extra ) );
-                controls << c;
-            } else if( param.first.startsWith( "duration" ) ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Duration" );
-                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinDuration + extra ) );
-                controls << c;
-            } else if( param.first.startsWith( "loudness" ) ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Loudness" );
-                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinLoudness + extra ) );
-                controls << c;
-            } else if( param.first.startsWith( "danceability" ) ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Danceability" );
-                int extra = param.first.endsWith( "_max" ) ? 1 : 0;
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinDanceability + extra ) );
-                controls << c;
-            } else if( param.first.startsWith( "energy" ) ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Energy" );
-                int extra = param.first.endsWith( "_max" ) ? 1 : 0;
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinEnergy + extra ) );
-                controls << c;
-            } else if( param.first.startsWith( "artist_familiarity" ) ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Artist Familiarity" );
-                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinFamiliarity + extra ) );
-                controls << c;
-            } else if( param.first.startsWith( "artist_hotttnesss" ) ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Artist Hotttnesss" );
-                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinHotttnesss + extra ) );
-                controls << c;
-            } else if( param.first.startsWith( "song_hotttnesss" ) ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Song Hotttnesss" );
-                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::SongMinHotttnesss + extra ) );
-                controls << c;
-            } else if( param.first.startsWith( "longitude" ) ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Longitude" );
-                int extra = param.first.endsWith( "_max" ) ? 1 : 0;
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinLongitude + extra ) );
-                controls << c;
-            } else if( param.first.startsWith( "latitude" ) ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Latitude" );
-                int extra = param.first.endsWith( "_max" ) ? 1 : 0;
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinLatitude + extra ) );
-                controls << c;
-            } else if( param.first == "key" ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Key" );
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Key ) );
-                controls << c;
-            } else if( param.first == "mode" ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Mode" );
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Mode ) );
-                controls << c;
-            } else if( param.first == "mood" ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Mood" );
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Mood ) );
-                controls << c;
-            } else if( param.first == "style" ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Style" );
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Style ) );
-                controls << c;
-            } else if( param.first == "song" ) {
-                dyncontrol_ptr c = pl->generator()->createControl( "Song" );
-                c->setInput( param.second );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::SongRadioType ) );
-                controls << c;
-            }
-        }
-        if( m == OnDemand )
-            pl->createNewRevision( uuid(), pl->currentrevision(), type, controls );
-        else
-            pl->createNewRevision( uuid(), pl->currentrevision(), type, controls, pl->entries() );
-
-        ViewManager::instance()->show( pl );
-        return pl;
-    }
-
-    return Tomahawk::dynplaylist_ptr();
-}
-
-
-bool
-GlobalActionManager::handleStationCommand( const QUrl& url )
-{
-    return !loadDynamicPlaylist( url, true ).isNull();
-}
-
-
-bool
-GlobalActionManager::handlePlayCommand( const QUrl& url )
-{
-    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
-    if( parts.isEmpty() ) {
-        tLog() << "No specific play command:" << url.toString();
-        return false;
-    }
-
-    if( parts 0  == "track" ) {
-        if( playSpotify( url ) )
-            return true;
-        else if( playRdio( url ) )
-            return true;
-
-        QPair< QString, QString > pair;
-        QString title, artist, album, urlStr;
-        foreach( pair, url.queryItems() ) {
-            if( pair.first == "title" )
-                title = pair.second;
-            else if( pair.first == "artist" )
-                artist = pair.second;
-            else if( pair.first == "album" )
-                album = pair.second;
-            else if( pair.first == "url" )
-                urlStr = pair.second;
-        }
-        query_ptr q = Query::get( artist, title, album );
-        if( !urlStr.isEmpty() )
-            q->setResultHint( urlStr );
-
-        playNow( q );
-        return true;
-    }
-
-    return false;
-}
-
-
-bool
-GlobalActionManager::playSpotify( const QUrl& url )
-{
-    if( !url.hasQueryItem( "spotifyURI" ) && !url.hasQueryItem( "spotifyURL" ) )
-        return false;
-
-    QString spotifyUrl = url.hasQueryItem( "spotifyURI" ) ? url.queryItemValue( "spotifyURI" ) : url.queryItemValue( "spotifyURL" );
-    SpotifyParser* p = new SpotifyParser( spotifyUrl, this );
-    connect( p, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( playOrQueueNow( Tomahawk::query_ptr ) ) );
-
-    return true;
-}
-
-void
-GlobalActionManager::playNow( const query_ptr& q )
-{
-
-    Pipeline::instance()->resolve( q, true );
-
-    m_waitingToPlay = q;
-    q->setProperty( "playNow", true );
-    connect( q.data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( waitingForResolved( bool ) ) );
-}
-
-
-void
-GlobalActionManager::playOrQueueNow( const query_ptr& q )
-{
-    Pipeline::instance()->resolve( q, true );
-
-    m_waitingToPlay = q;
-    connect( q.data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( waitingForResolved( bool ) ) );
-}
-
-
-bool
-GlobalActionManager::playRdio( const QUrl& url )
-{
-    if( !url.hasQueryItem( "rdioURI" ) && !url.hasQueryItem( "rdioURL" ) )
-        return false;
-
-
-    QString rdioUrl = url.hasQueryItem( "rdioURI" ) ? url.queryItemValue( "spotifyURI" ) : url.queryItemValue( "rdioURL" );
-    RdioParser* p = new RdioParser( this );
-    p->parse( rdioUrl );
-    connect( p, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( playOrQueueNow( Tomahawk::query_ptr ) ) );
-
-    return true;
-}
-
-
-bool GlobalActionManager::handleBookmarkCommand(const QUrl& url)
-{
-    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
-    if( parts.isEmpty() ) {
-        tLog() << "No specific bookmark command:" << url.toString();
-        return false;
-    }
-
-    if( parts 0  == "track" ) {
-        QPair< QString, QString > pair;
-        QString title, artist, album, urlStr;
-        foreach( pair, url.queryItems() ) {
-            if( pair.first == "title" )
-                title = pair.second;
-            else if( pair.first == "artist" )
-                artist = pair.second;
-            else if( pair.first == "album" )
-                album = pair.second;
-            else if( pair.first == "url" )
-                urlStr = pair.second;
-        }
-        query_ptr q = Query::get( artist, title, album );
-        if( !urlStr.isEmpty() )
-            q->setResultHint( urlStr );
-        Pipeline::instance()->resolve( q, true );
-
-        // now we add it to the special "bookmarks" playlist, creating it if it doesn't exist. if nothing is playing, start playing the track
-        QSharedPointer< LocalCollection > col = SourceList::instance()->getLocal()->collection().dynamicCast< LocalCollection >();
-        playlist_ptr bookmarkpl = col->bookmarksPlaylist();
-        if( bookmarkpl.isNull() ) { // create it and do the deed then
-            m_waitingToBookmark = q;
-            col->createBookmarksPlaylist();
-            connect( col.data(), SIGNAL( bookmarkPlaylistCreated( Tomahawk::playlist_ptr ) ), this, SLOT( bookmarkPlaylistCreated( Tomahawk::playlist_ptr ) ), Qt::UniqueConnection );
-        } else {
-            doBookmark( bookmarkpl, q );
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-
-void
-GlobalActionManager::shortenLinkRequestFinished()
-{
-    qDebug() << Q_FUNC_INFO;
-    QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
-    bool error = false;
-
-    // NOTE: this should never happen
-    if( !reply )
-    {
-        emit shortLinkReady( QUrl( "" ), QUrl( "" ) );
-        return;
-    }
-
-    // Check for the redirect attribute, as this should be the shortened link
-    QVariant urlVariant = reply->attribute( QNetworkRequest::RedirectionTargetAttribute );
-
-    // NOTE: this should never happen
-    if( urlVariant.isNull() || !urlVariant.isValid() )
-        error = true;
-
-    QUrl longUrl = reply->request().url();
-    QUrl shortUrl = urlVariant.toUrl();
-
-    // NOTE: this should never happen
-    if( !shortUrl.isValid() )
-        error = true;
-
-    // Success!  Here is the short link
-    if ( m_clipboardLongUrl == reply->request().url() )
-    {
-        QClipboard* cb = QApplication::clipboard();
-
-        QByteArray data = error ? longUrl.toEncoded() : shortUrl.toEncoded();
-        data.replace( "'", "%27" ); // QUrl doesn't encode ', which it doesn't have to. Some apps don't like ' though, and want %27. Both are valid.
-        cb->setText( data );
-
-        m_clipboardLongUrl.clear();
-    }
-    else
-    {
-        if ( !error )
-            emit shortLinkReady( longUrl, shortUrl );
-        else
-            emit shortLinkReady( longUrl, longUrl );
-    }
-
-    reply->deleteLater();
-}
-
-
-void
-GlobalActionManager::shortenLinkRequestError( QNetworkReply::NetworkError error )
-{
-    qDebug() << Q_FUNC_INFO;
-    qDebug() << "Network Error: " << error;
-
-    QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
-
-    // NOTE: this should never happen
-    if( !reply )
-    {
-        emit shortLinkReady( QUrl( "" ), QUrl( "" ) );
-        return;
-    }
-
-    reply->deleteLater();
-    emit shortLinkReady( QUrl( "" ), QUrl( "" ) );
-}
-
-
-void
-GlobalActionManager::bookmarkPlaylistCreated( const playlist_ptr& pl )
-{
-    Q_ASSERT( !m_waitingToBookmark.isNull() );
-    doBookmark( pl, m_waitingToBookmark );
-}
-
-
-void
-GlobalActionManager::doBookmark( const playlist_ptr& pl, const query_ptr& q )
-{
-    plentry_ptr e( new PlaylistEntry );
-    e->setGuid( uuid() );
-
-    if ( q->results().count() )
-        e->setDuration( q->results().at( 0 )->duration() );
-    else
-        e->setDuration( 0 );
-
-    e->setLastmodified( 0 );
-    e->setAnnotation( "" ); // FIXME
-    e->setQuery( q );
-
-    pl->createNewRevision( uuid(), pl->currentrevision(), QList< plentry_ptr >( pl->entries() ) << e );
-    connect( pl.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( showPlaylist() ) );
-
-    m_toShow = pl;
-
-    m_waitingToBookmark.clear();
-}
-
-
-void
-GlobalActionManager::showPlaylist()
-{
-    if( m_toShow.isNull() )
-        return;
-
-    ViewManager::instance()->show( m_toShow );
-
-    m_toShow.clear();
-}
-
-
-void
-GlobalActionManager::waitingForResolved( bool /* success */ )
-{
-    if ( m_waitingToPlay.data() != sender() )
-    {
-        m_waitingToPlay.clear();
-        return;
-    }
-
-    if ( !m_waitingToPlay.isNull() && m_waitingToPlay->playable() )
-    {
-        // play it!
-//         AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() );
-        if ( sender() && sender()->property( "playNow" ).toBool() )
-        {
-            if ( !AudioEngine::instance()->playlist().isNull() )
-                AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() );
-            else
-            {
-                ViewManager::instance()->queue()->model()->append( m_waitingToPlay );
-                AudioEngine::instance()->play();
-            }
-        } else
-            AudioEngine::instance()->play();
-
-        m_waitingToPlay.clear();
-    }
-}
-
-
-QString
-GlobalActionManager::hostname() const
-{
-    return QString( "http://toma.hk" );
-}
-
-
-/// SPOTIFY URL HANDLING
-
-bool
-GlobalActionManager::openSpotifyLink( const QString& link )
-{
-    SpotifyParser* spot = new SpotifyParser( link, this );
-    connect( spot, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( handleOpenTrack( Tomahawk::query_ptr ) ) );
-
-    return true;
-}
-
-
-bool
-GlobalActionManager::openRdioLink( const QString& link )
-{
-    RdioParser* rdio = new RdioParser( this );
-    connect( rdio, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( handleOpenTrack( Tomahawk::query_ptr ) ) );
-    rdio->parse( link );
-
-    return true;
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/globalactionmanager.h Deleted

@@ -1,118 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-    This program 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 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-
-#ifndef GLOBALACTIONMANAGER_H
-#define GLOBALACTIONMANAGER_H
-
-#include "query.h"
-#include "playlist.h"
-#include "playlist/dynamic/DynamicPlaylist.h"
-#include "dllmacro.h"
-
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QObject>
-#include <QUrl>
-#include <QWeakPointer>
-
-
-/**
- * Handles global actions such as parsing and creation of links, mime data handling, etc
- */
-class DLLEXPORT GlobalActionManager : public QObject
-{
-    Q_OBJECT
-public:
-    static GlobalActionManager* instance();
-    virtual ~GlobalActionManager();
-
-    QUrl openLinkFromQuery( const Tomahawk::query_ptr& query ) const;
-    QUrl openLink( const QString& title, const QString& artist, const QString& album ) const;
-
-    /// Takes a spotify link and performs the default open action on it
-    bool openSpotifyLink( const QString& link );
-
-    /// Takes a spotify link and performs the default open action on it
-    bool openRdioLink( const QString& link );
-
-    void copyToClipboard( const Tomahawk::query_ptr& query );
-    QString copyPlaylistToClipboard( const Tomahawk::dynplaylist_ptr& playlist );
-    void savePlaylistToFile( const Tomahawk::playlist_ptr& playlist, const QString& filename );
-
-public slots:
-    void shortenLink( const QUrl& url );
-
-    bool parseTomahawkLink( const QString& link );
-    void waitingForResolved( bool );
-
-    Tomahawk::dynplaylist_ptr loadDynamicPlaylist( const QUrl& url, bool station );
-
-    void handleOpenTrack( const Tomahawk::query_ptr& qry );
-    void handlePlayTrack( const Tomahawk::query_ptr& qry );
-
-signals:
-    void shortLinkReady( QUrl longUrl, QUrl shortUrl ) const;
-
-private slots:
-    void shortenLinkRequestFinished();
-    void shortenLinkRequestError( QNetworkReply::NetworkError );
-
-    void bookmarkPlaylistCreated( const Tomahawk::playlist_ptr& pl );
-    void showPlaylist();
-
-    void xspfCreated( const QByteArray& xspf );
-
-    void playOrQueueNow( const Tomahawk::query_ptr& );
-    void playNow( const Tomahawk::query_ptr& );
-
-    void playlistCreatedToShow( const Tomahawk::playlist_ptr& pl );
-    void playlistReadyToShow();
-private:
-    explicit GlobalActionManager( QObject* parent = 0 );
-    void doBookmark( const Tomahawk::playlist_ptr& pl, const Tomahawk::query_ptr& q );
-
-    /// handle opening of urls
-    bool handlePlaylistCommand( const QUrl& url );
-    bool handleCollectionCommand(const QUrl& url );
-    bool handleQueueCommand(const QUrl& url );
-    bool handleStationCommand(const QUrl& url );
-    bool handleAutoPlaylistCommand(const QUrl& url );
-    bool handleSearchCommand(const QUrl& url );
-    bool handlePlayCommand(const QUrl& url );
-    bool handleBookmarkCommand(const QUrl& url );
-    bool handleOpenCommand(const QUrl& url );
-    bool handleViewCommand(const QUrl& url );
-    bool doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
-
-    bool playSpotify( const QUrl& url );
-    bool queueSpotify( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
-    bool playRdio( const QUrl& url );
-    bool queueRdio( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
-
-    QString hostname() const;
-
-    Tomahawk::playlist_ptr m_toShow;
-    Tomahawk::query_ptr m_waitingToBookmark;
-    Tomahawk::query_ptr m_waitingToPlay;
-    QUrl m_clipboardLongUrl;
-
-    static GlobalActionManager* s_instance;
-};
-
-#endif // GLOBALACTIONMANAGER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infobar/infobar.cpp Deleted

@@ -1,241 +0,0 @@
-/* === 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
- *   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 "infobar.h"
-#include "ui_infobar.h"
-
-#include <QLabel>
-#include <QPixmap>
-
-#include "viewmanager.h"
-#include "thirdparty/Qocoa/qsearchfield.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include <QCheckBox>
-#include <widgets/querylabel.h>
-
-#define ANIMATION_TIME 400
-#define IMAGE_HEIGHT 64
-
-using namespace Tomahawk;
-
-
-InfoBar::InfoBar( QWidget* parent )
-    : QWidget( parent )
-    , ui( new Ui::InfoBar )
-    , m_queryLabel( 0 )
-{
-    ui->setupUi( this );
-    TomahawkUtils::unmarginLayout( layout() );
-    layout()->setContentsMargins( 8, 4, 8, 4 );
-
-    QFont boldFont = ui->captionLabel->font();
-    boldFont.setPixelSize( 18 );
-    boldFont.setBold( true );
-    ui->captionLabel->setFont( boldFont );
-    ui->captionLabel->setElideMode( Qt::ElideRight );
-
-    boldFont.setPixelSize( 12 );
-    ui->descriptionLabel->setFont( boldFont );
-
-    QFont regFont = ui->longDescriptionLabel->font();
-    regFont.setPixelSize( 11 );
-    ui->longDescriptionLabel->setFont( regFont );
-
-    QPalette whitePal = ui->captionLabel->palette();
-    whitePal.setColor( QPalette::Foreground, Qt::white );
-
-    ui->captionLabel->setPalette( whitePal );
-    ui->descriptionLabel->setPalette( whitePal );
-    ui->longDescriptionLabel->setPalette( whitePal );
-
-    ui->captionLabel->setMargin( 6 );
-    ui->descriptionLabel->setMargin( 6 );
-    ui->longDescriptionLabel->setMargin( 4 );
-
-    ui->captionLabel->setText( QString() );
-    ui->descriptionLabel->setText( QString() );
-    ui->longDescriptionLabel->setText( QString() );
-    ui->imageLabel->setText( QString() );
-
-    m_queryLabel = new QueryLabel( this );
-    m_queryLabel->setType( QueryLabel::Artist );
-    m_queryLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
-    m_queryLabel->setTextPen( palette().brightText().color() );
-    m_queryLabel->setFont( boldFont );
-    m_queryLabel->hide();
-    connect( m_queryLabel, SIGNAL( clickedArtist() ), this, SLOT( artistClicked() ) );
-
-    m_autoUpdate = new QCheckBox( this );
-    m_autoUpdate->setText( tr( "Automatically update" ) );
-    m_autoUpdate->setLayoutDirection( Qt::RightToLeft );
-    m_autoUpdate->setPalette( whitePal );
-    connect( m_autoUpdate, SIGNAL( toggled( bool ) ), this, SIGNAL( autoUpdateChanged( bool ) ) );
-
-    ui->horizontalLayout->addWidget( m_autoUpdate );
-
-    m_searchWidget = new QSearchField( this );
-    m_searchWidget->setPlaceholderText( tr( "Filter..." ) );
-    m_searchWidget->setMinimumWidth( 180 );
-    connect( m_searchWidget, SIGNAL( textChanged( QString ) ), this, SLOT( onFilterEdited() ) );
-
-    ui->horizontalLayout->addWidget( m_searchWidget );
-
-    QLinearGradient gradient = QLinearGradient( QPoint( 0, 0 ), QPoint( 500, 200 ) ); //HACK
-    gradient.setColorAt( 0.0, QColor( 100, 100, 100 ) );
-    gradient.setColorAt( 0.8, QColor( 63, 63, 63 ) );
-
-    QPalette p = palette();
-    p.setBrush( QPalette::Window, QBrush( gradient ) );
-    setPalette( p );
-    setAutoFillBackground( true );
-
-    setMinimumHeight( geometry().height() );
-    setMaximumHeight( geometry().height() );
-    connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ), SLOT( setFilterAvailable( bool ) ) );
-    connect( ViewManager::instance(), SIGNAL( autoUpdateAvailable( bool ) ), SLOT( setAutoUpdateAvailable( bool ) ) );
-}
-
-
-InfoBar::~InfoBar()
-{
-    delete ui;
-}
-
-
-void
-InfoBar::setCaption( const QString& s )
-{
-    ui->captionLabel->setText( s );
-}
-
-
-void
-InfoBar::setDescription( const QString& s )
-{
-    if ( m_queryLabel->isVisible() )
-    {
-        ui->verticalLayout->removeWidget( m_queryLabel );
-        m_queryLabel->hide();
-
-        ui->verticalLayout->addWidget( ui->descriptionLabel );
-        ui->verticalLayout->setContentsMargins( 0, 0, 0, 0 );
-        ui->descriptionLabel->show();
-    }
-    ui->descriptionLabel->setText( s );
-}
-
-void
-InfoBar::setDescription( const artist_ptr& artist )
-{
-    m_queryLabel->setQuery( Query::get( artist->name(), QString(), QString() ) );
-    m_queryLabel->setExtraContentsMargins( 4, 0, 0, 0 );
-
-    if ( !m_queryLabel->isVisible() )
-    {
-        ui->verticalLayout->removeWidget( ui->descriptionLabel );
-        ui->descriptionLabel->hide();
-
-        m_queryLabel->show();
-        ui->verticalLayout->addWidget( m_queryLabel );
-        ui->verticalLayout->setContentsMargins( 0, 0, 0, 15 );
-    }
-
-}
-
-void
-InfoBar::setDescription( const album_ptr&  )
-{
-    // TODO
-}
-
-void
-InfoBar::artistClicked()
-{
-    if ( m_queryLabel && !m_queryLabel->query().isNull() )
-        ViewManager::instance()->show( Artist::get( m_queryLabel->artist() ) );
-}
-
-
-void
-InfoBar::setLongDescription( const QString& s )
-{
-    ui->longDescriptionLabel->setText( s );
-
-    if ( s.isEmpty() )
-    {
-        ui->horizontalLayout->setStretchFactor( ui->verticalLayout, 1 );
-        ui->horizontalLayout->setStretchFactor( ui->verticalLayout_2, 0 );
-    } else
-    {
-        ui->horizontalLayout->setStretchFactor( ui->verticalLayout, 0 );
-        ui->horizontalLayout->setStretchFactor( ui->verticalLayout_2, 99 );
-    }
-}
-
-
-void
-InfoBar::setPixmap( const QPixmap& p )
-{
-    ui->imageLabel->setPixmap( p.scaledToHeight( IMAGE_HEIGHT, Qt::SmoothTransformation ) );
-}
-
-
-void
-InfoBar::setFilter( const QString& filter )
-{
-    m_searchWidget->setText( filter );
-}
-
-
-void
-InfoBar::setFilterAvailable( bool b )
-{
-    m_searchWidget->setVisible( b );
-}
-
-void
-InfoBar::setAutoUpdateAvailable( bool b )
-{
-    if ( b )
-        m_autoUpdate->setChecked( ViewManager::instance()->currentPage()->autoUpdate() );
-
-    m_autoUpdate->setVisible( b );
-}
-
-
-void
-InfoBar::onFilterEdited()
-{
-    emit filterTextChanged( m_searchWidget->text() );
-}
-
-void
-InfoBar::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-//            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infobar/infobar.h Deleted

@@ -1,80 +0,0 @@
-/* === 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
- *   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 INFOBAR_H
-#define INFOBAR_H
-
-#include <QWidget>
-
-#include "dllmacro.h"
-#include "artist.h"
-
-class QueryLabel;
-class QCheckBox;
-class QTimeLine;
-class QSearchField;
-class ContextWidget;
-
-namespace Ui
-{
-    class InfoBar;
-}
-
-class DLLEXPORT InfoBar : public QWidget
-{
-Q_OBJECT
-
-public:
-    InfoBar( QWidget* parent = 0 );
-    ~InfoBar();
-
-public slots:
-    void setCaption( const QString& s );
-
-    void setDescription( const QString& s );
-    // If you want a querylabel instead of an ElidedLabel
-    void setDescription( const Tomahawk::artist_ptr& artist );
-    void setDescription( const Tomahawk::album_ptr& album_ptr );
-
-    void setLongDescription( const QString& s );
-    void setPixmap( const QPixmap& p );
-
-    void setFilter( const QString& filter );
-    void setFilterAvailable( bool b );
-
-    void setAutoUpdateAvailable( bool b );
-signals:
-    void filterTextChanged( const QString& filter );
-    void autoUpdateChanged( bool checked );
-
-protected:
-    void changeEvent( QEvent* e );
-
-private slots:
-    void onFilterEdited();
-    void artistClicked();
-
-private:
-    Ui::InfoBar* ui;
-
-    QSearchField* m_searchWidget;
-    QCheckBox* m_autoUpdate;
-    QueryLabel* m_queryLabel;
-};
-
-#endif // INFOBAR_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infobar/infobar.ui Deleted

@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>InfoBar</class>
- <widget class="QWidget" name="InfoBar">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>774</width>
-    <height>80</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>72</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>InfoBar</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetDefaultConstraint</enum>
-     </property>
-     <item>
-      <widget class="QLabel" name="imageLabel">
-       <property name="minimumSize">
-        <size>
-         <width>64</width>
-         <height>64</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>16</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="sizeConstraint">
-        <enum>QLayout::SetDefaultConstraint</enum>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="ElidedLabel" name="captionLabel">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="ElidedLabel" name="descriptionLabel">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>16</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <property name="sizeConstraint">
-        <enum>QLayout::SetMaximumSize</enum>
-       </property>
-       <item>
-        <widget class="ElidedLabel" name="longDescriptionLabel">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>62</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>62</height>
-          </size>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>1</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ElidedLabel</class>
-   <extends>QLabel</extends>
-   <header>widgets/elidedlabel.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins Deleted

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic Deleted

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.cpp Deleted

@@ -1,190 +0,0 @@
-/* === 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 "RoviPlugin.h"
-
-#include "utils/logger.h"
-
-#include <QDateTime>
-#include <QNetworkReply>
-#include <parser.h>
-
-using namespace Tomahawk::InfoSystem;
-
-
-RoviPlugin::RoviPlugin()
-    : InfoPlugin()
-{
-    m_supportedGetTypes << InfoAlbumSongs;
-
-    /*
-     *    Your API Key is 7jxr9zggt45h6rg2n4ss3mrj
-     *    Your secret is XUnYutaAW6
-     */
-    m_apiKey = "7jxr9zggt45h6rg2n4ss3mrj";
-    m_secret = "XUnYutaAW6";
-}
-
-RoviPlugin::~RoviPlugin()
-{
-
-}
-
-
-void
-RoviPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        emit info( requestData, QVariant() );
-        return;
-    }
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    if ( !hash.contains( "artist" ) || !hash.contains( "album" ) )
-    {
-        emit info( requestData, QVariant() );
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria"artist" = hash"artist";
-    criteria"album" = hash"album";
-
-    emit getCachedInfo( criteria, 0, requestData );
-}
-
-void
-RoviPlugin::notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    switch ( requestData.type )
-    {
-        case InfoAlbumSongs:
-        {
-            QUrl baseUrl = QUrl( "http://api.rovicorp.com/search/v2/music/search" );
-            baseUrl.addQueryItem( "query", QString( "%1 %2" ).arg( criteria "artist"  ).arg( criteria "album"  ) );
-            baseUrl.addQueryItem( "entitytype", "album" );
-            baseUrl.addQueryItem( "include", "album:tracks" );
-
-            QNetworkReply* reply = makeRequest( baseUrl );
-
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-            connect( reply, SIGNAL( finished() ), this, SLOT( albumLookupFinished() ) );
-            connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), this, SLOT( albumLookupError( QNetworkReply::NetworkError ) ) );
-            break;
-        }
-        default:
-        {
-            Q_ASSERT( false );
-            break;
-        }
-    }
-}
-
-void
-RoviPlugin::albumLookupError( QNetworkReply::NetworkError error )
-{
-    if ( error == QNetworkReply::NoError )
-        return;
-
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    Q_ASSERT( reply );
-
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-
-    emit info( requestData, QVariant() );
-
-}
-
-void
-RoviPlugin::albumLookupFinished()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    Q_ASSERT( reply );
-
-    if ( reply->error() != QNetworkReply::NoError )
-        return;
-
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-
-    QJson::Parser p;
-    bool ok;
-    QVariantMap response = p.parse( reply, &ok ).toMap();
-
-    if ( !ok || response.isEmpty() || !response.contains( "searchResponse" ) )
-    {
-        tLog() << "Error parsing JSON from Rovi!" << p.errorString() << response;
-        emit info( requestData, QVariant() );
-        return;
-    }
-
-    QVariantList resultList = response "searchResponse" .toMap().value( "results" ).toList();
-    if ( resultList.size() == 0 )
-    {
-        emit info( requestData, QVariant() );
-        return;
-    }
-
-    QVariantMap results = resultList.first().toMap();
-    QVariantList tracks = results "album" .toMap() "tracks" .toList();
-
-    if ( tracks.isEmpty() )
-    {
-        tLog() << "Error parsing JSON from Rovi!" << p.errorString() << response;
-        emit info( requestData, QVariant() );
-    }
-
-
-    QStringList trackNameList;
-    foreach ( const QVariant& track, tracks )
-    {
-        const QVariantMap trackData = track.toMap();
-        if ( trackData.contains( "title" ) )
-            trackNameList << trackData "title" .toString();
-    }
-
-    QVariantMap returnedData;
-    returnedData"tracks" = trackNameList;
-
-    emit info( requestData, returnedData );
-
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria"artist" = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()"artist";
-    criteria"album" = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()"album";
-
-    emit updateCache( criteria, 0, requestData.type, returnedData );
-}
-
-
-QNetworkReply*
-RoviPlugin::makeRequest( QUrl url )
-{
-    url.addQueryItem( "apikey", m_apiKey );
-    url.addEncodedQueryItem( "sig", generateSig() );
-
-    qDebug() << "Rovi request url:" << url.toString();
-    return TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-}
-
-
-QByteArray
-RoviPlugin::generateSig() const
-{
-    QByteArray raw = m_apiKey + m_secret + QString::number( QDateTime::currentMSecsSinceEpoch() / 1000 ).toLatin1();
-    return TomahawkUtils::md5( raw ).toLatin1();
-
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/RoviPlugin.h Deleted

@@ -1,64 +0,0 @@
-/* === 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 ROVIPLUGIN_H
-#define ROVIPLUGIN_H
-
-#include "infosystem/infosystem.h"
-
-#include <QNetworkReply>
-
-class QNetworkAccessManager;
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class RoviPlugin : public InfoPlugin
-{
-    Q_OBJECT
-public:
-    RoviPlugin();
-    virtual ~RoviPlugin();
-
-protected:
-    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
-
-    virtual void pushInfo( QString, Tomahawk::InfoSystem::InfoType, QVariant )
-    {}
-
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
-
-private slots:
-    void albumLookupFinished();
-    void albumLookupError( QNetworkReply::NetworkError );
-private:
-    QNetworkReply* makeRequest( QUrl url );
-    QByteArray generateSig() const;
-
-    QByteArray m_apiKey;
-    QByteArray m_secret;
-};
-
-}
-
-}
-
-#endif // ROVIPLUGIN_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp Deleted

@@ -1,579 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *   Copyright 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 "chartsplugin.h"
-
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkReply>
-
-#include "album.h"
-#include "chartsplugin_data_p.h"
-#include "typedefs.h"
-#include "audio/audioengine.h"
-#include "tomahawksettings.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#define CHART_URL "http://charts.tomahawk-player.org/"
-//#define CHART_URL "http://localhost:8080/"
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-
-using namespace Tomahawk::InfoSystem;
-
-
-ChartsPlugin::ChartsPlugin()
-    : InfoPlugin()
-    , m_chartsFetchJobs( 0 )
-{
-    /// Add resources here
-    m_chartResources << "billboard" << "itunes" << "rdio" << "wearehunted" << "ex.fm" << "soundcloudwall";
-    /// If you add resource, update version aswell
-    m_chartVersion = "2.1";
-    m_supportedGetTypes <<  InfoChart << InfoChartCapabilities;
-
-}
-
-
-ChartsPlugin::~ChartsPlugin()
-{
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
-}
-
-
-void
-ChartsPlugin::dataError( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    emit info( requestData, QVariant() );
-    return;
-}
-
-
-void
-ChartsPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    //qDebug() << Q_FUNC_INFO << requestData.caller;
-    //qDebug() << Q_FUNC_INFO << requestData.customData;
-
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    bool foundSource = false;
-
-    switch ( requestData.type )
-    {
-        case InfoChart:
-            /// We need something to check if the request is actually ment to go to this plugin
-            if ( !hash.contains( "chart_source" ) )
-            {
-                tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Hash did not contain required param!";
-                dataError( requestData );
-                break;
-            }
-            else
-            {
-                foreach( QString resource, m_chartResources )
-                {
-                    if( resource == hash"chart_source" )
-                    {
-                        foundSource = true;
-                    }
-                }
-
-                if( !foundSource )
-                {
-                    dataError( requestData );
-                    break;
-                }
-
-            }
-            fetchChart( requestData );
-            break;
-
-        case InfoChartCapabilities:
-            fetchChartCapabilities( requestData );
-            break;
-        default:
-            dataError( requestData );
-    }
-}
-
-
-void
-ChartsPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-
-    /// Each request needs to contain both a id and source
-    if ( !hash.contains( "chart_id" ) && !hash.contains( "chart_source" ) )
-    {
-        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Hash did not contain required params!";
-        dataError( requestData );
-        return;
-
-    }
-    /// Set the criterias for current chart
-    criteria"chart_id" = hash"chart_id";
-    criteria"chart_source" = hash"chart_source";
-
-    emit getCachedInfo( criteria, 86400000, requestData );
-}
-
-void
-ChartsPlugin::fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Could not convert requestData to InfoStringHash!";
-        dataError( requestData );
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria "InfoChartCapabilities"  = "chartsplugin";
-    criteria "InfoChartVersion"  = m_chartVersion;
-    emit getCachedInfo( criteria, 864000000, requestData );
-}
-
-void
-ChartsPlugin::notInCacheSlot( QHash<QString, QString> criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    switch ( requestData.type )
-    {
-        case InfoChart:
-        {
-            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChart not in cache! Fetching...";
-
-            /// Fetch the chart, we need source and id
-            QUrl url = QUrl( QString( CHART_URL "source/%1/chart/%2" ).arg( criteria"chart_source" ).arg( criteria"chart_id" ) );
-            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Getting chart url" << url;
-
-            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-
-            connect( reply, SIGNAL( finished() ), SLOT( chartReturned() ) );
-            return;
-
-        }
-
-        case InfoChartCapabilities:
-        {
-
-            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChartCapabilities not in cache! Fetching...";
-            // we never need to re-fetch
-            //if ( !m_allChartsMap.isEmpty() )
-            //    return;
-
-            /// Then get each chart from resource
-
-            if ( !m_chartResources.isEmpty() && m_allChartsMap.isEmpty() )
-            {
-                tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChart fetching possible resources";
-                foreach ( QString resource, m_chartResources )
-                {
-                    QUrl url = QUrl( QString( CHART_URL "source/%1" ).arg( resource ) );
-                    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-                    reply->setProperty( "chart_resource", resource);
-
-                    tDebug() << "fetching:" << url;
-                    connect( reply, SIGNAL( finished() ), SLOT( chartTypes() ) );
-
-                    m_chartsFetchJobs++;
-                }
-            }
-
-            if ( m_chartsFetchJobs > 0 )
-            {
-                tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChartCapabilities still fetching!";
-                m_cachedRequests.append( requestData );
-                return;
-            }
-
-            emit info( requestData, m_allChartsMap );
-            return;
-        }
-
-        default:
-        {
-            tLog() << Q_FUNC_INFO << "Couldn't figure out what to do with this type of request after cache miss";
-            emit info( requestData, QVariant() );
-            return;
-        }
-    }
-}
-
-
-void
-ChartsPlugin::chartTypes()
-{
-    /// Get possible chart type for specificChartsPlugin: InfoChart types returned chart source
-    tDebug( LOGVERBOSE )  << "Got chart type result";
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-
-
-    if ( reply->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        const QVariantMap res = p.parse( reply, &ok ).toMap();
-        const QVariantMap chartObjs = res.value( "charts" ).toMap();
-
-        if ( !ok )
-        {
-            tLog() << "Failed to parse resources" << p.errorString() << "On line" << p.errorLine();
-
-            return;
-        }
-
-        /// Got types, append!
-        const QString source = res.value( "source" ).toString();
-
-        // We'll populate charts with the data from the server
-        QVariantMap charts;
-        QString chartName;
-        QStringList defaultChain;
-        if ( source == "wearehunted" || source == "itunes" )
-        {
-            // Some charts can have an extra param, itunes has geo, WAH has emerging/mainstream
-            // Itunes has geographic-area based charts. So we build a breadcrumb of
-            // ITunes - Country - Albums - Top Chart Type
-            //                  - Tracks - Top Chart Type
-            // WeAreHunted has Mainstream/Emerging
-            // WeAreHunted - Type - Artists - Chart Type
-            //                    - Tracks  - Chart Type
-            QHash< QString, QVariantMap > extraType;
-            foreach( const QVariant& chartObj, chartObjs.values() )
-            {
-                if( !chartObj.toMap().isEmpty() )
-                {
-                    const QVariantMap chart = chartObj.toMap();
-                    const QString id = chart.value( "id" ).toString();
-                    const QString geo = chart.value( "geo" ).toString();
-                    QString name = chart.value( "genre" ).toString();
-                    const QString type = chart.value( "type" ).toString();
-                    const bool isDefault = ( chart.contains( "default" ) && chart "default" .toInt() == 1 );
-
-                    QString extra;
-                    if( !geo.isEmpty() )
-                    {
-
-                        if ( !m_cachedCountries.contains( geo ) )
-                        {
-                            QLocale l( QString( "en_%1" ).arg( geo ) );
-                            extra = Tomahawk::CountryUtils::fullCountryFromCode( geo );
-
-                            for ( int i = 1; i < extra.size(); i++ )
-                            {
-                                if ( extra.at( i ).isUpper() )
-                                {
-                                    extra.insert( i, " " );
-                                    i++;
-                                }
-                            }
-                            m_cachedCountries geo  = extra;
-                        }
-                        else
-                            extra = m_cachedCountries geo ;
-                    }
-                    else
-                        extra = chart.value( "extra" ).toString();
-
-                    if ( name.isEmpty() ) // not a specific chart, an all chart
-                        name = tr( "Top Overall" );
-
-                    InfoStringHash c;
-                    c "id"  = id;
-                    c "label"  = name;
-                    c "type"  = "album";
-                    if ( isDefault )
-                        c "default"  = "true";
-
-                    QList< Tomahawk::InfoSystem::InfoStringHash > extraTypeData = extraType extra  type .value< QList< Tomahawk::InfoSystem::InfoStringHash > >();
-                    extraTypeData.append( c );
-                    extraType extra  type  = QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( extraTypeData );
-
-                    if ( isDefault )
-                    {
-                        defaultChain.clear();
-                        defaultChain.append( extra );
-                        defaultChain.append( type );
-                        defaultChain.append( name );
-                    }
-                }
-                foreach( const QString& c, extraType.keys() )
-                {
-                    charts c  = extraType c ;
-//                    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "extraType has types:" << c;
-                }
-                if( source == "itunes" ){
-                    chartName = "iTunes";
-                }
-                if( source == "soundcloudwall" ){
-                    chartName = "SoundCloudWall";
-                }
-                if( source == "wearehunted" ){
-                    chartName = "WeAreHunted";
-                }
-
-            }
-
-        }
-        else
-        {
-            // We'll just build:
-            // Source - Album - Chart Type
-            // Source - Track - Chart Type
-            QList< InfoStringHash > albumCharts;
-            QList< InfoStringHash > trackCharts;
-            QList< InfoStringHash > artistCharts;
-
-            foreach( const QVariant& chartObj, chartObjs.values() )
-            {
-                if( !chartObj.toMap().isEmpty() ){
-                    const QVariantMap chart = chartObj.toMap();
-                    const QString type = chart.value( "type" ).toString();
-                    const bool isDefault = ( chart.contains( "default" ) && chart "default" .toInt() == 1 );
-
-                    InfoStringHash c;
-                    c "id"  = chart.value( "id" ).toString();
-                    if( chart.value( "genre").isValid() )
-                        c "label"  = chart.value( "genre" ).toString();
-                    else
-                        c "label"  = chart.value( "name" ).toString();
-                    if ( isDefault )
-                        c "default"  = "true";
-
-                    if ( type == "Album" )
-                    {
-                        c "type"  = "album";
-                        albumCharts.append( c );
-                    }
-                    else if ( type == "Track" )
-                    {
-                        c "type"  = "tracks";
-                        trackCharts.append( c );
-
-                    }else if ( type == "Artist" )
-                    {
-                        c "type"  = "artists";
-                        artistCharts.append( c );
-
-                    }
-
-                    if ( isDefault )
-                    {
-                        defaultChain.clear();
-                        defaultChain.append( type + "s" ); //UGLY but it's plural to the user, see below
-                        defaultChain.append( c "label"  );
-                    }
-                }
-                if( !artistCharts.isEmpty() )
-                    charts.insert( tr( "Artists" ), QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( artistCharts ) );
-                if( !albumCharts.isEmpty() )
-                    charts.insert( tr( "Albums" ), QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( albumCharts ) );
-                if( !trackCharts.isEmpty() )
-                    charts.insert( tr( "Tracks" ), QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( trackCharts ) );
-
-                /// @note For displaying purposes, upper the first letter
-                /// @note Remeber to lower it when fetching this!
-                chartName = source;
-                chartName0 = chartName0.toUpper();
-            }
-        }
-
-        /// Add the possible charts and its types to breadcrumb
-//         tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "ADDING CHART TYPE TO CHARTS:" << chartName;
-        QVariantMap defaultMap = m_allChartsMap.value( "defaults" ).value< QVariantMap >();
-        defaultMap source  = defaultChain;
-        m_allChartsMap "defaults"  = defaultMap;
-        m_allChartsMap "defaultSource"  = "itunes";
-        m_allChartsMap.insert( chartName , QVariant::fromValue< QVariantMap >( charts ) );
-
-    }
-    else
-    {
-        tLog() << "Error fetching charts:" << reply->errorString();
-    }
-
-    m_chartsFetchJobs--;
-    if ( !m_cachedRequests.isEmpty() && m_chartsFetchJobs == 0 )
-    {
-        foreach ( InfoRequestData request, m_cachedRequests )
-        {
-            emit info( request, m_allChartsMap );
-            // update cache
-            Tomahawk::InfoSystem::InfoStringHash criteria;
-            criteria "InfoChartCapabilities"  = "chartsplugin";
-            criteria "InfoChartVersion"  = m_chartVersion;
-            emit updateCache( criteria, 864000000, request.type, m_allChartsMap );
-        }
-        m_cachedRequests.clear();
-    }
-
-}
-
-void
-ChartsPlugin::chartReturned()
-{
-
-    /// Chart request returned something! Woho
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    QVariantMap returnedData;
-
-    if ( reply->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        QVariantMap res = p.parse( reply, &ok ).toMap();
-
-        if ( !ok )
-        {
-            tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
-            return;
-        }
-
-        /// SO we have a result, parse it!
-        QVariantList chartResponse = res.value( "list" ).toList();
-        QList< Tomahawk::InfoSystem::InfoStringHash > top_tracks;
-        QList< Tomahawk::InfoSystem::InfoStringHash > top_albums;
-        QStringList top_artists;
-
-        /// Deside what type, we need to handle it differently
-        /// @todo: We allready know the type, append it to breadcrumb hash
-
-        if( res.value( "type" ).toString() == "Album" )
-            setChartType( Album );
-        else if( res.value( "type" ).toString() == "Track" )
-            setChartType( Track );
-        else if( res.value( "type" ).toString() == "Artist" )
-            setChartType( Artist );
-        else
-            setChartType( None );
-
-
-//         qDebug() << "Got chart returned!" << res;
-        foreach ( QVariant chartR, chartResponse )
-        {
-            QString title, artist, album;
-            QVariantMap chartMap = chartR.toMap();
-
-            if ( !chartMap.isEmpty() )
-            {
-
-                title = chartMap.value( "track" ).toString();
-                album = chartMap.value( "album" ).toString();
-                artist = chartMap.value( "artist" ).toString();
-                /// Maybe we can use rank later on, to display something nice
-                /// rank = chartMap.value( "rank" ).toString();
-
-                if ( chartType() == Album )
-                {
-
-                    if ( album.isEmpty() && artist.isEmpty() ) // don't have enough...
-                    {
-                        tDebug( LOGVERBOSE )  << "Didn't get an artist and album name from chart, not enough to build a query on. Aborting" << title << album << artist;
-
-                    }
-                    else
-                    {
-
-                        Tomahawk::InfoSystem::InfoStringHash pair;
-                        pair"artist" = artist;
-                        pair"album" = album;
-                        top_albums.append( pair );
-
-                    }
-                }
-
-                else if ( chartType() == Track )
-                {
-
-                    if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
-                    {
-                        tDebug( LOGVERBOSE )  << "Didn't get an artist and track name from charts, not enough to build a query on. Aborting" << title << artist << album;
-
-                    }
-                    else
-                    {
-
-                        Tomahawk::InfoSystem::InfoStringHash pair;
-                        pair"artist" = artist;
-                        pair"track" = title;
-                        top_tracks.append( pair );
-
-                    }
-                }else if( chartType() == Artist )
-                {
-                    if ( artist.isEmpty() ) // don't have enough...
-                    {
-                        tDebug( LOGVERBOSE )  << "Didn't get an artist from charts, not enough to build a query on. Aborting" << artist;
-
-                    }
-                    else
-                    {
-                        top_artists.append( artist );
-                    }
-
-                }
-            }
-        }
-
-        if( chartType() == Artist )
-        {
-            tDebug() << "ChartsPlugin:" << "\tgot " << top_artists.size() << " artists";
-            returnedData "artists"  = QVariant::fromValue< QStringList >( top_artists );
-            returnedData "type"  = "artists";
-        }
-
-        if( chartType() == Track )
-        {
-            tDebug() << "ChartsPlugin:" << "\tgot " << top_tracks.size() << " tracks";
-            returnedData "tracks"  = QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( top_tracks );
-            returnedData "type"  = "tracks";
-        }
-
-        if( chartType() == Album )
-        {
-            tDebug() << "ChartsPlugin:" << "\tgot " << top_albums.size() << " albums";
-            returnedData "albums"  = QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( top_albums );
-            returnedData "type"  = "albums";
-        }
-
-        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-
-        emit info( requestData, returnedData );
-        // update cache
-        Tomahawk::InfoSystem::InfoStringHash criteria;
-        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-        criteria "chart_id"  = origData "chart_id" ;
-        criteria "chart_source"  = origData "chart_source" ;
-        emit updateCache( criteria, 86400000, requestData.type, returnedData );
-    }
-    else
-        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Network error in fetching chart:" << reply->url().toString();
-
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.h Deleted

@@ -1,89 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 ChartsPlugin_H
-#define ChartsPlugin_H
-
-#include "infosystem/infosystem.h"
-#include "infosystem/infosystemworker.h"
-#include <QtNetwork/QNetworkReply>
-#include <QtCore/QObject>
-
-class QNetworkReply;
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class ChartsPlugin : public InfoPlugin
-{
-    Q_OBJECT
-
-public:
-    ChartsPlugin();
-    virtual ~ChartsPlugin();
-
-    enum ChartType {
-        None =      0x00,
-        Track =     0x01,
-        Album =     0x02,
-        Artist =    0x04
-
-    };
-
-    void setChartType( ChartType type ) { m_chartType = type; }
-    ChartType chartType() const { return m_chartType; }
-
-public slots:
-    void chartReturned();
-    void chartTypes();
-
-protected slots:
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
-    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
-
-    virtual void pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant data )
-    {
-        Q_UNUSED( caller )
-        Q_UNUSED( type )
-        Q_UNUSED( data )
-    }
-
-private:
-    void fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void dataError( Tomahawk::InfoSystem::InfoRequestData requestData );
-
-    QStringList m_chartResources;
-    QString m_chartVersion;
-    QList< InfoStringHash > m_charts;
-    ChartType m_chartType;
-    QVariantMap m_allChartsMap;
-    uint m_chartsFetchJobs;
-    QList< InfoRequestData > m_cachedRequests;
-    QHash< QString, QString > m_cachedCountries;
-    QWeakPointer< QNetworkAccessManager > m_nam;
-};
-
-}
-
-}
-
-#endif // ChartsPlugin_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.cpp Deleted

@@ -1,295 +0,0 @@
-/* === 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
- *   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 "echonestplugin.h"
-#include <echonest/Artist.h>
-#include <echonest/ArtistTypes.h>
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include <QNetworkConfiguration>
-
-using namespace Tomahawk::InfoSystem;
-using namespace Echonest;
-
-// for internal neatness
-
-EchoNestPlugin::EchoNestPlugin()
-    : InfoPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-    m_supportedGetTypes << Tomahawk::InfoSystem::InfoArtistBiography << Tomahawk::InfoSystem::InfoArtistFamiliarity << Tomahawk::InfoSystem::InfoArtistHotttness << Tomahawk::InfoSystem::InfoArtistTerms << Tomahawk::InfoSystem::InfoMiscTopTerms;
-    Echonest::Config::instance()->setNetworkAccessManager( TomahawkUtils::nam() );
-}
-
-
-EchoNestPlugin::~EchoNestPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-EchoNestPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    switch ( requestData.type )
-    {
-        case Tomahawk::InfoSystem::InfoArtistBiography:
-            return getArtistBiography( requestData );
-        case Tomahawk::InfoSystem::InfoArtistFamiliarity:
-            return getArtistFamiliarity( requestData );
-        case Tomahawk::InfoSystem::InfoArtistHotttness:
-            return getArtistHotttnesss( requestData );
-        case Tomahawk::InfoSystem::InfoArtistTerms:
-            return getArtistTerms( requestData );
-        case Tomahawk::InfoSystem::InfoTrackEnergy:
-            return getSongProfile( requestData, "energy" );
-        case Tomahawk::InfoSystem::InfoMiscTopTerms:
-            return getMiscTopTerms( requestData );
-        default:
-        {
-            emit info( requestData, QVariant() );
-            return;
-        }
-    }
-}
-
-
-void
-EchoNestPlugin::getSongProfile( const Tomahawk::InfoSystem::InfoRequestData &requestData, const QString &item )
-{
-    //WARNING: Totally not implemented yet
-    Q_UNUSED( item );
-
-    if( !isValidTrackData( requestData ) )
-        return;
-
-//     Track track( input.toString() );
-//     Artist artist( customData.input()->property("artistName").toString() );
-//     reply->setProperty("artist", QVariant::fromValue<Artist>(artist));
-//     reply->setProperty( "input", input );
-//     m_replyMapreply = customData;
-//     connect(reply, SIGNAL(finished()), SLOT(getArtistBiographySlot()));
-}
-
-
-void
-EchoNestPlugin::getArtistBiography( const Tomahawk::InfoSystem::InfoRequestData &requestData )
-{
-    if( !isValidArtistData( requestData ) )
-        return;
-
-    Echonest::Artist artist( requestData.input.toString() );
-    QNetworkReply *reply = artist.fetchBiographies();
-    reply->setProperty( "artist", QVariant::fromValue< Echonest::Artist >( artist ) );
-    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-    connect( reply, SIGNAL( finished() ), SLOT( getArtistBiographySlot() ) );
-}
-
-
-void
-EchoNestPlugin::getArtistFamiliarity( const Tomahawk::InfoSystem::InfoRequestData &requestData )
-{
-    if( !isValidArtistData( requestData ) )
-        return;
-
-    qDebug() << "Fetching artist familiarity!" << requestData.input;
-    Echonest::Artist artist( requestData.input.toString() );
-    QNetworkReply* reply = artist.fetchFamiliarity();
-    reply->setProperty( "artist", QVariant::fromValue< Echonest::Artist >( artist ) );
-    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-    connect( reply, SIGNAL( finished() ), SLOT( getArtistFamiliaritySlot() ) );
-}
-
-
-void
-EchoNestPlugin::getArtistHotttnesss( const Tomahawk::InfoSystem::InfoRequestData &requestData )
-{
-    if( !isValidArtistData( requestData ) )
-        return;
-
-    Echonest::Artist artist( requestData.input.toString() );
-    QNetworkReply* reply = artist.fetchHotttnesss();
-    reply->setProperty( "artist", QVariant::fromValue< Echonest::Artist >( artist ) );
-    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-    connect( reply, SIGNAL( finished() ), SLOT( getArtistHotttnesssSlot() ) );
-}
-
-
-void
-EchoNestPlugin::getArtistTerms( const Tomahawk::InfoSystem::InfoRequestData &requestData )
-{
-    if( !isValidArtistData( requestData ) )
-        return;
-
-    Echonest::Artist artist( requestData.input.toString() );
-    QNetworkReply* reply = artist.fetchTerms( Echonest::Artist::Weight );
-    reply->setProperty( "artist", QVariant::fromValue< Echonest::Artist >( artist ) );
-    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-    connect( reply, SIGNAL( finished() ), SLOT( getArtistTermsSlot() ) );
-}
-
-
-void
-EchoNestPlugin::getMiscTopTerms( const Tomahawk::InfoSystem::InfoRequestData &requestData )
-{
-    QNetworkReply* reply = Echonest::Artist::topTerms( 20 );
-    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-    connect( reply, SIGNAL( finished() ), SLOT( getMiscTopSlot() ) );
-}
-
-
-void
-EchoNestPlugin::getArtistBiographySlot()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    Echonest::Artist artist = artistFromReply( reply );
-    BiographyList biographies = artist.biographies();
-    QVariantMap biographyMap;
-    Q_FOREACH( const Biography& biography, biographies )
-    {
-        QVariantHash siteData;
-        siteData "site"  = biography.site();
-        siteData "url"  = biography.url().toString();
-        siteData "text"  = biography.text();
-        siteData "attribution"  = biography.license().attribution;
-        siteData "licensetype"  = biography.license().type;
-        siteData "attribution"  = biography.license().url.toString();
-        biographyMap biography.site()  = siteData;
-    }
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-    emit info( requestData, biographyMap );
-    reply->deleteLater();
-}
-
-
-void
-EchoNestPlugin::getArtistFamiliaritySlot()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    Echonest::Artist artist = artistFromReply( reply );
-    qreal familiarity = artist.familiarity();
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-    emit info( requestData, familiarity );
-    reply->deleteLater();
-}
-
-
-void
-EchoNestPlugin::getArtistHotttnesssSlot()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    Echonest::Artist artist = artistFromReply( reply );
-    qreal hotttnesss = artist.hotttnesss();
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-    emit info( requestData, hotttnesss );
-    reply->deleteLater();
-}
-
-
-void
-EchoNestPlugin::getArtistTermsSlot()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    Echonest::Artist artist = artistFromReply( reply );
-    TermList terms = artist.terms();
-    QVariantMap termsMap;
-    Q_FOREACH( const Echonest::Term& term, terms ) {
-        QVariantHash termHash;
-        termHash "weight"  = QString::number( term.weight() );
-        termHash "frequency"  = QString::number( term.frequency() );
-        termsMap term.name()  = termHash;
-    }
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-    emit info( requestData, termsMap );
-    reply->deleteLater();
-}
-
-
-void
-EchoNestPlugin::getMiscTopSlot()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    TermList terms = Echonest::Artist::parseTopTerms( reply );
-    QVariantMap termsMap;
-    Q_FOREACH( const Echonest::Term& term, terms ) {
-        QVariantHash termHash;
-        termHash "weight"  = QString::number( term.weight() );
-        termHash "frequency"  = QString::number( term.frequency() );
-        termsMap term.name()  = termHash;
-    }
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-    emit info( requestData, termsMap );
-    reply->deleteLater();
-}
-
-
-bool
-EchoNestPlugin::isValidArtistData( const Tomahawk::InfoSystem::InfoRequestData &requestData )
-{
-    if ( requestData.input.isNull() || !requestData.input.isValid() || !requestData.input.canConvert< QString >() )
-    {
-        emit info( requestData, QVariant() );
-        return false;
-    }
-    QString artistName = requestData.input.toString();
-    if ( artistName.isEmpty() )
-    {
-        emit info( requestData, QVariant() );
-        return false;
-    }
-    return true;
-}
-
-
-bool
-EchoNestPlugin::isValidTrackData( const Tomahawk::InfoSystem::InfoRequestData &requestData )
-{
-    if ( requestData.input.isNull() || !requestData.input.isValid() || !requestData.input.canConvert< QString >() )
-    {
-        emit info( requestData, QVariant() );
-        return false;
-    }
-    QString trackName = requestData.input.toString();
-    if ( trackName.isEmpty() )
-    {
-        emit info( requestData, QVariant() );
-        return false;
-    }
-    if ( !requestData.customData.contains( "artistName" ) || requestData.customData "artistName" .toString().isEmpty() )
-    {
-        emit info( requestData, QVariant() );
-        return false;
-    }
-    return true;
-}
-
-
-Artist
-EchoNestPlugin::artistFromReply( QNetworkReply* reply )
-{
-    Echonest::Artist artist = reply->property("artist").value<Echonest::Artist>();
-    try {
-        artist.parseProfile( reply );
-    } catch( const Echonest::ParseError& e ) {
-        qWarning() << "Caught parser error from echonest!" << e.what();
-    }
-    return artist;
-}
-//
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/echonestplugin.h Deleted

@@ -1,88 +0,0 @@
-/* === 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
- *   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 ECHONESTPLUGIN_H
-#define ECHONESTPLUGIN_H
-
-#include "infosystem/infosystem.h"
-#include "infosystem/infosystemworker.h"
-
-#include <QObject>
-
-class QNetworkReply;
-
-namespace Echonest
-{
-    class Artist;
-}
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class EchoNestPlugin : public InfoPlugin
-{
-    Q_OBJECT
-
-public:
-    EchoNestPlugin();
-    virtual ~EchoNestPlugin();
-
-protected slots:
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
-
-    virtual void pushInfo( const QString caller, const Tomahawk::InfoSystem::InfoType type, const QVariant data )
-    {
-        Q_UNUSED( caller );
-        Q_UNUSED( type );
-        Q_UNUSED( data );
-    }
-
-    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-    {
-        Q_UNUSED( criteria );
-        Q_UNUSED( requestData );
-    }
-
-private:
-    void getSongProfile( const Tomahawk::InfoSystem::InfoRequestData &requestData, const QString &item = QString() );
-    void getArtistBiography( const Tomahawk::InfoSystem::InfoRequestData &requestData );
-    void getArtistFamiliarity( const Tomahawk::InfoSystem::InfoRequestData &requestData );
-    void getArtistHotttnesss( const Tomahawk::InfoSystem::InfoRequestData &requestData );
-    void getArtistTerms( const Tomahawk::InfoSystem::InfoRequestData &requestData );
-    void getMiscTopTerms( const Tomahawk::InfoSystem::InfoRequestData &requestData );
-
-    bool isValidArtistData( const Tomahawk::InfoSystem::InfoRequestData &requestData );
-    bool isValidTrackData( const Tomahawk::InfoSystem::InfoRequestData &requestData );
-    Echonest::Artist artistFromReply( QNetworkReply* );
-
-private slots:
-    void getArtistBiographySlot();
-    void getArtistFamiliaritySlot();
-    void getArtistHotttnesssSlot();
-    void getArtistTermsSlot();
-    void getMiscTopSlot();
-};
-
-}
-
-}
-
-#endif // ECHONESTPLUGIN_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.cpp Deleted

@@ -1,395 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 "hypemPlugin.h"
-
-#include <QDir>
-#include <QSettings>
-#include <QCryptographicHash>
-#include <QNetworkConfiguration>
-#include <QNetworkReply>
-
-#include "album.h"
-#include "typedefs.h"
-#include "tomahawksettings.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#define HYPEM_URL "http://hypem.com/playlist/"
-#define HYPEM_END_URL "json/1/data.js"
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-
-using namespace Tomahawk::InfoSystem;
-
-
-hypemPlugin::hypemPlugin()
-    : InfoPlugin()
-    , m_chartsFetchJobs( 0 )
-{
-
-    m_supportedGetTypes << InfoChart << InfoChartCapabilities;
-    m_types << "Artists" << "Tracks" << "Recent by Tag";
-
-    m_trackTypes    << "Last 3 Days"
-                    << "Last Week"
-                    << "No Remixes"
-                    << "On Twitter";
-
-    m_byTagTypes    << "Dance"
-                    << "Experimental"
-                    << "Electronic"
-                    << "Funk"
-                    << "Hip-hop"
-                    << "Indie"
-                    << "Instrumental"
-                    << "Post-punk"
-                    << "Rock"
-                    << "Singer-songwriter"
-                    << "Alternative"
-                    << "Pop"
-                    << "Female"
-                    << "Vocalist"
-                    << "Folk"
-                    << "Electro"
-                    << "Lo-fi"
-                    << "Psychedelic"
-                    << "Rap"
-                    << "British"
-                    << "Ambient"
-                    << "Dubstep"
-                    << "House"
-                    << "Chillwave"
-                    << "Dreampop"
-                    << "Shoegaze"
-                    << "Chillout"
-                    << "Soul"
-                    << "French"
-                    << "Acoustic"
-                    << "Canadian"
-                    << "60s"
-                    << "80s"
-                    << "Techno"
-                    << "Punk"
-                    << "New wave";
-    chartTypes();
-
-}
-
-
-
-
-hypemPlugin::~hypemPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-hypemPlugin::dataError( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    emit info( requestData, QVariant() );
-    return;
-}
-
-
-void
-hypemPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    qDebug() << Q_FUNC_INFO << requestData.caller;
-    qDebug() << Q_FUNC_INFO << requestData.customData;
-
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-
-
-    switch ( requestData.type )
-    {
-
-        case InfoChart:
-            if ( !hash.contains( "chart_source" ) || hash"chart_source".toLower() != "hype machine" )
-            {
-                dataError( requestData );
-                break;
-            }
-            qDebug() << Q_FUNC_INFO << "InfoCHart req for" << hash"chart_source";
-            fetchChart( requestData );
-            break;
-
-        case InfoChartCapabilities:
-            fetchChartCapabilities( requestData );
-            break;
-        default:
-            dataError( requestData );
-    }
-}
-
-void
-hypemPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-
-    /// Each request needs to contain both a id and source
-    if ( !hash.contains( "chart_id" ) && !hash.contains( "chart_source" ) )
-    {
-        dataError( requestData );
-        return;
-
-    }
-    /// Set the criterias for current chart
-    criteria"chart_id" = hash"chart_id";
-    criteria"chart_source" = hash"chart_source";
-    /// @todo
-    /// set cache time based on wether requested type is 3day, lastweek or recent.
-    emit getCachedInfo( criteria, 86400000, requestData );
-}
-
-void
-hypemPlugin::fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    emit getCachedInfo( criteria, 0, requestData );
-}
-
-void
-hypemPlugin::notInCacheSlot( QHash<QString, QString> criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    switch ( requestData.type )
-    {
-        case InfoChart:
-        {
-            /// Fetch the chart, we need source and id
-            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChart not in cache! Fetching...";
-            QUrl url = QUrl( QString( HYPEM_URL "%1/%2" ).arg( criteria"chart_id".toLower() ).arg(HYPEM_END_URL) );
-            qDebug() << Q_FUNC_INFO << "Getting chart url" << url;
-
-            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-            connect( reply, SIGNAL( finished() ), SLOT( chartReturned() ) );
-            return;
-
-
-        }
-
-        case InfoChartCapabilities:
-        {
-            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChartCapabilities not in cache! Fetching...";
-            if ( m_chartsFetchJobs > 0 )
-            {
-                qDebug() << Q_FUNC_INFO << "InfoChartCapabilities still fetching!";
-                m_cachedRequests.append( requestData );
-                return;
-            }
-
-            emit info( requestData, m_allChartsMap );
-            return;
-        }
-
-        default:
-        {
-            tLog() << Q_FUNC_INFO << "Couldn't figure out what to do with this type of request after cache miss";
-            emit info( requestData, QVariant() );
-            return;
-        }
-    }
-}
-
-
-void
-hypemPlugin::chartTypes()
-{
-    /// Get possible chart type for specifichypemPlugin: InfoChart types returned chart source
-    tDebug() << Q_FUNC_INFO << "Got hypem types";
-
-    QVariantMap charts;
-
-    foreach(QVariant types, m_types )
-    {
-        QList< InfoStringHash > chart_types;
-        QList< InfoStringHash > pop_charts;
-        InfoStringHash c;
-
-        if(types.toString() != "Artists")
-        {
-
-            if(types.toString() == "Tracks")
-            {
-
-                foreach(QVariant trackType, m_trackTypes)
-                {
-                    QString typeId;
-                    if(trackType.toString() == "Last 3 Days")
-                        typeId = "popular/3day";
-
-                    if(trackType.toString() == "Last Week")
-                        typeId = "popular/lastweek";
-
-                    if(trackType.toString() == "No Remixes")
-                        typeId = "popular/noremix";
-
-                    if(trackType.toString() == "On Twitter")
-                        typeId = "popular/twitter";
-
-                    c "id"  = typeId;
-                    c "label"  = trackType.toString();
-                    c "type"  = "tracks";
-                    pop_charts.append( c );
-                }
-
-                chart_types.append( pop_charts );
-
-            }
-            else if(types.toString() == "Recent by Tag")
-            {
-                foreach(QVariant tagTypes, m_byTagTypes)
-                {
-
-                    c "id"  = "tags/" + tagTypes.toString().toLower();
-                    c "label"  = tagTypes.toString();
-                    c "type"  = tagTypes.toString();
-                    chart_types.append( c );
-                }
-
-            }
-
-        }else
-        {
-            InfoStringHash c;
-            c "id"  = "popular/artists";
-            c "label"  = "Most Recent";
-            c "type"  = "artists";
-            chart_types.append( c );
-        }
-
-        charts.insert( types.toString(), QVariant::fromValue<QList< InfoStringHash > >( chart_types ) );
-    }
-
-
-    m_allChartsMap.insert( "Hype Machine", QVariant::fromValue<QVariantMap>( charts ) );
-    qDebug() << "hypemPlugin:Chartstype: " << m_allChartsMap;
-
-
-}
-
-void
-hypemPlugin::chartReturned()
-{
-
-    /// Chart request returned something! Woho
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    QString url = reply->url().toString();
-    QVariantMap returnedData;
-    if ( reply->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        QVariantMap res = p.parse( reply, &ok ).toMap();
-
-        if ( !ok )
-        {
-            tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
-            return;
-        }
-
-        /// SO we have a result, parse it!
-        QList< InfoStringHash > top_tracks;
-        QStringList top_artists;
-
-        if( url.contains( "artists" ) )
-            setChartType( Artist );
-        else
-            setChartType( Track );
-
-        foreach(QVariant result, res )
-        {
-            QString title, artist;
-            QVariantMap chartMap = result.toMap();
-
-            if ( !chartMap.isEmpty() )
-            {
-
-                title = chartMap.value( "title" ).toString();
-                artist = chartMap.value( "artist" ).toString();
-
-                if( chartType() == Track )
-                {
-                    InfoStringHash pair;
-                    pair"artist" = artist;
-                    pair"track" = title;
-                    top_tracks << pair;
-
-                    qDebug() << "HypemChart type is track";
-                }
-
-
-                if( chartType() == Artist )
-                {
-
-                    top_artists << artist;
-                    qDebug() << "HypemChart type is artist";
-
-                }
-            }
-        }
-
-        if( chartType() == Track )
-        {
-            tDebug() << "HypemPlugin:" << "\tgot " << top_tracks.size() << " tracks";
-            returnedData"tracks" = QVariant::fromValue( top_tracks );
-            returnedData"type" = "tracks";
-        }
-
-
-
-        if( chartType() == Artist )
-        {
-            tDebug() << "HypemPlugin:" << "\tgot " << top_artists.size() << " artists";
-            returnedData"artists" = top_artists;
-            returnedData"type" = "artists";
-        }
-
-        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-
-
-        emit info( requestData, returnedData );
-        // update cache
-        Tomahawk::InfoSystem::InfoStringHash criteria;
-        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-        criteria "chart_id"  = origData "chart_id" ;
-        criteria "chart_source"  = origData "chart_source" ;
-        /// @todo
-        /// set cache time based on wether requested type is 3day, lastweek or recent.
-        emit updateCache( criteria, 86400000, requestData.type, returnedData );
-    }
-    else
-        qDebug() << "Network error in fetching chart:" << reply->url().toString();
-
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/hypemPlugin.h Deleted

@@ -1,95 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 hypemPlugin_H
-#define hypemPlugin_H
-
-#include "infosystem/infosystem.h"
-#include "infosystem/infosystemworker.h"
-#include <QNetworkReply>
-#include <QObject>
-
-class QNetworkReply;
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class hypemPlugin : public InfoPlugin
-{
-    Q_OBJECT
-
-public:
-    hypemPlugin();
-    virtual ~hypemPlugin();
-
-    enum ChartType {
-        None =      0x00,
-        Track =     0x01,
-        Album =     0x02,
-        Artist =    0x04
-
-    };
- void setChartType( ChartType type ) { m_chartType = type; }
- ChartType chartType() const { return m_chartType; }
-
-public slots:
-    void chartReturned();
-    void chartTypes();
-
-protected slots:
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
-    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
-    virtual void pushInfo( const QString caller, const Tomahawk::InfoSystem::InfoType type, const QVariant input )
-    {
-        Q_UNUSED( caller )
-        Q_UNUSED( type)
-        Q_UNUSED( input )
-    }
-
-
-private:
-    void fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void dataError( Tomahawk::InfoSystem::InfoRequestData requestData );
-
-    QVariantList m_chartResources;
-    QList<InfoStringHash> m_charts;
-
-
-    ChartType m_chartType;
-    QVariantMap m_allChartsMap;
-    QVariantList m_types;
-    QVariantList m_popularTypes;
-    QVariantList m_trackTypes;
-    QVariantList m_byTagTypes;
-
-
-    uint m_chartsFetchJobs;
-    QList< InfoRequestData > m_cachedRequests;
-
-    QHash< QString, QString > m_cachedCountries;
-};
-
-}
-
-}
-
-#endif // hypemPlugin_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.cpp Deleted

@@ -1,823 +0,0 @@
-/* === 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
- *   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 "lastfmplugin.h"
-
-#include <QDir>
-#include <QSettings>
-#include <QNetworkConfiguration>
-#include <QDomElement>
-
-#include "album.h"
-#include "typedefs.h"
-#include "audio/audioengine.h"
-#include "tomahawksettings.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include <lastfm/ws.h>
-#include <lastfm/XmlQuery>
-
-#include <qjson/parser.h>
-
-using namespace Tomahawk::InfoSystem;
-
-
-LastFmPlugin::LastFmPlugin()
-    : InfoPlugin()
-    , m_scrobbler( 0 )
-{
-    m_supportedGetTypes << InfoAlbumCoverArt << InfoArtistImages << InfoArtistSimilars << InfoArtistSongs << InfoChart << InfoChartCapabilities;
-    m_supportedPushTypes << InfoSubmitScrobble << InfoSubmitNowPlaying << InfoLove << InfoUnLove;
-
-    // Flush session key cache
-    TomahawkSettings::instance()->setLastFmSessionKey( QByteArray() );
-
-    lastfm::ws::ApiKey = "7194b85b6d1f424fe1668173a78c0c4a";
-    lastfm::ws::SharedSecret = "ba80f1df6d27ae63e9cb1d33ccf2052f";
-    lastfm::ws::Username = TomahawkSettings::instance()->lastFmUsername();
-    lastfm::setNetworkAccessManager( TomahawkUtils::nam() );
-
-    m_pw = TomahawkSettings::instance()->lastFmPassword();
-
-    //HACK work around a bug in liblastfm---it doesn't create its config dir, so when it
-    // tries to write the track cache, it fails silently. until we have a fixed version, do this
-    // code taken from Amarok (src/services/lastfm/ScrobblerAdapter.cpp)
-#ifdef Q_WS_X11
-    QString lpath = QDir::home().filePath( ".local/share/Last.fm" );
-    QDir ldir = QDir( lpath );
-    if( !ldir.exists() )
-    {
-        ldir.mkpath( lpath );
-    }
-#endif
-
-    m_badUrls << QUrl( "http://cdn.last.fm/flatness/catalogue/noimage" );
-
-    connect( TomahawkSettings::instance(), SIGNAL( changed() ),
-                                             SLOT( settingsChanged() ), Qt::QueuedConnection );
-
-    QTimer::singleShot( 0, this, SLOT( settingsChanged() ) );
-}
-
-
-LastFmPlugin::~LastFmPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-    delete m_scrobbler;
-    m_scrobbler = 0;
-}
-
-
-void
-LastFmPlugin::dataError( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    emit info( requestData, QVariant() );
-    return;
-}
-
-
-void
-LastFmPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    switch ( requestData.type )
-    {
-        case InfoArtistImages:
-            fetchArtistImages( requestData );
-            break;
-
-        case InfoAlbumCoverArt:
-            fetchCoverArt( requestData );
-            break;
-
-        case InfoArtistSimilars:
-            fetchSimilarArtists( requestData );
-            break;
-
-        case InfoArtistSongs:
-            fetchTopTracks( requestData );
-            break;
-
-        case InfoChart:
-            fetchChart( requestData );
-            break;
-
-        case InfoChartCapabilities:
-            fetchChartCapabilities( requestData );
-            break;
-        default:
-            dataError( requestData );
-    }
-}
-
-
-void
-LastFmPlugin::pushInfo( const QString caller, const Tomahawk::InfoSystem::InfoType type, const QVariant input )
-{
-    Q_UNUSED( caller )
-    switch ( type )
-    {
-        case InfoSubmitNowPlaying:
-            nowPlaying( input );
-            break;
-
-        case InfoSubmitScrobble:
-            scrobble();
-            break;
-
-        case InfoLove:
-        case InfoUnLove:
-            sendLoveSong( type, input );
-            break;
-
-        default:
-            return;
-    }
-}
-
-
-void
-LastFmPlugin::nowPlaying( const QVariant &input )
-{
-    if ( !input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() || !m_scrobbler )
-    {
-        tLog() << "LastFmPlugin::nowPlaying no m_scrobbler, or cannot convert input!";
-        if ( !m_scrobbler )
-            tLog() << "No scrobbler!";
-        return;
-    }
-
-    InfoStringHash hash = input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    if ( !hash.contains( "title" ) || !hash.contains( "artist" ) || !hash.contains( "album" ) || !hash.contains( "duration" ) )
-        return;
-
-    m_track = lastfm::MutableTrack();
-    m_track.stamp();
-
-    m_track.setTitle( hash"title" );
-    m_track.setArtist( hash"artist" );
-    m_track.setAlbum( hash"album" );
-    bool ok;
-    m_track.setDuration( hash"duration".toUInt( &ok ) );
-    m_track.setSource( lastfm::Track::Player );
-
-    m_scrobbler->nowPlaying( m_track );
-}
-
-
-void
-LastFmPlugin::scrobble()
-{
-    if ( !m_scrobbler || m_track.isNull() )
-        return;
-
-    tLog() << Q_FUNC_INFO << "Scrobbling now:" << m_track.toString();
-    m_scrobbler->cache( m_track );
-    m_scrobbler->submit();
-}
-
-
-void
-LastFmPlugin::sendLoveSong( const InfoType type, QVariant input )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( !input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        tLog() << "LastFmPlugin::nowPlaying cannot convert input!";
-        return;
-    }
-
-    InfoStringHash hash = input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    if ( !hash.contains( "title" ) || !hash.contains( "artist" ) || !hash.contains( "album" ) )
-        return;
-
-    lastfm::MutableTrack track;
-    track.stamp();
-
-    track.setTitle( hash"title" );
-    track.setArtist( hash"artist" );
-    track.setAlbum( hash"album" );
-    bool ok;
-    track.setDuration( hash"duration".toUInt( &ok ) );
-    track.setSource( lastfm::Track::Player );
-
-    if ( type == Tomahawk::InfoSystem::InfoLove )
-    {
-        track.love();
-    }
-    else if ( type == Tomahawk::InfoSystem::InfoUnLove )
-    {
-        track.unlove();
-    }
-}
-
-
-void
-LastFmPlugin::fetchSimilarArtists( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    if ( !hash.contains( "artist" ) )
-    {
-        dataError( requestData );
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria"artist" = hash"artist";
-
-    emit getCachedInfo( criteria, 2419200000, requestData );
-}
-
-
-void
-LastFmPlugin::fetchTopTracks( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    if ( !hash.contains( "artist" ) )
-    {
-        dataError( requestData );
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria"artist" = hash"artist";
-
-    emit getCachedInfo( criteria, 2419200000, requestData );
-}
-
-void
-LastFmPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    if ( !hash.contains( "chart_id" ) )
-    {
-        dataError( requestData );
-        return;
-    } else {
-        criteria"chart_id" = hash"chart_id";
-    }
-
-    emit getCachedInfo( criteria, 0, requestData );
-}
-
-void
-LastFmPlugin::fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-
-    emit getCachedInfo( criteria, 0, requestData );
-}
-
-void
-LastFmPlugin::fetchCoverArt( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    if ( !hash.contains( "artist" ) || !hash.contains( "album" ) )
-    {
-        dataError( requestData );
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria"artist" = hash"artist";
-    criteria"album" = hash"album";
-
-    emit getCachedInfo( criteria, 2419200000, requestData );
-}
-
-
-void
-LastFmPlugin::fetchArtistImages( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    if ( !hash.contains( "artist" ) )
-    {
-        dataError( requestData );
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria"artist" = hash"artist";
-
-    emit getCachedInfo( criteria, 2419200000, requestData );
-}
-
-
-void
-LastFmPlugin::notInCacheSlot( QHash<QString, QString> criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !TomahawkUtils::nam() )
-    {
-        tLog() << "Have a null QNAM, uh oh";
-        emit info( requestData, QVariant() );
-        return;
-    }
-
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    switch ( requestData.type )
-    {
-        case InfoChart:
-        {
-             /// We need something to check if the request is actually ment to go to this plugin
-            if ( !hash.contains( "chart_source" ) )
-            {
-                dataError( requestData );
-                break;
-            }
-            else
-            {
-                if( "last.fm" != hash"chart_source" )
-                {
-                    dataError( requestData );
-                    break;
-                }
-
-            }
-            QMap<QString, QString> args;
-            args"method" = criteria"chart_id";
-            args"limit" = "100";
-            QNetworkReply* reply = lastfm::ws::get(args);
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-
-            connect( reply, SIGNAL( finished() ), SLOT( chartReturned() ) );
-            return;
-        }
-
-        case InfoChartCapabilities:
-        {
-            QList< InfoStringHash > track_charts;
-            InfoStringHash c;
-            c "type"  = "tracks";
-            c "id"  = "chart.getTopTracks";
-            c "label"  = tr( "Top Tracks" );
-            track_charts.append( c );
-            c "id"  = "chart.getLovedTracks";
-            c "label"  = tr( "Loved Tracks" );
-            track_charts.append( c );
-            c "id"  = "chart.getHypedTracks";
-            c "label"  = tr( "Hyped Tracks" );
-            track_charts.append( c );
-
-            QList< InfoStringHash > artist_charts;
-            c "type"  = "artists";
-            c "id"  = "chart.getTopArtists";
-            c "label"  = tr( "Top Artists" );
-            artist_charts.append( c );
-            c "id"  = "chart.getHypedArtists";
-            c "label"  = tr( "Hyped Artists" );
-            artist_charts.append( c );
-
-            QVariantMap charts;
-            charts.insert( "Tracks", QVariant::fromValue< QList< InfoStringHash > >( track_charts ) );
-            charts.insert( "Artists", QVariant::fromValue< QList< InfoStringHash > >( artist_charts ) );
-
-            QVariantMap result;
-            result.insert( "Last.fm", QVariant::fromValue<QVariantMap>( charts ) );
-
-            emit info( requestData, result );
-            return;
-        }
-
-        case InfoArtistSimilars:
-        {
-            lastfm::Artist a( criteria"artist" );
-            QNetworkReply* reply = a.getSimilar();
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-
-            connect( reply, SIGNAL( finished() ), SLOT( similarArtistsReturned() ) );
-            return;
-        }
-
-        case InfoArtistSongs:
-        {
-            lastfm::Artist a( criteria"artist" );
-            QNetworkReply* reply = a.getTopTracks();
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-
-            connect( reply, SIGNAL( finished() ), SLOT( topTracksReturned() ) );
-            return;
-        }
-
-        case InfoAlbumCoverArt:
-        {
-            QString artistName = criteria"artist";
-            QString albumName = criteria"album";
-
-            QUrl imgurl( "http://ws.audioscrobbler.com/2.0/" );
-            imgurl.addQueryItem( "method", "album.imageredirect" );
-            imgurl.addEncodedQueryItem( "artist", QUrl::toPercentEncoding( artistName, "", "+" ) );
-            imgurl.addEncodedQueryItem( "album", QUrl::toPercentEncoding( albumName, "", "+" ) );
-            imgurl.addQueryItem( "autocorrect", QString::number( 1 ) );
-            imgurl.addQueryItem( "size", "largesquare" );
-            imgurl.addQueryItem( "api_key", "7a90f6672a04b809ee309af169f34b8b" );
-
-            QNetworkRequest req( imgurl );
-            QNetworkReply* reply = TomahawkUtils::nam()->get( req );
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-
-            connect( reply, SIGNAL( finished() ), SLOT( coverArtReturned() ) );
-            return;
-        }
-
-        case InfoArtistImages:
-        {
-            QString artistName = criteria"artist";
-
-            QUrl imgurl( "http://ws.audioscrobbler.com/2.0/" );
-            imgurl.addQueryItem( "method", "artist.imageredirect" );
-            imgurl.addEncodedQueryItem( "artist", QUrl::toPercentEncoding( artistName, "", "+" ) );
-            imgurl.addQueryItem( "autocorrect", QString::number( 1 ) );
-            imgurl.addQueryItem( "size", "largesquare" );
-            imgurl.addQueryItem( "api_key", "7a90f6672a04b809ee309af169f34b8b" );
-
-            QNetworkRequest req( imgurl );
-            QNetworkReply* reply = TomahawkUtils::nam()->get( req );
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-
-            connect( reply, SIGNAL( finished() ), SLOT( artistImagesReturned() ) );
-            return;
-        }
-
-        default:
-        {
-            tLog() << "Couldn't figure out what to do with this type of request after cache miss";
-            emit info( requestData, QVariant() );
-            return;
-        }
-    }
-}
-
-
-void
-LastFmPlugin::similarArtistsReturned()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-
-    QMap< int, QString > similarArtists = lastfm::Artist::getSimilar( reply );
-
-    QStringList sortedArtists;
-    QStringList sortedScores;
-    QStringList al;
-    QStringList sl;
-
-    foreach ( const QString& artist, similarArtists.values() )
-        al << artist;
-    foreach ( int score, similarArtists.keys() )
-        sl << QString::number( score );
-
-    for ( int i = al.count() - 1; i >= 0; i-- )
-    {
-        sortedArtists << al.at( i );
-        sortedScores << sl.at( i );
-    }
-
-    QVariantMap returnedData;
-    returnedData"artists" = sortedArtists;
-    returnedData"score" = sortedScores;
-
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-
-    emit info( requestData, returnedData );
-
-    Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria"artist" = origData"artist";
-    emit updateCache( criteria, 2419200000, requestData.type, returnedData );
-}
-
-
-void
-LastFmPlugin::chartReturned()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-
-    QVariantMap returnedData;
-    const QRegExp tracks_rx( "chart\\.\\S+tracks\\S*", Qt::CaseInsensitive );
-    const QRegExp artists_rx( "chart\\.\\S+artists\\S*", Qt::CaseInsensitive );
-    const QString url = reply->url().toString();
-
-    if ( url.contains( tracks_rx ) )
-    {
-        QList<lastfm::Track> tracks = parseTrackList( reply );
-        QList<InfoStringHash> top_tracks;
-        foreach( const lastfm::Track &t, tracks ) {
-            InfoStringHash pair;
-            pair "artist"  = t.artist().toString();
-            pair "track"  = t.title();
-            top_tracks << pair;
-        }
-        returnedData"tracks" = QVariant::fromValue( top_tracks );
-        returnedData"type" = "tracks";
-
-    }
-    else if ( url.contains( artists_rx ) )
-    {
-        QList<lastfm::Artist> list = lastfm::Artist::list( reply );
-        QStringList al;
-        foreach ( const lastfm::Artist& a, list )
-            al << a.toString();
-        returnedData"artists" = al;
-        returnedData"type" = "artists";
-    }
-    else
-    {
-        tDebug() << Q_FUNC_INFO << "got non tracks and non artists";
-    }
-
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-
-    emit info( requestData, returnedData );
-    // TODO update cache
-}
-
-
-void
-LastFmPlugin::topTracksReturned()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-
-    QStringList topTracks = lastfm::Artist::getTopTracks( reply );
-    topTracks.removeDuplicates();
-
-    QVariantMap returnedData;
-    returnedData"tracks" = topTracks;
-
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-
-    emit info( requestData, returnedData );
-
-    Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria"artist" = origData"artist";
-    emit updateCache( criteria, 0, requestData.type, returnedData );
-}
-
-
-void
-LastFmPlugin::coverArtReturned()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    QUrl redir = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
-    if ( redir.isEmpty() )
-    {
-        QByteArray ba = reply->readAll();
-        if ( ba.isNull() || !ba.length() )
-        {
-            tLog() << Q_FUNC_INFO << "Uh oh, null byte array";
-            emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-            return;
-        }
-        foreach ( const QUrl& url, m_badUrls )
-        {
-            if ( reply->url().toString().startsWith( url.toString() ) )
-                ba = QByteArray();
-        }
-
-        QVariantMap returnedData;
-        returnedData"imgbytes" = ba;
-        returnedData"url" = reply->url().toString();
-
-        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-
-        emit info( requestData, returnedData );
-
-        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
-        Tomahawk::InfoSystem::InfoStringHash criteria;
-        criteria"artist" = origData"artist";
-        criteria"album" = origData"album";
-        emit updateCache( criteria, 2419200000, requestData.type, returnedData );
-    }
-    else
-    {
-        if ( !TomahawkUtils::nam() )
-        {
-            tLog() << Q_FUNC_INFO << "Uh oh, nam is null";
-            emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-            return;
-        }
-        // Follow HTTP redirect
-        QNetworkRequest req( redir );
-        QNetworkReply* newReply = TomahawkUtils::nam()->get( req );
-        newReply->setProperty( "requestData", reply->property( "requestData" ) );
-        connect( newReply, SIGNAL( finished() ), SLOT( coverArtReturned() ) );
-    }
-
-    reply->deleteLater();
-}
-
-
-void
-LastFmPlugin::artistImagesReturned()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    QUrl redir = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
-    if ( redir.isEmpty() )
-    {
-        QByteArray ba = reply->readAll();
-        if ( ba.isNull() || !ba.length() )
-        {
-            tLog() << Q_FUNC_INFO << "Uh oh, null byte array";
-            emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-            return;
-        }
-        foreach ( const QUrl& url, m_badUrls )
-        {
-            if ( reply->url().toString().startsWith( url.toString() ) )
-                ba = QByteArray();
-        }
-        QVariantMap returnedData;
-        returnedData"imgbytes" = ba;
-        returnedData"url" = reply->url().toString();
-
-        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-
-        emit info( requestData, returnedData );
-
-        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
-        Tomahawk::InfoSystem::InfoStringHash criteria;
-        criteria"artist" = origData"artist";
-        emit updateCache( criteria, 2419200000, requestData.type, returnedData );
-    }
-    else
-    {
-        if ( !TomahawkUtils::nam() )
-        {
-            tLog() << Q_FUNC_INFO << "Uh oh, nam is null";
-            emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-            return;
-        }
-        // Follow HTTP redirect
-        QNetworkRequest req( redir );
-        QNetworkReply* newReply = TomahawkUtils::nam()->get( req );
-        newReply->setProperty( "requestData", reply->property( "requestData" ) );
-        connect( newReply, SIGNAL( finished() ), SLOT( artistImagesReturned() ) );
-    }
-
-    reply->deleteLater();
-}
-
-
-void
-LastFmPlugin::settingsChanged()
-{
-    if ( !m_scrobbler && TomahawkSettings::instance()->scrobblingEnabled() )
-    { // can simply create the scrobbler
-        lastfm::ws::Username = TomahawkSettings::instance()->lastFmUsername();
-        m_pw = TomahawkSettings::instance()->lastFmPassword();
-
-        createScrobbler();
-    }
-    else if ( m_scrobbler && !TomahawkSettings::instance()->scrobblingEnabled() )
-    {
-        delete m_scrobbler;
-        m_scrobbler = 0;
-    }
-    else if ( TomahawkSettings::instance()->lastFmUsername() != lastfm::ws::Username ||
-               TomahawkSettings::instance()->lastFmPassword() != m_pw )
-    {
-        lastfm::ws::Username = TomahawkSettings::instance()->lastFmUsername();
-        m_pw = TomahawkSettings::instance()->lastFmPassword();
-        // credentials have changed, have to re-create scrobbler for them to take effect
-        if ( m_scrobbler )
-        {
-            delete m_scrobbler;
-            m_scrobbler = 0;
-        }
-
-        createScrobbler();
-    }
-}
-
-
-void
-LastFmPlugin::onAuthenticated()
-{
-    QNetworkReply* authJob = dynamic_cast<QNetworkReply*>( sender() );
-    if ( !authJob )
-    {
-        tLog() << Q_FUNC_INFO << "Help! No longer got a last.fm auth job!";
-        return;
-    }
-
-    if ( authJob->error() == QNetworkReply::NoError )
-    {
-        lastfm::XmlQuery lfm = lastfm::XmlQuery( authJob->readAll() );
-
-        if ( lfm.children( "error" ).size() > 0 )
-        {
-            tLog() << "Error from authenticating with Last.fm service:" << lfm.text();
-            TomahawkSettings::instance()->setLastFmSessionKey( QByteArray() );
-        }
-        else
-        {
-            lastfm::ws::SessionKey = lfm "session"  "key" .text();
-
-            TomahawkSettings::instance()->setLastFmSessionKey( lastfm::ws::SessionKey.toLatin1() );
-
-//            qDebug() << "Got session key from last.fm";
-            if ( TomahawkSettings::instance()->scrobblingEnabled() )
-                m_scrobbler = new lastfm::Audioscrobbler( "thk" );
-        }
-    }
-    else
-    {
-        tLog() << "Got error in Last.fm authentication job:" << authJob->errorString();
-    }
-
-    authJob->deleteLater();
-}
-
-
-void
-LastFmPlugin::createScrobbler()
-{
-    if ( TomahawkSettings::instance()->lastFmSessionKey().isEmpty() ) // no session key, so get one
-    {
-        qDebug() << "LastFmPlugin::createScrobbler Session key is empty";
-        QString authToken = TomahawkUtils::md5( ( lastfm::ws::Username.toLower() + TomahawkUtils::md5( m_pw.toUtf8() ) ).toUtf8() );
-
-        QMap<QString, QString> query;
-        query "method"  = "auth.getMobileSession";
-        query "username"  = lastfm::ws::Username;
-        query "authToken"  = authToken;
-        QNetworkReply* authJob = lastfm::ws::post( query );
-
-        connect( authJob, SIGNAL( finished() ), SLOT( onAuthenticated() ) );
-    }
-    else
-    {
-        qDebug() << "LastFmPlugin::createScrobbler Already have session key";
-        lastfm::ws::SessionKey = TomahawkSettings::instance()->lastFmSessionKey();
-
-        m_scrobbler = new lastfm::Audioscrobbler( "thk" );
-    }
-}
-
-
-QList<lastfm::Track>
-LastFmPlugin::parseTrackList( QNetworkReply* reply )
-{
-    QList<lastfm::Track> tracks;
-    try
-    {
-        lastfm::XmlQuery lfm = reply->readAll();
-        foreach ( lastfm::XmlQuery xq, lfm.children( "track" ) )
-        {
-            tracks.append( lastfm::Track( xq ) );
-        }
-    }
-    catch ( lastfm::ws::ParseError& e )
-    {
-        qWarning() << e.what();
-    }
-
-    return tracks;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/lastfmplugin.h Deleted

@@ -1,90 +0,0 @@
-/* === 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
- *   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 LASTFMPLUGIN_H
-#define LASTFMPLUGIN_H
-
-#include "infosystem/infosystem.h"
-#include "infosystem/infosystemworker.h"
-
-#include <lastfm/Track>
-#include <lastfm/Audioscrobbler>
-#include <lastfm/ScrobblePoint>
-
-#include <QObject>
-
-class QNetworkReply;
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class LastFmPlugin : public InfoPlugin
-{
-    Q_OBJECT
-
-public:
-    LastFmPlugin();
-    virtual ~LastFmPlugin();
-
-public slots:
-    void settingsChanged();
-
-    void onAuthenticated();
-    void coverArtReturned();
-    void artistImagesReturned();
-    void similarArtistsReturned();
-    void topTracksReturned();
-    void chartReturned();
-
-protected slots:
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
-    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
-
-    virtual void pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant data );
-
-private:
-    void fetchCoverArt( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void fetchArtistImages( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void fetchSimilarArtists( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void fetchTopTracks( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData );
-
-    void createScrobbler();
-    void nowPlaying( const QVariant &input );
-    void scrobble();
-    void sendLoveSong( const InfoType type, QVariant input );
-
-    void dataError( Tomahawk::InfoSystem::InfoRequestData requestData );
-
-    QList<lastfm::Track> parseTrackList( QNetworkReply * reply );
-
-    lastfm::MutableTrack m_track;
-    lastfm::Audioscrobbler* m_scrobbler;
-    QString m_pw;
-
-    QList< QUrl > m_badUrls;
-};
-
-}
-
-}
-
-#endif // LASTFMPLUGIN_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.cpp Deleted

@@ -1,328 +0,0 @@
-/* === 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
- *   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 "musicbrainzPlugin.h"
-
-#include <QNetworkReply>
-#include <QDomDocument>
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk::InfoSystem;
-
-
-MusicBrainzPlugin::MusicBrainzPlugin()
-    : InfoPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-    m_supportedGetTypes << Tomahawk::InfoSystem::InfoArtistReleases << Tomahawk::InfoSystem::InfoAlbumSongs;
-}
-
-
-MusicBrainzPlugin::~MusicBrainzPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-MusicBrainzPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        emit info( requestData, QVariant() );
-        return;
-    }
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    if ( !hash.contains( "artist" ) )
-    {
-        emit info( requestData, QVariant() );
-        return;
-    }
-
-    switch ( requestData.type )
-    {
-        case InfoArtistReleases:
-        {
-
-            Tomahawk::InfoSystem::InfoStringHash criteria;
-            criteria"artist" = hash"artist";
-
-            emit getCachedInfo( criteria, 2419200000, requestData );
-            break;
-        }
-
-        case InfoAlbumSongs:
-        {
-
-            Tomahawk::InfoSystem::InfoStringHash criteria;
-            criteria"artist" = hash"artist";
-            criteria"album" = hash"album";
-
-            emit getCachedInfo( criteria, 2419200000, requestData );
-
-            break;
-        }
-
-        default:
-        {
-            Q_ASSERT( false );
-            break;
-        }
-    }
-}
-
-void
-MusicBrainzPlugin::notInCacheSlot( InfoStringHash criteria, InfoRequestData requestData )
-{
-    switch ( requestData.type )
-    {
-        case InfoArtistReleases:
-        {
-            QString requestString( "http://musicbrainz.org/ws/2/artist" );
-            QUrl url( requestString );
-            url.addQueryItem( "query", criteria"artist" );
-            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-
-            connect( reply, SIGNAL( finished() ), SLOT( artistSearchSlot() ) );
-            break;
-        }
-
-        case InfoAlbumSongs:
-        {
-            QString requestString( "http://musicbrainz.org/ws/2/artist" );
-            QUrl url( requestString );
-            url.addQueryItem( "query", criteria"artist" );
-            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-
-            connect( reply, SIGNAL( finished() ), SLOT( albumSearchSlot() ) );
-            break;
-        }
-
-        default:
-        {
-            Q_ASSERT( false );
-            break;
-        }
-    }
-}
-
-
-bool
-MusicBrainzPlugin::isValidTrackData( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( requestData.input.isNull() || !requestData.input.isValid() || !requestData.input.canConvert< QVariantMap >() )
-    {
-        emit info( requestData, QVariant() );
-        qDebug() << Q_FUNC_INFO << "Data null, invalid, or can't convert";
-        return false;
-    }
-    QVariantMap hash = requestData.input.value< QVariantMap >();
-    if ( hash "trackName" .toString().isEmpty() )
-    {
-        emit info( requestData, QVariant() );
-        qDebug() << Q_FUNC_INFO << "Track name is empty";
-        return false;
-    }
-    if ( hash "artistName" .toString().isEmpty() )
-    {
-        emit info( requestData, QVariant() );
-        qDebug() << Q_FUNC_INFO << "No artist name found";
-        return false;
-    }
-    return true;
-}
-
-
-void
-MusicBrainzPlugin::artistSearchSlot()
-{
-    QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
-    if ( !oldReply )
-        return; //timeout will handle it
-
-    QDomDocument doc;
-    doc.setContent( oldReply->readAll() );
-    QDomNodeList domNodeList = doc.elementsByTagName( "artist" );
-    if ( domNodeList.isEmpty() )
-    {
-        emit info( oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-        tDebug() << Q_FUNC_INFO << doc.toString();
-        return;
-    }
-
-    QString artist_id = domNodeList.at( 0 ).toElement().attribute( "id" );
-    QString requestString( "http://musicbrainz.org/ws/2/release?status=official&type=album|ep" );
-    QUrl url( requestString );
-    url.addQueryItem( "artist", artist_id );
-
-    QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-    newReply->setProperty( "requestData", oldReply->property( "requestData" ) );
-    connect( newReply, SIGNAL( finished() ), SLOT( albumFoundSlot() ) );
-}
-
-
-void
-MusicBrainzPlugin::albumSearchSlot()
-{
-    QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
-    if ( !oldReply )
-        return; //timeout will handle it
-
-    QDomDocument doc;
-    doc.setContent( oldReply->readAll() );
-    QDomNodeList domNodeList = doc.elementsByTagName( "artist" );
-    if ( domNodeList.isEmpty() )
-    {
-        emit info( oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-        return;
-    }
-
-    QString artist_id = domNodeList.at( 0 ).toElement().attribute( "id" );
-    QString requestString( "http://musicbrainz.org/ws/2/release?status=official&type=album|ep" );
-    QUrl url( requestString );
-    url.addQueryItem( "artist", artist_id );
-
-    QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-    newReply->setProperty( "requestData", oldReply->property( "requestData" ) );
-    connect( newReply, SIGNAL( finished() ), SLOT( tracksSearchSlot() ) );
-}
-
-
-void
-MusicBrainzPlugin::tracksSearchSlot()
-{
-    QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
-    if ( !oldReply )
-        return; //timeout will handle it
-
-    QDomDocument doc;
-    doc.setContent( oldReply->readAll() );
-    QDomNodeList domNodeList = doc.elementsByTagName( "release" );
-    if ( domNodeList.isEmpty() )
-    {
-        emit info( oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoRequestData requestData = oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-
-    QDomElement element;
-    for ( int i = 0; i < domNodeList.count(); i++ )
-    {
-        QDomNodeList albumNodeList = domNodeList.at( i ).toElement().elementsByTagName( "title" );
-        if ( albumNodeList.at( 0 ).toElement().text() == hash"album" )
-            element = domNodeList.at( i ).toElement();
-    }
-
-    if ( element.isNull() )
-    {
-        emit info( oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-        return;
-    }
-
-    QString release_id = element.attribute( "id" );
-    QString requestString = QString( "http://musicbrainz.org/ws/2/release/%1?inc=recordings" ).arg( release_id );
-    QUrl url( requestString );
-
-    QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-    newReply->setProperty( "requestData", oldReply->property( "requestData" ) );
-    connect( newReply, SIGNAL( finished() ), SLOT( tracksFoundSlot() ) );
-}
-
-
-void
-MusicBrainzPlugin::albumFoundSlot()
-{
-    QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
-    if ( !reply )
-        return; //timeout will handle it
-
-    QDomDocument doc;
-    doc.setContent( reply->readAll() );
-    QDomNodeList domNodeList = doc.elementsByTagName( "title" );
-    if ( domNodeList.isEmpty() )
-    {
-        emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-        return;
-    }
-
-    QStringList albums;
-    for ( int i = 0; i < domNodeList.count(); i++ )
-    {
-        QString album = domNodeList.at( i ).toElement().text();
-        if ( !albums.contains( album ) )
-            albums << album;
-    }
-
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-    QVariantMap returnedData;
-    returnedData"albums" = albums;
-    emit info( requestData, returnedData );
-
-    Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria"artist" = origData"artist";
-    emit updateCache( criteria, 0, requestData.type, returnedData );
-}
-
-
-void
-MusicBrainzPlugin::tracksFoundSlot()
-{
-    QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
-    if ( !reply )
-        return; //timeout will handle it
-
-    QDomDocument doc;
-    doc.setContent( reply->readAll() );
-    QDomNodeList domNodeList = doc.elementsByTagName( "recording" );
-    if ( domNodeList.isEmpty() )
-    {
-        emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-        return;
-    }
-
-    QStringList tracks;
-    for ( int i = 0; i < domNodeList.count(); i++ )
-    {
-        QDomNodeList trackNodeList = domNodeList.at( i ).toElement().elementsByTagName( "title" );
-
-        for ( int j = 0; j < trackNodeList.count(); j++ )
-        {
-            QString track = trackNodeList.at( j ).toElement().text();
-            if ( !tracks.contains( track ) )
-                tracks << track;
-        }
-    }
-
-    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-    QVariantMap returnedData;
-    returnedData"tracks" = tracks;
-    emit info( requestData, returnedData );
-
-    Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria"artist" = origData"artist";
-    criteria"album" = origData"album";
-    emit updateCache( criteria, 0, requestData.type, returnedData );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/musicbrainzPlugin.h Deleted

@@ -1,69 +0,0 @@
-/* === 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
- *   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 MUSICBRAINZPLUGIN_H
-#define MUSICBRAINZPLUGIN_H
-
-#include "infosystem/infosystem.h"
-#include "infosystem/infosystemworker.h"
-
-class QNetworkReply;
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class MusicBrainzPlugin : public InfoPlugin
-{
-    Q_OBJECT
-
-public:
-    MusicBrainzPlugin();
-    virtual ~MusicBrainzPlugin();
-
-protected slots:
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
-    virtual void notInCacheSlot( InfoStringHash criteria, InfoRequestData requestData );
-
-    virtual void pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant data )
-    {
-        Q_UNUSED( caller );
-        Q_UNUSED( type );
-        Q_UNUSED( data );
-    }
-
-
-private slots:
-    void artistSearchSlot();
-    void albumSearchSlot();
-    void tracksSearchSlot();
-
-    void albumFoundSlot();
-    void tracksFoundSlot();
-
-private:
-    bool isValidTrackData( Tomahawk::InfoSystem::InfoRequestData requestData );
-};
-
-}
-
-}
-
-#endif // MUSICBRAINZPLUGIN_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/musixmatchplugin.cpp Deleted

@@ -1,143 +0,0 @@
-/* === 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
- *   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 "musixmatchplugin.h"
-
-#include <QNetworkReply>
-#include <QDomDocument>
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk::InfoSystem;
-
-
-// for internal neatness
-
-MusixMatchPlugin::MusixMatchPlugin()
-    : InfoPlugin()
-    , m_apiKey("61be4ea5aea7dd942d52b2f1311dd9fe")
-{
-    qDebug() << Q_FUNC_INFO;
-    m_supportedGetTypes << Tomahawk::InfoSystem::InfoTrackLyrics;
-}
-
-MusixMatchPlugin::~MusixMatchPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-void
-MusixMatchPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    qDebug() << Q_FUNC_INFO;
-    if( !isValidTrackData( requestData ) || !requestData.input.canConvert< QVariantMap >() || requestData.type != Tomahawk::InfoSystem::InfoTrackLyrics )
-        return;
-    QVariantMap hash = requestData.input.value< QVariantMap >();
-    QString artist = hash"artistName".toString();
-    QString track = hash"trackName".toString();
-    if( artist.isEmpty() || track.isEmpty() )
-    {
-        emit info( requestData, QVariant() );
-        return;
-    }
-    qDebug() << "artist is " << artist << ", track is " << track;
-    QString requestString( "http://api.musixmatch.com/ws/1.1/track.search?format=xml&page_size=1&f_has_lyrics=1" );
-    QUrl url( requestString );
-    url.addQueryItem( "apikey", m_apiKey );
-    url.addQueryItem( "q_artist", artist );
-    url.addQueryItem( "q_track", track );
-    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-
-    connect( reply, SIGNAL( finished() ), SLOT( trackSearchSlot() ) );
-}
-
-bool
-MusixMatchPlugin::isValidTrackData( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( requestData.input.isNull() || !requestData.input.isValid() || !requestData.input.canConvert< QVariantMap >() )
-    {
-        emit info( requestData, QVariant() );
-        qDebug() << "MusixMatchPlugin::isValidTrackData: Data null, invalid, or can't convert";
-        return false;
-    }
-    QVariantMap hash = requestData.input.value< QVariantMap >();
-    if ( hash "trackName" .toString().isEmpty() )
-    {
-        emit info( requestData, QVariant() );
-        qDebug() << "MusixMatchPlugin::isValidTrackData: Track name is empty";
-        return false;
-    }
-    if ( hash "artistName" .toString().isEmpty() )
-    {
-        emit info( requestData, QVariant() );
-        qDebug() << "MusixMatchPlugin::isValidTrackData: No artist name found";
-        return false;
-    }
-    return true;
-}
-
-void
-MusixMatchPlugin::trackSearchSlot()
-{
-    qDebug() << Q_FUNC_INFO;
-    QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
-    if ( !oldReply )
-        return; //timeout will handle it
-
-    QDomDocument doc;
-    doc.setContent(oldReply->readAll());
-    qDebug() << doc.toString();
-    QDomNodeList domNodeList = doc.elementsByTagName("track_id");
-    if ( domNodeList.isEmpty() )
-    {
-        emit info( oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-        return;
-    }
-    QString track_id = domNodeList.at(0).toElement().text();
-    QString requestString( "http://api.musixmatch.com/ws/1.1/track.lyrics.get?track_id=%1&format=xml&apikey=%2" );
-    QUrl url( requestString );
-    url.addQueryItem( "apikey", m_apiKey );
-    url.addQueryItem( "track_id", track_id );
-    QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-    newReply->setProperty( "requestData", oldReply->property( "requestData" ) );
-    connect( newReply, SIGNAL( finished() ), SLOT( trackLyricsSlot() ) );
-}
-
-void
-MusixMatchPlugin::trackLyricsSlot()
-{
-    qDebug() << Q_FUNC_INFO;
-    QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
-    if ( !reply )
-        return; //timeout will handle it
-
-    QDomDocument doc;
-    doc.setContent( reply->readAll() );
-    QDomNodeList domNodeList = doc.elementsByTagName( "lyrics_body" );
-    if ( domNodeList.isEmpty() )
-    {
-        emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
-        return;
-    }
-    QString lyrics = domNodeList.at(0).toElement().text();
-    qDebug() << "Emitting lyrics: " << lyrics;
-    emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant( lyrics ) );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/musixmatchplugin.h Deleted

@@ -1,71 +0,0 @@
-/* === 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
- *   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 MUSIXMATCHPLUGIN_H
-#define MUSIXMATCHPLUGIN_H
-
-#include "infosystem/infosystem.h"
-#include "infosystem/infosystemworker.h"
-
-class QNetworkReply;
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class MusixMatchPlugin : public InfoPlugin
-{
-    Q_OBJECT
-
-public:
-    MusixMatchPlugin();
-    virtual ~MusixMatchPlugin();
-
-public slots:
-    void trackSearchSlot();
-    void trackLyricsSlot();
-
-protected slots:
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
-
-    virtual void pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant data )
-    {
-        Q_UNUSED( caller );
-        Q_UNUSED( type );
-        Q_UNUSED( data );
-    }
-
-virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-    {
-        Q_UNUSED( criteria );
-        Q_UNUSED( requestData );
-    }
-    
-private:
-    bool isValidTrackData( Tomahawk::InfoSystem::InfoRequestData requestData );
-    
-    QString m_apiKey;
-};
-
-}
-
-}
-
-#endif // MUSIXMATCHPLUGIN_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.cpp Deleted

@@ -1,384 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 "spotifyPlugin.h"
-
-#include <QDir>
-#include <QSettings>
-#include <QCryptographicHash>
-#include <QNetworkConfiguration>
-#include <QNetworkReply>
-
-#include "album.h"
-#include "typedefs.h"
-#include "audio/audioengine.h"
-#include "tomahawksettings.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "chartsplugin_data_p.h"
-
-#define SPOTIFY_API_URL "http://spotikea.tomahawk-player.org/"
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-
-using namespace Tomahawk::InfoSystem;
-
-
-SpotifyPlugin::SpotifyPlugin()
-    : InfoPlugin()
-    , m_chartsFetchJobs( 0 )
-{
-    m_supportedGetTypes << InfoChart << InfoChartCapabilities;
-
-}
-
-
-SpotifyPlugin::~SpotifyPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-SpotifyPlugin::dataError( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    emit info( requestData, QVariant() );
-    return;
-}
-
-
-void
-SpotifyPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    qDebug() << Q_FUNC_INFO << requestData.caller;
-    qDebug() << Q_FUNC_INFO << requestData.customData;
-
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-
-    switch ( requestData.type )
-    {
-        case InfoChart:
-            if ( !hash.contains( "chart_source" ) || hash"chart_source" != "spotify" )
-            {
-                dataError( requestData );
-                break;
-            }
-            qDebug() << Q_FUNC_INFO << "InfoCHart req for" << hash"chart_source";
-            fetchChart( requestData );
-            break;
-
-        case InfoChartCapabilities:
-            fetchChartCapabilities( requestData );
-            break;
-
-        default:
-            dataError( requestData );
-    }
-}
-
-
-void
-SpotifyPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-
-    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    /// Each request needs to contain both a id and source
-    if ( !hash.contains( "chart_id" ) && !hash.contains( "chart_source" ) )
-    {
-        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Hash did not contain required params!";
-        dataError( requestData );
-        return;
-    }
-    /// Set the criterias for current chart
-    criteria"chart_id" = hash"chart_id";
-    criteria"chart_source" = hash"chart_source";
-
-    emit getCachedInfo( criteria, 86400000 /* Expire chart cache in 1 day */, requestData );
-}
-
-
-void
-SpotifyPlugin::fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-    {
-        dataError( requestData );
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria "InfoChartCapabilities"  = "spotifyplugin";
-    emit getCachedInfo( criteria, 604800000, requestData );
-}
-
-
-void
-SpotifyPlugin::notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    switch ( requestData.type )
-    {
-        case InfoChart:
-        {
-            /// Fetch the chart, we need source and id
-            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChart not in cache! Fetching...";
-            QUrl url = QUrl( QString( SPOTIFY_API_URL "toplist/%1/" ).arg( criteria"chart_id" ) );
-            qDebug() << Q_FUNC_INFO << "Getting chart url" << url;
-
-            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
-            connect( reply, SIGNAL( finished() ), SLOT( chartReturned() ) );
-            return;
-        }
-        case InfoChartCapabilities:
-        {
-            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChartCapabilities not in cache! Fetching...";
-
-            // we never need to re-fetch
-            if ( !m_allChartsMap.isEmpty() )
-                return;
-
-            /// We need to fetch possible types before they are asked for
-            tDebug() << "SpotifyPlugin: InfoChart fetching possible resources";
-
-            QUrl url = QUrl( QString( SPOTIFY_API_URL "toplist/charts" )  );
-            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-            tDebug() << Q_FUNC_INFO << "fetching:" << url;
-            connect( reply, SIGNAL( finished() ), SLOT( chartTypes() ) );
-            m_chartsFetchJobs++;
-
-            if ( m_chartsFetchJobs > 0 )
-            {
-                qDebug() << Q_FUNC_INFO << "InfoChartCapabilities still fetching!";
-                m_cachedRequests.append( requestData );
-                return;
-            }
-
-            emit info( requestData, m_allChartsMap );
-            return;
-        }
-
-        default:
-        {
-            tLog() << Q_FUNC_INFO << "Couldn't figure out what to do with this type of request after cache miss";
-            emit info( requestData, QVariant() );
-            return;
-        }
-    }
-}
-
-
-void
-SpotifyPlugin::chartTypes()
-{
-    /// Get possible chart type for specificSpotifyPlugin: InfoChart types returned chart source
-    tDebug() << Q_FUNC_INFO << "Got spotifychart type result";
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-
-    if ( reply->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        const QVariantMap res = p.parse( reply, &ok ).toMap();
-        const QVariantMap chartObj = res;
-
-        if ( !ok )
-        {
-            tLog() << Q_FUNC_INFO << "Failed to parse resources" << p.errorString() << "On line" << p.errorLine();
-
-            return;
-        }
-
-        QVariantMap charts;
-        foreach( QVariant geos, chartObj.value( "Charts" ).toList().takeLast().toMap().value( "geo" ).toList() )
-        {
-           const QString geo = geos.toMap().value( "name" ).toString();
-           const QString geoId = geos.toMap().value( "id" ).toString();
-           QString country;
-
-           if( geo == "For me" )
-              continue; /// country = geo; Lets use this later, when we can get the spotify username from tomahawk
-           else if( geo == "Everywhere" )
-               country = geo;
-           else
-           {
-               QLocale l( QString( "en_%1" ).arg( geo ) );
-               country = Tomahawk::CountryUtils::fullCountryFromCode( geo );
-
-               for ( int i = 1; i < country.size(); i++ )
-               {
-                   if ( country.at( i ).isUpper() )
-                   {
-                       country.insert( i, " " );
-                       i++;
-                   }
-               }
-           }
-
-           QList< InfoStringHash > chart_types;
-           foreach( QVariant types, chartObj.value( "Charts" ).toList().takeFirst().toMap().value( "types" ).toList() )
-           {
-               QString type = types.toMap().value( "id" ).toString();
-               QString label = types.toMap().value( "name" ).toString();
-
-               InfoStringHash c;
-               c "id"  = type + "/" + geoId;
-               c "label"  = label;
-               c "type"  = type;
-
-               chart_types.append( c );
-           }
-
-           charts.insert( country.toUtf8(), QVariant::fromValue<QList< InfoStringHash > >( chart_types ) );
-        }
-
-        QVariantMap defaultMap;
-        defaultMap "spotify"  = QStringList() << "United States" << "Top Albums";
-        m_allChartsMap "defaults"  = defaultMap;
-        m_allChartsMap.insert( "Spotify", QVariant::fromValue<QVariantMap>( charts ) );
-    }
-    else
-    {
-        tLog() << Q_FUNC_INFO << "Error fetching charts:" << reply->errorString();
-    }
-
-    m_chartsFetchJobs--;
-    if ( !m_cachedRequests.isEmpty() && m_chartsFetchJobs == 0 )
-    {
-        foreach ( InfoRequestData request, m_cachedRequests )
-        {
-            emit info( request, m_allChartsMap );
-            Tomahawk::InfoSystem::InfoStringHash criteria;
-            criteria "InfoChartCapabilities"  = "spotifyplugin";
-            emit updateCache( criteria,604800000, request.type, m_allChartsMap );
-        }
-        m_cachedRequests.clear();
-    }
-}
-
-
-void
-SpotifyPlugin::chartReturned()
-{
-    /// Chart request returned something! Woho
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
-    QString url = reply->url().toString();
-    QVariantMap returnedData;
-    if ( reply->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        QVariantMap res = p.parse( reply, &ok ).toMap();
-
-        if ( !ok )
-        {
-            tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
-            return;
-        }
-
-        /// SO we have a result, parse it!
-        QList< InfoStringHash > top_tracks;
-        QList< InfoStringHash > top_albums;
-        QStringList top_artists;
-
-        if( url.contains( "albums" ) )
-            setChartType( Album );
-        else if( url.contains( "tracks" ) )
-            setChartType( Track );
-        else if( url.contains( "artists" ) )
-            setChartType( Artist );
-        else
-            setChartType( None );
-
-        foreach( QVariant result, res.value( "toplist" ).toMap().value( "result" ).toList() )
-        {
-            QString title, artist;
-            QVariantMap chartMap = result.toMap();
-
-            if ( !chartMap.isEmpty() )
-            {
-                title = chartMap.value( "title" ).toString();
-                artist = chartMap.value( "artist" ).toString();
-
-                if( chartType() == Track )
-                {
-                    InfoStringHash pair;
-                    pair"artist" = artist;
-                    pair"track" = title;
-                    top_tracks << pair;
-
-                    qDebug() << "SpotifyChart type is track";
-                }
-
-                if( chartType() == Album )
-                {
-                    InfoStringHash pair;
-                    pair"artist" = artist;
-                    pair"album" = title;
-                    top_albums << pair;
-                    qDebug() << "SpotifyChart type is album";
-                }
-
-                if( chartType() == Artist )
-                {
-                    top_artists << chartMap.value( "name" ).toString();
-                    qDebug() << "SpotifyChart type is artist";
-                }
-            }
-        }
-
-        if( chartType() == Track )
-        {
-            tDebug() << "ChartsPlugin:" << "\tgot " << top_tracks.size() << " tracks";
-            returnedData"tracks" = QVariant::fromValue( top_tracks );
-            returnedData"type" = "tracks";
-        }
-
-        if( chartType() == Album )
-        {
-            tDebug() << "ChartsPlugin:" << "\tgot " << top_albums.size() << " albums";
-            returnedData"albums" = QVariant::fromValue( top_albums );
-            returnedData"type" = "albums";
-        }
-
-        if( chartType() == Artist )
-        {
-            tDebug() << "ChartsPlugin:" << "\tgot " << top_artists.size() << " artists";
-            returnedData"artists" = top_artists;
-            returnedData"type" = "artists";
-        }
-
-        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
-
-        emit info( requestData, returnedData );
-
-        // update cache
-        Tomahawk::InfoSystem::InfoStringHash criteria;
-        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-        criteria "chart_id"  = origData "chart_id" ;
-        criteria "chart_source"  = origData "chart_source" ;
-        emit updateCache( criteria, 86400000, requestData.type, returnedData );
-    }
-    else
-        qDebug() << "Network error in fetching chart:" << reply->url().toString();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/generic/spotifyPlugin.h Deleted

@@ -1,83 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 SpotifyPlugin_H
-#define SpotifyPlugin_H
-
-#include "infosystem/infosystem.h"
-#include "infosystem/infosystemworker.h"
-#include <QNetworkReply>
-#include <QObject>
-
-class QNetworkReply;
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class SpotifyPlugin : public InfoPlugin
-{
-    Q_OBJECT
-
-public:
-    SpotifyPlugin();
-    virtual ~SpotifyPlugin();
-
-    enum ChartType {
-        None =      0x00,
-        Track =     0x01,
-        Album =     0x02,
-        Artist =    0x04
-
-    };
- void setChartType( ChartType type ) { m_chartType = type; }
- ChartType chartType() const { return m_chartType; }
-
-public slots:
-    void chartReturned();
-    void chartTypes();
-
-protected slots:
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
-    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
-    virtual void pushInfo( const QString caller, const Tomahawk::InfoSystem::InfoType type, const QVariant input )
-    {
-        Q_UNUSED( caller )
-        Q_UNUSED( type)
-        Q_UNUSED( input )
-    }
-
-private:
-    void fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void dataError( Tomahawk::InfoSystem::InfoRequestData requestData );
-
-
-    ChartType m_chartType;
-    QVariantMap m_allChartsMap;
-    uint m_chartsFetchJobs;
-    QList< InfoRequestData > m_cachedRequests;
-};
-
-}
-
-}
-
-#endif // SpotifyPlugin_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/mac Deleted

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/mac/adium.h Deleted

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/mac/adium.mm Deleted

@@ -1,31 +0,0 @@
-/* === 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
- *   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/>.
- */
-
-#import <Foundation/Foundation.h>
-#import <ScriptingBridge/ScriptingBridge.h>
-#import "adium.h"
-
-void
-script( const char* status )
-{
-    NSString *stat = NSString stringWithUTF8String:status;
-    NSAppleScript *appleScript = NSAppleScript alloc initWithSource:stat;
-    NSDictionary *errorDictionary;
-    NSAppleEventDescriptor *eventDescriptor = appleScript executeAndReturnError:&errorDictionary;
-    appleScript release;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/mac/adiumplugin.cpp Deleted

@@ -1,227 +0,0 @@
-/* === 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
- *   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 <string.h>
-
-#include <QTimer>
-
-#include "infosystem/infosystemworker.h"
-#include "artist.h"
-#include "result.h"
-#include "tomahawksettings.h"
-#include "globalactionmanager.h"
-#include "utils/logger.h"
-
-#include "adiumplugin.h"
-#include "adium.h"
-
-QString adium_beforeStatus;
-QString adium_afterStatus;
-
-static void setStatus(const QString &status)
-{
-    // The command that updates the status
-    QString scriptqstr;
-    scriptqstr.append(adium_beforeStatus);
-    scriptqstr.append(status);
-    scriptqstr.append(adium_afterStatus);
-
-    const char* scriptstr = scriptqstr.toUtf8();
-    script( scriptstr );
-}
-
-using namespace Tomahawk::InfoSystem;
-
-AdiumPlugin::AdiumPlugin()
-    : InfoPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    adium_beforeStatus = "if appIsRunning(\"Adium\") then\n";
-    adium_beforeStatus.append("tell application \"Adium\"\n");
-    adium_beforeStatus.append("set the status message of every account to \"");
-
-    adium_afterStatus.append("\"\nend tell\n");
-    adium_afterStatus.append("end if\n");
-    adium_afterStatus.append("on appIsRunning(appName)\n");
-    adium_afterStatus.append("tell application \"System Events\" to (name of processes) contains appName\n");
-    adium_afterStatus.append("end appIsRunning\n");
-
-    m_supportedPushTypes << InfoNowPlaying << InfoNowPaused << InfoNowResumed << InfoNowStopped;
-
-    m_active = TomahawkSettings::instance()->nowPlayingEnabled();
-
-    connect( TomahawkSettings::instance(), SIGNAL( changed() ),
-                                             SLOT( settingsChanged() ), Qt::QueuedConnection );
-
-    m_pauseTimer = new QTimer( this );
-    m_pauseTimer->setSingleShot( true );
-    connect( m_pauseTimer, SIGNAL( timeout() ),
-             this, SLOT( clearStatus() ) );
-
-    connect( GlobalActionManager::instance(), SIGNAL( shortLinkReady( QUrl, QUrl ) ),
-             SLOT( shortLinkReady( QUrl, QUrl ) ) );
-}
-
-
-AdiumPlugin::~AdiumPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-    if( m_active )
-      setStatus( "" );
-}
-
-void
-AdiumPlugin::shortLinkReady( QUrl longUrl, QUrl shortUrl )
-{
-    // The URL we received is either from a previous track, or not requested by us
-    if( longUrl != m_currentLongUrl )
-        return;
-
-    // Build the core of the now-playing string
-    QString nowPlaying = "";
-    nowPlaying.append( m_currentArtist );
-    nowPlaying.append(" - ");
-    nowPlaying.append( m_currentTitle );
-    nowPlaying.replace( "\"", "\\\"" );  // Escape quotes, or Applescript gets confused
-
-    // We failed to get the short URL, just update the status with the metadata
-    if( ( longUrl.toString() == "" ) )
-    {
-        setStatus( nowPlaying );
-        return;
-    }
-
-    // Add the short URL
-    nowPlaying.append( " " );
-    nowPlaying.append( shortUrl.toEncoded() );
-    setStatus( nowPlaying );
-
-}
-
-void
-AdiumPlugin::clearStatus()
-{
-    qDebug() << Q_FUNC_INFO;
-    setStatus( "" );
-}
-
-
-void
-AdiumPlugin::settingsChanged()
-{
-    m_active = TomahawkSettings::instance()->nowPlayingEnabled();
-}
-
-
-void
-AdiumPlugin::pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if( !m_active )
-        return;
-
-    switch ( type )
-    {
-        case InfoNowPlaying:
-          audioStarted( input );
-          break;
-        case InfoNowPaused:
-          audioPaused();
-          return;
-        case InfoNowResumed:
-          audioResumed( input );
-          break;
-        case InfoNowStopped:
-          audioStopped();
-          break;
-
-        default:
-          return;
-    }
-
-    // Stop the pause timer always, unless pausing of course
-    m_pauseTimer->stop();
-}
-
-
-/** Audio state slots */
-void
-AdiumPlugin::audioStarted( const QVariant &input )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( !input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-        return;
-
-    InfoStringHash hash = input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    if ( !hash.contains( "title" ) || !hash.contains( "artist" ) )
-        return;
-
-    m_currentTitle = hash"title";
-    m_currentArtist = hash"artist";
-
-    // Request a short URL
-    m_currentLongUrl = openLinkFromHash( hash );
-    GlobalActionManager::instance()->shortenLink( m_currentLongUrl );
-}
-
-QUrl
-AdiumPlugin::openLinkFromHash( const Tomahawk::InfoSystem::InfoStringHash& hash ) const
-{
-    QString title, artist, album;
-
-    if( !hash.isEmpty() && hash.contains( "title" ) && hash.contains( "artist" ) )
-    {
-        title = hash"title";
-        artist = hash"artist";
-        if( hash.contains( "album" ) )
-            album = hash"album";
-    }
-
-    return GlobalActionManager::instance()->openLink( title, artist, album );
-}
-
-void
-AdiumPlugin::audioFinished( const QVariant &input )
-{
-    //qDebug() << Q_FUNC_INFO;
-}
-
-void
-AdiumPlugin::audioStopped()
-{
-    qDebug() << Q_FUNC_INFO;
-    setStatus( "" );
-}
-
-void
-AdiumPlugin::audioPaused()
-{
-    qDebug() << Q_FUNC_INFO;
-    m_pauseTimer->start( 60 * 1000 );
-}
-
-void
-AdiumPlugin::audioResumed( const QVariant &input )
-{
-    qDebug() << Q_FUNC_INFO;
-    audioStarted( input );
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/mac/adiumplugin.h Deleted

@@ -1,91 +0,0 @@
-/* === 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
- *   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 ADIUMPLUGIN_H
-#define ADIUMPLUGIN_H
-
-#include "infosystem/infosystem.h"
-
-#include <QNetworkAccessManager>
-#include <QObject>
-#include <QVariant>
-#include <QWeakPointer>
-
-class QTimer;
-
-namespace Tomahawk {
-
-namespace InfoSystem {
-
-class AdiumPlugin : public InfoPlugin
-{
-    Q_OBJECT
-
-public:
-    AdiumPlugin();
-    virtual ~AdiumPlugin();
-
-protected slots:
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-    {
-        Q_UNUSED( requestData );
-    }
-    
-    void pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input );
-
-public slots:
-    virtual void notInCacheSlot( const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-    {
-        Q_UNUSED( criteria );
-        Q_UNUSED( requestData );
-    }
-
-private slots:
-    void shortLinkReady( QUrl longUrl, QUrl shortUrl );
-
-    void clearStatus();
-    void settingsChanged();
-
-private:
-    void audioStarted( const QVariant &input );
-    void audioFinished( const QVariant &input );
-    void audioStopped();
-    void audioPaused();
-    void audioResumed( const QVariant &input );
-
-    QUrl openLinkFromHash( const InfoStringHash& hash ) const;
-
-    bool m_active;
-    QString m_beforeStatus;
-    QString m_afterStatus;
-
-    QString m_currentTitle;
-    QString m_currentArtist;
-    QUrl m_currentLongUrl;
-
-    QTimer* m_pauseTimer;
-    QWeakPointer<QNetworkAccessManager> m_nam;
-
-};
-
-
-}
-
-}
-
-#endif // ADIUMPLUGIN_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix Deleted

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.cpp Deleted

@@ -1,99 +0,0 @@
-/* === 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
- *   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/>.
- */
-
-// Marked portions of this file are subject to the following copyright:
-/*
- * Copyright (C) 2009 by Aurélien Gâteau <aurelien.gateau@canonical.com>
- *
- * This program 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 2, or (at your option)
- * any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- */
-
-#include "fdonotifyplugin.h"
-#include "utils/tomahawkutils.h"
-#include "imageconverter.h"
-
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
-#include <QtGui/QImage>
-
-#include "utils/logger.h"
-
-using namespace Tomahawk::InfoSystem;
-
-
-FdoNotifyPlugin::FdoNotifyPlugin()
-    : InfoPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-    m_supportedPushTypes << Tomahawk::InfoSystem::InfoNotifyUser;
-}
-
-FdoNotifyPlugin::~FdoNotifyPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-void
-FdoNotifyPlugin::pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant pushData )
-{
-    Q_UNUSED( caller );
-    qDebug() << Q_FUNC_INFO;
-    if ( type != Tomahawk::InfoSystem::InfoNotifyUser || !pushData.canConvert< QVariantMap >() )
-    {
-        qDebug() << Q_FUNC_INFO << " not the right type or could not convert the hash";
-        return;
-    }
-    QVariantMap hash = pushData.value< QVariantMap >();
-    if ( !hash.contains( "message" ) )
-    {
-        qDebug() << Q_FUNC_INFO << " hash did not contain a message";
-        return;
-    }
-
-    QDBusMessage message = QDBusMessage::createMethodCall( "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications", "Notify" );
-    QList<QVariant> arguments;
-    arguments << QString( "Tomahawk" ); //app_name
-    arguments << quint32( 0 ); //notification_id
-    arguments << QString(); //app_icon
-    arguments << QString( "Tomahawk" ); //summary
-    arguments << hash "message" .toString(); //body
-    arguments << QStringList(); //actions
-    QVariantMap dict;
-    dict"desktop-entry" = QString( "tomahawk" );
-    if ( hash.contains( "image" ) && hash "image" .canConvert< QImage >() )
-        dict "image_data"  = ImageConverter::variantForImage( hash "image" .value< QImage >() );
-    else
-        dict "image_data"  = ImageConverter::variantForImage( QImage( RESPATH "icons/tomahawk-icon-128x128.png" ) );
-    arguments << dict; //hints
-    arguments << qint32( -1 ); //expire_timeout
-    message.setArguments( arguments );
-    QDBusConnection::sessionBus().send( message );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix/fdonotifyplugin.h Deleted

@@ -1,57 +0,0 @@
-/* === 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
- *   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 FDONOTIFYPLUGIN_H
-#define FDONOTIFYPLUGIN_H
-
-#include "infosystem/infosystem.h"
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class FdoNotifyPlugin : public InfoPlugin
-{
-    Q_OBJECT
-
-public:
-    FdoNotifyPlugin();
-    virtual ~FdoNotifyPlugin();
-
-protected slots:
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-    {
-        Q_UNUSED( requestData );
-    }
-
-    virtual void pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant pushData );
-
-    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-    {
-        Q_UNUSED( criteria );
-        Q_UNUSED( requestData );
-    }
-};
-
-}
-
-}
-
-#endif // FDONOTIFYPLUGIN_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix/imageconverter.cpp Deleted

@@ -1,109 +0,0 @@
-/*
-   Copyright (C) 2009 by Aurélien Gâteau <aurelien.gateau@canonical.com>
-
-   This program 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 2, or (at your option)
-   any later version.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
- */
-#include "imageconverter.h"
-
-#include <QtDBus/QDBusArgument>
-#include <QtDBus/QDBusMetaType>
-#include <QtGui/QImage>
-
-#include "utils/logger.h"
-
-namespace ImageConverter
-{
-
-/**
- * A structure representing an image which can be marshalled to fit the
- * notification spec.
- */
-struct SpecImage
-{
-	int width, height, rowStride;
-	bool hasAlpha;
-	int bitsPerSample, channels;
-	QByteArray data;
-};
-
-QDBusArgument &operator<<(QDBusArgument &argument, const SpecImage &image)
-{
-	argument.beginStructure();
-	argument << image.width << image.height << image.rowStride << image.hasAlpha;
-	argument << image.bitsPerSample << image.channels << image.data;
-	argument.endStructure();
-	return argument;
-}
-
-const QDBusArgument &operator>>(const QDBusArgument &argument, SpecImage &image)
-{
-	argument.beginStructure();
-	argument >> image.width >> image.height >> image.rowStride >> image.hasAlpha;
-	argument >> image.bitsPerSample >> image.channels >> image.data;
-	argument.endStructure();
-	return argument;
-}
-
-} // namespace
-
-// This must be before the QVariant::fromValue below (#211726)
-Q_DECLARE_METATYPE(ImageConverter::SpecImage)
-
-namespace ImageConverter
-{
-QVariant variantForImage(const QImage &_image)
-{
-	qDBusRegisterMetaType<SpecImage>();
-
-	QImage image = _image.convertToFormat(QImage::Format_ARGB32);
-
-	int rowStride = image.width() * 4;
-
-	// Notification spec stores pixels in R,G,B,A order, regardless of
-	// endianess
-	// Qt represents pixels as 32 bit unsigned int. So the order depend on
-	// endianess:
-	// - In big endian the order is A,R,G,B
-	// - In little endian the order is B,G,R,A
-	QByteArray data;
-	data.resize(rowStride * image.height());
-	char* dst = data.data();
-	for (int y=0; y<image.height(); ++y) {
-		QRgb* src = (QRgb*)image.scanLine(y);
-		QRgb* end = src + image.width();
-		for (;src != end; ++src) {
-			// Probably slow, but free of endianess issues
-			*dst++ = qRed(*src);
-			*dst++ = qGreen(*src);
-			*dst++ = qBlue(*src);
-			*dst++ = qAlpha(*src);
-		}
-	}
-
-	SpecImage specImage;
-	specImage.width = image.width();
-	specImage.height = image.height();
-	specImage.rowStride = rowStride;
-	specImage.hasAlpha = true;
-	specImage.bitsPerSample = 8;
-	specImage.channels = 4;
-	specImage.data = data;
-
-	return QVariant::fromValue(specImage);
-}
-
-} // namespace
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix/imageconverter.h Deleted

@@ -1,36 +0,0 @@
-/*
-   Copyright (C) 2009 by Aurélien Gâteau <aurelien.gateau@canonical.com>
-
-   This program 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 2, or (at your option)
-   any later version.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
- */
-#ifndef IMAGECONVERTER_H
-#define IMAGECONVERTER_H
-
-class QVariant;
-class QImage;
-
-namespace ImageConverter
-{
-
-/**
- * Returns a variant representing an image using the format describe in the
- * galago spec
- */
-QVariant variantForImage(const QImage &image);
-
-} // namespace
-
-#endif /* IMAGECONVERTER_H */

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.cpp Deleted

@@ -1,687 +0,0 @@
-/* === 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
- *   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 <QApplication>
-#include <QImage>
-#include <QtDBus/QtDBus>
-
-#include "audio/audioengine.h"
-#include "infosystem/infosystemworker.h"
-#include "album.h"
-#include "artist.h"
-#include "result.h"
-#include "tomahawksettings.h"
-#include "globalactionmanager.h"
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-
-#include "mprisplugin.h"
-#include "mprispluginrootadaptor.h"
-#include "mprispluginplayeradaptor.h"
-
-using namespace Tomahawk::InfoSystem;
-
-static QString s_mpInfoIdentifier = QString( "MPRISPLUGIN" );
-
-MprisPlugin::MprisPlugin()
-    : InfoPlugin()
-    , m_coverTempFile( 0 )
-{
-    // init
-    m_playbackStatus = "Stopped";
-
-    // Types of pushInfo we care about
-    m_supportedPushTypes << InfoNowPlaying << InfoNowPaused << InfoNowResumed << InfoNowStopped;
-
-    // DBus connection
-    new MprisPluginRootAdaptor( this );
-    new MprisPluginPlayerAdaptor( this );
-    QDBusConnection dbus = QDBusConnection::sessionBus();
-    dbus.registerObject( "/org/mpris/MediaPlayer2", this );
-    dbus.registerService( "org.mpris.MediaPlayer2.tomahawk" );
-
-    // Listen to volume changes
-    connect( AudioEngine::instance(), SIGNAL( volumeChanged( int ) ),
-                                        SLOT( onVolumeChanged( int ) ) );
-
-    // When the playlist changes, signals for several properties are sent
-    connect( AudioEngine::instance(), SIGNAL( playlistChanged( Tomahawk::playlistinterface_ptr ) ),
-                                        SLOT( onPlaylistChanged( Tomahawk::playlistinterface_ptr ) ) );
-
-    // When a track is added or removed, CanGoNext updated signal is sent
-    Tomahawk::playlistinterface_ptr playlist = AudioEngine::instance()->playlist();
-    if ( !playlist.isNull() )
-    {
-        connect( playlist.data(), SIGNAL( trackCountChanged( unsigned int ) ),
-                                    SLOT( onTrackCountChanged( unsigned int ) ) );
-    }
-
-    // Connect to AudioEngine's seeked signal
-    connect( AudioEngine::instance(), SIGNAL( seeked( qint64 ) ),
-                                        SLOT( onSeeked( qint64 ) ) );
-
-    // Connect to the InfoSystem (we need to get album covers via getInfo)
-
-    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 ) ) );
-}
-
-
-MprisPlugin::~MprisPlugin()
-{
-    delete m_coverTempFile;
-}
-
-
-// org.mpris.MediaPlayer2
-
-bool
-MprisPlugin::canQuit() const
-{
-    return true;
-}
-
-
-bool
-MprisPlugin::canRaise() const
-{
-    return false;
-}
-
-
-bool
-MprisPlugin::hasTrackList() const
-{
-    return false;
-}
-
-
-QString
-MprisPlugin::identity() const
-{
-    return QString( "Tomahawk" );
-}
-
-
-QString
-MprisPlugin::desktopEntry() const
-{
-    return QString( "tomahawk" );
-}
-
-
-QStringList
-MprisPlugin::supportedUriSchemes() const
-{
-    QStringList uriSchemes;
-    uriSchemes << "tomahawk" << "spotify";
-    return uriSchemes;
-}
-
-
-QStringList
-MprisPlugin::supportedMimeTypes() const
-{
-    return QStringList();
-}
-
-
-void
-MprisPlugin::Raise()
-{
-}
-
-
-void
-MprisPlugin::Quit()
-{
-    QApplication::quit();
-}
-
-
-// org.mpris.MediaPlayer2.Player
-
-bool
-MprisPlugin::canControl() const
-{
-    return true;
-}
-
-
-bool
-MprisPlugin::canGoNext() const
-{
-    return AudioEngine::instance()->canGoNext();
-}
-
-
-bool
-MprisPlugin::canGoPrevious() const
-{
-    return AudioEngine::instance()->canGoPrevious();
-}
-
-
-bool
-MprisPlugin::canPause() const
-{
-    return AudioEngine::instance()->currentTrack();
-}
-
-
-bool
-MprisPlugin::canPlay() const
-{
-    // If there is a currently playing track, or if there is a playlist with at least 1 track, you can hit play
-    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
-    return AudioEngine::instance()->currentTrack() || ( !p.isNull() && p->trackCount() );
-}
-
-
-bool
-MprisPlugin::canSeek() const
-{
-    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
-    if ( p.isNull() )
-        return false;
-    return p->seekRestrictions() != PlaylistInterface::NoSeek;
-
-}
-
-
-QString
-MprisPlugin::loopStatus() const
-{
-    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
-    if ( p.isNull() )
-        return "None";
-    PlaylistInterface::RepeatMode mode = p->repeatMode();
-    switch( mode )
-    {
-        case PlaylistInterface::RepeatOne:
-            return "Track";
-            break;
-        case PlaylistInterface::RepeatAll:
-            return "Playlist";
-            break;
-        case PlaylistInterface::NoRepeat:
-            return "None";
-            break;
-        default:
-            return "None";
-            break;
-    }
-
-    return QString( "None" );
-}
-
-
-void
-MprisPlugin::setLoopStatus( const QString& value )
-{
-    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
-    if ( p.isNull() )
-        return;
-    if ( value == "Track" )
-        p->setRepeatMode( PlaylistInterface::RepeatOne );
-    else if ( value == "Playlist" )
-        p->setRepeatMode( PlaylistInterface::RepeatAll );
-    else if ( value == "None" )
-        p->setRepeatMode( PlaylistInterface::NoRepeat );
-}
-
-
-double
-MprisPlugin::maximumRate() const
-{
-    return 1.0;
-}
-
-
-QVariantMap
-MprisPlugin::metadata() const
-{
-    QVariantMap metadataMap;
-    Tomahawk::result_ptr track = AudioEngine::instance()->currentTrack();
-    if ( track )
-    {
-        metadataMap.insert( "mpris:trackid", QString( "/track/" ) + track->id().replace( "-", "" ) );
-        metadataMap.insert( "mpris:length", track->duration() );
-        metadataMap.insert( "xesam:album", track->album()->name() );
-        metadataMap.insert( "xesam:artist", track->artist()->name() );
-        metadataMap.insert( "xesam:title", track->track() );
-
-        // Only return art if tempfile exists, and if its name contains the same "artist_album_tomahawk_cover.png"
-        if ( m_coverTempFile && m_coverTempFile->exists() &&
-             m_coverTempFile->fileName().contains( track->artist()->name() + "_" + track->album()->name() + "_tomahawk_cover.png" ) )
-        {
-            metadataMap.insert( "mpris:artUrl", QString( QUrl::fromLocalFile( QFileInfo( *m_coverTempFile ).absoluteFilePath() ).toEncoded() ) );
-        }
-        else
-        {
-            // Need to fetch the album cover
-
-            Tomahawk::InfoSystem::InfoStringHash trackInfo;
-            trackInfo"artist" = track->artist()->name();
-            trackInfo"album" = track->album()->name();
-
-            Tomahawk::InfoSystem::InfoRequestData requestData;
-            requestData.caller = s_mpInfoIdentifier;
-            requestData.type = Tomahawk::InfoSystem::InfoAlbumCoverArt;
-            requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
-            requestData.customData = QVariantMap();
-
-            Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-        }
-    }
-
-    return metadataMap;
-}
-
-
-double
-MprisPlugin::minimumRate() const
-{
-    return 1.0;
-}
-
-
-QString
-MprisPlugin::playbackStatus() const
-{
-    return m_playbackStatus;
-}
-
-
-qlonglong
-MprisPlugin::position() const
-{
-    // Convert Tomahawk's milliseconds to microseconds
-    return (qlonglong) ( AudioEngine::instance()->currentTime() * 1000 );
-}
-
-
-double
-MprisPlugin::rate() const
-{
-    return 1.0;
-}
-
-
-void
-MprisPlugin::setRate( double value )
-{
-    Q_UNUSED( value );
-}
-
-
-bool
-MprisPlugin::shuffle() const
-{
-    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
-    if ( p.isNull() )
-        return false;
-    return p->shuffled();
-}
-
-
-void
-MprisPlugin::setShuffle( bool value )
-{
-    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
-    if ( p.isNull() )
-        return;
-    return p->setShuffled( value );
-}
-
-
-double
-MprisPlugin::volume() const
-{
-    return AudioEngine::instance()->volume();
-}
-
-
-void
-MprisPlugin::setVolume( double value )
-{
-    AudioEngine::instance()->setVolume( value );
-}
-
-
-void
-MprisPlugin::Next()
-{
-    AudioEngine::instance()->next();
-}
-
-
-void
-MprisPlugin::OpenUri( const QString& Uri )
-{
-    if ( Uri.contains( "tomahawk://" ) )
-        GlobalActionManager::instance()->parseTomahawkLink( Uri );
-    else if ( Uri.contains( "spotify:" ) )
-        GlobalActionManager::instance()->openSpotifyLink( Uri );
-}
-
-
-void
-MprisPlugin::Pause()
-{
-    AudioEngine::instance()->pause();
-}
-
-
-void
-MprisPlugin::Play()
-{
-    AudioEngine::instance()->play();
-}
-
-
-void
-MprisPlugin::PlayPause()
-{
-    AudioEngine::instance()->playPause();
-}
-
-
-void
-MprisPlugin::Previous()
-{
-    AudioEngine::instance()->previous();
-}
-
-
-void
-MprisPlugin::Seek( qlonglong Offset )
-{
-    if ( !canSeek() )
-        return;
-
-    qlonglong seekTime = position() + Offset;
-    if ( seekTime < 0 )
-        AudioEngine::instance()->seek( 0 );
-    else if ( seekTime > AudioEngine::instance()->currentTrackTotalTime()*1000 )
-        Next();
-    // seekTime is in microseconds, but we work internally in milliseconds
-    else
-        AudioEngine::instance()->seek( (qint64) ( seekTime / 1000 ) );
-
-}
-
-
-void
-MprisPlugin::SetPosition( const QDBusObjectPath& TrackId, qlonglong Position )
-{
-    if ( !canSeek() )
-        return;
-
-    if ( TrackId.path() != QString( "/track/" ) + AudioEngine::instance()->currentTrack()->id().replace( "-", "" ) )
-        return;
-
-    if ( ( Position < 0) || ( Position > AudioEngine::instance()->currentTrackTotalTime()*1000 )  )
-        return;
-
-    AudioEngine::instance()->seek( (qint64) (Position / 1000 ) );
-
-}
-
-
-void
-MprisPlugin::Stop()
-{
-    AudioEngine::instance()->stop();
-}
-
-
-// InfoPlugin Methods
-
-void
-MprisPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-  Q_UNUSED( requestData );
-
-  return;
-}
-
-
-void
-MprisPlugin::pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input )
-{
-    Q_UNUSED( caller );
-    bool isPlayingInfo = false;
-
-    switch ( type )
-    {
-        case InfoNowPlaying:
-          isPlayingInfo = true;
-          audioStarted( input );
-          break;
-        case InfoNowPaused:
-          isPlayingInfo = true;
-          audioPaused();
-          break;
-        case InfoNowResumed:
-          isPlayingInfo = true;
-          audioResumed( input );
-          break;
-        case InfoNowStopped:
-          isPlayingInfo = true;
-          audioStopped();
-          break;
-
-        default:
-          break;
-    }
-
-    if ( isPlayingInfo )
-        notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "PlaybackStatus" );
-}
-
-
-void
-MprisPlugin::stateChanged( AudioState newState, AudioState oldState )
-{
-    Q_UNUSED( newState );
-    Q_UNUSED( oldState );
-}
-
-
-/** Audio state slots */
-void
-MprisPlugin::audioStarted( const QVariant& input )
-{
-    if ( !input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-        return;
-
-    InfoStringHash hash = input.value< Tomahawk::InfoSystem::InfoStringHash >();
-    if ( !hash.contains( "title" ) || !hash.contains( "artist" ) || !hash.contains( "album" ) )
-        return;
-
-    m_playbackStatus = "Playing";
-    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "Metadata" );
-}
-
-
-void
-MprisPlugin::audioFinished( const QVariant& input )
-{
-    Q_UNUSED( input );
-}
-
-
-void
-MprisPlugin::audioStopped()
-{
-    m_playbackStatus = "Stopped";
-}
-
-
-void
-MprisPlugin::audioPaused()
-{
-    m_playbackStatus = "Paused";
-}
-
-
-void
-MprisPlugin::audioResumed( const QVariant& input )
-{
-    audioStarted( input );
-}
-
-
-void
-MprisPlugin::onVolumeChanged( int volume )
-{
-    Q_UNUSED( volume );
-    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "Volume" );
-}
-
-
-void
-MprisPlugin::onPlaylistChanged( Tomahawk::playlistinterface_ptr playlist )
-{
-    disconnect( this, SLOT( onTrackCountChanged( unsigned int ) ) );
-
-    if ( !playlist.isNull() )
-        connect( playlist.data(), SIGNAL( trackCountChanged( unsigned int ) ),
-            SLOT( onTrackCountChanged( unsigned int ) ) );
-
-    // Notify relevant changes
-    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "LoopStatus" );
-    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "Shuffle" );
-    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanSeek" );
-    onTrackCountChanged( 0 );
-}
-
-
-void
-MprisPlugin::onTrackCountChanged( unsigned int tracks )
-{
-    Q_UNUSED( tracks );
-    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanGoNext" );
-    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanGoPrevious" );
-
-}
-
-
-void
-MprisPlugin::onSeeked( qint64 ms )
-{
-    qlonglong us = (qlonglong) ( ms*1000 );
-    emit Seeked( us );
-}
-
-
-void
-MprisPlugin::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
-{
-    // If the caller for the request was not us, or not the type of info we are seeking, ignore it
-    if ( requestData.caller != s_mpInfoIdentifier || requestData.type != Tomahawk::InfoSystem::InfoAlbumCoverArt )
-    {
-        //notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "Metadata" );
-        return;
-    }
-
-    if ( !output.canConvert< QVariantMap >() )
-    {
-        //notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "Metadata" );
-        tDebug( LOGINFO ) << "Cannot convert fetched art from a QByteArray";
-        return;
-    }
-
-    // Pull image data into byte array
-    QVariantMap returnedData = output.value< QVariantMap >();
-    const QByteArray ba = returnedData"imgbytes".toByteArray();
-    if ( ba.length() )
-    {
-        // Load from byte array to image
-        QImage image;
-        image.loadFromData( ba );
-
-        // Pull out request data for album+artist
-        if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
-        {
-            qDebug() << "Cannot convert metadata input to album cover retrieval";
-            return;
-        }
-
-        Tomahawk::InfoSystem::InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
-
-        // delete the old tempfile and make new one, to avoid caching of filename by mpris clients
-        if ( m_coverTempFile )
-        {
-            delete m_coverTempFile;
-            m_coverTempFile = 0;
-        }
-
-        if ( image.isNull() )
-            return;
-
-        m_coverTempFile = new QTemporaryFile( QDir::toNativeSeparators( QDir::tempPath() + "/" + hash"artist" + "_" + hash"album" + "_tomahawk_cover.png" ) );
-        if ( !m_coverTempFile->open() )
-        {
-            qDebug() << "WARNING: could not write temporary file for cover art!";
-        }
-
-        // Finally, save the image to the new temp file
-        if ( image.save( m_coverTempFile, "PNG" ) )
-        {
-            qDebug() << "Saving cover image to:" << QFileInfo( *m_coverTempFile ).absoluteFilePath();
-            m_coverTempFile->close();
-            notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "Metadata" );
-        }
-        else
-        {
-            tDebug() << Q_FUNC_INFO << "failed to save cover image!";
-            m_coverTempFile->close();
-        }
-    }
-}
-
-
-void
-MprisPlugin::infoSystemFinished( QString target )
-{
-    Q_UNUSED( target );
-}
-
-
-void
-MprisPlugin::notifyPropertyChanged( const QString& interface, const QString& propertyName )
-{
-    QDBusMessage signal = QDBusMessage::createSignal(
-        "/org/mpris/MediaPlayer2",
-        "org.freedesktop.DBus.Properties",
-        "PropertiesChanged" );
-    signal << interface;
-    QVariantMap changedProps;
-    changedProps.insert(propertyName, property(propertyName.toAscii()));
-    signal << changedProps;
-    signal << QStringList();
-    QDBusConnection::sessionBus().send(signal);
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix/mprisplugin.h Deleted

@@ -1,178 +0,0 @@
-/* === 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
- *   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 MPRISPLUGIN_H
-#define MPRISPLUGIN_H
-
-#include "audio/audioengine.h"
-#include "infosystem/infosystem.h"
-
-#include <QObject>
-#include <QVariant>
-#include <QtDBus/QtDBus>
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class MprisPlugin : public InfoPlugin
-{
-    Q_OBJECT
-
-public:
-    MprisPlugin();
-    virtual ~MprisPlugin();
-
-    // MPRIS DBus Methods
-
-    // org.mpris.MediaPlayer2
-
-    Q_PROPERTY( bool CanQuit READ canQuit )
-    bool canQuit() const;
-
-    Q_PROPERTY( bool CanRaise READ canRaise )
-    bool canRaise() const;
-
-    Q_PROPERTY( QString DesktopEntry READ desktopEntry )
-    QString desktopEntry() const;
-
-    Q_PROPERTY( bool HasTrackList READ hasTrackList )
-    bool hasTrackList() const;
-
-    Q_PROPERTY( QString Identity READ identity )
-    QString identity() const;
-
-    Q_PROPERTY( QStringList SupportedMimeTypes READ supportedMimeTypes )
-    QStringList supportedMimeTypes() const;
-
-    Q_PROPERTY( QStringList SupportedUriSchemes READ supportedUriSchemes )
-    QStringList supportedUriSchemes() const;
-
-    // org.mpris.MediaPlayer2.Player
-
-    Q_PROPERTY( bool CanControl READ canControl )
-    bool canControl() const;
-
-    Q_PROPERTY( bool CanGoNext READ canGoNext )
-    bool canGoNext() const;
-
-    Q_PROPERTY( bool CanGoPrevious READ canGoPrevious )
-    bool canGoPrevious() const;
-
-    Q_PROPERTY( bool CanPause READ canPause )
-    bool canPause() const;
-
-    Q_PROPERTY( bool CanPlay READ canPlay )
-    bool canPlay() const;
-
-    Q_PROPERTY( bool CanSeek READ canSeek )
-    bool canSeek() const;
-
-    Q_PROPERTY( QString LoopStatus READ loopStatus WRITE setLoopStatus )
-    QString loopStatus() const;
-    void setLoopStatus( const QString& value );
-
-    Q_PROPERTY( double MaximumRate READ maximumRate )
-    double maximumRate() const;
-
-    Q_PROPERTY( QVariantMap Metadata READ metadata )
-    QVariantMap metadata() const;
-
-    Q_PROPERTY( double MinimumRate READ minimumRate )
-    double minimumRate() const;
-
-    Q_PROPERTY( QString PlaybackStatus READ playbackStatus )
-    QString playbackStatus() const;
-
-    Q_PROPERTY( qlonglong Position READ position )
-    qlonglong position() const;
-
-    Q_PROPERTY( double Rate READ rate WRITE setRate )
-    double rate() const;
-    void setRate( double value );
-
-    Q_PROPERTY( bool Shuffle READ shuffle WRITE setShuffle )
-    bool shuffle() const;
-    void setShuffle( bool value );
-
-    Q_PROPERTY( double Volume READ volume WRITE setVolume )
-    double volume() const;
-    void setVolume( double value );
-
-public slots:
-    virtual void notInCacheSlot( const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-    {
-        Q_UNUSED( criteria );
-        Q_UNUSED( requestData );
-    }
-
-    // org.mpris.MediaPlayer2
-    void Raise();
-    void Quit();
-
-    // org.mpris.MediaPlayer2.Player
-    void Next();
-    void OpenUri( const QString& Uri );
-    void Pause();
-    void Play();
-    void PlayPause();
-    void Previous();
-    void Seek( qlonglong Offset );
-    void SetPosition( const QDBusObjectPath& TrackId, qlonglong Position );
-    void Stop();
-
-protected slots:
-    void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input );
-
-private slots:
-    void stateChanged( AudioState newState, AudioState oldState );
-    void onVolumeChanged( int volume );
-    void onPlaylistChanged( Tomahawk::playlistinterface_ptr );
-    void onTrackCountChanged( unsigned int tracks );
-    void onSeeked( qint64 ms );
-
-    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-    void infoSystemFinished( QString target );
-
-signals:
-    void Seeked( qlonglong Position );
-
-private:
-    // Get Info
-
-    // Push Info
-    void audioStarted( const QVariant& input );
-    void audioFinished( const QVariant& input );
-    void audioStopped();
-    void audioPaused();
-    void audioResumed( const QVariant& input );
-
-    // DBus
-    void notifyPropertyChanged( const QString& interface, const QString& propertyName );
-    QString m_playbackStatus;
-    QTemporaryFile* m_coverTempFile;
-};
-
-};
-
-}
-
-#endif // MPRISPLUGIN_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.cpp Deleted

@@ -1,205 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -a mprispluginplayeradaptor -c MprisPluginPlayerAdaptor mprispluginplayeradaptor.xml
- *
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "mprispluginplayeradaptor.h"
-#include <QtCore/QMetaObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-
-/*
- * Implementation of adaptor class MprisPluginPlayerAdaptor
- */
-
-MprisPluginPlayerAdaptor::MprisPluginPlayerAdaptor(QObject *parent)
-    : QDBusAbstractAdaptor(parent)
-{
-    // constructor
-    setAutoRelaySignals(true);
-}
-
-MprisPluginPlayerAdaptor::~MprisPluginPlayerAdaptor()
-{
-    // destructor
-}
-
-bool MprisPluginPlayerAdaptor::canControl() const
-{
-    // get the value of property CanControl
-    return qvariant_cast< bool >(parent()->property("CanControl"));
-}
-
-bool MprisPluginPlayerAdaptor::canGoNext() const
-{
-    // get the value of property CanGoNext
-    return qvariant_cast< bool >(parent()->property("CanGoNext"));
-}
-
-bool MprisPluginPlayerAdaptor::canGoPrevious() const
-{
-    // get the value of property CanGoPrevious
-    return qvariant_cast< bool >(parent()->property("CanGoPrevious"));
-}
-
-bool MprisPluginPlayerAdaptor::canPause() const
-{
-    // get the value of property CanPause
-    return qvariant_cast< bool >(parent()->property("CanPause"));
-}
-
-bool MprisPluginPlayerAdaptor::canPlay() const
-{
-    // get the value of property CanPlay
-    return qvariant_cast< bool >(parent()->property("CanPlay"));
-}
-
-bool MprisPluginPlayerAdaptor::canSeek() const
-{
-    // get the value of property CanSeek
-    return qvariant_cast< bool >(parent()->property("CanSeek"));
-}
-
-QString MprisPluginPlayerAdaptor::loopStatus() const
-{
-    // get the value of property LoopStatus
-    return qvariant_cast< QString >(parent()->property("LoopStatus"));
-}
-
-void MprisPluginPlayerAdaptor::setLoopStatus(const QString &value)
-{
-    // set the value of property LoopStatus
-    parent()->setProperty("LoopStatus", qVariantFromValue(value));
-}
-
-double MprisPluginPlayerAdaptor::maximumRate() const
-{
-    // get the value of property MaximumRate
-    return qvariant_cast< double >(parent()->property("MaximumRate"));
-}
-
-QVariantMap MprisPluginPlayerAdaptor::metadata() const
-{
-    // get the value of property Metadata
-    return qvariant_cast< QVariantMap >(parent()->property("Metadata"));
-}
-
-double MprisPluginPlayerAdaptor::minimumRate() const
-{
-    // get the value of property MinimumRate
-    return qvariant_cast< double >(parent()->property("MinimumRate"));
-}
-
-QString MprisPluginPlayerAdaptor::playbackStatus() const
-{
-    // get the value of property PlaybackStatus
-    return qvariant_cast< QString >(parent()->property("PlaybackStatus"));
-}
-
-qlonglong MprisPluginPlayerAdaptor::position() const
-{
-    // get the value of property Position
-    return qvariant_cast< qlonglong >(parent()->property("Position"));
-}
-
-double MprisPluginPlayerAdaptor::rate() const
-{
-    // get the value of property Rate
-    return qvariant_cast< double >(parent()->property("Rate"));
-}
-
-void MprisPluginPlayerAdaptor::setRate(double value)
-{
-    // set the value of property Rate
-    parent()->setProperty("Rate", qVariantFromValue(value));
-}
-
-bool MprisPluginPlayerAdaptor::shuffle() const
-{
-    // get the value of property Shuffle
-    return qvariant_cast< bool >(parent()->property("Shuffle"));
-}
-
-void MprisPluginPlayerAdaptor::setShuffle(bool value)
-{
-    // set the value of property Shuffle
-    parent()->setProperty("Shuffle", qVariantFromValue(value));
-}
-
-double MprisPluginPlayerAdaptor::volume() const
-{
-    // get the value of property Volume
-    return qvariant_cast< double >(parent()->property("Volume"));
-}
-
-void MprisPluginPlayerAdaptor::setVolume(double value)
-{
-    // set the value of property Volume
-    parent()->setProperty("Volume", qVariantFromValue(value));
-}
-
-void MprisPluginPlayerAdaptor::Next()
-{
-    // handle method call org.mpris.MediaPlayer2.Player.Next
-    QMetaObject::invokeMethod(parent(), "Next");
-}
-
-void MprisPluginPlayerAdaptor::OpenUri(const QString &Uri)
-{
-    // handle method call org.mpris.MediaPlayer2.Player.OpenUri
-    QMetaObject::invokeMethod(parent(), "OpenUri", Q_ARG(QString, Uri));
-}
-
-void MprisPluginPlayerAdaptor::Pause()
-{
-    // handle method call org.mpris.MediaPlayer2.Player.Pause
-    QMetaObject::invokeMethod(parent(), "Pause");
-}
-
-void MprisPluginPlayerAdaptor::Play()
-{
-    // handle method call org.mpris.MediaPlayer2.Player.Play
-    QMetaObject::invokeMethod(parent(), "Play");
-}
-
-void MprisPluginPlayerAdaptor::PlayPause()
-{
-    // handle method call org.mpris.MediaPlayer2.Player.PlayPause
-    QMetaObject::invokeMethod(parent(), "PlayPause");
-}
-
-void MprisPluginPlayerAdaptor::Previous()
-{
-    // handle method call org.mpris.MediaPlayer2.Player.Previous
-    QMetaObject::invokeMethod(parent(), "Previous");
-}
-
-void MprisPluginPlayerAdaptor::Seek(qlonglong Offset)
-{
-    qDebug() << Q_FUNC_INFO;
-    // handle method call org.mpris.MediaPlayer2.Player.Seek
-    QMetaObject::invokeMethod(parent(), "Seek", Q_ARG(qlonglong, Offset));
-}
-
-void MprisPluginPlayerAdaptor::SetPosition(const QDBusObjectPath &TrackId, qlonglong Position)
-{
-    qDebug() << Q_FUNC_INFO;
-    // handle method call org.mpris.MediaPlayer2.Player.SetPosition
-    QMetaObject::invokeMethod(parent(), "SetPosition", Q_ARG(QDBusObjectPath, TrackId), Q_ARG(qlonglong, Position));
-}
-
-void MprisPluginPlayerAdaptor::Stop()
-{
-    // handle method call org.mpris.MediaPlayer2.Player.Stop
-    QMetaObject::invokeMethod(parent(), "Stop");
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix/mprispluginplayeradaptor.h Deleted

@@ -1,140 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -a mprispluginplayeradaptor -c MprisPluginPlayerAdaptor mprispluginplayeradaptor.xml
- *
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#ifndef MPRISPLUGINPLAYERADAPTOR_H_1313089554
-#define MPRISPLUGINPLAYERADAPTOR_H_1313089554
-
-#include <QtCore/QObject>
-#include <QtDBus/QtDBus>
-
-class QByteArray;
-template<class T> class QList;
-template<class Key, class Value> class QMap;
-class QString;
-class QStringList;
-class QVariant;
-
-/*
- * Adaptor class for interface org.mpris.MediaPlayer2.Player
- */
-class MprisPluginPlayerAdaptor: public QDBusAbstractAdaptor
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.mpris.MediaPlayer2.Player")
-    Q_CLASSINFO("D-Bus Introspection", ""
-"  <interface name=\"org.mpris.MediaPlayer2.Player\">\n"
-"    <method name=\"Next\"/>\n"
-"    <method name=\"Previous\"/>\n"
-"    <method name=\"Pause\"/>\n"
-"    <method name=\"PlayPause\"/>\n"
-"    <method name=\"Stop\"/>\n"
-"    <method name=\"Play\"/>\n"
-"    <method name=\"Seek\">\n"
-"      <arg direction=\"in\" type=\"x\" name=\"Offset\"/>\n"
-"    </method>\n"
-"    <method name=\"SetPosition\">\n"
-"      <arg direction=\"in\" type=\"o\" name=\"TrackId\"/>\n"
-"      <arg direction=\"in\" type=\"x\" name=\"Position\"/>\n"
-"    </method>\n"
-"    <method name=\"OpenUri\">\n"
-"      <arg direction=\"in\" type=\"s\" name=\"Uri\"/>\n"
-"    </method>\n"
-"    <signal name=\"Seeked\">\n"
-"      <arg direction=\"out\" type=\"x\" name=\"Position\"/>\n"
-"    </signal>\n"
-"    <property access=\"read\" type=\"s\" name=\"PlaybackStatus\"/>\n"
-"    <property access=\"readwrite\" type=\"s\" name=\"LoopStatus\"/>\n"
-"    <property access=\"readwrite\" type=\"d\" name=\"Rate\"/>\n"
-"    <property access=\"readwrite\" type=\"b\" name=\"Shuffle\"/>\n"
-"    <property access=\"read\" type=\"a{sv}\" name=\"Metadata\">\n"
-"      <annotation value=\"QVariantMap\" name=\"com.trolltech.QtDBus.QtTypeName\"/>\n"
-"    </property>\n"
-"    <property access=\"readwrite\" type=\"d\" name=\"Volume\"/>\n"
-"    <property access=\"read\" type=\"x\" name=\"Position\"/>\n"
-"    <property access=\"read\" type=\"d\" name=\"MinimumRate\"/>\n"
-"    <property access=\"read\" type=\"d\" name=\"MaximumRate\"/>\n"
-"    <property access=\"read\" type=\"b\" name=\"CanGoNext\"/>\n"
-"    <property access=\"read\" type=\"b\" name=\"CanGoPrevious\"/>\n"
-"    <property access=\"read\" type=\"b\" name=\"CanPlay\"/>\n"
-"    <property access=\"read\" type=\"b\" name=\"CanPause\"/>\n"
-"    <property access=\"read\" type=\"b\" name=\"CanSeek\"/>\n"
-"    <property access=\"read\" type=\"b\" name=\"CanControl\"/>\n"
-"  </interface>\n"
-        "")
-public:
-    MprisPluginPlayerAdaptor(QObject *parent);
-    virtual ~MprisPluginPlayerAdaptor();
-
-public: // PROPERTIES
-    Q_PROPERTY(bool CanControl READ canControl)
-    bool canControl() const;
-
-    Q_PROPERTY(bool CanGoNext READ canGoNext)
-    bool canGoNext() const;
-
-    Q_PROPERTY(bool CanGoPrevious READ canGoPrevious)
-    bool canGoPrevious() const;
-
-    Q_PROPERTY(bool CanPause READ canPause)
-    bool canPause() const;
-
-    Q_PROPERTY(bool CanPlay READ canPlay)
-    bool canPlay() const;
-
-    Q_PROPERTY(bool CanSeek READ canSeek)
-    bool canSeek() const;
-
-    Q_PROPERTY(QString LoopStatus READ loopStatus WRITE setLoopStatus)
-    QString loopStatus() const;
-    void setLoopStatus(const QString &value);
-
-    Q_PROPERTY(double MaximumRate READ maximumRate)
-    double maximumRate() const;
-
-    Q_PROPERTY(QVariantMap Metadata READ metadata)
-    QVariantMap metadata() const;
-
-    Q_PROPERTY(double MinimumRate READ minimumRate)
-    double minimumRate() const;
-
-    Q_PROPERTY(QString PlaybackStatus READ playbackStatus)
-    QString playbackStatus() const;
-
-    Q_PROPERTY(qlonglong Position READ position)
-    qlonglong position() const;
-
-    Q_PROPERTY(double Rate READ rate WRITE setRate)
-    double rate() const;
-    void setRate(double value);
-
-    Q_PROPERTY(bool Shuffle READ shuffle WRITE setShuffle)
-    bool shuffle() const;
-    void setShuffle(bool value);
-
-    Q_PROPERTY(double Volume READ volume WRITE setVolume)
-    double volume() const;
-    void setVolume(double value);
-
-public Q_SLOTS: // METHODS
-    void Next();
-    void OpenUri(const QString &Uri);
-    void Pause();
-    void Play();
-    void PlayPause();
-    void Previous();
-    void Seek(qlonglong Offset);
-    void SetPosition(const QDBusObjectPath &TrackId, qlonglong Position);
-    void Stop();
-Q_SIGNALS: // SIGNALS
-    void Seeked(qlonglong Position);
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.cpp Deleted

@@ -1,92 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -a mprispluginrootadaptor -c MprisPluginRootAdaptor mprispluginrootadaptor.xml
- *
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * Do not edit! All changes made to it will be lost.
- */
-
-#include "mprispluginrootadaptor.h"
-#include <QtCore/QMetaObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-
-/*
- * Implementation of adaptor class MprisPluginRootAdaptor
- */
-
-MprisPluginRootAdaptor::MprisPluginRootAdaptor(QObject *parent)
-    : QDBusAbstractAdaptor(parent)
-{
-    // constructor
-    setAutoRelaySignals(true);
-}
-
-MprisPluginRootAdaptor::~MprisPluginRootAdaptor()
-{
-    // destructor
-}
-
-bool MprisPluginRootAdaptor::canQuit() const
-{
-    // get the value of property CanQuit
-    return qvariant_cast< bool >(parent()->property("CanQuit"));
-}
-
-bool MprisPluginRootAdaptor::canRaise() const
-{
-    qDebug() << Q_FUNC_INFO;
-    // get the value of property CanRaise
-    bool ret = qvariant_cast< bool >(parent()->property("CanRaise"));
-    qDebug() << "ret: " << ret;
-    return ret;
-}
-
-QString MprisPluginRootAdaptor::desktopEntry() const
-{
-    // get the value of property DesktopEntry
-    return qvariant_cast< QString >(parent()->property("DesktopEntry"));
-}
-
-bool MprisPluginRootAdaptor::hasTrackList() const
-{
-    // get the value of property HasTrackList
-    return qvariant_cast< bool >(parent()->property("HasTrackList"));
-}
-
-QString MprisPluginRootAdaptor::identity() const
-{
-    // get the value of property Identity
-    return qvariant_cast< QString >(parent()->property("Identity"));
-}
-
-QStringList MprisPluginRootAdaptor::supportedMimeTypes() const
-{
-    // get the value of property SupportedMimeTypes
-    return qvariant_cast< QStringList >(parent()->property("SupportedMimeTypes"));
-}
-
-QStringList MprisPluginRootAdaptor::supportedUriSchemes() const
-{
-    // get the value of property SupportedUriSchemes
-    return qvariant_cast< QStringList >(parent()->property("SupportedUriSchemes"));
-}
-
-void MprisPluginRootAdaptor::Quit()
-{
-    // handle method call org.mpris.MediaPlayer2.Quit
-    QMetaObject::invokeMethod(parent(), "Quit");
-}
-
-void MprisPluginRootAdaptor::Raise()
-{
-    // handle method call org.mpris.MediaPlayer2.Raise
-    QMetaObject::invokeMethod(parent(), "Raise");
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infoplugins/unix/mprispluginrootadaptor.h Deleted

@@ -1,77 +0,0 @@
-/*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -a mprispluginrootadaptor -c MprisPluginRootAdaptor mprispluginrootadaptor.xml
- *
- * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This is an auto-generated file.
- * This file may have been hand-edited. Look for HAND-EDIT comments
- * before re-generating it.
- */
-
-#ifndef MPRISPLUGINROOTADAPTOR_H_1312900930
-#define MPRISPLUGINROOTADAPTOR_H_1312900930
-
-#include <QtCore/QObject>
-#include <QtDBus/QtDBus>
-
-class QByteArray;
-template<class T> class QList;
-template<class Key, class Value> class QMap;
-class QString;
-class QStringList;
-class QVariant;
-
-/*
- * Adaptor class for interface org.mpris.MediaPlayer2
- */
-class MprisPluginRootAdaptor: public QDBusAbstractAdaptor
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.mpris.MediaPlayer2")
-    Q_CLASSINFO("D-Bus Introspection", ""
-"  <interface name=\"org.mpris.MediaPlayer2\">\n"
-"    <method name=\"Raise\"/>\n"
-"    <method name=\"Quit\"/>\n"
-"    <property access=\"read\" type=\"b\" name=\"CanQuit\"/>\n"
-"    <property access=\"read\" type=\"b\" name=\"CanRaise\"/>\n"
-"    <property access=\"read\" type=\"b\" name=\"HasTrackList\"/>\n"
-"    <property access=\"read\" type=\"s\" name=\"Identity\"/>\n"
-"    <property access=\"read\" type=\"s\" name=\"DesktopEntry\"/>\n"
-"    <property access=\"read\" type=\"as\" name=\"SupportedUriSchemes\"/>\n"
-"    <property access=\"read\" type=\"as\" name=\"SupportedMimeTypes\"/>\n"
-"  </interface>\n"
-        "")
-public:
-    MprisPluginRootAdaptor(QObject *parent);
-    virtual ~MprisPluginRootAdaptor();
-
-public: // PROPERTIES
-    Q_PROPERTY(bool CanQuit READ canQuit)
-    bool canQuit() const;
-
-    Q_PROPERTY(bool CanRaise READ canRaise)
-    bool canRaise() const;
-
-    Q_PROPERTY(QString DesktopEntry READ desktopEntry)
-    QString desktopEntry() const;
-
-    Q_PROPERTY(bool HasTrackList READ hasTrackList)
-    bool hasTrackList() const;
-
-    Q_PROPERTY(QString Identity READ identity)
-    QString identity() const;
-
-    Q_PROPERTY(QStringList SupportedMimeTypes READ supportedMimeTypes)
-    QStringList supportedMimeTypes() const;
-
-    Q_PROPERTY(QStringList SupportedUriSchemes READ supportedUriSchemes)
-    QStringList supportedUriSchemes() const;
-
-public Q_SLOTS: // METHODS
-    void Quit();
-    void Raise();
-Q_SIGNALS: // SIGNALS
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infosystem.cpp Deleted

@@ -1,261 +0,0 @@
-/* === 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
- *   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 <QCoreApplication>
-
-#include "infosystem.h"
-#include "tomahawksettings.h"
-#include "infosystemcache.h"
-#include "infosystemworker.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-InfoPlugin::InfoPlugin()
-    : QObject()
-{
-}
-
-InfoPlugin::~InfoPlugin()
-{
-}
-
-InfoSystem* InfoSystem::s_instance = 0;
-
-InfoSystem*
-InfoSystem::instance()
-{
-    return s_instance;
-}
-
-
-InfoSystem::InfoSystem( QObject *parent )
-    : QObject( parent )
-    , m_inited( false )
-    , m_infoSystemCacheThreadController( 0 )
-    , m_infoSystemWorkerThreadController( 0 )
-{
-    s_instance = this;
-
-    qDebug() << Q_FUNC_INFO;
-
-    m_infoSystemCacheThreadController = new InfoSystemCacheThread( this );
-    m_infoSystemCacheThreadController->start( QThread::IdlePriority );
-
-    m_infoSystemWorkerThreadController = new InfoSystemWorkerThread( this );
-    m_infoSystemWorkerThreadController->start();
-
-    QTimer::singleShot( 0, this, SLOT( init() ) );
-}
-
-
-InfoSystem::~InfoSystem()
-{
-    tDebug() << Q_FUNC_INFO << " beginning";
-
-    if ( m_infoSystemWorkerThreadController->worker() )
-    {
-        m_infoSystemWorkerThreadController->quit();
-        m_infoSystemWorkerThreadController->wait( 60000 );
-
-        delete m_infoSystemWorkerThreadController;
-        m_infoSystemWorkerThreadController = 0;
-    }
-    tDebug() << Q_FUNC_INFO << " done deleting worker";
-
-    if( m_infoSystemCacheThreadController->cache() )
-    {
-        m_infoSystemCacheThreadController->quit();
-        m_infoSystemCacheThreadController->wait( 60000 );
-
-        delete m_infoSystemCacheThreadController;
-        m_infoSystemCacheThreadController = 0;
-    }
-
-    tDebug() << Q_FUNC_INFO << " done deleting cache";
-}
-
-
-void
-InfoSystem::init()
-{
-    tDebug() << Q_FUNC_INFO;
-    if ( !m_infoSystemCacheThreadController->cache() || !m_infoSystemWorkerThreadController->worker() )
-    {
-        QTimer::singleShot( 0, this, SLOT( init() ) );
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoSystemCache* cache = m_infoSystemCacheThreadController->cache();
-    Tomahawk::InfoSystem::InfoSystemWorker* worker = m_infoSystemWorkerThreadController->worker();
-
-    connect( cache, SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-             worker, SLOT( infoSlot( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
-    
-    connect( worker, SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-             this,       SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
-    
-    connect( worker, SIGNAL( finished( QString ) ), this, SIGNAL( finished( QString ) ), Qt::UniqueConnection );
-    
-    connect( worker, SIGNAL( finished( QString, Tomahawk::InfoSystem::InfoType ) ),
-             this, SIGNAL( finished( QString, Tomahawk::InfoSystem::InfoType ) ), Qt::UniqueConnection );
-
-    QMetaObject::invokeMethod( worker, "init", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoSystemCache*, cache ) );
-    
-    m_inited = true;
-}
-
-
-bool
-InfoSystem::getInfo( const InfoRequestData &requestData )
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
-    {
-        init();
-        return false;
-    }
-    QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "getInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoRequestData, requestData ) );
-    return true;
-}
-
-
-bool
-InfoSystem::getInfo( const QString &caller, const QVariantMap &customData, const InfoTypeMap &inputMap, const InfoTimeoutMap &timeoutMap, bool allSources )
-{
-    if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
-    {
-        init();
-        return false;
-    }
-    InfoRequestData requestData;
-    requestData.caller = caller;
-    requestData.customData = customData;
-    requestData.allSources = allSources;
-    Q_FOREACH( InfoType type, inputMap.keys() )
-    {
-        requestData.type = type;
-        requestData.input = inputMap type ;
-        requestData.timeoutMillis = timeoutMap.contains( type ) ? timeoutMap type  : 10000;
-        QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "getInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoRequestData, requestData ) );
-    }
-    return false;
-}
-
-
-bool
-InfoSystem::pushInfo( const QString &caller, const InfoType type, const QVariant& input )
-{
-    tDebug() << Q_FUNC_INFO;
-    if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
-    {
-        init();
-        return false;
-    }
-
-    QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "pushInfo", Qt::QueuedConnection, Q_ARG( QString, caller ), Q_ARG( Tomahawk::InfoSystem::InfoType, type ), Q_ARG( QVariant, input ) );
-
-    return true;
-}
-
-
-bool
-InfoSystem::pushInfo( const QString &caller, const InfoTypeMap &input )
-{
-    if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
-    {
-        init();
-        return false;
-    }
-
-    Q_FOREACH( InfoType type, input.keys() )
-        QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "pushInfo", Qt::QueuedConnection, Q_ARG( QString, caller ), Q_ARG( Tomahawk::InfoSystem::InfoType, type ), Q_ARG( QVariant, input type  ) );
-
-    return true;
-}
-
-
-InfoSystemCacheThread::InfoSystemCacheThread( QObject *parent )
-    : QThread( parent )
-{
-    tDebug() << Q_FUNC_INFO;
-}
-
-
-InfoSystemCacheThread::~InfoSystemCacheThread()
-{
-    tDebug() << Q_FUNC_INFO;
-}
-
-
-void
-InfoSystemCacheThread::InfoSystemCacheThread::run()
-{
-    m_cache = QWeakPointer< InfoSystemCache >( new InfoSystemCache() );
-    exec();
-    if ( !m_cache.isNull() )
-        delete m_cache.data();
-}
-
-
-InfoSystemCache*
-InfoSystemCacheThread::cache() const
-{
-    if ( m_cache.isNull() )
-        return 0;
-    return m_cache.data();
-}
-
-
-InfoSystemWorkerThread::InfoSystemWorkerThread( QObject *parent )
-    : QThread( parent )
-{
-    tDebug() << Q_FUNC_INFO;
-}
-
-InfoSystemWorkerThread::~InfoSystemWorkerThread()
-{
-    tDebug() << Q_FUNC_INFO;
-}
-
-void
-InfoSystemWorkerThread::InfoSystemWorkerThread::run()
-{
-    m_worker = QWeakPointer< InfoSystemWorker >( new InfoSystemWorker() );
-    exec();
-    if( !m_worker.isNull() )
-        delete m_worker.data();
-}
-
-InfoSystemWorker*
-InfoSystemWorkerThread::worker() const
-{
-    if ( m_worker.isNull() )
-        return 0;
-    return m_worker.data();
-}
-
-
-} //namespace InfoSystem
-
-} //namespace Tomahawk

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infosystem.h Deleted

@@ -1,293 +0,0 @@
-/* === 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
- *   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 TOMAHAWK_INFOSYSTEM_H
-#define TOMAHAWK_INFOSYSTEM_H
-
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QObject>
-#include <QtCore/QtDebug>
-#include <QtCore/QMap>
-#include <QtCore/QWeakPointer>
-#include <QtCore/QSet>
-#include <QtCore/QLinkedList>
-#include <QtCore/QUrl>
-#include <QtCore/QVariant>
-#include <QtCore/QThread>
-#include <QtCore/QStringList>
-
-#include "dllmacro.h"
-#include "utils/tomahawkutils.h"
-
-class QNetworkAccessManager;
-
-namespace Tomahawk {
-
-namespace InfoSystem {
-
-class InfoSystemCache;
-class InfoSystemWorker;
-
-enum InfoType { // as items are saved in cache, mark them here to not change them
-    InfoNoInfo = 0, //WARNING: *ALWAYS* keep this first!
-    InfoTrackID = 1,
-    InfoTrackArtist = 2,
-    InfoTrackAlbum = 3,
-    InfoTrackGenre = 4,
-    InfoTrackComposer = 5,
-    InfoTrackDate = 6,
-    InfoTrackNumber = 7,
-    InfoTrackDiscNumber = 8,
-    InfoTrackBitRate = 9,
-    InfoTrackLength = 10,
-    InfoTrackSampleRate = 11,
-    InfoTrackFileSize = 12,
-    InfoTrackBPM = 13,
-    InfoTrackReplayGain = 14,
-    InfoTrackReplayPeakGain = 15,
-    InfoTrackLyrics = 16,
-    InfoTrackLocation = 17,
-    InfoTrackProfile = 18,
-    InfoTrackEnergy = 19,
-    InfoTrackDanceability = 20,
-    InfoTrackTempo = 21,
-    InfoTrackLoudness = 22,
-
-    InfoArtistID = 25,
-    InfoArtistName = 26,
-    InfoArtistBiography = 27,
-    InfoArtistImages = 28, //cached -- do not change
-    InfoArtistBlog = 29,
-    InfoArtistFamiliarity = 30,
-    InfoArtistHotttness = 31,
-    InfoArtistSongs = 32, //cached -- do not change
-    InfoArtistSimilars = 33, //cached -- do not change
-    InfoArtistNews = 34,
-    InfoArtistProfile = 35,
-    InfoArtistReviews = 36,
-    InfoArtistTerms = 37,
-    InfoArtistLinks = 38,
-    InfoArtistVideos = 39,
-    InfoArtistReleases = 40,
-
-    InfoAlbumID = 42,
-    InfoAlbumCoverArt = 43, //cached -- do not change
-    InfoAlbumName = 44,
-    InfoAlbumArtist = 45,
-    InfoAlbumDate = 46,
-    InfoAlbumGenre = 47,
-    InfoAlbumComposer = 48,
-    InfoAlbumSongs = 49,
-
-/** \var Tomahawk::InfoSystem::InfoType Tomahawk::InfoSystem::InfoType::InfoChartCapabilities
- * Documentation for InfoChartCapabilities
- *
- * Clients of this InfoType expect a QVariant
- *
- */
-    InfoChartCapabilities = 50,
-    /**
-     * Documentation for InfoChartArtists
-     */
-    InfoChart = 51,
-
-    InfoMiscTopHotttness = 60,
-    InfoMiscTopTerms = 61,
-
-    InfoSubmitNowPlaying = 70,
-    InfoSubmitScrobble = 71,
-
-    InfoNowPlaying = 80,
-    InfoNowPaused = 81,
-    InfoNowResumed = 82,
-    InfoNowStopped = 83,
-
-    InfoLove = 90,
-    InfoUnLove = 91,
-
-    InfoNotifyUser = 100,
-
-    InfoLastInfo = 101 //WARNING: *ALWAYS* keep this last!
-};
-
-struct InfoRequestData {
-    quint64 requestId;
-    quint64 internalId; //do not assign to this; it may get overwritten by the InfoSystem
-    QString caller;
-    Tomahawk::InfoSystem::InfoType type;
-    QVariant input;
-    QVariantMap customData;
-    uint timeoutMillis;
-    bool allSources;
-    
-    InfoRequestData()
-        : requestId( TomahawkUtils::infosystemRequestId() )
-        , internalId( TomahawkUtils::infosystemRequestId() )
-        , caller( QString() )
-        , type( Tomahawk::InfoSystem::InfoNoInfo )
-        , input( QVariant() )
-        , customData( QVariantMap() )
-        , timeoutMillis( 10000 )
-        , allSources( false )
-        {}
-    
-    InfoRequestData( const quint64 rId, const QString &callr, const Tomahawk::InfoSystem::InfoType typ, const QVariant &inputvar, const QVariantMap &custom )
-        : requestId( rId )
-        , internalId( TomahawkUtils::infosystemRequestId() )
-        , caller( callr )
-        , type( typ )
-        , input( inputvar )
-        , customData( custom )
-        , timeoutMillis( 10000 )
-        , allSources( false )
-        {}
-};
-
-typedef QMap< InfoType, QVariant > InfoTypeMap;
-typedef QMap< InfoType, uint > InfoTimeoutMap;
-typedef QHash< QString, QString > InfoStringHash;
-
-class DLLEXPORT InfoPlugin : public QObject
-{
-    Q_OBJECT
-
-public:
-    InfoPlugin();
-
-    virtual ~InfoPlugin();
-
-    QSet< InfoType > supportedGetTypes() const { return m_supportedGetTypes; }
-    QSet< InfoType > supportedPushTypes() const { return m_supportedPushTypes; }
-
-signals:
-    void getCachedInfo( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 newMaxAge, Tomahawk::InfoSystem::InfoRequestData requestData );
-    void info( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-
-    void updateCache( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 maxAge, Tomahawk::InfoSystem::InfoType type, QVariant output );
-
-protected slots:
-    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData ) = 0;
-    virtual void pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant data ) = 0;
-    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData ) = 0;
-
-protected:
-    InfoType m_type;
-    QSet< InfoType > m_supportedGetTypes;
-    QSet< InfoType > m_supportedPushTypes;
-
-private:
-    friend class InfoSystem;
-};
-
-typedef QWeakPointer< InfoPlugin > InfoPluginPtr;
-
-class InfoSystemCacheThread : public QThread
-{
-    Q_OBJECT
-
-public:
-    InfoSystemCacheThread( QObject *parent );
-    virtual ~InfoSystemCacheThread();
-
-    void run();
-    InfoSystemCache* cache() const;
-
-private:
-    QWeakPointer< InfoSystemCache > m_cache;
-};
-
-class InfoSystemWorkerThread : public QThread
-{
-    Q_OBJECT
-
-public:
-    InfoSystemWorkerThread( QObject *parent );
-    virtual ~InfoSystemWorkerThread();
-
-    void run();
-    InfoSystemWorker* worker() const;
-
-private:
-    QWeakPointer< InfoSystemWorker > m_worker;
-};
-
-class DLLEXPORT InfoSystem : public QObject
-{
-    Q_OBJECT
-
-public:
-    static InfoSystem* instance();
-
-    InfoSystem( QObject *parent );
-    ~InfoSystem();
-
-    bool getInfo( const InfoRequestData &requestData );
-    //WARNING: if changing timeoutMillis above, also change in below function in .cpp file
-    bool getInfo( const QString &caller, const QVariantMap &customData, const InfoTypeMap &inputMap, const InfoTimeoutMap &timeoutMap = InfoTimeoutMap(), bool allSources = false );
-    bool pushInfo( const QString &caller, const InfoType type, const QVariant &input );
-    bool pushInfo( const QString &caller, const InfoTypeMap &input );
-
-signals:
-    void info( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-    void finished( QString target );
-    void finished( QString target, Tomahawk::InfoSystem::InfoType type );
-
-private slots:
-    void init();
-    
-private:
-    bool m_inited;
-    InfoSystemCacheThread* m_infoSystemCacheThreadController;
-    InfoSystemWorkerThread* m_infoSystemWorkerThreadController;
-
-    static InfoSystem* s_instance;
-};
-
-}
-
-}
-
-
-
-inline uint qHash( Tomahawk::InfoSystem::InfoStringHash hash )
-{
-    QCryptographicHash md5( QCryptographicHash::Md5 );
-    QStringList keys = hash.keys();
-    keys.sort();
-    foreach( QString key, keys )
-    {
-        md5.addData( key.toUtf8() );
-        md5.addData( hashkey.toUtf8() );
-    }
-
-    QString hexData = md5.result();
-
-    uint returnval = 0;
-
-    foreach( uint val, hexData.toUcs4() )
-        returnval += val;
-
-    return returnval;
-}
-
-Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoRequestData );
-Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoStringHash );
-Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoSystemCache* );
-Q_DECLARE_METATYPE( QList< Tomahawk::InfoSystem::InfoStringHash > );
-
-#endif // TOMAHAWK_INFOSYSTEM_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infosystemcache.cpp Deleted

@@ -1,301 +0,0 @@
-/* === 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
- *   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 <QtDebug>
-
-#include <QDir>
-#include <QSettings>
-#include <QCryptographicHash>
-
-#ifndef ENABLE_HEADLESS
-    #include <QDesktopServices>
-#endif
-
-#include "infosystemcache.h"
-#include "tomahawksettings.h"
-#include "utils/logger.h"
-
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-
-InfoSystemCache::InfoSystemCache( QObject* parent )
-    : QObject( parent )
-    , m_cacheBaseDir( TomahawkSettings::instance()->storageCacheLocation() + "/InfoSystemCache/" )
-    , m_cacheVersion( 2 )
-{
-    tDebug() << Q_FUNC_INFO;
-    TomahawkSettings *s = TomahawkSettings::instance();
-    if ( s->infoSystemCacheVersion() != m_cacheVersion )
-    {
-        tLog() << "Cache version outdated, old:" << s->infoSystemCacheVersion()
-               << "new:" << m_cacheVersion
-               << "Doing upgrade, if any...";
-
-        uint current = s->infoSystemCacheVersion();
-        while( current < m_cacheVersion )
-        {
-            doUpgrade( current, current + 1 );
-            current++;
-        }
-        s->setInfoSystemCacheVersion( m_cacheVersion );
-    }
-
-    m_pruneTimer.setInterval( 300000 );
-    m_pruneTimer.setSingleShot( false );
-    connect( &m_pruneTimer, SIGNAL( timeout() ), SLOT( pruneTimerFired() ) );
-    m_pruneTimer.start();
-}
-
-
-InfoSystemCache::~InfoSystemCache()
-{
-    tDebug() << Q_FUNC_INFO;
-}
-
-void
-InfoSystemCache::doUpgrade( uint oldVersion, uint newVersion )
-{
-    Q_UNUSED( newVersion );
-    qDebug() << Q_FUNC_INFO;
-    if ( oldVersion == 0 || oldVersion == 1  )
-    {
-        qDebug() << Q_FUNC_INFO << "Wiping cache";
-
-        for ( int i = InfoNoInfo; i <= InfoLastInfo; i++ )
-        {
-            InfoType type = (InfoType)(i);
-            const QString cacheDirName = m_cacheBaseDir + QString::number( (int)type );
-            QFileInfoList fileList = QDir( cacheDirName ).entryInfoList( QDir::Files | QDir::NoDotAndDotDot );
-            foreach ( QFileInfo file, fileList )
-            {
-                if ( !QFile::remove( file.canonicalFilePath() ) )
-                    tLog() << "During upgrade, failed to remove cache file " << file.canonicalFilePath();
-            }
-        }
-    }
-}
-
-
-void
-InfoSystemCache::pruneTimerFired()
-{
-    qDebug() << Q_FUNC_INFO << "Pruning infosystemcache";
-    qlonglong currentMSecsSinceEpoch = QDateTime::currentMSecsSinceEpoch();
-
-    for ( int i = InfoNoInfo; i <= InfoLastInfo; i++ )
-    {
-        InfoType type = (InfoType)(i);
-        QHash< QString, QString > fileLocationHash = m_fileLocationCachetype;
-        const QString cacheDirName = m_cacheBaseDir + QString::number( (int)type );
-        QFileInfoList fileList = QDir( cacheDirName ).entryInfoList( QDir::Files | QDir::NoDotAndDotDot );
-        foreach ( QFileInfo file, fileList )
-        {
-            QString baseName = file.baseName();
-            if ( file.suffix().toLongLong() < currentMSecsSinceEpoch )
-            {
-                if ( !QFile::remove( file.canonicalFilePath() ) )
-                    tLog() << "Failed to remove stale cache file" << file.canonicalFilePath();
-                else
-                    qDebug() << "Removed stale cache file" << file.canonicalFilePath();
-            }
-            if ( fileLocationHash.contains( baseName ) )
-                fileLocationHash.remove( baseName );
-        }
-        m_fileLocationCachetype = fileLocationHash;
-    }
-}
-
-
-void
-InfoSystemCache::getCachedInfoSlot( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 newMaxAge, Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    QObject* sendingObj = sender();
-    const QString criteriaHashVal = criteriaMd5( criteria );
-    const QString criteriaHashValWithType = criteriaMd5( criteria, requestData.type );
-    QHash< QString, QString > fileLocationHash = m_fileLocationCache requestData.type ;
-    if ( !fileLocationHash.contains( criteriaHashVal ) )
-    {
-        if ( !fileLocationHash.isEmpty() )
-        {
-            //We already know of some values, so no need to re-read the directory again as it's already happened
-            qDebug() << Q_FUNC_INFO << "notInCache -- filelocationhash empty";
-            notInCache( sendingObj, criteria, requestData );
-            return;
-        }
-
-        const QString cacheDir = m_cacheBaseDir + QString::number( (int)requestData.type );
-        QDir dir( cacheDir );
-        if ( !dir.exists() )
-        {
-            //Dir doesn't exist so clearly not in cache
-            qDebug() << Q_FUNC_INFO << "notInCache -- dir doesn't exist";
-            notInCache( sendingObj, criteria, requestData );
-            return;
-        }
-
-        QFileInfoList fileList = dir.entryInfoList( QDir::Files | QDir::NoDotAndDotDot );
-        foreach ( QFileInfo file, fileList )
-        {
-            QString baseName = file.baseName();
-            fileLocationHash baseName  = file.canonicalFilePath();
-        }
-
-        //Store what we've loaded up
-        m_fileLocationCache requestData.type  = fileLocationHash;
-        if ( !fileLocationHash.contains( criteriaHashVal ) )
-        {
-            //Still didn't find it? It's really not in the cache then
-            qDebug() << Q_FUNC_INFO << "notInCache -- filelocationhash doesn't contain criteria val";
-            notInCache( sendingObj, criteria, requestData );
-            return;
-        }
-    }
-
-    QFileInfo file( fileLocationHash criteriaHashVal  );
-    qlonglong currMaxAge = file.suffix().toLongLong();
-
-    if ( currMaxAge < QDateTime::currentMSecsSinceEpoch() )
-    {
-        if ( !QFile::remove( file.canonicalFilePath() ) )
-            tLog() << "Failed to remove stale cache file" << file.canonicalFilePath();
-        else
-            qDebug() << "Removed stale cache file" << file.canonicalFilePath();
-
-        fileLocationHash.remove( criteriaHashVal );
-        m_fileLocationCache requestData.type  = fileLocationHash;
-        m_dataCache.remove( criteriaHashValWithType );
-
-        qDebug() << Q_FUNC_INFO << "notInCache -- file was stale";
-        notInCache( sendingObj, criteria, requestData );
-        return;
-    }
-    else if ( newMaxAge > 0 )
-    {
-        const QString newFilePath = QString( file.dir().canonicalPath() + '/' + criteriaHashVal + '.' + QString::number( QDateTime::currentMSecsSinceEpoch() + newMaxAge ) );
-
-        if ( !QFile::rename( file.canonicalFilePath(), newFilePath ) )
-        {
-            qDebug() << Q_FUNC_INFO << "notInCache -- failed to move old cache file to new location";
-            notInCache( sendingObj, criteria, requestData );
-            return;
-        }
-
-        fileLocationHash criteriaHashVal  = newFilePath;
-        m_fileLocationCache requestData.type  = fileLocationHash;
-    }
-
-    if ( !m_dataCache.contains( criteriaHashValWithType ) )
-    {
-        QSettings cachedSettings( fileLocationHash criteriaHashVal , QSettings::IniFormat );
-        QVariant output = cachedSettings.value( "data" );
-        m_dataCache.insert( criteriaHashValWithType, new QVariant( output ) );
-
-        emit info( requestData, output );
-    }
-    else
-    {
-        emit info( requestData, QVariant( *( m_dataCache criteriaHashValWithType  ) ) );
-    }
-}
-
-
-void
-InfoSystemCache::notInCache( QObject *receiver, Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    QMetaObject::invokeMethod( receiver, "notInCacheSlot", Q_ARG( Tomahawk::InfoSystem::InfoStringHash, criteria ), Q_ARG( Tomahawk::InfoSystem::InfoRequestData, requestData ) );
-}
-
-
-void
-InfoSystemCache::updateCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 maxAge, Tomahawk::InfoSystem::InfoType type, QVariant output )
-{
-    qDebug() << Q_FUNC_INFO;
-    const QString criteriaHashVal = criteriaMd5( criteria );
-    const QString criteriaHashValWithType = criteriaMd5( criteria, type );
-    const QString cacheDir = m_cacheBaseDir + QString::number( (int)type );
-    const QString settingsFilePath( cacheDir + '/' + criteriaHashVal + '.' + QString::number( QDateTime::currentMSecsSinceEpoch() + maxAge ) );
-
-    QHash< QString, QString > fileLocationHash = m_fileLocationCache type ;
-    if ( fileLocationHash.contains( criteriaHashVal ) )
-    {
-        if ( !QFile::rename( fileLocationHash criteriaHashVal , settingsFilePath ) )
-        {
-            tLog() << "Failed to move old cache file to new location!";
-            return;
-        }
-        fileLocationHash criteriaHashVal  = settingsFilePath;
-        m_fileLocationCache type  = fileLocationHash;
-
-        QSettings cachedSettings( fileLocationHash criteriaHashVal , QSettings::IniFormat );
-        cachedSettings.setValue( "data", output );
-
-        m_dataCache.insert( criteriaHashValWithType, new QVariant( output ) );
-
-        return;
-    }
-
-    QDir dir( cacheDir );
-    if( !dir.exists( cacheDir ) )
-    {
-        qDebug() << "Creating cache directory " << cacheDir;
-        if( !dir.mkpath( cacheDir ) )
-        {
-            tLog() << "Failed to create cache dir! Bailing...";
-            return;
-        }
-    }
-
-    QSettings cachedSettings( settingsFilePath, QSettings::IniFormat );
-    QStringList keys = criteria.keys();
-    cachedSettings.beginGroup( "criteria" );
-    for( int i = 0; i < criteria.size(); i++ )
-        cachedSettings.setValue( keys.at( i ), criteriakeys.at( i ) );
-    cachedSettings.endGroup();
-    cachedSettings.setValue( "data", output );
-
-    fileLocationHashcriteriaHashVal = settingsFilePath;
-    m_fileLocationCachetype = fileLocationHash;
-    m_dataCache.insert( criteriaHashValWithType, new QVariant( output ) );
-}
-
-
-const QString
-InfoSystemCache::criteriaMd5( const Tomahawk::InfoSystem::InfoStringHash &criteria, Tomahawk::InfoSystem::InfoType type ) const
-{
-    QCryptographicHash md5( QCryptographicHash::Md5 );
-    QStringList keys = criteria.keys();
-    keys.sort();
-    foreach( QString key, keys )
-    {
-        md5.addData( key.toUtf8() );
-        md5.addData( criteriakey.toUtf8() );
-    }
-    if ( type != Tomahawk::InfoSystem::InfoNoInfo && type != Tomahawk::InfoSystem::InfoLastInfo )
-        md5.addData( QString::number( (int)type ).toUtf8() );
-    return md5.result().toHex();
-}
-
-
-} //namespace InfoSystem
-
-} //namespace Tomahawk

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infosystemcache.h Deleted

@@ -1,72 +0,0 @@
-/* === 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
- *   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 TOMAHAWK_INFOSYSTEMCACHE_H
-#define TOMAHAWK_INFOSYSTEMCACHE_H
-
-#include <QCache>
-#include <QDateTime>
-#include <QObject>
-#include <QtDebug>
-#include <QTimer>
-
-#include "infosystem.h"
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-class InfoSystemCache : public QObject
-{
-Q_OBJECT
-
-public:
-    InfoSystemCache( QObject *parent = 0 );
-
-    virtual ~InfoSystemCache();
-
-signals:
-    void info( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-
-public slots:
-    void getCachedInfoSlot( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 newMaxAge, Tomahawk::InfoSystem::InfoRequestData requestData );
-    void updateCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 maxAge, Tomahawk::InfoSystem::InfoType type, QVariant output );
-
-private slots:
-    void pruneTimerFired();
-
-private:
-    void notInCache( QObject *receiver, Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
-    void doUpgrade( uint oldVersion, uint newVersion );
-    const QString criteriaMd5( const Tomahawk::InfoSystem::InfoStringHash &criteria, Tomahawk::InfoSystem::InfoType type = Tomahawk::InfoSystem::InfoNoInfo ) const;
-    
-    QString m_cacheBaseDir;
-    QHash< InfoType, QHash< QString, QString > > m_fileLocationCache;
-    QTimer m_pruneTimer;
-    QCache< QString, QVariant > m_dataCache;
-
-    uint m_cacheVersion;
-};
-
-} //namespace InfoSystem
-
-} //namespace Tomahawk
-
-#endif //TOMAHAWK_INFOSYSTEMCACHE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infosystemworker.cpp Deleted

@@ -1,346 +0,0 @@
-/* === 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
- *   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 <QCoreApplication>
-#include <QNetworkConfiguration>
-#include <QNetworkProxy>
-
-#include "config.h"
-#include "infosystemworker.h"
-#include "infosystemcache.h"
-#include "infoplugins/generic/echonestplugin.h"
-#include "infoplugins/generic/musixmatchplugin.h"
-#include "infoplugins/generic/chartsplugin.h"
-#include "infoplugins/generic/spotifyPlugin.h"
-#include "infoplugins/generic/lastfmplugin.h"
-#include "infoplugins/generic/musicbrainzPlugin.h"
-#include "infoplugins/generic/hypemPlugin.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#ifdef Q_WS_MAC
-#include "infoplugins/mac/adiumplugin.h"
-#endif
-#ifdef Q_WS_X11
-#include "infoplugins/unix/fdonotifyplugin.h"
-#include "infoplugins/unix/mprisplugin.h"
-#endif
-
-#include "lastfm/NetworkAccessManager"
-#include "infoplugins/generic/RoviPlugin.h"
-
-namespace Tomahawk
-{
-
-namespace InfoSystem
-{
-
-InfoSystemWorker::InfoSystemWorker()
-    : QObject()
-{
-    tDebug() << Q_FUNC_INFO;
-
-    m_checkTimeoutsTimer.setInterval( 1000 );
-    m_checkTimeoutsTimer.setSingleShot( false );
-    connect( &m_checkTimeoutsTimer, SIGNAL( timeout() ), SLOT( checkTimeoutsTimerFired() ) );
-    m_checkTimeoutsTimer.start();
-}
-
-
-InfoSystemWorker::~InfoSystemWorker()
-{
-    tDebug() << Q_FUNC_INFO << " beginning";
-    Q_FOREACH( InfoPluginPtr plugin, m_plugins )
-    {
-        if( plugin )
-            delete plugin.data();
-    }
-    tDebug() << Q_FUNC_INFO << " finished";
-}
-
-
-void
-InfoSystemWorker::init( Tomahawk::InfoSystem::InfoSystemCache* cache )
-{
-    tDebug() << Q_FUNC_INFO;
-#ifndef ENABLE_HEADLESS
-    InfoPluginPtr enptr( new EchoNestPlugin() );
-    m_plugins.append( enptr );
-    registerInfoTypes( enptr, enptr.data()->supportedGetTypes(), enptr.data()->supportedPushTypes() );
-    InfoPluginPtr mmptr( new MusixMatchPlugin() );
-    m_plugins.append( mmptr );
-    registerInfoTypes( mmptr, mmptr.data()->supportedGetTypes(), mmptr.data()->supportedPushTypes() );
-    InfoPluginPtr mbptr( new MusicBrainzPlugin() );
-    m_plugins.append( mbptr );
-    registerInfoTypes( mbptr, mbptr.data()->supportedGetTypes(), mbptr.data()->supportedPushTypes() );
-    InfoPluginPtr lfmptr( new LastFmPlugin() );
-    m_plugins.append( lfmptr );
-    registerInfoTypes( lfmptr, lfmptr.data()->supportedGetTypes(), lfmptr.data()->supportedPushTypes() );
-    InfoPluginPtr sptr( new ChartsPlugin() );
-    m_plugins.append( sptr );
-    registerInfoTypes( sptr, sptr.data()->supportedGetTypes(), sptr.data()->supportedPushTypes() );
-    InfoPluginPtr roviptr( new RoviPlugin() );
-    m_plugins.append( roviptr );
-    registerInfoTypes( roviptr, roviptr.data()->supportedGetTypes(), roviptr.data()->supportedPushTypes() );
-    InfoPluginPtr spotptr( new SpotifyPlugin() );
-    m_plugins.append( spotptr );
-    registerInfoTypes( spotptr, spotptr.data()->supportedGetTypes(), spotptr.data()->supportedPushTypes() );
-    InfoPluginPtr hypeptr( new hypemPlugin() );
-    m_plugins.append( hypeptr );
-    registerInfoTypes( hypeptr, hypeptr.data()->supportedGetTypes(), hypeptr.data()->supportedPushTypes() );
-#endif
-
-    #ifdef Q_WS_MAC
-    InfoPluginPtr admptr( new AdiumPlugin() );
-    m_plugins.append( admptr );
-    registerInfoTypes( admptr, admptr.data()->supportedGetTypes(), admptr.data()->supportedPushTypes() );
-    #endif
-#ifndef ENABLE_HEADLESS
-    #ifdef Q_WS_X11
-    InfoPluginPtr fdonotifyptr( new FdoNotifyPlugin() );
-    m_plugins.append( fdonotifyptr );
-    registerInfoTypes( fdonotifyptr, fdonotifyptr.data()->supportedGetTypes(), fdonotifyptr.data()->supportedPushTypes() );
-    InfoPluginPtr mprisptr( new MprisPlugin() );
-    m_plugins.append( mprisptr );
-    registerInfoTypes( mprisptr, mprisptr.data()->supportedGetTypes(), mprisptr.data()->supportedPushTypes() );
-    #endif
-#endif
-    Q_FOREACH( InfoPluginPtr plugin, m_plugins )
-    {
-        connect(
-                plugin.data(),
-                SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-                this,
-                SLOT( infoSlot( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-                Qt::UniqueConnection
-            );
-
-        connect(
-                plugin.data(),
-                SIGNAL( getCachedInfo( Tomahawk::InfoSystem::InfoStringHash, qint64, Tomahawk::InfoSystem::InfoRequestData ) ),
-                cache,
-                SLOT( getCachedInfoSlot( Tomahawk::InfoSystem::InfoStringHash, qint64, Tomahawk::InfoSystem::InfoRequestData ) )
-            );
-        connect(
-                plugin.data(),
-                SIGNAL( updateCache( Tomahawk::InfoSystem::InfoStringHash, qint64, Tomahawk::InfoSystem::InfoType, QVariant ) ),
-                cache,
-                SLOT( updateCacheSlot( Tomahawk::InfoSystem::InfoStringHash, qint64, Tomahawk::InfoSystem::InfoType, QVariant ) )
-            );
-    }
-}
-
-
-void
-InfoSystemWorker::registerInfoTypes( const InfoPluginPtr &plugin, const QSet< InfoType >& getTypes, const QSet< InfoType >& pushTypes )
-{
-    Q_FOREACH( InfoType type, getTypes )
-        m_infoGetMaptype.append( plugin );
-    Q_FOREACH( InfoType type, pushTypes )
-        m_infoPushMaptype.append( plugin );
-}
-
-
-QList< InfoPluginPtr >
-InfoSystemWorker::determineOrderedMatches( const InfoType type ) const
-{
-    //Dummy function for now that returns the various items in the QSet; at some point this will
-    //probably need to support ordering based on the data source
-    QList< InfoPluginPtr > providers;
-    Q_FOREACH( InfoPluginPtr ptr, m_infoGetMaptype )
-        providers << ptr;
-    return providers;
-}
-
-
-void
-InfoSystemWorker::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
-{
-    //qDebug() << Q_FUNC_INFO << "type is " << requestData.type << " and allSources = " << (allSources ? "true" : "false" );
-
-    QList< InfoPluginPtr > providers = determineOrderedMatches( requestData.type );
-    if ( providers.isEmpty() )
-    {
-        emit info( requestData, QVariant() );
-        checkFinished( requestData );
-        return;
-    }
-
-    if ( !requestData.allSources )
-        providers = QList< InfoPluginPtr >( providers.mid( 0, 1 ) );
-
-    bool foundOne = false;
-    foreach ( InfoPluginPtr ptr, providers )
-    {
-        if ( !ptr )
-            continue;
-
-        foundOne = true;
-
-        if ( requestData.allSources || m_savedRequestMap.contains( requestData.requestId ) )
-        {
-            if ( m_savedRequestMap.contains( requestData.requestId ) )
-                tDebug() << Q_FUNC_INFO << "Warning: reassigning requestId because it already exists";
-            requestData.internalId = TomahawkUtils::infosystemRequestId();
-        }
-        else
-            requestData.internalId = requestData.requestId;
-
-        quint64 requestId = requestData.internalId;
-        m_requestSatisfiedMap requestId  = false;
-        if ( requestData.timeoutMillis != 0 )
-        {
-            qint64 currMs = QDateTime::currentMSecsSinceEpoch();
-            m_timeRequestMapper.insert( currMs + requestData.timeoutMillis, requestId );
-        }
-    //    qDebug() << "Assigning request with requestId" << requestId << "and type" << requestData.type;
-        m_dataTracker requestData.caller  requestData.type  = m_dataTracker requestData.caller  requestData.type  + 1;
-    //    qDebug() << "Current count in dataTracker for target" << requestData.caller << "and type" << requestData.type << "is" << m_dataTracker requestData.caller  requestData.type ;
-
-        InfoRequestData* data = new InfoRequestData;
-        data->caller = requestData.caller;
-        data->type = requestData.type;
-        data->input = requestData.input;
-        data->customData = requestData.customData;
-        m_savedRequestMap requestId  = data;
-
-        QMetaObject::invokeMethod( ptr.data(), "getInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoRequestData, requestData ) );
-    }
-
-    if ( !foundOne )
-    {
-        emit info( requestData, QVariant() );
-        checkFinished( requestData );
-    }
-}
-
-
-void
-InfoSystemWorker::pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input )
-{
-//    qDebug() << Q_FUNC_INFO;
-
-    Q_FOREACH( InfoPluginPtr ptr, m_infoPushMap type  )
-    {
-        if( ptr )
-            QMetaObject::invokeMethod( ptr.data(), "pushInfo", Qt::QueuedConnection, Q_ARG( QString, caller ), Q_ARG( Tomahawk::InfoSystem::InfoType, type ), Q_ARG( QVariant, input ) );
-    }
-}
-
-
-void
-InfoSystemWorker::infoSlot( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
-{
-//    qDebug() << Q_FUNC_INFO << "with requestId" << requestId;
-
-    quint64 requestId = requestData.internalId;
-
-    if ( m_dataTracker requestData.caller  requestData.type  == 0 )
-    {
-//        qDebug() << Q_FUNC_INFO << "Caller was not waiting for that type of data!";
-        return;
-    }
-    if ( !m_requestSatisfiedMap.contains( requestId ) || m_requestSatisfiedMap requestId  )
-    {
-//        qDebug() << Q_FUNC_INFO << "Request was already taken care of!";
-        return;
-    }
-
-    m_requestSatisfiedMap requestId  = true;
-    emit info( requestData, output );
-
-    m_dataTracker requestData.caller  requestData.type  = m_dataTracker requestData.caller  requestData.type  - 1;
-//    qDebug() << "Current count in dataTracker for target" << requestData.caller << "and type" << requestData.type << "is" << m_dataTracker requestData.caller  requestData.type ;
-    delete m_savedRequestMap requestId ;
-    m_savedRequestMap.remove( requestId );
-    checkFinished( requestData );
-}
-
-
-void
-InfoSystemWorker::checkFinished( const Tomahawk::InfoSystem::InfoRequestData &requestData )
-{
-    if ( m_dataTracker requestData.caller  requestData.type  == 0 )
-        emit finished( requestData.caller, requestData.type );
-
-    Q_FOREACH( InfoType testtype, m_dataTracker requestData.caller .keys() )
-    {
-        if ( m_dataTracker requestData.caller  testtype  != 0 )
-            return;
-    }
-//    qDebug() << "Emitting finished with target" << target;
-    emit finished( requestData.caller );
-}
-
-
-void
-InfoSystemWorker::checkTimeoutsTimerFired()
-{
-    qint64 currTime = QDateTime::currentMSecsSinceEpoch();
-    Q_FOREACH( qint64 time, m_timeRequestMapper.keys() )
-    {
-        Q_FOREACH( quint64 requestId, m_timeRequestMapper.values( time ) )
-        {
-            if ( time < currTime )
-            {
-                if ( m_requestSatisfiedMap requestId  )
-                {
-//                    qDebug() << Q_FUNC_INFO << "Removing mapping of" << requestId << "which expired at time" << time << "and was already satisfied";
-                    m_timeRequestMapper.remove( time, requestId );
-                    if ( !m_timeRequestMapper.count( time ) )
-                        m_timeRequestMapper.remove( time );
-                    continue;
-                }
-
-                //doh, timed out
-//                qDebug() << Q_FUNC_INFO << "Doh, timed out for requestId" << requestId;
-                InfoRequestData *savedData = m_savedRequestMap requestId ;
-
-                InfoRequestData returnData;
-                returnData.caller = savedData->caller;
-                returnData.type = savedData->type;
-                returnData.input = savedData->input;
-                returnData.customData = savedData->customData;
-                emit info( returnData, QVariant() );
-
-                delete savedData;
-                m_savedRequestMap.remove( requestId );
-
-                m_dataTracker returnData.caller  returnData.type  = m_dataTracker returnData.caller  returnData.type  - 1;
-//                qDebug() << "Current count in dataTracker for target" << returnData.caller << "is" << m_dataTracker returnData.caller  returnData.type ;
-
-                m_requestSatisfiedMap requestId  = true;
-                m_timeRequestMapper.remove( time, requestId );
-                if ( !m_timeRequestMapper.count( time ) )
-                    m_timeRequestMapper.remove( time );
-
-                checkFinished( returnData );
-            }
-            else
-            {
-                //we've caught up, the remaining requets still have time to work
-                return;
-            }
-        }
-    }
-}
-
-
-} //namespace InfoSystem
-
-} //namespace Tomahawk

tomahawk-0.4.2.tar.bz2/src/libtomahawk/infosystem/infosystemworker.h Deleted

@@ -1,90 +0,0 @@
-/* === 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
- *   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 TOMAHAWK_INFOSYSTEMWORKER_H
-#define TOMAHAWK_INFOSYSTEMWORKER_H
-
-#include "infosystem/infosystem.h"
-
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtCore/QObject>
-#include <QtCore/QtDebug>
-#include <QtCore/QMap>
-#include <QtCore/QWeakPointer>
-#include <QtCore/QSet>
-#include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QTimer>
-
-#include "dllmacro.h"
-
-namespace Tomahawk {
-
-namespace InfoSystem {
-
-   
-class DLLEXPORT InfoSystemWorker : public QObject
-{
-    Q_OBJECT
-
-public:
-    InfoSystemWorker();
-    ~InfoSystemWorker();
-
-    void registerInfoTypes( const InfoPluginPtr &plugin, const QSet< InfoType > &getTypes, const QSet< InfoType > &pushTypes );
-    QNetworkAccessManager* nam() const;
-    
-signals:
-    void info( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-    void finished( QString target );
-    void finished( QString target, Tomahawk::InfoSystem::InfoType type );
-    
-public slots:
-    void init( Tomahawk::InfoSystem::InfoSystemCache* cache );
-    void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
-    void pushInfo( QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input );
-
-    void infoSlot( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-    
-private slots:
-    void checkTimeoutsTimerFired();
-    
-private:
-
-    void checkFinished( const Tomahawk::InfoSystem::InfoRequestData &target );
-    QList< InfoPluginPtr > determineOrderedMatches( const InfoType type ) const;
-    
-    QHash< QString, QHash< InfoType, int > > m_dataTracker;
-    QMultiMap< qint64, quint64 > m_timeRequestMapper;
-    QHash< uint, bool > m_requestSatisfiedMap;
-    QHash< uint, InfoRequestData* > m_savedRequestMap;
-    
-    // For now, statically instantiate plugins; this is just somewhere to keep them
-    QList< InfoPluginPtr > m_plugins;
-
-    QMap< InfoType, QList< InfoPluginPtr > > m_infoGetMap;
-    QMap< InfoType, QList< InfoPluginPtr > > m_infoPushMap;
-
-    QTimer m_checkTimeoutsTimer;
-};
-
-}
-
-}
-
-#endif // TOMAHAWK_INFOSYSTEMWORKER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/bufferiodevice.cpp Deleted

@@ -1,279 +0,0 @@
-/* === 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
- *   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 "bufferiodevice.h"
-
-#include <QCoreApplication>
-#include <QThread>
-
-#include "utils/logger.h"
-
-// Msgs are framed, this is the size each msg we send containing audio data:
-#define BLOCKSIZE 4096
-
-
-BufferIODevice::BufferIODevice( unsigned int size, QObject* parent )
-    : QIODevice( parent )
-    , m_size( size )
-    , m_received( 0 )
-    , m_pos( 0 )
-{
-}
-
-
-bool
-BufferIODevice::open( OpenMode mode )
-{
-    Q_UNUSED( mode );
-    QMutexLocker lock( &m_mut );
-
-    qDebug() << Q_FUNC_INFO;
-    QIODevice::open( QIODevice::ReadOnly | QIODevice::Unbuffered ); // FIXME?
-    return true;
-}
-
-
-void
-BufferIODevice::close()
-{
-    QMutexLocker lock( &m_mut );
-
-    qDebug() << Q_FUNC_INFO;
-    QIODevice::close();
-}
-
-
-bool
-BufferIODevice::seek( qint64 pos )
-{
-    qDebug() << Q_FUNC_INFO << pos << m_size;
-
-    if ( pos >= m_size )
-        return false;
-
-    int block = blockForPos( pos );
-    if ( isBlockEmpty( block ) )
-        emit blockRequest( block );
-
-    m_pos = pos;
-    qDebug() << "Finished seeking";
-
-    return true;
-}
-
-
-void
-BufferIODevice::seeked( int block )
-{
-    qDebug() << Q_FUNC_INFO << block << m_size;
-}
-
-
-void
-BufferIODevice::inputComplete( const QString& errmsg )
-{
-    qDebug() << Q_FUNC_INFO;
-    setErrorString( errmsg );
-    m_size = m_received;
-    emit readChannelFinished();
-}
-
-
-void
-BufferIODevice::addData( int block, const QByteArray& ba )
-{
-    {
-        QMutexLocker lock( &m_mut );
-
-        while ( m_buffer.count() <= block )
-            m_buffer << QByteArray();
-
-        m_buffer.replace( block, ba );
-    }
-
-    // If this was the last block of the transfer, check if we need to fill up gaps
-    if ( block + 1 == maxBlocks() )
-    {
-        if ( nextEmptyBlock() >= 0 )
-        {
-            emit blockRequest( nextEmptyBlock() );
-        }
-    }
-
-    m_received += ba.count();
-    emit bytesWritten( ba.count() );
-    emit readyRead();
-}
-
-
-qint64
-BufferIODevice::bytesAvailable() const
-{
-    return m_size - m_pos;
-}
-
-
-qint64
-BufferIODevice::readData( char* data, qint64 maxSize )
-{
-//    qDebug() << Q_FUNC_INFO << m_pos << maxSize << 1;
-
-    if ( atEnd() )
-        return 0;
-
-    QByteArray ba;
-    ba.append( getData( m_pos, maxSize ) );
-    m_pos += ba.count();
-
-//    qDebug() << Q_FUNC_INFO << maxSize << ba.count() << 2;
-    memcpy( data, ba.data(), ba.count() );
-
-    return ba.count();
-}
-
-
-qint64
-BufferIODevice::writeData( const char* data, qint64 maxSize )
-{
-    Q_UNUSED( data );
-    Q_UNUSED( maxSize );
-    // call addData instead
-    Q_ASSERT( false );
-    return 0;
-}
-
-
-qint64
-BufferIODevice::size() const
-{
-    qDebug() << Q_FUNC_INFO << m_size;
-    return m_size;
-}
-
-
-bool
-BufferIODevice::atEnd() const
-{
-//    qDebug() << Q_FUNC_INFO << ( m_size <= m_pos );
-    return ( m_size <= m_pos );
-}
-
-
-void
-BufferIODevice::clear()
-{
-    QMutexLocker lock( &m_mut );
-
-    m_pos = 0;
-    m_buffer.clear();
-}
-
-
-unsigned int
-BufferIODevice::blockSize()
-{
-    return BLOCKSIZE;
-}
-
-
-int
-BufferIODevice::blockForPos( qint64 pos ) const
-{
-    // 0 / 4096 -> block 0
-    // 4095 / 4096 -> block 0
-    // 4096 / 4096 -> block 1
-
-    return pos / BLOCKSIZE;
-}
-
-
-int
-BufferIODevice::offsetForPos( qint64 pos ) const
-{
-    // 0 % 4096 -> offset 0
-    // 4095 % 4096 -> offset 4095
-    // 4096 % 4096 -> offset 0
-
-    return pos % BLOCKSIZE;
-}
-
-
-int
-BufferIODevice::nextEmptyBlock() const
-{
-    int i = 0;
-    foreach( const QByteArray& ba, m_buffer )
-    {
-        if ( ba.isEmpty() )
-            return i;
-
-        i++;
-    }
-
-    if ( i == maxBlocks() )
-        return -1;
-
-    return i;
-}
-
-
-int
-BufferIODevice::maxBlocks() const
-{
-    int i = m_size / BLOCKSIZE;
-
-    if ( ( m_size % BLOCKSIZE ) > 0 )
-        i++;
-
-    return i;
-}
-
-
-bool
-BufferIODevice::isBlockEmpty( int block ) const
-{
-    if ( block >= m_buffer.count() )
-        return true;
-
-    return m_buffer.at( block ).isEmpty();
-}
-
-
-QByteArray
-BufferIODevice::getData( qint64 pos, qint64 size )
-{
-//    qDebug() << Q_FUNC_INFO << pos << size << 1;
-    QByteArray ba;
-    int block = blockForPos( pos );
-    int offset = offsetForPos( pos );
-
-    QMutexLocker lock( &m_mut );
-    while( ba.count() < size )
-    {
-        if ( block > maxBlocks() )
-            break;
-
-        if ( isBlockEmpty( block ) )
-            break;
-
-        ba.append( m_buffer.at( block++ ).mid( offset ) );
-    }
-
-//    qDebug() << Q_FUNC_INFO << pos << size << 2;
-    return ba.left( size );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/connection.cpp Deleted

@@ -1,467 +0,0 @@
-/* === 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
- *   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 "connection.h"
-
-#include <QtCore/QTime>
-#include <QtCore/QThread>
-
-#include "network/servent.h"
-#include "utils/logger.h"
-
-#define PROTOVER "4" // must match remote peer, or we can't talk.
-
-
-Connection::Connection( Servent* parent )
-    : QObject()
-    , m_sock( 0 )
-    , m_peerport( 0 )
-    , m_servent( parent )
-    , m_ready( false )
-    , m_onceonly( true )
-    , m_do_shutdown( false )
-    , m_actually_shutting_down( false )
-    , m_peer_disconnected( false )
-    , m_tx_bytes( 0 )
-    , m_tx_bytes_requested( 0 )
-    , m_rx_bytes( 0 )
-    , m_id( "Connection()" )
-    , m_statstimer( 0 )
-    , m_stats_tx_bytes_per_sec( 0 )
-    , m_stats_rx_bytes_per_sec( 0 )
-    , m_rx_bytes_last( 0 )
-    , m_tx_bytes_last( 0 )
-{
-    moveToThread( m_servent->thread() );
-    qDebug() << "CTOR Connection (super)" << thread();
-
-    connect( &m_msgprocessor_out, SIGNAL( ready( msg_ptr ) ),
-             SLOT( sendMsg_now( msg_ptr ) ), Qt::QueuedConnection );
-
-    connect( &m_msgprocessor_in,  SIGNAL( ready( msg_ptr ) ),
-             SLOT( handleMsg( msg_ptr ) ), Qt::QueuedConnection );
-
-    connect( &m_msgprocessor_in, SIGNAL( empty() ),
-             SLOT( handleIncomingQueueEmpty() ), Qt::QueuedConnection );
-}
-
-
-Connection::~Connection()
-{
-    tDebug() << "DTOR connection (super)" << id() << thread() << m_sock.isNull();
-    if( !m_sock.isNull() )
-    {
-//        qDebug() << "deleteLatering sock" << m_sock;
-        m_sock->deleteLater();
-    }
-
-    delete m_statstimer;
-}
-
-
-void
-Connection::handleIncomingQueueEmpty()
-{
-    //qDebug() << Q_FUNC_INFO << "bavail" << m_sock->bytesAvailable()
-    //         << "isopen" << m_sock->isOpen()
-    //         << "m_peer_disconnected" << m_peer_disconnected
-    //         << "bytes rx" << bytesReceived();
-
-    if( !m_sock.isNull() && m_sock->bytesAvailable() == 0 && m_peer_disconnected )
-    {
-        qDebug() << "No more data to read, peer disconnected. shutting down connection."
-                 << "bytesavail" << m_sock->bytesAvailable()
-                 << "bytesrx" << m_rx_bytes;
-        shutdown();
-    }
-}
-
-
-// convenience:
-void
-Connection::setFirstMessage( const QVariant& m )
-{
-    QJson::Serializer ser;
-    const QByteArray ba = ser.serialize( m );
-    //qDebug() << "first msg json len:" << ba.length();
-    setFirstMessage( Msg::factory( ba, Msg::JSON ) );
-}
-
-
-void
-Connection::setFirstMessage( msg_ptr m )
-{
-    m_firstmsg = m;
-    //qDebug() << id() << " first msg set to " << QString::fromAscii(m_firstmsg->payload())
-    //        << "msg len:" << m_firstmsg->length() ;
-}
-
-
-void
-Connection::shutdown( bool waitUntilSentAll )
-{
-    qDebug() << Q_FUNC_INFO << waitUntilSentAll << id();
-    if ( m_do_shutdown )
-    {
-        //qDebug() << id() << " already shutting down";
-        return;
-    }
-
-    m_do_shutdown = true;
-    if ( !waitUntilSentAll )
-    {
-//        qDebug() << "Shutting down immediately " << id();
-        actualShutdown();
-    }
-    else
-    {
-        qDebug() << "Shutting down after transfer complete " << id()
-                 << "Actual/Desired" << m_tx_bytes << m_tx_bytes_requested;
-
-        bytesWritten( 0 ); // trigger shutdown if we've already sent everything
-        // otherwise the bytesWritten slot will call actualShutdown()
-        // once all enqueued data has been properly written to the socket
-    }
-}
-
-
-void
-Connection::actualShutdown()
-{
-    qDebug() << Q_FUNC_INFO << m_actually_shutting_down << id();
-    if ( m_actually_shutting_down )
-    {
-        return;
-    }
-    m_actually_shutting_down = true;
-
-    if ( !m_sock.isNull() && m_sock->isOpen() )
-    {
-        m_sock->disconnectFromHost();
-    }
-
-//    qDebug() << "EMITTING finished()";
-    emit finished();
-}
-
-
-void
-Connection::markAsFailed()
-{
-    qDebug() << "Connection" << id() << "FAILED ***************" << thread();
-    emit failed();
-    shutdown();
-}
-
-
-void
-Connection::start( QTcpSocket* sock )
-{
-    Q_ASSERT( m_sock.isNull() );
-    Q_ASSERT( sock );
-    Q_ASSERT( sock->isValid() );
-
-    m_sock = sock;
-
-    if( m_name.isEmpty() )
-    {
-        m_name = QString( "peer%1" ).arg( m_sock->peerAddress().toString() );
-    }
-
-    QTimer::singleShot( 0, this, SLOT( doSetup() ) );
-}
-
-
-void
-Connection::authCheckTimeout()
-{
-    if( m_ready )
-        return;
-
-    qDebug() << "Closing connection, not authed in time.";
-    shutdown();
-}
-
-
-void
-Connection::doSetup()
-{
-    qDebug() << Q_FUNC_INFO << thread();
-    /*
-        New connections can be created from other thread contexts, such as
-        when AudioEngine calls getIODevice.. - we need to ensure that connections
-        and their associated sockets are running in the same thread as the servent.
-
-        HINT: export QT_FATAL_WARNINGS=1 helps to catch these kind of errors.
-     */
-    if( QThread::currentThread() != m_servent->thread() )
-    {
-        // Connections should always be in the same thread as the servent.
-        qDebug() << "Fixing thead affinity...";
-        moveToThread( m_servent->thread() );
-        qDebug() << Q_FUNC_INFO  << thread();
-    }
-
-    //stats timer calculates BW used by this connection
-    m_statstimer = new QTimer;
-    m_statstimer->moveToThread( this->thread() );
-    m_statstimer->setInterval( 1000 );
-    connect( m_statstimer, SIGNAL( timeout() ), SLOT( calcStats() ) );
-    m_statstimer->start();
-    m_statstimer_mark.start();
-
-    m_sock->moveToThread( thread() );
-
-    connect( m_sock.data(), SIGNAL( bytesWritten( qint64 ) ),
-                              SLOT( bytesWritten( qint64 ) ), Qt::QueuedConnection );
-
-    connect( m_sock.data(), SIGNAL( disconnected() ),
-                              SLOT( socketDisconnected() ), Qt::QueuedConnection );
-
-    connect( m_sock.data(), SIGNAL( error( QAbstractSocket::SocketError ) ),
-                              SLOT( socketDisconnectedError( QAbstractSocket::SocketError ) ), Qt::QueuedConnection );
-
-    connect( m_sock.data(), SIGNAL( readyRead() ),
-                              SLOT( readyRead() ), Qt::QueuedConnection );
-
-    // if connection not authed/setup fast enough, kill it:
-    QTimer::singleShot( AUTH_TIMEOUT, this, SLOT( authCheckTimeout() ) );
-
-    if( outbound() )
-    {
-        Q_ASSERT( !m_firstmsg.isNull() );
-        sendMsg( m_firstmsg );
-    }
-    else
-    {
-        sendMsg( Msg::factory( PROTOVER, Msg::SETUP ) );
-    }
-
-    // call readyRead incase we missed the signal in between the servent disconnecting and us
-    // connecting to the signal - won't do anything if there are no bytesAvailable anyway.
-    readyRead();
-}
-
-
-void
-Connection::socketDisconnected()
-{
-    tDebug() << "SOCKET DISCONNECTED" << this->name() << id()
-             << "shutdown will happen after incoming queue empties."
-             << "bytesavail:" << m_sock->bytesAvailable()
-             << "bytesRecvd" << bytesReceived();
-
-    m_peer_disconnected = true;
-    emit socketClosed();
-
-    if( m_msgprocessor_in.length() == 0 && m_sock->bytesAvailable() == 0 )
-    {
-        handleIncomingQueueEmpty();
-        actualShutdown();
-    }
-}
-
-
-void
-Connection::socketDisconnectedError( QAbstractSocket::SocketError e )
-{
-    qDebug() << "SOCKET ERROR CODE" << e << this->name() << "CALLING Connection::shutdown(false)";
-
-    if ( e == QAbstractSocket::RemoteHostClosedError )
-        return;
-
-    m_peer_disconnected = true;
-
-    emit socketErrored(e);
-    emit socketClosed();
-
-    shutdown( false );
-}
-
-
-QString
-Connection::id() const
-{
-    return m_id;
-}
-
-
-void
-Connection::setId( const QString& id )
-{
-    m_id = id;
-}
-
-
-void
-Connection::readyRead()
-{
-//    qDebug() << "readyRead, bytesavail:" << m_sock->bytesAvailable();
-
-    if( m_msg.isNull() )
-    {
-        if( m_sock->bytesAvailable() < Msg::headerSize() )
-            return;
-
-        char msgheader Msg::headerSize() ;
-        if( m_sock->read( (char*) &msgheader, Msg::headerSize() ) != Msg::headerSize() )
-        {
-            qDebug() << "Failed reading msg header";
-            this->markAsFailed();
-            return;
-        }
-
-        m_msg = Msg::begin( (char*) &msgheader );
-        m_rx_bytes += Msg::headerSize();
-    }
-
-    if( m_sock->bytesAvailable() < m_msg->length() )
-        return;
-
-    QByteArray ba = m_sock->read( m_msg->length() );
-    if( ba.length() != (qint32)m_msg->length() )
-    {
-        qDebug() << "Failed to read full msg payload";
-        this->markAsFailed();
-        return;
-    }
-    m_msg->fill( ba );
-    m_rx_bytes += ba.length();
-
-    handleReadMsg(); // process m_msg and clear() it
-
-    // since there is no explicit threading, use the event loop to schedule this:
-    if( m_sock->bytesAvailable() )
-    {
-        QTimer::singleShot( 0, this, SLOT( readyRead() ) );
-    }
-}
-
-
-void
-Connection::handleReadMsg()
-{
-    if( outbound() == false &&
-        m_msg->is( Msg::SETUP ) &&
-        m_msg->payload() == "ok" )
-    {
-        m_ready = true;
-        qDebug() << "Connection" << id() << "READY";
-        setup();
-        emit ready();
-    }
-    else if( !m_ready &&
-             outbound() &&
-             m_msg->is( Msg::SETUP ) )
-    {
-        if( m_msg->payload() == PROTOVER )
-        {
-            sendMsg( Msg::factory( "ok", Msg::SETUP ) );
-            m_ready = true;
-            qDebug() << "Connection" << id() << "READY";
-            setup();
-            emit ready();
-        }
-        else
-        {
-            sendMsg( Msg::factory( "{\"method\":\"protovercheckfail\"}", Msg::JSON | Msg::SETUP ) );
-            shutdown( true );
-        }
-    }
-    else
-    {
-        m_msgprocessor_in.append( m_msg );
-    }
-
-    m_msg.clear();
-}
-
-
-void
-Connection::sendMsg( QVariant j )
-{
-    if( m_do_shutdown )
-        return;
-
-    QJson::Serializer serializer;
-    const QByteArray payload = serializer.serialize( j );
-    sendMsg( Msg::factory( payload, Msg::JSON ) );
-}
-
-
-void
-Connection::sendMsg( msg_ptr msg )
-{
-    if( m_do_shutdown )
-    {
-        qDebug() << Q_FUNC_INFO << "SHUTTING DOWN, NOT SENDING msg flags:"
-                << (int)msg->flags() << "length:" << msg->length() << id();
-        return;
-    }
-
-    m_tx_bytes_requested += msg->length() + Msg::headerSize();
-    m_msgprocessor_out.append( msg );
-}
-
-
-void
-Connection::sendMsg_now( msg_ptr msg )
-{
-    //qDebug() << Q_FUNC_INFO << thread() << QThread::currentThread();
-    Q_ASSERT( QThread::currentThread() == thread() );
-//    Q_ASSERT( this->isRunning() );
-
-    if ( m_sock.isNull() || !m_sock->isOpen() || !m_sock->isWritable() )
-    {
-        qDebug() << "***** Socket problem, whilst in sendMsg(). Cleaning up. *****";
-        shutdown( false );
-        return;
-    }
-
-    if ( !msg->write( m_sock.data() ) )
-    {
-        //qDebug() << "Error writing to socket in sendMsg() *************";
-        shutdown( false );
-        return;
-    }
-}
-
-
-void
-Connection::bytesWritten( qint64 i )
-{
-    m_tx_bytes += i;
-    // if we are waiting to shutdown, and have sent all queued data, do actual shutdown:
-    if ( m_do_shutdown && m_tx_bytes == m_tx_bytes_requested )
-        actualShutdown();
-}
-
-
-void
-Connection::calcStats()
-{
-    int elapsed = m_statstimer_mark.restart(); // ms since last calc
-
-    m_stats_tx_bytes_per_sec = (float)1000 * ( (m_tx_bytes - m_tx_bytes_last) / (float)elapsed );
-    m_stats_rx_bytes_per_sec = (float)1000 * ( (m_rx_bytes - m_rx_bytes_last) / (float)elapsed );
-
-    m_rx_bytes_last = m_rx_bytes;
-    m_tx_bytes_last = m_tx_bytes;
-
-    emit statsTick( m_stats_tx_bytes_per_sec, m_stats_rx_bytes_per_sec );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/connection.h Deleted

@@ -1,151 +0,0 @@
-/* === 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
- *   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 CONNECTION_H
-#define CONNECTION_H
-
-#include <QtCore/QSharedPointer>
-#include <QtNetwork/QTcpSocket>
-#include <QtNetwork/QHostAddress>
-#include <QtCore/QVariant>
-#include <QtCore/QVariantMap>
-#include <QtCore/QString>
-#include <QtCore/QDataStream>
-#include <QtCore/QtEndian>
-#include <QtCore/QTimer>
-#include <QtCore/QTime>
-#include <QtCore/QPointer>
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-#include <qjson/qobjecthelper.h>
-
-#include "msg.h"
-#include "msgprocessor.h"
-
-#include "dllmacro.h"
-
-class Servent;
-
-class DLLEXPORT Connection : public QObject
-{
-Q_OBJECT
-
-public:
-
-    Connection( Servent* parent );
-    virtual ~Connection();
-    virtual Connection* clone() = 0;
-
-    QString id() const;
-    void setId( const QString& );
-
-    void setFirstMessage( const QVariant& m );
-    void setFirstMessage( msg_ptr m );
-    msg_ptr firstMessage() const { return m_firstmsg; };
-
-    const QPointer<QTcpSocket>& socket() { return m_sock; };
-
-    void setOutbound( bool o ) { m_outbound = o; };
-    bool outbound() const { return m_outbound; }
-
-    Servent* servent() { return m_servent; };
-
-    // get public port of remote peer:
-    int peerPort() { return m_peerport; };
-    void setPeerPort( int p ) { m_peerport = p; };
-
-    void markAsFailed();
-
-    void setName( const QString& n ) { m_name = n; };
-    QString name() const { return m_name; };
-
-    void setOnceOnly( bool b ) { m_onceonly = b; };
-    bool onceOnly() const { return m_onceonly; };
-
-    bool isReady() const { return m_ready; } ;
-    bool isRunning() const { return m_sock != 0; }
-
-    qint64 bytesSent() const { return m_tx_bytes; }
-    qint64 bytesReceived() const { return m_rx_bytes; }
-
-    void setMsgProcessorModeOut( quint32 m ) { m_msgprocessor_out.setMode( m ); }
-    void setMsgProcessorModeIn( quint32 m ) { m_msgprocessor_in.setMode( m ); }
-
-    const QHostAddress peerIpAddress() const { return m_peerIpAddress; }
-
-signals:
-    void ready();
-    void failed();
-    void finished();
-    void statsTick( qint64 tx_bytes_sec, qint64 rx_bytes_sec );
-    void socketClosed();
-    void socketErrored( QAbstractSocket::SocketError );
-
-protected:
-    virtual void setup() = 0;
-
-protected slots:
-    virtual void handleMsg( msg_ptr msg ) = 0;
-
-public slots:
-    virtual void start( QTcpSocket* sock );
-    void sendMsg( QVariant );
-    void sendMsg( msg_ptr );
-
-    void shutdown( bool waitUntilSentAll = false );
-
-private slots:
-    void handleIncomingQueueEmpty();
-    void sendMsg_now( msg_ptr );
-    void socketDisconnected();
-    void socketDisconnectedError( QAbstractSocket::SocketError );
-    void readyRead();
-    void doSetup();
-    void authCheckTimeout();
-    void bytesWritten( qint64 );
-    void calcStats();
-
-protected:
-    QPointer<QTcpSocket> m_sock;
-    int m_peerport;
-    msg_ptr m_msg;
-    QJson::Parser parser;
-    Servent* m_servent;
-    bool m_outbound, m_ready, m_onceonly;
-    msg_ptr m_firstmsg;
-    QString m_name;
-    QHostAddress m_peerIpAddress;
-
-private:
-    void handleReadMsg();
-    void actualShutdown();
-    bool m_do_shutdown, m_actually_shutting_down, m_peer_disconnected;
-    qint64 m_tx_bytes, m_tx_bytes_requested;
-    qint64 m_rx_bytes;
-    QString m_id;
-
-    QTimer* m_statstimer;
-    QTime m_statstimer_mark;
-    qint64 m_stats_tx_bytes_per_sec, m_stats_rx_bytes_per_sec;
-    qint64 m_rx_bytes_last, m_tx_bytes_last;
-
-    MsgProcessor m_msgprocessor_in, m_msgprocessor_out;
-};
-
-#endif // CONNECTION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/controlconnection.cpp Deleted

@@ -1,310 +0,0 @@
-/* === 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
- *   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 "controlconnection.h"
-
-#include "streamconnection.h"
-#include "database/database.h"
-#include "database/databasecommand_collectionstats.h"
-#include "dbsyncconnection.h"
-#include "sourcelist.h"
-#include "network/dbsyncconnection.h"
-#include "network/servent.h"
-#include "sip/SipHandler.h"
-#include "utils/logger.h"
-
-#define TCP_TIMEOUT 600
-
-using namespace Tomahawk;
-
-
-ControlConnection::ControlConnection( Servent* parent, const QHostAddress &ha )
-    : Connection( parent )
-    , m_dbsyncconn( 0 )
-    , m_registered( false )
-    , m_pingtimer( 0 )
-{
-    qDebug() << "CTOR controlconnection";
-    setId("ControlConnection()");
-
-    // auto delete when connection closes:
-    connect( this, SIGNAL( finished() ), SLOT( deleteLater() ) );
-
-    this->setMsgProcessorModeIn( MsgProcessor::UNCOMPRESS_ALL | MsgProcessor::PARSE_JSON );
-    this->setMsgProcessorModeOut( MsgProcessor::COMPRESS_IF_LARGE );
-
-    m_peerIpAddress = ha;
-}
-
-
-ControlConnection::ControlConnection( Servent* parent, const QString &ha )
-    : Connection( parent )
-    , m_dbsyncconn( 0 )
-    , m_registered( false )
-    , m_pingtimer( 0 )
-{
-    qDebug() << "CTOR controlconnection";
-    setId("ControlConnection()");
-
-    // auto delete when connection closes:
-    connect( this, SIGNAL( finished() ), SLOT( deleteLater() ) );
-
-    this->setMsgProcessorModeIn( MsgProcessor::UNCOMPRESS_ALL | MsgProcessor::PARSE_JSON );
-    this->setMsgProcessorModeOut( MsgProcessor::COMPRESS_IF_LARGE );
-
-    if ( !ha.isEmpty() )
-    {
-        QHostAddress qha( ha );
-        if ( !qha.isNull() )
-            m_peerIpAddress = qha;
-        else
-        {
-            QHostInfo qhi = QHostInfo::fromName( ha );
-            if ( !qhi.addresses().isEmpty() )
-                m_peerIpAddress = qhi.addresses().first();
-        }
-    }
-}
-
-
-ControlConnection::~ControlConnection()
-{
-    qDebug() << "DTOR controlconnection";
-
-    if ( !m_source.isNull() )
-        m_source->setOffline();
-
-    delete m_pingtimer;
-    m_servent->unregisterControlConnection( this );
-    if ( m_dbsyncconn )
-        m_dbsyncconn->deleteLater();
-}
-
-source_ptr
-ControlConnection::source() const
-{
-    return m_source;
-}
-
-Connection*
-ControlConnection::clone()
-{
-    ControlConnection* clone = new ControlConnection( servent(), m_peerIpAddress.toString() );
-    clone->setOnceOnly( onceOnly() );
-    clone->setName( name() );
-    return clone;
-}
-
-
-void
-ControlConnection::setup()
-{
-    qDebug() << Q_FUNC_INFO << id() << name();
-
-    if ( !m_source.isNull() )
-    {
-        qDebug() << "This source seems to be online already.";
-        Q_ASSERT( false );
-        return;
-    }
-
-    QString friendlyName = name();
-
-    tDebug() << "Detected name:" << name() << friendlyName << m_sock->peerAddress();
-
-    // setup source and remote collection for this peer
-    m_source = SourceList::instance()->get( id(), friendlyName );
-    m_source->setControlConnection( this );
-
-    // delay setting up collection/etc until source is synced.
-    // we need it DB synced so it has an ID + exists in DB.
-    connect( m_source.data(), SIGNAL( syncedWithDatabase() ),
-                                SLOT( registerSource() ), Qt::QueuedConnection );
-
-    m_source->setOnline();
-
-    m_pingtimer = new QTimer;
-    m_pingtimer->setInterval( 5000 );
-    connect( m_pingtimer, SIGNAL( timeout() ), SLOT( onPingTimer() ) );
-    m_pingtimer->start();
-    m_pingtimer_mark.start();
-}
-
-
-// source was synced to DB, set it up properly:
-void
-ControlConnection::registerSource()
-{
-    qDebug() << Q_FUNC_INFO << m_source->id();
-    Source* source = (Source*) sender();
-    Q_UNUSED( source )
-    Q_ASSERT( source == m_source.data() );
-
-#ifndef ENABLE_HEADLESS
-//    qDebug() << Q_FUNC_INFO << "Setting avatar ... " << name() << !SipHandler::instance()->avatar( name() ).isNull();
-    if( !SipHandler::instance()->avatar( name() ).isNull() )
-    {
-        source->setAvatar( SipHandler::instance()->avatar( name() ) );
-    }
-#endif
-
-    m_registered = true;
-    m_servent->registerControlConnection( this );
-    setupDbSyncConnection();
-}
-
-
-void
-ControlConnection::setupDbSyncConnection( bool ondemand )
-{
-    qDebug() << Q_FUNC_INFO << ondemand << m_source->id() << m_dbconnkey << m_dbsyncconn << m_registered;
-
-    if ( m_dbsyncconn || !m_registered )
-        return;
-
-    Q_ASSERT( m_source->id() > 0 );
-
-    if( !m_dbconnkey.isEmpty() )
-    {
-        qDebug() << "Connecting to DBSync offer from peer...";
-        m_dbsyncconn = new DBSyncConnection( m_servent, m_source );
-
-        m_servent->createParallelConnection( this, m_dbsyncconn, m_dbconnkey );
-        m_dbconnkey.clear();
-    }
-    else if( !outbound() || ondemand ) // only one end makes the offer
-    {
-        qDebug() << "Offering a DBSync key to peer...";
-        m_dbsyncconn = new DBSyncConnection( m_servent, m_source );
-
-        QString key = uuid();
-        m_servent->registerOffer( key, m_dbsyncconn );
-        QVariantMap m;
-        m.insert( "method", "dbsync-offer" );
-        m.insert( "key", key );
-        sendMsg( m );
-    }
-
-    if ( m_dbsyncconn )
-    {
-        connect( m_dbsyncconn, SIGNAL( finished() ),
-                 m_dbsyncconn,   SLOT( deleteLater() ) );
-
-        connect( m_dbsyncconn, SIGNAL( destroyed( QObject* ) ),
-                                 SLOT( dbSyncConnFinished( QObject* ) ), Qt::DirectConnection );
-    }
-}
-
-
-void
-ControlConnection::dbSyncConnFinished( QObject* c )
-{
-    qDebug() << Q_FUNC_INFO << "DBSync connection closed (for now)";
-    if( (DBSyncConnection*)c == m_dbsyncconn )
-    {
-        //qDebug() << "Setting m_dbsyncconn to NULL";
-        m_dbsyncconn = NULL;
-    }
-    else
-        qDebug() << "Old DbSyncConn destroyed?!";
-}
-
-
-DBSyncConnection*
-ControlConnection::dbSyncConnection()
-{
-    qDebug() << Q_FUNC_INFO << m_source->id();
-    if ( !m_dbsyncconn )
-    {
-        setupDbSyncConnection( true );
-//        Q_ASSERT( m_dbsyncconn );
-    }
-
-    return m_dbsyncconn;
-}
-
-
-void
-ControlConnection::handleMsg( msg_ptr msg )
-{
-    if ( msg->is( Msg::PING ) )
-    {
-        // qDebug() << "Received Connection PING, nice." << m_pingtimer_mark.elapsed();
-        m_pingtimer_mark.restart();
-        return;
-    }
-
-    // if small and not compresed, print it out for debug
-    if( msg->length() < 1024 && !msg->is( Msg::COMPRESSED ) )
-    {
-        qDebug() << id() << "got msg:" << QString::fromAscii( msg->payload() );
-    }
-
-    // All control connection msgs are JSON
-    if( !msg->is( Msg::JSON ) )
-    {
-        Q_ASSERT( msg->is( Msg::JSON ) );
-        markAsFailed();
-        return;
-    }
-
-    QVariantMap m = msg->json().toMap();
-    if( !m.isEmpty() )
-    {
-        if( m.value("conntype").toString() == "request-offer" )
-        {
-            QString theirkey = m"key".toString();
-            QString ourkey   = m"offer".toString();
-            QString theirdbid = m"controlid".toString();
-            servent()->reverseOfferRequest( this, theirdbid, ourkey, theirkey );
-        }
-        else if( m.value( "method" ).toString() == "dbsync-offer" )
-        {
-            m_dbconnkey = m.value( "key" ).toString() ;
-            setupDbSyncConnection();
-        }
-        else if( m.value( "method" ) == "protovercheckfail" )
-        {
-            qDebug() << "*** Remote peer protocol version mismatch, connection closed";
-            shutdown( true );
-            return;
-        }
-        else
-        {
-            qDebug() << id() << "Unhandled msg:" << QString::fromAscii( msg->payload() );
-        }
-
-        return;
-    }
-
-    qDebug() << id() << "Invalid msg:" << QString::fromAscii(msg->payload());
-}
-
-
-
-void
-ControlConnection::onPingTimer()
-{
-    if ( m_pingtimer_mark.elapsed() >= TCP_TIMEOUT * 1000 )
-    {
-        qDebug() << "Timeout reached! Shutting down connection to" << m_source->friendlyName();
-        shutdown( true );
-    }
-
-    sendMsg( Msg::factory( QByteArray(), Msg::PING ) );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/controlconnection.h Deleted

@@ -1,75 +0,0 @@
-/* === 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
- *   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/>.
- */
-
-/*
-    One ControlConnection always remains open to each peer.
-
-    They arrange connections/reverse connections, inform us
-    when the peer goes offline, and own+setup DBSyncConnections.
-
-*/
-#ifndef CONTROLCONNECTION_H
-#define CONTROLCONNECTION_H
-
-#include "typedefs.h"
-#include "connection.h"
-
-#include "dllmacro.h"
-
-class Servent;
-class DBSyncConnection;
-
-class DLLEXPORT ControlConnection : public Connection
-{
-Q_OBJECT
-
-public:
-    explicit ControlConnection( Servent* parent = 0, const QHostAddress &ha = QHostAddress() );
-    explicit ControlConnection( Servent* parent = 0, const QString &ha = QString() );
-    ~ControlConnection();
-    Connection* clone();
-
-    DBSyncConnection* dbSyncConnection();
-
-    Tomahawk::source_ptr source() const;
-
-protected:
-    virtual void setup();
-
-protected slots:
-    virtual void handleMsg( msg_ptr msg );
-
-private slots:
-    void dbSyncConnFinished( QObject* c );
-    void registerSource();
-    void onPingTimer();
-
-private:
-    void setupDbSyncConnection( bool ondemand = false );
-
-    Tomahawk::source_ptr m_source;
-    DBSyncConnection* m_dbsyncconn;
-
-    QString m_dbconnkey;
-    bool m_registered;
-
-    QTimer* m_pingtimer;
-    QTime m_pingtimer_mark;
-};
-
-#endif // CONTROLCONNECTION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/dbsyncconnection.cpp Deleted

@@ -1,305 +0,0 @@
-/* === 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
- *   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/>.
- */
-
-/*
-    Database syncing using the oplog table.
-    =======================================
-    Load the last GUID we applied for the peer, tell them it.
-    In return, they send us all new ops since that guid.
-
-    We then apply those new ops to our cache of their data
-
-    Synced.
-
-*/
-
-#include "dbsyncconnection.h"
-
-#include "database/database.h"
-#include "database/databasecommand.h"
-#include "database/databasecommand_collectionstats.h"
-#include "database/databasecommand_loadops.h"
-#include "remotecollection.h"
-#include "source.h"
-#include "sourcelist.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-DBSyncConnection::DBSyncConnection( Servent* s, const source_ptr& src )
-    : Connection( s )
-    , m_source( src )
-    , m_state( UNKNOWN )
-{
-    qDebug() << Q_FUNC_INFO << src->id() << thread();
-
-    connect( this,            SIGNAL( stateChanged( DBSyncConnection::State, DBSyncConnection::State, QString ) ),
-             m_source.data(),   SLOT( onStateChanged( DBSyncConnection::State, DBSyncConnection::State, QString ) ) );
-    connect( m_source.data(), SIGNAL( commandsFinished() ),
-             this,              SLOT( lastOpApplied() ) );
-
-    this->setMsgProcessorModeIn( MsgProcessor::PARSE_JSON | MsgProcessor::UNCOMPRESS_ALL );
-
-    // msgs are stored compressed in the db, so not typically needed here, but doesnt hurt:
-    this->setMsgProcessorModeOut( MsgProcessor::COMPRESS_IF_LARGE );
-}
-
-
-DBSyncConnection::~DBSyncConnection()
-{
-    tDebug() << "DTOR" << Q_FUNC_INFO << m_source->id() << m_source->friendlyName();
-    m_state = SHUTDOWN;
-}
-
-
-void
-DBSyncConnection::changeState( State newstate )
-{
-    if ( m_state == SHUTDOWN )
-        return;
-
-    State s = m_state;
-    m_state = newstate;
-    qDebug() << "DBSYNC State changed from" << s << "to" << newstate << "- source:" << m_source->id();
-    emit stateChanged( newstate, s, "" );
-}
-
-
-void
-DBSyncConnection::setup()
-{
-    setId( QString( "DBSyncConnection/%1" ).arg( socket()->peerAddress().toString() ) );
-    check();
-}
-
-
-void
-DBSyncConnection::trigger()
-{
-    // if we're still setting up the connection, do nothing - we sync on first connect anyway:
-    if ( !isRunning() )
-        return;
-
-    QMetaObject::invokeMethod( this, "sendMsg", Qt::QueuedConnection,
-                               Q_ARG( msg_ptr, Msg::factory( "{\"method\":\"trigger\"}", Msg::JSON ) ) );
-}
-
-
-void
-DBSyncConnection::check()
-{
-    qDebug() << Q_FUNC_INFO << this << m_source->id();
-    if ( m_state != UNKNOWN && m_state != SYNCED )
-    {
-        qDebug() << "Syncing in progress already.";
-        return;
-    }
-    if ( m_state == SHUTDOWN )
-    {
-        qDebug() << "Aborting sync due to shutdown.";
-        return;
-    }
-
-    m_uscache.clear();
-    changeState( CHECKING );
-
-    // load last-modified etc data for our collection and theirs from our DB:
-    DatabaseCommand_CollectionStats* cmd_us = new DatabaseCommand_CollectionStats( SourceList::instance()->getLocal() );
-    connect( cmd_us, SIGNAL( done( QVariantMap ) ), SLOT( gotUs( QVariantMap ) ) );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd_us) );
-
-    if ( m_source->lastCmdGuid().isEmpty() )
-    {
-        DatabaseCommand_CollectionStats* cmd_them = new DatabaseCommand_CollectionStats( m_source );
-        connect( cmd_them, SIGNAL( done( QVariantMap ) ), SLOT( gotThem( QVariantMap ) ) );
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd_them) );
-    }
-    else
-    {
-        fetchOpsData( m_source->lastCmdGuid() );
-    }
-}
-
-
-/// Called once we've loaded our mtimes etc from the DB for our local
-/// collection - send them to the remote peer to compare.
-void
-DBSyncConnection::gotUs( const QVariantMap& m )
-{
-    Q_UNUSED( m )
-    if ( !m_uscache.empty() )
-        sendOps();
-}
-
-
-/// Called once we've loaded our cached data about their collection
-void
-DBSyncConnection::gotThem( const QVariantMap& m )
-{
-    fetchOpsData( m.value( "lastop" ).toString() );
-}
-
-
-void
-DBSyncConnection::fetchOpsData( const QString& sinceguid )
-{
-    changeState( FETCHING );
-
-    tLog() << "Sending a FETCHOPS cmd since:" << sinceguid << "- source:" << m_source->id();
-
-    QVariantMap msg;
-    msg.insert( "method", "fetchops" );
-    msg.insert( "lastop", sinceguid );
-    sendMsg( msg );
-}
-
-
-void
-DBSyncConnection::handleMsg( msg_ptr msg )
-{
-    Q_ASSERT( !msg->is( Msg::COMPRESSED ) );
-
-    if ( m_state == FETCHING )
-        changeState( PARSING );
-
-    // "everything is synced" indicated by non-json msg containing "ok":
-    if ( !msg->is( Msg::JSON ) &&
-         msg->is( Msg::DBOP ) &&
-         msg->payload() == "ok" )
-    {
-        changeState( SYNCED );
-
-        // calc the collection stats, to updates the "X tracks" in the sidebar etc
-        // this is done automatically if you run a dbcmd to add files.
-        DatabaseCommand_CollectionStats* cmd = new DatabaseCommand_CollectionStats( m_source );
-        connect( cmd,           SIGNAL( done( const QVariantMap & ) ),
-                 m_source.data(), SLOT( setStats( const QVariantMap& ) ), Qt::QueuedConnection );
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
-        return;
-    }
-
-    Q_ASSERT( msg->is( Msg::JSON ) );
-
-    QVariantMap m = msg->json().toMap();
-    if ( m.empty() )
-    {
-        tLog() << "Failed to parse msg in dbsync" << m_source->id() << m_source->friendlyName();
-        Q_ASSERT( false );
-        return;
-    }
-
-    // a db sync op msg
-    if ( msg->is( Msg::DBOP ) )
-    {
-        DatabaseCommand* cmd = DatabaseCommand::factory( m, m_source );
-        if ( cmd )
-        {
-            QSharedPointer<DatabaseCommand> cmdsp = QSharedPointer<DatabaseCommand>(cmd);
-            m_source->addCommand( cmdsp );
-        }
-
-        if ( !msg->is( Msg::FRAGMENT ) ) // last msg in this batch
-        {
-            changeState( SAVING ); // just DB work left to complete
-            m_source->executeCommands();
-        }
-        return;
-    }
-
-    if ( m.value( "method" ).toString() == "fetchops" )
-    {
-        m_uscache = m;
-        sendOps();
-        return;
-    }
-
-    if ( m.value( "method" ).toString() == "trigger" )
-    {
-        tLog( LOGVERBOSE ) << "Got trigger msg on dbsyncconnection, checking for new stuff.";
-        check();
-        return;
-    }
-
-    tLog() << Q_FUNC_INFO << "Unhandled msg:" << msg->payload();
-    Q_ASSERT( false );
-}
-
-
-void
-DBSyncConnection::lastOpApplied()
-{
-    changeState( SYNCED );
-    // check again, until peer responds we have no new ops to process
-    check();
-}
-
-
-/// request new copies of anything we've cached that is stale
-void
-DBSyncConnection::sendOps()
-{
-    tLog( LOGVERBOSE ) << "Will send peer" << m_source->id() << "all ops since" << m_uscache.value( "lastop" ).toString();
-
-    source_ptr src = SourceList::instance()->getLocal();
-
-    DatabaseCommand_loadOps* cmd = new DatabaseCommand_loadOps( src, m_uscache.value( "lastop" ).toString() );
-    connect( cmd, SIGNAL( done( QString, QString, QList< dbop_ptr > ) ),
-                    SLOT( sendOpsData( QString, QString, QList< dbop_ptr > ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-DBSyncConnection::sendOpsData( QString sinceguid, QString lastguid, QList< dbop_ptr > ops )
-{
-    if ( m_lastSentOp == lastguid )
-        ops.clear();
-
-    m_lastSentOp = lastguid;
-    if ( ops.length() == 0 )
-    {
-        tLog( LOGVERBOSE ) << "Sending ok" << m_source->id() << m_source->friendlyName();
-        sendMsg( Msg::factory( "ok", Msg::DBOP ) );
-        return;
-    }
-
-    tLog( LOGVERBOSE ) << Q_FUNC_INFO << sinceguid << lastguid << "Num ops to send:" << ops.length();
-
-    int i;
-    for( i = 0; i < ops.length(); ++i )
-    {
-        quint8 flags = Msg::JSON | Msg::DBOP;
-
-        if ( ops.at( i )->compressed )
-            flags |= Msg::COMPRESSED;
-        if ( i != ops.length() - 1 )
-            flags |= Msg::FRAGMENT;
-
-        sendMsg( Msg::factory( ops.at( i )->payload, flags ) );
-    }
-}
-
-
-Connection*
-DBSyncConnection::clone()
-{
-    Q_ASSERT( false );
-    return 0;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/dbsyncconnection.h Deleted

@@ -1,89 +0,0 @@
-/* === 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
- *   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 DBSYNCCONNECTION_H
-#define DBSYNCCONNECTION_H
-
-#include <QObject>
-#include <QTimer>
-#include <QSharedPointer>
-#include <QIODevice>
-
-#include "network/connection.h"
-#include "database/op.h"
-#include "typedefs.h"
-
-class DatabaseCommand;
-
-class DBSyncConnection : public Connection
-{
-Q_OBJECT
-
-public:
-    enum State
-    {
-        UNKNOWN,
-        CHECKING,
-        FETCHING,
-        PARSING,
-        SAVING,
-        SYNCED,
-        SCANNING,
-        SHUTDOWN
-    };
-
-    explicit DBSyncConnection( Servent* s, const Tomahawk::source_ptr& src );
-    virtual ~DBSyncConnection();
-
-    void setup();
-    Connection* clone();
-
-signals:
-    void stateChanged( DBSyncConnection::State newstate, DBSyncConnection::State oldstate, const QString& info );
-
-protected slots:
-    virtual void handleMsg( msg_ptr msg );
-
-public slots:
-    void sendOps();
-    /// trigger a re-sync to pick up any new ops
-    void trigger();
-
-private slots:
-    void gotUs( const QVariantMap& m );
-    void gotThem( const QVariantMap& m );
-
-    void fetchOpsData( const QString& sinceguid );
-    void sendOpsData( QString sinceguid, QString lastguid, QList< dbop_ptr > ops );
-    void lastOpApplied();
-
-    void check();
-
-private:
-    void synced();
-    void changeState( State newstate );
-
-    Tomahawk::source_ptr m_source;
-    QVariantMap m_uscache;
-
-    QString m_lastSentOp;
-
-    State m_state;
-};
-
-#endif // DBSYNCCONNECTION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/msgprocessor.cpp Deleted

@@ -1,137 +0,0 @@
-/* === 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
- *   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 "msgprocessor.h"
-
-#include "network/servent.h"
-#include "utils/logger.h"
-
-
-MsgProcessor::MsgProcessor( quint32 mode, quint32 t ) :
-    QObject(), m_mode( mode ), m_threshold( t ), m_totmsgsize( 0 )
-{
-    moveToThread( Servent::instance()->thread() );
-}
-
-
-void
-MsgProcessor::append( msg_ptr msg )
-{
-    if( QThread::currentThread() != thread() )
-    {
-        qDebug() << "reinvoking msgprocessor::append in correct thread, ie not" << QThread::currentThread();
-        QMetaObject::invokeMethod( this, "append", Qt::QueuedConnection, Q_ARG(msg_ptr, msg) );
-        return;
-    }
-
-    m_msgs.append( msg );
-    m_msg_ready.insert( msg.data(), false );
-
-    m_totmsgsize += msg->payload().length();
-
-    if( m_mode & NOTHING )
-    {
-        //qDebug() << "MsgProcessor::NOTHING";
-        handleProcessedMsg( msg );
-        return;
-    }
-
-    QFuture<msg_ptr> fut = QtConcurrent::run(&MsgProcessor::process, msg, m_mode, m_threshold);
-    QFutureWatcher<msg_ptr> * watcher = new QFutureWatcher<msg_ptr>;
-    connect( watcher, SIGNAL( finished() ),
-             this, SLOT( processed() ),
-             Qt::QueuedConnection );
-
-    watcher->setFuture( fut );
-}
-
-
-void
-MsgProcessor::processed()
-{
-    QFutureWatcher<msg_ptr> * watcher = (QFutureWatcher<msg_ptr> *) sender();
-    msg_ptr msg = watcher->result();
-    watcher->deleteLater();
-    handleProcessedMsg( msg );
-}
-
-
-void
-MsgProcessor::handleProcessedMsg( msg_ptr msg )
-{
-    Q_ASSERT( QThread::currentThread() == thread() );
-
-    m_msg_ready.insert( msg.data(), true );
-
-    while( !m_msgs.isEmpty() )
-    {
-        if( m_msg_ready.value( m_msgs.first().data() ) )
-        {
-            msg_ptr m = m_msgs.takeFirst();
-            m_msg_ready.remove( m.data() );
-            //qDebug() << Q_FUNC_INFO << "totmsgsize:" << m_totmsgsize;
-            emit ready( m );
-        }
-        else
-        {
-            return;
-        }
-    }
-
-    //qDebug() << Q_FUNC_INFO << "EMPTY, no msgs left.";
-    emit empty();
-}
-
-
-/// This method is run by QtConcurrent:
-msg_ptr
-MsgProcessor::process( msg_ptr msg, quint32 mode, quint32 threshold )
-{
-    // uncompress if needed
-    if( (mode & UNCOMPRESS_ALL) && msg->is( Msg::COMPRESSED ) )
-    {
-//        qDebug() << "MsgProcessor::UNCOMPRESSING";
-        msg->m_payload = qUncompress( msg->payload() );
-        msg->m_length  = msg->m_payload.length();
-        msg->m_flags ^= Msg::COMPRESSED;
-    }
-
-    // parse json payload into qvariant if needed
-    if( (mode & PARSE_JSON) &&
-        msg->is( Msg::JSON ) &&
-        msg->m_json_parsed == false )
-    {
-//        qDebug() << "MsgProcessor::PARSING JSON";
-        bool ok;
-        QJson::Parser parser;
-        msg->m_json = parser.parse( msg->payload(), &ok );
-        msg->m_json_parsed = true;
-    }
-
-    // compress if needed
-    if( (mode & COMPRESS_IF_LARGE) &&
-        !msg->is( Msg::COMPRESSED )
-        && msg->length() > threshold )
-    {
-//        qDebug() << "MsgProcessor::COMPRESSING";
-        msg->m_payload = qCompress( msg->payload(), 9 );
-        msg->m_length  = msg->m_payload.length();
-        msg->m_flags |= Msg::COMPRESSED;
-    }
-    return msg;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/msgprocessor.h Deleted

@@ -1,82 +0,0 @@
-/* === 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
- *   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/>.
- */
-
-/*
-    MsgProcessor is a FIFO queue of msg_ptr, you .add() a msg_ptr, and
-    it emits done(msg_ptr) for each msg, preserving the order.
-
-    It can be configured to auto-compress, or de-compress msgs for sending
-    or receiving.
-
-    It uses QtConcurrent, but preserves msg order.
-
-    NOT threadsafe.
-*/
-#ifndef MSGPROCESSOR_H
-#define MSGPROCESSOR_H
-
-#include <QObject>
-#include <QtConcurrentRun>
-#include <QFuture>
-#include <QFutureWatcher>
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-#include <qjson/qobjecthelper.h>
-
-#include "msg.h"
-
-class MsgProcessor : public QObject
-{
-Q_OBJECT
-public:
-    enum Mode
-    {
-        NOTHING = 0,
-        COMPRESS_IF_LARGE = 1,
-        UNCOMPRESS_ALL = 2,
-        PARSE_JSON = 4
-    };
-
-    explicit MsgProcessor( quint32 mode = NOTHING, quint32 t = 512 );
-
-    void setMode( quint32 m ) { m_mode = m ; }
-
-    static msg_ptr process( msg_ptr msg, quint32 mode, quint32 threshold );
-
-    int length() const { return m_msgs.length(); }
-
-signals:
-    void ready( msg_ptr );
-    void empty();
-
-public slots:
-    void append( msg_ptr msg );
-    void processed();
-
-private:
-    void handleProcessedMsg( msg_ptr msg );
-
-    quint32 m_mode;
-    quint32 m_threshold;
-    QList<msg_ptr> m_msgs;
-    QMap< Msg*, bool> m_msg_ready;
-    unsigned int m_totmsgsize;
-};
-
-#endif // MSGPROCESSOR_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/portfwdthread.cpp Deleted

@@ -1,117 +0,0 @@
-/* === 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
- *   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 "portfwdthread.h"
-
-#include "headlesscheck.h"
-
-#include <QNetworkInterface>
-#include <QStringList>
-#include <QTime>
-#include <QTimer>
-
-#include "portfwd/portfwd.h"
-#include "utils/logger.h"
-
-
-PortFwdThread::PortFwdThread( unsigned int port )
-    : QThread()
-    , m_externalPort( 0 )
-    , m_port( port )
-{
-    moveToThread( this );
-    start();
-}
-
-
-PortFwdThread::~PortFwdThread()
-{
-    qDebug() << Q_FUNC_INFO << "waiting for event loop to finish...";
-    quit();
-    wait( 6000 );
-
-    delete m_portfwd;
-}
-
-
-void
-PortFwdThread::work()
-{
-    qsrand( QTime( 0, 0, 0 ).secsTo( QTime::currentTime() ) );
-    m_portfwd = new Portfwd();
-
-    foreach ( QHostAddress ha, QNetworkInterface::allAddresses() )
-    {
-        if( ha.toString() == "127.0.0.1" ) continue;
-        if( ha.toString().contains( ":" ) ) continue; //ipv6
-
-        m_portfwd->addBlockedDevice( ha.toString().toStdString() );
-    }
-
-    // try and pick an available port:
-    if ( m_portfwd->init( 2000 ) )
-    {
-        int tryport = m_port;
-
-        // last.fm office firewall policy hack
-        // (corp. firewall allows outgoing connections to this port,
-        //  so listen on this if you want lastfmers to connect to you)
-        if ( qApp->arguments().contains( "--porthack" ) )
-        {
-            tryport = 3389;
-            m_portfwd->remove( tryport );
-        }
-
-        for ( int r = 0; r < 3; ++r )
-        {
-            qDebug() << "Trying to setup portfwd on" << tryport;
-            if ( m_portfwd->add( tryport, m_port ) )
-            {
-                QString pubip = QString( m_portfwd->external_ip().c_str() ).trimmed();
-                m_externalAddress = QHostAddress( pubip );
-                m_externalPort = tryport;
-                tDebug() << "External servent address detected as" << pubip << ":" << m_externalPort;
-                qDebug() << "Max upstream  " << m_portfwd->max_upstream_bps() << "bps";
-                qDebug() << "Max downstream" << m_portfwd->max_downstream_bps() << "bps";
-                break;
-            }
-            tryport = qAbs( 10000 + 50000 * (float)qrand() / RAND_MAX );
-        }
-    }
-    else
-        tDebug() << "No UPNP Gateway device found?";
-
-    if ( !m_externalPort )
-        tDebug() << "Could not setup fwd for port:" << m_port;
-
-    emit externalAddressDetected( m_externalAddress, m_externalPort );
-}
-
-
-void
-PortFwdThread::run()
-{
-    QTimer::singleShot( 0, this, SLOT( work() ) );
-    exec();
-
-    if ( m_externalPort )
-    {
-        qDebug() << "Unregistering port fwd";
-        m_portfwd->remove( m_externalPort );
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/remotecollection.cpp Deleted

@@ -1,47 +0,0 @@
-/* === 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
- *   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 "remotecollection.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-RemoteCollection::RemoteCollection( source_ptr source, QObject* parent )
-    :  DatabaseCollection( source, parent )
-{
-}
-
-
-// adding/removing is done by dbsyncconnection, and the dbcmd objects that modify
-// the database will make us emit the appropriate signals (tracksAdded etc.)
-void
-RemoteCollection::addTracks( const QList<QVariant>& newitems )
-{
-    Q_UNUSED( newitems );
-    Q_ASSERT( false );
-}
-
-
-void
-RemoteCollection::removeTracks( const QDir& dir )
-{
-    Q_UNUSED( dir );
-    Q_ASSERT( false );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/remotecollection.h Deleted

@@ -1,45 +0,0 @@
-/* === 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
- *   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 REMOTECOLLECTION_H
-#define REMOTECOLLECTION_H
-
-#include "typedefs.h"
-
-#include "network/controlconnection.h"
-#include "database/databasecollection.h"
-
-class RemoteCollection : public DatabaseCollection
-{
-Q_OBJECT
-
-friend class ControlConnection; // for receiveTracks()
-
-public:
-    explicit RemoteCollection( Tomahawk::source_ptr source, QObject* parent = 0 );
-    ~RemoteCollection()
-    {
-        qDebug() << Q_FUNC_INFO;
-    }
-
-public slots:
-    virtual void addTracks( const QList<QVariant>& newitems );
-    virtual void removeTracks( const QDir& dir );
-};
-
-#endif // REMOTECOLLECTION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/servent.cpp Deleted

@@ -1,912 +0,0 @@
-/* === 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
- *   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 "servent.h"
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QMutexLocker>
-#include <QtNetwork/QNetworkInterface>
-#include <QtCore/QFile>
-#include <QtCore/QThread>
-#include <QtNetwork/QNetworkProxy>
-#include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
-
-#include "result.h"
-#include "source.h"
-#include "bufferiodevice.h"
-#include "connection.h"
-#include "controlconnection.h"
-#include "database/database.h"
-#include "streamconnection.h"
-#include "sourcelist.h"
-
-#include "portfwdthread.h"
-#include "tomahawksettings.h"
-#include <aclsystem.h>
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-Servent* Servent::s_instance = 0;
-
-
-Servent*
-Servent::instance()
-{
-    return s_instance;
-}
-
-
-Servent::Servent( QObject* parent )
-    : QTcpServer( parent )
-    , m_port( 0 )
-    , m_externalPort( 0 )
-    , m_ready( false )
-    , m_portfwd( 0 )
-{
-    s_instance = this;
-
-    m_lanHack = qApp->arguments().contains( "--lanhack" );
-    new ACLSystem( this );
-    setProxy( QNetworkProxy::NoProxy );
-
-    {
-    boost::function<QSharedPointer<QIODevice>(result_ptr)> fac =
-        boost::bind( &Servent::localFileIODeviceFactory, this, _1 );
-    this->registerIODeviceFactory( "file", fac );
-    }
-
-    {
-    boost::function<QSharedPointer<QIODevice>(result_ptr)> fac =
-        boost::bind( &Servent::remoteIODeviceFactory, this, _1 );
-    this->registerIODeviceFactory( "servent", fac );
-    }
-
-    {
-    boost::function<QSharedPointer<QIODevice>(result_ptr)> fac =
-        boost::bind( &Servent::httpIODeviceFactory, this, _1 );
-    this->registerIODeviceFactory( "http", fac );
-    }
-}
-
-
-Servent::~Servent()
-{
-    delete m_portfwd;
-}
-
-
-bool
-Servent::startListening( QHostAddress ha, bool upnp, int port )
-{
-    m_port = port;
-    int defPort = TomahawkSettings::instance()->defaultPort();
-
-    // Listen on both the selected port and, if not the same, the default port -- the latter sometimes necessary for zeroconf
-    // TODO: only listen on both when zeroconf sip is enabled
-    // TODO: use a real zeroconf system instead of a simple UDP broadcast?
-    if ( !listen( ha, m_port ) )
-    {
-        if ( m_port != defPort )
-        {
-            if ( !listen( ha, defPort ) )
-            {
-                tLog() << "Failed to listen on both port" << m_port << "and port" << defPort;
-                tLog() << "Error string is:" << errorString();
-                return false;
-            }
-            else
-                m_port = defPort;
-        }
-    }
-
-    tLog() << "Servent listening on port" << m_port << "- servent thread:" << thread()
-           << "- address mode:" << (int)( TomahawkSettings::instance()->externalAddressMode() );
-
-    // --lanhack means to advertise your LAN IP as if it were externally visible
-    if ( TomahawkSettings::instance()->preferStaticHostPort() )
-    {
-        m_externalHostname = TomahawkSettings::instance()->externalHostname();
-        m_externalPort = TomahawkSettings::instance()->externalPort();
-        m_ready = true;
-        emit ready();
-        return true;
-    }
-
-    TomahawkSettings::ExternalAddressMode mode = TomahawkSettings::instance()->externalAddressMode();
-    if ( mode == TomahawkSettings::Upnp && !upnp )
-        mode = TomahawkSettings::Lan;
-
-    switch ( mode )
-    {
-        case TomahawkSettings::Lan:
-            setInternalAddress();
-            break;
-
-        case TomahawkSettings::Upnp:
-            // TODO check if we have a public/internet IP on this machine directly
-            tLog() << "External address mode set to upnp...";
-            m_portfwd = new PortFwdThread( m_port );
-            connect( m_portfwd, SIGNAL( externalAddressDetected( QHostAddress, unsigned int ) ),
-                                  SLOT( setExternalAddress( QHostAddress, unsigned int ) ) );
-            break;
-    }
-
-    return true;
-}
-
-
-QString
-Servent::createConnectionKey( const QString& name, const QString &nodeid, const QString &key, bool onceOnly )
-{
-    Q_ASSERT( this->thread() == QThread::currentThread() );
-
-    QString _key = ( key.isEmpty() ? uuid() : key );
-    ControlConnection* cc = new ControlConnection( this, name );
-    cc->setName( name.isEmpty() ? QString( "KEY(%1)" ).arg( key ) : name );
-    if ( !nodeid.isEmpty() )
-        cc->setId( nodeid );
-    cc->setOnceOnly( onceOnly );
-
-    tDebug( LOGVERBOSE ) << "Creating connection key with name of" << cc->name() << "and id of" << cc->id() << "and key of" << _key << "; key is once only? :" << (onceOnly ? "true" : "false");
-    registerOffer( _key, cc );
-    return _key;
-}
-
-
-bool
-Servent::isValidExternalIP( const QHostAddress& addr ) const
-{
-    QString ip = addr.toString();
-    if ( !m_lanHack && ( ip.startsWith( "10." ) || ip.startsWith( "172.16." ) || ip.startsWith( "192.168." ) ) )
-    {
-        return false;
-    }
-
-    return !addr.isNull();
-}
-
-
-void
-Servent::setInternalAddress()
-{
-    foreach ( QHostAddress ha, QNetworkInterface::allAddresses() )
-    {
-        if ( ha.toString() == "127.0.0.1" )
-            continue;
-        if ( ha.toString().contains( ":" ) )
-            continue; //ipv6
-
-        if ( m_lanHack && isValidExternalIP( ha ) )
-        {
-            tLog() << "LANHACK: set external address to lan address" << ha.toString();
-            setExternalAddress( ha, m_port );
-        }
-        else
-        {
-            m_ready = true;
-            emit ready();
-        }
-        break;
-    }
-}
-
-
-void
-Servent::setExternalAddress( QHostAddress ha, unsigned int port )
-{
-    if ( isValidExternalIP( ha ) )
-    {
-        m_externalAddress = ha;
-        m_externalPort = port;
-    }
-
-    if ( m_externalPort == 0 || !isValidExternalIP( ha ) )
-    {
-        if ( !TomahawkSettings::instance()->externalHostname().isEmpty() &&
-             !TomahawkSettings::instance()->externalPort() == 0 )
-        {
-            m_externalHostname = TomahawkSettings::instance()->externalHostname();
-            m_externalPort = TomahawkSettings::instance()->externalPort();
-            tDebug() << "UPnP failed, have external address/port - falling back" << m_externalHostname << m_externalPort << m_externalAddress;
-        }
-        else
-        {
-            tLog() << "No external access, LAN and outbound connections only!";
-            setInternalAddress();
-            return;
-        }
-    }
-
-    m_ready = true;
-    emit ready();
-}
-
-
-void
-Servent::registerOffer( const QString& key, Connection* conn )
-{
-    m_offerskey = QWeakPointer<Connection>(conn);
-}
-
-
-void
-Servent::registerControlConnection( ControlConnection* conn )
-{
-    m_controlconnections.append( conn );
-}
-
-
-void
-Servent::unregisterControlConnection( ControlConnection* conn )
-{
-    QList<ControlConnection*> n;
-    foreach( ControlConnection* c, m_controlconnections )
-        if( c!=conn )
-            n.append( c );
-
-    m_connectedNodes.removeAll( conn->id() );
-    m_controlconnections = n;
-}
-
-
-ControlConnection*
-Servent::lookupControlConnection( const QString& name )
-{
-    foreach( ControlConnection* c, m_controlconnections )
-        if( c->name() == name )
-            return c;
-
-    return NULL;
-}
-
-
-void
-Servent::incomingConnection( int sd )
-{
-    Q_ASSERT( this->thread() == QThread::currentThread() );
-
-    QTcpSocketExtra* sock = new QTcpSocketExtra;
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Accepting connection, sock" << sock;
-
-    sock->moveToThread( thread() );
-    sock->_disowned = false;
-    sock->_outbound = false;
-    if( !sock->setSocketDescriptor( sd ) )
-    {
-        Q_ASSERT( false );
-        return;
-    }
-
-    connect( sock, SIGNAL( readyRead() ), SLOT( readyRead() ) );
-    connect( sock, SIGNAL( disconnected() ), sock, SLOT( deleteLater() ) );
-}
-
-
-void
-Servent::readyRead()
-{
-    Q_ASSERT( this->thread() == QThread::currentThread() );
-    QTcpSocketExtra* sock = (QTcpSocketExtra*)sender();
-
-    if( sock->_disowned )
-    {
-        return;
-    }
-
-    if( sock->_msg.isNull() )
-    {
-        char msgheader Msg::headerSize() ;
-        if( sock->bytesAvailable() < Msg::headerSize() )
-            return;
-
-        sock->read( (char*) &msgheader, Msg::headerSize() );
-        sock->_msg = Msg::begin( (char*) &msgheader );
-    }
-
-    if( sock->bytesAvailable() < sock->_msg->length() )
-        return;
-
-    QByteArray ba = sock->read( sock->_msg->length() );
-    sock->_msg->fill( ba );
-    Q_ASSERT( sock->_msg->is( Msg::JSON ) );
-
-    ControlConnection* cc = 0;
-    bool ok;
-    QString key, conntype, nodeid, controlid;
-    QVariantMap m = parser.parse( sock->_msg->payload(), &ok ).toMap();
-    if( !ok )
-    {
-        tDebug() << "Invalid JSON on new connection, aborting";
-        goto closeconnection;
-    }
-
-    conntype  = m.value( "conntype" ).toString();
-    key       = m.value( "key" ).toString();
-    nodeid    = m.value( "nodeid" ).toString();
-    controlid = m.value( "controlid" ).toString();
-
-    tDebug( LOGVERBOSE ) << "Incoming connection details:" << m;
-
-    if( !nodeid.isEmpty() ) // only control connections send nodeid
-    {
-        bool dupe = false;
-        if ( m_connectedNodes.contains( nodeid ) )
-            dupe = true;
-
-        foreach( ControlConnection* con, m_controlconnections )
-        {
-            tLog( LOGVERBOSE ) << "known connection:" << con->id() << con->source()->friendlyName();
-            if( con->id() == nodeid )
-            {
-                dupe = true;
-                break;
-            }
-        }
-
-        if ( dupe )
-        {
-            tLog() << "Duplicate control connection detected, dropping:" << nodeid << conntype;
-            goto closeconnection;
-        }
-    }
-
-    foreach( ControlConnection* con, m_controlconnections )
-    {
-        if ( con->id() == controlid )
-        {
-            cc = con;
-            break;
-        }
-    }
-
-    // they connected to us and want something we are offering
-    if ( conntype == "accept-offer" || conntype == "push-offer" )
-    {
-        sock->_msg.clear();
-        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << key << nodeid << "socket peer address = " << sock->peerAddress() << "socket peer name = " << sock->peerName();
-        Connection* conn = claimOffer( cc, nodeid, key, sock->peerAddress() );
-        if( !conn )
-        {
-            tLog() << "claimOffer FAILED, key:" << key << nodeid;
-            goto closeconnection;
-        }
-        tDebug( LOGVERBOSE ) << "claimOffer OK:" << key << nodeid;
-
-        m_connectedNodes << nodeid;
-        if( !nodeid.isEmpty() )
-            conn->setId( nodeid );
-
-        handoverSocket( conn, sock );
-        return;
-    }
-    else
-    {
-        tLog() << "Invalid or unhandled conntype";
-    }
-
-    // fallthru to cleanup:
-closeconnection:
-    tLog() << "Closing incoming connection, something was wrong.";
-    sock->_msg.clear();
-    sock->disconnectFromHost();
-}
-
-
-// creates a new tcp connection to peer from conn, handled by given connector
-// new_conn is responsible for sending the first msg, if needed
-void
-Servent::createParallelConnection( Connection* orig_conn, Connection* new_conn, const QString& key )
-{
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << ", key:" << key << thread() << orig_conn;
-    // if we can connect to them directly:
-    if( orig_conn && orig_conn->outbound() )
-    {
-        connectToPeer( orig_conn->socket()->peerAddress().toString(),
-                       orig_conn->peerPort(),
-                       key,
-                       new_conn );
-    }
-    else // ask them to connect to us:
-    {
-        QString tmpkey = uuid();
-        tLog() << "Asking them to connect to us using" << tmpkey ;
-        registerOffer( tmpkey, new_conn );
-
-        QVariantMap m;
-        m.insert( "conntype", "request-offer" );
-        m.insert( "key", tmpkey );
-        m.insert( "offer", key );
-        m.insert( "port", externalPort() );
-        m.insert( "controlid", Database::instance()->dbid() );
-
-        QJson::Serializer ser;
-        orig_conn->sendMsg( Msg::factory( ser.serialize(m), Msg::JSON ) );
-    }
-}
-
-
-void
-Servent::socketConnected()
-{
-    QTcpSocketExtra* sock = (QTcpSocketExtra*)sender();
-
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << thread() << "socket: " << sock << ", hostaddr: " << sock->peerAddress() << ", hostname: " << sock->peerName();
-
-    Connection* conn = sock->_conn.data();
-    handoverSocket( conn, sock );
-}
-
-
-// transfers ownership of socket to the connection and inits the connection
-void Servent::handoverSocket( Connection* conn, QTcpSocketExtra* sock )
-{
-    Q_ASSERT( conn );
-    Q_ASSERT( sock );
-    Q_ASSERT( conn->socket().isNull() );
-    Q_ASSERT( sock->isValid() );
-
-    disconnect( sock, SIGNAL( readyRead() ),    this, SLOT( readyRead() ) );
-    disconnect( sock, SIGNAL( disconnected() ), sock, SLOT( deleteLater() ) );
-    disconnect( sock, SIGNAL( error( QAbstractSocket::SocketError ) ),
-                this, SLOT( socketError( QAbstractSocket::SocketError ) ) );
-
-    sock->_disowned = true;
-    conn->setOutbound( sock->_outbound );
-    conn->setPeerPort( sock->peerPort() );
-
-    conn->start( sock );
-}
-
-
-void
-Servent::socketError( QAbstractSocket::SocketError e )
-{
-    QTcpSocketExtra* sock = (QTcpSocketExtra*)sender();
-    if ( !sock )
-    {
-        tLog() << "SocketError, sock is null";
-        return;
-    }
-
-    if ( !sock->_conn.isNull() )
-    {
-        Connection* conn = sock->_conn.data();
-        tLog() << "Servent::SocketError:" << e << conn->id() << conn->name();
-
-        if ( !sock->_disowned )
-        {
-            // connection will delete if we already transferred ownership, otherwise:
-            sock->deleteLater();
-        }
-
-        conn->markAsFailed(); // will emit failed, then finished
-    }
-    else
-    {
-        tLog() << "SocketError, connection is null";
-        sock->deleteLater();
-    }
-}
-
-
-void
-Servent::connectToPeer( const QString& ha, int port, const QString &key, const QString& name, const QString& id )
-{
-    Q_ASSERT( this->thread() == QThread::currentThread() );
-
-    ControlConnection* conn = new ControlConnection( this, ha );
-    QVariantMap m;
-    m"conntype"  = "accept-offer";
-    m"key"       = key;
-    m"port"      = externalPort();
-    m"nodeid"    = Database::instance()->dbid();
-
-    conn->setFirstMessage( m );
-    if( name.length() )
-        conn->setName( name );
-    if( id.length() )
-        conn->setId( id );
-
-    connectToPeer( ha, port, key, conn );
-}
-
-
-void
-Servent::connectToPeer( const QString& ha, int port, const QString &key, Connection* conn )
-{
-    tDebug( LOGVERBOSE ) << "Servent::connectToPeer:" << ha << ":" << port
-                         << thread() << QThread::currentThread();
-
-    Q_ASSERT( port > 0 );
-    Q_ASSERT( conn );
-
-    if ( ( ha == m_externalAddress.toString() || ha == m_externalHostname ) &&
-         ( port == m_externalPort ) )
-    {
-        tDebug() << "ERROR: Tomahawk won't try to connect to" << ha << ":" << port << ": identified as ourselves.";
-        return;
-    }
-
-    if( key.length() && conn->firstMessage().isNull() )
-    {
-        QVariantMap m;
-        m"conntype"  = "accept-offer";
-        m"key"       = key;
-        m"port"      = externalPort();
-        m"controlid" = Database::instance()->dbid();
-        conn->setFirstMessage( m );
-    }
-
-    QTcpSocketExtra* sock = new QTcpSocketExtra();
-    sock->_disowned = false;
-    sock->_conn = conn;
-    sock->_outbound = true;
-
-    connect( sock, SIGNAL( connected() ), SLOT( socketConnected() ) );
-    connect( sock, SIGNAL( error( QAbstractSocket::SocketError ) ),
-                     SLOT( socketError( QAbstractSocket::SocketError ) ) );
-
-    if ( !conn->peerIpAddress().isNull() )
-        sock->connectToHost( conn->peerIpAddress(), port, QTcpSocket::ReadWrite );
-    else
-        sock->connectToHost( ha, port, QTcpSocket::ReadWrite );
-    sock->moveToThread( thread() );
-}
-
-
-void
-Servent::reverseOfferRequest( ControlConnection* orig_conn, const QString& theirdbid, const QString& key, const QString& theirkey )
-{
-    Q_ASSERT( this->thread() == QThread::currentThread() );
-
-    tDebug( LOGVERBOSE ) << "Servent::reverseOfferRequest received for" << key;
-    Connection* new_conn = claimOffer( orig_conn, theirdbid, key );
-    if ( !new_conn )
-    {
-        tDebug() << "claimOffer failed, killing requesting connection out of spite";
-        orig_conn->shutdown();
-        return;
-    }
-
-    QVariantMap m;
-    m"conntype"  = "push-offer";
-    m"key"       = theirkey;
-    m"port"      = externalPort();
-    m"controlid" = Database::instance()->dbid();
-    new_conn->setFirstMessage( m );
-    createParallelConnection( orig_conn, new_conn, QString() );
-}
-
-
-// return the appropriate connection for a given offer key, or NULL if invalid
-Connection*
-Servent::claimOffer( ControlConnection* cc, const QString &nodeid, const QString &key, const QHostAddress peer )
-{
-    bool noauth = qApp->arguments().contains( "--noauth" );
-
-    // magic key for stream connections:
-    if( key.startsWith( "FILE_REQUEST_KEY:" ) )
-    {
-        // check if the source IP matches an existing, authenticated connection
-        if ( !noauth && peer != QHostAddress::Any && !isIPWhitelisted( peer ) )
-        {
-            bool authed = false;
-            foreach( ControlConnection* cc, m_controlconnections )
-            {
-                if( cc->socket()->peerAddress() == peer )
-                {
-                    authed = true;
-                    break;
-                }
-            }
-            if( !authed )
-            {
-                tLog() << "File transfer request rejected, invalid source IP";
-                return NULL;
-            }
-        }
-
-        QString fid = key.right( key.length() - 17 );
-        StreamConnection* sc = new StreamConnection( this, cc, fid );
-        return sc;
-    }
-
-    if( key == "whitelist" ) // LAN IP address, check source IP
-    {
-        if( isIPWhitelisted( peer ) )
-        {
-            tDebug() << "Connection is from whitelisted IP range (LAN)";
-            Connection* conn = new ControlConnection( this, peer.toString() );
-            conn->setName( peer.toString() );
-            return conn;
-        }
-        else
-        {
-            tDebug() << "Connection claimed to be whitelisted, but wasn't.";
-            return NULL;
-        }
-    }
-
-    if( m_offers.contains( key ) )
-    {
-        QWeakPointer<Connection> conn = m_offers.value( key );
-        if( conn.isNull() )
-        {
-            // This can happen if it's a streamconnection, but the audioengine has
-            // already closed the iodevice, causing the connection to be deleted before
-            // the peer connects and provides the first byte
-            tLog() << Q_FUNC_INFO << "invalid/expired offer:" << key;
-            return NULL;
-        }
-
-        if( !nodeid.isEmpty() )
-        {
-            // If there isn't a nodeid it's not the first connection and will already have been stopped
-            if( !checkACL( conn.data(), nodeid, true ) )
-            {
-                tLog() << "Connection not allowed due to ACL";
-                return NULL;
-            }
-        }
-
-        if( conn.data()->onceOnly() )
-        {
-            m_offers.remove( key );
-            return conn.data();
-        }
-        else
-        {
-            return conn.data()->clone();
-        }
-    }
-    else if ( noauth )
-    {
-        Connection* conn;
-        conn = new ControlConnection( this, peer );
-        conn->setName( key );
-        return conn;
-    }
-    else
-    {
-        tLog() << "Invalid offer key:" << key;
-        return NULL;
-    }
-}
-
-
-bool
-Servent::checkACL( const Connection* conn, const QString &nodeid, bool showDialog ) const
-{
-    Q_UNUSED( conn );
-    Q_UNUSED( showDialog );
-    tDebug( LOGVERBOSE ) << "Checking ACLs";
-
-    ACLSystem* aclSystem = ACLSystem::instance();
-    ACLSystem::ACL peerStatus = aclSystem->isAuthorizedUser( nodeid );
-    if( peerStatus == ACLSystem::Deny )
-        return false;
-
-    //FIXME: Actually enable it when it makes sense
-    //FIXME: needs refactoring because it depends on QtGui and the servent is part of libtomahawk-core
-    /*
-    return true;
-    if( peerStatus == ACLSystem::NotFound )
-    {
-        if( !showDialog )
-            return false;
-
-        QMessageBox msgBox;
-        msgBox.setIcon( QMessageBox::Question );
-        msgBox.setText( tr( "Incoming Connection Attempt" ) );
-        msgBox.setInformativeText( tr( "Another Tomahawk instance is attempting to connect to you. Select whether to allow or deny this connection.\n\nPeer name: %1\nPeer ID: %2\n\nRemember: Only allow peers to connect if you have the legal right for them to stream music from you.").arg( conn->name(), nodeid ) );
-        QPushButton *denyButton = msgBox.addButton( tr( "Deny" ), QMessageBox::HelpRole );
-        QPushButton *alwaysDenyButton = msgBox.addButton( tr( "Always Deny" ), QMessageBox::YesRole );
-        QPushButton *allowButton = msgBox.addButton( tr( "Allow" ), QMessageBox::NoRole );
-        QPushButton *alwaysAllowButton = msgBox.addButton( tr( "Always Allow" ), QMessageBox::ActionRole );
-
-        msgBox.setDefaultButton( denyButton );
-        msgBox.setEscapeButton( denyButton );
-
-        msgBox.exec();
-
-        if( msgBox.clickedButton() == denyButton )
-            return false;
-        else if( msgBox.clickedButton() == alwaysDenyButton )
-        {
-            aclSystem->authorizeUser( nodeid, ACLSystem::Deny );
-            return false;
-        }
-        else if( msgBox.clickedButton() == alwaysAllowButton )
-        {
-            aclSystem->authorizeUser( nodeid, ACLSystem::Allow );
-            return true;
-        }
-        else if( msgBox.clickedButton() == allowButton )
-            return true;
-
-        //How could we get here?
-        Q_ASSERT( false );
-        return false;
-    }
-    */
-
-    return true;
-}
-
-
-QSharedPointer<QIODevice>
-Servent::remoteIODeviceFactory( const result_ptr& result )
-{
-    QSharedPointer<QIODevice> sp;
-
-    QStringList parts = result->url().mid( QString( "servent://" ).length() ).split( "\t" );
-    const QString sourceName = parts.at( 0 );
-    const QString fileId = parts.at( 1 );
-    source_ptr s = SourceList::instance()->get( sourceName );
-    if ( s.isNull() || !s->controlConnection() )
-        return sp;
-
-    ControlConnection* cc = s->controlConnection();
-    StreamConnection* sc = new StreamConnection( this, cc, fileId, result );
-    createParallelConnection( cc, sc, QString( "FILE_REQUEST_KEY:%1" ).arg( fileId ) );
-    return sc->iodevice();
-}
-
-
-void
-Servent::registerStreamConnection( StreamConnection* sc )
-{
-    Q_ASSERT( !m_scsessions.contains( sc ) );
-    tDebug( LOGVERBOSE ) << "Registering Stream" << m_scsessions.length() + 1;
-
-    QMutexLocker lock( &m_ftsession_mut );
-    m_scsessions.append( sc );
-
-    printCurrentTransfers();
-    emit streamStarted( sc );
-}
-
-
-void
-Servent::onStreamFinished( StreamConnection* sc )
-{
-    Q_ASSERT( sc );
-    tDebug( LOGVERBOSE ) << "Stream Finished, unregistering" << sc->id();
-
-    QMutexLocker lock( &m_ftsession_mut );
-    m_scsessions.removeAll( sc );
-
-    printCurrentTransfers();
-    emit streamFinished( sc );
-}
-
-
-// used for debug output:
-void
-Servent::printCurrentTransfers()
-{
-    int k = 1;
-//    qDebug() << "~~~ Active file transfer connections:" << m_scsessions.length();
-    foreach( StreamConnection* i, m_scsessions )
-    {
-        qDebug() << k << ") " << i->id();
-    }
-    qDebug() << endl;
-}
-
-
-bool
-Servent::isIPWhitelisted( QHostAddress ip )
-{
-    typedef QPair<QHostAddress, int> range;
-    static QList<range> whitelist;
-    if( whitelist.isEmpty() )
-    {
-        whitelist << range( QHostAddress( "10.0.0.0" ), 8 )
-                  << range( QHostAddress( "172.16.0.0" ), 12 )
-                  << range( QHostAddress( "192.168.0.0" ), 16 )
-                  << range( QHostAddress( "169.254.0.0" ), 16 )
-                  << range( QHostAddress( "127.0.0.0" ), 24 );
-
-//        tDebug( LOGVERBOSE ) << "Loaded whitelist IP range:" << whitelist;
-    }
-
-    foreach( const range& r, whitelist )
-        if( ip.isInSubnet( r ) )
-            return true;
-
-    return false;
-}
-
-
-bool
-Servent::connectedToSession( const QString& session )
-{
-    foreach( ControlConnection* cc, m_controlconnections )
-    {
-        if( cc->id() == session )
-            return true;
-    }
-
-    return false;
-}
-
-
-void
-Servent::triggerDBSync()
-{
-    // tell peers we have new stuff they should sync
-    QList<source_ptr> sources = SourceList::instance()->sources();
-    foreach( const source_ptr& src, sources )
-    {
-        // skip local source
-        if ( src.isNull() || src->isLocal() )
-            continue;
-
-        if ( src->controlConnection() && src->controlConnection()->dbSyncConnection() ) // source online?
-            src->controlConnection()->dbSyncConnection()->trigger();
-    }
-}
-
-
-void
-Servent::registerIODeviceFactory( const QString &proto, boost::function<QSharedPointer<QIODevice>(Tomahawk::result_ptr)> fac )
-{
-    m_iofactories.insert( proto, fac );
-}
-
-
-QSharedPointer<QIODevice>
-Servent::getIODeviceForUrl( const Tomahawk::result_ptr& result )
-{
-    QSharedPointer<QIODevice> sp;
-
-    QRegExp rx( "^(a-zA-Z0-9+)://(.+)$" );
-    if ( rx.indexIn( result->url() ) == -1 )
-        return sp;
-
-    const QString proto = rx.cap( 1 );
-    if ( !m_iofactories.contains( proto ) )
-        return sp;
-
-    return m_iofactories.value( proto )( result );
-}
-
-
-QSharedPointer<QIODevice>
-Servent::localFileIODeviceFactory( const Tomahawk::result_ptr& result )
-{
-    // ignore "file://" at front of url
-    QFile* io = new QFile( result->url().mid( QString( "file://" ).length() ) );
-    if ( io )
-        io->open( QIODevice::ReadOnly );
-
-    return QSharedPointer<QIODevice>( io );
-}
-
-
-QSharedPointer<QIODevice>
-Servent::httpIODeviceFactory( const Tomahawk::result_ptr& result )
-{
-    QNetworkRequest req( result->url() );
-    QNetworkReply* reply = TomahawkUtils::nam()->get( req );
-    return QSharedPointer<QIODevice>( reply, &QObject::deleteLater );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/servent.h Deleted

@@ -1,181 +0,0 @@
-/* === 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
- *   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 SERVENT_H
-#define SERVENT_H
-
-// time before new connection terminates if no auth received
-#define AUTH_TIMEOUT 180000
-
-#include <QtCore/QObject>
-#include <QtCore/QMap>
-#include <QtCore/QMutex>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QTimer>
-#include <QtCore/QPointer>
-#include <QtNetwork/QTcpServer>
-#include <QtNetwork/QTcpSocket>
-#include <QtNetwork/QHostInfo>
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-#include <qjson/qobjecthelper.h>
-
-#include "typedefs.h"
-#include "msg.h"
-
-#include <boost/function.hpp>
-
-#include "dllmacro.h"
-
-class Connection;
-class Connector;
-class ControlConnection;
-class StreamConnection;
-class ProxyConnection;
-class RemoteCollectionConnection;
-class PortFwdThread;
-
-// this is used to hold a bit of state, so when a connected signal is emitted
-// from a socket, we can associate it with a Connection object etc.
-class DLLEXPORT QTcpSocketExtra : public QTcpSocket
-{
-Q_OBJECT
-
-public:
-    QTcpSocketExtra() : QTcpSocket()
-    {
-        QTimer::singleShot( AUTH_TIMEOUT, this, SLOT( authTimeout() ) ) ;
-    }
-
-    QWeakPointer<Connection> _conn;
-    bool _outbound;
-    bool _disowned;
-    msg_ptr _msg;
-
-private slots:
-    void authTimeout()
-    {
-      if( _disowned )
-          return;
-
-      qDebug() << "Connection timed out before providing a valid offer-key";
-      this->disconnectFromHost();
-    }
-};
-
-class DLLEXPORT Servent : public QTcpServer
-{
-Q_OBJECT
-
-public:
-    static Servent* instance();
-
-    explicit Servent( QObject* parent = 0 );
-    virtual ~Servent();
-
-    bool startListening( QHostAddress ha, bool upnp, int port );
-
-    int port() const { return m_port; }
-
-    // creates new token that allows a controlconnection to be set up
-    QString createConnectionKey( const QString& name = "", const QString &nodeid = "", const QString &key = "", bool onceOnly = true );
-
-    void registerOffer( const QString& key, Connection* conn );
-
-    void registerControlConnection( ControlConnection* conn );
-    void unregisterControlConnection( ControlConnection* conn );
-    ControlConnection* lookupControlConnection( const QString& name );
-
-    void connectToPeer( const QString& ha, int port, const QString &key, const QString& name = "", const QString& id = "" );
-    void connectToPeer( const QString& ha, int port, const QString &key, Connection* conn );
-    void reverseOfferRequest( ControlConnection* orig_conn, const QString &theirdbid, const QString& key, const QString& theirkey );
-
-    bool visibleExternally() const { return !m_externalHostname.isNull() || (m_externalPort > 0 && !m_externalAddress.isNull()); }
-    QString externalAddress() const { return !m_externalHostname.isNull() ? m_externalHostname : m_externalAddress.toString(); }
-    int externalPort() const { return m_externalPort; }
-
-    QSharedPointer<QIODevice> remoteIODeviceFactory( const Tomahawk::result_ptr& );
-    static bool isIPWhitelisted( QHostAddress ip );
-
-    bool connectedToSession( const QString& session );
-    unsigned int numConnectedPeers() const { return m_controlconnections.length(); }
-
-    QList< StreamConnection* > streams() const { return m_scsessions; }
-
-    QSharedPointer<QIODevice> getIODeviceForUrl( const Tomahawk::result_ptr& result );
-    void registerIODeviceFactory( const QString &proto, boost::function<QSharedPointer<QIODevice>(Tomahawk::result_ptr)> fac );
-    QSharedPointer<QIODevice> localFileIODeviceFactory( const Tomahawk::result_ptr& result );
-    QSharedPointer<QIODevice> httpIODeviceFactory( const Tomahawk::result_ptr& result );
-
-    bool isReady() const { return m_ready; };
-
-signals:
-    void streamStarted( StreamConnection* );
-    void streamFinished( StreamConnection* );
-    void ready();
-
-protected:
-    void incomingConnection( int sd );
-
-public slots:
-    void setInternalAddress();
-    void setExternalAddress( QHostAddress ha, unsigned int port );
-
-    void socketError( QAbstractSocket::SocketError );
-    void createParallelConnection( Connection* orig_conn, Connection* new_conn, const QString& key );
-
-    void registerStreamConnection( StreamConnection* );
-    void onStreamFinished( StreamConnection* sc );
-
-    void socketConnected();
-    void triggerDBSync();
-
-private slots:
-    void readyRead();
-
-    Connection* claimOffer( ControlConnection* cc, const QString &nodeid, const QString &key, const QHostAddress peer = QHostAddress::Any );
-
-private:
-    bool isValidExternalIP( const QHostAddress& addr ) const;
-    void handoverSocket( Connection* conn, QTcpSocketExtra* sock );
-    bool checkACL( const Connection* conn, const QString &nodeid, bool showDialog ) const;
-    void printCurrentTransfers();
-
-    QJson::Parser parser;
-    QList< ControlConnection* > m_controlconnections; // canonical list of authed peers
-    QMap< QString, QWeakPointer<Connection> > m_offers;
-    QStringList m_connectedNodes;
-
-    int m_port, m_externalPort;
-    QHostAddress m_externalAddress;
-    QString m_externalHostname;
-    bool m_ready;
-    bool m_lanHack;
-
-    // currently active file transfers:
-    QList< StreamConnection* > m_scsessions;
-    QMutex m_ftsession_mut;
-
-    QMap< QString,boost::function<QSharedPointer<QIODevice>(Tomahawk::result_ptr)> > m_iofactories;
-
-    PortFwdThread* m_portfwd;
-    static Servent* s_instance;
-};
-
-#endif // SERVENT_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/streamconnection.cpp Deleted

@@ -1,287 +0,0 @@
-/* === 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
- *   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 "streamconnection.h"
-
-#include <QFile>
-
-#include "result.h"
-
-#include "bufferiodevice.h"
-#include "network/controlconnection.h"
-#include "network/servent.h"
-#include "database/databasecommand_loadfiles.h"
-#include "database/database.h"
-#include "sourcelist.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-StreamConnection::StreamConnection( Servent* s, ControlConnection* cc, QString fid, const Tomahawk::result_ptr& result )
-    : Connection( s )
-    , m_cc( cc )
-    , m_fid( fid )
-    , m_type( RECEIVING )
-    , m_curBlock( 0 )
-    , m_badded( 0 )
-    , m_bsent( 0 )
-    , m_allok( false )
-    , m_result( result )
-    , m_transferRate( 0 )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    BufferIODevice* bio = new BufferIODevice( result->size() );
-    m_iodev = QSharedPointer<QIODevice>( bio, &QObject::deleteLater ); // device audio data gets written to
-    m_iodev->open( QIODevice::ReadWrite );
-
-    Servent::instance()->registerStreamConnection( this );
-
-    // if the audioengine closes the iodev (skip/stop/etc) then kill the connection
-    // immediately to avoid unnecessary network transfer
-    connect( m_iodev.data(), SIGNAL( aboutToClose() ), SLOT( shutdown() ), Qt::QueuedConnection );
-    connect( m_iodev.data(), SIGNAL( blockRequest( int ) ), SLOT( onBlockRequest( int ) ) );
-
-    // auto delete when connection closes:
-    connect( this, SIGNAL( finished() ), SLOT( deleteLater() ), Qt::QueuedConnection );
-
-    // don't fuck with our messages at all. No compression, no parsing, nothing:
-    this->setMsgProcessorModeIn ( MsgProcessor::NOTHING );
-    this->setMsgProcessorModeOut( MsgProcessor::NOTHING );
-}
-
-
-StreamConnection::StreamConnection( Servent* s, ControlConnection* cc, QString fid )
-    : Connection( s )
-    , m_cc( cc )
-    , m_fid( fid )
-    , m_type( SENDING )
-    , m_badded( 0 )
-    , m_bsent( 0 )
-    , m_allok( false )
-    , m_transferRate( 0 )
-{
-    Servent::instance()->registerStreamConnection( this );
-    // auto delete when connection closes:
-    connect( this, SIGNAL( finished() ), SLOT( deleteLater() ), Qt::QueuedConnection );
-}
-
-
-StreamConnection::~StreamConnection()
-{
-    qDebug() << Q_FUNC_INFO << "TX/RX:" << bytesSent() << bytesReceived();
-    if( m_type == RECEIVING && !m_allok )
-    {
-        qDebug() << "FTConnection closing before last data msg received, shame.";
-        //TODO log the fact that our peer was bad-mannered enough to not finish the upload
-
-        // protected, we could expose it:
-        //m_iodev->setErrorString("FTConnection providing data went away mid-transfer");
-
-        ((BufferIODevice*)m_iodev.data())->inputComplete();
-    }
-
-    Servent::instance()->onStreamFinished( this );
-}
-
-
-QString
-StreamConnection::id() const
-{
-    return QString( "FTC%1 %2" )
-              .arg( m_type == SENDING ? "TX" : "RX" )
-              .arg( m_fid );
-}
-
-
-Tomahawk::source_ptr
-StreamConnection::source() const
-{
-	return m_source;
-}
-
-void
-StreamConnection::showStats( qint64 tx, qint64 rx )
-{
-    if( tx > 0 || rx > 0 )
-    {
-        qDebug() << id()
-                 << QString( "Down: %L1 bytes/sec," ).arg( rx )
-                 << QString( "Up: %L1 bytes/sec" ).arg( tx );
-    }
-
-    m_transferRate = tx + rx;
-    emit updated();
-}
-
-
-void
-StreamConnection::setup()
-{
-    QList<source_ptr> sources = SourceList::instance()->sources();
-    foreach( const source_ptr& src, sources )
-    {
-        // local src doesnt have a control connection, skip it:
-        if( src.isNull() || src->isLocal() )
-            continue;
-
-        if ( src->controlConnection() == m_cc )
-        {
-            m_source = src;
-            break;
-        }
-    }
-
-    connect( this, SIGNAL( statsTick( qint64, qint64 ) ), SLOT( showStats( qint64, qint64 ) ) );
-    if( m_type == RECEIVING )
-    {
-        qDebug() << "in RX mode";
-        emit updated();
-        return;
-    }
-
-    qDebug() << "in TX mode, fid:" << m_fid;
-
-    DatabaseCommand_LoadFiles* cmd = new DatabaseCommand_LoadFiles( m_fid.toUInt() );
-    connect( cmd, SIGNAL( result( Tomahawk::result_ptr ) ), SLOT( startSending( Tomahawk::result_ptr ) ) );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-StreamConnection::startSending( const Tomahawk::result_ptr& result )
-{
-    if ( result.isNull() )
-    {
-        qDebug() << "Can't handle invalid result!";
-        shutdown();
-        return;
-    }
-
-    m_result = result;
-    qDebug() << "Starting to transmit" << m_result->url();
-
-    QSharedPointer<QIODevice> io = Servent::instance()->getIODeviceForUrl( m_result );
-    if( !io )
-    {
-        qDebug() << "Couldn't read from source:" << m_result->url();
-        shutdown();
-        return;
-    }
-
-    m_readdev = QSharedPointer<QIODevice>( io );
-    sendSome();
-
-    emit updated();
-}
-
-
-void
-StreamConnection::handleMsg( msg_ptr msg )
-{
-    Q_ASSERT( msg->is( Msg::RAW ) );
-
-    if ( msg->payload().startsWith( "block" ) )
-    {
-        int block = QString( msg->payload() ).mid( 5 ).toInt();
-        m_readdev->seek( block * BufferIODevice::blockSize() );
-
-        qDebug() << "Seeked to block:" << block;
-
-        QByteArray sm;
-        sm.append( QString( "doneblock%1" ).arg( block ) );
-
-        sendMsg( Msg::factory( sm, Msg::RAW | Msg::FRAGMENT ) );
-        QTimer::singleShot( 0, this, SLOT( sendSome() ) );
-    }
-    else if ( msg->payload().startsWith( "doneblock" ) )
-    {
-        int block = QString( msg->payload() ).mid( 9 ).toInt();
-        ((BufferIODevice*)m_iodev.data())->seeked( block );
-
-        m_curBlock = block;
-        qDebug() << "Next block is now:" << block;
-    }
-    else if ( msg->payload().startsWith( "data" ) )
-    {
-        m_badded += msg->payload().length() - 4;
-        ((BufferIODevice*)m_iodev.data())->addData( m_curBlock++, msg->payload().mid( 4 ) );
-    }
-
-    //qDebug() << Q_FUNC_INFO << "flags" << (int) msg->flags()
-    //         << "payload len" << msg->payload().length()
-    //         << "written to device so far: " << m_badded;
-
-    if ( ((BufferIODevice*)m_iodev.data())->nextEmptyBlock() < 0 )
-    {
-        m_allok = true;
-        // tell our iodev there is no more data to read, no args meaning a success:
-        ((BufferIODevice*)m_iodev.data())->inputComplete();
-        shutdown();
-    }
-}
-
-
-Connection*
-StreamConnection::clone()
-{
-    Q_ASSERT( false );
-    return 0;
-}
-
-
-void
-StreamConnection::sendSome()
-{
-    Q_ASSERT( m_type == StreamConnection::SENDING );
-
-    QByteArray ba = "data";
-    ba.append( m_readdev->read( BufferIODevice::blockSize() ) );
-    m_bsent += ba.length() - 4;
-
-    if( m_readdev->atEnd() )
-    {
-        sendMsg( Msg::factory( ba, Msg::RAW ) );
-        return;
-    }
-    else
-    {
-        // more to come -> FRAGMENT
-        sendMsg( Msg::factory( ba, Msg::RAW | Msg::FRAGMENT ) );
-    }
-
-    // HINT: change the 0 to 50 to transmit at 640Kbps, for example
-    //       (this is where upload throttling could be implemented)
-    QTimer::singleShot( 0, this, SLOT( sendSome() ) );
-}
-
-
-void
-StreamConnection::onBlockRequest( int block )
-{
-    qDebug() << Q_FUNC_INFO << block;
-
-    if ( m_curBlock == block )
-        return;
-
-    QByteArray sm;
-    sm.append( QString( "block%1" ).arg( block ) );
-
-    sendMsg( Msg::factory( sm, Msg::RAW | Msg::FRAGMENT ) );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/network/streamconnection.h Deleted

@@ -1,96 +0,0 @@
-/* === 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
- *   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 STREAMCONNECTION_H
-#define STREAMCONNECTION_H
-
-#include <QObject>
-#include <QSharedPointer>
-#include <QIODevice>
-
-#include "network/connection.h"
-#include "result.h"
-
-#include "dllmacro.h"
-
-class ControlConnection;
-class BufferIODevice;
-
-class DLLEXPORT StreamConnection : public Connection
-{
-Q_OBJECT
-
-public:
-    enum Type
-    {
-        SENDING = 0,
-        RECEIVING = 1
-    };
-
-    // RX:
-    explicit StreamConnection( Servent* s, ControlConnection* cc, QString fid, const Tomahawk::result_ptr& result );
-    // TX:
-    explicit StreamConnection( Servent* s, ControlConnection* cc, QString fid );
-
-    virtual ~StreamConnection();
-
-    QString id() const;
-    void setup();
-    Connection* clone();
-
-    const QSharedPointer<QIODevice>& iodevice() { return m_iodev; }
-    ControlConnection* controlConnection() const { return m_cc; }
-
-    Tomahawk::source_ptr source() const;
-    Tomahawk::result_ptr track() const { return m_result; }
-    qint64 transferRate() const { return m_transferRate; }
-
-    Type type() const { return m_type; }
-    QString fid() const { return m_fid; }
-
-signals:
-    void updated();
-
-protected slots:
-    virtual void handleMsg( msg_ptr msg );
-
-private slots:
-    void startSending( const Tomahawk::result_ptr& );
-    void sendSome();
-    void showStats( qint64 tx, qint64 rx );
-
-    void onBlockRequest( int pos );
-
-private:
-    QSharedPointer<QIODevice> m_iodev;
-    ControlConnection* m_cc;
-    QString m_fid;
-    Type m_type;
-    QSharedPointer<QIODevice> m_readdev;
-
-    int m_curBlock;
-
-    int m_badded, m_bsent;
-    bool m_allok; // got last msg ok, transfer complete?
-
-    Tomahawk::source_ptr m_source;
-    Tomahawk::result_ptr m_result;
-    qint64 m_transferRate;
-};
-
-#endif // STREAMCONNECTION_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/pipeline.cpp Deleted

@@ -1,530 +0,0 @@
-/* === 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
- *   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 "pipeline.h"
-
-#include <QMutexLocker>
-
-#include "functimeout.h"
-#include "database/database.h"
-#include "ExternalResolver.h"
-#include "resolvers/scriptresolver.h"
-#include "resolvers/qtscriptresolver.h"
-
-#include "utils/logger.h"
-
-#define DEFAULT_CONCURRENT_QUERIES 4
-#define MAX_CONCURRENT_QUERIES 16
-#define CLEANUP_TIMEOUT 5 * 60 * 1000
-#define MINSCORE 0.5
-
-using namespace Tomahawk;
-
-Pipeline* Pipeline::s_instance = 0;
-
-
-Pipeline*
-Pipeline::instance()
-{
-    return s_instance;
-}
-
-
-Pipeline::Pipeline( QObject* parent )
-    : QObject( parent )
-    , m_running( false )
-{
-    s_instance = this;
-
-    m_maxConcurrentQueries = qBound( DEFAULT_CONCURRENT_QUERIES, QThread::idealThreadCount(), MAX_CONCURRENT_QUERIES );
-    tDebug() << Q_FUNC_INFO << "Using" << m_maxConcurrentQueries << "threads";
-
-    m_temporaryQueryTimer.setInterval( CLEANUP_TIMEOUT );
-    connect( &m_temporaryQueryTimer, SIGNAL( timeout() ), SLOT( onTemporaryQueryTimer() ) );
-}
-
-
-Pipeline::~Pipeline()
-{
-    tDebug() << Q_FUNC_INFO;
-    m_running = false;
-
-    // stop script resolvers
-    qDeleteAll( m_scriptResolvers );
-    m_scriptResolvers.clear();
-}
-
-
-void
-Pipeline::databaseReady()
-{
-    connect( Database::instance(), SIGNAL( indexReady() ), this, SLOT( start() ), Qt::QueuedConnection );
-    Database::instance()->loadIndex();
-}
-
-
-void
-Pipeline::start()
-{
-    tDebug() << Q_FUNC_INFO << "Shunting this many pending queries:" << m_queries_pending.size();
-    m_running = true;
-
-    shuntNext();
-}
-
-
-void
-Pipeline::stop()
-{
-    m_running = false;
-}
-
-
-void
-Pipeline::removeResolver( Resolver* r )
-{
-    QMutexLocker lock( &m_mut );
-
-    m_resolvers.removeAll( r );
-    emit resolverRemoved( r );
-}
-
-
-void
-Pipeline::addResolver( Resolver* r )
-{
-    QMutexLocker lock( &m_mut );
-
-    tDebug() << "Adding resolver" << r->name();
-    m_resolvers.append( r );
-    emit resolverAdded( r );
-}
-
-
-void
-Pipeline::addExternalResolverFactory( ResolverFactoryFunc resolverFactory )
-{
-    m_resolverFactories << resolverFactory;
-}
-
-
-Tomahawk::ExternalResolver*
-Pipeline::addScriptResolver( const QString& path, bool start )
-{
-    ExternalResolver* res = 0;
-
-    foreach ( ResolverFactoryFunc factory, m_resolverFactories )
-    {
-        res = factory( path );
-        if ( !res )
-            continue;
-
-        m_scriptResolvers << res;
-        if ( start )
-            res->start();
-
-        break;
-    }
-
-    return res;
-}
-
-
-void
-Pipeline::stopScriptResolver( const QString& path )
-{
-    foreach ( ExternalResolver* res, m_scriptResolvers )
-    {
-        if ( res->filePath() == path )
-            res->stop();
-    }
-}
-
-
-void
-Pipeline::removeScriptResolver( const QString& scriptPath )
-{
-    ExternalResolver* r = 0;
-    foreach ( ExternalResolver* res, m_scriptResolvers )
-    {
-        if ( res->filePath() == scriptPath )
-            r = res;
-    }
-    m_scriptResolvers.removeAll( r );
-
-    if ( r )
-    {
-        r->stop();
-        r->deleteLater();
-    }
-}
-
-
-ExternalResolver*
-Pipeline::resolverForPath( const QString& scriptPath )
-{
-    foreach ( ExternalResolver* res, m_scriptResolvers )
-    {
-        if ( res->filePath() == scriptPath )
-            return res;
-    }
-    return 0;
-}
-
-
-void
-Pipeline::resolve( const QList<query_ptr>& qlist, bool prioritized, bool temporaryQuery )
-{
-    {
-        QMutexLocker lock( &m_mut );
-
-        int i = 0;
-        foreach( const query_ptr& q, qlist )
-        {
-            if ( q->resolvingFinished() )
-                continue;
-            if ( m_queries_pending.contains( q ) )
-                continue;
-            if ( m_qidsState.contains( q->id() ) )
-                continue;
-
-            if ( !m_qids.contains( q->id() ) )
-                m_qids.insert( q->id(), q );
-
-            if ( prioritized )
-                m_queries_pending.insert( i++, q );
-            else
-                m_queries_pending << q;
-
-            if ( temporaryQuery )
-            {
-                m_queries_temporary << q;
-
-                if ( m_temporaryQueryTimer.isActive() )
-                    m_temporaryQueryTimer.stop();
-                m_temporaryQueryTimer.start();
-            }
-        }
-    }
-
-    shuntNext();
-}
-
-
-void
-Pipeline::resolve( const query_ptr& q, bool prioritized, bool temporaryQuery )
-{
-    if ( q.isNull() )
-        return;
-
-    QList< query_ptr > qlist;
-    qlist << q;
-    resolve( qlist, prioritized, temporaryQuery );
-}
-
-
-void
-Pipeline::resolve( QID qid, bool prioritized, bool temporaryQuery )
-{
-    resolve( query( qid ), prioritized, temporaryQuery );
-}
-
-
-void
-Pipeline::reportResults( QID qid, const QList< result_ptr >& results )
-{
-    if ( !m_running )
-        return;
-
-    if ( !m_qids.contains( qid ) )
-    {
-        tDebug() << "Result arrived too late for:" << qid;
-        return;
-    }
-    const query_ptr& q = m_qids.value( qid );
-
-    QList< result_ptr > cleanResults;
-    foreach( const result_ptr& r, results )
-    {
-        float score = q->howSimilar( r );
-        r->setScore( score );
-        if ( !q->isFullTextQuery() && score < MINSCORE )
-            continue;
-
-        cleanResults << r;
-    }
-
-    if ( !cleanResults.isEmpty() )
-    {
-        q->addResults( cleanResults );
-        foreach( const result_ptr& r, cleanResults )
-        {
-            m_rids.insert( r->id(), r );
-        }
-
-        if ( q->playable() && !q->isFullTextQuery() )
-        {
-            setQIDState( q, 0 );
-            return;
-        }
-    }
-
-    decQIDState( q );
-}
-
-
-void
-Pipeline::reportAlbums( QID qid, const QList< album_ptr >& albums )
-{
-    if ( !m_running )
-        return;
-
-    if ( !m_qids.contains( qid ) )
-    {
-        tDebug() << "Albums arrived too late for:" << qid;
-        return;
-    }
-    const query_ptr& q = m_qids.value( qid );
-    Q_ASSERT( q->isFullTextQuery() );
-
-    QList< album_ptr > cleanAlbums;
-    foreach( const album_ptr& r, albums )
-    {
-//        float score = q->howSimilar( r );
-
-        cleanAlbums << r;
-    }
-
-    if ( !cleanAlbums.isEmpty() )
-    {
-        q->addAlbums( cleanAlbums );
-    }
-}
-
-
-void
-Pipeline::reportArtists( QID qid, const QList< artist_ptr >& artists )
-{
-    if ( !m_running )
-        return;
-
-    if ( !m_qids.contains( qid ) )
-    {
-        tDebug() << "Artists arrived too late for:" << qid;
-        return;
-    }
-    const query_ptr& q = m_qids.value( qid );
-    Q_ASSERT( q->isFullTextQuery() );
-
-    QList< artist_ptr > cleanArtists;
-    foreach( const artist_ptr& r, artists )
-    {
-//        float score = q->howSimilar( r );
-
-        cleanArtists << r;
-    }
-
-    if ( !cleanArtists.isEmpty() )
-    {
-        q->addArtists( cleanArtists );
-    }
-}
-
-
-void
-Pipeline::shuntNext()
-{
-    if ( !m_running )
-        return;
-
-    unsigned int rc;
-    query_ptr q;
-    {
-        QMutexLocker lock( &m_mut );
-
-        rc = m_resolvers.count();
-        if ( m_queries_pending.isEmpty() )
-        {
-            if ( m_qidsState.isEmpty() )
-                emit idle();
-            return;
-        }
-
-        // Check if we are ready to dispatch more queries
-        if ( m_qidsState.count() >= m_maxConcurrentQueries )
-            return;
-
-        /*
-            Since resolvers are async, we now dispatch to the highest weighted ones
-            and after timeout, dispatch to next highest etc, aborting when solved
-        */
-        q = m_queries_pending.takeFirst();
-        q->setCurrentResolver( 0 );
-    }
-
-    setQIDState( q, rc );
-}
-
-
-void
-Pipeline::timeoutShunt( const query_ptr& q )
-{
-    if ( !m_running )
-        return;
-
-    // are we still waiting for a timeout?
-    if ( m_qidsTimeout.contains( q->id() ) )
-    {
-        decQIDState( q );
-    }
-}
-
-
-void
-Pipeline::shunt( const query_ptr& q )
-{
-    if ( !m_running )
-        return;
-
-    Resolver* r = 0;
-    if ( !q->resolvingFinished() )
-        r = nextResolver( q );
-
-    if ( r )
-    {
-        tLog( LOGVERBOSE ) << "Dispatching to resolver" << r->name() << q->toString() << q->solved() << q->id();
-
-        q->setCurrentResolver( r );
-        r->resolve( q );
-        emit resolving( q );
-
-        if ( r->timeout() > 0 )
-        {
-            m_qidsTimeout.insert( q->id(), true );
-            new FuncTimeout( r->timeout(), boost::bind( &Pipeline::timeoutShunt, this, q ), this );
-        }
-    }
-    else
-    {
-        // we get here if we disable a resolver while a query is resolving
-        setQIDState( q, 0 );
-        return;
-    }
-
-    shuntNext();
-}
-
-
-Tomahawk::Resolver*
-Pipeline::nextResolver( const Tomahawk::query_ptr& query ) const
-{
-    Resolver* newResolver = 0;
-
-    foreach ( Resolver* r, m_resolvers )
-    {
-        if ( query->resolvedBy().contains( r ) )
-            continue;
-
-        if ( !newResolver )
-        {
-            newResolver = r;
-            continue;
-        }
-
-        if ( r->weight() > newResolver->weight() )
-            newResolver = r;
-    }
-
-    return newResolver;
-}
-
-
-void
-Pipeline::setQIDState( const Tomahawk::query_ptr& query, int state )
-{
-    QMutexLocker lock( &m_mut );
-
-    if ( m_qidsTimeout.contains( query->id() ) )
-        m_qidsTimeout.remove( query->id() );
-
-    if ( state > 0 )
-    {
-        m_qidsState.insert( query->id(), state );
-
-        new FuncTimeout( 0, boost::bind( &Pipeline::shunt, this, query ), this );
-    }
-    else
-    {
-        m_qidsState.remove( query->id() );
-        query->onResolvingFinished();
-
-        if ( !m_queries_temporary.contains( query ) )
-            m_qids.remove( query->id() );
-
-        new FuncTimeout( 0, boost::bind( &Pipeline::shuntNext, this ), this );
-    }
-}
-
-
-int
-Pipeline::incQIDState( const Tomahawk::query_ptr& query )
-{
-    QMutexLocker lock( &m_mut );
-
-    int state = 1;
-    if ( m_qidsState.contains( query->id() ) )
-    {
-        state = m_qidsState.value( query->id() ) + 1;
-    }
-    m_qidsState.insert( query->id(), state );
-
-    return state;
-}
-
-
-int
-Pipeline::decQIDState( const Tomahawk::query_ptr& query )
-{
-    int state = 0;
-    {
-        QMutexLocker lock( &m_mut );
-
-        if ( !m_qidsState.contains( query->id() ) )
-            return 0;
-
-        state = m_qidsState.value( query->id() ) - 1;
-    }
-
-    setQIDState( query, state );
-    return state;
-}
-
-
-void
-Pipeline::onTemporaryQueryTimer()
-{
-    QMutexLocker lock( &m_mut );
-    tDebug() << Q_FUNC_INFO;
-    m_temporaryQueryTimer.stop();
-
-    for ( int i = m_queries_temporary.count() - 1; i >= 0; i-- )
-    {
-        query_ptr q = m_queries_temporary.takeAt( i );
-        m_qids.remove( q->id() );
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/pipeline.h Deleted

@@ -1,134 +0,0 @@
-/* === 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
- *   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 PIPELINE_H
-#define PIPELINE_H
-
-#include "typedefs.h"
-#include "query.h"
-
-#include <QObject>
-#include <QList>
-#include <QMap>
-#include <QMutex>
-#include <QTimer>
-
-#include <boost/function.hpp>
-
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-class Resolver;
-class ExternalResolver;
-typedef boost::function<Tomahawk::ExternalResolver*(QString)> ResolverFactoryFunc;
-
-class DLLEXPORT Pipeline : public QObject
-{
-Q_OBJECT
-
-public:
-    static Pipeline* instance();
-
-    explicit Pipeline( QObject* parent = 0 );
-    virtual ~Pipeline();
-
-    bool isRunning() const { return m_running; }
-
-    unsigned int pendingQueryCount() const { return m_queries_pending.count(); }
-    unsigned int activeQueryCount() const { return m_qidsState.count(); }
-
-    void reportResults( QID qid, const QList< result_ptr >& results );
-    void reportAlbums( QID qid, const QList< album_ptr >& albums );
-    void reportArtists( QID qid, const QList< artist_ptr >& artists );
-
-    void addExternalResolverFactory( ResolverFactoryFunc resolverFactory );
-    Tomahawk::ExternalResolver* addScriptResolver( const QString& scriptPath, bool start = true );
-    void stopScriptResolver( const QString& scriptPath );
-    void removeScriptResolver( const QString& scriptPath );
-    QList< Tomahawk::ExternalResolver* > scriptResolvers() const { return m_scriptResolvers; }
-    Tomahawk::ExternalResolver* resolverForPath( const QString& scriptPath );
-
-    void addResolver( Resolver* r );
-    void removeResolver( Resolver* r );
-
-    query_ptr query( const QID& qid ) const
-    {
-        return m_qids.value( qid );
-    }
-
-    result_ptr result( const RID& rid ) const
-    {
-        return m_rids.value( rid );
-    }
-
-public slots:
-    void resolve( const query_ptr& q, bool prioritized = true, bool temporaryQuery = false );
-    void resolve( const QList<query_ptr>& qlist, bool prioritized = true, bool temporaryQuery = false );
-    void resolve( QID qid, bool prioritized = true, bool temporaryQuery = false );
-
-    void start();
-    void stop();
-    void databaseReady();
-
-signals:
-    void idle();
-    void resolving( const Tomahawk::query_ptr& query );
-
-    void resolverAdded( Resolver* );
-    void resolverRemoved( Resolver* );
-
-private slots:
-    void timeoutShunt( const query_ptr& q );
-    void shunt( const query_ptr& q );
-    void shuntNext();
-
-    void onTemporaryQueryTimer();
-
-private:
-    Tomahawk::Resolver* nextResolver( const Tomahawk::query_ptr& query ) const;
-
-    void setQIDState( const Tomahawk::query_ptr& query, int state );
-    int incQIDState( const Tomahawk::query_ptr& query );
-    int decQIDState( const Tomahawk::query_ptr& query );
-
-    QList< Resolver* > m_resolvers;
-    QList< Tomahawk::ExternalResolver* > m_scriptResolvers;
-    QList< ResolverFactoryFunc > m_resolverFactories;
-    QMap< QID, bool > m_qidsTimeout;
-    QMap< QID, unsigned int > m_qidsState;
-    QMap< QID, query_ptr > m_qids;
-    QMap< RID, result_ptr > m_rids;
-
-    QMutex m_mut; // for m_qids, m_rids
-
-    // store queries here until DB index is loaded, then shunt them all
-    QList< query_ptr > m_queries_pending;
-    // store temporary queries here and clean up after timeout threshold
-    QList< query_ptr > m_queries_temporary;
-
-    int m_maxConcurrentQueries;
-    bool m_running;
-    QTimer m_temporaryQueryTimer;
-
-    static Pipeline* s_instance;
-};
-
-}; //ns
-
-#endif // PIPELINE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist.cpp Deleted

@@ -1,606 +0,0 @@
-/* === 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
- *   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 "playlist.h"
-
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-
-#include "database/database.h"
-#include "database/databasecommand_loadplaylistentries.h"
-#include "database/databasecommand_setplaylistrevision.h"
-#include "database/databasecommand_createplaylist.h"
-#include "database/databasecommand_deleteplaylist.h"
-#include "database/databasecommand_renameplaylist.h"
-
-#include "tomahawksettings.h"
-#include "pipeline.h"
-#include "source.h"
-#include "sourcelist.h"
-#include "playlistplaylistinterface.h"
-
-#include "utils/logger.h"
-#include "PlaylistUpdaterInterface.h"
-
-using namespace Tomahawk;
-
-
-PlaylistEntry::PlaylistEntry() {}
-PlaylistEntry::~PlaylistEntry() {}
-
-
-void
-PlaylistEntry::setQueryVariant( const QVariant& v )
-{
-    QVariantMap m = v.toMap();
-
-    QString artist = m.value( "artist" ).toString();
-    QString album = m.value( "album" ).toString();
-    QString track = m.value( "track" ).toString();
-    m_query = Tomahawk::Query::get( artist, track, album );
-}
-
-
-QVariant
-PlaylistEntry::queryVariant() const
-{
-    return m_query->toVariant();
-}
-
-
-void
-PlaylistEntry::setQuery( const Tomahawk::query_ptr& q )
-{
-    m_query = q;
-}
-
-
-const Tomahawk::query_ptr&
-PlaylistEntry::query() const
-{
-    return m_query;
-}
-
-
-source_ptr
-PlaylistEntry::lastSource() const
-{
-    return m_lastsource;
-}
-
-
-void
-PlaylistEntry::setLastSource( source_ptr s )
-{
-    m_lastsource = s;
-}
-
-
-Playlist::Playlist( const source_ptr& author )
-    : m_source( author )
-    , m_lastmodified( 0 )
-    , m_updater( 0 )
-{
-}
-
-
-// used when loading from DB:
-Playlist::Playlist( const source_ptr& src,
-                    const QString& currentrevision,
-                    const QString& title,
-                    const QString& info,
-                    const QString& creator,
-                    uint createdOn,
-                    bool shared,
-                    int lastmod,
-                    const QString& guid )
-    : QObject()
-    , m_source( src )
-    , m_currentrevision( currentrevision )
-    , m_guid( guid == "" ? uuid() : guid )
-    , m_title( title )
-    , m_info( info )
-    , m_creator( creator )
-    , m_lastmodified( lastmod )
-    , m_createdOn( createdOn )
-    , m_shared( shared )
-    , m_updater( 0 )
-{
-    init();
-}
-
-
-Playlist::Playlist( const source_ptr& author,
-                    const QString& guid,
-                    const QString& title,
-                    const QString& info,
-                    const QString& creator,
-                    bool shared,
-                    const QList< Tomahawk::plentry_ptr >& entries )
-    : QObject()
-    , m_source( author )
-    , m_guid( guid )
-    , m_title( title )
-    , m_info ( info )
-    , m_creator( creator )
-    , m_lastmodified( 0 )
-    , m_createdOn( 0 ) // will be set by db command
-    , m_shared( shared )
-    , m_initEntries( entries )
-    , m_updater( 0 )
-{
-    init();
-}
-
-
-void
-Playlist::init()
-{
-    m_busy = false;
-    m_deleted = false;
-    m_locallyChanged = false;
-    connect( Pipeline::instance(), SIGNAL( idle() ), SLOT( onResolvingFinished() ) );
-}
-
-
-Playlist::~Playlist()
-{
-}
-
-
-playlist_ptr
-Playlist::create( const source_ptr& author,
-                  const QString& guid,
-                  const QString& title,
-                  const QString& info,
-                  const QString& creator,
-                  bool shared,
-                  const QList<Tomahawk::query_ptr>& queries )
-{
-    QList< plentry_ptr > entries;
-    foreach( const Tomahawk::query_ptr& query, queries )
-    {
-        plentry_ptr p( new PlaylistEntry );
-        p->setGuid( uuid() );
-        p->setDuration( query->duration() );
-        p->setLastmodified( 0 );
-        p->setAnnotation( "" );
-        p->setQuery( query );
-
-        entries << p;
-    }
-
-    playlist_ptr playlist( new Playlist( author, guid, title, info, creator, shared, entries ), &QObject::deleteLater );
-
-    // save to DB in the background
-    // Watch for the created() signal if you need to be sure it's written.
-    //
-    // When a playlist is created it will reportCreated(), adding it to the
-    // collection it belongs to and emitting the appropriate signal.
-    // When we create a new playlist for the local source here we call reportCreated()
-    // immediately, so the GUI can reflect the new playlist without waiting for the DB sync
-    //
-    // When createplaylist DBOPs come from peers, the postCommitHook will call
-    // reportCreated for us automatically, which should cause new playlists to be added to the GUI.
-
-    DatabaseCommand_CreatePlaylist* cmd = new DatabaseCommand_CreatePlaylist( author, playlist );
-    connect( cmd, SIGNAL( finished() ), playlist.data(), SIGNAL( created() ) );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
-    playlist->reportCreated( playlist );
-
-    return playlist;
-}
-
-
-playlist_ptr
-Playlist::load( const QString& guid )
-{
-    playlist_ptr p;
-
-    foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() )
-    {
-        p = source->collection()->playlist( guid );
-        if ( !p.isNull() )
-            return p;
-    }
-
-    return p;
-}
-
-
-void
-Playlist::remove( const playlist_ptr& playlist )
-{
-    playlist->aboutToBeDeleted( playlist );
-
-    TomahawkSettings *s = TomahawkSettings::instance();
-    s->removePlaylistSettings( playlist->guid() );
-
-    DatabaseCommand_DeletePlaylist* cmd = new DatabaseCommand_DeletePlaylist( playlist->author(), playlist->guid() );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
-}
-
-
-void
-Playlist::rename( const QString& title )
-{
-    DatabaseCommand_RenamePlaylist* cmd = new DatabaseCommand_RenamePlaylist( author(), guid(), title );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
-}
-
-
-void
-Playlist::reportCreated( const playlist_ptr& self )
-{
-    Q_ASSERT( self.data() == this );
-    m_source->collection()->addPlaylist( self );
-}
-
-
-void
-Playlist::reportDeleted( const Tomahawk::playlist_ptr& self )
-{
-    Q_ASSERT( self.data() == this );
-    if ( m_updater )
-        m_updater->remove();
-
-    m_deleted = true;
-    m_source->collection()->deletePlaylist( self );
-
-    emit deleted( self );
-}
-
-
-void
-Playlist::loadRevision( const QString& rev )
-{
-//    qDebug() << Q_FUNC_INFO << currentrevision() << rev << m_title;
-
-    setBusy( true );
-    DatabaseCommand_LoadPlaylistEntries* cmd =
-            new DatabaseCommand_LoadPlaylistEntries( rev.isEmpty() ? currentrevision() : rev );
-
-    connect( cmd, SIGNAL( done( const QString&,
-                                const QList<QString>&,
-                                const QList<QString>&,
-                                bool,
-                                const QMap< QString, Tomahawk::plentry_ptr >&,
-                                bool ) ),
-                    SLOT( setRevision( const QString&,
-                                       const QList<QString>&,
-                                       const QList<QString>&,
-                                       bool,
-                                       const QMap< QString, Tomahawk::plentry_ptr >&,
-                                       bool ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-//public, model can call this if user changes a playlist:
-void
-Playlist::createNewRevision( const QString& newrev, const QString& oldrev, const QList< plentry_ptr >& entries )
-{
-    tDebug() << Q_FUNC_INFO << newrev << oldrev << entries.count();
-    Q_ASSERT( m_source->isLocal() || newrev == oldrev );
-
-    if ( busy() )
-    {
-        m_revisionQueue.enqueue( RevisionQueueItem( newrev, oldrev, entries, oldrev == currentrevision() ) );
-        return;
-    }
-
-    if ( newrev != oldrev )
-        setBusy( true );
-
-    // calc list of newly added entries:
-    QList<plentry_ptr> added = newEntries( entries );
-    QStringList orderedguids;
-    foreach( const plentry_ptr& p, entries )
-        orderedguids << p->guid();
-
-    // source making the change (local user in this case)
-    source_ptr author = SourceList::instance()->getLocal();
-    // command writes new rev to DB and calls setRevision, which emits our signal
-    DatabaseCommand_SetPlaylistRevision* cmd =
-            new DatabaseCommand_SetPlaylistRevision( author,
-                                                     guid(),
-                                                     newrev,
-                                                     oldrev,
-                                                     orderedguids,
-                                                     added,
-                                                     entries );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-// private, called when we loadRevision, or by our friend class DatabaseCommand_SetPlaylistRevision
-// used to save new revision data (either originating locally, or via network msg for syncing)
-void
-Playlist::setRevision( const QString& rev,
-                       const QList<QString>& neworderedguids,
-                       const QList<QString>& oldorderedguids,
-                       bool is_newest_rev,
-                       const QMap< QString, Tomahawk::plentry_ptr >& addedmap,
-                       bool applied )
-{
-    if( QThread::currentThread() != thread() )
-    {
-        QMetaObject::invokeMethod( this,
-                                   "setRevision",
-                                   Qt::BlockingQueuedConnection,
-                                   Q_ARG( QString, rev ),
-                                   Q_ARG( QList<QString>, neworderedguids ),
-                                   Q_ARG( QList<QString>, oldorderedguids ),
-                                   Q_ARG( bool, is_newest_rev ),
-                                   QGenericArgument( "QMap< QString,Tomahawk::plentry_ptr >", (const void*)&addedmap ),
-                                   Q_ARG( bool, applied )
-                                 );
-        return;
-    }
-
-    PlaylistRevision pr = setNewRevision( rev, neworderedguids, oldorderedguids, is_newest_rev, addedmap );
-
-    Q_ASSERT( applied );
-    if ( applied )
-        m_currentrevision = rev;
-    pr.applied = applied;
-
-    foreach( const plentry_ptr& entry, m_entries )
-    {
-        connect( entry->query().data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ),
-                 SLOT( onResultsFound( QList<Tomahawk::result_ptr> ) ), Qt::UniqueConnection );
-    }
-
-    setBusy( false );
-
-    if ( m_initEntries.count() && currentrevision().isEmpty() )
-    {
-        // add initial tracks
-        createNewRevision( uuid(), currentrevision(), m_initEntries );
-        m_initEntries.clear();
-    }
-    else
-        emit revisionLoaded( pr );
-
-    checkRevisionQueue();
-}
-
-
-PlaylistRevision
-Playlist::setNewRevision( const QString& rev,
-                          const QList<QString>& neworderedguids,
-                          const QList<QString>& oldorderedguids,
-                          bool is_newest_rev,
-                          const QMap< QString, Tomahawk::plentry_ptr >& addedmap )
-{
-    // build up correctly ordered new list of plentry_ptrs from
-    // existing ones, and the ones that have been added
-    QMap<QString, plentry_ptr> entriesmap;
-    foreach ( const plentry_ptr& p, m_entries )
-        entriesmap.insert( p->guid(), p );
-
-    QList<plentry_ptr> entries;
-    foreach ( const QString& id, neworderedguids )
-    {
-        if ( entriesmap.contains( id ) )
-        {
-            entries.append( entriesmap.value( id ) );
-        }
-        else if ( addedmap.contains( id ) )
-        {
-            entries.append( addedmap.value( id ) );
-            if ( is_newest_rev )
-                m_entries.append( addedmap.value( id ) );
-        }
-        else
-        {
-            tDebug() << "id:" << id;
-            tDebug() << "newordered:" << neworderedguids.count() << neworderedguids;
-            tDebug() << "entriesmap:" << entriesmap.count() << entriesmap;
-            tDebug() << "addedmap:" << addedmap.count() << addedmap;
-            tDebug() << "m_entries" << m_entries;
-
-            tLog() << "Playlist error for playlist with guid" << guid() << "from source" << author()->friendlyName();
-            Q_ASSERT( false ); // XXX
-        }
-    }
-
-    PlaylistRevision pr;
-    pr.oldrevisionguid = m_currentrevision;
-    pr.revisionguid = rev;
-
-    // entries that have been removed:
-    QSet<QString> removedguids = oldorderedguids.toSet().subtract( neworderedguids.toSet() );
-    //qDebug() << "Removedguids:" << removedguids << "oldorederedguids" << oldorderedguids << "newog" << neworderedguids;
-    foreach ( QString remid, removedguids )
-    {
-        // NB: entriesmap will contain old/removed entries only if the removal was done
-        // in the same session - after a restart, history is not in memory.
-        if ( entriesmap.contains( remid ) )
-        {
-            pr.removed << entriesmap.value( remid );
-            if ( is_newest_rev )
-            {
-                //qDebug() << "Removing from m_entries" << remid;
-                for ( int k = 0 ; k < m_entries.length(); ++k )
-                {
-                    if ( m_entries.at( k )->guid() == remid )
-                    {
-                        //qDebug() << "removed at" << k;
-                        m_entries.removeAt( k );
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    pr.added = addedmap.values();
-    pr.newlist = entries;
-
-    return pr;
-}
-
-
-source_ptr
-Playlist::author() const
-{
-    return m_source;
-}
-
-
-void
-Playlist::resolve()
-{
-    QList< query_ptr > qlist;
-    foreach( const plentry_ptr& p, m_entries )
-    {
-        qlist << p->query();
-    }
-
-    Pipeline::instance()->resolve( qlist );
-}
-
-
-void
-Playlist::onResultsFound( const QList<Tomahawk::result_ptr>& results )
-{
-    Q_UNUSED( results );
-    m_locallyChanged = true;
-}
-
-
-void
-Playlist::onResolvingFinished()
-{
-    if ( m_locallyChanged && !m_deleted )
-    {
-        m_locallyChanged = false;
-        createNewRevision( currentrevision(), currentrevision(), m_entries );
-    }
-}
-
-
-void
-Playlist::addEntry( const query_ptr& query, const QString& oldrev )
-{
-    QList<query_ptr> queries;
-    queries << query;
-
-    addEntries( queries, oldrev );
-}
-
-
-void
-Playlist::addEntries( const QList<query_ptr>& queries, const QString& oldrev )
-{
-    QList<plentry_ptr> el = entriesFromQueries( queries );
-
-    QString newrev = uuid();
-    createNewRevision( newrev, oldrev, el );
-}
-
-
-QList<plentry_ptr>
-Playlist::entriesFromQueries( const QList<Tomahawk::query_ptr>& queries, bool clearFirst )
-{
-    QList<plentry_ptr> el;
-    if ( !clearFirst )
-        el = entries();
-
-    foreach( const query_ptr& query, queries )
-    {
-        plentry_ptr e( new PlaylistEntry() );
-        e->setGuid( uuid() );
-
-        if ( query->results().count() )
-            e->setDuration( query->results().at( 0 )->duration() );
-        else
-            e->setDuration( 0 );
-
-        e->setLastmodified( 0 );
-        e->setAnnotation( "" ); // FIXME
-        e->setQuery( query );
-
-        el << e;
-    }
-    return el;
-}
-
-
-QList< plentry_ptr >
-Playlist::newEntries( const QList< plentry_ptr >& entries )
-{
-    QSet<QString> currentguids;
-    foreach( const plentry_ptr& p, m_entries )
-        currentguids.insert( p->guid() ); // could be cached as member?
-
-    // calc list of newly added entries:
-    QList<plentry_ptr> added;
-    foreach( const plentry_ptr& p, entries )
-    {
-        if( !currentguids.contains( p->guid() ) )
-            added << p;
-    }
-    return added;
-}
-
-
-void
-Playlist::setBusy( bool b )
-{
-    m_busy = b;
-    emit changed();
-}
-
-
-void
-Playlist::checkRevisionQueue()
-{
-    if ( !m_revisionQueue.isEmpty() )
-    {
-        RevisionQueueItem item = m_revisionQueue.dequeue();
-
-        if ( item.oldRev != currentrevision() && item.applyToTip )
-        {
-            // this was applied to the then-latest, but the already-running operation changed it so it's out of date now. fix it
-            if ( item.oldRev == item.newRev )
-            {
-                checkRevisionQueue();
-                return;
-            }
-
-            item.oldRev = currentrevision();
-        }
-        createNewRevision( item.newRev, item.oldRev, item.entries );
-    }
-}
-
-
-Tomahawk::playlistinterface_ptr
-Playlist::playlistInterface()
-{
-    if ( m_playlistInterface.isNull() )
-    {
-        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::PlaylistPlaylistInterface( this ) );
-    }
-
-    return m_playlistInterface;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist.h Deleted

@@ -1,290 +0,0 @@
-/* === 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
- *   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 PLAYLIST_H
-#define PLAYLIST_H
-
-#include <QObject>
-#include <QList>
-#include <QVariant>
-#include <QSharedPointer>
-#include <QQueue>
-
-#include "typedefs.h"
-#include "result.h"
-#include "playlistinterface.h"
-#include "playlist/PlaylistUpdaterInterface.h"
-#include "query.h"
-
-#include "dllmacro.h"
-
-class DatabaseCommand_LoadAllPlaylists;
-class DatabaseCommand_LoadAllSortedPlaylists;
-class DatabaseCommand_SetPlaylistRevision;
-class DatabaseCommand_CreatePlaylist;
-namespace Tomahawk
-{
-
-class PlaylistUpdaterInterface;
-
-class DLLEXPORT PlaylistEntry : public QObject
-{
-Q_OBJECT
-Q_PROPERTY( QString guid              READ guid         WRITE setGuid )
-Q_PROPERTY( QString annotation        READ annotation   WRITE setAnnotation )
-Q_PROPERTY( unsigned int duration     READ duration     WRITE setDuration )
-Q_PROPERTY( unsigned int lastmodified READ lastmodified WRITE setLastmodified )
-Q_PROPERTY( QVariant query            READ queryVariant WRITE setQueryVariant )
-
-public:
-    PlaylistEntry();
-    virtual ~PlaylistEntry();
-
-    void setQuery( const Tomahawk::query_ptr& q );
-    const Tomahawk::query_ptr& query() const;
-
-    // I wish Qt did this for me once i specified the Q_PROPERTIES:
-    void setQueryVariant( const QVariant& v );
-    QVariant queryVariant() const;
-
-    QString guid() const { return m_guid; }
-    void setGuid( const QString& s ) { m_guid = s; }
-
-    QString annotation() const { return m_annotation; }
-    void setAnnotation( const QString& s ) { m_annotation = s; }
-
-    QString resultHint() const { return m_resulthint; }
-    void setResultHint( const QString& s ) { m_resulthint= s; }
-
-    unsigned int duration() const { return m_duration; }
-    void setDuration( unsigned int i ) { m_duration = i; }
-
-    unsigned int lastmodified() const { return m_lastmodified; }
-    void setLastmodified( unsigned int i ) { m_lastmodified = i; }
-
-    source_ptr lastSource() const;
-    void setLastSource( source_ptr s );
-
-private:
-    QString m_guid;
-    Tomahawk::query_ptr m_query;
-    QString m_annotation;
-    unsigned int m_duration;
-    unsigned int m_lastmodified;
-    source_ptr   m_lastsource;
-    QString      m_resulthint;
-};
-
-
-struct PlaylistRevision
-{
-    QString revisionguid;
-    QString oldrevisionguid;
-    QList<plentry_ptr> newlist;
-    QList<plentry_ptr> added;
-    QList<plentry_ptr> removed;
-    bool applied; // false if conflict
-};
-
-struct RevisionQueueItem
-{
-public:
-    QString newRev;
-    QString oldRev;
-    QList< plentry_ptr > entries;
-    bool applyToTip;
-
-    RevisionQueueItem( const QString& nRev, const QString& oRev, const QList< plentry_ptr >& e, bool latest ) :
-        newRev( nRev ), oldRev( oRev), entries( e ), applyToTip( latest ) {}
-};
-
-
-class DLLEXPORT Playlist : public QObject
-{
-Q_OBJECT
-Q_PROPERTY( QString guid            READ guid               WRITE setGuid )
-Q_PROPERTY( QString currentrevision READ currentrevision    WRITE setCurrentrevision )
-Q_PROPERTY( QString title           READ title              WRITE setTitle )
-Q_PROPERTY( QString info            READ info               WRITE setInfo )
-Q_PROPERTY( QString creator         READ creator            WRITE setCreator )
-Q_PROPERTY( unsigned int createdon  READ createdOn          WRITE setCreatedOn )
-Q_PROPERTY( bool    shared          READ shared             WRITE setShared )
-
-friend class ::DatabaseCommand_LoadAllPlaylists;
-friend class ::DatabaseCommand_LoadAllSortedPlaylists;
-friend class ::DatabaseCommand_SetPlaylistRevision;
-friend class ::DatabaseCommand_CreatePlaylist;
-friend class DynamicPlaylist;
-
-public:
-    virtual ~Playlist();
-
-    static Tomahawk::playlist_ptr load( const QString& guid );
-
-    // one CTOR is private, only called by DatabaseCommand_LoadAllPlaylists
-    static Tomahawk::playlist_ptr create( const source_ptr& author,
-                                          const QString& guid,
-                                          const QString& title,
-                                          const QString& info,
-                                          const QString& creator,
-                                          bool shared,
-                                          const QList<Tomahawk::query_ptr>& queries = QList<Tomahawk::query_ptr>() );
-
-    static void remove( const playlist_ptr& playlist );
-    void rename( const QString& title );
-
-    virtual void loadRevision( const QString& rev = "" );
-
-    source_ptr author() const;
-    QString currentrevision() const   { return m_currentrevision; }
-    QString title() const             { return m_title; }
-    QString info() const              { return m_info; }
-    QString creator() const           { return m_creator; }
-    QString guid() const              { return m_guid; }
-    bool shared() const               { return m_shared; }
-    unsigned int lastmodified() const { return m_lastmodified; }
-    uint createdOn() const            { return m_createdOn; }
-
-    bool busy() const { return m_busy; }
-
-    const QList< plentry_ptr >& entries() { return m_entries; }
-    virtual void addEntry( const Tomahawk::query_ptr& query, const QString& oldrev );
-    virtual void addEntries( const QList<Tomahawk::query_ptr>& queries, const QString& oldrev );
-
-    // <IGNORE hack="true">
-    // these need to exist and be public for the json serialization stuff
-    // you SHOULD NOT call them.  They are used for an alternate CTOR method from json.
-    // maybe friend QObjectHelper and make them private?
-    explicit Playlist( const source_ptr& author );
-    void setCurrentrevision( const QString& s ) { m_currentrevision = s; }
-    void setTitle( const QString& s )           { m_title = s; emit changed(); }
-    void setInfo( const QString& s )            { m_info = s; }
-    void setCreator( const QString& s )         { m_creator = s; }
-    void setGuid( const QString& s )            { m_guid = s; }
-    void setShared( bool b )                    { m_shared = b; }
-    void setCreatedOn( uint createdOn )         { m_createdOn = createdOn; }
-    // </IGNORE>
-
-
-    QList<plentry_ptr> entriesFromQueries( const QList<Tomahawk::query_ptr>& queries, bool clearFirst = false );
-    void setUpdater( PlaylistUpdaterInterface* pluinterface ) { m_updater = pluinterface; }
-    PlaylistUpdaterInterface* updater() const { return m_updater; }
-
-    Tomahawk::playlistinterface_ptr playlistInterface();
-
-signals:
-    /// emitted when the playlist revision changes (whenever the playlist changes)
-    void revisionLoaded( Tomahawk::PlaylistRevision );
-
-    /// watch for this to see when newly created playlist is synced to DB (if you care)
-    void created();
-
-    /// renamed etc.
-    void changed();
-
-    /**
-     *   delete command is scheduled but not completed. Do not call remove() again once this
-     *   is emitted.
-     */
-    void aboutToBeDeleted( const Tomahawk::playlist_ptr& pl );
-
-    /// was deleted, eh?
-    void deleted( const Tomahawk::playlist_ptr& pl );
-
-public slots:
-    // want to update the playlist from the model?
-    // generate a newrev using uuid() and call this:
-    void createNewRevision( const QString& newrev, const QString& oldrev, const QList< plentry_ptr >& entries );
-    void reportCreated( const Tomahawk::playlist_ptr& self );
-    void reportDeleted( const Tomahawk::playlist_ptr& self );
-
-    void setRevision( const QString& rev,
-                      const QList<QString>& neworderedguids,
-                      const QList<QString>& oldorderedguids,
-                      bool is_newest_rev,
-                      const QMap< QString, Tomahawk::plentry_ptr >& addedmap,
-                      bool applied );
-
-    void resolve();
-
-protected:
-    // called from loadAllPlaylists DB cmd:
-    explicit Playlist( const source_ptr& src,
-                       const QString& currentrevision,
-                       const QString& title,
-                       const QString& info,
-                       const QString& creator,
-                       uint createdOn,
-                       bool shared,
-                       int lastmod,
-                       const QString& guid = "" ); // populate db
-
-    // called when creating new playlist
-    explicit Playlist( const source_ptr& author,
-                       const QString& guid,
-                       const QString& title,
-                       const QString& info,
-                       const QString& creator,
-                       bool shared,
-                       const QList< Tomahawk::plentry_ptr >& entries = QList< Tomahawk::plentry_ptr >() );
-
-    QList< plentry_ptr > newEntries( const QList< plentry_ptr >& entries );
-    PlaylistRevision setNewRevision( const QString& rev,
-                                     const QList<QString>& neworderedguids,
-                                     const QList<QString>& oldorderedguids,
-                                     bool is_newest_rev,
-                                     const QMap< QString, Tomahawk::plentry_ptr >& addedmap );
-
-
-private slots:
-    void onResultsFound( const QList<Tomahawk::result_ptr>& results );
-    void onResolvingFinished();
-
-private:
-    Playlist();
-    void init();
-
-    void setBusy( bool b );
-    void checkRevisionQueue();
-
-    source_ptr m_source;
-    QString m_currentrevision;
-    QString m_guid, m_title, m_info, m_creator;
-    unsigned int m_lastmodified;
-    unsigned int m_createdOn;
-    bool m_shared;
-
-    QList< plentry_ptr > m_initEntries;
-    QList< plentry_ptr > m_entries;
-
-    QQueue<RevisionQueueItem> m_revisionQueue;
-
-    PlaylistUpdaterInterface* m_updater;
-
-    bool m_locallyChanged;
-    bool m_deleted;
-    bool m_busy;
-
-    Tomahawk::playlistinterface_ptr m_playlistInterface;
-};
-
-}
-
-Q_DECLARE_METATYPE( QSharedPointer< Tomahawk::Playlist > )
-
-#endif // PLAYLIST_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albumitem.cpp Deleted

@@ -1,105 +0,0 @@
-/* === 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
- *   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 "albumitem.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-AlbumItem::~AlbumItem()
-{
-    // Don't use qDeleteAll here! The children will remove themselves
-    // from the list when they get deleted and the qDeleteAll iterator
-    // will fail badly!
-    for ( int i = children.count() - 1; i >= 0; i-- )
-        delete children.at( i );
-
-    if ( parent && index.isValid() )
-    {
-        parent->children.removeAt( index.row() );
-    }
-}
-
-
-AlbumItem::AlbumItem( AlbumItem* parent, QAbstractItemModel* model )
-{
-    this->parent = parent;
-    this->model = model;
-    childCount = 0;
-    toberemoved = false;
-
-    if ( parent )
-    {
-        parent->children.append( this );
-    }
-}
-
-
-AlbumItem::AlbumItem( const Tomahawk::album_ptr& album, AlbumItem* parent, int row )
-    : QObject( parent )
-    , m_album( album )
-{
-    this->parent = parent;
-    if ( parent )
-    {
-        if ( row < 0 )
-        {
-            parent->children.append( this );
-            row = parent->children.count() - 1;
-        }
-        else
-        {
-            parent->children.insert( row, this );
-        }
-
-        this->model = parent->model;
-    }
-
-    toberemoved = false;
-
-    connect( album.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
-}
-
-
-AlbumItem::AlbumItem( const Tomahawk::artist_ptr& artist, AlbumItem* parent, int row )
-    : QObject( parent )
-    , m_artist( artist )
-{
-    this->parent = parent;
-    if ( parent )
-    {
-        if ( row < 0 )
-        {
-            parent->children.append( this );
-            row = parent->children.count() - 1;
-        }
-        else
-        {
-            parent->children.insert( row, this );
-        }
-
-        this->model = parent->model;
-    }
-
-    toberemoved = false;
-
-    connect( artist.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albumitem.h Deleted

@@ -1,62 +0,0 @@
-/* === 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
- *   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 ALBUMITEM_H
-#define ALBUMITEM_H
-
-#include <QAbstractItemModel>
-#include <QHash>
-#include <QPersistentModelIndex>
-#include <QPixmap>
-
-#include "artist.h"
-#include "album.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT AlbumItem : public QObject
-{
-Q_OBJECT
-
-public:
-    ~AlbumItem();
-
-    explicit AlbumItem( AlbumItem* parent = 0, QAbstractItemModel* model = 0 );
-    explicit AlbumItem( const Tomahawk::artist_ptr& artist, AlbumItem* parent = 0, int row = -1 );
-    explicit AlbumItem( const Tomahawk::album_ptr& album, AlbumItem* parent = 0, int row = -1 );
-
-    const Tomahawk::artist_ptr& artist() const { return m_artist; }
-    const Tomahawk::album_ptr& album() const { return m_album; }
-
-    AlbumItem* parent;
-    QList<AlbumItem*> children;
-    QHash<QString, AlbumItem*> hash;
-    int childCount;
-    QPersistentModelIndex index;
-    QAbstractItemModel* model;
-    bool toberemoved;
-
-signals:
-    void dataChanged();
-
-private:
-    Tomahawk::artist_ptr m_artist;
-    Tomahawk::album_ptr m_album;
-};
-
-#endif // ALBUMITEM_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albumitemdelegate.cpp Deleted

@@ -1,260 +0,0 @@
-/* === 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
- *   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 "albumitemdelegate.h"
-
-#include <QApplication>
-#include <QPainter>
-#include <QAbstractItemView>
-
-#include "artist.h"
-#include "query.h"
-#include "result.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include "playlist/albumitem.h"
-#include "playlist/albumproxymodel.h"
-#include <QMouseEvent>
-#include <viewmanager.h>
-
-
-AlbumItemDelegate::AlbumItemDelegate( QAbstractItemView* parent, AlbumProxyModel* proxy )
-    : QStyledItemDelegate( (QObject*)parent )
-    , m_view( parent )
-    , m_model( proxy )
-{
-}
-
-
-QSize
-AlbumItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QSize size = QStyledItemDelegate::sizeHint( option, index );
-    return size;
-}
-
-
-void
-AlbumItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    AlbumItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( index ) );
-    if ( !item )
-        return;
-
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, QModelIndex() );
-    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
-
-    painter->save();
-    painter->setRenderHint( QPainter::Antialiasing );
-
-    if ( !( option.state & QStyle::State_Selected ) )
-    {
-        QRect shadowRect = option.rect.adjusted( 5, 4, -5, -40 );
-        painter->setPen( QColor( 90, 90, 90 ) );
-        painter->drawRoundedRect( shadowRect, 0.5, 0.5 );
-
-        QPen shadowPen( QColor( 30, 30, 30 ) );
-        shadowPen.setWidth( 0.4 );
-        painter->drawLine( shadowRect.bottomLeft() + QPoint( -1, 2 ), shadowRect.bottomRight() + QPoint( 1, 2 ) );
-
-        shadowPen.setColor( QColor( 160, 160, 160 ) );
-        painter->setPen( shadowPen );
-        painter->drawLine( shadowRect.topLeft() + QPoint( -1, 2 ), shadowRect.bottomLeft() + QPoint( -1, 2 ) );
-        painter->drawLine( shadowRect.topRight() + QPoint( 2, 2 ), shadowRect.bottomRight() + QPoint( 2, 2 ) );
-        painter->drawLine( shadowRect.bottomLeft() + QPoint( 0, 3 ), shadowRect.bottomRight() + QPoint( 0, 3 ) );
-
-        shadowPen.setColor( QColor( 180, 180, 180 ) );
-        painter->setPen( shadowPen );
-        painter->drawLine( shadowRect.topLeft() + QPoint( -2, 3 ), shadowRect.bottomLeft() + QPoint( -2, 1 ) );
-        painter->drawLine( shadowRect.topRight() + QPoint( 3, 3 ), shadowRect.bottomRight() + QPoint( 3, 1 ) );
-        painter->drawLine( shadowRect.bottomLeft() + QPoint( 0, 4 ), shadowRect.bottomRight() + QPoint( 0, 4 ) );
-    }
-
-    QRect r = option.rect.adjusted( 6, 5, -6, -41 );
-    QPixmap cover;
-    if ( !item->album().isNull() )
-    {
-        cover = item->album()->cover( r.size() );
-        if ( cover.isNull() )
-            cover = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::CoverInCase, r.size() );
-    }
-    else if ( !item->artist().isNull() )
-    {
-        cover = item->artist()->cover( r.size() );
-    }
-
-    if ( option.state & QStyle::State_Selected )
-    {
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
-        painter->save();
-        painter->setRenderHint( QPainter::Antialiasing );
-
-        QPainterPath border;
-        border.addRoundedRect( r.adjusted( -2, -2, 2, 2 ), 3, 3 );
-        QPen borderPen( QColor( 86, 170, 243 ) );
-        borderPen.setWidth( 5 );
-        painter->setPen( borderPen );
-        painter->drawPath( border );
-
-        painter->restore();
-#else
-        opt.palette.setColor( QPalette::Text, opt.palette.color( QPalette::HighlightedText ) );
-#endif
-    }
-
-    painter->drawPixmap( r, cover );
-
-    painter->setPen( opt.palette.color( QPalette::Text ) );
-    QTextOption to;
-    to.setWrapMode( QTextOption::NoWrap );
-
-    QString text;
-    QFont font = opt.font;
-    font.setPixelSize( 11 );
-    QFont boldFont = font;
-    boldFont.setBold( true );
-
-    QRect textRect = option.rect.adjusted( 0, option.rect.height() - 32, 0, -2 );
-
-    QString name;
-    if ( !item->album().isNull() )
-        name = item->album()->name();
-    else if ( !item->artist().isNull() )
-        name = item->artist()->name();
-
-    painter->setFont( boldFont );
-    bool oneLiner = false;
-    if ( item->album().isNull() || item->album()->artist().isNull() )
-        oneLiner = true;
-    else
-        oneLiner = ( textRect.height() / 2 < painter->fontMetrics().boundingRect( item->album()->name() ).height() ||
-                     textRect.height() / 2 < painter->fontMetrics().boundingRect( item->album()->artist()->name() ).height() );
-
-    if ( oneLiner )
-    {
-        to.setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
-        text = painter->fontMetrics().elidedText( name, Qt::ElideRight, textRect.width() - 3 );
-        painter->drawText( textRect, text, to );
-    }
-    else
-    {
-        to.setAlignment( Qt::AlignHCenter | Qt::AlignTop );
-        text = painter->fontMetrics().elidedText( item->album()->name(), Qt::ElideRight, textRect.width() - 3 );
-        painter->drawText( textRect, text, to );
-
-        // If the user is hovering over an artist rect, draw a background so she knows it's clickable
-        QRect r = textRect;
-        r.setTop( r.bottom() - painter->fontMetrics().height() );
-        r.adjust( 4, 0, -4, -1 );
-        if ( m_hoveringOver == index )
-        {
-            TomahawkUtils::drawQueryBackground( painter, opt.palette, r, 1.1 );
-            painter->setPen( opt.palette.color( QPalette::HighlightedText ) );
-        }
-        else
-        {
-            if ( !( option.state & QStyle::State_Selected ) )
-#ifdef Q_WS_MAC
-                painter->setPen( opt.palette.color( QPalette::Dark ).darker( 200 ) );
-#else
-                painter->setPen( opt.palette.color( QPalette::Dark ) );
-#endif
-        }
-
-        to.setAlignment( Qt::AlignHCenter | Qt::AlignBottom );
-        text = painter->fontMetrics().elidedText( item->album()->artist()->name(), Qt::ElideRight, textRect.width() - 10 );
-        painter->drawText( textRect.adjusted( 5, -1, -5, -1 ), text, to );
-
-        // Calculate rect of artist on-hover button click area
-        m_artistNameRects index  = r;
-    }
-
-    painter->restore();
-}
-
-
-bool
-AlbumItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
-{
-    Q_UNUSED( model );
-    Q_UNUSED( option );
-
-    if ( event->type() != QEvent::MouseButtonRelease &&
-         event->type() != QEvent::MouseMove &&
-         event->type() != QEvent::MouseButtonPress &&
-         event->type() != QEvent::Leave )
-        return false;
-
-    if ( m_artistNameRects.contains( index ) )
-    {
-        QMouseEvent* ev = static_cast< QMouseEvent* >( event );
-        QRect artistNameRect = m_artistNameRects index ;
-        if ( artistNameRect.contains( ev->pos() ) )
-        {
-            if ( event->type() == QEvent::MouseMove )
-            {
-                if ( m_hoveringOver != index )
-                {
-                    QModelIndex old = m_hoveringOver;
-                    m_hoveringOver = index;
-                    emit updateIndex( old );
-                    emit updateIndex( index );
-                }
-
-                event->accept();
-                return true;
-            }
-            else if ( event->type() == QEvent::MouseButtonRelease )
-            {
-                AlbumItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( index ) );
-                if ( !item || item->album().isNull() || item->album()->artist().isNull() )
-                    return false;
-
-                ViewManager::instance()->show( item->album()->artist() );
-
-                event->accept();
-                return true;
-            }
-            else if ( event->type() == QEvent::MouseButtonPress )
-            {
-                // Stop the whole album from having a down click action as we just want the artist name to be clicked
-                event->accept();
-                return true;
-            }
-        }
-    }
-
-    whitespaceMouseEvent();
-
-    return false;
-}
-
-
-void
-AlbumItemDelegate::whitespaceMouseEvent()
-{
-    if ( m_hoveringOver.isValid() )
-    {
-        QModelIndex old = m_hoveringOver;
-        m_hoveringOver = QPersistentModelIndex();
-        emit updateIndex( old );
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albumitemdelegate.h Deleted

@@ -1,58 +0,0 @@
-/* === 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
- *   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 ALBUMITEMDELEGATE_H
-#define ALBUMITEMDELEGATE_H
-
-#include <QStyledItemDelegate>
-
-#include "dllmacro.h"
-
-class QEvent;
-class AlbumProxyModel;
-
-class DLLEXPORT AlbumItemDelegate : public QStyledItemDelegate
-{
-Q_OBJECT
-
-public:
-    AlbumItemDelegate( QAbstractItemView* parent = 0, AlbumProxyModel* proxy = 0 );
-
-    void whitespaceMouseEvent();
-
-protected:
-    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-    bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
-//    QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-signals:
-    void updateIndex( const QModelIndex& idx );
-
-private:
-    QAbstractItemView* m_view;
-    AlbumProxyModel* m_model;
-
-    mutable QHash< QPersistentModelIndex, QRect > m_artistNameRects;
-    QPersistentModelIndex m_hoveringOver;
-
-    QPixmap m_shadowPixmap;
-};
-
-#endif // ALBUMITEMDELEGATE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albummodel.cpp Deleted

@@ -1,462 +0,0 @@
-/* === 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
- *   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 "albummodel.h"
-
-#include <QListView>
-#include <QMimeData>
-#include <QNetworkReply>
-
-#include "artist.h"
-#include "albumitem.h"
-#include "source.h"
-#include "sourcelist.h"
-#include "database/database.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-AlbumModel::AlbumModel( QObject* parent )
-    : QAbstractItemModel( parent )
-    , m_rootItem( new AlbumItem( 0, this ) )
-    , m_overwriteOnAdd( false )
-{
-}
-
-
-AlbumModel::~AlbumModel()
-{
-    delete m_rootItem;
-}
-
-
-QModelIndex
-AlbumModel::index( int row, int column, const QModelIndex& parent ) const
-{
-    if ( !m_rootItem || row < 0 || column < 0 )
-        return QModelIndex();
-
-    AlbumItem* parentItem = itemFromIndex( parent );
-    AlbumItem* childItem = parentItem->children.value( row );
-    if ( !childItem )
-        return QModelIndex();
-
-    return createIndex( row, column, childItem );
-}
-
-
-int
-AlbumModel::rowCount( const QModelIndex& parent ) const
-{
-    if ( parent.column() > 0 )
-        return 0;
-
-    AlbumItem* parentItem = itemFromIndex( parent );
-    if ( !parentItem )
-        return 0;
-
-    return parentItem->children.count();
-}
-
-
-int
-AlbumModel::columnCount( const QModelIndex& parent ) const
-{
-    Q_UNUSED( parent );
-    return 1;
-}
-
-
-QModelIndex
-AlbumModel::parent( const QModelIndex& child ) const
-{
-    AlbumItem* entry = itemFromIndex( child );
-    if ( !entry )
-        return QModelIndex();
-
-    AlbumItem* parentEntry = entry->parent;
-    if ( !parentEntry )
-        return QModelIndex();
-
-    AlbumItem* grandparentEntry = parentEntry->parent;
-    if ( !grandparentEntry )
-        return QModelIndex();
-
-    int row = grandparentEntry->children.indexOf( parentEntry );
-    return createIndex( row, 0, parentEntry );
-}
-
-
-QVariant
-AlbumModel::data( const QModelIndex& index, int role ) const
-{
-    if ( role == Qt::SizeHintRole )
-    {
-        return QSize( 116, 150 );
-    }
-
-    AlbumItem* entry = itemFromIndex( index );
-    if ( !entry )
-        return QVariant();
-
-    if ( role != Qt::DisplayRole ) // && role != Qt::ToolTipRole )
-        return QVariant();
-
-    QString name;
-    if ( !entry->album().isNull() )
-        name = entry->album()->name();
-    else if ( !entry->artist().isNull() )
-        name = entry->artist()->name();
-
-    switch( index.column() )
-    {
-        case 0:
-            return name;
-            break;
-
-    }
-
-    return QVariant();
-}
-
-
-QVariant
-AlbumModel::headerData( int section, Qt::Orientation orientation, int role ) const
-{
-    QStringList headers;
-    headers << tr( "Album" );
-    if ( orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= 0 )
-    {
-        return headers.at( section );
-    }
-
-    return QVariant();
-}
-
-
-Qt::ItemFlags
-AlbumModel::flags( const QModelIndex& index ) const
-{
-    Qt::ItemFlags defaultFlags = QAbstractItemModel::flags( index );
-
-    if ( index.isValid() && index.column() == 0 )
-        return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
-    else
-        return defaultFlags;
-}
-
-
-QStringList
-AlbumModel::mimeTypes() const
-{
-    QStringList types;
-    types << "application/tomahawk.query.list";
-    return types;
-}
-
-
-QMimeData*
-AlbumModel::mimeData( const QModelIndexList &indexes ) const
-{
-    QByteArray queryData;
-    QDataStream queryStream( &queryData, QIODevice::WriteOnly );
-
-    bool isAlbumData = true;
-    foreach ( const QModelIndex& i, indexes )
-    {
-        if ( i.column() > 0 )
-            continue;
-
-        QModelIndex idx = index( i.row(), 0, i.parent() );
-        AlbumItem* item = itemFromIndex( idx );
-        if ( item && !item->album().isNull() )
-        {
-            const album_ptr& album = item->album();
-            queryStream << album->artist()->name();
-            queryStream << album->name();
-
-            isAlbumData = true;
-        }
-        else if ( item && !item->artist().isNull() )
-        {
-            const artist_ptr& artist = item->artist();
-            queryStream << artist->name();
-
-            isAlbumData = false;
-        }
-    }
-
-    QMimeData* mimeData = new QMimeData;
-    mimeData->setData( isAlbumData ? "application/tomahawk.metadata.album" : "application/tomahawk.metadata.artist", queryData );
-
-    return mimeData;
-}
-
-
-void
-AlbumModel::removeIndex( const QModelIndex& index )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( index.column() > 0 )
-        return;
-
-    AlbumItem* item = itemFromIndex( index );
-    if ( item )
-    {
-        emit beginRemoveRows( index.parent(), index.row(), index.row() );
-        delete item;
-        emit endRemoveRows();
-    }
-
-    emit itemCountChanged( rowCount( QModelIndex() ) );
-}
-
-
-void
-AlbumModel::removeIndexes( const QList<QModelIndex>& indexes )
-{
-    foreach( const QModelIndex& idx, indexes )
-    {
-        removeIndex( idx );
-    }
-}
-
-
-void
-AlbumModel::addCollection( const collection_ptr& collection, bool overwrite )
-{
-    qDebug() << Q_FUNC_INFO << collection->name()
-                            << collection->source()->id()
-                            << collection->source()->userName();
-
-    DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( collection );
-    m_overwriteOnAdd = overwrite;
-    m_collection = collection;
-
-    connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
-                    SLOT( addAlbums( QList<Tomahawk::album_ptr> ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-
-    m_title = tr( "All albums from %1" ).arg( collection->source()->friendlyName() );
-
-    if ( collection.isNull() )
-    {
-        connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ), Qt::UniqueConnection );
-
-        QList<Tomahawk::source_ptr> sources = SourceList::instance()->sources();
-        foreach ( const source_ptr& source, sources )
-        {
-            connect( source->collection().data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
-        }
-    }
-    else
-    {
-        connect( collection.data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
-    }
-
-    emit loadingStarted();
-}
-
-
-void
-AlbumModel::addFilteredCollection( const collection_ptr& collection, unsigned int amount, DatabaseCommand_AllAlbums::SortOrder order, bool overwrite )
-{
-/*    qDebug() << Q_FUNC_INFO << collection->name()
-                            << collection->source()->id()
-                            << collection->source()->userName()
-                            << amount << order;*/
-
-    DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( collection );
-    cmd->setLimit( amount );
-    cmd->setSortOrder( order );
-    cmd->setSortDescending( true );
-    m_overwriteOnAdd = overwrite;
-    m_collection = collection;
-
-    connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
-                    SLOT( addAlbums( QList<Tomahawk::album_ptr> ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-
-    if ( !collection.isNull() )
-        m_title = tr( "All albums from %1" ).arg( collection->source()->friendlyName() );
-    else
-        m_title = tr( "All albums" );
-
-    emit loadingStarted();
-}
-
-
-void
-AlbumModel::addAlbums( const QList<Tomahawk::album_ptr>& albums )
-{
-    emit loadingFinished();
-
-    if ( m_overwriteOnAdd )
-        clear();
-
-    QList<Tomahawk::album_ptr> trimmedAlbums;
-    foreach ( const album_ptr& album, albums )
-    {
-        if ( !album.isNull() && album->name().length() )
-        {
-            if ( findItem( album ) || trimmedAlbums.contains( album ) )
-                continue;
-            trimmedAlbums << album;
-        }
-    }
-
-    if ( !trimmedAlbums.count() )
-    {
-        emit itemCountChanged( rowCount( QModelIndex() ) );
-        return;
-    }
-
-    int c = rowCount( QModelIndex() );
-    QPair< int, int > crows;
-    crows.first = c;
-    crows.second = c + trimmedAlbums.count() - 1;
-
-    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
-
-    AlbumItem* albumitem;
-    foreach( const album_ptr& album, trimmedAlbums )
-    {
-        albumitem = new AlbumItem( album, m_rootItem );
-        albumitem->index = createIndex( m_rootItem->children.count() - 1, 0, albumitem );
-
-        connect( albumitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
-    }
-
-    emit endInsertRows();
-    emit itemCountChanged( rowCount( QModelIndex() ) );
-}
-
-
-void
-AlbumModel::addArtists( const QList<Tomahawk::artist_ptr>& artists )
-{
-    emit loadingFinished();
-
-    if ( m_overwriteOnAdd )
-        clear();
-
-    QList<Tomahawk::artist_ptr> trimmedArtists;
-    foreach ( const artist_ptr& artist, artists )
-    {
-        if ( !artist.isNull() && artist->name().length() )
-        {
-            if ( findItem( artist ) || trimmedArtists.contains( artist ) )
-                continue;
-            trimmedArtists << artist;
-        }
-    }
-
-    if ( !trimmedArtists.count() )
-    {
-        emit itemCountChanged( rowCount( QModelIndex() ) );
-        return;
-    }
-
-    int c = rowCount( QModelIndex() );
-    QPair< int, int > crows;
-    crows.first = c;
-    crows.second = c + trimmedArtists.count() - 1;
-
-    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
-
-    AlbumItem* albumitem;
-    foreach ( const artist_ptr& artist, trimmedArtists )
-    {
-        albumitem = new AlbumItem( artist, m_rootItem );
-        albumitem->index = createIndex( m_rootItem->children.count() - 1, 0, albumitem );
-
-        connect( albumitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
-    }
-
-    emit endInsertRows();
-    emit itemCountChanged( rowCount( QModelIndex() ) );
-}
-
-
-void
-AlbumModel::onSourceAdded( const Tomahawk::source_ptr& source )
-{
-    connect( source->collection().data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
-}
-
-
-void
-AlbumModel::onCollectionChanged()
-{
-    addCollection( m_collection, true );
-}
-
-
-void
-AlbumModel::clear()
-{
-    beginResetModel();
-    delete m_rootItem;
-    m_rootItem = new AlbumItem( 0, this );
-    endResetModel();
-}
-
-
-void
-AlbumModel::onDataChanged()
-{
-    AlbumItem* p = (AlbumItem*)sender();
-    emit dataChanged( p->index, p->index.sibling( p->index.row(), columnCount( QModelIndex() ) - 1 ) );
-}
-
-
-AlbumItem*
-AlbumModel::findItem( const artist_ptr& artist ) const
-{
-    for ( int i = 0; i < rowCount( QModelIndex() ); i++ )
-    {
-        AlbumItem* item = itemFromIndex( index( i, 0, QModelIndex() ) );
-        if ( !item->artist().isNull() && item->artist() == artist )
-        {
-            return item;
-        }
-    }
-
-    return 0;
-}
-
-
-AlbumItem*
-AlbumModel::findItem( const album_ptr& album ) const
-{
-    for ( int i = 0; i < rowCount( QModelIndex() ); i++ )
-    {
-        AlbumItem* item = itemFromIndex( index( i, 0, QModelIndex() ) );
-        if ( !item->album().isNull() && item->album() == album )
-        {
-            return item;
-        }
-    }
-
-    return 0;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albummodel.h Deleted

@@ -1,120 +0,0 @@
-/* === 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
- *   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 ALBUMMODEL_H
-#define ALBUMMODEL_H
-
-#include <QAbstractItemModel>
-#include <QPixmap>
-
-#include "album.h"
-#include "playlistinterface.h"
-#include "database/databasecommand_allalbums.h"
-
-#include "dllmacro.h"
-
-class AlbumItem;
-class QMetaData;
-
-class DLLEXPORT AlbumModel : public QAbstractItemModel
-{
-Q_OBJECT
-
-public:
-    explicit AlbumModel( QObject* parent = 0 );
-    virtual ~AlbumModel();
-
-    virtual QModelIndex index( int row, int column, const QModelIndex& parent ) const;
-    virtual QModelIndex parent( const QModelIndex& child ) const;
-
-    virtual bool isReadOnly() const { return true; }
-
-    virtual int trackCount() const { return rowCount( QModelIndex() ); }
-    virtual int albumCount() const { return rowCount( QModelIndex() ); }
-
-    virtual int rowCount( const QModelIndex& parent ) const;
-    virtual int columnCount( const QModelIndex& parent ) const;
-
-    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-    virtual QVariant headerData( int section, Qt::Orientation orientation, int role ) const;
-
-    virtual void removeIndex( const QModelIndex& index );
-    virtual void removeIndexes( const QList<QModelIndex>& indexes );
-
-    virtual QMimeData* mimeData( const QModelIndexList& indexes ) const;
-    virtual QStringList mimeTypes() const;
-    virtual Qt::ItemFlags flags( const QModelIndex& index ) const;
-
-    Tomahawk::collection_ptr collection() const { return m_collection; }
-
-    void clear();
-    void addCollection( const Tomahawk::collection_ptr& collection, bool overwrite = false );
-    void addFilteredCollection( const Tomahawk::collection_ptr& collection, unsigned int amount, DatabaseCommand_AllAlbums::SortOrder order, bool overwrite = false );
-
-    virtual QString title() const { return m_title; }
-    virtual QString description() const { return m_description; }
-    virtual void setTitle( const QString& title ) { m_title = title; }
-    virtual void setDescription( const QString& description ) { m_description = description; }
-
-    AlbumItem* findItem( const Tomahawk::artist_ptr& artist ) const;
-    AlbumItem* findItem( const Tomahawk::album_ptr& album ) const;
-
-    AlbumItem* itemFromIndex( const QModelIndex& index ) const
-    {
-        if ( index.isValid() )
-            return static_cast<AlbumItem*>( index.internalPointer() );
-        else
-        {
-            return m_rootItem;
-        }
-    }
-
-public slots:
-    virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode /*mode*/ ) {}
-    virtual void setShuffled( bool /*shuffled*/ ) {}
-
-    void addAlbums( const QList<Tomahawk::album_ptr>& albums );
-    void addArtists( const QList<Tomahawk::artist_ptr>& artists );
-
-signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void itemCountChanged( unsigned int items );
-
-    void loadingStarted();
-    void loadingFinished();
-
-private slots:
-    void onDataChanged();
-
-    void onSourceAdded( const Tomahawk::source_ptr& source );
-    void onCollectionChanged();
-
-private:
-    QPersistentModelIndex m_currentIndex;
-    AlbumItem* m_rootItem;
-
-    QString m_title;
-    QString m_description;
-    bool m_overwriteOnAdd;
-
-    Tomahawk::collection_ptr m_collection;
-};
-
-#endif // ALBUMMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albumproxymodel.cpp Deleted

@@ -1,152 +0,0 @@
-/* === 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
- *   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 "albumproxymodel.h"
-
-#include <QListView>
-
-#include "albumproxymodelplaylistinterface.h"
-#include "artist.h"
-#include "albumitem.h"
-#include "query.h"
-#include "utils/logger.h"
-
-
-AlbumProxyModel::AlbumProxyModel( QObject* parent )
-    : QSortFilterProxyModel( parent )
-    , m_model( 0 )
-{
-    setFilterCaseSensitivity( Qt::CaseInsensitive );
-    setSortCaseSensitivity( Qt::CaseInsensitive );
-    setDynamicSortFilter( true );
-
-    setSourceAlbumModel( 0 );
-}
-
-
-void
-AlbumProxyModel::setSourceModel( QAbstractItemModel* sourceModel )
-{
-    Q_UNUSED( sourceModel );
-    qDebug() << "Explicitly use setSourceAlbumModel instead";
-    Q_ASSERT( false );
-}
-
-
-void
-AlbumProxyModel::setSourceAlbumModel( AlbumModel* sourceModel )
-{
-    m_model = sourceModel;
-
-    if ( m_model && m_model->metaObject()->indexOfSignal( "trackCountChanged(uint)" ) > -1 )
-        connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), SIGNAL( sourceTrackCountChanged( unsigned int ) ) );
-
-    QSortFilterProxyModel::setSourceModel( sourceModel );
-}
-
-
-bool
-AlbumProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
-{
-    if ( filterRegExp().isEmpty() )
-        return true;
-
-    AlbumItem* pi = sourceModel()->itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
-    if ( !pi )
-        return false;
-
-    const Tomahawk::album_ptr& q = pi->album();
-
-    QStringList sl = filterRegExp().pattern().split( " ", QString::SkipEmptyParts );
-
-    bool found = true;
-    foreach( const QString& s, sl )
-    {
-        if ( !q->name().contains( s, Qt::CaseInsensitive ) && !q->artist()->name().contains( s, Qt::CaseInsensitive ) )
-        {
-            found = false;
-        }
-    }
-
-    return found;
-}
-
-
-bool
-AlbumProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
-{
-    AlbumItem* p1 = sourceModel()->itemFromIndex( left );
-    AlbumItem* p2 = sourceModel()->itemFromIndex( right );
-
-    if ( !p1 )
-        return true;
-    if ( !p2 )
-        return false;
-
-    if ( p1->album().isNull() || p1->album()->artist().isNull() )
-        return true;
-
-    if ( p2->album().isNull() || p2->album()->artist().isNull() )
-        return false;
-
-    if ( p1->album()->artist()->name() == p2->album()->artist()->name() )
-    {
-        return QString::localeAwareCompare( p1->album()->name(), p2->album()->name() ) < 0;
-    }
-
-    return QString::localeAwareCompare( p1->album()->artist()->name(), p2->album()->artist()->name() ) < 0;
-}
-
-
-void
-AlbumProxyModel::removeIndex( const QModelIndex& index )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( !sourceModel() )
-        return;
-    if ( index.column() > 0 )
-        return;
-
-    sourceModel()->removeIndex( mapToSource( index ) );
-}
-
-
-void
-AlbumProxyModel::removeIndexes( const QList<QModelIndex>& indexes )
-{
-    if ( !sourceModel() )
-        return;
-
-    foreach( const QModelIndex& idx, indexes )
-    {
-        removeIndex( idx );
-    }
-}
-
-
-Tomahawk::playlistinterface_ptr
-AlbumProxyModel::playlistInterface()
-{
-    if ( m_playlistInterface.isNull() )
-    {
-        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::AlbumProxyModelPlaylistInterface( this ) );
-    }
-
-    return m_playlistInterface;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albumproxymodel.h Deleted

@@ -1,63 +0,0 @@
-/* === 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
- *   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 ALBUMPROXYMODEL_H
-#define ALBUMPROXYMODEL_H
-
-#include <QSortFilterProxyModel>
-
-#include "playlistinterface.h"
-#include "playlist/albummodel.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT AlbumProxyModel : public QSortFilterProxyModel
-{
-Q_OBJECT
-
-public:
-    explicit AlbumProxyModel( QObject* parent = 0 );
-    virtual ~AlbumProxyModel() {}
-
-    virtual AlbumModel* sourceModel() const { return m_model; }
-    virtual void setSourceAlbumModel( AlbumModel* sourceModel );
-    virtual void setSourceModel( QAbstractItemModel* sourceModel );
-
-    virtual int albumCount() const { return rowCount( QModelIndex() ); }
-
-    virtual void removeIndex( const QModelIndex& index );
-    virtual void removeIndexes( const QList<QModelIndex>& indexes );
-
-    virtual void emitFilterChanged( const QString &pattern ) { emit filterChanged( pattern ); }
-
-    virtual Tomahawk::playlistinterface_ptr playlistInterface();
-
-signals:
-    void filterChanged( const QString& filter );
-
-protected:
-    bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const;
-    bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
-
-private:
-    AlbumModel* m_model;
-
-    Tomahawk::playlistinterface_ptr m_playlistInterface;
-};
-
-#endif // ALBUMPROXYMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albumproxymodelplaylistinterface.cpp Deleted

@@ -1,100 +0,0 @@
-/* === 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
- *   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 "albumproxymodelplaylistinterface.h"
-
-#include "albumproxymodel.h"
-#include "artist.h"
-#include "albumitem.h"
-#include "query.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-AlbumProxyModelPlaylistInterface::AlbumProxyModelPlaylistInterface( AlbumProxyModel *proxyModel )
-    : Tomahawk::PlaylistInterface()
-    , m_proxyModel( proxyModel )
-    , m_repeatMode( PlaylistInterface::NoRepeat )
-    , m_shuffled( false )
-{
-}
-
-
-AlbumProxyModelPlaylistInterface::~AlbumProxyModelPlaylistInterface()
-{
-    m_proxyModel.clear();
-}
-
-
-QList< Tomahawk::query_ptr >
-AlbumProxyModelPlaylistInterface::tracks()
-{
-    Q_ASSERT( FALSE );
-    QList<Tomahawk::query_ptr> queries;
-    return queries;
-}
-
-
-int
-AlbumProxyModelPlaylistInterface::unfilteredTrackCount() const
-{
-    return ( m_proxyModel.isNull() ? 0 : m_proxyModel.data()->sourceModel()->rowCount( QModelIndex() ) );
-}
-
-
-int
-AlbumProxyModelPlaylistInterface::trackCount() const
-{
-    return ( m_proxyModel.isNull() ? 0 : m_proxyModel.data()->rowCount( QModelIndex() ) );
-}
-
-
-Tomahawk::result_ptr
-AlbumProxyModelPlaylistInterface::currentItem() const
-{
-     return Tomahawk::result_ptr();
-}
-
-
-QString
-AlbumProxyModelPlaylistInterface::filter() const
-{
-    return ( m_proxyModel.isNull() ? QString() : m_proxyModel.data()->filterRegExp().pattern() );
-}
-
-
-void
-AlbumProxyModelPlaylistInterface::setFilter( const QString& pattern )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( m_proxyModel.isNull() )
-        return;
-
-    m_proxyModel.data()->setFilterRegExp( pattern );
-    m_proxyModel.data()->emitFilterChanged( pattern );
-}
-
-
-Tomahawk::result_ptr
-AlbumProxyModelPlaylistInterface::siblingItem( int itemsAway )
-{
-    Q_UNUSED( itemsAway );
-    qDebug() << Q_FUNC_INFO;
-    return Tomahawk::result_ptr( 0 );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albumproxymodelplaylistinterface.h Deleted

@@ -1,77 +0,0 @@
-/* === 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
- *   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 ALBUMPROXYMODELPLAYLISTINTERFACE_H
-#define ALBUMPROXYMODELPLAYLISTINTERFACE_H
-
-#include "playlistinterface.h"
-#include "playlist/albummodel.h"
-
-#include "dllmacro.h"
-
-class AlbumProxyModel;
-
-namespace Tomahawk
-{
-
-class DLLEXPORT AlbumProxyModelPlaylistInterface : public Tomahawk::PlaylistInterface
-{
-Q_OBJECT
-
-public:
-    explicit AlbumProxyModelPlaylistInterface( AlbumProxyModel *proxyModel );
-    virtual ~AlbumProxyModelPlaylistInterface();
-
-    virtual QList<Tomahawk::query_ptr> tracks();
-
-    virtual int unfilteredTrackCount() const;
-    virtual int trackCount() const;
-
-    virtual bool hasNextItem() { return true; }
-    virtual Tomahawk::result_ptr currentItem() const;
-    virtual Tomahawk::result_ptr siblingItem( int direction );
-
-    virtual QString filter() const;
-    virtual void setFilter( const QString& pattern );
-
-    virtual Tomahawk::PlaylistInterface::RepeatMode repeatMode() const { return m_repeatMode; }
-    virtual bool shuffled() const { return m_shuffled; }
-    virtual Tomahawk::PlaylistInterface::ViewMode viewMode() const { return Tomahawk::PlaylistInterface::Album; }
-
-signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void trackCountChanged( unsigned int tracks );
-    void sourceTrackCountChanged( unsigned int tracks );
-
-    void nextTrackReady();
-
-public slots:
-    virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
-    virtual void setShuffled( bool enabled ) { m_shuffled = enabled; emit shuffleModeChanged( enabled ); }
-
-private:
-    QWeakPointer< AlbumProxyModel > m_proxyModel;
-    RepeatMode m_repeatMode;
-    bool m_shuffled;
-};
-
-} //ns
-
-#endif // ALBUMPROXYMODELPLAYLISTINTERFACE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albumview.cpp Deleted

@@ -1,243 +0,0 @@
-/* === 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
- *   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 "albumview.h"
-
-#include <QHeaderView>
-#include <QKeyEvent>
-#include <QPainter>
-#include <QScrollBar>
-#include <qmath.h>
-
-#include "audio/audioengine.h"
-#include "context/ContextWidget.h"
-#include "tomahawksettings.h"
-#include "artist.h"
-#include "albumitem.h"
-#include "albumitemdelegate.h"
-#include "albummodel.h"
-#include "viewmanager.h"
-#include "utils/logger.h"
-#include "dynamic/widgets/LoadingSpinner.h"
-
-#define SCROLL_TIMEOUT 280
-
-using namespace Tomahawk;
-
-
-AlbumView::AlbumView( QWidget* parent )
-    : QListView( parent )
-    , m_model( 0 )
-    , m_proxyModel( 0 )
-    , m_delegate( 0 )
-    , m_loadingSpinner( new LoadingSpinner( this ) )
-    , m_overlay( new OverlayWidget( this ) )
-    , m_inited( false )
-{
-    setDragEnabled( true );
-    setDropIndicatorShown( false );
-    setDragDropOverwriteMode( false );
-    setUniformItemSizes( true );
-    setSpacing( 16 );
-    setContentsMargins( 0, 0, 0, 0 );
-    setMouseTracking( true );
-
-    setResizeMode( Adjust );
-    setViewMode( IconMode );
-    setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
-
-    setAutoFitItems( true );
-    setProxyModel( new AlbumProxyModel( this ) );
-
-    connect( this, SIGNAL( doubleClicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
-}
-
-
-AlbumView::~AlbumView()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-AlbumView::setProxyModel( AlbumProxyModel* model )
-{
-    m_proxyModel = model;
-    m_delegate = new AlbumItemDelegate( this, m_proxyModel );
-    connect( m_delegate, SIGNAL( updateIndex( QModelIndex ) ), this, SLOT( update( QModelIndex ) ) );
-    setItemDelegate( m_delegate );
-
-    QListView::setModel( m_proxyModel );
-}
-
-
-void
-AlbumView::setModel( QAbstractItemModel* model )
-{
-    Q_UNUSED( model );
-    qDebug() << "Explicitly use setAlbumModel instead";
-    Q_ASSERT( false );
-}
-
-
-void
-AlbumView::setAlbumModel( AlbumModel* model )
-{
-    m_model = model;
-
-    if ( m_proxyModel )
-    {
-        m_proxyModel->setSourceAlbumModel( m_model );
-        m_proxyModel->sort( 0 );
-    }
-
-    connect( m_proxyModel, SIGNAL( filterChanged( QString ) ), SLOT( onFilterChanged( QString ) ) );
-
-    connect( m_model, SIGNAL( itemCountChanged( unsigned int ) ), SLOT( onItemCountChanged( unsigned int ) ) );
-    connect( m_model, SIGNAL( loadingStarted() ), m_loadingSpinner, SLOT( fadeIn() ) );
-    connect( m_model, SIGNAL( loadingFinished() ), m_loadingSpinner, SLOT( fadeOut() ) );
-}
-
-
-void
-AlbumView::currentChanged( const QModelIndex& current, const QModelIndex& previous )
-{
-    QListView::currentChanged( current, previous );
-
-    AlbumItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( current ) );
-    if ( item )
-    {
-        if ( !item->album().isNull() )
-            ViewManager::instance()->context()->setAlbum( item->album() );
-    }
-}
-
-
-void
-AlbumView::onItemActivated( const QModelIndex& index )
-{
-    AlbumItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
-    if ( item )
-    {
-//        qDebug() << "Result activated:" << item->album()->tracks().first()->toString() << item->album()->tracks().first()->results().first()->url();
-//        APP->audioEngine()->playItem( item->album().data(), item->album()->tracks().first()->results().first() );
-
-        if ( !item->album().isNull() )
-            ViewManager::instance()->show( item->album() );
-        else if ( !item->artist().isNull() )
-            ViewManager::instance()->show( item->artist() );
-    }
-}
-
-
-void
-AlbumView::onItemCountChanged( unsigned int items )
-{
-    if ( items == 0 )
-    {
-        if ( m_model->collection().isNull() || ( !m_model->collection().isNull() && m_model->collection()->source()->isLocal() ) )
-            m_overlay->setText( tr( "After you have scanned your music collection you will find your latest album additions right here." ) );
-        else
-            m_overlay->setText( tr( "This collection doesn't have any recent albums." ) );
-
-        m_overlay->show();
-    }
-    else
-        m_overlay->hide();
-}
-
-
-void
-AlbumView::paintEvent( QPaintEvent* event )
-{
-    if ( !autoFitItems() || m_inited || !m_proxyModel->rowCount() )
-        QListView::paintEvent( event );
-}
-
-
-void
-AlbumView::resizeEvent( QResizeEvent* event )
-{
-    if ( autoFitItems() )
-    {
-#ifdef Q_WS_X11
-        int scrollbar = verticalScrollBar()->isVisible() ? verticalScrollBar()->width() : 0;
-#else
-        int scrollbar = verticalScrollBar()->rect().width();
-#endif
-        int rectWidth = contentsRect().width() - scrollbar - 16 - 3;
-        QSize itemSize = m_proxyModel->data( QModelIndex(), Qt::SizeHintRole ).toSize();
-
-        int itemsPerRow = qFloor( rectWidth / ( itemSize.width() + 16 ) );
-        int rightSpacing = rectWidth - ( itemsPerRow * ( itemSize.width() + 16 ) );
-        int newSpacing = 16 + floor( rightSpacing / ( itemsPerRow + 1 ) );
-
-        if ( itemsPerRow < 1 )
-            setSpacing( 16 );
-        else
-            setSpacing( newSpacing );
-
-        if ( !m_inited )
-        {
-            m_inited = true;
-            repaint();
-        }
-    }
-
-    QListView::resizeEvent( event );
-}
-
-
-void
-AlbumView::onFilterChanged( const QString& )
-{
-    if ( selectedIndexes().count() )
-        scrollTo( selectedIndexes().at( 0 ), QAbstractItemView::PositionAtCenter );
-}
-
-
-void
-AlbumView::startDrag( Qt::DropActions supportedActions )
-{
-    QList<QPersistentModelIndex> pindexes;
-    QModelIndexList indexes;
-    foreach( const QModelIndex& idx, selectedIndexes() )
-    {
-        if ( ( m_proxyModel->flags( idx ) & Qt::ItemIsDragEnabled ) )
-        {
-            indexes << idx;
-            pindexes << idx;
-        }
-    }
-
-    if ( indexes.count() == 0 )
-        return;
-
-    qDebug() << "Dragging" << indexes.count() << "indexes";
-    QMimeData* data = m_proxyModel->mimeData( indexes );
-    if ( !data )
-        return;
-
-    QDrag* drag = new QDrag( this );
-    drag->setMimeData( data );
-    const QPixmap p = TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeAlbum, indexes.count() );
-    drag->setPixmap( p );
-    drag->setHotSpot( QPoint( -20, -20 ) );
-
-    /* Qt::DropAction action = */ drag->exec( supportedActions, Qt::CopyAction );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/albumview.h Deleted

@@ -1,93 +0,0 @@
-/* === 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
- *   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 ALBUMVIEW_H
-#define ALBUMVIEW_H
-
-#include <QListView>
-#include <QSortFilterProxyModel>
-#include <QTimer>
-
-#include "viewpage.h"
-#include "albumproxymodel.h"
-#include "widgets/overlaywidget.h"
-#include "dllmacro.h"
-
-class AlbumModel;
-class LoadingSpinner;
-class AlbumItemDelegate;
-
-class DLLEXPORT AlbumView : public QListView, public Tomahawk::ViewPage
-{
-Q_OBJECT
-
-public:
-    explicit AlbumView( QWidget* parent = 0 );
-    ~AlbumView();
-
-    void setProxyModel( AlbumProxyModel* model );
-
-    AlbumModel* model() const { return m_model; }
-    AlbumProxyModel* proxyModel() const { return m_proxyModel; }
-//    PlaylistItemDelegate* delegate() { return m_delegate; }
-
-    bool autoFitItems() const { return m_autoFitItems; }
-    void setAutoFitItems( bool b ) { m_autoFitItems = b; }
-
-    void setAlbumModel( AlbumModel* model );
-    void setModel( QAbstractItemModel* model );
-
-    virtual QWidget* widget() { return this; }
-    virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return proxyModel()->playlistInterface(); }
-
-    virtual QString title() const { return m_model->title(); }
-    virtual QString description() const { return m_model->description(); }
-
-    virtual bool showModes() const { return true; }
-
-    virtual bool jumpToCurrentTrack() { return false; }
-
-public slots:
-    void onItemActivated( const QModelIndex& index );
-
-protected:
-    virtual void startDrag( Qt::DropActions supportedActions );
-
-    void paintEvent( QPaintEvent* event );
-    void resizeEvent( QResizeEvent* event );
-
-protected slots:
-    virtual void currentChanged( const QModelIndex& current, const QModelIndex& previous );
-
-private slots:
-    void onItemCountChanged( unsigned int items );
-
-    void onFilterChanged( const QString& filter );
-
-private:
-    AlbumModel* m_model;
-    AlbumProxyModel* m_proxyModel;
-    AlbumItemDelegate* m_delegate;
-    LoadingSpinner* m_loadingSpinner;
-    OverlayWidget* m_overlay;
-
-    bool m_inited;
-    bool m_autoFitItems;
-};
-
-#endif // ALBUMVIEW_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/artistview.cpp Deleted

@@ -1,424 +0,0 @@
-/* === 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
- *   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 "artistview.h"
-
-#include <QHeaderView>
-#include <QKeyEvent>
-#include <QPainter>
-#include <QScrollBar>
-
-#include "audio/audioengine.h"
-#include "context/ContextWidget.h"
-#include "dynamic/widgets/LoadingSpinner.h"
-#include "widgets/overlaywidget.h"
-
-#include "contextmenu.h"
-#include "tomahawksettings.h"
-#include "treeheader.h"
-#include "treeitemdelegate.h"
-#include "treemodel.h"
-#include "viewmanager.h"
-#include "utils/logger.h"
-
-#define SCROLL_TIMEOUT 280
-
-using namespace Tomahawk;
-
-
-ArtistView::ArtistView( QWidget* parent )
-    : QTreeView( parent )
-    , m_header( new TreeHeader( this ) )
-    , m_overlay( new OverlayWidget( this ) )
-    , m_model( 0 )
-    , m_proxyModel( 0 )
-//    , m_delegate( 0 )
-    , m_loadingSpinner( new LoadingSpinner( this ) )
-    , m_updateContextView( true )
-    , m_contextMenu( new ContextMenu( this ) )
-    , m_showModes( true )
-{
-    setAlternatingRowColors( true );
-    setDragEnabled( true );
-    setDropIndicatorShown( false );
-    setDragDropOverwriteMode( false );
-    setUniformRowHeights( false );
-    setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
-    setRootIsDecorated( true );
-    setAnimated( false );
-    setAllColumnsShowFocus( true );
-    setSelectionMode( QAbstractItemView::ExtendedSelection );
-    setSelectionBehavior( QAbstractItemView::SelectRows );
-    setContextMenuPolicy( Qt::CustomContextMenu );
-
-    setHeader( m_header );
-    setProxyModel( new TreeProxyModel( this ) );
-
-    #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
-
-    m_timer.setInterval( SCROLL_TIMEOUT );
-    connect( verticalScrollBar(), SIGNAL( rangeChanged( int, int ) ), SLOT( onViewChanged() ) );
-    connect( verticalScrollBar(), SIGNAL( valueChanged( int ) ), SLOT( onViewChanged() ) );
-    connect( &m_timer, SIGNAL( timeout() ), SLOT( onScrollTimeout() ) );
-
-    connect( this, SIGNAL( doubleClicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
-    connect( this, SIGNAL( customContextMenuRequested( const QPoint& ) ), SLOT( onCustomContextMenu( const QPoint& ) ) );
-    connect( m_contextMenu, SIGNAL( triggered( int ) ), SLOT( onMenuTriggered( int ) ) );
-}
-
-
-ArtistView::~ArtistView()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-ArtistView::setProxyModel( TreeProxyModel* model )
-{
-    m_proxyModel = model;
-    setItemDelegate( new TreeItemDelegate( this, m_proxyModel ) );
-
-    QTreeView::setModel( m_proxyModel );
-}
-
-
-void
-ArtistView::setModel( QAbstractItemModel* model )
-{
-    Q_UNUSED( model );
-    qDebug() << "Explicitly use setPlaylistModel instead";
-    Q_ASSERT( false );
-}
-
-
-void
-ArtistView::setTreeModel( TreeModel* model )
-{
-    m_model = model;
-
-    if ( m_proxyModel )
-    {
-        m_proxyModel->setSourceTreeModel( model );
-        m_proxyModel->sort( 0 );
-    }
-
-    connect( m_model, SIGNAL( loadingStarted() ), m_loadingSpinner, SLOT( fadeIn() ) );
-    connect( m_model, SIGNAL( loadingFinished() ), m_loadingSpinner, SLOT( fadeOut() ) );
-    connect( m_proxyModel, SIGNAL( filteringStarted() ), SLOT( onFilteringStarted() ) );
-    connect( m_proxyModel, SIGNAL( filteringFinished() ), m_loadingSpinner, SLOT( fadeOut() ) );
-
-    connect( m_model, SIGNAL( itemCountChanged( unsigned int ) ), SLOT( onItemCountChanged( unsigned int ) ) );
-    connect( m_proxyModel, SIGNAL( filteringFinished() ), SLOT( onFilterChangeFinished() ) );
-    connect( m_proxyModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( onViewChanged() ) );
-
-    guid(); // this will set the guid on the header
-
-    if ( model->columnStyle() == TreeModel::TrackOnly )
-    {
-        setHeaderHidden( true );
-        setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-    }
-    else
-    {
-        setHeaderHidden( false );
-        setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
-    }
-}
-
-
-void
-ArtistView::onViewChanged()
-{
-    if ( m_timer.isActive() )
-        m_timer.stop();
-
-    m_timer.start();
-}
-
-
-void
-ArtistView::onScrollTimeout()
-{
-    if ( m_timer.isActive() )
-        m_timer.stop();
-
-    QModelIndex left = indexAt( viewport()->rect().topLeft() );
-    while ( left.isValid() && left.parent().isValid() )
-        left = left.parent();
-
-    QModelIndex right = indexAt( viewport()->rect().bottomLeft() );
-    while ( right.isValid() && right.parent().isValid() )
-        right = right.parent();
-
-    int max = m_proxyModel->playlistInterface()->trackCount();
-    if ( right.isValid() )
-        max = right.row() + 1;
-
-    if ( !max )
-        return;
-
-    for ( int i = left.row(); i < max; i++ )
-    {
-        m_model->getCover( m_proxyModel->mapToSource( m_proxyModel->index( i, 0 ) ) );
-    }
-}
-
-
-void
-ArtistView::currentChanged( const QModelIndex& current, const QModelIndex& previous )
-{
-    QTreeView::currentChanged( current, previous );
-
-    if ( !m_updateContextView )
-        return;
-
-    TreeModelItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( current ) );
-    if ( item )
-    {
-        if ( !item->result().isNull() )
-            ViewManager::instance()->context()->setQuery( item->result()->toQuery() );
-        else if ( !item->artist().isNull() )
-            ViewManager::instance()->context()->setArtist( item->artist() );
-        else if ( !item->album().isNull() )
-            ViewManager::instance()->context()->setAlbum( item->album() );
-        else if ( !item->query().isNull() )
-            ViewManager::instance()->context()->setQuery( item->query() );
-    }
-}
-
-
-void
-ArtistView::onItemActivated( const QModelIndex& index )
-{
-    TreeModelItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
-    if ( item )
-    {
-        if ( !item->artist().isNull() )
-            ViewManager::instance()->show( item->artist() );
-        else if ( !item->album().isNull() )
-            ViewManager::instance()->show( item->album(), m_model->mode() );
-        else if ( !item->result().isNull() && item->result()->isOnline() )
-        {
-            m_model->setCurrentItem( item->index );
-            AudioEngine::instance()->playItem( m_proxyModel->playlistInterface(), item->result() );
-        }
-    }
-}
-
-
-void
-ArtistView::keyPressEvent( QKeyEvent* event )
-{
-    QTreeView::keyPressEvent( event );
-
-    if ( !model() )
-        return;
-
-    if ( event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return )
-    {
-        onItemActivated( currentIndex() );
-    }
-}
-
-
-void
-ArtistView::resizeEvent( QResizeEvent* event )
-{
-    QTreeView::resizeEvent( event );
-    m_header->checkState();
-
-    if ( !model() )
-        return;
-
-    if ( model()->columnCount( QModelIndex() ) == 1 )
-    {
-        m_header->resizeSection( 0, event->size().width() );
-    }
-}
-
-
-void
-ArtistView::onItemCountChanged( unsigned int items )
-{
-    if ( items == 0 )
-    {
-        if ( m_model->collection().isNull() || ( !m_model->collection().isNull() && m_model->collection()->source()->isLocal() ) )
-            m_overlay->setText( tr( "After you have scanned your music collection you will find your tracks right here." ) );
-        else
-            m_overlay->setText( tr( "This collection is currently empty." ) );
-
-        m_overlay->show();
-    }
-    else
-        m_overlay->hide();
-}
-
-
-void
-ArtistView::onFilterChangeFinished()
-{
-    if ( selectedIndexes().count() )
-        scrollTo( selectedIndexes().at( 0 ), QAbstractItemView::PositionAtCenter );
-
-    if ( !proxyModel()->playlistInterface()->filter().isEmpty() && !proxyModel()->playlistInterface()->trackCount() && model()->trackCount() )
-    {
-        m_overlay->setText( tr( "Sorry, your filter '%1' did not match any results." ).arg( proxyModel()->playlistInterface()->filter() ) );
-        m_overlay->show();
-    }
-    else
-        if ( model()->trackCount() )
-            m_overlay->hide();
-}
-
-
-void
-ArtistView::onFilteringStarted()
-{
-    m_overlay->hide();
-    m_loadingSpinner->fadeIn();
-}
-
-
-void
-ArtistView::startDrag( Qt::DropActions supportedActions )
-{
-    QList<QPersistentModelIndex> pindexes;
-    QModelIndexList indexes;
-    foreach( const QModelIndex& idx, selectedIndexes() )
-    {
-        if ( ( m_proxyModel->flags( idx ) & Qt::ItemIsDragEnabled ) )
-        {
-            indexes << idx;
-            pindexes << idx;
-        }
-    }
-
-    if ( indexes.count() == 0 )
-        return;
-
-    qDebug() << "Dragging" << indexes.count() << "indexes";
-    QMimeData* data = m_proxyModel->mimeData( indexes );
-    if ( !data )
-        return;
-
-    QDrag* drag = new QDrag( this );
-    drag->setMimeData( data );
-
-    QPixmap p;
-    if ( data->hasFormat( "application/tomahawk.metadata.artist" ) )
-        p = TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeArtist, indexes.count() );
-    else if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
-        p = TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeAlbum, indexes.count() );
-    else
-        p = TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeTrack, indexes.count() );
-
-    drag->setPixmap( p );
-    drag->setHotSpot( QPoint( -20, -20 ) );
-
-    drag->exec( supportedActions, Qt::CopyAction );
-}
-
-
-void
-ArtistView::onCustomContextMenu( const QPoint& pos )
-{
-    m_contextMenu->clear();
-
-    QModelIndex idx = indexAt( pos );
-    idx = idx.sibling( idx.row(), 0 );
-    m_contextMenuIndex = idx;
-
-    if ( !idx.isValid() )
-        return;
-
-    QList<query_ptr> queries;
-    QList<artist_ptr> artists;
-    QList<album_ptr> albums;
-
-    foreach ( const QModelIndex& index, selectedIndexes() )
-    {
-        if ( index.column() || selectedIndexes().contains( index.parent() ) )
-            continue;
-
-        TreeModelItem* item = m_proxyModel->itemFromIndex( m_proxyModel->mapToSource( index ) );
-
-        if ( item && !item->result().isNull() )
-            queries << item->result()->toQuery();
-        else if ( item && !item->query().isNull() )
-            queries << item->query();
-        if ( item && !item->artist().isNull() )
-            artists << item->artist();
-        if ( item && !item->album().isNull() )
-            albums << item->album();
-    }
-
-    m_contextMenu->setQueries( queries );
-    m_contextMenu->setArtists( artists );
-    m_contextMenu->setAlbums( albums );
-
-    m_contextMenu->exec( mapToGlobal( pos ) );
-}
-
-
-void
-ArtistView::onMenuTriggered( int action )
-{
-    switch ( action )
-    {
-        case ContextMenu::ActionPlay:
-            onItemActivated( m_contextMenuIndex );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-bool
-ArtistView::jumpToCurrentTrack()
-{
-    if ( !m_proxyModel )
-        return false;
-
-    scrollTo( m_proxyModel->currentIndex(), QAbstractItemView::PositionAtCenter );
-    return true;
-}
-
-
-QString
-ArtistView::guid() const
-{
-    if ( m_guid.isEmpty() )
-    {
-        m_guid = QString( "artistview/%1" ).arg( m_model->columnCount( QModelIndex() ) );
-        m_header->setGuid( m_guid );
-    }
-
-    return m_guid;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/artistview.h Deleted

@@ -1,122 +0,0 @@
-/* === 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
- *   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 ARTISTVIEW_H
-#define ARTISTVIEW_H
-
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QTreeView>
-#include <QtCore/QTimer>
-
-#include "treeproxymodel.h"
-#include "viewpage.h"
-
-#include "playlistinterface.h"
-
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-    class ContextMenu;
-};
-
-class TreeHeader;
-class LoadingSpinner;
-class OverlayWidget;
-class TreeModel;
-
-class DLLEXPORT ArtistView : public QTreeView, public Tomahawk::ViewPage
-{
-Q_OBJECT
-
-public:
-    explicit ArtistView( QWidget* parent = 0 );
-    ~ArtistView();
-
-    virtual QString guid() const;
-    virtual void setGuid( const QString& guid ) { m_guid = guid; }
-
-    void setProxyModel( TreeProxyModel* model );
-
-    TreeModel* model() const { return m_model; }
-    TreeProxyModel* proxyModel() const { return m_proxyModel; }
-    OverlayWidget* overlay() const { return m_overlay; }
-    //    PlaylistItemDelegate* delegate() { return m_delegate; }
-
-    void setModel( QAbstractItemModel* model );
-    void setTreeModel( TreeModel* model );
-
-    virtual QWidget* widget() { return this; }
-    virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return proxyModel()->playlistInterface(); }
-
-    virtual QString title() const { return m_model->title(); }
-    virtual QString description() const { return m_model->description(); }
-    virtual QPixmap pixmap() const { return m_model->icon(); }
-
-    virtual bool showStatsBar() const { return false; }
-    virtual bool showFilter() const { return true; }
-
-    virtual void setShowModes( bool b ) { m_showModes = b; }
-    virtual bool showModes() const { return m_showModes; }
-
-    virtual bool jumpToCurrentTrack();
-
-    bool updatesContextView() const { return m_updateContextView; }
-    void setUpdatesContextView( bool b ) { m_updateContextView = b; }
-
-public slots:
-    void onItemActivated( const QModelIndex& index );
-
-protected:
-    virtual void startDrag( Qt::DropActions supportedActions );
-    virtual void resizeEvent( QResizeEvent* event );
-
-    virtual void keyPressEvent( QKeyEvent* event );
-
-protected slots:
-    virtual void currentChanged( const QModelIndex& current, const QModelIndex& previous );
-
-private slots:
-    void onItemCountChanged( unsigned int items );
-    void onFilterChangeFinished();
-    void onFilteringStarted();
-    void onViewChanged();
-    void onScrollTimeout();
-
-    void onCustomContextMenu( const QPoint& pos );
-    void onMenuTriggered( int action );
-
-private:
-    TreeHeader* m_header;
-    OverlayWidget* m_overlay;
-    TreeModel* m_model;
-    TreeProxyModel* m_proxyModel;
-//    PlaylistItemDelegate* m_delegate;
-    LoadingSpinner* m_loadingSpinner;
-
-    bool m_updateContextView;
-
-    QModelIndex m_contextMenuIndex;
-    Tomahawk::ContextMenu* m_contextMenu;
-
-    bool m_showModes;
-    QTimer m_timer;
-    mutable QString m_guid;
-};
-
-#endif // ARTISTVIEW_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/collectionflatmodel.cpp Deleted

@@ -1,150 +0,0 @@
-/* === 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
- *   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 "collectionflatmodel.h"
-
-#include "database/database.h"
-#include "sourcelist.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-CollectionFlatModel::CollectionFlatModel( QObject* parent )
-    : TrackModel( parent )
-{
-}
-
-
-CollectionFlatModel::~CollectionFlatModel()
-{
-}
-
-
-void
-CollectionFlatModel::addCollections( const QList< collection_ptr >& collections )
-{
-    foreach( const collection_ptr& col, collections )
-    {
-        addCollection( col );
-    }
-
-    // we are waiting for some to load
-    if( !m_loadingCollections.isEmpty() )
-        emit loadingStarted();
-}
-
-
-void
-CollectionFlatModel::addCollection( const collection_ptr& collection, bool sendNotifications )
-{
-    qDebug() << Q_FUNC_INFO << collection->name()
-                            << collection->source()->id()
-                            << collection->source()->userName();
-
-    if ( sendNotifications )
-        emit loadingStarted();
-
-    DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( collection );
-    connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
-                    SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ), Qt::QueuedConnection );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-
-    m_loadingCollections << collection.data();
-
-    if ( collection->source()->isLocal() )
-        setTitle( tr( "My Collection" ) );
-    else
-        setTitle( tr( "Collection of %1" ).arg( collection->source()->friendlyName() ) );
-}
-
-
-void
-CollectionFlatModel::addFilteredCollection( const collection_ptr& collection, unsigned int amount, DatabaseCommand_AllTracks::SortOrder order )
-{
-    qDebug() << Q_FUNC_INFO << collection->name()
-                            << collection->source()->id()
-                            << collection->source()->userName()
-                            << amount << order;
-
-    DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( collection );
-    cmd->setLimit( amount );
-    cmd->setSortOrder( order );
-    cmd->setSortDescending( true );
-
-    connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
-                    SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ), Qt::QueuedConnection );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-CollectionFlatModel::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks )
-{
-    qDebug() << Q_FUNC_INFO << tracks.count() << rowCount( QModelIndex() );
-
-    if ( !m_loadingCollections.isEmpty() && sender() && qobject_cast< Collection* >( sender() ) )
-    {
-        // we are keeping track and are called as a slot
-        m_loadingCollections.removeAll( qobject_cast< Collection* >( sender() ) );
-    }
-
-    append( tracks );
-
-    if ( m_loadingCollections.isEmpty() )
-        emit loadingFinished();
-}
-
-
-void
-CollectionFlatModel::onTracksRemoved( const QList<Tomahawk::query_ptr>& tracks )
-{
-    QList<Tomahawk::query_ptr> t = tracks;
-    for ( int i = rowCount( QModelIndex() ); i >= 0 && t.count(); i-- )
-    {
-        QModelIndex idx = index( i, 0, QModelIndex() );
-        TrackModelItem* item = itemFromIndex( idx );
-        if ( !item )
-            continue;
-
-        int j = 0;
-        foreach ( const query_ptr& query, t )
-        {
-            if ( item->query().data() == query.data() )
-            {
-                remove( idx );
-                t.removeAt( j );
-                break;
-            }
-
-            j++;
-        }
-    }
-}
-
-
-void
-CollectionFlatModel::onDataChanged()
-{
-    TrackModelItem* p = (TrackModelItem*)sender();
-
-    if ( p )
-        emit dataChanged( p->index, p->index.sibling( p->index.row(), columnCount( QModelIndex() ) - 1 ) );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/collectionflatmodel.h Deleted

@@ -1,73 +0,0 @@
-/* === 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
- *   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 COLLECTIONFLATMODEL_H
-#define COLLECTIONFLATMODEL_H
-
-#include <QAbstractItemModel>
-#include <QList>
-#include <QHash>
-
-#include "typedefs.h"
-#include "trackmodel.h"
-#include "query.h"
-#include "source.h"
-#include "playlistinterface.h"
-
-#include "database/databasecommand_alltracks.h"
-
-#include "dllmacro.h"
-
-class QMetaData;
-
-class DLLEXPORT CollectionFlatModel : public TrackModel
-{
-Q_OBJECT
-
-public:
-    explicit CollectionFlatModel( QObject* parent = 0 );
-    ~CollectionFlatModel();
-
-    virtual int trackCount() const { return rowCount( QModelIndex() ) + m_tracksToAdd.count(); }
-
-    void addCollections( const QList< Tomahawk::collection_ptr >& collections );
-    void addCollection( const Tomahawk::collection_ptr& collection, bool sendNotifications = true );
-    void addFilteredCollection( const Tomahawk::collection_ptr& collection, unsigned int amount, DatabaseCommand_AllTracks::SortOrder order );
-
-signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void loadingStarted();
-    void loadingFinished();
-    void trackCountChanged( unsigned int tracks );
-
-private slots:
-    void onDataChanged();
-
-    void onTracksAdded( const QList<Tomahawk::query_ptr>& tracks );
-    void onTracksRemoved( const QList<Tomahawk::query_ptr>& tracks );
-
-private:
-    QMap< Tomahawk::collection_ptr, QPair< int, int > > m_collectionRows;
-    QList<Tomahawk::query_ptr> m_tracksToAdd;
-    // just to keep track of what we are waiting to be loaded
-    QList<Tomahawk::Collection*> m_loadingCollections;
-};
-
-#endif // COLLECTIONFLATMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/collectionproxymodel.cpp Deleted

@@ -1,44 +0,0 @@
-/* === 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
- *   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 "collectionproxymodel.h"
-
-#include "collectionproxymodelplaylistinterface.h"
-
-#include <QTreeView>
-
-#include "album.h"
-#include "query.h"
-#include "utils/logger.h"
-
-
-CollectionProxyModel::CollectionProxyModel( QObject* parent )
-    : TrackProxyModel( parent )
-{
-}
-
-Tomahawk::playlistinterface_ptr
-CollectionProxyModel::playlistInterface()
-{
-    if ( m_playlistInterface.isNull() )
-    {
-        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::CollectionProxyModelPlaylistInterface( this ) );
-    }
-
-    return m_playlistInterface;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/collectionproxymodel.h Deleted

@@ -1,39 +0,0 @@
-/* === 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
- *   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 COLLECTIONPROXYMODEL_H
-#define COLLECTIONPROXYMODEL_H
-
-#include "trackproxymodel.h"
-#include "trackproxymodelplaylistinterface.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT CollectionProxyModel : public TrackProxyModel
-{
-Q_OBJECT
-
-public:
-    explicit CollectionProxyModel( QObject* parent = 0 );
-    virtual ~CollectionProxyModel() {}
-
-    virtual Tomahawk::playlistinterface_ptr playlistInterface();
-
-};
-
-#endif // COLLECTIONPROXYMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/collectionproxymodelplaylistinterface.cpp Deleted

@@ -1,36 +0,0 @@
-/* === 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
- *   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 "collectionproxymodelplaylistinterface.h"
-
-#include "collectionproxymodel.h"
-#include "album.h"
-#include "query.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-CollectionProxyModelPlaylistInterface::CollectionProxyModelPlaylistInterface( CollectionProxyModel *proxyModel )
-    : TrackProxyModelPlaylistInterface( proxyModel )
-{
-}
-
-CollectionProxyModelPlaylistInterface::~CollectionProxyModelPlaylistInterface()
-{
-    m_proxyModel.clear();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/collectionproxymodelplaylistinterface.h Deleted

@@ -1,45 +0,0 @@
-/* === 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
- *   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 COLLECTIONPROXYMODELPLAYLISTINTERFACE_H
-#define COLLECTIONPROXYMODELPLAYLISTINTERFACE_H
-
-#include "trackproxymodel.h"
-#include "trackproxymodelplaylistinterface.h"
-
-#include "dllmacro.h"
-
-class CollectionProxyModel;
-
-namespace Tomahawk
-{
-
-class DLLEXPORT CollectionProxyModelPlaylistInterface : public TrackProxyModelPlaylistInterface
-{
-Q_OBJECT
-
-public:
-    explicit CollectionProxyModelPlaylistInterface( CollectionProxyModel* proxyModel );
-    virtual ~CollectionProxyModelPlaylistInterface();
-
-    virtual PlaylistInterface::ViewMode viewMode() const { return PlaylistInterface::Flat; }
-};
-
-} //ns
-
-#endif // COLLECTIONPROXYMODELPLAYLISTINTERFACE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/collectionview.cpp Deleted

@@ -1,97 +0,0 @@
-/* === 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
- *   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 "collectionview.h"
-
-#include <QDragEnterEvent>
-#include <QPainter>
-
-#include "collectionproxymodel.h"
-#include "trackmodel.h"
-#include "widgets/overlaywidget.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-CollectionView::CollectionView( QWidget* parent )
-    : TrackView( parent )
-{
-    setProxyModel( new CollectionProxyModel( this ) );
-
-    setDragDropMode( QAbstractItemView::DragOnly );
-}
-
-
-CollectionView::~CollectionView()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-CollectionView::setModel( QAbstractItemModel* model )
-{
-    Q_UNUSED( model );
-    qDebug() << "Explicitly use setTrackModel instead";
-    Q_ASSERT( false );
-}
-
-
-void
-CollectionView::setTrackModel( TrackModel* model )
-{
-    TrackView::setTrackModel( model );
-
-    setColumnHidden( TrackModel::Score, true ); // Hide score column per default
-    setColumnHidden( TrackModel::Origin, true ); // Hide origin column per default
-    setColumnHidden( TrackModel::Composer, true ); //Hide composer column per default
-
-    setGuid( QString( "collectionview/%1" ).arg( model->columnCount() ) );
-    sortByColumn( TrackModel::Artist, Qt::AscendingOrder );
-
-    connect( model, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) );
-}
-
-
-void
-CollectionView::dragEnterEvent( QDragEnterEvent* event )
-{
-    event->ignore();
-}
-
-
-void
-CollectionView::onTrackCountChanged( unsigned int tracks )
-{
-    if ( tracks == 0 )
-    {
-        overlay()->setText( tr( "This collection is empty." ) );
-        overlay()->show();
-    }
-    else
-        overlay()->hide();
-}
-
-
-bool
-CollectionView::jumpToCurrentTrack()
-{
-    scrollTo( proxyModel()->currentIndex(), QAbstractItemView::PositionAtCenter );
-    return true;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/collectionview.h Deleted

@@ -1,60 +0,0 @@
-/* === 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
- *   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 COLLECTIONVIEW_H
-#define COLLECTIONVIEW_H
-
-#include "trackproxymodel.h"
-#include "trackview.h"
-#include "viewpage.h"
-
-#include "dllmacro.h"
-
-class TrackModel;
-
-class DLLEXPORT CollectionView : public TrackView, public Tomahawk::ViewPage
-{
-Q_OBJECT
-
-public:
-    explicit CollectionView( QWidget* parent = 0 );
-    ~CollectionView();
-
-    virtual void setTrackModel( TrackModel* model );
-    virtual void setModel( QAbstractItemModel* model );
-
-    virtual QWidget* widget() { return this; }
-    virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return proxyModel()->playlistInterface(); }
-
-    virtual QString title() const { return model()->title(); }
-    virtual QString description() const { return model()->description(); }
-    virtual QPixmap pixmap() const { return QPixmap( RESPATH "images/music-icon.png" ); }
-
-    virtual bool showModes() const { return true; }
-    virtual bool showFilter() const { return true; }
-
-    virtual bool jumpToCurrentTrack();
-
-private slots:
-    void onTrackCountChanged( unsigned int tracks );
-
-protected:
-    virtual void dragEnterEvent( QDragEnterEvent* event );
-};
-
-#endif // COLLECTIONVIEW_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/customplaylistview.cpp Deleted

@@ -1,176 +0,0 @@
-/* === 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 "customplaylistview.h"
-
-#include "database/databasecommand_genericselect.h"
-#include "database/database.h"
-#include "utils/tomahawkutils.h"
-#include "sourcelist.h"
-#include "audio/audioengine.h"
-
-using namespace Tomahawk;
-
-CustomPlaylistView::CustomPlaylistView( CustomPlaylistView::PlaylistType type, const source_ptr& s, QWidget* parent )
-    : PlaylistView ( parent )
-    , m_type( type )
-    , m_source( s )
-    , m_model( new PlaylistModel( this ) )
-{
-    // Generate the tracks, add them to the playlist
-    setFrameShape( QFrame::NoFrame );
-    setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-    setPlaylistModel( m_model );
-    generateTracks();
-
-    if ( m_type == SourceLovedTracks )
-        connect( m_source.data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) );
-    else if ( m_type == TopLovedTracks )
-    {
-        connect( SourceList::instance()->getLocal().data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) );
-        foreach ( const source_ptr& s, SourceList::instance()->sources( true ) )
-            connect( s.data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) );
-
-        connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), this, SLOT( sourceAdded( Tomahawk::source_ptr ) ) );
-    }
-}
-
-
-CustomPlaylistView::~CustomPlaylistView()
-{
-}
-
-
-bool
-CustomPlaylistView::isBeingPlayed() const
-{
-    return AudioEngine::instance()->currentTrackPlaylist() == playlistInterface();
-}
-
-
-bool
-CustomPlaylistView::jumpToCurrentTrack()
-{
-    return PlaylistView::jumpToCurrentTrack();
-}
-
-
-void
-CustomPlaylistView::generateTracks()
-{
-    QString sql;
-    switch ( m_type )
-    {
-        // TODO
-        case SourceLovedTracks:
-            sql = QString( "SELECT track.name, artist.name, COUNT(*) as counter "
-                           "FROM social_attributes, track, artist "
-                           "WHERE social_attributes.id = track.id AND artist.id = track.artist AND social_attributes.k = 'Love' AND social_attributes.v = 'true' AND social_attributes.source %1 "
-                           "GROUP BY track.id "
-                           "ORDER BY counter DESC, social_attributes.timestamp DESC " ).arg( m_source->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_source->id() ) );
-            break;
-        case TopLovedTracks:
-            sql = QString( "SELECT track.name, artist.name, source, COUNT(*) as counter "
-                           "FROM social_attributes, track, artist "
-                           "WHERE social_attributes.id = track.id AND artist.id = track.artist AND social_attributes.k = 'Love' AND social_attributes.v = 'true' "
-                           "GROUP BY track.id "
-                           "ORDER BY counter DESC, social_attributes.timestamp DESC LIMIT 0, 50" );
-            break;
-    }
-
-    DatabaseCommand_GenericSelect* cmd = new DatabaseCommand_GenericSelect( sql, DatabaseCommand_GenericSelect::Track, -1, 0 );
-    connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( tracksGenerated( QList<Tomahawk::query_ptr> ) ) );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-CustomPlaylistView::tracksGenerated( QList< query_ptr > tracks )
-{
-    bool changed = false;
-    QList< query_ptr > newTracks = TomahawkUtils::mergePlaylistChanges( m_model->queries(), tracks, changed);
-
-    if ( !changed )
-        return;
-
-    m_model->clear();
-    m_model->append( newTracks );
-}
-
-
-QString
-CustomPlaylistView::title() const
-{
-    if ( m_source.isNull() )
-        return tr( "Top Loved Tracks" );
-    else
-    {
-        if ( m_source->isLocal() )
-            return tr( "Your loved tracks" );
-        else
-            return tr( "%1's loved tracks" ).arg( m_source->friendlyName() );
-    }
-}
-
-
-QString
-CustomPlaylistView::description() const
-{
-    if ( m_source.isNull() )
-        return tr( "The most loved tracks from all your friends" );
-    else
-    {
-        if ( m_source->isLocal() )
-            return tr( "All of your loved tracks" );
-        else
-            return tr( "All of %1's loved tracks" ).arg( m_source->friendlyName() );
-    }
-}
-
-
-QString
-CustomPlaylistView::longDescription() const
-{
-    return QString();
-}
-
-
-QPixmap
-CustomPlaylistView::pixmap() const
-{
-    return QPixmap( RESPATH "images/loved_playlist.png" );
-}
-
-
-void
-CustomPlaylistView::socialAttributesChanged( const QString& action )
-{
-    if ( action == "Love" )
-    {
-        generateTracks();
-    }
-}
-
-
-void
-CustomPlaylistView::sourceAdded( const source_ptr& s )
-{
-    connect( s.data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/customplaylistview.h Deleted

@@ -1,70 +0,0 @@
-/* === 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 CUSTOMPLAYLISTVIEW_H
-#define CUSTOMPLAYLISTVIEW_H
-
-#include "playlistview.h"
-
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT CustomPlaylistView : public PlaylistView
-{
-    Q_OBJECT
-public:
-    enum PlaylistType {
-        SourceLovedTracks,
-        TopLovedTracks
-    };
-
-    explicit CustomPlaylistView( PlaylistType type, const source_ptr& s, QWidget* parent = 0 );
-    virtual ~CustomPlaylistView();
-
-    virtual bool showFilter() const { return false; }
-    virtual bool showStatsBar() const { return false; }
-
-    virtual QString title() const;
-    virtual QPixmap pixmap() const;
-    virtual QString description() const;
-    virtual QString longDescription() const;
-
-    virtual bool isTemporaryPage() const { return false; }
-    virtual bool isBeingPlayed() const;
-    virtual bool jumpToCurrentTrack();
-
-private slots:
-    void tracksGenerated( QList<Tomahawk::query_ptr> tracks );
-
-    void socialAttributesChanged( const QString& );
-    void sourceAdded( const Tomahawk::source_ptr& );
-
-private:
-    void generateTracks();
-
-    PlaylistType m_type;
-    source_ptr m_source;
-    PlaylistModel* m_model;
-};
-
-}
-
-#endif // CUSTOMPLAYLISTVIEW_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.cpp Deleted

@@ -1,127 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010 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 "LoadingSpinner.h"
-
-#include <QTimeLine>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QMovie>
-#include <QLabel>
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#define ANIM_LENGTH 300
-
-
-LoadingSpinner::LoadingSpinner( QWidget* parent )
-    : QWidget( parent )
-    , m_showHide( new QTimeLine )
-{
-    m_showHide->setDuration( 300 );
-    m_showHide->setStartFrame( 0 );
-    m_showHide->setEndFrame( 100 );
-    m_showHide->setUpdateInterval( 20 );
-    connect( m_showHide, SIGNAL( frameChanged( int ) ), this, SLOT( update() ) );
-    connect( m_showHide, SIGNAL( finished() ), this, SLOT( hideFinished() ) );
-
-    m_anim = new QMovie( RESPATH "/images/loading-animation.gif" );
-    m_anim->jumpToNextFrame();
-
-    connect( m_anim, SIGNAL( frameChanged( int ) ), this, SLOT( update() ) );
-
-    resize( m_anim->currentPixmap().size() );
-    setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
-    hide();
-}
-
-
-LoadingSpinner::~LoadingSpinner()
-{
-}
-
-
-void
-LoadingSpinner::fadeIn()
-{
-    if ( isVisible() )
-        return;
-
-    show();
-
-    m_anim->start();
-    m_showHide->setDirection( QTimeLine::Forward );
-
-    if ( m_showHide->state() != QTimeLine::Running )
-        m_showHide->start();
-}
-
-
-void
-LoadingSpinner::fadeOut()
-{
-    m_showHide->setDirection( QTimeLine::Backward );
-
-    if ( m_showHide->state() != QTimeLine::Running )
-        m_showHide->start();
-}
-
-
-void
-LoadingSpinner::hideFinished()
-{
-    if ( m_showHide->direction() == QTimeLine::Backward )
-    {
-        hide();
-        m_anim->stop();
-    }
-}
-
-
-QSize
-LoadingSpinner::sizeHint() const
-{
-    return m_anim->currentPixmap().size();
-}
-
-
-void
-LoadingSpinner::paintEvent( QPaintEvent* ev )
-{
-    Q_UNUSED( ev );
-
-    if ( !parentWidget() )
-        return;
-
-    QPoint center( ( parentWidget()->width() / 2 ) - ( width() / 2 ), ( parentWidget()->height() / 2 ) - ( height() / 2 ) );
-    if ( center != pos() )
-    {
-        move( center );
-        return;
-    }
-
-    QPainter p( this );
-
-    if ( m_showHide->state() == QTimeLine::Running )
-    { // showing or hiding
-        p.setOpacity( (qreal)m_showHide->currentValue() );
-    }
-
-    p.drawPixmap( rect(), m_anim->currentPixmap() );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/LoadingSpinner.h Deleted

@@ -1,56 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010 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 LOADING_SPINNER_H
-#define LOADING_SPINNER_H
-
-#include <QWidget>
-
-#include "dllmacro.h"
-
-class QMovie;
-class QTimeLine;
-/**
- * A small widget that displays an animated loading spinner
- */
-class DLLEXPORT LoadingSpinner : public QWidget {
-    Q_OBJECT
-public:
-    LoadingSpinner( QWidget* parent );
-    virtual ~LoadingSpinner();
-
-    virtual QSize sizeHint() const;
-    virtual void paintEvent( QPaintEvent* );
-
-public slots:
-    void fadeIn();
-    void fadeOut();
-
-private slots:
-    void hideFinished();
-
-private:
-    void reposition();
-
-    QTimeLine* m_showHide;
-    QMovie* m_anim;
-};
-
-#endif
-
-class QPaintEvent;

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/playlistitemdelegate.cpp Deleted

@@ -1,322 +0,0 @@
-/* === 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
- *   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 "playlistitemdelegate.h"
-
-#include <QApplication>
-#include <QPainter>
-
-#include "query.h"
-#include "result.h"
-#include "artist.h"
-#include "source.h"
-#include "sourcelist.h"
-
-#include "trackmodel.h"
-#include "trackmodelitem.h"
-#include "trackproxymodel.h"
-#include "trackview.h"
-#include "trackheader.h"
-
-#include "utils/tomahawkutilsgui.h"
-#include "utils/logger.h"
-
-#define PLAYING_ICON QString( RESPATH "images/now-playing-speaker.png" )
-#define ARROW_ICON QString( RESPATH "images/info.png" )
-
-using namespace Tomahawk;
-
-
-PlaylistItemDelegate::PlaylistItemDelegate( TrackView* parent, TrackProxyModel* proxy )
-    : QStyledItemDelegate( (QObject*)parent )
-    , m_view( parent )
-    , m_model( proxy )
-{
-    m_nowPlayingIcon = QPixmap( PLAYING_ICON );
-    m_arrowIcon = QPixmap( ARROW_ICON );
-
-    m_topOption = QTextOption( Qt::AlignTop );
-    m_topOption.setWrapMode( QTextOption::NoWrap );
-
-    m_bottomOption = QTextOption( Qt::AlignBottom );
-    m_bottomOption.setWrapMode( QTextOption::NoWrap );
-
-    m_defaultAvatar = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/user-avatar.png" ) );
-}
-
-
-void
-PlaylistItemDelegate::updateRowSize( const QModelIndex& index )
-{
-    emit sizeHintChanged( index );
-}
-
-
-QSize
-PlaylistItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QSize size = QStyledItemDelegate::sizeHint( option, index );
-
-    if ( index.isValid() )
-    {
-        int style = index.data( TrackModel::StyleRole ).toInt();
-        if ( style == TrackModel::Short || style == TrackModel::ShortWithAvatars )
-        {
-            int rowHeight = option.fontMetrics.height() + 8;
-            size.setHeight( rowHeight * 2 );
-        }
-    }
-
-    return size;
-}
-
-
-QWidget*
-PlaylistItemDelegate::createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    Q_UNUSED( parent );
-    Q_UNUSED( option );
-    Q_UNUSED( index );
-    return 0;
-}
-
-
-void
-PlaylistItemDelegate::prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, TrackModelItem* item ) const
-{
-    initStyleOption( option, index );
-
-    if ( item->isPlaying() )
-    {
-        option->palette.setColor( QPalette::Highlight, option->palette.color( QPalette::Mid ) );
-
-        option->backgroundBrush = option->palette.color( QPalette::Mid );
-        option->palette.setColor( QPalette::Text, option->palette.color( QPalette::Text ) );
-
-    }
-
-    if ( option->state & QStyle::State_Selected && !item->isPlaying() )
-    {
-        option->palette.setColor( QPalette::Text, option->palette.color( QPalette::HighlightedText ) );
-    }
-    else
-    {
-        float opacity = 0.0;
-        if ( item->query()->results().count() )
-            opacity = item->query()->results().first()->score();
-
-        opacity = qMax( (float)0.3, opacity );
-        QColor textColor = TomahawkUtils::alphaBlend( option->palette.color( QPalette::Text ), option->palette.color( QPalette::BrightText ), opacity );
-
-        option->palette.setColor( QPalette::Text, textColor );
-    }
-}
-
-
-void
-PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    int style = index.data( TrackModel::StyleRole ).toInt();
-    switch ( style )
-    {
-        case TrackModel::Detailed:
-            paintDetailed( painter, option, index );
-            break;
-
-        case TrackModel::Short:
-            paintShort( painter, option, index );
-            break;
-        case TrackModel::ShortWithAvatars:
-            paintShort( painter, option, index, true );
-    }
-}
-
-
-void
-PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, bool useAvatars ) const
-{
-    TrackModelItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
-    Q_ASSERT( item );
-
-    QStyleOptionViewItemV4 opt = option;
-    prepareStyleOption( &opt, index, item );
-    opt.text.clear();
-
-    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
-
-    if ( m_view->header()->visualIndex( index.column() ) > 0 )
-        return;
-
-    QPixmap pixmap;
-    QString artist, track, upperText, lowerText;
-    source_ptr source = item->query()->playedBy().first;
-
-    if ( item->query()->results().count() )
-    {
-        artist = item->query()->results().first()->artist()->name();
-        track = item->query()->results().first()->track();
-    }
-    else
-    {
-        artist = item->query()->artist();
-        track = item->query()->track();
-    }
-
-    if ( source.isNull() )
-    {
-        upperText = artist;
-        lowerText = track;
-    }
-    else
-    {
-        upperText = QString( "%1 - %2" ).arg( artist ).arg( track );
-        QString playtime = TomahawkUtils::ageToString( QDateTime::fromTime_t( item->query()->playedBy().second ), true );
-
-        if ( source == SourceList::instance()->getLocal() )
-            lowerText = QString( tr( "played %1 by you" ) ).arg( playtime );
-        else
-            lowerText = QString( tr( "played %1 by %2" ) ).arg( playtime ).arg( source->friendlyName() );
-
-        if ( useAvatars )
-            pixmap = source->avatar( Source::FancyStyle );
-    }
-
-    if ( pixmap.isNull() && !useAvatars )
-        pixmap = QPixmap( RESPATH "images/track-placeholder.png" );
-    else if ( pixmap.isNull() && useAvatars )
-        pixmap = m_defaultAvatar;
-
-    painter->save();
-    {
-        QRect r = opt.rect.adjusted( 3, 6, 0, -6 );
-
-        // Paint Now Playing Speaker Icon
-        if ( item->isPlaying() )
-        {
-            r.adjust( 0, 0, 0, 0 );
-            QRect npr = r.adjusted( 3, r.height() / 2 - m_nowPlayingIcon.height() / 2, 18 - r.width(), -r.height() / 2 + m_nowPlayingIcon.height() / 2  );
-            painter->drawPixmap( npr, m_nowPlayingIcon );
-            r.adjust( 22, 0, 0, 0 );
-        }
-
-        painter->setPen( opt.palette.text().color() );
-
-        QRect ir = r.adjusted( 4, 0, -option.rect.width() + option.rect.height() - 8 + r.left(), 0 );
-
-        QPixmap scover;
-        if ( m_cache.contains( pixmap.cacheKey() ) )
-        {
-            scover = m_cache.value( pixmap.cacheKey() );
-        }
-        else
-        {
-            scover = pixmap.scaled( ir.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation );
-            m_cache.insert( pixmap.cacheKey(), scover );
-        }
-        painter->drawPixmap( ir, scover );
-
-        QFont boldFont = opt.font;
-        boldFont.setBold( true );
-
-        r.adjust( ir.width() + 12, 0, -12, 0 );
-        painter->setFont( boldFont );
-        QString text = painter->fontMetrics().elidedText( upperText, Qt::ElideRight, r.width() );
-        painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, m_topOption );
-
-        painter->setFont( opt.font );
-        text = painter->fontMetrics().elidedText( lowerText, Qt::ElideRight, r.width() );
-        painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, m_bottomOption );
-    }
-    painter->restore();
-}
-
-
-void
-PlaylistItemDelegate::paintDetailed( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    TrackModelItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
-    Q_ASSERT( item );
-
-    QTextOption textOption( Qt::AlignVCenter | (Qt::Alignment)index.data( Qt::TextAlignmentRole ).toUInt() );
-    textOption.setWrapMode( QTextOption::NoWrap );
-
-    QStyleOptionViewItemV4 opt = option;
-    prepareStyleOption( &opt, index, item );
-    opt.text.clear();
-    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
-
-    if ( m_view->hoveredIndex().row() == index.row() && m_view->hoveredIndex().column() == index.column() &&
-       ( index.column() == TrackModel::Artist || index.column() == TrackModel::Album ) )
-    {
-        opt.rect.setWidth( opt.rect.width() - 16 );
-        QRect arrowRect( opt.rect.x() + opt.rect.width(), opt.rect.y() + 1, opt.rect.height() - 2, opt.rect.height() - 2 );
-
-        if ( m_arrowIcon.height() != arrowRect.height() )
-            m_arrowIcon = m_arrowIcon.scaled( arrowRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation );
-        painter->drawPixmap( arrowRect, m_arrowIcon );
-    }
-
-    painter->save();
-
-    if ( index.column() == TrackModel::Score )
-    {
-        QColor barColor( 167, 183, 211 ); // This matches the sidebar (sourcetreeview.cpp:672)
-        if ( opt.state & QStyle::State_Selected )
-            painter->setPen( opt.palette.brightText().color() );
-        else
-            painter->setPen( barColor );
-
-        QRect r = opt.rect.adjusted( 3, 3, -6, -4 );
-        painter->drawRect( r );
-
-        QRect fillR = r;
-        int fillerWidth = (int)( index.data().toFloat() * (float)fillR.width() );
-        fillR.adjust( 0, 0, -( fillR.width() - fillerWidth ), 0 );
-
-        if ( opt.state & QStyle::State_Selected )
-            painter->setBrush( opt.palette.brightText().color() );
-        else
-            painter->setBrush( barColor );
-
-        painter->drawRect( fillR );
-    }
-    else if ( item->isPlaying() )
-    {
-        QRect r = opt.rect.adjusted( 3, 0, 0, 0 );
-
-        // Paint Now Playing Speaker Icon
-        if ( m_view->header()->visualIndex( index.column() ) == 0 )
-        {
-            r.adjust( 0, 0, 0, -3 );
-            painter->drawPixmap( r.adjusted( 3, 1, 18 - r.width(), 1 ), m_nowPlayingIcon );
-            r.adjust( 25, 0, 0, 3 );
-        }
-
-        painter->setPen( opt.palette.text().color() );
-        QString text = painter->fontMetrics().elidedText( index.data().toString(), Qt::ElideRight, r.width() - 3 );
-        painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, textOption );
-    }
-    else
-    {
-        painter->setPen( opt.palette.text().color() );
-        QString text = painter->fontMetrics().elidedText( index.data().toString(), Qt::ElideRight, opt.rect.width() - 6 );
-        painter->drawText( opt.rect.adjusted( 3, 1, -3, 0 ), text, textOption );
-    }
-
-    painter->restore();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/playlistitemdelegate.h Deleted

@@ -1,68 +0,0 @@
-/* === 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
- *   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 PLAYLISTITEMDELEGATE_H
-#define PLAYLISTITEMDELEGATE_H
-
-#include <QStyledItemDelegate>
-#include <QTextOption>
-
-#include "dllmacro.h"
-
-class TrackModel;
-class TrackModelItem;
-class TrackProxyModel;
-class TrackView;
-
-class DLLEXPORT PlaylistItemDelegate : public QStyledItemDelegate
-{
-Q_OBJECT
-
-public:
-    PlaylistItemDelegate( TrackView* parent = 0, TrackProxyModel* proxy = 0 );
-
-    void updateRowSize( const QModelIndex& index );
-
-public slots:
-    void setRemovalProgress( unsigned int progress ) { m_removalProgress = progress; }
-
-protected:
-    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-private:
-    void prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, TrackModelItem* item ) const;
-
-    void paintDetailed( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    void paintShort( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, bool useAvatars = false ) const;
-
-    unsigned int m_removalProgress;
-
-    mutable QHash< qint64, QPixmap > m_cache;
-    QPixmap m_nowPlayingIcon, m_defaultAvatar;
-    mutable QPixmap m_arrowIcon;
-
-    QTextOption m_topOption;
-    QTextOption m_bottomOption;
-
-    TrackView* m_view;
-    TrackProxyModel* m_model;
-};
-
-#endif // PLAYLISTITEMDELEGATE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/playlistmodel.cpp Deleted

@@ -1,499 +0,0 @@
-/* === 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
- *   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 "playlistmodel.h"
-
-#include <QMimeData>
-#include <QTreeView>
-
-#include "artist.h"
-#include "album.h"
-#include "pipeline.h"
-#include "source.h"
-#include "sourcelist.h"
-#include "database/database.h"
-#include "database/databasecommand_playbackhistory.h"
-#include "dynamic/GeneratorInterface.h"
-#include "dropjob.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-PlaylistModel::PlaylistModel( QObject* parent )
-    : TrackModel( parent )
-    , m_isTemporary( false )
-    , m_changesOngoing( false )
-{
-    m_dropStorage.parent = QPersistentModelIndex();
-    m_dropStorage.row = -10;
-
-    setReadOnly( true );
-}
-
-
-PlaylistModel::~PlaylistModel()
-{
-}
-
-
-void
-PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEntries )
-{
-    if ( !m_playlist.isNull() )
-    {
-        disconnect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( onRevisionLoaded( Tomahawk::PlaylistRevision ) ) );
-        disconnect( m_playlist.data(), SIGNAL( deleted( Tomahawk::playlist_ptr ) ), this, SIGNAL( playlistDeleted() ) );
-        disconnect( m_playlist.data(), SIGNAL( changed() ), this, SIGNAL( playlistChanged() ) );
-    }
-
-    if ( loadEntries )
-        clear();
-
-    m_playlist = playlist;
-    connect( playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), SLOT( onRevisionLoaded( Tomahawk::PlaylistRevision ) ) );
-    connect( playlist.data(), SIGNAL( deleted( Tomahawk::playlist_ptr ) ), this, SIGNAL( playlistDeleted() ) );
-    connect( playlist.data(), SIGNAL( changed() ), this, SIGNAL( playlistChanged() ) );
-
-    setReadOnly( !m_playlist->author()->isLocal() );
-    setTitle( playlist->title() );
-    setDescription( tr( "A playlist by %1, created %2" )
-                  .arg( playlist->author()->isLocal() ? tr( "you" ) : playlist->author()->friendlyName() )
-                  .arg( TomahawkUtils::ageToString( QDateTime::fromTime_t( playlist->createdOn() ), true ) ) );
-
-    m_isTemporary = false;
-    if ( !loadEntries )
-        return;
-
-    QList<plentry_ptr> entries = playlist->entries();
-    append( entries );
-}
-
-
-void
-PlaylistModel::loadHistory( const Tomahawk::source_ptr& source, unsigned int amount )
-{
-    if ( rowCount( QModelIndex() ) )
-    {
-        clear();
-    }
-
-    m_playlist.clear();
-
-    DatabaseCommand_PlaybackHistory* cmd = new DatabaseCommand_PlaybackHistory( source );
-    cmd->setLimit( amount );
-
-    connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ),
-                    SLOT( append( QList<Tomahawk::query_ptr> ) ), Qt::QueuedConnection );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-PlaylistModel::clear()
-{
-    TrackModel::clear();
-
-    m_waitingForResolved.clear();
-}
-
-
-void
-PlaylistModel::append( const QList< plentry_ptr >& entries )
-{
-    insert( entries, rowCount( QModelIndex() ) );
-}
-
-
-void
-PlaylistModel::append( const QList< query_ptr >& queries )
-{
-    insert( queries, rowCount( QModelIndex() ) );
-}
-
-
-void
-PlaylistModel::append( const Tomahawk::query_ptr& query )
-{
-    insert( query, rowCount( QModelIndex() ) );
-}
-
-
-void
-PlaylistModel::append( const Tomahawk::album_ptr& album )
-{
-    if ( album.isNull() )
-        return;
-
-    connect( album.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr> ) ),
-                             SLOT( append( QList<Tomahawk::query_ptr> ) ) );
-
-    if ( rowCount( QModelIndex() ) == 0 )
-    {
-        setTitle( album->name() );
-        setDescription( tr( "All tracks by %1 on album %2" ).arg( album->artist()->name() ).arg( album->name() ) );
-        m_isTemporary = true;
-    }
-
-    append( album->playlistInterface()->tracks() );
-}
-
-
-void
-PlaylistModel::append( const Tomahawk::artist_ptr& artist )
-{
-    if ( artist.isNull() )
-        return;
-
-    connect( artist.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr> ) ),
-                              SLOT( append( QList<Tomahawk::query_ptr> ) ) );
-
-    if ( rowCount( QModelIndex() ) == 0 )
-    {
-        setTitle( artist->name() );
-        setDescription( tr( "All tracks by %1" ).arg( artist->name() ) );
-        m_isTemporary = true;
-    }
-
-    append( artist->playlistInterface()->tracks() );
-}
-
-
-void
-PlaylistModel::insert( const Tomahawk::query_ptr& query, int row )
-{
-    TrackModel::insert( query, row );
-}
-
-
-void
-PlaylistModel::insert( const QList< Tomahawk::query_ptr >& queries, int row )
-{
-    QList< Tomahawk::plentry_ptr > entries;
-    foreach( const query_ptr& query, queries )
-    {
-        plentry_ptr entry = plentry_ptr( new PlaylistEntry() );
-
-        if ( query->results().count() )
-            entry->setDuration( query->results().at( 0 )->duration() );
-        else
-            entry->setDuration( 0 );
-
-        entry->setLastmodified( 0 );
-        entry->setAnnotation( "" ); // FIXME
-        entry->setQuery( query );
-        entry->setGuid( uuid() );
-
-        entries << entry;
-    }
-
-    insert( entries, row );
-}
-
-
-void
-PlaylistModel::insert( const QList< Tomahawk::plentry_ptr >& entries, int row )
-{
-    if ( !entries.count() )
-    {
-        emit trackCountChanged( rowCount( QModelIndex() ) );
-        return;
-    }
-
-    int c = row;
-    QPair< int, int > crows;
-    crows.first = c;
-    crows.second = c + entries.count() - 1;
-
-    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
-
-    QList< Tomahawk::query_ptr > queries;
-    int i = 0;
-    TrackModelItem* plitem;
-    foreach( const plentry_ptr& entry, entries )
-    {
-        plitem = new TrackModelItem( entry, rootItem(), row + i );
-        plitem->index = createIndex( row + i, 0, plitem );
-        i++;
-
-        if ( entry->query()->id() == currentItemUuid() )
-            setCurrentItem( plitem->index );
-
-        if ( !entry->query()->resolvingFinished() && !entry->query()->playable() )
-        {
-            queries << entry->query();
-            m_waitingForResolved.append( entry->query().data() );
-            connect( entry->query().data(), SIGNAL( resolvingFinished( bool ) ), SLOT( trackResolved( bool ) ) );
-        }
-
-        connect( plitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
-    }
-
-    if ( !m_waitingForResolved.isEmpty() )
-    {
-        Pipeline::instance()->resolve( queries );
-        emit loadingStarted();
-    }
-
-    emit endInsertRows();
-    emit trackCountChanged( rowCount( QModelIndex() ) );
-}
-
-
-void
-PlaylistModel::trackResolved( bool )
-{
-    Tomahawk::Query* q = qobject_cast< Query* >( sender() );
-    if ( !q )
-    {
-        // Track has been removed from the playlist by now
-        return;
-    }
-
-    m_waitingForResolved.removeAll( q );
-    disconnect( q, SIGNAL( resolvingFinished( bool ) ), this, SLOT( trackResolved( bool ) ) );
-
-    if ( m_waitingForResolved.isEmpty() )
-    {
-        emit loadingFinished();
-    }
-}
-
-
-void
-PlaylistModel::onDataChanged()
-{
-    TrackModelItem* p = (TrackModelItem*)sender();
-    if ( p && p->index.isValid() )
-        emit dataChanged( p->index, p->index.sibling( p->index.row(), columnCount() - 1 ) );
-}
-
-
-void
-PlaylistModel::onRevisionLoaded( Tomahawk::PlaylistRevision revision )
-{
-    if ( !m_waitForRevision.contains( revision.revisionguid ) )
-        loadPlaylist( m_playlist );
-    else
-        m_waitForRevision.removeAll( revision.revisionguid );
-}
-
-
-QMimeData*
-PlaylistModel::mimeData( const QModelIndexList& indexes ) const
-{
-    // Add the playlist id to the mime data so that we can detect dropping on ourselves
-    QMimeData* d = TrackModel::mimeData( indexes );
-    if ( !m_playlist.isNull() )
-        d->setData( "application/tomahawk.playlist.id", m_playlist->guid().toLatin1() );
-
-    return d;
-}
-
-
-bool
-PlaylistModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent )
-{
-    Q_UNUSED( column );
-
-    if ( action == Qt::IgnoreAction || isReadOnly() )
-        return true;
-
-    if ( !DropJob::acceptsMimeData( data ) )
-        return false;
-
-    m_dropStorage.row = row;
-    m_dropStorage.parent = QPersistentModelIndex( parent );
-    m_dropStorage.action = action;
-
-    DropJob* dj = new DropJob();
-
-    if ( !DropJob::acceptsMimeData( data, DropJob::Track | DropJob::Playlist | DropJob::Album | DropJob::Artist ) )
-        return false;
-
-    dj->setDropTypes( DropJob::Track | DropJob::Playlist | DropJob::Artist | DropJob::Album );
-    dj->setDropAction( DropJob::Append );
-/*    if ( action & Qt::MoveAction )
-        dj->setDropAction( DropJob::Move ); */
-
-#ifdef Q_WS_MAC
-    // On mac, drags from outside the app are still Qt::MoveActions instead of Qt::CopyAction by default
-    // so check if the drag originated in this playlist to determine whether or not to copy
-    if ( !data->hasFormat( "application/tomahawk.playlist.id" ) ||
-       ( !m_playlist.isNull() && data->data( "application/tomahawk.playlist.id" ) != m_playlist->guid() ) )
-    {
-        dj->setDropAction( DropJob::Append );
-    }
-#endif
-
-    connect( dj, SIGNAL( tracks( QList< Tomahawk::query_ptr > ) ), SLOT( parsedDroppedTracks( QList< Tomahawk::query_ptr > ) ) );
-    dj->tracksFromMimeData( data );
-
-    return true;
-}
-
-
-void
-PlaylistModel::parsedDroppedTracks( QList< query_ptr > tracks )
-{
-    if ( m_dropStorage.row == -10  ) // nope
-        return;
-
-    int beginRow;
-    if ( m_dropStorage.row != -1 )
-        beginRow = m_dropStorage.row;
-    else if ( m_dropStorage.parent.isValid() )
-        beginRow = m_dropStorage.parent.row();
-    else
-        beginRow = rowCount( QModelIndex() );
-
-    if ( tracks.count() )
-    {
-        bool update = ( m_dropStorage.action & Qt::CopyAction || m_dropStorage.action & Qt::MoveAction );
-        if ( update )
-            beginPlaylistChanges();
-
-        insert( tracks, beginRow );
-
-        if ( update && m_dropStorage.action & Qt::CopyAction )
-            endPlaylistChanges();
-    }
-
-    m_dropStorage.parent = QPersistentModelIndex();
-    m_dropStorage.row = -10;
-}
-
-
-void
-PlaylistModel::beginPlaylistChanges()
-{
-    if ( m_playlist.isNull() || !m_playlist->author()->isLocal() )
-        return;
-
-    Q_ASSERT( !m_changesOngoing );
-    m_changesOngoing = true;
-}
-
-
-void
-PlaylistModel::endPlaylistChanges()
-{
-    if ( m_playlist.isNull() || !m_playlist->author()->isLocal() )
-        return;
-
-    if ( m_changesOngoing )
-    {
-        m_changesOngoing = false;
-    }
-    else
-    {
-        tDebug() << "Called" << Q_FUNC_INFO << "unexpectedly!";
-        Q_ASSERT( false );
-    }
-
-    QList<plentry_ptr> l = playlistEntries();
-    QString newrev = uuid();
-    m_waitForRevision << newrev;
-
-    if ( dynplaylist_ptr dynplaylist = m_playlist.dynamicCast<Tomahawk::DynamicPlaylist>() )
-    {
-        if ( dynplaylist->mode() == OnDemand )
-        {
-            dynplaylist->createNewRevision( newrev );
-        }
-        else if ( dynplaylist->mode() == Static )
-        {
-            dynplaylist->createNewRevision( newrev, dynplaylist->currentrevision(), dynplaylist->type(), dynplaylist->generator()->controls(), l );
-        }
-    }
-    else
-    {
-        m_playlist->createNewRevision( newrev, m_playlist->currentrevision(), l );
-    }
-}
-
-
-QList<Tomahawk::plentry_ptr>
-PlaylistModel::playlistEntries() const
-{
-    QList<plentry_ptr> l;
-    for ( int i = 0; i < rowCount( QModelIndex() ); i++ )
-    {
-        QModelIndex idx = index( i, 0, QModelIndex() );
-        if ( !idx.isValid() )
-            continue;
-
-        TrackModelItem* item = itemFromIndex( idx );
-        if ( item )
-            l << item->entry();
-    }
-
-    return l;
-}
-
-
-void
-PlaylistModel::remove( int row, bool moreToCome )
-{
-    TrackModel::remove( row, moreToCome );
-}
-
-
-void
-PlaylistModel::remove( const QModelIndex& index, bool moreToCome )
-{
-    TrackModelItem* item = itemFromIndex( index );
-
-    if ( item && m_waitingForResolved.contains( item->query().data() ) )
-    {
-        m_waitingForResolved.removeAll( item->query().data() );
-        if ( m_waitingForResolved.isEmpty() )
-            emit loadingFinished();
-    }
-
-    if ( !m_changesOngoing )
-        beginPlaylistChanges();
-
-    TrackModel::remove( index, moreToCome );
-
-    if ( !moreToCome )
-        endPlaylistChanges();
-}
-
-
-void
-PlaylistModel::remove( const QList<QModelIndex>& indexes )
-{
-    TrackModel::remove( indexes );
-}
-
-
-void
-PlaylistModel::remove( const QList<QPersistentModelIndex>& indexes )
-{
-    TrackModel::remove( indexes );
-}
-
-
-bool
-PlaylistModel::isTemporary() const
-{
-    return m_isTemporary;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/playlistmodel.h Deleted

@@ -1,109 +0,0 @@
-/* === 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
- *   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 PLAYLISTMODEL_H
-#define PLAYLISTMODEL_H
-
-#include <QList>
-#include <QHash>
-
-#include "typedefs.h"
-#include "trackmodel.h"
-#include "playlist.h"
-#include "query.h"
-#include "playlistinterface.h"
-
-#include "dllmacro.h"
-
-class QMimeData;
-class QMetaData;
-
-class DLLEXPORT PlaylistModel : public TrackModel
-{
-Q_OBJECT
-
-typedef struct {
-    int row;
-    QPersistentModelIndex parent;
-    Qt::DropAction action;
-} DropStorageData;
-
-public:
-    explicit PlaylistModel( QObject* parent = 0 );
-    ~PlaylistModel();
-
-    virtual QMimeData* mimeData ( const QModelIndexList& indexes ) const;
-    virtual bool dropMimeData( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent );
-
-    Tomahawk::playlist_ptr playlist() const { return m_playlist; }
-
-    virtual void loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEntries = true );
-    void loadHistory( const Tomahawk::source_ptr& source, unsigned int amount = 50 );
-
-    bool isTemporary() const;
-
-public slots:
-    virtual void clear();
-
-    virtual void append( const Tomahawk::query_ptr& query );
-    virtual void append( const Tomahawk::album_ptr& album );
-    virtual void append( const Tomahawk::artist_ptr& artist );
-    virtual void append( const QList< Tomahawk::query_ptr >& queries );
-    virtual void append( const QList< Tomahawk::plentry_ptr >& entries );
-
-    virtual void insert( const Tomahawk::query_ptr& query, int row = 0 );
-    virtual void insert( const QList< Tomahawk::query_ptr >& queries, int row = 0 );
-    virtual void insert( const QList< Tomahawk::plentry_ptr >& entries, int row = 0 );
-
-    virtual void remove( int row, bool moreToCome = false );
-    virtual void remove( const QModelIndex& index, bool moreToCome = false );
-    virtual void remove( const QList<QModelIndex>& indexes );
-    virtual void remove( const QList<QPersistentModelIndex>& indexes );
-
-signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-    void playlistDeleted();
-    void playlistChanged();
-
-protected:
-    bool waitForRevision( const QString& revisionguid ) const { return m_waitForRevision.contains( revisionguid ); }
-    void removeFromWaitList( const QString& revisionguid ) { m_waitForRevision.removeAll( revisionguid ); }
-
-private slots:
-    void onDataChanged();
-    void onRevisionLoaded( Tomahawk::PlaylistRevision revision );
-    void parsedDroppedTracks( QList<Tomahawk::query_ptr> );
-    void trackResolved( bool );
-
-private:
-    void beginPlaylistChanges();
-    void endPlaylistChanges();
-
-    QList<Tomahawk::plentry_ptr> playlistEntries() const;
-
-    Tomahawk::playlist_ptr m_playlist;
-    bool m_isTemporary;
-    bool m_changesOngoing;
-    QList< Tomahawk::Query* > m_waitingForResolved;
-    QStringList m_waitForRevision;
-
-    DropStorageData m_dropStorage;
-};
-
-#endif // PLAYLISTMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/playlistproxymodel.cpp Deleted

@@ -1,39 +0,0 @@
-/* === 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
- *   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 "playlistproxymodel.h"
-
-#include "playlistproxymodelplaylistinterface.h"
-#include "utils/logger.h"
-
-
-PlaylistProxyModel::PlaylistProxyModel( QObject* parent )
-    : TrackProxyModel( parent )
-{
-}
-
-Tomahawk::playlistinterface_ptr
-PlaylistProxyModel::playlistInterface()
-{
-    if ( m_playlistInterface.isNull() )
-    {
-        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::PlaylistProxyModelPlaylistInterface( this ) );
-    }
-
-    return m_playlistInterface;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/playlistproxymodel.h Deleted

@@ -1,37 +0,0 @@
-/* === 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
- *   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 PLAYLISTPROXYMODEL_H
-#define PLAYLISTPROXYMODEL_H
-
-#include "trackproxymodel.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT PlaylistProxyModel : public TrackProxyModel
-{
-Q_OBJECT
-
-public:
-    explicit PlaylistProxyModel( QObject* parent = 0 );
-    virtual ~PlaylistProxyModel() {}
-
-    virtual Tomahawk::playlistinterface_ptr playlistInterface();
-};
-
-#endif // PLAYLISTPROXYMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/playlistproxymodelplaylistinterface.cpp Deleted

@@ -1,34 +0,0 @@
-/* === 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
- *   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 "playlistproxymodelplaylistinterface.h"
-
-#include "playlistproxymodel.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-PlaylistProxyModelPlaylistInterface::PlaylistProxyModelPlaylistInterface( PlaylistProxyModel *proxyModel )
-    : TrackProxyModelPlaylistInterface( proxyModel )
-{
-}
-
-PlaylistProxyModelPlaylistInterface::~PlaylistProxyModelPlaylistInterface()
-{
-    m_proxyModel.clear();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/playlistproxymodelplaylistinterface.h Deleted

@@ -1,42 +0,0 @@
-/* === 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
- *   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 PLAYLISTPROXYMODELPLAYLISTINTERFACE_H
-#define PLAYLISTPROXYMODELPLAYLISTINTERFACE_H
-
-#include "trackproxymodelplaylistinterface.h"
-
-#include "dllmacro.h"
-
-class PlaylistProxyModel;
-
-namespace Tomahawk
-{
-
-class DLLEXPORT PlaylistProxyModelPlaylistInterface : public TrackProxyModelPlaylistInterface
-{
-Q_OBJECT
-
-public:
-    explicit PlaylistProxyModelPlaylistInterface( PlaylistProxyModel *proxyModel );
-    virtual ~PlaylistProxyModelPlaylistInterface();
-};
-
-} //ns
-
-#endif // PLAYLISTPROXYMODELPLAYLISTINTERFACE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/playlistview.cpp Deleted

@@ -1,197 +0,0 @@
-/* === 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
- *   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 "playlistview.h"
-
-#include <QKeyEvent>
-#include <QPainter>
-
-#include "playlist/playlistproxymodel.h"
-#include "widgets/overlaywidget.h"
-#include "viewmanager.h"
-#include "utils/logger.h"
-#include "PlaylistUpdaterInterface.h"
-
-using namespace Tomahawk;
-
-
-PlaylistView::PlaylistView( QWidget* parent )
-    : TrackView( parent )
-    , m_model( 0 )
-{
-    setProxyModel( new PlaylistProxyModel( this ) );
-
-    connect( contextMenu(), SIGNAL( triggered( int ) ), SLOT( onMenuTriggered( int ) ) );
-}
-
-
-PlaylistView::~PlaylistView()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-PlaylistView::setModel( QAbstractItemModel* model )
-{
-    Q_UNUSED( model );
-    qDebug() << "Explicitly use setPlaylistModel instead";
-    Q_ASSERT( false );
-}
-
-
-void
-PlaylistView::setPlaylistModel( PlaylistModel* model )
-{
-    m_model = model;
-
-    TrackView::setTrackModel( m_model );
-    setColumnHidden( TrackModel::Age, true ); // Hide age column per default
-    setColumnHidden( TrackModel::Composer, true ); // Hide composer column per default
-
-    if ( guid().isEmpty() )
-    {
-        if ( !m_model->playlist().isNull() )
-        {
-            setGuid( QString( "playlistview/%1/%2" ).arg( m_model->columnCount() ).arg( m_model->playlist()->guid() ) );
-        }
-        else
-        {
-            setGuid( QString( "playlistview/%1" ).arg( m_model->columnCount() ) );
-        }
-    }
-
-    connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) );
-    connect( m_model, SIGNAL( playlistDeleted() ), SLOT( onDeleted() ) );
-    connect( m_model, SIGNAL( playlistChanged() ), SLOT( onChanged() ) );
-}
-
-
-void
-PlaylistView::keyPressEvent( QKeyEvent* event )
-{
-    qDebug() << Q_FUNC_INFO;
-    TrackView::keyPressEvent( event );
-
-    if ( !model() )
-        return;
-
-    if ( ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace ) && !model()->isReadOnly() )
-    {
-        qDebug() << "Removing selected items";
-        proxyModel()->remove( selectedIndexes() );
-    }
-}
-
-
-void
-PlaylistView::deleteItems()
-{
-    proxyModel()->remove( selectedIndexes() );
-}
-
-
-bool
-PlaylistView::canAutoUpdate() const
-{
-    if ( !m_model->playlist().isNull() && m_model->playlist()->updater() )
-        return true;
-
-    return false;
-}
-
-
-bool
-PlaylistView::autoUpdate() const
-{
-    if ( canAutoUpdate() )
-        return m_model->playlist()->updater()->autoUpdate();
-
-    return false;
-}
-
-
-void
-PlaylistView::setAutoUpdate( bool autoUpdate )
-{
-    if ( !canAutoUpdate() )
-        return;
-
-    m_model->playlist()->updater()->setAutoUpdate( autoUpdate );
-}
-
-
-void
-PlaylistView::onTrackCountChanged( unsigned int tracks )
-{
-    if ( tracks == 0 )
-    {
-        overlay()->setText( tr( "This playlist is currently empty. Add some tracks to it and enjoy the music!" ) );
-        overlay()->show();
-    }
-    else
-        overlay()->hide();
-}
-
-
-bool
-PlaylistView::jumpToCurrentTrack()
-{
-    scrollTo( proxyModel()->currentIndex(), QAbstractItemView::PositionAtCenter );
-    return true;
-}
-
-
-void
-PlaylistView::onDeleted()
-{
-    qDebug() << Q_FUNC_INFO;
-    emit destroyed( widget() );
-}
-
-
-void
-PlaylistView::onChanged()
-{
-    if ( m_model && !m_model->playlist().isNull() &&
-         ViewManager::instance()->currentPage() == this )
-        emit nameChanged( m_model->playlist()->title() );
-}
-
-
-bool
-PlaylistView::isTemporaryPage() const
-{
-    return ( m_model && m_model->isTemporary() );
-}
-
-
-void
-PlaylistView::onMenuTriggered( int action )
-{
-    switch ( action )
-    {
-        case ContextMenu::ActionDelete:
-            deleteItems();
-            break;
-
-        default:
-            TrackView::onMenuTriggered( action );
-            break;
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/playlistview.h Deleted

@@ -1,76 +0,0 @@
-/* === 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
- *   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 PLAYLISTVIEW_H
-#define PLAYLISTVIEW_H
-
-#include "playlist/trackproxymodel.h"
-#include "playlist/playlistmodel.h"
-#include "trackview.h"
-#include "viewpage.h"
-#include "dllmacro.h"
-
-class DLLEXPORT PlaylistView : public TrackView, public Tomahawk::ViewPage
-{
-Q_OBJECT
-
-public:
-    explicit PlaylistView( QWidget* parent = 0 );
-    virtual ~PlaylistView();
-
-    PlaylistModel* playlistModel() const { return m_model; }
-    virtual void setPlaylistModel( PlaylistModel* model );
-    virtual void setModel( QAbstractItemModel* model );
-
-    virtual QWidget* widget() { return this; }
-    virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return proxyModel()->playlistInterface(); }
-
-    virtual bool showFilter() const { return true; }
-
-    virtual bool canAutoUpdate() const;
-    virtual void setAutoUpdate( bool autoUpdate );
-    virtual bool autoUpdate() const;
-
-    virtual QString title() const { return playlistModel()->title(); }
-    virtual QString description() const { return m_model->description(); }
-    virtual QPixmap pixmap() const { return QPixmap( RESPATH "images/playlist-icon.png" ); }
-    virtual bool jumpToCurrentTrack();
-    virtual bool isTemporaryPage() const;
-
-signals:
-    void nameChanged( const QString& title );
-    void destroyed( QWidget* widget );
-
-protected:
-    void keyPressEvent( QKeyEvent* event );
-
-private slots:
-    void onTrackCountChanged( unsigned int tracks );
-    void onMenuTriggered( int action );
-    void deleteItems();
-
-    void onDeleted();
-    void onChanged();
-
-private:
-    PlaylistModel* m_model;
-    QString m_customTitle;
-    QString m_customDescripton;
-};
-
-#endif // PLAYLISTVIEW_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/queueproxymodel.cpp Deleted

@@ -1,69 +0,0 @@
-/* === 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
- *   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 "queueproxymodel.h"
-
-#include "queueproxymodelplaylistinterface.h"
-#include "playlist/trackview.h"
-#include "viewmanager.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-QueueProxyModel::QueueProxyModel( TrackView* parent )
-    : PlaylistProxyModel( parent )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    connect( parent, SIGNAL( itemActivated( QModelIndex ) ), this, SLOT( onIndexActivated( QModelIndex ) ) );
-    connect( playlistInterface().data(), SIGNAL( sourceTrackCountChanged( unsigned int ) ), this, SLOT( onTrackCountChanged( unsigned int ) ) );
-}
-
-
-QueueProxyModel::~QueueProxyModel()
-{
-}
-
-
-void
-QueueProxyModel::onIndexActivated( const QModelIndex& index )
-{
-    setCurrentIndex( QModelIndex() );
-    remove( index );
-}
-
-
-void
-QueueProxyModel::onTrackCountChanged( unsigned int count )
-{
-    if ( count == 0 )
-        ViewManager::instance()->hideQueue();
-}
-
-
-Tomahawk::playlistinterface_ptr
-QueueProxyModel::playlistInterface()
-{
-    if ( m_playlistInterface.isNull() )
-    {
-        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::QueueProxyModelPlaylistInterface( this ) );
-    }
-
-    return m_playlistInterface;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/queueproxymodel.h Deleted

@@ -1,44 +0,0 @@
-/* === 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
- *   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 QUEUEPROXYMODEL_H
-#define QUEUEPROXYMODEL_H
-
-#include "playlistproxymodel.h"
-
-#include "dllmacro.h"
-
-class QMetaData;
-class TrackView;
-
-class DLLEXPORT QueueProxyModel : public PlaylistProxyModel
-{
-Q_OBJECT
-
-public:
-    explicit QueueProxyModel( TrackView* parent = 0 );
-    virtual ~QueueProxyModel();
-
-    virtual Tomahawk::playlistinterface_ptr playlistInterface();
-
-private slots:
-    void onIndexActivated( const QModelIndex& index );
-    void onTrackCountChanged( unsigned int count );
-};
-
-#endif // QUEUEPROXYMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/queueproxymodelplaylistinterface.cpp Deleted

@@ -1,50 +0,0 @@
-/* === 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
- *   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 "queueproxymodelplaylistinterface.h"
-
-#include "queueproxymodel.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-QueueProxyModelPlaylistInterface::QueueProxyModelPlaylistInterface( QueueProxyModel *proxyModel )
-    : PlaylistProxyModelPlaylistInterface( proxyModel )
-{
-}
-
-
-QueueProxyModelPlaylistInterface::~QueueProxyModelPlaylistInterface()
-{
-    m_proxyModel.clear();
-}
-
-
-Tomahawk::result_ptr
-QueueProxyModelPlaylistInterface::siblingItem( int itemsAway )
-{
-    if ( m_proxyModel.isNull() )
-        return Tomahawk::result_ptr();
-
-    m_proxyModel.data()->setCurrentIndex( QModelIndex() );
-    Tomahawk::result_ptr res = PlaylistProxyModelPlaylistInterface::siblingItem( itemsAway );
-
-    m_proxyModel.data()->remove( m_proxyModel.data()->currentIndex() );
-
-    return res;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/queueproxymodelplaylistinterface.h Deleted

@@ -1,45 +0,0 @@
-/* === 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
- *   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 QUEUEPROXYMODELPLAYLISTINTERFACE_H
-#define QUEUEPROXYMODELPLAYLISTINTERFACE_H
-
-#include "playlistproxymodelplaylistinterface.h"
-
-#include "result.h"
-#include "dllmacro.h"
-
-class QueueProxyModel;
-
-namespace Tomahawk
-{
-
-class DLLEXPORT QueueProxyModelPlaylistInterface : public PlaylistProxyModelPlaylistInterface
-{
-Q_OBJECT
-
-public:
-    explicit QueueProxyModelPlaylistInterface( QueueProxyModel *proxyModel );
-    virtual ~QueueProxyModelPlaylistInterface();
-
-    virtual Tomahawk::result_ptr siblingItem( int itemsAway );
-};
-
-} //ns
-
-#endif // QUEUEPROXYMODELPLAYLISTINTERFACE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/queueview.cpp Deleted

@@ -1,152 +0,0 @@
-/* === 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
- *   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 "queueview.h"
-#include "ui_queueview.h"
-
-#include <QVBoxLayout>
-
-#include "widgets/HeaderLabel.h"
-#include "playlist/queueproxymodel.h"
-#include "widgets/overlaywidget.h"
-#include "utils/logger.h"
-#include "playlistview.h"
-#include "utils/tomahawkutilsgui.h"
-
-using namespace Tomahawk;
-
-
-QueueView::QueueView( AnimatedSplitter* parent )
-    : AnimatedWidget( parent )
-    , ui( new Ui::QueueView )
-    , m_dragTimer( 0 )
-{
-    ui->setupUi( this );
-    TomahawkUtils::unmarginLayout( layout() );
-    setContentsMargins( 0, 0, 0, 0 );
-
-    setHiddenSize( QSize( 0, 22 ) );
-
-    ui->queue->setProxyModel( new QueueProxyModel( ui->queue ) );
-    ui->queue->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
-    ui->queue->setFrameShape( QFrame::NoFrame );
-    ui->queue->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    ui->queue->overlay()->setEnabled( false );
-
-    connect( ui->toggleButton, SIGNAL( clicked() ), SLOT( show() ) );
-
-    ui->toggleButton->installEventFilter( this );
-}
-
-
-QueueView::~QueueView()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-QueueView::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-PlaylistView*
-QueueView::queue() const
-{
-    return ui->queue;
-}
-
-
-bool
-QueueView::eventFilter( QObject* obj, QEvent* ev )
-{
-    if ( obj == ui->toggleButton )
-    {
-        if ( ev->type() == QEvent::DragEnter )
-        {
-            ev->accept();
-
-            if ( m_dragTimer == 0 )
-            {
-                m_dragTimer = new QTimer( this );
-                m_dragTimer->setInterval( 1000 );
-                m_dragTimer->setSingleShot( true );
-                connect( m_dragTimer, SIGNAL( timeout() ), this, SLOT( show() ) );
-                m_dragTimer->start();
-            }
-        }
-        else if ( ev->type() == QEvent::DragLeave || ev->type() == QEvent::Drop )
-        {
-            delete m_dragTimer;
-            m_dragTimer = 0;
-        }
-    }
-
-    return QObject::eventFilter( obj, ev );
-}
-
-
-void
-QueueView::hide()
-{
-    disconnect( ui->toggleButton, SIGNAL( clicked() ), this, SLOT( hide() ) );
-    connect( ui->toggleButton, SIGNAL( clicked() ), SLOT( show() ) );
-    ui->toggleButton->setText( tr( "Show Queue" ) );
-    emit hideWidget();
-}
-
-
-void
-QueueView::show()
-{
-    disconnect( ui->toggleButton, SIGNAL( clicked() ), this, SLOT( show() ) );
-    connect( ui->toggleButton, SIGNAL( clicked() ), SLOT( hide() ) );
-    ui->toggleButton->setText( tr( "Hide Queue" ) );
-    emit showWidget();
-}
-
-
-void
-QueueView::onShown( QWidget* widget, bool animated )
-{
-    if ( widget != this )
-        return;
-
-    AnimatedWidget::onShown( widget, animated );
-}
-
-
-void
-QueueView::onHidden( QWidget* widget, bool animated )
-{
-    if ( widget != this )
-        return;
-
-    AnimatedWidget::onHidden( widget, animated );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/queueview.h Deleted

@@ -1,65 +0,0 @@
-/* === 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
- *   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 QUEUEVIEW_H
-#define QUEUEVIEW_H
-
-#include <QPushButton>
-
-#include "widgets/animatedsplitter.h"
-
-#include "dllmacro.h"
-
-class QTimer;
-class PlaylistView;
-
-namespace Ui
-{
-    class QueueView;
-}
-
-class DLLEXPORT QueueView : public AnimatedWidget
-{
-Q_OBJECT
-
-public:
-    explicit QueueView( AnimatedSplitter* parent );
-    ~QueueView();
-
-    PlaylistView* queue() const;
-
-    QSize sizeHint() const { return QSize( 0, 200 ); }
-
-    virtual bool eventFilter( QObject* , QEvent* );
-
-public slots:
-    virtual void onShown( QWidget*, bool animated );
-    virtual void onHidden( QWidget*, bool animated );
-
-    virtual void show();
-    virtual void hide();
-
-protected:
-    void changeEvent( QEvent* e );
-
-private:
-    Ui::QueueView* ui;
-    QTimer* m_dragTimer;
-};
-
-#endif // QUEUEVIEW_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/queueview.ui Deleted

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>QueueView</class>
- <widget class="QWidget" name="QueueView">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>774</width>
-    <height>72</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>72</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>InfoBar</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="HeaderLabel" name="toggleButton">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="acceptDrops">
-      <bool>true</bool>
-     </property>
-     <property name="text">
-      <string>Show Queue</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="PlaylistView" name="queue"/>
-     </item>
-     <item>
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>1</width>
-         <height>16</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>HeaderLabel</class>
-   <extends>QLabel</extends>
-   <header location="global">widgets/HeaderLabel.h</header>
-  </customwidget>
-  <customwidget>
-   <class>PlaylistView</class>
-   <extends>QTreeView</extends>
-   <header location="global">playlist/playlistview.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/topbar/clearbutton.cpp Deleted

@@ -1,92 +0,0 @@
-/**
- * Copyright (c) 2009, Benjamin C. Meyer  <ben@meyerhome.net>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "clearbutton.h"
-
-#include <qpainter.h>
-
-ClearButton::ClearButton(QWidget *parent)
-    : QAbstractButton(parent)
-{
-    setCursor(Qt::ArrowCursor);
-    setFocusPolicy(Qt::NoFocus);
-    setToolTip(tr("Clear"));
-    setMinimumSize(22, 22);
-    setVisible(false);
-
-#if QT_VERSION >= 0x040600
-    // First check for a style icon, current KDE provides one
-    if (m_styleImage.isNull()) {
-        QLatin1String iconName = (layoutDirection() == Qt::RightToLeft)
-            ? QLatin1String("edit-clear-locationbar-ltr")
-            : QLatin1String("edit-clear-locationbar-rtl");
-        QIcon icon = QIcon::fromTheme(iconName);
-        if (!icon.isNull())
-            m_styleImage = icon.pixmap(16, 16).toImage();
-    }
-#endif
-}
-
-void ClearButton::textChanged(const QString &text)
-{
-    setVisible(!text.isEmpty());
-}
-
-void ClearButton::paintEvent(QPaintEvent *event)
-{
-    Q_UNUSED(event);
-    QPainter painter(this);
-
-    if (!m_styleImage.isNull()) {
-        int x = (width() - m_styleImage.width()) / 2 - 1;
-        int y = (height() - m_styleImage.height()) / 2 - 1;
-        painter.drawImage(x, y, m_styleImage);
-        return;
-    }
-
-    // Fall back to boring circle X
-    painter.setRenderHint(QPainter::Antialiasing, true);
-
-    QPalette p = palette();
-    QColor circleColor = isDown() ? p.color(QPalette::Dark) : p.color(QPalette::Mid);
-    QColor xColor = p.color(QPalette::Window);
-
-    // draw circle
-    painter.setBrush(circleColor);
-    painter.setPen(circleColor);
-    int padding = width() / 5;
-    int circleRadius = width() - (padding * 2);
-    painter.drawEllipse(padding, padding, circleRadius, circleRadius);
-
-    // draw X
-    painter.setPen(xColor);
-    padding = padding * 2;
-    painter.drawLine(padding, padding,            width() - padding, width() - padding);
-    painter.drawLine(padding, height() - padding, width() - padding, padding);
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/topbar/lineedit.cpp Deleted

@@ -1,230 +0,0 @@
-/**
- * Copyright (c) 2008 - 2009, Benjamin C. Meyer  <ben@meyerhome.net>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "lineedit.h"
-#include "lineedit_p.h"
-
-#include <qevent.h>
-#include <qlayout.h>
-#include <qstyleoption.h>
-#include <qpainter.h>
-
-SideWidget::SideWidget(QWidget *parent)
-    : QWidget(parent)
-{
-}
-
-bool SideWidget::event(QEvent *event)
-{
-    if (event->type() == QEvent::LayoutRequest)
-        emit sizeHintChanged();
-    return QWidget::event(event);
-}
-
-LineEdit::LineEdit(QWidget *parent)
-    : QLineEdit(parent)
-    , m_leftLayout(0)
-    , m_rightLayout(0)
-{
-    init();
-}
-
-LineEdit::LineEdit(const QString &contents, QWidget *parent)
-    : QLineEdit(contents, parent)
-    , m_leftWidget(0)
-    , m_rightWidget(0)
-    , m_leftLayout(0)
-    , m_rightLayout(0)
-{
-    init();
-}
-
-void LineEdit::init()
-{
-    m_leftWidget = new SideWidget(this);
-    m_leftWidget->resize(0, 0);
-    m_leftLayout = new QHBoxLayout(m_leftWidget);
-    m_leftLayout->setContentsMargins(0, 0, 0, 0);
-    if (isRightToLeft())
-        m_leftLayout->setDirection(QBoxLayout::RightToLeft);
-    else
-        m_leftLayout->setDirection(QBoxLayout::LeftToRight);
-    m_leftLayout->setSizeConstraint(QLayout::SetFixedSize);
-
-    m_rightWidget = new SideWidget(this);
-    m_rightWidget->resize(0, 0);
-    m_rightLayout = new QHBoxLayout(m_rightWidget);
-    if (isRightToLeft())
-        m_rightLayout->setDirection(QBoxLayout::RightToLeft);
-    else
-        m_rightLayout->setDirection(QBoxLayout::LeftToRight);
-    m_rightLayout->setContentsMargins(0, 0, 0, 0);
-
-    QSpacerItem *horizontalSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
-    m_rightLayout->addItem(horizontalSpacer);
-
-    setWidgetSpacing(3);
-    connect(m_leftWidget, SIGNAL(sizeHintChanged()),
-            this, SLOT(updateTextMargins()));
-    connect(m_rightWidget, SIGNAL(sizeHintChanged()),
-            this, SLOT(updateTextMargins()));
-}
-
-bool LineEdit::event(QEvent *event)
-{
-    if (event->type() == QEvent::LayoutDirectionChange) {
-        if (isRightToLeft()) {
-            m_leftLayout->setDirection(QBoxLayout::RightToLeft);
-            m_rightLayout->setDirection(QBoxLayout::RightToLeft);
-        } else {
-            m_leftLayout->setDirection(QBoxLayout::LeftToRight);
-            m_rightLayout->setDirection(QBoxLayout::LeftToRight);
-        }
-    }
-    return QLineEdit::event(event);
-}
-
-void LineEdit::addWidget(QWidget *widget, WidgetPosition position)
-{
-    if (!widget)
-        return;
-
-    bool rtl = isRightToLeft();
-    if (rtl)
-        position = (position == LeftSide) ? RightSide : LeftSide;
-    if (position == LeftSide) {
-        m_leftLayout->addWidget(widget);
-    } else {
-        m_rightLayout->insertWidget(1, widget);
-    }
-}
-
-void LineEdit::removeWidget(QWidget *widget)
-{
-    if (!widget)
-        return;
-
-    m_leftLayout->removeWidget(widget);
-    m_rightLayout->removeWidget(widget);
-    widget->hide();
-}
-
-void LineEdit::setWidgetSpacing(int spacing)
-{
-    m_leftLayout->setSpacing(spacing);
-    m_rightLayout->setSpacing(spacing);
-    updateTextMargins();
-}
-
-int LineEdit::widgetSpacing() const
-{
-    return m_leftLayout->spacing();
-}
-
-int LineEdit::textMargin(WidgetPosition position) const
-{
-    int spacing = m_rightLayout->spacing();
-    int w = 0;
-    if (position == LeftSide)
-        w = m_leftWidget->sizeHint().width();
-    else
-        w = m_rightWidget->sizeHint().width();
-    if (w == 0)
-        return 0;
-    return w + spacing * 2;
-}
-
-void LineEdit::updateTextMargins()
-{
-    int left = textMargin(LineEdit::LeftSide);
-    int right = textMargin(LineEdit::RightSide);
-    int top = 0;
-    int bottom = 0;
-    setTextMargins(left, top, right, bottom);
-    updateSideWidgetLocations();
-}
-
-void LineEdit::updateSideWidgetLocations()
-{
-    QStyleOptionFrameV2 opt;
-    initStyleOption(&opt);
-    QRect textRect = style()->subElementRect(QStyle::SE_LineEditContents, &opt, this);
-    int spacing = m_rightLayout->spacing();
-    textRect.adjust(spacing, 0, -spacing, 0);
-
-    int left = textMargin(LineEdit::LeftSide);
-
-    int midHeight = textRect.center().y() + 1;
-
-    if (m_leftLayout->count() > 0) {
-        int leftHeight = midHeight - m_leftWidget->height() / 2;
-        int leftWidth = m_leftWidget->width();
-        if (leftWidth == 0)
-            leftHeight = midHeight - m_leftWidget->sizeHint().height() / 2;
-        m_leftWidget->move(textRect.x(), leftHeight);
-    }
-    textRect.setX(left);
-    textRect.setY(midHeight - m_rightWidget->sizeHint().height() / 2);
-    textRect.setHeight(m_rightWidget->sizeHint().height());
-    m_rightWidget->setGeometry(textRect);
-}
-
-void LineEdit::resizeEvent(QResizeEvent *event)
-{
-    updateSideWidgetLocations();
-    QLineEdit::resizeEvent(event);
-}
-
-QString LineEdit::inactiveText() const
-{
-    return m_inactiveText;
-}
-
-void LineEdit::setInactiveText(const QString &text)
-{
-    m_inactiveText = text;
-}
-
-void LineEdit::paintEvent(QPaintEvent *event)
-{
-    QLineEdit::paintEvent(event);
-    if (text().isEmpty() && !m_inactiveText.isEmpty() && !hasFocus()) {
-        QStyleOptionFrameV2 panel;
-        initStyleOption(&panel);
-        QRect textRect = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);
-        int horizontalMargin = 2;
-        textRect.adjust(horizontalMargin, 0, 0, 0);
-        int left = textMargin(LineEdit::LeftSide);
-        int right = textMargin(LineEdit::RightSide);
-        textRect.adjust(left, 0, -right, 0);
-        QPainter painter(this);
-        painter.setPen(palette().brush(QPalette::Disabled, QPalette::Text).color());
-        painter.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, m_inactiveText);
-    }
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/topbar/lineedit.h Deleted

@@ -1,91 +0,0 @@
-/**
- * Copyright (c) 2008 - 2009, Benjamin C. Meyer  <ben@meyerhome.net>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef LINEEDIT_H
-#define LINEEDIT_H
-
-#include <QLineEdit>
-
-#include "dllmacro.h"
-class QHBoxLayout;
-
-/*
-    LineEdit is a subclass of QLineEdit that provides an easy and simple
-    way to add widgets on the left or right hand side of the text.
-
-    The layout of the widgets on either side are handled by a QHBoxLayout.
-    You can set the spacing around the widgets with setWidgetSpacing().
-
-    As widgets are added to the class they are inserted from the outside
-    into the center of the widget.
-*/
-class SideWidget;
-class DLLEXPORT LineEdit : public QLineEdit
-{
-    Q_OBJECT
-    Q_PROPERTY(QString inactiveText READ inactiveText WRITE setInactiveText)
-
-public:
-    enum WidgetPosition {
-        LeftSide,
-        RightSide
-    };
-
-    LineEdit(QWidget *parent = 0);
-    LineEdit(const QString &contents, QWidget *parent = 0);
-
-    void addWidget(QWidget *widget, WidgetPosition position);
-    void removeWidget(QWidget *widget);
-    void setWidgetSpacing(int spacing);
-    int widgetSpacing() const;
-    int textMargin(WidgetPosition position) const;
-    QString inactiveText() const;
-    void setInactiveText(const QString &text);
-
-    void paintEvent(QPaintEvent *event);
-
-protected:
-    void resizeEvent(QResizeEvent *event);
-    bool event(QEvent *event);
-
-protected slots:
-    void updateTextMargins();
-
-private:
-    void init();
-    void updateSideWidgetLocations();
-
-    SideWidget *m_leftWidget;
-    SideWidget *m_rightWidget;
-    QHBoxLayout *m_leftLayout;
-    QHBoxLayout *m_rightLayout;
-    QString m_inactiveText;
-};
-
-#endif // LINEEDIT_H
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/topbar/searchbutton.cpp Deleted

@@ -1,116 +0,0 @@
-/*
- * Copyright 2009 Benjamin C. Meyer <ben@meyerhome.net>
- *
- * This program 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 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "searchbutton.h"
-
-#include <qcompleter.h>
-#include <qevent.h>
-#include <qlineedit.h>
-#include <qpainter.h>
-
-SearchButton::SearchButton(QWidget *parent)
-    : QAbstractButton(parent)
-    , m_showMenuTriangle(false)
-{
-    setFocusPolicy(Qt::NoFocus);
-    setCursor(Qt::ArrowCursor);
-    setMinimumSize(sizeHint());
-}
-
-QSize SearchButton::sizeHint() const
-{
-    if (!m_cache.isNull())
-        return m_cache.size();
-    if (m_showMenuTriangle)
-        return QSize(16, 16);
-    return QSize(12, 16);
-}
-
-QImage SearchButton::generateSearchImage(bool dropDown)
-{
-    QImage image(dropDown ? 16 : 12, 16, QImage::Format_ARGB32);
-    image.fill(qRgba(0, 0, 0, 0));
-    QPainterPath path;
-
-    // draw magnify glass circle
-    int radius = image.height() / 2;
-    QRect circle(1, 1, radius, radius);
-    path.addEllipse(circle);
-
-    // draw handle
-    path.arcMoveTo(circle, 300);
-    QPointF currentPosition = path.currentPosition();
-    path.moveTo(currentPosition.x() + 1, currentPosition.y() + 1);
-    if (dropDown)
-        path.lineTo(image.width()-6, image.height()-4);
-    else
-        path.lineTo(image.width()-2, image.height()-4);
-
-    QPainter painter(&image);
-    painter.setRenderHint(QPainter::Antialiasing, true);
-    painter.setPen(QPen(Qt::darkGray, 2));
-    painter.drawPath(path);
-
-    if (dropDown) {
-        // draw the dropdown triangle
-        QPainterPath dropPath;
-        dropPath.arcMoveTo(circle, 320);
-        QPointF currentPosition = dropPath.currentPosition();
-        currentPosition = QPointF(currentPosition.x() + 2, currentPosition.y() + 0.5);
-        dropPath.moveTo(currentPosition);
-        dropPath.lineTo(currentPosition.x() + 4, currentPosition.y());
-        dropPath.lineTo(currentPosition.x() + 2, currentPosition.y() + 2);
-        dropPath.closeSubpath();
-        painter.setPen(Qt::darkGray);
-        painter.setBrush(Qt::darkGray);
-        painter.setRenderHint(QPainter::Antialiasing, false);
-        painter.drawPath(dropPath);
-    }
-    painter.end();
-    return image;
-}
-
-void SearchButton::setImage(const QImage &image)
-{
-    m_cache = image;
-    setMinimumSize(sizeHint());
-    update();
-}
-
-void SearchButton::setShowMenuTriangle(bool show)
-{
-    m_showMenuTriangle = show;
-    setMinimumSize(sizeHint());
-}
-
-bool SearchButton::showMenuTriangle() const
-{
-    return m_showMenuTriangle;
-}
-
-void SearchButton::paintEvent(QPaintEvent *event)
-{
-    Q_UNUSED(event);
-    if (m_cache.isNull())
-        m_cache = generateSearchImage(m_showMenuTriangle);
-    QPainter painter(this);
-    painter.setRenderHint(QPainter::SmoothPixmapTransform);
-    painter.drawImage(QPoint(0, 0), m_cache);
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/topbar/searchbutton.h Deleted

@@ -1,47 +0,0 @@
-/*
- * Copyright 2009 Benjamin C. Meyer <ben@meyerhome.net>
- *
- * This program 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 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef SEARCHBUTTON_H
-#define SEARCHBUTTON_H
-
-#include <qabstractbutton.h>
-
-#include "dllmacro.h"
-
-class QCompleter;
-class DLLEXPORT SearchButton : public QAbstractButton
-{
-    Q_OBJECT
-
-public:
-    SearchButton(QWidget *parent = 0);
-    void setImage(const QImage &image);
-    void setShowMenuTriangle(bool show);
-    bool showMenuTriangle() const;
-    void paintEvent(QPaintEvent *event);
-    QSize sizeHint() const;
-
-private:
-    QImage generateSearchImage(bool dropDown);
-    QImage m_cache;
-    bool m_showMenuTriangle;
-};
-
-#endif // SEARCHBUTTON_H
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/topbar/searchlineedit.cpp Deleted

@@ -1,69 +0,0 @@
-/**
- * Copyright (c) 2009, Benjamin C. Meyer
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "searchlineedit.h"
-
-#include "clearbutton.h"
-#include "searchbutton.h"
-
-SearchLineEdit::SearchLineEdit(QWidget *parent)
-    : LineEdit(parent)
-{
-    init();
-}
-
-void SearchLineEdit::init()
-{
-    // search button on the left
-    m_searchButton = new SearchButton(this);
-    addWidget(m_searchButton, LeftSide);
-
-    // clear button on the right
-    m_clearButton = new ClearButton(this);
-    connect(m_clearButton, SIGNAL(clicked()),
-            this, SLOT(clear()));
-    connect(this, SIGNAL(textChanged(const QString&)),
-            m_clearButton, SLOT(textChanged(const QString&)));
-    addWidget(m_clearButton, RightSide);
-    m_clearButton->hide();
-
-    setWidgetSpacing(5);
-
-    updateTextMargins();
-    setInactiveText(tr("Search"));
-}
-
-ClearButton *SearchLineEdit::clearButton() const
-{
-    return m_clearButton;
-}
-
-SearchButton *SearchLineEdit::searchButton() const
-{
-    return m_searchButton;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/topbar/searchlineedit.h Deleted

@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2009, Benjamin C. Meyer
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef SEARCHLINEEDIT_H
-#define SEARCHLINEEDIT_H
-
-#include "lineedit.h"
-
-class ClearButton;
-class SearchButton;
-
-class DLLEXPORT SearchLineEdit : public LineEdit
-{
-    Q_OBJECT
-
-public:
-    SearchLineEdit(QWidget *parent = 0);
-
-    ClearButton *clearButton() const;
-    SearchButton *searchButton() const;
-
-private:
-    void init();
-    ClearButton *m_clearButton;
-    SearchButton *m_searchButton;
-};
-
-#endif // SEARCHLINEEDIT_H
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/topbar/topbar.cpp Deleted

@@ -1,343 +0,0 @@
-/* === 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
- *   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 "topbar.h"
-#include "ui_topbar.h"
-
-#include "searchbutton.h"
-
-#include <QPropertyAnimation>
-#include <QRadioButton>
-#include <QFile>
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#define MAXDUDES 3
-#define DUDEWIDTH 10
-#define DUDEX( i ) ( DUDEWIDTH * i )
-
-using namespace Tomahawk;
-
-
-TopBar::TopBar( QWidget* parent )
-    : QWidget( parent )
-    , ui( new Ui::TopBar )
-    , m_sources( 0 )
-    , m_tracks( 0 )
-    , m_artists( 0 )
-    , m_shown( 0 )
-{
-    ui->setupUi( this );
-
-    ui->statsLabelNumTracks->setFormat( "%L1 " + tr( "Tracks" ) );
-    ui->statsLabelNumArtists->setFormat( "%L1 " + tr( "Artists" ) );
-    connect( ui->filterEdit, SIGNAL( textChanged( QString ) ), SIGNAL( filterTextChanged( QString ) ) );
-
-    ui->filterEdit->setStyleSheet( "QLineEdit { border: 1px solid gray; border-radius: 6px; margin-right: 2px; }" );
-    ui->filterEdit->setInactiveText( tr( "Filter" ) );
-#ifdef Q_WS_MAC
-    ui->filterEdit->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-#endif
-
-    ui->filterEdit->searchButton()->setImage( QImage( RESPATH "images/filter.png" ) );
-
-    // initialise dudes
-    for( int i = 0; i < MAXDUDES; ++i )
-    {
-        QLabel* manlbl = new QLabel( ui->widgetMen );
-        manlbl->setPixmap( QPixmap( RESPATH "images/avatar-dude.png" ) );
-        manlbl->move( QPoint( -10,0 ) );
-        manlbl->show();
-        m_dudes.append( manlbl );
-    }
-
-    QFile f( RESPATH "stylesheets/topbar-radiobuttons.css" );
-    f.open( QFile::ReadOnly );
-    QString css = QString::fromAscii( f.readAll() );
-    f.close();
-
-    ui->widgetRadio->setStyleSheet( css );
-
-    ui->radioNormal->setFocusPolicy( Qt::NoFocus );
-    ui->radioDetailed->setFocusPolicy( Qt::NoFocus );
-    ui->radioCloud->setFocusPolicy( Qt::NoFocus );
-
-    ui->radioCloud->hide();
-
-    ui->radioNormal->setToolTip( tr( "Artist View" ) );
-    ui->radioDetailed->setToolTip( tr("Flat View" ) );
-
-    connect( ui->radioNormal, SIGNAL( clicked() ), SIGNAL( artistMode() ) );
-    connect( ui->radioDetailed, SIGNAL( clicked() ), SIGNAL( flatMode() ) );
-    connect( ui->radioCloud, SIGNAL( clicked() ), SIGNAL( albumMode() ) );
-
-    setNumSources( 0 );
-    setNumTracks( 0 );
-    setNumArtists( 0 );
-    setNumShown( 0 );
-
-    onArtistMode();
-
-    connect( ViewManager::instance(), SIGNAL( numSourcesChanged( unsigned int ) ),
-                                        SLOT( setNumSources( unsigned int ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( numTracksChanged( unsigned int ) ),
-                                        SLOT( setNumTracks( unsigned int ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( numArtistsChanged( unsigned int ) ),
-                                        SLOT( setNumArtists( unsigned int ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( numShownChanged( unsigned int ) ),
-                                        SLOT( setNumShown( unsigned int ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( statsAvailable( bool ) ),
-                                        SLOT( setStatsVisible( bool ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( modesAvailable( bool ) ),
-                                        SLOT( setModesVisible( bool ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ),
-                                        SLOT( setFilterVisible( bool ) ) );
-
-    connect( ViewManager::instance(), SIGNAL( modeChanged( Tomahawk::PlaylistInterface::ViewMode ) ),
-                                        SLOT( onModeChanged( Tomahawk::PlaylistInterface::ViewMode ) ) );
-}
-
-
-TopBar::~TopBar()
-{
-    delete ui;
-}
-
-
-void
-TopBar::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-TopBar::resizeEvent( QResizeEvent* e )
-{
-    QWidget::resizeEvent( e );
-}
-
-
-void
-TopBar::fadeInDude( unsigned int i )
-{
-//    qDebug() << Q_FUNC_INFO << i;
-
-    QLabel* dude = m_dudes.at( i );
-    QPropertyAnimation* ani = new QPropertyAnimation( dude, "pos" );
-    ani->setDuration( 1000 );
-    ani->setEasingCurve( QEasingCurve::InQuad );
-    ani->setStartValue( QPoint( -10,0 ) );
-    ani->setEndValue( QPoint( DUDEX( i+1 ), 0 ) );
-
-    qDebug() << "Animating from" << ani->startValue() << "to" << ani->endValue();
-    connect( ani, SIGNAL( finished() ), ani, SLOT( deleteLater() ) );
-    ani->start();
-}
-
-
-void
-TopBar::fadeOutDude( unsigned int i )
-{
-//    qDebug() << Q_FUNC_INFO << i;
-
-    QLabel* dude = m_dudes.at( i );
-    QPropertyAnimation* ani = new QPropertyAnimation( dude, "pos" );
-    ani->setDuration( 1000 );
-    ani->setEasingCurve( QEasingCurve::OutQuad );
-    ani->setStartValue( dude->pos() );
-    ani->setEndValue( QPoint( -10, 0 ) );
-
-    qDebug() << "Animating from" << ani->startValue() << "to" << ani->endValue();
-    connect( ani, SIGNAL( finished() ), ani, SLOT( deleteLater() ) );
-    ani->start();
-}
-
-
-void
-TopBar::setNumSources( unsigned int i )
-{
-//    qDebug() << Q_FUNC_INFO << i;
-
-    // Dude0 Dude1 Dude2
-    ui->statsLabelNumSources->setText( QString( "%L1 %2" ).arg( i ).arg( tr( "Sources" ) ) );
-
-    if( ( m_sources >= MAXDUDES && i >= MAXDUDES ) || m_sources == i )
-    {
-        m_sources = i;
-        return;
-    }
-
-    if( i > m_sources )
-    {
-        for( unsigned int k = m_sources; k < MAXDUDES && k < i; ++k )
-        {
-            fadeInDude( k );
-        }
-        m_sources = i;
-    }
-    else
-    {
-        int k = qMin( (unsigned int)MAXDUDES - 1, m_sources - 1 );
-        do
-        {
-            fadeOutDude( k );
-            m_sources--;
-        } while( (unsigned int)k-- > i );
-
-        m_sources = i;
-    }
-}
-
-
-void
-TopBar::setNumTracks( unsigned int i )
-{
-    m_tracks = i;
-    ui->statsLabelNumTracks->setVal( i );
-}
-
-
-void
-TopBar::setNumArtists( unsigned int i )
-{
-    m_artists = i;
-    ui->statsLabelNumArtists->setVisible( m_artists > 0 );
-    ui->statsLabelNumArtists->setVal( i );
-}
-
-
-void
-TopBar::setNumShown( unsigned int i )
-{
-    m_shown = i;
-    ui->statsLabelNumShown->setVisible( m_shown != m_tracks && ui->statsLabelNumTracks->isVisible() );
-    ui->statsLabelNumShown->setText( QString( "%L1 %2" ).arg( i ).arg( tr( "Shown" ) ) );
-}
-
-
-void
-TopBar::addSource()
-{
-//    qDebug() << Q_FUNC_INFO;
-    setNumSources( m_sources + 1 );
-}
-
-
-void
-TopBar::removeSource()
-{
-//    qDebug() << Q_FUNC_INFO;
-    Q_ASSERT( m_sources > 0 );
-    setNumSources( m_sources - 1 );
-}
-
-
-void
-TopBar::setStatsVisible( bool b )
-{
-    foreach( QLabel* dude, m_dudes )
-        dude->setVisible( b );
-
-//    ui->statsLabelNumArtists->setVisible( b );
-//    ui->statsLabelNumShown->setVisible( b );
-    ui->statsLabelNumSources->setVisible( b );
-    ui->statsLabelNumTracks->setVisible( b );
-}
-
-
-void
-TopBar::setModesVisible( bool b )
-{
-    ui->widgetRadio->setVisible( b );
-}
-
-
-void
-TopBar::setFilterVisible( bool b )
-{
-    ui->filterEdit->setVisible( b );
-}
-
-
-void
-TopBar::setFilter( const QString& filter )
-{
-    ui->filterEdit->setText( filter );
-}
-
-
-void
-TopBar::onModeChanged( Tomahawk::PlaylistInterface::ViewMode mode )
-{
-    qDebug() << Q_FUNC_INFO << mode;
-    switch ( mode )
-    {
-        case Tomahawk::PlaylistInterface::Flat:
-            onFlatMode();
-            break;
-
-        case Tomahawk::PlaylistInterface::Tree:
-            onArtistMode();
-            break;
-
-        case Tomahawk::PlaylistInterface::Album:
-            onAlbumMode();
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-TopBar::onFlatMode()
-{
-    ui->radioDetailed->setChecked( true );
-}
-
-
-void
-TopBar::onArtistMode()
-{
-    ui->radioNormal->setChecked( true );
-}
-
-
-void
-TopBar::onAlbumMode()
-{
-    ui->radioCloud->setChecked( true );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/topbar/topbar.h Deleted

@@ -1,87 +0,0 @@
-/* === 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
- *   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 TOPBAR_H
-#define TOPBAR_H
-
-#include <QWidget>
-#include <QLabel>
-#include <QList>
-
-#include "viewmanager.h"
-#include "sourcelist.h"
-#include "dllmacro.h"
-
-namespace Ui
-{
-    class TopBar;
-}
-
-class DLLEXPORT TopBar : public QWidget
-{
-Q_OBJECT
-
-public:
-    TopBar( QWidget* parent = 0 );
-    ~TopBar();
-
-signals:
-    void filterTextChanged( const QString& newtext );
-
-    void flatMode();
-    void artistMode();
-    void albumMode();
-
-public slots:
-    void setNumSources( unsigned int );
-    void setNumTracks( unsigned int );
-    void setNumArtists( unsigned int );
-    void setNumShown( unsigned int );
-
-    void setStatsVisible( bool b );
-    void setModesVisible( bool b );
-    void setFilterVisible( bool b );
-
-    void addSource();
-    void removeSource();
-
-    void setFilter( const QString& filter );
-
-private slots:
-    void onModeChanged( Tomahawk::PlaylistInterface::ViewMode mode );
-    void onFlatMode();
-    void onArtistMode();
-    void onAlbumMode();
-
-protected:
-    void changeEvent( QEvent* e );
-    void resizeEvent( QResizeEvent* e );
-
-private:
-    void fadeOutDude( unsigned int i );
-    void fadeInDude( unsigned int i );
-
-    Ui::TopBar* ui;
-
-    unsigned int m_sources, m_tracks, m_artists, m_shown;
-    QList<QLabel*> m_dudes;
-
-    Tomahawk::source_ptr m_onesource;
-};
-
-#endif // TOPBAR_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/topbar/topbar.ui Deleted

@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TopBar</class>
- <widget class="QWidget" name="TopBar">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>809</width>
-    <height>45</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>38</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="leftMargin">
-    <number>6</number>
-   </property>
-   <property name="topMargin">
-    <number>2</number>
-   </property>
-   <property name="rightMargin">
-    <number>2</number>
-   </property>
-   <property name="bottomMargin">
-    <number>4</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="widgetMen" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>36</width>
-       <height>22</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">margin-top:3px;</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="statsLabelNumSources">
-     <property name="styleSheet">
-      <string notr="true"/>
-     </property>
-     <property name="text">
-      <string>0 Sources</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>5</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="AnimatedCounterLabel" name="statsLabelNumTracks">
-     <property name="text">
-      <string>0 Tracks</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer_4">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>5</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="AnimatedCounterLabel" name="statsLabelNumArtists">
-     <property name="text">
-      <string>0 Artists</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer_5">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>5</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="statsLabelNumShown">
-     <property name="text">
-      <string>0 Shown</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::MinimumExpanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>149</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QWidget" name="widgetRadio" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>58</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>58</width>
-       <height>30</height>
-      </size>
-     </property>
-     <widget class="QRadioButton" name="radioNormal">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>29</width>
-        <height>30</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QRadioButton" name="radioCloud">
-      <property name="geometry">
-       <rect>
-        <x>58</x>
-        <y>0</y>
-        <width>29</width>
-        <height>30</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QRadioButton" name="radioDetailed">
-      <property name="geometry">
-       <rect>
-        <x>29</x>
-        <y>0</y>
-        <width>29</width>
-        <height>30</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>29</width>
-        <height>30</height>
-       </size>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>15</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="SearchLineEdit" name="filterEdit">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>150</width>
-       <height>27</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>150</width>
-       <height>27</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AnimatedCounterLabel</class>
-   <extends>QLabel</extends>
-   <header>widgets/animatedcounterlabel.h</header>
-  </customwidget>
-  <customwidget>
-   <class>SearchLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>playlist/topbar/searchlineedit.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackheader.cpp Deleted

@@ -1,38 +0,0 @@
-/* === 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
- *   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 "trackheader.h"
-
-#include "playlist/trackview.h"
-#include "utils/logger.h"
-
-
-TrackHeader::TrackHeader( TrackView* parent )
-    : ViewHeader( parent )
-    , m_parent( parent )
-{
-    QList< double > columnWeights;
-    columnWeights << 0.16 << 0.16 << 0.14 << 0.12 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.09; // << 0.03;
-
-    setDefaultColumnWeights( columnWeights );
-}
-
-
-TrackHeader::~TrackHeader()
-{
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackheader.h Deleted

@@ -1,39 +0,0 @@
-/* === 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
- *   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 TRACKHEADER_H
-#define TRACKHEADER_H
-
-#include "ViewHeader.h"
-#include "dllmacro.h"
-
-class TrackView;
-
-class DLLEXPORT TrackHeader : public ViewHeader
-{
-Q_OBJECT
-
-public:
-    explicit TrackHeader( TrackView* parent = 0 );
-    ~TrackHeader();
-
-private:
-    TrackView* m_parent;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackmodel.cpp Deleted

@@ -1,574 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 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 "trackmodel.h"
-
-#include <QDateTime>
-#include <QMimeData>
-#include <QTreeView>
-
-#include "audio/audioengine.h"
-#include "utils/tomahawkutils.h"
-
-#include "artist.h"
-#include "album.h"
-#include "pipeline.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-TrackModel::TrackModel( QObject* parent )
-    : QAbstractItemModel( parent )
-    , m_rootItem( new TrackModelItem( 0, this ) )
-    , m_readOnly( true )
-    , m_style( Detailed )
-{
-    connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( onPlaybackStarted( Tomahawk::result_ptr ) ), Qt::DirectConnection );
-    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ), Qt::DirectConnection );
-}
-
-
-TrackModel::~TrackModel()
-{
-}
-
-
-QModelIndex
-TrackModel::index( int row, int column, const QModelIndex& parent ) const
-{
-    if ( !m_rootItem || row < 0 || column < 0 )
-        return QModelIndex();
-
-    TrackModelItem* parentItem = itemFromIndex( parent );
-    TrackModelItem* childItem = parentItem->children.value( row );
-    if ( !childItem )
-        return QModelIndex();
-
-    return createIndex( row, column, childItem );
-}
-
-
-int
-TrackModel::rowCount( const QModelIndex& parent ) const
-{
-    if ( parent.column() > 0 )
-        return 0;
-
-    TrackModelItem* parentItem = itemFromIndex( parent );
-    if ( !parentItem )
-        return 0;
-
-    return parentItem->children.count();
-}
-
-
-int
-TrackModel::columnCount( const QModelIndex& parent ) const
-{
-    Q_UNUSED( parent );
-
-    switch ( m_style )
-    {
-        case Short:
-        case ShortWithAvatars:
-            return 1;
-            break;
-
-        case Detailed:
-        default:
-            return 12;
-            break;
-    }
-}
-
-
-QModelIndex
-TrackModel::parent( const QModelIndex& child ) const
-{
-    TrackModelItem* entry = itemFromIndex( child );
-    if ( !entry )
-        return QModelIndex();
-
-    TrackModelItem* parentEntry = entry->parent;
-    if ( !parentEntry )
-        return QModelIndex();
-
-    TrackModelItem* grandparentEntry = parentEntry->parent;
-    if ( !grandparentEntry )
-        return QModelIndex();
-
-    int row = grandparentEntry->children.indexOf( parentEntry );
-    return createIndex( row, 0, parentEntry );
-}
-
-
-QVariant
-TrackModel::data( const QModelIndex& index, int role ) const
-{
-    TrackModelItem* entry = itemFromIndex( index );
-    if ( !entry )
-        return QVariant();
-
-    if ( role == Qt::DecorationRole )
-    {
-        return QVariant();
-    }
-
-    if ( role == Qt::SizeHintRole )
-    {
-        return QSize( 0, 18 );
-    }
-
-    if ( role == Qt::TextAlignmentRole )
-    {
-        return QVariant( columnAlignment( index.column() ) );
-    }
-
-    if ( role == StyleRole )
-    {
-        return m_style;
-    }
-
-    if ( role != Qt::DisplayRole ) // && role != Qt::ToolTipRole )
-        return QVariant();
-
-    const query_ptr& query = entry->query();
-    if ( !query->numResults() )
-    {
-        switch( index.column() )
-        {
-            case Artist:
-                return query->artist();
-                break;
-
-            case Track:
-                return query->track();
-                break;
-
-            case Album:
-                return query->album();
-                break;
-        }
-    }
-    else
-    {
-        switch( index.column() )
-        {
-            case Artist:
-                return query->results().first()->artist()->name();
-                break;
-
-            case Track:
-                return query->results().first()->track();
-                break;
-
-            case Album:
-                return query->results().first()->album()->name();
-                break;
-
-            case Composer:
-                if ( !query->results().first()->composer().isNull() )
-                    return query->results().first()->composer()->name();
-                break;
-
-            case Duration:
-                return TomahawkUtils::timeToString( query->results().first()->duration() );
-                break;
-
-            case Bitrate:
-                if ( query->results().first()->bitrate() > 0 )
-                    return query->results().first()->bitrate();
-                break;
-
-            case Age:
-                return TomahawkUtils::ageToString( QDateTime::fromTime_t( query->results().first()->modificationTime() ) );
-                break;
-
-            case Year:
-                if ( query->results().first()->year() != 0 )
-                    return query->results().first()->year();
-                break;
-
-            case Filesize:
-                return TomahawkUtils::filesizeToString( query->results().first()->size() );
-                break;
-
-            case Origin:
-                return query->results().first()->friendlySource();
-                break;
-
-            case Score:
-                return query->results().first()->score();
-                break;
-
-            case AlbumPos:
-                QString tPos;
-                if ( query->results().first()->albumpos() != 0 )
-                {
-                    tPos = QString::number( query->results().first()->albumpos() );
-                    if( query->results().first()->discnumber() == 0 )
-                        return tPos;
-                    else
-                        return QString( "%1.%2" ).arg( QString::number( query->results().first()->discnumber() ) )
-                                                 .arg( tPos );
-                }
-                break;
-        }
-    }
-
-    return QVariant();
-}
-
-
-QVariant
-TrackModel::headerData( int section, Qt::Orientation orientation, int role ) const
-{
-    Q_UNUSED( orientation );
-
-    QStringList headers;
-    headers << tr( "Artist" ) << tr( "Title" ) << tr( "Composer" ) << tr( "Album" ) << tr( "Track" ) << tr( "Duration" ) << tr( "Bitrate" ) << tr( "Age" ) << tr( "Year" ) << tr( "Size" ) << tr( "Origin" ) << tr( "Score" );
-    if ( role == Qt::DisplayRole && section >= 0 )
-    {
-        return headers.at( section );
-    }
-
-    if ( role == Qt::TextAlignmentRole )
-    {
-        return QVariant( columnAlignment( section ) );
-    }
-
-    return QVariant();
-}
-
-
-void
-TrackModel::setCurrentItem( const QModelIndex& index )
-{
-    TrackModelItem* oldEntry = itemFromIndex( m_currentIndex );
-    if ( oldEntry )
-    {
-        oldEntry->setIsPlaying( false );
-    }
-
-    TrackModelItem* entry = itemFromIndex( index );
-    if ( index.isValid() && entry && !entry->query().isNull() )
-    {
-        m_currentIndex = index;
-        m_currentUuid = entry->query()->id();
-        entry->setIsPlaying( true );
-    }
-    else
-    {
-        m_currentIndex = QModelIndex();
-        m_currentUuid = QString();
-    }
-}
-
-
-Qt::DropActions
-TrackModel::supportedDropActions() const
-{
-    return Qt::CopyAction | Qt::MoveAction;
-}
-
-
-Qt::ItemFlags
-TrackModel::flags( const QModelIndex& index ) const
-{
-    Qt::ItemFlags defaultFlags = QAbstractItemModel::flags( index );
-
-    if ( index.isValid() && index.column() == 0 )
-        return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
-    else
-        return Qt::ItemIsDropEnabled | defaultFlags;
-}
-
-
-QStringList
-TrackModel::mimeTypes() const
-{
-    QStringList types;
-    types << "application/tomahawk.query.list";
-    return types;
-}
-
-
-QMimeData*
-TrackModel::mimeData( const QModelIndexList &indexes ) const
-{
-    qDebug() << Q_FUNC_INFO;
-
-    QByteArray queryData;
-    QDataStream queryStream( &queryData, QIODevice::WriteOnly );
-
-    foreach ( const QModelIndex& i, indexes )
-    {
-        if ( i.column() > 0 )
-            continue;
-
-        QModelIndex idx = index( i.row(), 0, i.parent() );
-        TrackModelItem* item = itemFromIndex( idx );
-        if ( item )
-        {
-            const query_ptr& query = item->query();
-            queryStream << qlonglong( &query );
-        }
-    }
-
-    QMimeData* mimeData = new QMimeData();
-    mimeData->setData( "application/tomahawk.query.list", queryData );
-
-    return mimeData;
-}
-
-
-void
-TrackModel::clear()
-{
-    if ( rowCount( QModelIndex() ) )
-    {
-        emit loadingFinished();
-
-        emit beginResetModel();
-        delete m_rootItem;
-        m_rootItem = 0;
-        m_rootItem = new TrackModelItem( 0, this );
-        emit endResetModel();
-    }
-}
-
-
-QList< query_ptr >
-TrackModel::queries() const
-{
-    Q_ASSERT( m_rootItem );
-
-    QList< query_ptr > tracks;
-    foreach ( TrackModelItem* item, m_rootItem->children )
-    {
-        tracks << item->query();
-    }
-
-    return tracks;
-}
-
-
-void
-TrackModel::append( const Tomahawk::query_ptr& query )
-{
-    insert( query, rowCount( QModelIndex() ) );
-}
-
-
-void
-TrackModel::append( const QList< Tomahawk::query_ptr >& queries )
-{
-    insert( queries, rowCount( QModelIndex() ) );
-}
-
-
-void
-TrackModel::insert( const Tomahawk::query_ptr& query, int row )
-{
-    if ( query.isNull() )
-        return;
-
-    QList< Tomahawk::query_ptr > ql;
-    ql << query;
-
-    insert( ql, row );
-}
-
-
-void
-TrackModel::insert( const QList< Tomahawk::query_ptr >& queries, int row )
-{
-    if ( !queries.count() )
-    {
-        emit trackCountChanged( rowCount( QModelIndex() ) );
-        return;
-    }
-
-    int c = row;
-    QPair< int, int > crows;
-    crows.first = c;
-    crows.second = c + queries.count() - 1;
-
-    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
-
-    int i = 0;
-    TrackModelItem* plitem;
-    foreach( const query_ptr& query, queries )
-    {
-        plitem = new TrackModelItem( query, m_rootItem, row + i );
-        plitem->index = createIndex( row + i, 0, plitem );
-        i++;
-
-        if ( query->id() == currentItemUuid() )
-            setCurrentItem( plitem->index );
-
-        connect( plitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
-    }
-
-    emit endInsertRows();
-    emit trackCountChanged( rowCount( QModelIndex() ) );
-}
-
-
-void
-TrackModel::remove( int row, bool moreToCome )
-{
-    remove( index( row, 0, QModelIndex() ), moreToCome );
-}
-
-
-void
-TrackModel::remove( const QModelIndex& index, bool moreToCome )
-{
-    if ( QThread::currentThread() != thread() )
-    {
-        QMetaObject::invokeMethod( this, "remove",
-                                   Qt::QueuedConnection,
-                                   Q_ARG(const QModelIndex, index),
-                                   Q_ARG(bool, moreToCome) );
-        return;
-    }
-
-    if ( index.column() > 0 )
-        return;
-
-    TrackModelItem* item = itemFromIndex( index );
-    if ( item )
-    {
-        emit beginRemoveRows( index.parent(), index.row(), index.row() );
-        delete item;
-        emit endRemoveRows();
-    }
-
-    if ( !moreToCome )
-        emit trackCountChanged( rowCount( QModelIndex() ) );
-}
-
-
-void
-TrackModel::remove( const QList<QModelIndex>& indexes )
-{
-    QList<QPersistentModelIndex> pil;
-    foreach ( const QModelIndex& idx, indexes )
-    {
-        pil << idx;
-    }
-
-    remove( pil );
-}
-
-
-void
-TrackModel::remove( const QList<QPersistentModelIndex>& indexes )
-{
-    QList<QPersistentModelIndex> finalIndexes;
-    foreach ( const QPersistentModelIndex index, indexes )
-    {
-        if ( index.column() > 0 )
-            continue;
-        finalIndexes << index;
-    }
-
-    for ( int i = 0; i < finalIndexes.count(); i++ )
-    {
-        remove( finalIndexes.at( i ), i + 1 != finalIndexes.count() );
-    }
-}
-
-
-TrackModelItem*
-TrackModel::itemFromIndex( const QModelIndex& index ) const
-{
-    if ( index.isValid() )
-    {
-        return static_cast<TrackModelItem*>( index.internalPointer() );
-    }
-    else
-    {
-        return m_rootItem;
-    }
-}
-
-
-void
-TrackModel::onPlaybackStarted( const Tomahawk::result_ptr& result )
-{
-    TrackModelItem* oldEntry = itemFromIndex( m_currentIndex );
-    if ( oldEntry && ( oldEntry->query().isNull() || !oldEntry->query()->numResults() || oldEntry->query()->results().first().data() != result.data() ) )
-    {
-        oldEntry->setIsPlaying( false );
-    }
-}
-
-
-void
-TrackModel::onPlaybackStopped()
-{
-    TrackModelItem* oldEntry = itemFromIndex( m_currentIndex );
-    if ( oldEntry )
-    {
-        oldEntry->setIsPlaying( false );
-    }
-}
-
-
-void
-TrackModel::ensureResolved()
-{
-    for( int i = 0; i < rowCount( QModelIndex() ); i++ )
-    {
-        query_ptr query = itemFromIndex( index( i, 0, QModelIndex() ) )->query();
-
-        if ( !query->resolvingFinished() )
-            Pipeline::instance()->resolve( query );
-    }
-}
-
-
-void
-TrackModel::setStyle( TrackModel::TrackItemStyle style )
-{
-    m_style = style;
-}
-
-
-Qt::Alignment
-TrackModel::columnAlignment( int column ) const
-{
-    switch( column )
-    {
-        case Age:
-        case AlbumPos:
-        case Bitrate:
-        case Duration:
-        case Filesize:
-        case Year:
-            return Qt::AlignHCenter;
-            break;
-
-        default:
-            return Qt::AlignLeft;
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackmodel.h Deleted

@@ -1,153 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 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 TRACKMODEL_H
-#define TRACKMODEL_H
-
-#include <QAbstractItemModel>
-
-#include "playlistinterface.h"
-#include "trackmodelitem.h"
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-class QMetaData;
-
-class DLLEXPORT TrackModel : public QAbstractItemModel
-{
-Q_OBJECT
-
-public:
-    enum TrackItemStyle
-    { Detailed = 0, Short = 1, ShortWithAvatars = 2 };
-
-    enum TrackModelRole
-    { StyleRole = Qt::UserRole + 1 };
-
-    enum Columns {
-        Artist = 0,
-        Track = 1,
-        Composer = 2,
-        Album = 3,
-        AlbumPos = 4,
-        Duration = 5,
-        Bitrate = 6,
-        Age = 7,
-        Year = 8,
-        Filesize = 9,
-        Origin = 10,
-        Score = 11
-    };
-
-    explicit TrackModel( QObject* parent = 0 );
-    virtual ~TrackModel();
-
-    TrackModel::TrackItemStyle style() const { return m_style; }
-    void setStyle( TrackModel::TrackItemStyle style );
-
-    virtual QModelIndex index( int row, int column, const QModelIndex& parent ) const;
-    virtual QModelIndex parent( const QModelIndex& child ) const;
-
-    virtual bool isReadOnly() const { return m_readOnly; }
-    virtual void setReadOnly( bool b ) { m_readOnly = b; }
-
-    virtual QString title() const { return m_title; }
-    virtual void setTitle( const QString& title ) { m_title = title; }
-    virtual QString description() const { return m_description; }
-    virtual void setDescription( const QString& description ) { m_description = description; }
-
-    virtual int trackCount() const { return rowCount( QModelIndex() ); }
-
-    virtual int rowCount( const QModelIndex& parent ) const;
-    virtual int columnCount( const QModelIndex& parent = QModelIndex() ) const;
-
-    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-    virtual QVariant headerData( int section, Qt::Orientation orientation, int role ) const;
-
-    virtual QMimeData* mimeData( const QModelIndexList& indexes ) const;
-    virtual QStringList mimeTypes() const;
-    virtual Qt::DropActions supportedDropActions() const;
-    virtual Qt::ItemFlags flags( const QModelIndex& index ) const;
-
-    virtual QPersistentModelIndex currentItem() { return m_currentIndex; }
-    virtual Tomahawk::QID currentItemUuid() { return m_currentUuid; }
-
-    virtual Tomahawk::PlaylistInterface::RepeatMode repeatMode() const { return Tomahawk::PlaylistInterface::NoRepeat; }
-    virtual bool shuffled() const { return false; }
-
-    virtual void ensureResolved();
-
-    TrackModelItem* itemFromIndex( const QModelIndex& index ) const;
-    /// Returns a flat list of all tracks in this model
-    QList< Tomahawk::query_ptr > queries() const;
-
-signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void trackCountChanged( unsigned int tracks );
-
-    void loadingStarted();
-    void loadingFinished();
-
-public slots:
-    virtual void setCurrentItem( const QModelIndex& index );
-
-    virtual void clear();
-
-    virtual void append( const QList< Tomahawk::query_ptr >& queries );
-    virtual void append( const Tomahawk::query_ptr& query );
-    virtual void append( const Tomahawk::artist_ptr& artist ) { Q_UNUSED( artist ); }
-    virtual void append( const Tomahawk::album_ptr& album ) { Q_UNUSED( album ); }
-
-    virtual void insert( const QList< Tomahawk::query_ptr >& queries, int row = 0 );
-    virtual void insert( const Tomahawk::query_ptr& query, int row = 0 );
-
-    virtual void remove( int row, bool moreToCome = false );
-    virtual void remove( const QModelIndex& index, bool moreToCome = false );
-    virtual void remove( const QList<QModelIndex>& indexes );
-    virtual void remove( const QList<QPersistentModelIndex>& indexes );
-
-    virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode /*mode*/ ) {}
-    virtual void setShuffled( bool /*shuffled*/ ) {}
-
-protected:
-    TrackModelItem* rootItem() const { return m_rootItem; }
-
-private slots:
-    void onPlaybackStarted( const Tomahawk::result_ptr& result );
-    void onPlaybackStopped();
-
-private:
-    Qt::Alignment columnAlignment( int column ) const;
-
-    TrackModelItem* m_rootItem;
-    QPersistentModelIndex m_currentIndex;
-    Tomahawk::QID m_currentUuid;
-
-    bool m_readOnly;
-
-    QString m_title;
-    QString m_description;
-
-    TrackItemStyle m_style;
-};
-
-#endif // TRACKMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackmodelitem.cpp Deleted

@@ -1,124 +0,0 @@
-/* === 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
- *   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 "trackmodelitem.h"
-
-#include "playlist.h"
-#include "query.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-TrackModelItem::~TrackModelItem()
-{
-    // Don't use qDeleteAll here! The children will remove themselves
-    // from the list when they get deleted and the qDeleteAll iterator
-    // will fail badly!
-    if ( parent && index.isValid() )
-    {
-        parent->children.remove( index.row() );
-    }
-
-    for ( int i = children.count() - 1; i >= 0; i-- )
-        delete children.at( i );
-}
-
-
-TrackModelItem::TrackModelItem( TrackModelItem* parent, QAbstractItemModel* model )
-{
-    this->parent = parent;
-    this->model = model;
-    childCount = 0;
-    toberemoved = false;
-    m_isPlaying = false;
-
-    if ( parent )
-    {
-        parent->children.append( this );
-    }
-}
-
-
-TrackModelItem::TrackModelItem( const Tomahawk::query_ptr& query, TrackModelItem* parent, int row )
-    : QObject( parent )
-{
-    setupItem( query, parent, row );
-}
-
-
-TrackModelItem::TrackModelItem( const Tomahawk::plentry_ptr& entry, TrackModelItem* parent, int row )
-    : QObject( parent )
-    , m_entry( entry )
-{
-    setupItem( entry->query(), parent, row );
-}
-
-
-const Tomahawk::plentry_ptr&
-TrackModelItem::entry() const
-{
-    return m_entry;
-}
-
-
-const Tomahawk::query_ptr&
-TrackModelItem::query() const
-{
-    if ( !m_entry.isNull() )
-        return m_entry->query();
-    else
-        return m_query;
-}
-
-
-void
-TrackModelItem::setupItem( const Tomahawk::query_ptr& query, TrackModelItem* parent, int row )
-{
-    this->parent = parent;
-    if ( parent )
-    {
-        if ( row < 0 )
-        {
-            parent->children.append( this );
-            row = parent->children.count() - 1;
-        }
-        else
-        {
-            parent->children.insert( row, this );
-        }
-
-        this->model = parent->model;
-    }
-
-    m_isPlaying = false;
-    toberemoved = false;
-    m_query = query;
-    if ( !query->numResults() )
-    {
-        connect( query.data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ),
-                               SIGNAL( dataChanged() ) );
-
-        connect( query.data(), SIGNAL( resultsRemoved( Tomahawk::result_ptr ) ),
-                               SIGNAL( dataChanged() ) );
-
-        connect( query.data(), SIGNAL( resultsChanged() ),
-                               SIGNAL( dataChanged() ) );
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackmodelitem.h Deleted

@@ -1,66 +0,0 @@
-/* === 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
- *   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 PLITEM_H
-#define PLITEM_H
-
-#include <QHash>
-#include <QVector>
-#include <QPersistentModelIndex>
-#include <QAbstractItemModel>
-
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT TrackModelItem : public QObject
-{
-Q_OBJECT
-
-public:
-    virtual ~TrackModelItem();
-
-    explicit TrackModelItem( TrackModelItem* parent = 0, QAbstractItemModel* model = 0 );
-    explicit TrackModelItem( const Tomahawk::query_ptr& query, TrackModelItem* parent = 0, int row = -1 );
-    explicit TrackModelItem( const Tomahawk::plentry_ptr& entry, TrackModelItem* parent = 0, int row = -1 );
-
-    const Tomahawk::plentry_ptr& entry() const;
-    const Tomahawk::query_ptr& query() const;
-
-    bool isPlaying() { return m_isPlaying; }
-    void setIsPlaying( bool b ) { m_isPlaying = b; emit dataChanged(); }
-
-    TrackModelItem* parent;
-    QVector<TrackModelItem*> children;
-    int childCount;
-    QPersistentModelIndex index;
-    QAbstractItemModel* model;
-    bool toberemoved;
-
-signals:
-    void dataChanged();
-
-private:
-    void setupItem( const Tomahawk::query_ptr& query, TrackModelItem* parent, int row = -1 );
-
-    Tomahawk::plentry_ptr m_entry;
-    Tomahawk::query_ptr m_query;
-    bool m_isPlaying;
-};
-
-#endif // PLITEM_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackproxymodel.cpp Deleted

@@ -1,311 +0,0 @@
-/* === 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
- *   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 "trackproxymodel.h"
-
-#include <QTreeView>
-
-#include "trackproxymodelplaylistinterface.h"
-#include "artist.h"
-#include "album.h"
-#include "query.h"
-#include "utils/logger.h"
-
-
-TrackProxyModel::TrackProxyModel( QObject* parent )
-    : QSortFilterProxyModel( parent )
-    , m_model( 0 )
-    , m_showOfflineResults( true )
-{
-    setFilterCaseSensitivity( Qt::CaseInsensitive );
-    setSortCaseSensitivity( Qt::CaseInsensitive );
-    setDynamicSortFilter( true );
-
-    setSourceTrackModel( 0 );
-}
-
-
-void
-TrackProxyModel::setSourceModel( QAbstractItemModel* model )
-{
-    Q_UNUSED( model );
-    qDebug() << "Explicitly use setSourceTrackModel instead";
-    Q_ASSERT( false );
-}
-
-
-void
-TrackProxyModel::setSourceTrackModel( TrackModel* sourceModel )
-{
-    m_model = sourceModel;
-
-    if ( m_model && m_model->metaObject()->indexOfSignal( "trackCountChanged(uint)" ) > -1 )
-        connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), playlistInterface().data(), SIGNAL( sourceTrackCountChanged( unsigned int ) ) );
-
-    QSortFilterProxyModel::setSourceModel( m_model );
-}
-
-
-bool
-TrackProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
-{
-    TrackModelItem* pi = itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
-    if ( !pi )
-        return false;
-
-    const Tomahawk::query_ptr& q = pi->query();
-    if ( q.isNull() ) // uh oh? filter out invalid queries i guess
-        return false;
-
-    Tomahawk::result_ptr r;
-    if ( q->numResults() )
-        r = q->results().first();
-
-    if ( !m_showOfflineResults && !r.isNull() && !r->isOnline() )
-        return false;
-
-    if ( filterRegExp().isEmpty() )
-        return true;
-
-    QStringList sl = filterRegExp().pattern().split( " ", QString::SkipEmptyParts );
-    foreach( QString s, sl )
-    {
-        s = s.toLower();
-        if ( !r.isNull() )
-        {
-            if ( !r->artist()->name().toLower().contains( s ) &&
-                 !r->album()->name().toLower().contains( s ) &&
-                 !r->track().toLower().contains( s ) )
-            {
-                return false;
-            }
-        }
-        else
-        {
-            if ( !q->artist().toLower().contains( s ) &&
-                 !q->album().toLower().contains( s ) &&
-                 !q->track().toLower().contains( s ) )
-            {
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-
-void
-TrackProxyModel::remove( const QModelIndex& index )
-{
-    if ( !sourceModel() )
-        return;
-    if ( !index.isValid() )
-        return;
-
-    sourceModel()->remove( mapToSource( index ) );
-}
-
-
-void
-TrackProxyModel::remove( const QModelIndexList& indexes )
-{
-    if ( !sourceModel() )
-        return;
-
-    QList<QPersistentModelIndex> pil;
-    foreach ( const QModelIndex& idx, indexes )
-    {
-        if ( idx.isValid() )
-            pil << mapToSource( idx );
-    }
-
-    sourceModel()->remove( pil );
-}
-
-
-void
-TrackProxyModel::remove( const QList< QPersistentModelIndex >& indexes )
-{
-    if ( !sourceModel() )
-        return;
-
-    QList<QPersistentModelIndex> pil;
-    foreach ( const QPersistentModelIndex& idx, indexes )
-    {
-        if ( idx.isValid() )
-            pil << mapToSource( idx );
-    }
-
-    sourceModel()->remove( pil );
-}
-
-
-bool
-TrackProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
-{
-    TrackModelItem* p1 = itemFromIndex( left );
-    TrackModelItem* p2 = itemFromIndex( right );
-
-    if ( !p1 )
-        return true;
-    if ( !p2 )
-        return false;
-
-    const Tomahawk::query_ptr& q1 = p1->query();
-    const Tomahawk::query_ptr& q2 = p2->query();
-
-    QString artist1 = q1->artistSortname();
-    QString artist2 = q2->artistSortname();
-    QString album1 = q1->album();
-    QString album2 = q2->album();
-    QString track1 = q1->track();
-    QString track2 = q2->track();
-    unsigned int albumpos1 = 0, albumpos2 = 0;
-    unsigned int discnumber1 = 0, discnumber2 = 0;
-    unsigned int bitrate1 = 0, bitrate2 = 0;
-    unsigned int mtime1 = 0, mtime2 = 0;
-    unsigned int size1 = 0, size2 = 0;
-    qint64 id1 = 0, id2 = 0;
-
-    if ( q1->numResults() )
-    {
-        const Tomahawk::result_ptr& r = q1->results().at( 0 );
-        artist1 = r->artist()->sortname();
-        album1 = r->album()->name();
-        track1 = r->track();
-        albumpos1 = r->albumpos();
-        discnumber1 = qMax( 1, (int)r->discnumber() );
-        bitrate1 = r->bitrate();
-        mtime1 = r->modificationTime();
-        id1 = r->trackId();
-        size1 = r->size();
-    }
-    if ( q2->numResults() )
-    {
-        const Tomahawk::result_ptr& r = q2->results().at( 0 );
-        artist2 = r->artist()->sortname();
-        album2 = r->album()->name();
-        track2 = r->track();
-        albumpos2 = r->albumpos();
-        discnumber2 = qMax( 1, (int)r->discnumber() );
-        bitrate2 = r->bitrate();
-        mtime2 = r->modificationTime();
-        id2 = r->trackId();
-        size2 = r->size();
-    }
-
-    // This makes it a stable sorter and prevents items from randomly jumping about.
-    if ( id1 == id2 )
-    {
-        id1 = (qint64)&q1;
-        id2 = (qint64)&q2;
-    }
-
-    if ( left.column() == TrackModel::Artist ) // sort by artist
-    {
-        if ( artist1 == artist2 )
-        {
-            if ( album1 == album2 )
-            {
-                if ( discnumber1 == discnumber2 )
-                {
-                    if ( albumpos1 == albumpos2 )
-                        return id1 < id2;
-
-                    return albumpos1 < albumpos2;
-                }
-
-                return discnumber1 < discnumber2;
-            }
-
-            return QString::localeAwareCompare( album1, album2 ) < 0;
-        }
-
-        return QString::localeAwareCompare( artist1, artist2 ) < 0;
-    }
-    else if ( left.column() == TrackModel::Album ) // sort by album
-    {
-        if ( album1 == album2 )
-        {
-            if ( discnumber1 == discnumber2 )
-            {
-                if ( albumpos1 == albumpos2 )
-                    return id1 < id2;
-
-                return albumpos1 < albumpos2;
-            }
-
-            return discnumber1 < discnumber2;
-        }
-
-        return QString::localeAwareCompare( album1, album2 ) < 0;
-    }
-    else if ( left.column() == TrackModel::Bitrate ) // sort by bitrate
-    {
-        if ( bitrate1 == bitrate2 )
-            return id1 < id2;
-
-        return bitrate1 < bitrate2;
-    }
-    else if ( left.column() == TrackModel::Age ) // sort by mtime
-    {
-        if ( mtime1 == mtime2 )
-            return id1 < id2;
-
-        return mtime1 < mtime2;
-    }
-    else if ( left.column() == TrackModel::Filesize ) // sort by file size
-    {
-        if ( size1 == size2 )
-            return id1 < id2;
-
-        return size1 < size2;
-    }
-    else if ( left.column() == TrackModel::AlbumPos ) // sort by album pos
-    {
-        if ( discnumber1 != discnumber2 )
-        {
-            return discnumber1 < discnumber2;
-        }
-        else
-        {
-            if ( albumpos1 != albumpos2 )
-                return albumpos1 < albumpos2;
-        }
-    }
-
-    const QString& lefts = sourceModel()->data( left ).toString();
-    const QString& rights = sourceModel()->data( right ).toString();
-    if ( lefts == rights )
-        return id1 < id2;
-
-    return QString::localeAwareCompare( lefts, rights ) < 0;
-}
-
-
-Tomahawk::playlistinterface_ptr
-TrackProxyModel::playlistInterface()
-{
-    if ( m_playlistInterface.isNull() )
-    {
-        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::TrackProxyModelPlaylistInterface( this ) );
-    }
-
-    return m_playlistInterface;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackproxymodel.h Deleted

@@ -1,69 +0,0 @@
-/* === 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
- *   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 TRACKPROXYMODEL_H
-#define TRACKPROXYMODEL_H
-
-#include <QtGui/QSortFilterProxyModel>
-
-#include "playlistinterface.h"
-#include "playlist/trackmodel.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT TrackProxyModel : public QSortFilterProxyModel
-{
-Q_OBJECT
-
-public:
-    explicit TrackProxyModel ( QObject* parent = 0 );
-    virtual ~TrackProxyModel() {}
-
-    virtual TrackModel* sourceModel() const { return m_model; }
-    virtual void setSourceTrackModel( TrackModel* sourceModel );
-    virtual void setSourceModel( QAbstractItemModel* model );
-
-    virtual QPersistentModelIndex currentIndex() const { return mapFromSource( m_model->currentItem() ); }
-    virtual void setCurrentIndex( const QModelIndex& index ) { m_model->setCurrentItem( mapToSource( index ) ); }
-
-    virtual void remove( const QModelIndex& index );
-    virtual void remove( const QModelIndexList& indexes );
-    virtual void remove( const QList< QPersistentModelIndex >& indexes );
-
-    virtual bool showOfflineResults() const { return m_showOfflineResults; }
-    virtual void setShowOfflineResults( bool b ) { m_showOfflineResults = b; }
-
-    virtual void emitFilterChanged( const QString &pattern ) { emit filterChanged( pattern ); }
-
-    virtual TrackModelItem* itemFromIndex( const QModelIndex& index ) const { return sourceModel()->itemFromIndex( index ); }
-
-    virtual Tomahawk::playlistinterface_ptr playlistInterface();
-
-signals:
-    void filterChanged( const QString& filter );
-
-protected:
-    virtual bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const;
-    virtual bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
-
-    TrackModel* m_model;
-    bool m_showOfflineResults;
-    Tomahawk::playlistinterface_ptr m_playlistInterface;
-};
-
-#endif // TRACKPROXYMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackproxymodelplaylistinterface.cpp Deleted

@@ -1,193 +0,0 @@
-/* === 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
- *   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 "trackproxymodelplaylistinterface.h"
-
-#include "trackproxymodel.h"
-#include "artist.h"
-#include "album.h"
-#include "query.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-TrackProxyModelPlaylistInterface::TrackProxyModelPlaylistInterface( TrackProxyModel* proxyModel )
-    : PlaylistInterface()
-    , m_proxyModel( proxyModel )
-    , m_repeatMode( PlaylistInterface::NoRepeat )
-    , m_shuffled( false )
-{
-}
-
-
-TrackProxyModelPlaylistInterface::~TrackProxyModelPlaylistInterface()
-{
-    m_proxyModel.clear();
-}
-
-
-int
-TrackProxyModelPlaylistInterface::unfilteredTrackCount() const
-{
-    return ( m_proxyModel.isNull() ? 0 : m_proxyModel.data()->sourceModel()->trackCount() );
-}
-
-
-int
-TrackProxyModelPlaylistInterface::trackCount() const
-{
-    return ( m_proxyModel.isNull() ? 0 : m_proxyModel.data()->rowCount( QModelIndex() ) );
-}
-
-
-QString
-TrackProxyModelPlaylistInterface::filter() const
-{
-    return ( m_proxyModel.isNull() ? QString() : m_proxyModel.data()->filterRegExp().pattern() );
-}
-
-
-void
-TrackProxyModelPlaylistInterface::setFilter( const QString& pattern )
-{
-    if ( m_proxyModel.isNull() )
-        return;
-
-    m_proxyModel.data()->setFilterRegExp( pattern );
-    m_proxyModel.data()->emitFilterChanged( pattern );
-
-    emit trackCountChanged( trackCount() );
-}
-
-
-QList< Tomahawk::query_ptr >
-TrackProxyModelPlaylistInterface::tracks()
-{
-    if ( m_proxyModel.isNull() )
-        return QList< Tomahawk::query_ptr >();
-
-    TrackProxyModel* proxyModel = m_proxyModel.data();
-    QList<Tomahawk::query_ptr> queries;
-
-    for ( int i = 0; i < proxyModel->rowCount( QModelIndex() ); i++ )
-    {
-        TrackModelItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( proxyModel->index( i, 0 ) ) );
-        if ( item )
-            queries << item->query();
-    }
-
-    return queries;
-}
-
-
-Tomahawk::result_ptr
-TrackProxyModelPlaylistInterface::siblingItem( int itemsAway )
-{
-    return siblingItem( itemsAway, false );
-}
-
-
-bool
-TrackProxyModelPlaylistInterface::hasNextItem()
-{
-    return !( siblingItem( 1, true ).isNull() );
-}
-
-
-Tomahawk::result_ptr
-TrackProxyModelPlaylistInterface::siblingItem( int itemsAway, bool readOnly )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( m_proxyModel.isNull() )
-        return Tomahawk::result_ptr();
-
-    TrackProxyModel* proxyModel = m_proxyModel.data();
-
-    QModelIndex idx = proxyModel->index( 0, 0 );
-    if ( proxyModel->rowCount() )
-    {
-        if ( m_shuffled )
-        {
-            // random mode is enabled
-            // TODO come up with a clever random logic, that keeps track of previously played items
-            idx = proxyModel->index( qrand() % proxyModel->rowCount(), 0 );
-        }
-        else if ( proxyModel->currentIndex().isValid() )
-        {
-            idx = proxyModel->currentIndex();
-
-            // random mode is disabled
-            if ( m_repeatMode != PlaylistInterface::RepeatOne )
-            {
-                // keep progressing through the playlist normally
-                idx = proxyModel->index( idx.row() + itemsAway, 0 );
-            }
-        }
-    }
-
-    if ( !idx.isValid() && m_repeatMode == PlaylistInterface::RepeatAll )
-    {
-        // repeat all tracks
-        if ( itemsAway > 0 )
-        {
-            // reset to first item
-            idx = proxyModel->index( 0, 0 );
-        }
-        else
-        {
-            // reset to last item
-            idx = proxyModel->index( proxyModel->rowCount() - 1, 0 );
-        }
-    }
-
-    // Try to find the next available PlaylistItem (with results)
-    while ( idx.isValid() )
-    {
-        TrackModelItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( idx ) );
-        if ( item && item->query()->playable() )
-        {
-            qDebug() << "Next PlaylistItem found:" << item->query()->toString() << item->query()->results().at( 0 )->url();
-            if ( !readOnly )
-                proxyModel->setCurrentIndex( idx );
-            return item->query()->results().at( 0 );
-        }
-
-        idx = proxyModel->index( idx.row() + ( itemsAway > 0 ? 1 : -1 ), 0 );
-    }
-
-    if ( !readOnly )
-        proxyModel->setCurrentIndex( QModelIndex() );
-    return Tomahawk::result_ptr();
-}
-
-
-Tomahawk::result_ptr
-TrackProxyModelPlaylistInterface::currentItem() const
-{
-    if ( m_proxyModel.isNull() )
-        return Tomahawk::result_ptr();
-
-    TrackProxyModel* proxyModel = m_proxyModel.data();
-
-    TrackModelItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( proxyModel->currentIndex() ) );
-    if ( item && !item->query().isNull() && item->query()->playable() )
-        return item->query()->results().at( 0 );
-    return Tomahawk::result_ptr();
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackproxymodelplaylistinterface.h Deleted

@@ -1,69 +0,0 @@
-/* === 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
- *   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 TRACKPROXYMODELPLAYLISTINTERFACE_H
-#define TRACKPROXYMODELPLAYLISTINTERFACE_H
-
-#include <QtGui/QSortFilterProxyModel>
-
-#include "playlistinterface.h"
-#include "playlist/trackmodel.h"
-
-#include "dllmacro.h"
-
-class TrackProxyModel;
-
-namespace Tomahawk {
-
-class DLLEXPORT TrackProxyModelPlaylistInterface : public Tomahawk::PlaylistInterface
-{
-Q_OBJECT
-
-public:
-    explicit TrackProxyModelPlaylistInterface( TrackProxyModel* proxyModel );
-    virtual ~TrackProxyModelPlaylistInterface();
-
-    virtual QList<Tomahawk::query_ptr> tracks();
-
-    virtual int unfilteredTrackCount() const;
-    virtual int trackCount() const;
-
-    virtual Tomahawk::result_ptr currentItem() const;
-    virtual Tomahawk::result_ptr siblingItem( int itemsAway );
-    virtual Tomahawk::result_ptr siblingItem( int itemsAway, bool readOnly );
-    virtual bool hasNextItem();
-
-    virtual QString filter() const;
-    virtual void setFilter( const QString& pattern );
-
-    virtual PlaylistInterface::RepeatMode repeatMode() const { return m_repeatMode; }
-    virtual bool shuffled() const { return m_shuffled; }
-
-public slots:
-    virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
-    virtual void setShuffled( bool enabled ) { m_shuffled = enabled; emit shuffleModeChanged( enabled ); }
-
-protected:
-    QWeakPointer< TrackProxyModel > m_proxyModel;
-    RepeatMode m_repeatMode;
-    bool m_shuffled;
-};
-
-} //ns
-
-#endif // TRACKPROXYMODELPLAYLISTINTERFACE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackview.cpp Deleted

@@ -1,635 +0,0 @@
-/* === 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
- *   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 "trackview.h"
-
-#include <QKeyEvent>
-#include <QPainter>
-#include <QScrollBar>
-
-#include "trackheader.h"
-#include "viewmanager.h"
-#include "trackmodel.h"
-#include "trackproxymodel.h"
-#include "audio/audioengine.h"
-#include "context/ContextWidget.h"
-#include "widgets/overlaywidget.h"
-#include "dynamic/widgets/LoadingSpinner.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "utils/closure.h"
-#include "dropjob.h"
-#include "artist.h"
-#include "album.h"
-
-using namespace Tomahawk;
-
-
-TrackView::TrackView( QWidget* parent )
-    : QTreeView( parent )
-    , m_model( 0 )
-    , m_proxyModel( 0 )
-    , m_delegate( 0 )
-    , m_header( new TrackHeader( this ) )
-    , m_overlay( new OverlayWidget( this ) )
-    , m_loadingSpinner( new LoadingSpinner( this ) )
-    , m_resizing( false )
-    , m_dragging( false )
-    , m_updateContextView( true )
-    , m_contextMenu( new ContextMenu( this ) )
-{
-    setMouseTracking( true );
-    setAlternatingRowColors( true );
-    setSelectionMode( QAbstractItemView::ExtendedSelection );
-    setSelectionBehavior( QAbstractItemView::SelectRows );
-    setDragEnabled( true );
-    setDropIndicatorShown( false );
-    setDragDropMode( QAbstractItemView::InternalMove );
-    setDragDropOverwriteMode( false );
-    setAllColumnsShowFocus( true );
-    setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
-    setRootIsDecorated( false );
-    setUniformRowHeights( true );
-
-    setHeader( m_header );
-    setSortingEnabled( true );
-    sortByColumn( -1 );
-    setContextMenuPolicy( Qt::CustomContextMenu );
-
-#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
-
-    connect( this, SIGNAL( doubleClicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
-    connect( this, SIGNAL( customContextMenuRequested( const QPoint& ) ), SLOT( onCustomContextMenu( const QPoint& ) ) );
-    connect( m_contextMenu, SIGNAL( triggered( int ) ), SLOT( onMenuTriggered( int ) ) );
-}
-
-
-TrackView::~TrackView()
-{
-    tDebug() << Q_FUNC_INFO;
-}
-
-
-void
-TrackView::setGuid( const QString& guid )
-{
-    m_guid = guid;
-    m_header->setGuid( guid );
-}
-
-
-void
-TrackView::setProxyModel( TrackProxyModel* model )
-{
-    m_proxyModel = model;
-
-    m_delegate = new PlaylistItemDelegate( this, m_proxyModel );
-    setItemDelegate( m_delegate );
-
-    QTreeView::setModel( m_proxyModel );
-}
-
-
-void
-TrackView::setModel( QAbstractItemModel* model )
-{
-    Q_UNUSED( model );
-    tDebug() << "Explicitly use setTrackModel instead";
-    Q_ASSERT( false );
-}
-
-
-void
-TrackView::setTrackModel( TrackModel* model )
-{
-    m_model = model;
-
-    if ( m_proxyModel )
-    {
-        m_proxyModel->setSourceTrackModel( m_model );
-    }
-
-    connect( m_model, SIGNAL( loadingStarted() ), m_loadingSpinner, SLOT( fadeIn() ) );
-    connect( m_model, SIGNAL( loadingFinished() ), m_loadingSpinner, SLOT( fadeOut() ) );
-
-    connect( m_proxyModel, SIGNAL( filterChanged( QString ) ), SLOT( onFilterChanged( QString ) ) );
-
-    setAcceptDrops( true );
-
-    if ( model->style() == TrackModel::Short || model->style() == TrackModel::ShortWithAvatars )
-    {
-        setHeaderHidden( true );
-        setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-    }
-    else
-    {
-        setHeaderHidden( false );
-        setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
-    }
-}
-
-
-void
-TrackView::startPlayingFromStart()
-{
-    if ( m_proxyModel->rowCount() == 0 )
-        return;
-
-    const QModelIndex index = m_proxyModel->index( 0, 0 );
-    startAutoPlay( index );
-}
-
-
-void
-TrackView::autoPlayResolveFinished( const query_ptr& query, int row )
-{
-    Q_ASSERT( !query.isNull() );
-    Q_ASSERT( row >= 0 );
-
-    if ( query.isNull() || row < 0  || query != m_autoPlaying )
-        return;
-
-    const QModelIndex index = m_proxyModel->index( row, 0 );
-    if ( query->playable() )
-    {
-        onItemActivated( index );
-        return;
-    }
-
-    // Try the next one..
-    const QModelIndex sib = index.sibling( index.row() + 1, index.column() );
-    if ( sib.isValid() )
-        startAutoPlay( sib );
-
-}
-
-
-void
-TrackView::currentChanged( const QModelIndex& current, const QModelIndex& previous )
-{
-    QTreeView::currentChanged( current, previous );
-
-    if ( !m_updateContextView )
-        return;
-
-    TrackModelItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( current ) );
-    if ( item )
-    {
-        ViewManager::instance()->context()->setQuery( item->query() );
-    }
-}
-
-
-void
-TrackView::onItemActivated( const QModelIndex& index )
-{
-    if ( !index.isValid() )
-        return;
-
-    tryToPlayItem( index );
-    emit itemActivated( index );
-}
-
-
-void
-TrackView::startAutoPlay( const QModelIndex& index )
-{
-    if ( tryToPlayItem( index ) )
-        return;
-
-    // item isn't playable but still resolving
-    TrackModelItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
-    if ( item && !item->query().isNull() && !item->query()->resolvingFinished() )
-    {
-        m_autoPlaying = item->query(); // So we can kill it if user starts autoplaying this playlist again
-        NewClosure( item->query().data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( autoPlayResolveFinished( Tomahawk::query_ptr, int ) ),
-                    item->query(), index.row() );
-        return;
-    }
-
-    // not playable at all, try next
-    const QModelIndex sib = index.sibling( index.row() + 1, index.column() );
-    if ( sib.isValid() )
-        startAutoPlay( sib );
-}
-
-
-bool
-TrackView::tryToPlayItem( const QModelIndex& index )
-{
-    TrackModelItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
-    if ( item && !item->query().isNull() && item->query()->numResults() )
-    {
-        tDebug() << "Result activated:" << item->query()->toString() << item->query()->results().first()->url();
-        m_proxyModel->setCurrentIndex( index );
-        AudioEngine::instance()->playItem( m_proxyModel->playlistInterface(), item->query()->results().first() );
-
-        return true;
-    }
-
-    return false;
-}
-
-
-void
-TrackView::keyPressEvent( QKeyEvent* event )
-{
-    QTreeView::keyPressEvent( event );
-
-    if ( !model() )
-        return;
-
-    if ( event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return )
-    {
-        onItemActivated( currentIndex() );
-    }
-}
-
-
-void
-TrackView::onItemResized( const QModelIndex& index )
-{
-    tDebug() << Q_FUNC_INFO;
-    m_delegate->updateRowSize( index );
-}
-
-
-void
-TrackView::playItem()
-{
-    onItemActivated( m_contextMenuIndex );
-}
-
-
-void
-TrackView::resizeEvent( QResizeEvent* event )
-{
-    QTreeView::resizeEvent( event );
-
-    int sortSection = m_header->sortIndicatorSection();
-    Qt::SortOrder sortOrder = m_header->sortIndicatorOrder();
-
-    if ( m_header->checkState() && sortSection >= 0 )
-    {
-        // restoreState keeps overwriting our previous sort-order
-        sortByColumn( sortSection, sortOrder );
-    }
-
-    if ( !model() )
-        return;
-
-    if ( model()->columnCount() == 1 )
-    {
-        m_header->resizeSection( 0, event->size().width() );
-    }
-}
-
-
-void
-TrackView::dragEnterEvent( QDragEnterEvent* event )
-{
-    tDebug() << Q_FUNC_INFO;
-    QTreeView::dragEnterEvent( event );
-
-    if ( DropJob::acceptsMimeData( event->mimeData() ) )
-    {
-        m_dragging = true;
-        m_dropRect = QRect();
-
-        event->acceptProposedAction();
-    }
-}
-
-
-void
-TrackView::dragMoveEvent( QDragMoveEvent* event )
-{
-    QTreeView::dragMoveEvent( event );
-
-    if ( model()->isReadOnly() )
-    {
-        event->ignore();
-        return;
-    }
-
-    if ( DropJob::acceptsMimeData( event->mimeData() ) )
-    {
-        setDirtyRegion( m_dropRect );
-        const QPoint pos = event->pos();
-        QModelIndex index = indexAt( pos );
-        bool pastLast = false;
-
-        if ( !index.isValid() && proxyModel()->rowCount( QModelIndex() ) > 0 )
-        {
-            index = proxyModel()->index( proxyModel()->rowCount( QModelIndex() ) - 1, 0, QModelIndex() );
-            pastLast = true;
-        }
-
-        if ( index.isValid() )
-        {
-            const QRect rect = visualRect( index );
-            m_dropRect = rect;
-
-            // indicate that the item will be inserted above the current place
-            const int gap = 5; // FIXME constant
-            int yHeight = ( pastLast ? rect.bottom() : rect.top() ) - gap / 2;
-            m_dropRect = QRect( 0, yHeight, width(), gap );
-
-            event->acceptProposedAction();
-        }
-
-        setDirtyRegion( m_dropRect );
-    }
-}
-
-
-void
-TrackView::dropEvent( QDropEvent* event )
-{
-    QTreeView::dropEvent( event );
-
-    if ( event->isAccepted() )
-    {
-        tDebug() << "Ignoring accepted event!";
-    }
-    else
-    {
-        if ( DropJob::acceptsMimeData( event->mimeData()) )
-        {
-            const QPoint pos = event->pos();
-            const QModelIndex index = indexAt( pos );
-
-            tDebug() << Q_FUNC_INFO << "Drop Event accepted at row:" << index.row();
-            event->acceptProposedAction();
-
-            if ( !model()->isReadOnly() )
-            {
-                model()->dropMimeData( event->mimeData(), event->proposedAction(), index.row(), 0, index.parent() );
-            }
-        }
-    }
-
-    m_dragging = false;
-}
-
-
-void
-TrackView::paintEvent( QPaintEvent* event )
-{
-    QTreeView::paintEvent( event );
-    QPainter painter( viewport() );
-
-    if ( m_dragging )
-    {
-        // draw drop indicator
-        {
-            // draw indicator for inserting items
-            QBrush blendedBrush = viewOptions().palette.brush( QPalette::Normal, QPalette::Highlight );
-            QColor color = blendedBrush.color();
-
-            const int y = ( m_dropRect.top() + m_dropRect.bottom() ) / 2;
-            const int thickness = m_dropRect.height() / 2;
-
-            int alpha = 255;
-            const int alphaDec = alpha / ( thickness + 1 );
-            for ( int i = 0; i < thickness; i++ )
-            {
-                color.setAlpha( alpha );
-                alpha -= alphaDec;
-                painter.setPen( color );
-                painter.drawLine( 0, y - i, width(), y - i );
-                painter.drawLine( 0, y + i, width(), y + i );
-            }
-        }
-    }
-}
-
-
-void
-TrackView::onFilterChanged( const QString& )
-{
-    if ( selectedIndexes().count() )
-        scrollTo( selectedIndexes().at( 0 ), QAbstractItemView::PositionAtCenter );
-
-    if ( !proxyModel()->playlistInterface()->filter().isEmpty() && !proxyModel()->playlistInterface()->trackCount() && model()->trackCount() )
-    {
-        m_overlay->setText( tr( "Sorry, your filter '%1' did not match any results." ).arg( proxyModel()->playlistInterface()->filter() ) );
-        m_overlay->show();
-    }
-    else
-        if ( model()->trackCount() )
-            m_overlay->hide();
-}
-
-
-void
-TrackView::startDrag( Qt::DropActions supportedActions )
-{
-    QList<QPersistentModelIndex> pindexes;
-    QModelIndexList indexes;
-    foreach( const QModelIndex& idx, selectedIndexes() )
-    {
-        if ( ( m_proxyModel->flags( idx ) & Qt::ItemIsDragEnabled ) )
-        {
-            indexes << idx;
-            pindexes << idx;
-        }
-    }
-
-    if ( indexes.count() == 0 )
-        return;
-
-    tDebug() << "Dragging" << indexes.count() << "indexes";
-    QMimeData* data = m_proxyModel->mimeData( indexes );
-    if ( !data )
-        return;
-
-    QDrag* drag = new QDrag( this );
-    drag->setMimeData( data );
-    const QPixmap p = TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeTrack, indexes.count() );
-    drag->setPixmap( p );
-    drag->setHotSpot( QPoint( -20, -20 ) );
-
-    Qt::DropAction action = drag->exec( supportedActions, Qt::CopyAction );
-    if ( action == Qt::MoveAction )
-    {
-        m_proxyModel->remove( pindexes );
-    }
-}
-
-
-void
-TrackView::onCustomContextMenu( const QPoint& pos )
-{
-    m_contextMenu->clear();
-
-    QModelIndex idx = indexAt( pos );
-    idx = idx.sibling( idx.row(), 0 );
-    setContextMenuIndex( idx );
-
-    if ( !idx.isValid() )
-        return;
-
-    if ( model() && !model()->isReadOnly() )
-        m_contextMenu->setSupportedActions( m_contextMenu->supportedActions() | ContextMenu::ActionDelete );
-
-    QList<query_ptr> queries;
-    foreach ( const QModelIndex& index, selectedIndexes() )
-    {
-        if ( index.column() )
-            continue;
-
-        TrackModelItem* item = proxyModel()->itemFromIndex( proxyModel()->mapToSource( index ) );
-        if ( item && !item->query().isNull() )
-            queries << item->query();
-    }
-
-    m_contextMenu->setQueries( queries );
-    m_contextMenu->exec( mapToGlobal( pos ) );
-}
-
-
-void
-TrackView::onMenuTriggered( int action )
-{
-    switch ( action )
-    {
-        case ContextMenu::ActionPlay:
-            onItemActivated( m_contextMenuIndex );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-TrackView::updateHoverIndex( const QPoint& pos )
-{
-    QModelIndex idx = indexAt( pos );
-
-    if ( idx != m_hoveredIndex )
-    {
-        m_hoveredIndex = idx;
-        repaint();
-    }
-
-    if ( !m_model || m_model->style() == TrackModel::Short || m_model->style() == TrackModel::ShortWithAvatars )
-        return;
-
-    if ( idx.column() == TrackModel::Artist || idx.column() == TrackModel::Album )
-    {
-        if ( pos.x() > header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) - 16 &&
-             pos.x() < header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) )
-        {
-            setCursor( Qt::PointingHandCursor );
-            return;
-        }
-    }
-
-    if ( cursor().shape() != Qt::ArrowCursor )
-        setCursor( Qt::ArrowCursor );
-}
-
-
-void
-TrackView::wheelEvent( QWheelEvent* event )
-{
-    QTreeView::wheelEvent( event );
-
-    if ( m_hoveredIndex.isValid() )
-    {
-        m_hoveredIndex = QModelIndex();
-        repaint();
-    }
-}
-
-
-void
-TrackView::leaveEvent( QEvent* event )
-{
-    QTreeView::leaveEvent( event );
-    updateHoverIndex( QPoint( -1, -1 ) );
-}
-
-
-void
-TrackView::mouseMoveEvent( QMouseEvent* event )
-{
-    QTreeView::mouseMoveEvent( event );
-    updateHoverIndex( event->pos() );
-}
-
-
-void
-TrackView::mousePressEvent( QMouseEvent* event )
-{
-    QTreeView::mousePressEvent( event );
-
-    if ( !m_model || m_model->style() != TrackModel::Detailed )
-        return;
-
-    QModelIndex idx = indexAt( event->pos() );
-    if ( event->pos().x() > header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) - 16 &&
-         event->pos().x() < header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) )
-    {
-        TrackModelItem* item = proxyModel()->itemFromIndex( proxyModel()->mapToSource( idx ) );
-        switch ( idx.column() )
-        {
-            case TrackModel::Artist:
-            {
-                if ( item->query()->results().count() )
-                {
-                    ViewManager::instance()->show( item->query()->results().first()->artist() );
-                }
-                else
-                {
-                    ViewManager::instance()->show( Artist::get( item->query()->artist() ) );
-                }
-                break;
-            }
-
-            case TrackModel::Album:
-            {
-                if ( item->query()->results().count() )
-                {
-                    ViewManager::instance()->show( item->query()->results().first()->album() );
-                }
-                else
-                {
-                    artist_ptr artist = Artist::get( item->query()->artist() );
-                    ViewManager::instance()->show( Album::get( artist, item->query()->album() ) );
-                }
-                break;
-            }
-
-            default:
-                break;
-        }
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/trackview.h Deleted

@@ -1,133 +0,0 @@
-/* === 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
- *   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 TRACKVIEW_H
-#define TRACKVIEW_H
-
-#include <QtGui/QTreeView>
-#include <QtGui/QSortFilterProxyModel>
-
-#include "contextmenu.h"
-#include "playlistitemdelegate.h"
-
-#include "dllmacro.h"
-
-class QAction;
-class LoadingSpinner;
-class TrackHeader;
-class TrackModel;
-class TrackProxyModel;
-class OverlayWidget;
-
-class DLLEXPORT TrackView : public QTreeView
-{
-Q_OBJECT
-
-public:
-    explicit TrackView( QWidget* parent = 0 );
-    ~TrackView();
-
-    virtual QString guid() const { return m_guid; }
-    virtual void setGuid( const QString& guid );
-
-    virtual void setTrackModel( TrackModel* model );
-    virtual void setModel( QAbstractItemModel* model );
-    void setProxyModel( TrackProxyModel* model );
-
-    virtual TrackModel* model() const { return m_model; }
-    TrackProxyModel* proxyModel() const { return m_proxyModel; }
-    PlaylistItemDelegate* delegate() const { return m_delegate; }
-    TrackHeader* header() const { return m_header; }
-    OverlayWidget* overlay() const { return m_overlay; }
-    Tomahawk::ContextMenu* contextMenu() const { return m_contextMenu; }
-    LoadingSpinner* loadingSpinner() const { return m_loadingSpinner; }
-
-    QModelIndex hoveredIndex() const { return m_hoveredIndex; }
-    QModelIndex contextMenuIndex() const { return m_contextMenuIndex; }
-    void setContextMenuIndex( const QModelIndex& idx ) { m_contextMenuIndex = idx; }
-
-    bool updatesContextView() const { return m_updateContextView; }
-    void setUpdatesContextView( bool b ) { m_updateContextView = b; }
-
-    // Starts playing from the beginning if resolved, or waits until a track is playable
-    void startPlayingFromStart();
-
-public slots:
-    virtual void onItemActivated( const QModelIndex& index );
-
-    void playItem();
-    void onMenuTriggered( int action );
-
-signals:
-    void itemActivated( const QModelIndex& index );
-
-protected:
-    virtual void resizeEvent( QResizeEvent* event );
-
-    virtual void startDrag( Qt::DropActions supportedActions );
-    virtual void dragEnterEvent( QDragEnterEvent* event );
-    virtual void dragLeaveEvent( QDragLeaveEvent* /*event*/ ) { m_dragging = false; setDirtyRegion( m_dropRect ); }
-    virtual void dragMoveEvent( QDragMoveEvent* event );
-    virtual void dropEvent( QDropEvent* event );
-
-    void wheelEvent( QWheelEvent* event );
-    void mouseMoveEvent( QMouseEvent* event );
-    void mousePressEvent( QMouseEvent* event );
-    void leaveEvent( QEvent* event );
-    void paintEvent( QPaintEvent* event );
-    void keyPressEvent( QKeyEvent* event );
-
-protected slots:
-    virtual void currentChanged( const QModelIndex& current, const QModelIndex& previous );
-
-private slots:
-    void onItemResized( const QModelIndex& index );
-    void onFilterChanged( const QString& filter );
-
-    void onCustomContextMenu( const QPoint& pos );
-
-    void autoPlayResolveFinished( const Tomahawk::query_ptr& query, int row  );
-
-private:
-    void startAutoPlay( const QModelIndex& index );
-    bool tryToPlayItem( const QModelIndex& index );
-    void updateHoverIndex( const QPoint& pos );
-
-    QString m_guid;
-    TrackModel* m_model;
-    TrackProxyModel* m_proxyModel;
-    PlaylistItemDelegate* m_delegate;
-    TrackHeader* m_header;
-    OverlayWidget* m_overlay;
-    LoadingSpinner* m_loadingSpinner;
-
-    bool m_resizing;
-    bool m_dragging;
-    QRect m_dropRect;
-
-    bool m_updateContextView;
-
-    QModelIndex m_hoveredIndex;
-    QModelIndex m_contextMenuIndex;
-
-    Tomahawk::query_ptr m_autoPlaying;
-
-    Tomahawk::ContextMenu* m_contextMenu;
-};
-
-#endif // TRACKVIEW_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treeheader.cpp Deleted

@@ -1,38 +0,0 @@
-/* === 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
- *   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 "treeheader.h"
-
-#include "playlist/artistview.h"
-#include "utils/logger.h"
-
-
-TreeHeader::TreeHeader( ArtistView* parent )
-    : ViewHeader( parent )
-    , m_parent( parent )
-{
-    QList< double > columnWeights;
-    columnWeights << 0.42 << 0.12 << 0.07 << 0.07 << 0.07 << 0.07 << 0.07; // << 0.11;
-
-    setDefaultColumnWeights( columnWeights );
-}
-
-
-TreeHeader::~TreeHeader()
-{
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treeheader.h Deleted

@@ -1,39 +0,0 @@
-/* === 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
- *   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 TREEHEADER_H
-#define TREEHEADER_H
-
-#include "ViewHeader.h"
-#include "dllmacro.h"
-
-class ArtistView;
-
-class DLLEXPORT TreeHeader : public ViewHeader
-{
-Q_OBJECT
-
-public:
-    explicit TreeHeader( ArtistView* parent = 0 );
-    ~TreeHeader();
-
-private:
-    ArtistView* m_parent;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treeitemdelegate.cpp Deleted

@@ -1,179 +0,0 @@
-/* === 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
- *   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 "treeitemdelegate.h"
-
-#include <QApplication>
-#include <QPainter>
-#include <QAbstractItemView>
-#include <QHeaderView>
-
-#include "query.h"
-#include "result.h"
-
-#include "utils/tomahawkutilsgui.h"
-#include "utils/logger.h"
-
-#include "treemodelitem.h"
-#include "treeproxymodel.h"
-#include "artistview.h"
-
-
-TreeItemDelegate::TreeItemDelegate( ArtistView* parent, TreeProxyModel* proxy )
-    : QStyledItemDelegate( (QObject*)parent )
-    , m_view( parent )
-    , m_model( proxy )
-{
-    m_nowPlayingIcon = QPixmap( RESPATH "images/now-playing-speaker.png" );
-    m_defaultAlbumCover = QPixmap( RESPATH "images/no-album-no-case.png" );
-    m_defaultArtistImage = QPixmap( RESPATH "images/no-artist-image-placeholder.png" );
-}
-
-
-QSize
-TreeItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QSize size = QStyledItemDelegate::sizeHint( option, index );
-    return size;
-}
-
-
-void
-TreeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    TreeModelItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( index ) );
-    if ( !item )
-        return;
-
-    QString text;
-    if ( !item->artist().isNull() )
-    {
-        text = item->artist()->name();
-    }
-    else if ( !item->album().isNull() )
-    {
-        text = item->album()->name();
-    }
-    else if ( !item->result().isNull() || !item->query().isNull() )
-    {
-        float opacity = item->result().isNull() ? 0.0 : item->result()->score();
-        opacity = qMax( (float)0.3, opacity );
-        QColor textColor = TomahawkUtils::alphaBlend( option.palette.color( QPalette::Foreground ), option.palette.color( QPalette::Background ), opacity );
-
-        {
-            QStyleOptionViewItemV4 o = option;
-            initStyleOption( &o, QModelIndex() );
-
-            painter->save();
-            o.palette.setColor( QPalette::Text, textColor );
-
-            if ( o.state & QStyle::State_Selected && o.state & QStyle::State_Active )
-            {
-                o.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) );
-            }
-
-            if ( item->isPlaying() )
-            {
-                o.palette.setColor( QPalette::Highlight, o.palette.color( QPalette::Mid ) );
-                if ( o.state & QStyle::State_Selected )
-                    o.palette.setColor( QPalette::Text, textColor );
-                o.state |= QStyle::State_Selected;
-            }
-
-            int oldX = 0;
-            if ( m_view->header()->visualIndex( index.column() ) == 0 )
-            {
-                oldX = o.rect.x();
-                o.rect.setX( 0 );
-            }
-            qApp->style()->drawControl( QStyle::CE_ItemViewItem, &o, painter );
-            if ( oldX > 0 )
-                o.rect.setX( oldX );
-
-            {
-                QRect r = o.rect.adjusted( 3, 0, 0, 0 );
-
-                // Paint Now Playing Speaker Icon
-                if ( item->isPlaying() && m_view->header()->visualIndex( index.column() ) == 0 )
-                {
-                    r.adjust( 0, 0, 0, -3 );
-                    painter->drawPixmap( r.adjusted( 3, 1, 18 - r.width(), 1 ), m_nowPlayingIcon );
-                    r.adjust( 25, 0, 0, 3 );
-                }
-
-                painter->setPen( o.palette.text().color() );
-
-                QTextOption to( Qt::AlignVCenter );
-                QString text = painter->fontMetrics().elidedText( index.data().toString(), Qt::ElideRight, r.width() - 3 );
-                painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, to );
-            }
-            painter->restore();
-        }
-
-        return;
-    }
-    else
-        return;
-
-    if ( text.trimmed().isEmpty() )
-        text = tr( "Unknown" );
-
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, QModelIndex() );
-    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
-
-    if ( option.state & QStyle::State_Selected )
-    {
-        opt.palette.setColor( QPalette::Text, opt.palette.color( QPalette::HighlightedText ) );
-    }
-
-    if ( index.column() > 0 )
-        return;
-
-    painter->save();
-    painter->setRenderHint( QPainter::Antialiasing );
-    painter->setPen( opt.palette.color( QPalette::Text ) );
-
-    QRect r = option.rect.adjusted( 4, 4, -option.rect.width() + option.rect.height() - 4, -4 );
-//    painter->drawPixmap( r, QPixmap( RESPATH "images/cover-shadow.png" ) );
-
-    QPixmap cover;
-    if ( !item->album().isNull() )
-    {
-        cover = item->album()->cover( r.size(), false );
-        if ( cover.isNull() )
-            cover = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, r.size() );
-    }
-    else if ( !item->artist().isNull() )
-    {
-        cover = item->artist()->cover( r.size(), false );
-        if ( cover.isNull() )
-            cover = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::ScaledCover, r.size() );
-    }
-
-    painter->drawPixmap( r, cover );
-
-    QTextOption to;
-    to.setAlignment( Qt::AlignVCenter );
-
-    r = option.rect.adjusted( option.rect.height(), 6, -4, -option.rect.height() + 22 );
-    text = painter->fontMetrics().elidedText( text, Qt::ElideRight, r.width() );
-    painter->drawText( r, text, to );
-
-    painter->restore();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treeitemdelegate.h Deleted

@@ -1,51 +0,0 @@
-/* === 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
- *   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 TREEITEMDELEGATE_H
-#define TREEITEMDELEGATE_H
-
-#include <QStyledItemDelegate>
-
-#include "dllmacro.h"
-
-class ArtistView;
-class TreeProxyModel;
-
-class DLLEXPORT TreeItemDelegate : public QStyledItemDelegate
-{
-Q_OBJECT
-
-public:
-    TreeItemDelegate( ArtistView* parent = 0, TreeProxyModel* proxy = 0 );
-
-protected:
-    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-//    QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-private:
-    ArtistView* m_view;
-    TreeProxyModel* m_model;
-
-    QPixmap m_nowPlayingIcon;
-    QPixmap m_defaultAlbumCover;
-    QPixmap m_defaultArtistImage;
-};
-
-#endif // TREEITEMDELEGATE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treemodel.cpp Deleted

@@ -1,1028 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2012,      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 "treemodel.h"
-
-#include <QMimeData>
-
-#include "pipeline.h"
-#include "source.h"
-#include "sourcelist.h"
-#include "audio/audioengine.h"
-#include "database/databasecommand_allalbums.h"
-#include "database/databasecommand_alltracks.h"
-#include "database/database.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-TreeModel::TreeModel( QObject* parent )
-    : QAbstractItemModel( parent )
-    , m_rootItem( new TreeModelItem( 0, this ) )
-    , m_infoId( uuid() )
-    , m_columnStyle( AllColumns )
-    , m_mode( DatabaseMode )
-{
-    setIcon( QPixmap( RESPATH "images/music-icon.png" ) );
-
-    connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( onPlaybackStarted( Tomahawk::result_ptr ) ), Qt::DirectConnection );
-    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ), Qt::DirectConnection );
-
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(),
-             SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-               SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-}
-
-
-TreeModel::~TreeModel()
-{
-}
-
-
-void
-TreeModel::clear()
-{
-    if ( rowCount( QModelIndex() ) )
-    {
-        emit loadingFinished();
-
-        emit beginResetModel();
-        delete m_rootItem;
-        m_rootItem = 0;
-        m_rootItem = new TreeModelItem( 0, this );
-        emit endResetModel();
-    }
-}
-
-
-void
-TreeModel::setMode( ModelMode mode )
-{
-    clear();
-    m_mode = mode;
-    emit modeChanged( mode );
-}
-
-
-Tomahawk::collection_ptr
-TreeModel::collection() const
-{
-    return m_collection;
-}
-
-
-void
-TreeModel::getCover( const QModelIndex& index )
-{
-    TreeModelItem* item = itemFromIndex( index );
-
-    if ( !item->artist().isNull() && !item->artist()->infoLoaded() )
-        item->artist()->cover( QSize( 0, 0 ) );
-    else if ( !item->album().isNull() && !item->album()->infoLoaded() )
-        item->album()->cover( QSize( 0, 0 ) );
-}
-
-
-void
-TreeModel::setCurrentItem( const QModelIndex& index )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    TreeModelItem* oldEntry = itemFromIndex( m_currentIndex );
-    if ( oldEntry )
-    {
-        oldEntry->setIsPlaying( false );
-    }
-
-    TreeModelItem* entry = itemFromIndex( index );
-    if ( entry )
-    {
-        m_currentIndex = index;
-        entry->setIsPlaying( true );
-    }
-    else
-    {
-        m_currentIndex = QModelIndex();
-    }
-}
-
-
-QModelIndex
-TreeModel::index( int row, int column, const QModelIndex& parent ) const
-{
-    if ( !m_rootItem || row < 0 || column < 0 )
-        return QModelIndex();
-
-    TreeModelItem* parentItem = itemFromIndex( parent );
-    TreeModelItem* childItem = parentItem->children.value( row );
-    if ( !childItem )
-        return QModelIndex();
-
-    return createIndex( row, column, childItem );
-}
-
-
-bool
-TreeModel::canFetchMore( const QModelIndex& parent ) const
-{
-    TreeModelItem* parentItem = itemFromIndex( parent );
-
-    if ( parentItem->fetchingMore )
-        return false;
-
-    if ( !parentItem->artist().isNull() )
-    {
-        return true;
-    }
-    else if ( !parentItem->album().isNull() )
-    {
-        return true;
-    }
-
-    return false;
-}
-
-
-void
-TreeModel::fetchMore( const QModelIndex& parent )
-{
-    TreeModelItem* parentItem = itemFromIndex( parent );
-    if ( !parentItem || parentItem->fetchingMore )
-        return;
-
-    parentItem->fetchingMore = true;
-    if ( !parentItem->artist().isNull() )
-    {
-        qDebug() << Q_FUNC_INFO << "Loading Artist:" << parentItem->artist()->name();
-        addAlbums( parentItem->artist(), parent );
-    }
-    else if ( !parentItem->album().isNull() )
-    {
-        qDebug() << Q_FUNC_INFO << "Loading Album:" << parentItem->album()->name();
-        addTracks( parentItem->album(), parent );
-    }
-    else
-        Q_ASSERT( false );
-}
-
-
-bool
-TreeModel::hasChildren( const QModelIndex& parent ) const
-{
-    TreeModelItem* parentItem = itemFromIndex( parent );
-    if ( !parentItem )
-        return false;
-
-    if ( parentItem == m_rootItem )
-        return true;
-
-    return ( !parentItem->artist().isNull() || !parentItem->album().isNull() );
-}
-
-
-int
-TreeModel::rowCount( const QModelIndex& parent ) const
-{
-    if ( parent.column() > 0 )
-        return 0;
-
-    TreeModelItem* parentItem = itemFromIndex( parent );
-    if ( !parentItem )
-        return 0;
-
-    return parentItem->children.count();
-}
-
-
-int
-TreeModel::columnCount( const QModelIndex& parent ) const
-{
-    Q_UNUSED( parent );
-
-    if ( m_columnStyle == AllColumns )
-        return 8;
-    else if ( m_columnStyle == TrackOnly )
-        return 1;
-
-    // UH..
-    return 0;
-}
-
-
-QModelIndex
-TreeModel::parent( const QModelIndex& child ) const
-{
-    TreeModelItem* entry = itemFromIndex( child );
-    if ( !entry )
-        return QModelIndex();
-
-    TreeModelItem* parentEntry = entry->parent;
-    if ( !parentEntry )
-        return QModelIndex();
-
-    TreeModelItem* grandparentEntry = parentEntry->parent;
-    if ( !grandparentEntry )
-        return QModelIndex();
-
-    int row = grandparentEntry->children.indexOf( parentEntry );
-    return createIndex( row, 0, parentEntry );
-}
-
-
-QVariant
-TreeModel::data( const QModelIndex& index, int role ) const
-{
-    TreeModelItem* entry = itemFromIndex( index );
-    if ( !entry )
-        return QVariant();
-
-    if ( role == Qt::SizeHintRole )
-    {
-        if ( !entry->result().isNull() || !entry->query().isNull() )
-        {
-            return QSize( 128, 20 );
-        }
-        else if ( !entry->album().isNull() )
-        {
-            return QSize( 128, 32 );
-        }
-        else if ( !entry->artist().isNull() )
-        {
-            return QSize( 128, 44 );
-        }
-
-        return QSize( 128, 0 );
-    }
-
-    if ( role != Qt::DisplayRole ) // && role != Qt::ToolTipRole )
-        return QVariant();
-
-    if ( !entry->artist().isNull() && index.column() == Name )
-    {
-        return entry->artist()->name();
-    }
-    else if ( !entry->album().isNull() && index.column() == Name )
-    {
-        return entry->album()->name();
-    }
-    else if ( !entry->result().isNull() )
-    {
-        const result_ptr& result = entry->result();
-        unsigned int discnumber = 0;
-        if ( !entry->query().isNull() )
-            discnumber = entry->query()->discnumber();
-        if ( discnumber == 0 )
-            discnumber = result->discnumber();
-
-        unsigned int albumpos = 0;
-        if ( !entry->query().isNull() )
-            albumpos = entry->query()->albumpos();
-        if ( albumpos == 0 )
-            albumpos = result->albumpos();
-
-        switch( index.column() )
-        {
-            case Name:
-                return QString( "%1%2%3" ).arg( discnumber > 0 ? QString( "%1." ).arg( discnumber ) : QString() )
-                                          .arg( albumpos > 0 ? QString( "%1. ").arg( albumpos ) : QString() )
-                                          .arg( result->track() );
-
-            case Duration:
-                return TomahawkUtils::timeToString( result->duration() );
-
-            case Bitrate:
-                if ( result->bitrate() > 0 )
-                    return result->bitrate();
-                break;
-
-            case Age:
-                return TomahawkUtils::ageToString( QDateTime::fromTime_t( result->modificationTime() ) );
-
-            case Year:
-                if ( result->year() != 0 )
-                    return result->year();
-                break;
-
-            case Filesize:
-                return TomahawkUtils::filesizeToString( result->size() );
-
-            case Origin:
-                return result->friendlySource();
-
-            case AlbumPosition:
-                return result->albumpos();
-
-            case Composer:
-                if ( !result->composer().isNull() )
-                    return result->composer()->name();
-                break;
-
-            default:
-                return QVariant();
-        }
-    }
-    else if ( !entry->query().isNull() )
-    {
-        const query_ptr& query = entry->query();
-        switch( index.column() )
-        {
-            case Name:
-                return QString( "%1%2%3" ).arg( query->discnumber() > 0 ? QString( "%1." ).arg( query->discnumber() ) : QString() )
-                                          .arg( query->albumpos() > 0 ? QString( "%1. ").arg( query->albumpos() ) : QString() )
-                                          .arg( query->track() );
-
-            case AlbumPosition:
-                return entry->query()->albumpos();
-
-            default:
-                return QVariant();
-        }
-    }
-
-    return QVariant();
-}
-
-
-QVariant
-TreeModel::headerData( int section, Qt::Orientation orientation, int role ) const
-{
-    QStringList headers;
-    headers << tr( "Name" ) << tr( "Composer" ) << tr( "Duration" ) << tr( "Bitrate" ) << tr( "Age" ) << tr( "Year" ) << tr( "Size" ) << tr( "Origin" );
-    if ( orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= 0 )
-    {
-        return headers.at( section );
-    }
-
-    return QVariant();
-}
-
-
-Qt::ItemFlags
-TreeModel::flags( const QModelIndex& index ) const
-{
-    Qt::ItemFlags defaultFlags = QAbstractItemModel::flags( index );
-
-    if ( index.isValid() && index.column() == 0 )
-    {
-        TreeModelItem* item = itemFromIndex( index );
-        if ( item && !item->result().isNull() )
-            return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
-        if ( item && ( !item->album().isNull() || !item->artist().isNull() ) )
-            return Qt::ItemIsDragEnabled | defaultFlags;
-    }
-
-    return defaultFlags;
-}
-
-
-QStringList
-TreeModel::mimeTypes() const
-{
-    QStringList types;
-    types << "application/tomahawk.mixed";
-    return types;
-}
-
-
-QMimeData*
-TreeModel::mimeData( const QModelIndexList &indexes ) const
-{
-    qDebug() << Q_FUNC_INFO;
-
-    QByteArray resultData;
-    QDataStream resultStream( &resultData, QIODevice::WriteOnly );
-
-    // lets try with artist only
-    bool fail = false;
-    foreach ( const QModelIndex& i, indexes)
-    {
-        if ( i.column() > 0 || indexes.contains( i.parent() ) )
-            continue;
-
-        TreeModelItem* item = itemFromIndex( i );
-        if ( !item )
-            continue;
-
-        if ( !item->artist().isNull() )
-        {
-            const artist_ptr& artist = item->artist();
-            resultStream << artist->name();
-        }
-        else
-        {
-            fail = true;
-            break;
-        }
-    }
-    if ( !fail )
-    {
-        QMimeData* mimeData = new QMimeData();
-        mimeData->setData( "application/tomahawk.metadata.artist", resultData );
-        return mimeData;
-    }
-
-    // lets try with album only
-    fail = false;
-    resultData.clear();
-    foreach ( const QModelIndex& i, indexes )
-    {
-        if ( i.column() > 0 || indexes.contains( i.parent() ) )
-            continue;
-
-        TreeModelItem* item = itemFromIndex( i );
-        if ( !item )
-            continue;
-
-        if ( !item->album().isNull() )
-        {
-            const album_ptr& album = item->album();
-            resultStream << album->artist()->name();
-            resultStream << album->name();
-        }
-        else
-        {
-            fail = true;
-            break;
-        }
-    }
-    if ( !fail )
-    {
-        QMimeData* mimeData = new QMimeData();
-        mimeData->setData( "application/tomahawk.metadata.album", resultData );
-        return mimeData;
-    }
-
-    // lets try with tracks only
-    fail = false;
-    resultData.clear();
-    foreach ( const QModelIndex& i, indexes )
-    {
-        if ( i.column() > 0 || indexes.contains( i.parent() ) )
-            continue;
-
-        TreeModelItem* item = itemFromIndex( i );
-        if ( !item )
-            continue;
-
-        if ( !item->result().isNull() )
-        {
-            const result_ptr& result = item->result();
-            resultStream << qlonglong( &result );
-        }
-        else
-        {
-            fail = true;
-            break;
-        }
-    }
-    if ( !fail )
-    {
-        QMimeData* mimeData = new QMimeData();
-        mimeData->setData( "application/tomahawk.result.list", resultData );
-        return mimeData;
-    }
-
-    // Ok... we have to use mixed
-    resultData.clear();
-    foreach ( const QModelIndex& i, indexes )
-    {
-        if ( i.column() > 0 || indexes.contains( i.parent() ) )
-            continue;
-
-        TreeModelItem* item = itemFromIndex( i );
-        if ( !item )
-            continue;
-
-        if ( !item->artist().isNull() )
-        {
-            const artist_ptr& artist = item->artist();
-            resultStream << QString( "application/tomahawk.metadata.artist" ) << artist->name();
-        }
-        else if ( !item->album().isNull() )
-        {
-            const album_ptr& album = item->album();
-            resultStream << QString( "application/tomahawk.metadata.album" ) << album->artist()->name() << album->name();
-        }
-        else if ( !item->result().isNull() )
-        {
-            const result_ptr& result = item->result();
-            resultStream << QString( "application/tomahawk.result.list" ) << qlonglong( &result );
-        }
-    }
-
-    QMimeData* mimeData = new QMimeData();
-    mimeData->setData( "application/tomahawk.mixed", resultData );
-    return mimeData;
-}
-
-
-void
-TreeModel::removeIndex( const QModelIndex& index )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( index.column() > 0 )
-        return;
-
-    TreeModelItem* item = itemFromIndex( index );
-    if ( item )
-    {
-        emit beginRemoveRows( index.parent(), index.row(), index.row() );
-        delete item;
-        emit endRemoveRows();
-    }
-}
-
-
-void
-TreeModel::removeIndexes( const QList<QModelIndex>& indexes )
-{
-    foreach( const QModelIndex& idx, indexes )
-    {
-        removeIndex( idx );
-    }
-}
-
-
-void
-TreeModel::addAllCollections()
-{
-    emit loadingStarted();
-    DatabaseCommand_AllArtists* cmd = new DatabaseCommand_AllArtists();
-
-    connect( cmd, SIGNAL( artists( QList<Tomahawk::artist_ptr> ) ),
-                    SLOT( onArtistsAdded( QList<Tomahawk::artist_ptr> ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-
-    connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ), Qt::UniqueConnection );
-
-    QList<Tomahawk::source_ptr> sources = SourceList::instance()->sources();
-    foreach ( const source_ptr& source, sources )
-    {
-        connect( source->collection().data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
-    }
-
-    m_title = tr( "All Artists" );
-}
-
-
-void
-TreeModel::addArtists( const artist_ptr& artist )
-{
-    if ( artist.isNull() )
-        return;
-
-    emit loadingStarted();
-
-    QList<Tomahawk::artist_ptr> artists;
-    artists << artist;
-    onArtistsAdded( artists );
-}
-
-
-void
-TreeModel::addAlbums( const artist_ptr& artist, const QModelIndex& parent, bool autoRefetch )
-{
-    emit loadingStarted();
-
-    if ( m_mode == DatabaseMode )
-    {
-        DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( m_collection, artist );
-        cmd->setData( parent.row() );
-
-        connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
-                        SLOT( onAlbumsFound( QList<Tomahawk::album_ptr>, QVariant ) ) );
-
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-    }
-    else if ( m_mode == InfoSystemMode )
-    {
-        Tomahawk::InfoSystem::InfoStringHash artistInfo;
-        artistInfo"artist" = artist->name();
-
-        Tomahawk::InfoSystem::InfoRequestData requestData;
-        requestData.caller = m_infoId;
-        requestData.customData"row" = parent.row();
-        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
-        requestData.customData"refetch" = autoRefetch;
-        requestData.type = Tomahawk::InfoSystem::InfoArtistReleases;
-        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-    }
-    else
-        Q_ASSERT( false );
-}
-
-
-void
-TreeModel::addTracks( const album_ptr& album, const QModelIndex& parent, bool autoRefetch )
-{
-    emit loadingStarted();
-
-    QList< QVariant > rows;
-    rows << parent.row();
-    rows << parent.parent().row();
-
-    if ( m_mode == DatabaseMode )
-    {
-        DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection );
-        cmd->setAlbum( album );
-        cmd->setData( QVariant( rows ) );
-
-        connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
-                        SLOT( onTracksFound( QList<Tomahawk::query_ptr>, QVariant ) ) );
-
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-    }
-    else if ( m_mode == InfoSystemMode )
-    {
-        Tomahawk::InfoSystem::InfoStringHash artistInfo;
-        artistInfo"artist" = album->artist()->name();
-        artistInfo"album" = album->name();
-
-        m_receivedInfoData.removeAll( artistInfo );
-        Tomahawk::InfoSystem::InfoRequestData requestData;
-        requestData.caller = m_infoId;
-        requestData.customData"rows" = rows;
-        requestData.customData"refetch" = autoRefetch;
-        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
-        requestData.type = Tomahawk::InfoSystem::InfoAlbumSongs;
-        requestData.timeoutMillis = 0;
-        requestData.allSources = true;
-        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-    }
-    else
-        Q_ASSERT( false );
-}
-
-
-void
-TreeModel::addCollection( const collection_ptr& collection )
-{
-    qDebug() << Q_FUNC_INFO << collection->name()
-                            << collection->source()->id()
-                            << collection->source()->userName();
-
-    m_collection = collection;
-    DatabaseCommand_AllArtists* cmd = new DatabaseCommand_AllArtists( collection );
-
-    connect( cmd, SIGNAL( artists( QList<Tomahawk::artist_ptr> ) ),
-                    SLOT( onArtistsAdded( QList<Tomahawk::artist_ptr> ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-
-    connect( collection.data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
-
-    if ( !collection->source()->avatar().isNull() )
-        setIcon( collection->source()->avatar() );
-
-    if ( collection->source()->isLocal() )
-        setTitle( tr( "My Collection" ) );
-    else
-        setTitle( tr( "Collection of %1" ).arg( collection->source()->friendlyName() ) );
-}
-
-
-void
-TreeModel::addFilteredCollection( const collection_ptr& collection, unsigned int amount, DatabaseCommand_AllArtists::SortOrder order )
-{
-    qDebug() << Q_FUNC_INFO << collection->name()
-                            << collection->source()->id()
-                            << collection->source()->userName()
-                            << amount << order;
-
-    DatabaseCommand_AllArtists* cmd = new DatabaseCommand_AllArtists( collection );
-    cmd->setLimit( amount );
-    cmd->setSortOrder( order );
-    cmd->setSortDescending( true );
-
-    connect( cmd, SIGNAL( artists( QList<Tomahawk::artist_ptr>, Tomahawk::collection_ptr ) ),
-                    SLOT( onArtistsAdded( QList<Tomahawk::artist_ptr>, Tomahawk::collection_ptr ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-
-    if ( collection->source()->isLocal() )
-        setTitle( tr( "My Collection" ) );
-    else
-        setTitle( tr( "Collection of %1" ).arg( collection->source()->friendlyName() ) );
-}
-
-
-void
-TreeModel::onSourceAdded( const Tomahawk::source_ptr& source )
-{
-    connect( source->collection().data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
-}
-
-
-void
-TreeModel::onCollectionChanged()
-{
-    clear();
-
-    if ( m_collection )
-        addCollection( m_collection );
-    else
-        addAllCollections();
-}
-
-
-void
-TreeModel::onArtistsAdded( const QList<Tomahawk::artist_ptr>& artists )
-{
-    emit loadingFinished();
-    if ( !artists.count() )
-    {
-        emit itemCountChanged( rowCount( QModelIndex() ) );
-        return;
-    }
-
-    int c = rowCount( QModelIndex() );
-    QPair< int, int > crows;
-    crows.first = c;
-    crows.second = c + artists.count() - 1;
-
-    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
-
-    TreeModelItem* artistitem;
-    foreach( const artist_ptr& artist, artists )
-    {
-        artistitem = new TreeModelItem( artist, m_rootItem );
-        artistitem->index = createIndex( m_rootItem->children.count() - 1, 0, artistitem );
-        connect( artistitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
-    }
-
-    emit endInsertRows();
-    emit itemCountChanged( rowCount( QModelIndex() ) );
-}
-
-
-void
-TreeModel::onAlbumsAdded( const QList<Tomahawk::album_ptr>& albums, const QModelIndex& parent )
-{
-    emit loadingFinished();
-    if ( !albums.count() )
-        return;
-
-    TreeModelItem* parentItem = itemFromIndex( parent );
-
-    QPair< int, int > crows;
-    int c = rowCount( parent );
-    crows.first = c;
-    crows.second = c + albums.count() - 1;
-
-    emit beginInsertRows( parent, crows.first, crows.second );
-
-    TreeModelItem* albumitem = 0;
-    foreach( const album_ptr& album, albums )
-    {
-        albumitem = new TreeModelItem( album, parentItem );
-        albumitem->index = createIndex( parentItem->children.count() - 1, 0, albumitem );
-        connect( albumitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
-
-        getCover( albumitem->index );
-    }
-
-    emit endInsertRows();
-}
-
-
-void
-TreeModel::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks, const QModelIndex& parent )
-{
-    emit loadingFinished();
-    if ( !tracks.count() )
-        return;
-
-    TreeModelItem* parentItem = itemFromIndex( parent );
-
-    QPair< int, int > crows;
-    int c = rowCount( parent );
-    crows.first = c;
-    crows.second = c + tracks.count() - 1;
-
-    emit beginInsertRows( parent, crows.first, crows.second );
-
-    TreeModelItem* item = 0;
-    foreach( const query_ptr& query, tracks )
-    {
-        if ( query->numResults() )
-            item = new TreeModelItem( query->results().first(), parentItem );
-        else
-            item = new TreeModelItem( query, parentItem );
-
-        item->index = createIndex( parentItem->children.count() - 1, 0, item );
-
-        connect( item, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
-    }
-
-    emit endInsertRows();
-}
-
-
-void
-TreeModel::onTracksFound( const QList<Tomahawk::query_ptr>& tracks, const QVariant& variant )
-{
-    QList< QVariant > rows = variant.toList();
-    QModelIndex idx = index( rows.first().toUInt(), 0, index( rows.at( 1 ).toUInt(), 0, QModelIndex() ) );
-
-    onTracksAdded( tracks, idx );
-}
-
-
-void
-TreeModel::onAlbumsFound( const QList<Tomahawk::album_ptr>& albums, const QVariant& variant )
-{
-    QModelIndex idx = index( variant.toInt(), 0, QModelIndex() );
-    onAlbumsAdded( albums, idx );
-}
-
-
-void
-TreeModel::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
-{
-    if ( requestData.caller != m_infoId )
-    {
-        return;
-    }
-
-    switch ( requestData.type )
-    {
-        case Tomahawk::InfoSystem::InfoArtistReleases:
-        {
-            QVariantMap returnedData = output.value< QVariantMap >();
-            QStringList albums = returnedData "albums" .toStringList();
-            QList<album_ptr> al;
-
-            Tomahawk::InfoSystem::InfoStringHash inputInfo;
-            inputInfo = requestData.input.value< InfoSystem::InfoStringHash >();
-            artist_ptr artist = Artist::get( inputInfo "artist" , false );
-
-            if ( artist.isNull() )
-                return;
-
-            foreach ( const QString& albumName, albums )
-            {
-                Tomahawk::album_ptr album = Tomahawk::Album::get( artist, albumName, false );
-                al << album;
-            }
-
-            QModelIndex idx = index( requestData.customData "row" .toInt(), 0, QModelIndex() );
-
-            if ( requestData.customData "refetch" .toBool() && !al.count() )
-            {
-                setMode( DatabaseMode );
-
-                Tomahawk::InfoSystem::InfoStringHash inputInfo;
-                inputInfo = requestData.input.value< InfoSystem::InfoStringHash >();
-                artist_ptr artist = Artist::get( inputInfo "artist" , false );
-
-                addAlbums( artist, idx );
-            }
-            else
-                onAlbumsAdded( al, idx );
-
-            break;
-        }
-
-        case Tomahawk::InfoSystem::InfoAlbumSongs:
-        {
-            m_receivedInfoData.append( requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >() );
-
-            QVariantMap returnedData = output.value< QVariantMap >();
-            if ( !returnedData.isEmpty() )
-            {
-                emit loadingFinished();
-
-                QList< QVariant > rows = requestData.customData "rows" .toList();
-                QModelIndex idx = index( rows.first().toUInt(), 0, index( rows.at( 1 ).toUInt(), 0, QModelIndex() ) );
-                if ( rowCount( idx ) )
-                    return;
-
-                Tomahawk::InfoSystem::InfoStringHash inputInfo;
-                inputInfo = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
-
-                QStringList tracks = returnedData "tracks" .toStringList();
-                QList<query_ptr> ql;
-
-                //TODO: Figure out how to do this with a multi-disk album without breaking the
-                //      current behaviour. I just know too little about InfoSystem to deal with
-                //      it right now, I've only taken the liberty of adding Query::setDiscNumber
-                //      which should make this easier. --Teo 11/2011
-                unsigned int trackNo = 1;
-
-                foreach ( const QString& trackName, tracks )
-                {
-                    query_ptr query = Query::get( inputInfo "artist" , trackName, inputInfo "album"  );
-                    query->setAlbumPos( trackNo++ );
-                    ql << query;
-                }
-                Pipeline::instance()->resolve( ql );
-
-                onTracksAdded( ql, idx );
-            }
-            else if ( m_receivedInfoData.count() == 2 /* FIXME */ )
-            {
-                // If the second load got no data, but the first load did, don't do anything
-                QList< QVariant > rows = requestData.customData "rows" .toList();
-                QModelIndex idx = index( rows.first().toUInt(), 0, index( rows.at( 1 ).toUInt(), 0, QModelIndex() ) );
-                if ( rowCount( idx ) )
-                    return;
-
-                if ( requestData.customData "refetch" .toBool() )
-                {
-                    setMode( DatabaseMode );
-
-                    Tomahawk::InfoSystem::InfoStringHash inputInfo;
-                    inputInfo = requestData.input.value< InfoSystem::InfoStringHash >();
-                    artist_ptr artist = Artist::get( inputInfo "artist" , false );
-                    album_ptr album = Album::get( artist, inputInfo "album" , false );
-
-                    addTracks( album, QModelIndex() );
-                }
-                else
-                    emit loadingFinished();
-            }
-
-            break;
-        }
-
-        default:
-        {
-            Q_ASSERT( false );
-            break;
-        }
-    }
-}
-
-
-void
-TreeModel::onPlaybackStarted( const Tomahawk::result_ptr& result )
-{
-    TreeModelItem* oldEntry = itemFromIndex( m_currentIndex );
-    if ( oldEntry && ( oldEntry->result().isNull() || oldEntry->result().data() != result.data() ) )
-    {
-        oldEntry->setIsPlaying( false );
-    }
-}
-
-
-void
-TreeModel::onPlaybackStopped()
-{
-    TreeModelItem* oldEntry = itemFromIndex( m_currentIndex );
-    if ( oldEntry )
-    {
-        oldEntry->setIsPlaying( false );
-    }
-}
-
-
-void
-TreeModel::onDataChanged()
-{
-    TreeModelItem* p = (TreeModelItem*)sender();
-    emit dataChanged( p->index, p->index.sibling( p->index.row(), columnCount( QModelIndex() ) - 1 ) );
-}
-
-
-void
-TreeModel::setColumnStyle( TreeModel::ColumnStyle style )
-{
-    m_columnStyle = style;
-}
-
-
-QModelIndex
-TreeModel::indexFromArtist( const Tomahawk::artist_ptr& artist ) const
-{
-    for ( int i = 0; i < rowCount(); i++ )
-    {
-        QModelIndex idx = index( i, 0, QModelIndex() );
-        TreeModelItem* item = itemFromIndex( idx );
-        if ( item && item->artist() == artist )
-        {
-            return idx;
-        }
-    }
-
-    return QModelIndex();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treemodel.h Deleted

@@ -1,180 +0,0 @@
-/* === 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
- *   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 TREEMODEL_H
-#define TREEMODEL_H
-
-#include <QAbstractItemModel>
-#include <QPixmap>
-
-#include "artist.h"
-#include "album.h"
-#include "query.h"
-#include "result.h"
-#include "playlistinterface.h"
-#include "database/databasecommand_allartists.h"
-
-#include "treemodelitem.h"
-#include "infosystem/infosystem.h"
-
-#include "dllmacro.h"
-#include "typedefs.h"
-
-class QMetaData;
-
-class DLLEXPORT TreeModel : public QAbstractItemModel
-{
-Q_OBJECT
-
-public:
-    enum Columns {
-        Name = 0,
-        Composer,
-        Duration,
-        Bitrate,
-        Age,
-        Year,
-        Filesize,
-        Origin,
-        AlbumPosition
-    };
-
-    enum ColumnStyle
-    { AllColumns = 0, TrackOnly };
-
-    explicit TreeModel( QObject* parent = 0 );
-    virtual ~TreeModel();
-
-    virtual QModelIndex index( int row, int column, const QModelIndex& parent ) const;
-    virtual QModelIndex parent( const QModelIndex& child ) const;
-
-    virtual bool isReadOnly() const { return true; }
-
-    virtual int trackCount() const { return rowCount( QModelIndex() ); }
-    virtual int albumCount() const { return rowCount( QModelIndex() ); }
-
-    virtual bool hasChildren( const QModelIndex& parent = QModelIndex() ) const;
-    virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const;
-    virtual int columnCount( const QModelIndex& parent = QModelIndex() ) const;
-
-    virtual Tomahawk::ModelMode mode() const { return m_mode; }
-    virtual void setMode( Tomahawk::ModelMode mode );
-
-    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-    virtual QVariant headerData( int section, Qt::Orientation orientation, int role ) const;
-
-    virtual void clear();
-    virtual void removeIndex( const QModelIndex& index );
-    virtual void removeIndexes( const QList<QModelIndex>& indexes );
-
-    virtual QMimeData* mimeData( const QModelIndexList& indexes ) const;
-    virtual QStringList mimeTypes() const;
-    virtual Qt::ItemFlags flags( const QModelIndex& index ) const;
-
-    virtual QPersistentModelIndex currentItem() { return m_currentIndex; }
-
-    Tomahawk::collection_ptr collection() const;
-
-    void addAllCollections();
-    void addCollection( const Tomahawk::collection_ptr& collection );
-    void addFilteredCollection( const Tomahawk::collection_ptr& collection, unsigned int amount, DatabaseCommand_AllArtists::SortOrder order );
-
-    void addArtists( const Tomahawk::artist_ptr& artist );
-    void addAlbums( const Tomahawk::artist_ptr& artist, const QModelIndex& parent, bool autoRefetch = false );
-    void addTracks( const Tomahawk::album_ptr& album, const QModelIndex& parent, bool autoRefetch = false );
-
-    void getCover( const QModelIndex& index );
-
-    ColumnStyle columnStyle() const { return m_columnStyle; }
-    void setColumnStyle( ColumnStyle style );
-
-    virtual QString title() const { return m_title; }
-    virtual QString description() const { return m_description; }
-    virtual QPixmap icon() const { return m_icon; }
-    virtual void setTitle( const QString& title ) { m_title = title; }
-    virtual void setDescription( const QString& description ) { m_description = description; }
-    virtual void setIcon( const QPixmap& pixmap ) { m_icon = pixmap; }
-
-    QModelIndex indexFromArtist( const Tomahawk::artist_ptr& artist ) const;
-    TreeModelItem* itemFromIndex( const QModelIndex& index ) const
-    {
-        if ( index.isValid() )
-        {
-            return static_cast<TreeModelItem*>( index.internalPointer() );
-        }
-        else
-        {
-            return m_rootItem;
-        }
-    }
-
-public slots:
-    virtual void setCurrentItem( const QModelIndex& index );
-
-    virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode /*mode*/ ) {}
-    virtual void setShuffled( bool /*shuffled*/ ) {}
-
-signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void modeChanged( Tomahawk::ModelMode mode );
-    void itemCountChanged( unsigned int items );
-
-    void loadingStarted();
-    void loadingFinished();
-
-protected:
-    bool canFetchMore( const QModelIndex& parent ) const;
-    void fetchMore( const QModelIndex& parent );
-
-private slots:
-    void onArtistsAdded( const QList<Tomahawk::artist_ptr>& artists );
-    void onAlbumsAdded( const QList<Tomahawk::album_ptr>& albums, const QModelIndex& index );
-    void onAlbumsFound( const QList<Tomahawk::album_ptr>& albums, const QVariant& variant );
-    void onTracksAdded( const QList<Tomahawk::query_ptr>& tracks, const QModelIndex& index );
-    void onTracksFound( const QList<Tomahawk::query_ptr>& tracks, const QVariant& variant );
-
-    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-
-    void onPlaybackStarted( const Tomahawk::result_ptr& result );
-    void onPlaybackStopped();
-
-    void onDataChanged();
-
-    void onSourceAdded( const Tomahawk::source_ptr& source );
-    void onCollectionChanged();
-
-private:
-    QPersistentModelIndex m_currentIndex;
-    TreeModelItem* m_rootItem;
-    QString m_infoId;
-
-    QString m_title;
-    QString m_description;
-    QPixmap m_icon;
-    ColumnStyle m_columnStyle;
-    Tomahawk::ModelMode m_mode;
-
-    QList<Tomahawk::artist_ptr> m_artistsFilter;
-
-    Tomahawk::collection_ptr m_collection;
-    QList<Tomahawk::InfoSystem::InfoStringHash> m_receivedInfoData;
-};
-
-#endif // ALBUMMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treemodelitem.cpp Deleted

@@ -1,261 +0,0 @@
-/* === 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
- *   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 "treemodelitem.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "artist.h"
-#include "album.h"
-#include "query.h"
-
-using namespace Tomahawk;
-
-
-TreeModelItem::~TreeModelItem()
-{
-    // Don't use qDeleteAll here! The children will remove themselves
-    // from the list when they get deleted and the qDeleteAll iterator
-    // will fail badly!
-    for ( int i = children.count() - 1; i >= 0; i-- )
-        delete children.at( i );
-
-    if ( parent && index.isValid() )
-    {
-        parent->children.removeAt( index.row() );
-    }
-}
-
-
-TreeModelItem::TreeModelItem( TreeModelItem* parent, QAbstractItemModel* model )
-{
-    this->parent = parent;
-    this->model = model;
-    childCount = 0;
-    toberemoved = false;
-    fetchingMore = false;
-    m_isPlaying = false;
-
-    if ( parent )
-    {
-        parent->children.append( this );
-    }
-}
-
-
-TreeModelItem::TreeModelItem( const Tomahawk::album_ptr& album, TreeModelItem* parent, int row )
-    : QObject( parent )
-    , m_album( album )
-{
-    this->parent = parent;
-    fetchingMore = false;
-    m_isPlaying = false;
-
-    if ( parent )
-    {
-        if ( row < 0 )
-        {
-            parent->children.append( this );
-            row = parent->children.count() - 1;
-        }
-        else
-        {
-            parent->children.insert( row, this );
-        }
-
-        this->model = parent->model;
-    }
-
-    toberemoved = false;
-
-    connect( album.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
-}
-
-
-TreeModelItem::TreeModelItem( const Tomahawk::artist_ptr& artist, TreeModelItem* parent, int row )
-    : QObject( parent )
-    , m_artist( artist )
-{
-    this->parent = parent;
-    fetchingMore = false;
-    m_isPlaying = false;
-
-    if ( parent )
-    {
-        if ( row < 0 )
-        {
-            parent->children.append( this );
-            row = parent->children.count() - 1;
-        }
-        else
-        {
-            parent->children.insert( row, this );
-        }
-
-        this->model = parent->model;
-    }
-
-    toberemoved = false;
-
-    connect( artist.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
-}
-
-
-TreeModelItem::TreeModelItem( const Tomahawk::result_ptr& result, TreeModelItem* parent, int row )
-    : QObject( parent )
-    , m_result( result )
-{
-    this->parent = parent;
-    fetchingMore = false;
-    m_isPlaying = false;
-
-    if ( parent )
-    {
-        if ( row < 0 )
-        {
-            parent->children.append( this );
-            row = parent->children.count() - 1;
-        }
-        else
-        {
-            parent->children.insert( row, this );
-        }
-
-        this->model = parent->model;
-    }
-
-    toberemoved = false;
-}
-
-
-TreeModelItem::TreeModelItem( const Tomahawk::query_ptr& query, TreeModelItem* parent, int row )
-    : QObject( parent )
-    , m_query( query )
-{
-    this->parent = parent;
-    fetchingMore = false;
-    m_isPlaying = false;
-
-    if ( parent )
-    {
-        if ( row < 0 )
-        {
-            parent->children.append( this );
-            row = parent->children.count() - 1;
-        }
-        else
-        {
-            parent->children.insert( row, this );
-        }
-
-        this->model = parent->model;
-    }
-
-    toberemoved = false;
-
-    connect( query.data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ),
-                             SLOT( onResultsChanged() ) );
-
-    connect( query.data(), SIGNAL( resultsRemoved( Tomahawk::result_ptr ) ),
-                             SLOT( onResultsChanged() ) );
-
-    connect( query.data(), SIGNAL( resultsChanged() ),
-                             SLOT( onResultsChanged() ) );
-}
-
-
-void
-TreeModelItem::onResultsChanged()
-{
-    if ( m_query->numResults() )
-        m_result = m_query->results().first();
-    else
-        m_result = result_ptr();
-
-    emit dataChanged();
-}
-
-
-QString
-TreeModelItem::name() const
-{
-    if ( !m_artist.isNull() )
-    {
-        return m_artist->name();
-    }
-    else if ( !m_album.isNull() )
-    {
-        return m_album->name();
-    }
-    else if ( !m_result.isNull() )
-    {
-        return m_result->track();
-    }
-    else if ( !m_query.isNull() )
-    {
-        return m_query->track();
-    }
-
-    Q_ASSERT( false );
-    return QString();
-}
-
-
-QString
-TreeModelItem::artistName() const
-{
-    if ( !m_result.isNull() )
-    {
-        return m_result->artist()->name();
-    }
-    else if ( !m_query.isNull() )
-    {
-        return m_query->artist();
-    }
-
-    return QString();
-}
-
-
-QString
-TreeModelItem::albumName() const
-{
-    if ( !m_result.isNull() && !m_result->album().isNull() )
-    {
-        return m_result->album()->name();
-    }
-    else if ( !m_query.isNull() )
-    {
-        return m_query->album();
-    }
-
-    return QString();
-}
-
-
-const Tomahawk::result_ptr&
-TreeModelItem::result() const
-{
-    if ( m_result.isNull() && !m_query.isNull() )
-    {
-        if ( m_query->results().count() )
-            return m_query->results().first();
-    }
-
-    return m_result;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treemodelitem.h Deleted

@@ -1,80 +0,0 @@
-/* === 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
- *   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 TREEMODELITEM_H
-#define TREEMODELITEM_H
-
-#include <QAbstractItemModel>
-#include <QHash>
-#include <QPersistentModelIndex>
-#include <QPixmap>
-
-#include "typedefs.h"
-#include "dllmacro.h"
-
-class DLLEXPORT TreeModelItem : public QObject
-{
-Q_OBJECT
-
-public:
-    ~TreeModelItem();
-
-    explicit TreeModelItem( TreeModelItem* parent = 0, QAbstractItemModel* model = 0 );
-    explicit TreeModelItem( const Tomahawk::artist_ptr& artist, TreeModelItem* parent = 0, int row = -1 );
-    explicit TreeModelItem( const Tomahawk::album_ptr& album, TreeModelItem* parent = 0, int row = -1 );
-    explicit TreeModelItem( const Tomahawk::result_ptr& result, TreeModelItem* parent = 0, int row = -1 );
-    explicit TreeModelItem( const Tomahawk::query_ptr& query, TreeModelItem* parent = 0, int row = -1 );
-
-    const Tomahawk::artist_ptr& artist() const { return m_artist; };
-    const Tomahawk::album_ptr& album() const { return m_album; };
-    const Tomahawk::query_ptr& query() const { return m_query; };
-    const Tomahawk::result_ptr& result() const;
-
-    bool isPlaying() { return m_isPlaying; }
-    void setIsPlaying( bool b ) { m_isPlaying = b; emit dataChanged(); }
-
-    QString name() const;
-    QString artistName() const;
-    QString albumName() const;
-
-    TreeModelItem* parent;
-    QList<TreeModelItem*> children;
-    QHash<QString, TreeModelItem*> hash;
-    int childCount;
-    QPersistentModelIndex index;
-    QAbstractItemModel* model;
-
-    bool toberemoved;
-    bool fetchingMore;
-
-signals:
-    void dataChanged();
-
-private slots:
-    void onResultsChanged();
-
-private:
-    Tomahawk::artist_ptr m_artist;
-    Tomahawk::album_ptr m_album;
-    Tomahawk::result_ptr m_result;
-    Tomahawk::query_ptr m_query;
-
-    bool m_isPlaying;
-};
-
-#endif // TREEMODELITEM_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treeproxymodel.cpp Deleted

@@ -1,403 +0,0 @@
-/* === 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
- *   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 "treeproxymodel.h"
-
-#include <QtGui/QListView>
-
-#include "treeproxymodelplaylistinterface.h"
-#include "source.h"
-#include "query.h"
-#include "database/database.h"
-#include "database/databaseimpl.h"
-#include "database/databasecommand_allalbums.h"
-#include "utils/logger.h"
-
-
-TreeProxyModel::TreeProxyModel( QObject* parent )
-    : QSortFilterProxyModel( parent )
-    , m_artistsFilterCmd( 0 )
-    , m_model( 0 )
-{
-    setFilterCaseSensitivity( Qt::CaseInsensitive );
-    setSortCaseSensitivity( Qt::CaseInsensitive );
-    setDynamicSortFilter( true );
-
-    setSourceTreeModel( 0 );
-}
-
-
-QPersistentModelIndex
-TreeProxyModel::currentIndex() const
-{
-    if ( !m_model )
-        return QPersistentModelIndex();
-
-    return mapFromSource( m_model->currentItem() );
-}
-
-
-void
-TreeProxyModel::setSourceModel( QAbstractItemModel* sourceModel )
-{
-    Q_UNUSED( sourceModel );
-    qDebug() << "Explicitly use setSourceTreeModel instead";
-    Q_ASSERT( false );
-}
-
-
-void
-TreeProxyModel::setSourceTreeModel( TreeModel* sourceModel )
-{
-    m_model = sourceModel;
-
-    if ( m_model )
-    {
-        if ( m_model->metaObject()->indexOfSignal( "trackCountChanged(uint)" ) > -1 )
-            connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), SIGNAL( sourceTrackCountChanged( unsigned int ) ) );
-
-        connect( m_model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( onRowsInserted( QModelIndex, int, int ) ) );
-        connect( m_model, SIGNAL( modelReset() ), SLOT( onModelReset() ) );
-    }
-
-    QSortFilterProxyModel::setSourceModel( sourceModel );
-}
-
-
-void
-TreeProxyModel::onRowsInserted( const QModelIndex& parent, int /* start */, int /* end */ )
-{
-    if ( m_filter.isEmpty() )
-        return;
-    if ( sender() != m_model )
-        return;
-
-    TreeModelItem* pi = m_model->itemFromIndex( m_model->index( parent.row(), 0, parent.parent() ) );
-    if ( pi->artist().isNull() )
-        return;
-
-    DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( m_model->collection() );
-    cmd->setArtist( pi->artist() );
-    cmd->setFilter( m_filter );
-
-    connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
-                    SLOT( onFilterAlbums( QList<Tomahawk::album_ptr> ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-TreeProxyModel::onModelReset()
-{
-    m_cache.clear();
-    m_artistsFilter.clear();
-    m_albumsFilter.clear();
-}
-
-
-void
-TreeProxyModel::newFilterFromPlaylistInterface( const QString &pattern )
-{
-    emit filteringStarted();
-
-    m_filter = pattern;
-    m_albumsFilter.clear();
-
-    if ( m_artistsFilterCmd )
-    {
-        disconnect( m_artistsFilterCmd, SIGNAL( artists( QList<Tomahawk::artist_ptr> ) ),
-                    this,                 SLOT( onFilterArtists( QList<Tomahawk::artist_ptr> ) ) );
-
-        m_artistsFilterCmd = 0;
-    }
-
-    if ( m_filter.isEmpty() )
-    {
-        filterFinished();
-    }
-    else
-    {
-        DatabaseCommand_AllArtists* cmd = new DatabaseCommand_AllArtists( m_model->collection() );
-        cmd->setFilter( pattern );
-        m_artistsFilterCmd = cmd;
-
-        connect( cmd, SIGNAL( artists( QList<Tomahawk::artist_ptr> ) ),
-                        SLOT( onFilterArtists( QList<Tomahawk::artist_ptr> ) ) );
-
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-    }
-}
-
-
-void
-TreeProxyModel::onFilterArtists( const QList<Tomahawk::artist_ptr>& artists )
-{
-    bool finished = true;
-    m_artistsFilter = artists;
-    m_artistsFilterCmd = 0;
-
-    foreach ( const Tomahawk::artist_ptr& artist, artists )
-    {
-        QModelIndex idx = m_model->indexFromArtist( artist );
-        if ( m_model->rowCount( idx ) )
-        {
-            finished = false;
-
-            DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( m_model->collection() );
-            cmd->setArtist( artist );
-            cmd->setFilter( m_filter );
-
-            connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
-                            SLOT( onFilterAlbums( QList<Tomahawk::album_ptr> ) ) );
-
-            Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-        }
-    }
-
-    if ( finished )
-        filterFinished();
-}
-
-
-void
-TreeProxyModel::onFilterAlbums( const QList<Tomahawk::album_ptr>& albums )
-{
-    foreach ( const Tomahawk::album_ptr& album, albums )
-        m_albumsFilter << album->id();
-
-    filterFinished();
-}
-
-
-void
-TreeProxyModel::filterFinished()
-{
-    m_artistsFilterCmd = 0;
-
-    if ( qobject_cast< Tomahawk::TreeProxyModelPlaylistInterface* >( m_playlistInterface.data() )->vanillaFilter() != m_filter )
-    {
-        emit filterChanged( m_filter );
-    }
-
-    qobject_cast< Tomahawk::TreeProxyModelPlaylistInterface* >( m_playlistInterface )->setVanillaFilter( m_filter );
-    setFilterRegExp( m_filter );
-
-    qobject_cast< Tomahawk::TreeProxyModelPlaylistInterface* >( m_playlistInterface )->sendTrackCount();
-
-    emit filteringFinished();
-}
-
-
-bool
-TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
-{
-    TreeModelItem* item = sourceModel()->itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
-    Q_ASSERT( item );
-
-    if ( m_model->mode() == Tomahawk::DatabaseMode && !item->result().isNull() )
-    {
-        QList< Tomahawk::result_ptr > rl = m_cache.values( sourceParent );
-        foreach ( const Tomahawk::result_ptr& cachedResult, rl )
-        {
-            if ( cachedResult.isNull() )
-                continue;
-
-            if ( cachedResult->track() == item->result()->track() &&
-               ( cachedResult->albumpos() == item->result()->albumpos() || cachedResult->albumpos() == 0 ) )
-            {
-                return ( cachedResult.data() == item->result().data() );
-            }
-        }
-
-        for ( int i = 0; i < sourceModel()->rowCount( sourceParent ); i++ )
-        {
-            if ( i == sourceRow )
-                continue;
-
-            TreeModelItem* ti = sourceModel()->itemFromIndex( sourceModel()->index( i, 0, sourceParent ) );
-
-            if ( ti->name() == item->name() &&
-               ( ti->result()->albumpos() == item->result()->albumpos() || ti->result()->albumpos() == 0 || item->result()->albumpos() == 0 ) )
-            {
-                if ( !item->result()->isOnline() && ti->result()->isOnline() )
-                    return false;
-
-                if ( !item->result()->collection()->source()->isLocal() && ti->result()->collection()->source()->isLocal() )
-                    return false;
-            }
-        }
-    }
-
-    bool accepted = false;
-    if ( m_filter.isEmpty() )
-        accepted = true;
-    else if ( !item->artist().isNull() )
-        accepted = m_artistsFilter.contains( item->artist() );
-    else if ( !item->album().isNull() )
-        accepted = m_albumsFilter.contains( item->album()->id() );
-
-    if ( !accepted )
-    {
-        QStringList sl = m_filter.split( " ", QString::SkipEmptyParts );
-        foreach( const QString& s, sl )
-        {
-            if ( !item->name().contains( s, Qt::CaseInsensitive ) &&
-                 !item->albumName().contains( s, Qt::CaseInsensitive ) &&
-                 !item->artistName().contains( s, Qt::CaseInsensitive ) )
-            {
-                return false;
-            }
-        }
-    }
-
-    m_cache.insertMulti( sourceParent, item->result() );
-    return true;
-}
-
-
-bool
-TreeProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
-{
-    TreeModelItem* p1 = sourceModel()->itemFromIndex( left );
-    TreeModelItem* p2 = sourceModel()->itemFromIndex( right );
-
-    if ( !p1 )
-        return true;
-    if ( !p2 )
-        return false;
-
-/*    if ( !p1->result().isNull() && p2->result().isNull() )
-        return true;
-    if ( p1->result().isNull() && !p2->result().isNull() )
-        return false;*/
-
-    unsigned int albumpos1 = 0;
-    unsigned int albumpos2 = 0;
-    unsigned int discnumber1 = 0;
-    unsigned int discnumber2 = 0;
-    if ( !p1->query().isNull() )
-    {
-        albumpos1 = p1->query()->albumpos();
-        discnumber1 = p1->query()->discnumber();
-    }
-    if ( !p2->query().isNull() )
-    {
-        albumpos2 = p2->query()->albumpos();
-        discnumber2 = p2->query()->discnumber();
-    }
-    if ( !p1->result().isNull() )
-    {
-        if ( albumpos1 == 0 )
-            albumpos1 = p1->result()->albumpos();
-        if ( discnumber1 == 0 )
-            discnumber1 = p1->result()->discnumber();
-    }
-    if ( !p2->result().isNull() )
-    {
-        if ( albumpos2 == 0 )
-            albumpos2 = p2->result()->albumpos();
-        if ( discnumber2 == 0 )
-            discnumber2 = p2->result()->discnumber();
-    }
-    discnumber1 = qMax( 1, (int)discnumber1 );
-    discnumber2 = qMax( 1, (int)discnumber2 );
-
-    if ( discnumber1 != discnumber2 )
-    {
-        return discnumber1 < discnumber2;
-    }
-    else
-    {
-        if ( albumpos1 != albumpos2 )
-            return albumpos1 < albumpos2;
-    }
-
-    const QString& lefts = textForItem( p1 );
-    const QString& rights = textForItem( p2 );
-    if ( lefts == rights )
-        return (qint64)&p1 < (qint64)&p2;
-
-    return QString::localeAwareCompare( lefts, rights ) < 0;
-}
-
-
-void
-TreeProxyModel::removeIndex( const QModelIndex& index )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( !sourceModel() )
-        return;
-    if ( index.column() > 0 )
-        return;
-
-    sourceModel()->removeIndex( mapToSource( index ) );
-}
-
-
-void
-TreeProxyModel::removeIndexes( const QList<QModelIndex>& indexes )
-{
-    if ( !sourceModel() )
-        return;
-
-    foreach( const QModelIndex& idx, indexes )
-    {
-        removeIndex( idx );
-    }
-}
-
-
-QString
-TreeProxyModel::textForItem( TreeModelItem* item ) const
-{
-    if ( !item )
-        return QString();
-
-    if ( !item->artist().isNull() )
-    {
-        return item->artist()->sortname();
-    }
-    else if ( !item->album().isNull() )
-    {
-        return DatabaseImpl::sortname( item->album()->name() );
-    }
-    else if ( !item->result().isNull() )
-    {
-        return DatabaseImpl::sortname( item->result()->track() );
-    }
-    else if ( !item->query().isNull() )
-    {
-        return item->query()->track();
-    }
-
-    return QString();
-}
-
-
-Tomahawk::playlistinterface_ptr
-TreeProxyModel::playlistInterface()
-{
-    if ( m_playlistInterface.isNull() )
-    {
-        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::TreeProxyModelPlaylistInterface( this ) );
-    }
-
-    return m_playlistInterface;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treeproxymodel.h Deleted

@@ -1,96 +0,0 @@
-/* === 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
- *   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 TREEPROXYMODEL_H
-#define TREEPROXYMODEL_H
-
-#include <QSortFilterProxyModel>
-
-#include "playlistinterface.h"
-#include "treemodel.h"
-
-#include "dllmacro.h"
-
-class DatabaseCommand_AllArtists;
-
-namespace Tomahawk
-{
-    class TreeProxyModelPlaylistInterface;
-}
-
-class DLLEXPORT TreeProxyModel : public QSortFilterProxyModel
-{
-Q_OBJECT
-
-public:
-    explicit TreeProxyModel( QObject* parent = 0 );
-    virtual ~TreeProxyModel() {}
-
-    virtual TreeModel* sourceModel() const { return m_model; }
-    virtual void setSourceTreeModel( TreeModel* sourceModel );
-    virtual void setSourceModel( QAbstractItemModel* sourceModel );
-
-    virtual QPersistentModelIndex currentIndex() const;
-    virtual void setCurrentIndex( const QModelIndex& index ) { m_model->setCurrentItem( mapToSource( index ) ); }
-
-    virtual void newFilterFromPlaylistInterface( const QString &pattern );
-
-    virtual void removeIndex( const QModelIndex& index );
-    virtual void removeIndexes( const QList<QModelIndex>& indexes );
-
-    virtual int albumCount() const { return rowCount( QModelIndex() ); }
-
-    virtual TreeModelItem* itemFromIndex( const QModelIndex& index ) const { return sourceModel()->itemFromIndex( index ); }
-
-    virtual Tomahawk::playlistinterface_ptr playlistInterface();
-
-signals:
-    void filterChanged( const QString& filter );
-    void filteringStarted();
-    void filteringFinished();
-
-protected:
-    bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const;
-    bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
-
-private slots:
-    void onRowsInserted( const QModelIndex& parent, int start, int end );
-
-    void onFilterArtists( const QList<Tomahawk::artist_ptr>& artists );
-    void onFilterAlbums( const QList<Tomahawk::album_ptr>& albums );
-
-    void onModelReset();
-
-private:
-    void filterFinished();
-    QString textForItem( TreeModelItem* item ) const;
-
-    mutable QMap< QPersistentModelIndex, Tomahawk::result_ptr > m_cache;
-
-    QList<Tomahawk::artist_ptr> m_artistsFilter;
-    QList<int> m_albumsFilter;
-    DatabaseCommand_AllArtists* m_artistsFilterCmd;
-
-     QString m_filter;
-
-    TreeModel* m_model;
-
-    Tomahawk::playlistinterface_ptr m_playlistInterface;
-};
-
-#endif // TREEPROXYMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treeproxymodelplaylistinterface.cpp Deleted

@@ -1,167 +0,0 @@
-/* === 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
- *   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 "treeproxymodelplaylistinterface.h"
-
-#include "treeproxymodel.h"
-
-#include "source.h"
-#include "query.h"
-#include "database/database.h"
-#include "database/databaseimpl.h"
-#include "database/databasecommand_allalbums.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-TreeProxyModelPlaylistInterface::TreeProxyModelPlaylistInterface( TreeProxyModel *proxyModel )
-    : PlaylistInterface()
-    , m_proxyModel( proxyModel )
-    , m_repeatMode( PlaylistInterface::NoRepeat )
-    , m_shuffled( false )
-{
-}
-
-
-TreeProxyModelPlaylistInterface::~TreeProxyModelPlaylistInterface()
-{
-    m_proxyModel.clear();
-}
-
-
-QString
-TreeProxyModelPlaylistInterface::filter() const
-{
-    if ( m_proxyModel.isNull() )
-        return 0;
-    TreeProxyModel* proxyModel = m_proxyModel.data();
-    return proxyModel->filterRegExp().pattern();
-}
-
-
-void
-TreeProxyModelPlaylistInterface::setFilter( const QString& pattern )
-{
-    if ( m_proxyModel.isNull() )
-        return;
-    m_proxyModel.data()->newFilterFromPlaylistInterface( pattern );
-}
-
-
-int
-TreeProxyModelPlaylistInterface::unfilteredTrackCount() const
-{
-    if ( m_proxyModel.isNull() )
-        return 0;
-    TreeProxyModel* proxyModel = m_proxyModel.data();
-    return proxyModel->sourceModel()->rowCount( QModelIndex() );
-}
-
-
-int
-TreeProxyModelPlaylistInterface::trackCount() const
-{
-    if ( m_proxyModel.isNull() )
-        return 0;
-    TreeProxyModel* proxyModel = m_proxyModel.data();
-    return proxyModel->rowCount( QModelIndex() );
-}
-
-
-bool
-TreeProxyModelPlaylistInterface::hasNextItem()
-{
-    return !( siblingItem( 1, true ).isNull() );
-}
-
-
-Tomahawk::result_ptr
-TreeProxyModelPlaylistInterface::siblingItem( int itemsAway )
-{
-    return siblingItem( itemsAway, false );
-}
-
-
-Tomahawk::result_ptr
-TreeProxyModelPlaylistInterface::siblingItem( int itemsAway, bool readOnly )
-{
-    if ( m_proxyModel.isNull() )
-        return Tomahawk::result_ptr();
-    TreeProxyModel* proxyModel = m_proxyModel.data();
-
-    QModelIndex idx = proxyModel->currentIndex();
-    if ( !idx.isValid() )
-        return Tomahawk::result_ptr();
-
-    if ( m_shuffled )
-    {
-        idx = proxyModel->index( qrand() % proxyModel->rowCount( idx.parent() ), 0, idx.parent() );
-    }
-    else
-    {
-        if ( m_repeatMode != PlaylistInterface::RepeatOne )
-            idx = proxyModel->index( idx.row() + ( itemsAway > 0 ? 1 : -1 ), 0, idx.parent() );
-    }
-
-    if ( !idx.isValid() && m_repeatMode == PlaylistInterface::RepeatAll )
-    {
-        if ( itemsAway > 0 )
-        {
-            // reset to first item
-            idx = proxyModel->index( 0, 0, proxyModel->currentIndex().parent() );
-        }
-        else
-        {
-            // reset to last item
-            idx = proxyModel->index( proxyModel->rowCount( proxyModel->currentIndex().parent() ) - 1, 0, proxyModel->currentIndex().parent() );
-        }
-    }
-
-    // Try to find the next available PlaylistItem (with results)
-    while ( idx.isValid() )
-    {
-        TreeModelItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( idx ) );
-        if ( item && !item->result().isNull() && item->result()->isOnline() )
-        {
-            qDebug() << "Next PlaylistItem found:" << item->result()->url();
-            if ( !readOnly )
-                proxyModel->setCurrentIndex( idx );
-            return item->result();
-        }
-
-        idx = proxyModel->index( idx.row() + ( itemsAway > 0 ? 1 : -1 ), 0, idx.parent() );
-    }
-
-    if ( !readOnly )
-        proxyModel->setCurrentIndex( QModelIndex() );
-    return Tomahawk::result_ptr();
-}
-
-
-Tomahawk::result_ptr
-TreeProxyModelPlaylistInterface::currentItem() const
-{
-    if ( m_proxyModel.isNull() )
-        return Tomahawk::result_ptr();
-    TreeProxyModel* proxyModel = m_proxyModel.data();
-
-    TreeModelItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( proxyModel->currentIndex() ) );
-    if ( item && !item->result().isNull() && item->result()->isOnline() )
-        return item->result();
-    return Tomahawk::result_ptr();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/treeproxymodelplaylistinterface.h Deleted

@@ -1,89 +0,0 @@
-/* === 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
- *   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 TREEPROXYMODELPLAYLISTINTERFACE_H
-#define TREEPROXYMODELPLAYLISTINTERFACE_H
-
-#include "playlistinterface.h"
-#include "treemodel.h"
-
-#include "dllmacro.h"
-
-class DatabaseCommand_AllArtists;
-class TreeProxyModel;
-
-namespace Tomahawk
-{
-
-class DLLEXPORT TreeProxyModelPlaylistInterface : public Tomahawk::PlaylistInterface
-{
-Q_OBJECT
-
-public:
-    explicit TreeProxyModelPlaylistInterface( TreeProxyModel *proxyModel );
-    virtual ~TreeProxyModelPlaylistInterface();
-
-    virtual QList< Tomahawk::query_ptr > tracks() { Q_ASSERT( FALSE ); QList< Tomahawk::query_ptr > queries; return queries; }
-
-    virtual int unfilteredTrackCount() const;
-    virtual int trackCount() const;
-
-    virtual bool hasNextItem();
-    virtual Tomahawk::result_ptr currentItem() const;
-    virtual Tomahawk::result_ptr siblingItem( int direction );
-    virtual Tomahawk::result_ptr siblingItem( int direction, bool readOnly );
-
-    virtual QString filter() const;
-    virtual void setFilter( const QString& pattern );
-
-    virtual QString vanillaFilter() const { return PlaylistInterface::filter(); }
-    virtual void setVanillaFilter( const QString &filter ) { PlaylistInterface::setFilter( filter ); }
-
-    virtual void sendTrackCount() { emit trackCountChanged( trackCount() ); }
-
-    virtual PlaylistInterface::RepeatMode repeatMode() const { return m_repeatMode; }
-    virtual bool shuffled() const { return m_shuffled; }
-    virtual PlaylistInterface::ViewMode viewMode() const { return PlaylistInterface::Tree; }
-
-signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void trackCountChanged( unsigned int tracks );
-    void sourceTrackCountChanged( unsigned int tracks );
-
-    void filterChanged( const QString& filter );
-    void filteringStarted();
-    void filteringFinished();
-
-    void nextTrackReady();
-
-public slots:
-    virtual void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
-    virtual void setShuffled( bool enabled ) { m_shuffled = enabled; emit shuffleModeChanged( enabled ); }
-
-private:
-    QWeakPointer< TreeProxyModel > m_proxyModel;
-
-    RepeatMode m_repeatMode;
-    bool m_shuffled;
-};
-
-} //ns
-
-#endif // TREEPROXYMODELPLAYLISTINTERFACE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlistinterface.cpp Deleted

@@ -1,47 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 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 "playlistinterface.h"
-#include "utils/logger.h"
-#include "result.h"
-
-using namespace Tomahawk;
-
-PlaylistInterface::PlaylistInterface ()
-    : QObject()
-    , m_latchMode( StayOnSong )
-{
-    m_id = uuid();
-    qRegisterMetaType<Tomahawk::PlaylistInterface::RepeatMode>( "Tomahawk::PlaylistInterface::RepeatMode" );
-}
-
-PlaylistInterface::~PlaylistInterface()
-{
-}
-
-result_ptr
-PlaylistInterface::previousItem()
-{
-     return siblingItem( -1 );
-}
-
-result_ptr
-PlaylistInterface::nextItem()
-{
-     return siblingItem( 1 );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlistinterface.h Deleted

@@ -1,109 +0,0 @@
-/* === 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
- *   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 PLAYLISTINTERFACE_H
-#define PLAYLISTINTERFACE_H
-
-#include <QtCore/QModelIndex>
-
-#include "typedefs.h"
-#include "dllmacro.h"
-#include "utils/logger.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT PlaylistInterface : public QObject
-{
-Q_OBJECT
-
-public:
-    enum RepeatMode { NoRepeat, RepeatOne, RepeatAll };
-    Q_ENUMS( RepeatMode )
-    enum ViewMode { Unknown, Tree, Flat, Album };
-    enum SeekRestrictions { NoSeekRestrictions, NoSeek };
-    enum SkipRestrictions { NoSkipRestrictions, NoSkipForwards, NoSkipBackwards, NoSkip };
-    enum RetryMode { NoRetry, Retry };
-    enum LatchMode { StayOnSong, RealTime };
-
-    explicit PlaylistInterface();
-    virtual ~PlaylistInterface();
-
-    const QString id() { return m_id; }
-    
-    virtual QList< Tomahawk::query_ptr > tracks() = 0;
-
-    virtual int unfilteredTrackCount() const = 0;
-    virtual int trackCount() const = 0;
-
-    virtual Tomahawk::result_ptr currentItem() const = 0;
-    virtual Tomahawk::result_ptr previousItem();
-    virtual bool hasNextItem() { return true; }
-    virtual Tomahawk::result_ptr nextItem();
-    virtual Tomahawk::result_ptr siblingItem( int itemsAway ) = 0;
-
-    virtual PlaylistInterface::RepeatMode repeatMode() const = 0;
-
-    virtual bool shuffled() const = 0;
-
-    virtual PlaylistInterface::ViewMode viewMode() const { return Unknown; }
-    
-    virtual PlaylistInterface::SeekRestrictions seekRestrictions() const { return NoSeekRestrictions; }
-    virtual PlaylistInterface::SkipRestrictions skipRestrictions() const { return NoSkipRestrictions; }
-
-    virtual PlaylistInterface::RetryMode retryMode() const { return NoRetry; }
-    virtual quint32 retryInterval() const { return 30000; }
-
-    virtual PlaylistInterface::LatchMode latchMode() const { return m_latchMode; }
-    virtual void setLatchMode( PlaylistInterface::LatchMode latchMode ) { m_latchMode = latchMode; }
-    
-    virtual QString filter() const { return m_filter; }
-    virtual void setFilter( const QString& pattern ) { m_filter = pattern; }
-
-    virtual void reset() {}
-
-    //TODO: Get rid of the next two functions once all playlsitinterfaces are factored out
-    // Some playlist interfaces can wrap other interfaces. When checking for top-level
-    // equality (say, to compare the currently playing interface) this might be needed
-    virtual bool hasChildInterface( Tomahawk::playlistinterface_ptr ) { return false; }
-
-public slots:
-    virtual void setRepeatMode( RepeatMode mode ) = 0;
-    virtual void setShuffled( bool enabled ) = 0;
-
-signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-    void trackCountChanged( unsigned int tracks );
-    void sourceTrackCountChanged( unsigned int tracks );
-    void latchModeChanged( Tomahawk::PlaylistInterface::LatchMode mode );
-    void nextTrackReady();
-
-protected:
-    LatchMode m_latchMode;
-    
-private:
-    Q_DISABLE_COPY( PlaylistInterface )
-
-    QString m_id;
-    QString m_filter;
-};
-
-};
-
-#endif // PLAYLISTINTERFACE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlistplaylistinterface.cpp Deleted

@@ -1,64 +0,0 @@
-/* === 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
- *   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 "playlistplaylistinterface.h"
-
-#include "playlist.h"
-#include "sourcelist.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-PlaylistPlaylistInterface::PlaylistPlaylistInterface( Tomahawk::Playlist* playlist )
-    : Tomahawk::PlaylistInterface()
-    , m_playlist( playlist )
-{
-}
-
-
-PlaylistPlaylistInterface::~PlaylistPlaylistInterface()
-{
-    m_playlist.clear();
-}
-
-
-int
-PlaylistPlaylistInterface::unfilteredTrackCount() const
-{
-    return ( m_playlist.isNull() ? 0 : m_playlist.data()->entries().count() );
-}
-
-
-int
-PlaylistPlaylistInterface::trackCount() const
-{
-    return ( m_playlist.isNull() ? 0 : m_playlist.data()->entries().count() );
-}
-
-
-QList< Tomahawk::query_ptr >
-PlaylistPlaylistInterface::tracks()
-{
-    QList<Tomahawk::query_ptr> queries;
-    foreach( const plentry_ptr& p, ( m_playlist.isNull() ? QList< Tomahawk::plentry_ptr >() : m_playlist.data()->entries() ) )
-        queries << p->query();
-
-    return queries;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlistplaylistinterface.h Deleted

@@ -1,74 +0,0 @@
-/* === 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
- *   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 PLAYLISTPLAYLISTINTERFACE_H
-#define PLAYLISTPLAYLISTINTERFACE_H
-
-#include <QObject>
-#include <QList>
-#include <QSharedPointer>
-
-#include "typedefs.h"
-#include "result.h"
-#include "playlistinterface.h"
-#include "query.h"
-
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT PlaylistPlaylistInterface : public Tomahawk::PlaylistInterface
-{
-Q_OBJECT
-
-public:
-    PlaylistPlaylistInterface( Tomahawk::Playlist* playlist );
-    virtual ~PlaylistPlaylistInterface();
-
-    virtual QList<Tomahawk::query_ptr> tracks();
-
-    virtual int unfilteredTrackCount() const;
-    virtual int trackCount() const;
-
-    virtual bool hasNextItem() { return false; }
-    virtual Tomahawk::result_ptr currentItem() const { return m_currentItem; }
-
-    virtual Tomahawk::result_ptr siblingItem( int /*itemsAway*/ ) { return result_ptr(); }
-
-    virtual PlaylistInterface::RepeatMode repeatMode() const { return PlaylistInterface::NoRepeat; }
-    virtual bool shuffled() const { return false; }
-
-    virtual void setFilter( const QString& /*pattern*/ ) {}
-
-public slots:
-    virtual void setRepeatMode( PlaylistInterface::RepeatMode ) {}
-    virtual void setShuffled( bool ) {}
-
-private:
-    PlaylistPlaylistInterface();
-    Q_DISABLE_COPY( PlaylistPlaylistInterface )
-
-    QWeakPointer< Tomahawk::Playlist > m_playlist;
-
-    result_ptr m_currentItem;
-};
-
-}
-
-#endif // PLAYLISTPLAYLISTINTERFACE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/query.cpp Deleted

@@ -1,664 +0,0 @@
-/* === 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
- *   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 "query.h"
-
-#include <QtAlgorithms>
-
-#include "database/database.h"
-#include "database/databaseimpl.h"
-#include "database/databasecommand_logplayback.h"
-#include "database/databasecommand_playbackhistory.h"
-#include "database/databasecommand_loadplaylistentries.h"
-#include "database/databasecommand_loadsocialactions.h"
-#include "database/databasecommand_socialaction.h"
-#include "album.h"
-#include "collection.h"
-#include "pipeline.h"
-#include "resolver.h"
-#include "sourcelist.h"
-#include "audio/audioengine.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-query_ptr
-Query::get( const QString& artist, const QString& track, const QString& album, const QID& qid, bool autoResolve )
-{
-    if ( qid.isEmpty() )
-        autoResolve = false;
-
-    query_ptr q = query_ptr( new Query( artist, track, album, qid, autoResolve ), &QObject::deleteLater );
-    q->setWeakRef( q.toWeakRef() );
-
-    if ( autoResolve )
-        Pipeline::instance()->resolve( q );
-
-    return q;
-}
-
-
-query_ptr
-Query::get( const QString& query, const QID& qid )
-{
-
-    query_ptr q = query_ptr( new Query( query, qid ), &QObject::deleteLater );
-    q->setWeakRef( q.toWeakRef() );
-
-    if ( !qid.isEmpty() )
-        Pipeline::instance()->resolve( q );
-
-    return q;
-}
-
-
-Query::Query( const QString& artist, const QString& track, const QString& album, const QID& qid, bool autoResolve )
-    : m_qid( qid )
-    , m_artist( artist )
-    , m_album( album )
-    , m_track( track )
-    , m_socialActionsLoaded( false )
-{
-    init();
-
-    if ( autoResolve )
-    {
-        connect( Database::instance(), SIGNAL( indexReady() ), SLOT( refreshResults() ), Qt::QueuedConnection );
-    }
-
-    connect( Pipeline::instance(), SIGNAL( resolverAdded( Resolver* ) ),
-             SLOT( onResolverAdded() ), Qt::QueuedConnection );
-    connect( Pipeline::instance(), SIGNAL( resolverRemoved( Resolver* ) ),
-             SLOT( onResolverRemoved() ), Qt::QueuedConnection );
-}
-
-
-Query::Query( const QString& query, const QID& qid )
-    : m_qid( qid )
-    , m_fullTextQuery( query )
-{
-    init();
-
-    if ( !qid.isEmpty() )
-    {
-        connect( Database::instance(), SIGNAL( indexReady() ), SLOT( refreshResults() ), Qt::QueuedConnection );
-    }
-}
-
-
-Query::~Query()
-{
-    QMutexLocker lock( &m_mutex );
-    m_ownRef.clear();
-    m_results.clear();
-}
-
-
-void
-Query::init()
-{
-    m_resolveFinished = false;
-    m_solved = false;
-    m_playable = false;
-    m_duration = -1;
-    m_albumpos = 0;
-    m_discnumber = 0;
-
-    updateSortNames();
-}
-
-
-void
-Query::updateSortNames()
-{
-    if ( isFullTextQuery() )
-    {
-        m_artistSortname = DatabaseImpl::sortname( m_fullTextQuery, true );
-        m_composerSortName = DatabaseImpl::sortname( m_composer, true );
-        m_albumSortname = DatabaseImpl::sortname( m_fullTextQuery );
-        m_trackSortname = m_albumSortname;
-    }
-    else
-    {
-        m_artistSortname = DatabaseImpl::sortname( m_artist, true );
-        m_composerSortName = DatabaseImpl::sortname( m_composer, true );
-        m_albumSortname = DatabaseImpl::sortname( m_album );
-        m_trackSortname = DatabaseImpl::sortname( m_track );
-    }
-}
-
-
-void
-Query::addResults( const QList< Tomahawk::result_ptr >& newresults )
-{
-    {
-        QMutexLocker lock( &m_mutex );
-
-/*        const QStringList smt = AudioEngine::instance()->supportedMimeTypes();
-        foreach ( const Tomahawk::result_ptr& result, newresults )
-        {
-            if ( !smt.contains( result->mimetype() ) )
-            {
-                tDebug() << "Won't accept result, unsupported mimetype" << result->toString() << result->mimetype();
-            }
-            else
-                m_results.append( result );
-        }*/
-
-        m_results << newresults;
-        qStableSort( m_results.begin(), m_results.end(), Query::resultSorter );
-
-        // hook up signals, and check solved status
-        foreach( const result_ptr& rp, newresults )
-        {
-            connect( rp.data(), SIGNAL( statusChanged() ), SLOT( onResultStatusChanged() ) );
-        }
-    }
-
-    checkResults();
-    emit resultsAdded( newresults );
-}
-
-
-void
-Query::addAlbums( const QList< Tomahawk::album_ptr >& newalbums )
-{
-    {
-        QMutexLocker lock( &m_mutex );
-        m_albums << newalbums;
-    }
-
-    emit albumsAdded( newalbums );
-}
-
-
-void
-Query::addArtists( const QList< Tomahawk::artist_ptr >& newartists )
-{
-    {
-        QMutexLocker lock( &m_mutex );
-        m_artists << newartists;
-    }
-
-    emit artistsAdded( newartists );
-}
-
-
-void
-Query::refreshResults()
-{
-    if ( m_resolveFinished )
-    {
-        m_resolveFinished = false;
-        query_ptr q = m_ownRef.toStrongRef();
-        if ( q )
-            Pipeline::instance()->resolve( q );
-    }
-}
-
-
-void
-Query::onResultStatusChanged()
-{
-    {
-        QMutexLocker lock( &m_mutex );
-        if ( m_results.count() )
-            qStableSort( m_results.begin(), m_results.end(), Query::resultSorter );
-    }
-
-    checkResults();
-    emit resultsChanged();
-}
-
-
-void
-Query::removeResult( const Tomahawk::result_ptr& result )
-{
-    {
-        QMutexLocker lock( &m_mutex );
-        m_results.removeAll( result );
-    }
-
-    emit resultsRemoved( result );
-    checkResults();
-}
-
-
-void
-Query::onResolvingFinished()
-{
-    tDebug( LOGVERBOSE ) << "Finished resolving:" << toString();
-    if ( !m_resolveFinished )
-    {
-        m_resolveFinished = true;
-        m_resolvers.clear();
-
-        emit resolvingFinished( m_solved );
-    }
-}
-
-
-void
-Query::onResolverAdded()
-{
-    if ( !solved() )
-    {
-        refreshResults();
-    }
-}
-
-
-void
-Query::onResolverRemoved()
-{
-    if ( !solved() )
-    {
-        refreshResults();
-    }
-}
-
-
-QList< result_ptr >
-Query::results() const
-{
-    QMutexLocker lock( &m_mutex );
-    return m_results;
-}
-
-
-unsigned int
-Query::numResults() const
-{
-    QMutexLocker lock( &m_mutex );
-    return m_results.length();
-}
-
-
-QID
-Query::id() const
-{
-    if ( m_qid.isEmpty() )
-    {
-        m_qid = uuid();
-    }
-
-    return m_qid;
-}
-
-
-void
-Query::setPlayedBy( const Tomahawk::source_ptr& source, unsigned int playtime )
-{
-    m_playedBy.first = source;
-    m_playedBy.second = playtime;
-}
-
-
-bool
-Query::resultSorter( const result_ptr& left, const result_ptr& right )
-{
-    const float ls = left->score();
-    const float rs = right->score();
-
-    if ( ls == rs )
-    {
-        if ( !left->collection().isNull() && left->collection()->source()->isLocal() )
-            return true;
-        else
-            return false;
-    }
-
-    return ls > rs;
-}
-
-
-void
-Query::setCurrentResolver( Tomahawk::Resolver* resolver )
-{
-    m_resolvers << resolver;
-}
-
-
-Tomahawk::Resolver*
-Query::currentResolver() const
-{
-    int x = m_resolvers.count();
-    while ( --x )
-    {
-        QWeakPointer< Resolver > r = m_resolvers.at( x );
-        if ( r.isNull() )
-            continue;
-
-        return r.data();
-    }
-
-    return 0;
-}
-
-
-void
-Query::clearResults()
-{
-    foreach( const result_ptr& rp, m_results )
-    {
-        removeResult( rp );
-    }
-}
-
-
-void
-Query::checkResults()
-{
-    bool playable = false;
-    bool solved = false;
-
-    {
-        QMutexLocker lock( &m_mutex );
-
-        // hook up signals, and check solved status
-        foreach( const result_ptr& rp, m_results )
-        {
-            if ( rp->score() > 0.0 && rp->collection().isNull() )
-            {
-                playable = true;
-            }
-            else if ( !rp->collection().isNull() && rp->collection()->source()->isOnline() )
-            {
-                playable = true;
-            }
-
-            if ( rp->score() > 0.99 )
-            {
-                solved = true;
-            }
-
-            if ( playable )
-                break;
-        }
-    }
-
-    if ( m_playable && !playable )
-    {
-        refreshResults();
-    }
-
-    if ( m_playable != playable )
-    {
-        m_playable = playable;
-        emit playableStateChanged( m_playable );
-    }
-    if ( m_solved != solved )
-    {
-        m_solved = solved;
-        emit solvedStateChanged( m_solved );
-    }
-}
-
-
-QVariant
-Query::toVariant() const
-{
-    QVariantMap m;
-    m.insert( "artist", artist() );
-    m.insert( "album", album() );
-    m.insert( "track", track() );
-    m.insert( "duration", duration() );
-    m.insert( "qid", id() );
-
-    return m;
-}
-
-
-QString
-Query::toString() const
-{
-    if ( !isFullTextQuery() )
-        return QString( "Query(%1, %2 - %3)" ).arg( id() ).arg( artist() ).arg( track() );
-    else
-        return QString( "Query(%1, Fulltext: %2)" ).arg( id() ).arg( fullTextQuery() );
-}
-
-
-// TODO make clever (ft. featuring live (stuff) etc)
-float
-Query::howSimilar( const Tomahawk::result_ptr& r )
-{
-    // result values
-    const QString rArtistname = r->artist()->sortname();
-    const QString rAlbumname  = DatabaseImpl::sortname( r->album()->name() );
-    const QString rTrackname  = DatabaseImpl::sortname( r->track() );
-
-    // normal edit distance
-    int artdist = levenshtein( m_artistSortname, rArtistname );
-    int albdist = levenshtein( m_albumSortname, rAlbumname );
-    int trkdist = levenshtein( m_trackSortname, rTrackname );
-
-    // max length of name
-    int mlart = qMax( m_artistSortname.length(), rArtistname.length() );
-    int mlalb = qMax( m_albumSortname.length(), rAlbumname.length() );
-    int mltrk = qMax( m_trackSortname.length(), rTrackname.length() );
-
-    // distance scores
-    float dcart = (float)( mlart - artdist ) / mlart;
-    float dcalb = (float)( mlalb - albdist ) / mlalb;
-    float dctrk = (float)( mltrk - trkdist ) / mltrk;
-
-    if ( isFullTextQuery() )
-    {
-        const QString artistTrackname = DatabaseImpl::sortname( fullTextQuery() );
-        const QString rArtistTrackname  = DatabaseImpl::sortname( r->artist()->name() + " " + r->track() );
-
-        int atrdist = levenshtein( artistTrackname, rArtistTrackname );
-        int mlatr = qMax( artistTrackname.length(), rArtistTrackname.length() );
-        float dcatr = (float)( mlatr - atrdist ) / mlatr;
-
-        float res = qMax( dcart, dcalb );
-        res = qMax( res, dcatr );
-        return qMax( res, dctrk );
-    }
-    else
-    {
-        // don't penalize for missing album name
-        if ( m_albumSortname.isEmpty() )
-            dcalb = 1.0;
-
-        // weighted, so album match is worth less than track title
-        float combined = ( dcart * 4 + dcalb + dctrk * 5 ) / 10;
-        return combined;
-    }
-}
-
-
-QPair< Tomahawk::source_ptr, unsigned int >
-Query::playedBy() const
-{
-    return m_playedBy;
-}
-
-
-void
-Query::loadSocialActions()
-{
-    m_socialActionsLoaded = true;
-    query_ptr q = m_ownRef.toStrongRef();
-
-    DatabaseCommand_LoadSocialActions* cmd = new DatabaseCommand_LoadSocialActions( q );
-    connect( cmd, SIGNAL( finished() ), SLOT( onSocialActionsLoaded() ) );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
-}
-
-
-void
-Query::onSocialActionsLoaded()
-{
-    parseSocialActions();
-
-    emit socialActionsLoaded();
-}
-
-
-void
-Query::setAllSocialActions( const QList< SocialAction >& socialActions )
-{
-    m_allSocialActions = socialActions;
-}
-
-
-QList< SocialAction >
-Query::allSocialActions()
-{
-    return m_allSocialActions;
-}
-
-
-void
-Query::parseSocialActions()
-{
-    QListIterator< Tomahawk::SocialAction > it( m_allSocialActions );
-    unsigned int highestTimestamp = 0;
-
-    while ( it.hasNext() )
-    {
-        Tomahawk::SocialAction socialAction;
-        socialAction = it.next();
-        if ( socialAction.timestamp.toUInt() > highestTimestamp && socialAction.source.toInt() == SourceList::instance()->getLocal()->id() )
-        {
-            m_currentSocialActions socialAction.action.toString()  = socialAction.value.toBool();
-        }
-    }
-}
-
-
-bool
-Query::loved()
-{
-    if ( m_socialActionsLoaded )
-    {
-        return m_currentSocialActions "Love" .toBool();
-    }
-    else
-    {
-        loadSocialActions();
-    }
-
-    return false;
-}
-
-
-void
-Query::setLoved( bool loved )
-{
-    query_ptr q = m_ownRef.toStrongRef();
-    if ( q )
-    {
-        m_currentSocialActions "Loved"  = loved;
-
-        Tomahawk::InfoSystem::InfoStringHash trackInfo;
-        trackInfo"title" = track();
-        trackInfo"artist" = artist();
-        trackInfo"album" = album();
-
-        Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
-            id(), Tomahawk::InfoSystem::InfoLove,
-            QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo ) );
-
-        DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction( q, QString( "Love" ), loved ? QString( "true" ) : QString( "false" ) );
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
-    }
-}
-
-
-int
-Query::levenshtein( const QString& source, const QString& target )
-{
-    // Step 1
-    const int n = source.length();
-    const int m = target.length();
-
-    if ( n == 0 )
-        return m;
-    if ( m == 0 )
-        return n;
-
-    // Good form to declare a TYPEDEF
-    typedef QVector< QVector<int> > Tmatrix;
-    Tmatrix matrix;
-    matrix.resize( n + 1 );
-
-    // Size the vectors in the 2.nd dimension. Unfortunately C++ doesn't
-    // allow for allocation on declaration of 2.nd dimension of vec of vec
-    for ( int i = 0; i <= n; i++ )
-    {
-        QVector<int> tmp;
-        tmp.resize( m + 1 );
-        matrix.insert( i, tmp );
-    }
-
-    // Step 2
-    for ( int i = 0; i <= n; i++ )
-        matrixi0 = i;
-    for ( int j = 0; j <= m; j++ )
-        matrix0j = j;
-
-    // Step 3
-    for ( int i = 1; i <= n; i++ )
-    {
-        const QChar s_i = sourcei - 1;
-
-        // Step 4
-        for ( int j = 1; j <= m; j++ )
-        {
-            const QChar t_j = targetj - 1;
-
-            // Step 5
-            int cost;
-            if ( s_i == t_j )
-                cost = 0;
-            else
-                cost = 1;
-
-            // Step 6
-            const int above = matrixi - 1j;
-            const int left = matrixij - 1;
-            const int diag = matrixi - 1j - 1;
-
-            int cell = ( ( ( left + 1 ) > ( diag + cost ) ) ? diag + cost : left + 1 );
-            if ( above + 1 < cell )
-                cell = above + 1;
-
-            // Step 6A: Cover transposition, in addition to deletion,
-            // insertion and substitution. This step is taken from:
-            // Berghel, Hal ; Roach, David : "An Extension of Ukkonen's
-            // Enhanced Dynamic Programming ASM Algorithm"
-            // (http://www.acm.org/~hlb/publications/asm/asm.html)
-            if ( i > 2 && j > 2 )
-            {
-                int trans = matrixi - 2j - 2 + 1;
-
-                if ( source i - 2  != t_j ) trans++;
-                if ( s_i != target j - 2  ) trans++;
-                if ( cell > trans ) cell = trans;
-            }
-            matrixij = cell;
-        }
-    }
-
-    // Step 7
-    return matrixnm;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/query.h Deleted

@@ -1,207 +0,0 @@
-/* === 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
- *   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 QUERY_H
-#define QUERY_H
-
-#include <QObject>
-#include <QMutex>
-#include <QList>
-#include <QVariant>
-
-#include "typedefs.h"
-#include "result.h"
-
-#include "dllmacro.h"
-
-class DatabaseCommand_LogPlayback;
-class DatabaseCommand_PlaybackHistory;
-class DatabaseCommand_LoadPlaylistEntries;
-
-namespace Tomahawk
-{
-
-class Resolver;
-
-class DLLEXPORT Query : public QObject
-{
-Q_OBJECT
-
-friend class ::DatabaseCommand_LogPlayback;
-friend class ::DatabaseCommand_PlaybackHistory;
-friend class ::DatabaseCommand_LoadPlaylistEntries;
-friend class Pipeline;
-
-public:
-    static query_ptr get( const QString& artist, const QString& track, const QString& album, const QID& qid = QString(), bool autoResolve = true );
-    static query_ptr get( const QString& query, const QID& qid );
-
-    virtual ~Query();
-
-    /// returns list of all results so far
-    QList< result_ptr > results() const;
-
-    /// how many results found so far?
-    unsigned int numResults() const;
-
-    QID id() const;
-
-    /// sorter for list of results
-    static bool resultSorter( const result_ptr &left, const result_ptr& right );
-
-    /// true when a perfect result has been found (score of 1.0)
-    bool solved() const { return m_solved; }
-    /// true when any result has been found (score may be less than 1.0)
-    bool playable() const { return m_playable; }
-
-    QString fullTextQuery() const { return m_fullTextQuery; }
-    bool isFullTextQuery() const { return !m_fullTextQuery.isEmpty(); }
-    bool resolvingFinished() const { return m_resolveFinished; }
-    float howSimilar( const Tomahawk::result_ptr& r );
-
-    QPair< Tomahawk::source_ptr, unsigned int > playedBy() const;
-    Tomahawk::Resolver* currentResolver() const;
-    QList< QWeakPointer< Tomahawk::Resolver > > resolvedBy() const { return m_resolvers; }
-
-    void setArtist( const QString& artist ) { m_artist = artist; updateSortNames(); }
-    void setComposer( const QString& composer ) { m_composer = composer; updateSortNames(); }
-    void setAlbum( const QString& album ) { m_album = album; updateSortNames(); }
-    void setTrack( const QString& track ) { m_track = track; updateSortNames(); }
-    void setResultHint( const QString& resultHint ) { m_resultHint = resultHint; }
-    void setDuration( int duration ) { m_duration = duration; }
-    void setAlbumPos( unsigned int albumpos ) { m_albumpos = albumpos; }
-    void setDiscNumber( unsigned int discnumber ) { m_discnumber = discnumber; }
-
-    QVariant toVariant() const;
-    QString toString() const;
-
-    QString resultHint() const { return m_resultHint; }
-    QString artistSortname() const { return m_artistSortname; }
-    QString albumSortname() const { return m_albumSortname; }
-    QString trackSortname() const { return m_trackSortname; }
-    QString artist() const { return m_artist; }
-    QString composer() const { return m_composer; }
-    QString album() const { return m_album; }
-    QString track() const { return m_track; }
-
-    int duration() const { return m_duration; }
-    unsigned int albumpos() const { return m_albumpos; }
-    unsigned int discnumber() const { return m_discnumber; }
-
-    void setResolveFinished( bool resolved ) { m_resolveFinished = resolved; }
-    void setPlayedBy( const Tomahawk::source_ptr& source, unsigned int playtime );
-
-    void setLoved( bool loved );
-    bool loved();
-
-    void loadSocialActions();
-    QList< Tomahawk::SocialAction > allSocialActions();
-    void setAllSocialActions( const QList< Tomahawk::SocialAction >& socialActions );
-
-    QWeakPointer< Tomahawk::Query > weakRef() { return m_ownRef; }
-    void setWeakRef( QWeakPointer< Tomahawk::Query > weakRef ) { m_ownRef = weakRef; }
-
-signals:
-    void resultsAdded( const QList<Tomahawk::result_ptr>& );
-    void resultsRemoved( const Tomahawk::result_ptr& );
-
-    void albumsAdded( const QList<Tomahawk::album_ptr>& );
-    void artistsAdded( const QList<Tomahawk::artist_ptr>& );
-
-    void resultsChanged();
-    void solvedStateChanged( bool state );
-    void playableStateChanged( bool state );
-    void resolvingFinished( bool hasResults );
-
-    // emitted when social actions are loaded
-    void socialActionsLoaded();
-
-public slots:
-    /// (indirectly) called by resolver plugins when results are found
-    void addResults( const QList< Tomahawk::result_ptr >& );
-    void removeResult( const Tomahawk::result_ptr& );
-
-    void addAlbums( const QList< Tomahawk::album_ptr >& );
-    void addArtists( const QList< Tomahawk::artist_ptr >& );
-
-    void onResolvingFinished();
-
-    // resolve if not solved()
-    void onResolverAdded();
-    void onResolverRemoved();
-
-private slots:
-    void onResultStatusChanged();
-    void refreshResults();
-    void onSocialActionsLoaded();
-
-private:
-    Query();
-    explicit Query( const QString& artist, const QString& track, const QString& album, const QID& qid, bool autoResolve );
-    explicit Query( const QString& query, const QID& qid );
-
-    void init();
-
-    void setCurrentResolver( Tomahawk::Resolver* resolver );
-    void clearResults();
-    void checkResults();
-
-    void updateSortNames();
-    static int levenshtein( const QString& source, const QString& target );
-
-    void parseSocialActions();
-
-    QList< Tomahawk::artist_ptr > m_artists;
-    QList< Tomahawk::album_ptr > m_albums;
-    QList< Tomahawk::result_ptr > m_results;
-    bool m_solved;
-    bool m_playable;
-    bool m_resolveFinished;
-    mutable QID m_qid;
-
-    QString m_artistSortname;
-    QString m_composerSortName;
-    QString m_albumSortname;
-    QString m_trackSortname;
-
-    QString m_artist;
-    QString m_composer;
-    QString m_album;
-    QString m_track;
-    QString m_fullTextQuery;
-
-    int m_duration;
-    unsigned int m_albumpos;
-    unsigned int m_discnumber;
-    QString m_resultHint;
-
-    QPair< Tomahawk::source_ptr, unsigned int > m_playedBy;
-    QList< QWeakPointer< Tomahawk::Resolver > > m_resolvers;
-
-    mutable QMutex m_mutex;
-
-    QWeakPointer< Tomahawk::Query > m_ownRef;
-
-    bool m_socialActionsLoaded;
-    QHash< QString, QVariant > m_currentSocialActions;
-    QList< SocialAction > m_allSocialActions;
-};
-
-}; //ns
-
-#endif // QUERY_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/resolver.cpp Deleted

tomahawk-0.4.2.tar.bz2/src/libtomahawk/resolver.h Deleted

@@ -1,57 +0,0 @@
-/* === 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
- *   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 RESOLVER_H
-#define RESOLVER_H
-
-#include <QObject>
-
-#include "query.h"
-
-#include "dllmacro.h"
-
-// implement this if you can resolve queries to content
-
-/*
-    Weight: 1-100, 100 being the best
-    Timeout: some millisecond value, after which we try the next highest
-             weighted resolver
-
-*/
-
-namespace Tomahawk
-{
-
-class DLLEXPORT Resolver : public QObject
-{
-Q_OBJECT
-
-public:
-    Resolver() {}
-
-    virtual QString name() const = 0;
-    virtual unsigned int weight() const = 0;
-    virtual unsigned int timeout() const = 0;
-
-public slots:
-    virtual void resolve( const Tomahawk::query_ptr& query ) = 0;
-};
-
-}; //ns
-
-#endif // RESOLVER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/resolvers/qtscriptresolver.cpp Deleted

@@ -1,606 +0,0 @@
-/* === 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
- *   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 "qtscriptresolver.h"
-
-#include "artist.h"
-#include "album.h"
-#include "config.h"
-#include "pipeline.h"
-#include "sourcelist.h"
-
-#include "network/servent.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-
-#include <QtGui/QMessageBox>
-
-#include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
-
-#include <QtCore/QMetaProperty>
-#include <QtCore/QCryptographicHash>
-
-// FIXME: bloody hack, remove this for 0.3
-// this one adds new functionality to old resolvers
-#define RESOLVER_LEGACY_CODE "var resolver = Tomahawk.resolver.instance ? Tomahawk.resolver.instance : TomahawkResolver;"
-// this one keeps old code invokable
-#define RESOLVER_LEGACY_CODE2 "var resolver = Tomahawk.resolver.instance ? Tomahawk.resolver.instance : window;"
-
-
-QtScriptResolverHelper::QtScriptResolverHelper( const QString& scriptPath, QtScriptResolver* parent )
-    : QObject( parent )
-{
-    m_scriptPath = scriptPath;
-    m_resolver = parent;
-}
-
-
-QByteArray
-QtScriptResolverHelper::readRaw( const QString& fileName )
-{
-    QString path = QFileInfo( m_scriptPath ).absolutePath();
-    // remove directories
-    QString cleanedFileName = QFileInfo( fileName ).fileName();
-    QString absoluteFilePath = path.append( "/" ).append( cleanedFileName );
-
-    QFile file( absoluteFilePath );
-    if ( !file.exists() )
-    {
-        Q_ASSERT(false);
-        return QByteArray();
-    }
-
-    file.open( QIODevice::ReadOnly );
-    return file.readAll();
-}
-
-
-QString
-QtScriptResolverHelper::compress( const QString& data )
-{
-    QByteArray comp = qCompress( data.toLatin1(), 9 );
-    return comp.toBase64();
-}
-
-
-QString
-QtScriptResolverHelper::readCompressed( const QString& fileName )
-{
-    return compress( readRaw( fileName ) );
-}
-
-
-QString
-QtScriptResolverHelper::readBase64( const QString& fileName )
-{
-    return readRaw( fileName ).toBase64();
-}
-
-
-QVariantMap
-QtScriptResolverHelper::resolverData()
-{
-    QVariantMap resolver;
-    resolver"config" = m_resolverConfig;
-    resolver"scriptPath" = m_scriptPath;
-    return resolver;
-}
-
-
-void
-QtScriptResolverHelper::log( const QString& message )
-{
-    tLog() << m_scriptPath << ":" << message;
-}
-
-
-void
-QtScriptResolverHelper::addTrackResults( const QVariantMap& results )
-{
-    qDebug() << "Resolver reporting results:" << results;
-    QList< Tomahawk::result_ptr > tracks = m_resolver->parseResultVariantList( results.value("results").toList() );
-
-    QString qid = results.value("qid").toString();
-
-    Tomahawk::Pipeline::instance()->reportResults( qid, tracks );
-}
-
-
-void
-QtScriptResolverHelper::setResolverConfig( const QVariantMap& config )
-{
-    m_resolverConfig = config;
-}
-
-QString
-QtScriptResolverHelper::hmac( const QByteArray& key, const QByteArray &input )
-{
-#ifdef QCA2_FOUND
-    if ( !QCA::isSupported( "hmac(md5)" ) )
-    {
-        tLog() << "HMAC(md5) not supported with qca-ossl plugin, or qca-ossl plugin is not installed! Unable to generate signature!";
-        return QByteArray();
-    }
-
-    QCA::MessageAuthenticationCode md5hmac1( "hmac(md5)", QCA::SecureArray() );
-    QCA::SymmetricKey keyObject( key );
-    md5hmac1.setup( keyObject );
-
-    md5hmac1.update( QCA::SecureArray( input ) );
-    QCA::SecureArray resultArray = md5hmac1.final();
-
-    QString result = QCA::arrayToHex( resultArray.toByteArray() );
-    return result.toUtf8();
-#else
-    tLog() << "Tomahawk compiled without QCA support, cannot generate HMAC signature";
-    return QString();
-#endif
-}
-
-QString
-QtScriptResolverHelper::md5( const QByteArray& input )
-{
-    QByteArray const digest = QCryptographicHash::hash( input, QCryptographicHash::Md5 );
-    return QString::fromLatin1( digest.toHex() );
-}
-
-void
-QtScriptResolverHelper::addCustomUrlHandler( const QString& protocol, const QString& callbackFuncName )
-{
-    boost::function<QSharedPointer<QIODevice>(Tomahawk::result_ptr)> fac = boost::bind( &QtScriptResolverHelper::customIODeviceFactory, this, _1 );
-    Servent::instance()->registerIODeviceFactory( protocol, fac );
-
-    m_urlCallback = callbackFuncName;
-}
-
-QSharedPointer< QIODevice >
-QtScriptResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr& result )
-{
-    QString getUrl = QString( "Tomahawk.resolver.instance.%1( '%2' );" ).arg( m_urlCallback )
-                                                                        .arg( QString( QUrl( result->url() ).toEncoded() ) );
-
-    QString urlStr = m_resolver->m_engine->mainFrame()->evaluateJavaScript( getUrl ).toString();
-
-    if ( urlStr.isEmpty() )
-        return QSharedPointer< QIODevice >();
-
-    QUrl url = QUrl::fromEncoded( urlStr.toUtf8() );
-    QNetworkRequest req( url );
-    tDebug() << "Creating a QNetowrkReply with url:" << req.url().toString();
-    QNetworkReply* reply = TomahawkUtils::nam()->get( req );
-    return QSharedPointer<QIODevice>( reply, &QObject::deleteLater );
-}
-
-
-void
-ScriptEngine::javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& sourceID )
-{
-    tLog() << "JAVASCRIPT:" << m_scriptPath << message << lineNumber << sourceID;
-#ifdef DEBUG_BUILD
-    QMessageBox::critical( 0, "Script Resolver Error", QString( "%1 %2 %3 %4" ).arg( m_scriptPath ).arg( message ).arg( lineNumber ).arg( sourceID ) );
-#endif
-}
-
-
-QtScriptResolver::QtScriptResolver( const QString& scriptPath )
-    : Tomahawk::ExternalResolverGui( scriptPath )
-    , m_ready( false )
-    , m_stopped( true )
-    , m_error( Tomahawk::ExternalResolver::NoError )
-    , m_resolverHelper( new QtScriptResolverHelper( scriptPath, this ) )
-{
-    tLog() << Q_FUNC_INFO << "Loading JS resolver:" << scriptPath;
-
-    m_engine = new ScriptEngine( this );
-    m_name = QFileInfo( filePath() ).baseName();
-
-    if ( !QFile::exists( filePath() ) )
-    {
-        tLog() << Q_FUNC_INFO << "Failed loading JavaScript resolver:" << scriptPath;
-        m_error = Tomahawk::ExternalResolver::FileNotFound;
-    }
-    else
-    {
-        init();
-    }
-}
-
-
-QtScriptResolver::~QtScriptResolver()
-{
-    Tomahawk::Pipeline::instance()->removeResolver( this );
-    delete m_engine;
-}
-
-
-Tomahawk::ExternalResolver* QtScriptResolver::factory( const QString& scriptPath )
-{
-    ExternalResolver* res = 0;
-
-    const QFileInfo fi( scriptPath );
-    if ( fi.suffix() == "js" || fi.suffix() == "script" )
-    {
-        res = new QtScriptResolver( scriptPath );
-        tLog() << Q_FUNC_INFO << scriptPath << "Loaded.";
-    }
-
-    return res;
-}
-
-
-bool
-QtScriptResolver::running() const
-{
-    return m_ready && !m_stopped;
-}
-
-void
-QtScriptResolver::reload()
-{
-    if ( QFile::exists( filePath() ) )
-    {
-        init();
-        m_error = Tomahawk::ExternalResolver::NoError;
-    } else
-    {
-        m_error = Tomahawk::ExternalResolver::FileNotFound;
-    }
-}
-
-
-void
-QtScriptResolver::init()
-{
-    QFile scriptFile( filePath() );
-    if( !scriptFile.open( QIODevice::ReadOnly ) )
-    {
-        qWarning() << "Failed to read contents of file:" << filePath() << scriptFile.errorString();
-        return;
-    }
-    const QByteArray scriptContents = scriptFile.readAll();
-
-    m_engine->mainFrame()->setHtml( "<html><body></body></html>", QUrl( "file:///invalid/file/for/security/policy" ) );
-
-    // add c++ part of tomahawk javascript library
-    m_engine->mainFrame()->addToJavaScriptWindowObject( "Tomahawk", m_resolverHelper );
-
-    // add rest of it
-    m_engine->setScriptPath( "tomahawk.js" );
-    QFile jslib( RESPATH "js/tomahawk.js" );
-    jslib.open( QIODevice::ReadOnly );
-    m_engine->mainFrame()->evaluateJavaScript( jslib.readAll() );
-    jslib.close();
-
-    // add resolver
-    m_engine->setScriptPath( filePath() );
-    m_engine->mainFrame()->evaluateJavaScript( scriptContents );
-
-    // init resolver
-    resolverInit();
-
-    QVariantMap m = resolverSettings();
-    m_name    = m.value( "name" ).toString();
-    m_weight  = m.value( "weight", 0 ).toUInt();
-    m_timeout = m.value( "timeout", 25 ).toUInt() * 1000;
-
-    // load config widget and apply settings
-    loadUi();
-    QVariantMap config = resolverUserConfig();
-    fillDataInWidgets( config );
-
-    qDebug() << "JS" << filePath() << "READY," << "name" << m_name << "weight" << m_weight << "timeout" << m_timeout;
-
-    m_ready = true;
-}
-
-void
-QtScriptResolver::start()
-{
-    m_stopped = false;
-    if ( m_ready )
-        Tomahawk::Pipeline::instance()->addResolver( this );
-    else
-        init();
-}
-
-
-Tomahawk::ExternalResolver::ErrorState
-QtScriptResolver::error() const
-{
-    return m_error;
-}
-
-
-void
-QtScriptResolver::resolve( const Tomahawk::query_ptr& query )
-{
-    if ( QThread::currentThread() != thread() )
-    {
-        QMetaObject::invokeMethod( this, "resolve", Qt::QueuedConnection, Q_ARG(Tomahawk::query_ptr, query) );
-        return;
-    }
-
-    QString eval;
-    if ( !query->isFullTextQuery() )
-    {
-        eval = QString( RESOLVER_LEGACY_CODE2 "resolver.resolve( '%1', '%2', '%3', '%4' );" )
-                  .arg( query->id().replace( "'", "\\'" ) )
-                  .arg( query->artist().replace( "'", "\\'" ) )
-                  .arg( query->album().replace( "'", "\\'" ) )
-                  .arg( query->track().replace( "'", "\\'" ) );
-    }
-    else
-    {
-        eval = QString( "if(Tomahawk.resolver.instance !== undefined) {"
-                        "   resolver.search( '%1', '%2' );"
-                        "} else {"
-                        "   resolve( '%1', '', '', '%2' );"
-                        "}"
-                      )
-                  .arg( query->id().replace( "'", "\\'" ) )
-                  .arg( query->fullTextQuery().replace( "'", "\\'" ) );
-    }
-
-    QVariantMap m = m_engine->mainFrame()->evaluateJavaScript( eval ).toMap();
-
-    if( m.isEmpty() )
-    {
-        // if the resolver doesn't return anything, async api is used
-        return;
-    }
-
-    qDebug() << "JavaScript Result:" << m;
-
-    const QString qid = query->id();
-    const QVariantList reslist = m.value( "results" ).toList();
-
-    QList< Tomahawk::result_ptr > results = parseResultVariantList( reslist );
-
-    Tomahawk::Pipeline::instance()->reportResults( qid, results );
-}
-
-
-QList< Tomahawk::result_ptr >
-QtScriptResolver::parseResultVariantList( const QVariantList& reslist )
-{
-    QList< Tomahawk::result_ptr > results;
-
-    foreach( const QVariant& rv, reslist )
-    {
-        QVariantMap m = rv.toMap();
-
-        Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() );
-        Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false );
-        rp->setArtist( ap );
-        rp->setAlbum( Tomahawk::Album::get( ap, m.value( "album" ).toString(), false ) );
-        rp->setTrack( m.value( "track" ).toString() );
-        rp->setAlbumPos( m.value( "albumpos" ).toUInt() );
-        rp->setBitrate( m.value( "bitrate" ).toUInt() );
-        rp->setSize( m.value( "size" ).toUInt() );
-        rp->setRID( uuid() );
-        rp->setFriendlySource( name() );
-        rp->setScore( m.value( "score" ).toFloat() );
-        rp->setDiscNumber( m.value( "discnumber" ).toUInt() );
-
-        if ( m.contains( "year" ) )
-        {
-            QVariantMap attr;
-            attr "releaseyear"  = m.value( "year" );
-            rp->setAttributes( attr );
-        }
-
-        rp->setDuration( m.value( "duration", 0 ).toUInt() );
-        if ( rp->duration() <= 0 && m.contains( "durationString" ) )
-        {
-            QTime time = QTime::fromString( m.value( "durationString" ).toString(), "hh:mm:ss" );
-            rp->setDuration( time.secsTo( QTime( 0, 0 ) ) * -1 );
-        }
-
-        rp->setMimetype( m.value( "mimetype" ).toString() );
-        if ( rp->mimetype().isEmpty() )
-        {
-            rp->setMimetype( TomahawkUtils::extensionToMimetype( m.value( "extension" ).toString() ) );
-            Q_ASSERT( !rp->mimetype().isEmpty() );
-        }
-
-        results << rp;
-    }
-
-    return results;
-}
-
-
-void
-QtScriptResolver::stop()
-{
-    m_stopped = true;
-    Tomahawk::Pipeline::instance()->removeResolver( this );
-    emit stopped();
-}
-
-
-void
-QtScriptResolver::loadUi()
-{
-    QVariantMap m = m_engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE  "resolver.getConfigUi();" ).toMap();
-    m_dataWidgets = m"fields".toList();
-
-    bool compressed = m.value( "compressed", "false" ).toBool();
-    qDebug() << "Resolver has a preferences widget! compressed?" << compressed;
-
-    QByteArray uiData = m "widget" .toByteArray();
-
-    if( compressed )
-        uiData = qUncompress( QByteArray::fromBase64( uiData ) );
-    else
-        uiData = QByteArray::fromBase64( uiData );
-
-    QVariantMap images;
-    foreach(const QVariant& item, m "images" .toList())
-    {
-        QString key = item.toMap().keys().first();
-        QVariant value = item.toMap().value(key);
-        imageskey = value;
-    }
-
-    if( m.contains( "images" ) )
-        uiData = fixDataImagePaths( uiData, compressed, images );
-
-    m_configWidget = QWeakPointer< QWidget >( widgetFromData( uiData, 0 ) );
-
-    emit changed();
-}
-
-
-QWidget*
-QtScriptResolver::configUI() const
-{
-    if( m_configWidget.isNull() )
-        return 0;
-    else
-        return m_configWidget.data();
-}
-
-
-void
-QtScriptResolver::saveConfig()
-{
-    QVariant saveData = loadDataFromWidgets();
-//    qDebug() << Q_FUNC_INFO << saveData;
-
-    m_resolverHelper->setResolverConfig( saveData.toMap() );
-    m_engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "resolver.saveUserConfig();" );
-}
-
-
-QWidget*
-QtScriptResolver::findWidget(QWidget* widget, const QString& objectName)
-{
-    if( !widget || !widget->isWidgetType() )
-        return 0;
-
-    if( widget->objectName() == objectName )
-        return widget;
-
-
-    foreach( QObject* child, widget->children() )
-    {
-        QWidget* found = findWidget(qobject_cast< QWidget* >( child ), objectName);
-
-        if( found )
-            return found;
-    }
-
-    return 0;
-}
-
-
-QVariant
-QtScriptResolver::widgetData(QWidget* widget, const QString& property)
-{
-    for( int i = 0; i < widget->metaObject()->propertyCount(); i++ )
-    {
-        if( widget->metaObject()->property( i ).name() == property )
-        {
-            return widget->property( property.toLatin1() );
-        }
-    }
-
-    return QVariant();
-}
-
-
-void
-QtScriptResolver::setWidgetData(const QVariant& value, QWidget* widget, const QString& property)
-{
-    for( int i = 0; i < widget->metaObject()->propertyCount(); i++ )
-    {
-        if( widget->metaObject()->property( i ).name() == property )
-        {
-            widget->metaObject()->property( i ).write( widget, value);
-            return;
-        }
-    }
-}
-
-
-QVariantMap
-QtScriptResolver::loadDataFromWidgets()
-{
-    QVariantMap saveData;
-    foreach(const QVariant& dataWidget, m_dataWidgets)
-    {
-        QVariantMap data = dataWidget.toMap();
-
-        QString widgetName = data"widget".toString();
-        QWidget* widget= findWidget( m_configWidget.data(), widgetName );
-
-        QVariant value = widgetData( widget, data"property".toString() );
-
-        saveData data"name".toString()  = value;
-    }
-
-    return saveData;
-}
-
-
-void
-QtScriptResolver::fillDataInWidgets( const QVariantMap& data )
-{
-    foreach(const QVariant& dataWidget, m_dataWidgets)
-    {
-        QString widgetName = dataWidget.toMap()"widget".toString();
-        QWidget* widget= findWidget( m_configWidget.data(), widgetName );
-        if( !widget )
-        {
-            tLog() << Q_FUNC_INFO << "Widget specified in resolver was not found:" << widgetName;
-            Q_ASSERT(false);
-            return;
-        }
-
-        QString propertyName = dataWidget.toMap()"property".toString();
-        QString name = dataWidget.toMap()"name".toString();
-
-        setWidgetData( data name , widget, propertyName );
-    }
-}
-
-
-QVariantMap
-QtScriptResolver::resolverSettings()
-{
-    return m_engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "if(resolver.settings) resolver.settings; else getSettings(); " ).toMap();
-}
-
-
-QVariantMap
-QtScriptResolver::resolverUserConfig()
-{
-    return m_engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "resolver.getUserConfig();" ).toMap();
-}
-
-
-QVariantMap
-QtScriptResolver::resolverInit()
-{
-    return m_engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "resolver.init();" ).toMap();
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/resolvers/qtscriptresolver.h Deleted

@@ -1,177 +0,0 @@
-/* === 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
- *   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 QTSCRIPTRESOLVER_H
-#define QTSCRIPTRESOLVER_H
-
-#include "ExternalResolverGui.h"
-#include "query.h"
-#include "utils/tomahawkutils.h"
-#include "config.h"
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QThread>
-#include <QtWebKit/QWebPage>
-#include <QtWebKit/QWebFrame>
-
-#ifdef QCA2_FOUND
-#include <QtCrypto>
-#endif
-
-#include "dllmacro.h"
-
-class QtScriptResolver;
-
-class DLLEXPORT QtScriptResolverHelper : public QObject
-{
-Q_OBJECT
-
-public:
-    QtScriptResolverHelper( const QString& scriptPath, QtScriptResolver* parent );
-    void setResolverConfig( const QVariantMap& config );
-
-    // Return a HMAC (md5) signature of the input text with the desired key
-    Q_INVOKABLE QString hmac( const QByteArray& key, const QByteArray& input );
-    Q_INVOKABLE QString md5( const QByteArray& input );
-
-    Q_INVOKABLE void addCustomUrlHandler( const QString& protocol, const QString& callbackFuncName );
-
-    QSharedPointer<QIODevice> customIODeviceFactory( const Tomahawk::result_ptr& result );
-
-public slots:
-    QByteArray readRaw( const QString& fileName );
-    QString readBase64( const QString& fileName );
-    QString readCompressed( const QString& fileName );
-
-    QString compress( const QString& data );
-    QVariantMap resolverData();
-
-    void log( const QString& message );
-    bool fakeEnv() { return false; }
-
-    void addTrackResults( const QVariantMap& results );
-
-private:
-    QString m_scriptPath, m_urlCallback;
-    QVariantMap m_resolverConfig;
-    QtScriptResolver* m_resolver;
-#ifdef QCA2_FOUND
-    QCA::Initializer m_qcaInit;
-#endif
-};
-
-class DLLEXPORT ScriptEngine : public QWebPage
-{
-Q_OBJECT
-
-public:
-    explicit ScriptEngine( QtScriptResolver* parent )
-        : QWebPage( (QObject*) parent )
-        , m_parent( parent )
-    {
-        settings()->setAttribute( QWebSettings::OfflineStorageDatabaseEnabled, true );
-        settings()->setOfflineStoragePath( TomahawkUtils::appDataDir().path() );
-        settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);
-        settings()->setLocalStoragePath( TomahawkUtils::appDataDir().path() );
-        settings()->setAttribute( QWebSettings::LocalStorageDatabaseEnabled, true );
-        settings()->setAttribute( QWebSettings::LocalContentCanAccessFileUrls, true );
-        settings()->setAttribute( QWebSettings::LocalContentCanAccessRemoteUrls, true );
-    }
-
-    void setScriptPath( const QString& scriptPath )
-    {
-        m_scriptPath = scriptPath;
-    }
-
-public slots:
-    bool shouldInterruptJavaScript()
-    {
-        return true;
-    }
-
-protected:
-    virtual void javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& sourceID );
-
-private:
-    QtScriptResolver* m_parent;
-    QString m_scriptPath;
-};
-
-
-class DLLEXPORT QtScriptResolver : public Tomahawk::ExternalResolverGui
-{
-Q_OBJECT
-
-friend class ::QtScriptResolverHelper;
-
-public:
-    explicit QtScriptResolver( const QString& scriptPath );
-    virtual ~QtScriptResolver();
-    static ExternalResolver* factory( const QString& scriptPath );
-
-    virtual QString name() const         { return m_name; }
-    virtual unsigned int weight() const  { return m_weight; }
-    virtual unsigned int timeout() const { return m_timeout; }
-
-    virtual QWidget* configUI() const;
-    virtual void saveConfig();
-
-    virtual ExternalResolver::ErrorState error() const;
-    virtual bool running() const;
-    virtual void reload();
-
-public slots:
-    virtual void resolve( const Tomahawk::query_ptr& query );
-    virtual void stop();
-    virtual void start();
-
-signals:
-    void stopped();
-
-private:
-    void init();
-
-    void loadUi();
-    QWidget* findWidget( QWidget* widget, const QString& objectName );
-    void setWidgetData( const QVariant& value, QWidget* widget, const QString& property );
-    QVariant widgetData( QWidget* widget, const QString& property );
-    QVariantMap loadDataFromWidgets();
-    void fillDataInWidgets( const QVariantMap& data );
-
-    // encapsulate javascript calls
-    QVariantMap resolverSettings();
-    QVariantMap resolverUserConfig();
-    QVariantMap resolverInit();
-
-    QList< Tomahawk::result_ptr > parseResultVariantList( const QVariantList& reslist );
-
-    ScriptEngine* m_engine;
-
-    QString m_name;
-    unsigned int m_weight, m_timeout;
-
-    bool m_ready, m_stopped;
-    ExternalResolver::ErrorState m_error;
-
-    QtScriptResolverHelper* m_resolverHelper;
-    QWeakPointer< QWidget > m_configWidget;
-    QList< QVariant > m_dataWidgets;
-};
-
-#endif // QTSCRIPTRESOLVER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/resolvers/scriptresolver.cpp Deleted

@@ -1,453 +0,0 @@
-/* === 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
- *   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 "scriptresolver.h"
-
-#include <QtEndian>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkProxy>
-
-#include "artist.h"
-#include "album.h"
-#include "pipeline.h"
-#include "sourcelist.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#ifdef Q_OS_WIN
-#include <shlwapi.h>
-#endif
-
-ScriptResolver::ScriptResolver( const QString& exe )
-    : Tomahawk::ExternalResolverGui( exe )
-    , m_num_restarts( 0 )
-    , m_msgsize( 0 )
-    , m_ready( false )
-    , m_stopped( true )
-    , m_configSent( false )
-    , m_deleting( false )
-    , m_error( Tomahawk::ExternalResolver::NoError )
-{
-    tLog() << Q_FUNC_INFO << "Created script resolver:" << exe;
-    connect( &m_proc, SIGNAL( readyReadStandardError() ), SLOT( readStderr() ) );
-    connect( &m_proc, SIGNAL( readyReadStandardOutput() ), SLOT( readStdout() ) );
-    connect( &m_proc, SIGNAL( finished( int, QProcess::ExitStatus ) ), SLOT( cmdExited( int, QProcess::ExitStatus ) ) );
-
-    startProcess();
-
-    if ( !TomahawkUtils::nam() )
-        return;
-
-    // set the name to the binary, if we launch properly we'll get the name the resolver reports
-    m_name = QFileInfo( filePath() ).baseName();
-}
-
-
-ScriptResolver::~ScriptResolver()
-{
-    disconnect( &m_proc, SIGNAL( finished( int, QProcess::ExitStatus ) ), this, SLOT( cmdExited( int, QProcess::ExitStatus ) ) );
-    m_deleting = true;
-
-    m_proc.kill();
-    m_proc.waitForFinished(); // might call handleMsg
-
-    Tomahawk::Pipeline::instance()->removeResolver( this );
-
-    if ( !m_configWidget.isNull() )
-        delete m_configWidget.data();
-}
-
-
-Tomahawk::ExternalResolver*
-ScriptResolver::factory( const QString& exe )
-{
-    ExternalResolver* res = 0;
-
-    const QFileInfo fi( exe );
-    if ( fi.suffix() != "js" && fi.suffix() != "script" )
-    {
-        res = new ScriptResolver( exe );
-        tLog() << Q_FUNC_INFO << exe << "Loaded.";
-    }
-
-    return res;
-}
-
-
-void
-ScriptResolver::start()
-{
-    m_stopped = false;
-    if ( m_ready )
-        Tomahawk::Pipeline::instance()->addResolver( this );
-    else if ( !m_configSent )
-        sendConfig();
-    // else, we've sent our config msg so are waiting for the resolver to react
-}
-
-
-void
-ScriptResolver::sendConfig()
-{
-    // Send a configutaion message with any information the resolver might need
-    // For now, only the proxy information is sent
-    QVariantMap m;
-    m.insert( "_msgtype", "config" );
-
-    m_configSent = true;
-
-    TomahawkUtils::NetworkProxyFactory* factory = dynamic_cast<TomahawkUtils::NetworkProxyFactory*>( TomahawkUtils::nam()->proxyFactory() );
-    QNetworkProxy proxy = factory->proxy();
-    QString proxyType = ( proxy.type() == QNetworkProxy::Socks5Proxy ? "socks5" : "none" );
-    m.insert( "proxytype", proxyType );
-    m.insert( "proxyhost", proxy.hostName() );
-    m.insert( "proxyport", proxy.port() );
-    m.insert( "proxyuser", proxy.user() );
-    m.insert( "proxypass", proxy.password() );
-
-    // QJson sucks
-    QVariantList hosts;
-    foreach ( const QString& host, factory->noProxyHosts() )
-        hosts << host;
-    m.insert( "noproxyhosts", hosts );
-
-    QByteArray data = m_serializer.serialize( m );
-    sendMsg( data );
-}
-
-
-void
-ScriptResolver::reload()
-{
-    startProcess();
-}
-
-
-bool
-ScriptResolver::running() const
-{
-    return !m_stopped;
-}
-
-
-void
-ScriptResolver::readStderr()
-{
-    tLog() << "SCRIPT_STDERR" << filePath() << m_proc.readAllStandardError();
-}
-
-
-ScriptResolver::ErrorState
-ScriptResolver::error() const
-{
-    return m_error;
-}
-
-
-void
-ScriptResolver::readStdout()
-{
-    if ( m_msgsize == 0 )
-    {
-        if ( m_proc.bytesAvailable() < 4 )
-            return;
-
-        quint32 len_nbo;
-        m_proc.read( (char*) &len_nbo, 4 );
-        m_msgsize = qFromBigEndian( len_nbo );
-    }
-
-    if ( m_msgsize > 0 )
-    {
-        m_msg.append( m_proc.read( m_msgsize - m_msg.length() ) );
-    }
-
-    if ( m_msgsize == (quint32) m_msg.length() )
-    {
-        handleMsg( m_msg );
-        m_msgsize = 0;
-        m_msg.clear();
-
-        if ( m_proc.bytesAvailable() )
-            QTimer::singleShot( 0, this, SLOT( readStdout() ) );
-    }
-}
-
-
-void
-ScriptResolver::sendMsg( const QByteArray& msg )
-{
-//     qDebug() << Q_FUNC_INFO << m_ready << msg << msg.length();
-    if ( !m_proc.isOpen() )
-        return;
-
-    quint32 len;
-    qToBigEndian( msg.length(), (uchar*) &len );
-    m_proc.write( (const char*) &len, 4 );
-    m_proc.write( msg );
-}
-
-
-void
-ScriptResolver::handleMsg( const QByteArray& msg )
-{
-//    qDebug() << Q_FUNC_INFO << msg.size() << QString::fromAscii( msg );
-
-    // Might be called from waitForFinished() in ~ScriptResolver, no database in that case, abort.
-    if ( m_deleting )
-        return;
-
-    bool ok;
-    QVariant v = m_parser.parse( msg, &ok );
-    if ( !ok || v.type() != QVariant::Map )
-    {
-        Q_ASSERT(false);
-        return;
-    }
-    QVariantMap m = v.toMap();
-    QString msgtype = m.value( "_msgtype" ).toString();
-
-    if ( msgtype == "settings" )
-    {
-        doSetup( m );
-        return;
-    }
-    else if ( msgtype == "confwidget" )
-    {
-        setupConfWidget( m );
-        return;
-    }
-
-    if ( msgtype == "results" )
-    {
-        const QString qid = m.value( "qid" ).toString();
-        QList< Tomahawk::result_ptr > results;
-        const QVariantList reslist = m.value( "results" ).toList();
-
-        foreach( const QVariant& rv, reslist )
-        {
-            QVariantMap m = rv.toMap();
-            qDebug() << "Found result:" << m;
-
-            Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() );
-            Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false );
-            rp->setArtist( ap );
-            rp->setAlbum( Tomahawk::Album::get( ap, m.value( "album" ).toString(), false ) );
-            rp->setAlbumPos( m.value( "albumpos" ).toUInt() );
-            rp->setTrack( m.value( "track" ).toString() );
-            rp->setDuration( m.value( "duration" ).toUInt() );
-            rp->setBitrate( m.value( "bitrate" ).toUInt() );
-            rp->setSize( m.value( "size" ).toUInt() );
-            rp->setRID( uuid() );
-            rp->setFriendlySource( m_name );
-            rp->setYear( m.value( "year").toUInt() );
-            rp->setDiscNumber( m.value( "discnumber" ).toUInt() );
-
-            rp->setMimetype( m.value( "mimetype" ).toString() );
-            if ( rp->mimetype().isEmpty() )
-            {
-                rp->setMimetype( TomahawkUtils::extensionToMimetype( m.value( "extension" ).toString() ) );
-                Q_ASSERT( !rp->mimetype().isEmpty() );
-            }
-
-            results << rp;
-        }
-
-        Tomahawk::Pipeline::instance()->reportResults( qid, results );
-    }
-}
-
-
-void
-ScriptResolver::cmdExited( int code, QProcess::ExitStatus status )
-{
-    m_ready = false;
-    tLog() << Q_FUNC_INFO << "SCRIPT EXITED, code" << code << "status" << status << filePath();
-    Tomahawk::Pipeline::instance()->removeResolver( this );
-
-    m_error = ExternalResolver::FailedToLoad;
-    emit changed();
-
-    if ( m_stopped )
-    {
-        tLog() << "*** Script resolver stopped ";
-        emit terminated();
-
-        return;
-    }
-
-    if ( m_num_restarts < 10 )
-    {
-        m_num_restarts++;
-        tLog() << "*** Restart num" << m_num_restarts;
-        startProcess();
-        sendConfig();
-    }
-    else
-    {
-        tLog() << "*** Reached max restarts, not restarting.";
-    }
-}
-
-void
-ScriptResolver::resolve( const Tomahawk::query_ptr& query )
-{
-    QVariantMap m;
-    m.insert( "_msgtype", "rq" );
-
-    if ( query->isFullTextQuery() )
-    {
-        m.insert( "fulltext", query->fullTextQuery() );
-        m.insert( "artist", query->artist() );
-        m.insert( "track", query->fullTextQuery() );
-        m.insert( "qid", query->id() );
-    }
-    else
-    {
-        m.insert( "artist", query->artist() );
-        m.insert( "track", query->track() );
-        m.insert( "qid", query->id() );
-    }
-
-    const QByteArray msg = m_serializer.serialize( QVariant( m ) );
-    sendMsg( msg );
-}
-
-
-void
-ScriptResolver::doSetup( const QVariantMap& m )
-{
-//    qDebug() << Q_FUNC_INFO << m;
-
-    m_name    = m.value( "name" ).toString();
-    m_weight  = m.value( "weight", 0 ).toUInt();
-    m_timeout = m.value( "timeout", 5 ).toUInt() * 1000;
-    qDebug() << "SCRIPT" << filePath() << "READY," << "name" << m_name << "weight" << m_weight << "timeout" << m_timeout;
-
-    m_ready = true;
-    m_configSent = false;
-
-    if ( !m_stopped )
-        Tomahawk::Pipeline::instance()->addResolver( this );
-}
-
-
-void
-ScriptResolver::setupConfWidget( const QVariantMap& m )
-{
-    bool compressed = m.value( "compressed", "false" ).toString() == "true";
-    qDebug() << "Resolver has a preferences widget! compressed?" << compressed;
-
-    QByteArray uiData = m "widget" .toByteArray();
-    if( compressed )
-        uiData = qUncompress( QByteArray::fromBase64( uiData ) );
-    else
-        uiData = QByteArray::fromBase64( uiData );
-
-    if ( m.contains( "images" ) )
-        uiData = fixDataImagePaths( uiData, compressed, m "images" .toMap() );
-    m_configWidget = QWeakPointer< QWidget >( widgetFromData( uiData, 0 ) );
-
-    emit changed();
-}
-
-
-void ScriptResolver::startProcess()
-{
-    if ( !QFile::exists( filePath() ) )
-        m_error = Tomahawk::ExternalResolver::FileNotFound;
-    else
-    {
-        m_error = Tomahawk::ExternalResolver::NoError;
-    }
-
-    QFileInfo fi( filePath() );
-
-    QString interpreter;
-    QString runPath = filePath();
-
-#ifdef Q_OS_WIN
-    if ( fi.suffix().toLower() != "exe" )
-    {
-        DWORD dwSize = MAX_PATH;
-
-        wchar_t pathMAX_PATH = { 0 };
-        wchar_t *ext = (wchar_t *) ("." + fi.suffix()).utf16();
-
-        HRESULT hr = AssocQueryStringW(
-                (ASSOCF) 0,
-                ASSOCSTR_EXECUTABLE,
-                ext,
-                L"open",
-                path,
-                &dwSize
-        );
-
-        if ( ! FAILED( hr ) )
-        {
-            interpreter = QString( "\"%1\"" ).arg(QString::fromUtf16((const ushort *) path));
-        }
-    }
-    else
-    {
-        // have to enclose in quotes if path contains spaces on windows...
-        runPath = QString( "\"%1\"" ).arg( filePath() );
-    }
-#endif // Q_OS_WIN
-
-    if( interpreter.isEmpty() )
-        m_proc.start( runPath );
-    else
-        m_proc.start( interpreter, QStringList() << filePath() );
-
-    sendConfig();
-}
-
-
-void
-ScriptResolver::saveConfig()
-{
-    Q_ASSERT( !m_configWidget.isNull() );
-
-    QVariantMap m;
-    m.insert( "_msgtype", "setpref" );
-    QVariant widgets = configMsgFromWidget( m_configWidget.data() );
-    m.insert( "widgets", widgets );
-    QByteArray data = m_serializer.serialize( m );
-
-    sendMsg( data );
-}
-
-
-QWidget*
-ScriptResolver::configUI() const
-{
-    if ( m_configWidget.isNull() )
-        return 0;
-    else
-        return m_configWidget.data();
-}
-
-
-void
-ScriptResolver::stop()
-{
-    m_stopped = true;
-    Tomahawk::Pipeline::instance()->removeResolver( this );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/resolvers/scriptresolver.h Deleted

@@ -1,95 +0,0 @@
-/* === 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
- *   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 SCRIPTRESOLVER_H
-#define SCRIPTRESOLVER_H
-
-#include <QProcess>
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-#include <qjson/qobjecthelper.h>
-
-#include "query.h"
-#include "ExternalResolverGui.h"
-
-#include "dllmacro.h"
-
-class QWidget;
-
-class DLLEXPORT ScriptResolver : public Tomahawk::ExternalResolverGui
-{
-Q_OBJECT
-
-public:
-    explicit ScriptResolver( const QString& exe );
-    virtual ~ScriptResolver();
-    static ExternalResolver* factory( const QString& exe );
-
-    virtual QString name() const            { return m_name; }
-    virtual unsigned int weight() const     { return m_weight; }
-    virtual unsigned int preference() const { return m_preference; }
-    virtual unsigned int timeout() const    { return m_timeout; }
-
-    virtual QWidget* configUI() const;
-    virtual void saveConfig();
-
-    virtual ExternalResolver::ErrorState error() const;
-    virtual void reload();
-
-    virtual bool running() const;
-
-signals:
-    void terminated();
-
-public slots:
-    virtual void stop();
-    virtual void resolve( const Tomahawk::query_ptr& query );
-    virtual void start();
-
-private slots:
-    void readStderr();
-    void readStdout();
-    void cmdExited( int code, QProcess::ExitStatus status );
-
-private:
-    void sendConfig();
-
-    void handleMsg( const QByteArray& msg );
-    void sendMsg( const QByteArray& msg );
-    void doSetup( const QVariantMap& m );
-    void setupConfWidget( const QVariantMap& m );
-
-    void startProcess();
-
-    QProcess m_proc;
-    QString m_name;
-    unsigned int m_weight, m_preference, m_timeout, m_num_restarts;
-    QWeakPointer< QWidget > m_configWidget;
-
-    quint32 m_msgsize;
-    QByteArray m_msg;
-
-    bool m_ready, m_stopped, m_configSent, m_deleting;
-    ExternalResolver::ErrorState m_error;
-
-    QJson::Parser m_parser;
-    QJson::Serializer m_serializer;
-};
-
-#endif // SCRIPTRESOLVER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/result.cpp Deleted

@@ -1,274 +0,0 @@
-/* === 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
- *   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 "result.h"
-
-#include "album.h"
-#include "collection.h"
-#include "source.h"
-#include "database/database.h"
-#include "database/databasecommand_resolve.h"
-#include "database/databasecommand_alltracks.h"
-#include "database/databasecommand_addfiles.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-static QHash< QString, QWeakPointer< Result > > s_results;
-static QMutex s_mutex;
-
-
-Tomahawk::result_ptr
-Result::get( const QString& url )
-{
-    QMutexLocker lock( &s_mutex );
-    if ( s_results.contains( url ) )
-    {
-        return s_results.value( url );
-    }
-
-    result_ptr r = result_ptr( new Result( url ), &Result::deleteLater );
-    s_results.insert( url, r );
-
-    return r;
-}
-
-
-bool
-Result::isCached( const QString& url )
-{
-    QMutexLocker lock( &s_mutex );
-    return ( s_results.contains( url ) );
-}
-
-
-Result::Result( const QString& url )
-    : QObject()
-    , m_url( url )
-    , m_duration( 0 )
-    , m_bitrate( 0 )
-    , m_size( 0 )
-    , m_albumpos( 0 )
-    , m_modtime( 0 )
-    , m_discnumber( 0 )
-    , m_year( 0 )
-    , m_score( 0 )
-    , m_trackId( 0 )
-    , m_fileId( 0 )
-{
-}
-
-
-Result::~Result()
-{
-}
-
-
-void
-Result::deleteLater()
-{
-    QMutexLocker lock( &s_mutex );
-
-    if ( s_results.contains( m_url ) )
-    {
-        s_results.remove( m_url );
-    }
-
-    QObject::deleteLater();
-}
-
-
-artist_ptr
-Result::artist() const
-{
-    return m_artist;
-}
-
-artist_ptr
-Result::composer() const
-{
-    return m_composer;
-}
-
-
-album_ptr
-Result::album() const
-{
-    return m_album;
-}
-
-
-collection_ptr
-Result::collection() const
-{
-    return m_collection;
-}
-
-
-float
-Result::score() const
-{
-    if ( !collection().isNull() && collection()->source()->isOnline() )
-    {
-        return m_score;
-    }
-    else
-    {
-        // check if this a valid collection-less result (e.g. from youtube, but ignore offline sources still)
-        if ( collection().isNull() )
-            return m_score;
-        else
-            return 0.0;
-    }
-}
-
-
-RID
-Result::id() const
-{
-    if ( m_rid.isEmpty() )
-        m_rid = uuid();
-
-    return m_rid;
-}
-
-
-bool
-Result::isOnline() const
-{
-    return ( ( !collection().isNull() && collection()->source()->isOnline() ) || collection().isNull() );
-}
-
-
-QVariant
-Result::toVariant() const
-{
-    QVariantMap m;
-    m.insert( "artist", artist()->name() );
-    m.insert( "album", album()->name() );
-    m.insert( "track", track() );
-
-    if ( !collection().isNull() )
-        m.insert( "source", collection()->source()->friendlyName() );
-    else
-        m.insert( "source", friendlySource() );
-
-    m.insert( "mimetype", mimetype() );
-    m.insert( "size", size() );
-    m.insert( "bitrate", bitrate() );
-    m.insert( "duration", duration() );
-    m.insert( "score", score() );
-    m.insert( "sid", id() );
-    m.insert( "discnumber", discnumber() );
-
-    if ( !composer().isNull() )
-        m.insert( "composer", composer()->name() );
-
-    return m;
-}
-
-
-QString
-Result::toString() const
-{
-    return QString( "Result(%1 %2\t%3 - %4  %5" ).arg( id() ).arg( score() ).arg( artist().isNull() ? QString() : artist()->name() ).arg( track() ).arg( url() );
-}
-
-
-Tomahawk::query_ptr
-Result::toQuery()
-{
-    if ( m_query.isNull() )
-    {
-        m_query = Tomahawk::Query::get( artist()->name(), track(), album()->name() );
-        QList<Tomahawk::result_ptr> rl;
-        rl << Result::get( m_url );
-
-        m_query->addResults( rl );
-        m_query->setResolveFinished( true );
-    }
-
-    return m_query;
-}
-
-
-void
-Result::updateAttributes()
-{
-    if ( m_attributes.contains( "releaseyear" ) )
-    {
-        m_year = m_attributes.value( "releaseyear" ).toInt();
-    }
-}
-
-
-void
-Result::onOnline()
-{
-    emit statusChanged();
-}
-
-
-void
-Result::onOffline()
-{
-    emit statusChanged();
-}
-
-
-void
-Result::setArtist( const Tomahawk::artist_ptr& artist )
-{
-    m_artist = artist;
-}
-
-
-void
-Result::setComposer( const Tomahawk::artist_ptr &composer )
-{
-    m_composer = composer;
-}
-
-
-void
-Result::setAlbum( const Tomahawk::album_ptr& album )
-{
-    m_album = album;
-}
-
-
-void
-Result::setCollection( const Tomahawk::collection_ptr& collection )
-{
-    m_collection = collection;
-    connect( m_collection->source().data(), SIGNAL( online() ), SLOT( onOnline() ), Qt::QueuedConnection );
-    connect( m_collection->source().data(), SIGNAL( offline() ), SLOT( onOffline() ), Qt::QueuedConnection );
-}
-
-
-QString
-Result::friendlySource() const
-{
-    if ( collection().isNull() )
-    {
-        return m_friendlySource;
-    }
-    else
-        return collection()->source()->friendlyName();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/result.h Deleted

@@ -1,157 +0,0 @@
-/* === 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
- *   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 RESULT_H
-#define RESULT_H
-
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QVariant>
-
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-class DatabaseCommand_Resolve;
-class DatabaseCommand_AllTracks;
-class DatabaseCommand_AddFiles;
-class DatabaseCommand_LoadFile;
-
-namespace Tomahawk
-{
-
-
-struct SocialAction
-{
-    QVariant action;
-    QVariant value;
-    QVariant timestamp;
-    QVariant source;
-};
-
-
-class DLLEXPORT Result : public QObject
-{
-Q_OBJECT
-
-friend class ::DatabaseCommand_Resolve;
-friend class ::DatabaseCommand_AllTracks;
-friend class ::DatabaseCommand_AddFiles;
-friend class ::DatabaseCommand_LoadFile;
-
-public:
-    static Tomahawk::result_ptr get( const QString& url );
-    static bool isCached( const QString& url );
-    virtual ~Result();
-
-    QVariant toVariant() const;
-    QString toString() const;
-    Tomahawk::query_ptr toQuery();
-
-    float score() const;
-    RID id() const;
-    bool isOnline() const;
-
-    collection_ptr collection() const;
-    Tomahawk::artist_ptr artist() const;
-    Tomahawk::album_ptr album() const;
-    Tomahawk::artist_ptr composer() const;
-    QString track() const { return m_track; }
-    QString url() const { return m_url; }
-    QString mimetype() const { return m_mimetype; }
-    QString friendlySource() const;
-
-    unsigned int duration() const { return m_duration; }
-    unsigned int bitrate() const { return m_bitrate; }
-    unsigned int size() const { return m_size; }
-    unsigned int albumpos() const { return m_albumpos; }
-    unsigned int modificationTime() const { return m_modtime; }
-    int year() const { return m_year; }
-    unsigned int discnumber() const { return m_discnumber; }
-
-    void setScore( float score ) { m_score = score; }
-    void setTrackId( unsigned int id ) { m_trackId = id; }
-    void setFileId( unsigned int id ) { m_fileId = id; }
-    void setRID( RID id ) { m_rid = id; }
-    void setCollection( const Tomahawk::collection_ptr& collection );
-    void setFriendlySource( const QString& s ) { m_friendlySource = s; }
-    void setArtist( const Tomahawk::artist_ptr& artist );
-    void setAlbum( const Tomahawk::album_ptr& album );
-    void setComposer( const Tomahawk::artist_ptr& composer );
-    void setTrack( const QString& track ) { m_track = track; }
-    void setMimetype( const QString& mimetype ) { m_mimetype = mimetype; }
-    void setDuration( unsigned int duration ) { m_duration = duration; }
-    void setBitrate( unsigned int bitrate ) { m_bitrate = bitrate; }
-    void setSize( unsigned int size ) { m_size = size; }
-    void setAlbumPos( unsigned int albumpos ) { m_albumpos = albumpos; }
-    void setModificationTime( unsigned int modtime ) { m_modtime = modtime; }
-    void setYear( unsigned int year ) { m_year = year; }
-    void setDiscNumber( unsigned int discnumber ) { m_discnumber = discnumber; }
-
-    QVariantMap attributes() const { return m_attributes; }
-    void setAttributes( const QVariantMap& map ) { m_attributes = map; updateAttributes(); }
-
-    unsigned int trackId() const { return m_trackId; }
-    unsigned int fileId() const { return m_fileId; }
-
-public slots:
-    void deleteLater();
-
-signals:
-    // emitted when the collection this result comes from is going offline/online:
-    void statusChanged();
-
-private slots:
-    void onOffline();
-    void onOnline();
-    
-private:
-    // private constructor
-    explicit Result( const QString& url );
-    explicit Result();
-
-    void updateAttributes();
-
-    mutable RID m_rid;
-    collection_ptr m_collection;
-    Tomahawk::query_ptr m_query;
-
-    Tomahawk::artist_ptr m_artist;
-    Tomahawk::album_ptr m_album;
-    Tomahawk::artist_ptr m_composer;
-    QString m_track;
-    QString m_url;
-    QString m_mimetype;
-    QString m_friendlySource;
-
-    unsigned int m_duration;
-    unsigned int m_bitrate;
-    unsigned int m_size;
-    unsigned int m_albumpos;
-    unsigned int m_modtime;
-    unsigned int m_discnumber;
-    int m_year;
-    float m_score;
-
-    QVariantMap m_attributes;
-    unsigned int m_trackId, m_fileId;
-};
-
-} //ns
-
-#endif // RESULT_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sip/SipModel.cpp Deleted

@@ -1,225 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "SipModel.h"
-
-#include "tomahawksettings.h"
-#include "sip/SipHandler.h"
-#include "sip/SipPlugin.h"
-
-#include "utils/logger.h"
-
-
-SipModel::SipModel( QObject* parent )
-    : QAbstractItemModel( parent )
-{
-    connect( SipHandler::instance(), SIGNAL( stateChanged( SipPlugin*, SipPlugin::ConnectionState ) ), this, SLOT( pluginStateChanged( SipPlugin* ) ) );
-    connect( SipHandler::instance(), SIGNAL( pluginAdded( SipPlugin* ) ), this, SLOT( pluginAdded( SipPlugin* ) ) );
-    connect( SipHandler::instance(), SIGNAL( pluginRemoved( SipPlugin* ) ), this, SLOT( pluginRemoved( SipPlugin* ) ) );
-
-    // TODO disable inline factories for now
-    /*
-    foreach( SipPluginFactory* f, SipHandler::instance()->pluginFactories() ) {
-        if( f->isCreatable() )
-            m_factories << f;
-    } */
-
-}
-
-
-SipModel::~SipModel()
-{
-}
-
-
-QVariant
-SipModel::data( const QModelIndex& index, int role ) const
-{
-    if( !index.isValid() )
-        return QVariant();
-
-    if( !index.parent().isValid() && index.row() == SipHandler::instance()->allPlugins().count() ) { // last row, this is the factory
-        if( role == Qt::DisplayRole )
-            return tr( "Add New Account..." );
-        else if( role == FactoryRole )
-            return true;
-        else
-            return QVariant();
-    }
-
-    if( !index.parent().isValid() ) { // account
-        QList< SipPlugin* > plugins = SipHandler::instance()->allPlugins();
-        Q_ASSERT( index.row() <= plugins.size() );
-        SipPlugin* p = plugins index.row() ;
-        switch( role )
-        {
-            case Qt::DisplayRole:
-            case SipModel::PluginName:
-                return p->accountName();
-            case SipModel::ConnectionStateRole:
-                return p->connectionState();
-            case SipModel::HasConfig:
-                return ( p->configWidget() != 0 );
-            case SipModel::FactoryRole:
-                return false;
-            case Qt::DecorationRole:
-                return p->icon();
-            case SipModel::SipPluginData:
-                return QVariant::fromValue< QObject* >( p );
-            case Qt::CheckStateRole:
-                return SipHandler::instance()->enabledPlugins().contains( p ) ? Qt::Checked : Qt::Unchecked;
-            default:
-                return QVariant();
-        }
-    }
-
-    if( index.parent().isValid() ) { // this is a factory type
-        SipPluginFactory* p = m_factories.at( index.row() );
-        switch( role )
-        {
-        case Qt::DisplayRole:
-            return p->prettyName();
-        case SipModel::FactoryItemRole:
-            return true;
-        case SipModel::FactoryItemIcon:
-            return p->icon();
-        case SipModel::SipPluginFactoryData:
-            return QVariant::fromValue< QObject* >( p );
-        default:
-            return QVariant();
-        }
-    }
-
-    return QVariant();
-}
-
-
-bool
-SipModel::setData( const QModelIndex& index, const QVariant& value, int role )
-{
-    Q_ASSERT( index.isValid() && index.row() <= SipHandler::instance()->allPlugins().count() );
-
-    if( role == Qt::CheckStateRole ) {
-        Qt::CheckState state = static_cast< Qt::CheckState >( value.toInt() );
-        QList< SipPlugin* > plugins = SipHandler::instance()->allPlugins();
-        SipPlugin* p = plugins index.row() ;
-
-        if( state == Qt::Checked && !SipHandler::instance()->enabledPlugins().contains( p ) ) {
-            SipHandler::instance()->enablePlugin( p );
-        } else if( state == Qt::Unchecked ) {
-            SipHandler::instance()->disablePlugin( p );
-        }
-        dataChanged( index, index );
-
-        return true;
-    }
-    return false;
-}
-
-
-QModelIndex
-SipModel::index( int row, int column, const QModelIndex& parent ) const
-{
-    if( !parent.isValid() )
-        return hasIndex( row, column, parent ) ? createIndex( row, column, 0 ) : QModelIndex();
-
-//     qDebug() << "Creating index for non-top level row!";
-    // it's a child of the Add Account, e.g. a factory
-    if( hasIndex( row, column, parent ) ) {
-        return createIndex( row, column, 1 /* magic */ );
-    }
-
-    return QModelIndex();
-}
-
-
-QModelIndex
-SipModel::parent( const QModelIndex& child ) const
-{
-    if( !child.isValid() )
-        return QModelIndex();
-
-    if( child.internalId() == 1 ) {
-        return index( SipHandler::instance()->allPlugins().size(), 0, QModelIndex() );
-    }
-
-    return QModelIndex();
-}
-
-
-int
-SipModel::rowCount( const QModelIndex& parent ) const
-{
-    if( !parent.isValid() ) // invalid root node
-        return SipHandler::instance()->allPlugins().size() /* TODO inline factories disabled + 1*/;
-    if( parent.isValid() && !parent.parent().isValid() ) { // top level item
-        if( parent.row() == SipHandler::instance()->allPlugins().count() ) {// last row, this is the factory
-            return m_factories.count();
-        }
-    }
-
-    return 0;
-}
-
-
-int
-SipModel::columnCount(const QModelIndex& parent) const
-{
-    Q_UNUSED( parent );
-    return 1;
-}
-
-
-Qt::ItemFlags
-SipModel::flags( const QModelIndex& index ) const
-{
-    if( index.data( SipModel::FactoryRole ).toBool() || index.data( SipModel::FactoryItemRole ).toBool() )
-        return QAbstractItemModel::flags( index ) & ~Qt::ItemIsSelectable;
-    return QAbstractItemModel::flags( index ) | Qt::ItemIsUserCheckable;
-}
-
-
-void
-SipModel::pluginAdded( SipPlugin* p )
-{
-    Q_UNUSED( p );
-    // we assume sip plugins are added at the end of the list.
-    Q_ASSERT( SipHandler::instance()->allPlugins().last() == p );
-    int size = SipHandler::instance()->allPlugins().count() - 1;
-    beginInsertRows( QModelIndex(), size, size );
-    endInsertRows();
-}
-
-
-void
-SipModel::pluginRemoved( SipPlugin* p )
-{
-    int idx = SipHandler::instance()->allPlugins().indexOf( p );
-    beginRemoveRows( QModelIndex(), idx, idx );
-    endRemoveRows();
-}
-
-
-void
-SipModel::pluginStateChanged( SipPlugin* p )
-{
-    int at = SipHandler::instance()->allPlugins().indexOf( p );
-    QModelIndex idx = index( at, 0, QModelIndex() );
-    emit dataChanged( idx, idx );
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sip/SipModel.h Deleted

@@ -1,67 +0,0 @@
-/*
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef SIPMODEL_H
-#define SIPMODEL_H
-
-#include "dllmacro.h"
-
-#include <QModelIndex>
-#include <QStringList>
-
-class SipPluginFactory;
-class SipPlugin;
-
-class DLLEXPORT SipModel : public QAbstractItemModel
-{
-    Q_OBJECT
-public:
-    enum Roles {
-        PluginName = Qt::UserRole + 15,
-        ConnectionStateRole = Qt::UserRole + 17,
-        HasConfig = Qt::UserRole + 18,
-        FactoryRole = Qt::UserRole + 19,
-        ErrorString = Qt::UserRole + 20,
-        FactoryItemRole = Qt::UserRole + 21,
-        FactoryItemIcon = Qt::UserRole + 22,
-        SipPluginData = Qt::UserRole + 23,
-        SipPluginFactoryData = Qt::UserRole + 24
-    };
-
-    explicit SipModel( QObject* parent = 0 );
-    virtual ~SipModel();
-
-    virtual QModelIndex index ( int row, int column, const QModelIndex& parent = QModelIndex() ) const;
-    virtual QModelIndex parent ( const QModelIndex& child ) const;
-    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-    virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const;
-    virtual int columnCount( const QModelIndex& parent ) const;
-    virtual Qt::ItemFlags flags(const QModelIndex& index) const;
-    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
-
-private slots:
-    void pluginAdded( SipPlugin* p );
-    void pluginRemoved( SipPlugin* p );
-    void pluginStateChanged( SipPlugin* p );
-
-private:
-    QList< SipPluginFactory* > m_factories;
-};
-
-#endif // SIPMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sip/sipinfo.cpp Deleted

@@ -1,249 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
- *
- *   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 "sipinfo.h"
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-
-#include <QVariant>
-
-
-class SipInfoPrivate : public QSharedData
-{
-public:
-    SipInfoPrivate()
-        : port( -1 )
-    {
-    }
-
-    SipInfoPrivate( const SipInfoPrivate& other ) : QSharedData( other ),
-        visible(other.visible),
-        host(other.host),
-        port(other.port),
-        uniqname(other.uniqname),
-        key(other.key)
-    {
-    }
-    ~SipInfoPrivate() { }
-
-    QVariant visible;
-    QHostInfo host;
-    int port;
-    QString uniqname;
-    QString key;
-};
-
-
-SipInfo::SipInfo()
-{
-    d = new SipInfoPrivate;
-}
-
-
-SipInfo::SipInfo(const SipInfo& other)
-    : QObject()
-    , d( other.d )
-{
-}
-
-
-SipInfo::~SipInfo()
-{
-}
-
-
-SipInfo&
-SipInfo::operator=( const SipInfo& other )
-{
-    d = other.d;
-    return *this;
-}
-
-
-void
-SipInfo::clear()
-{
-    d->visible.clear();
-    d->host = QHostInfo();
-    d->port = -1;
-    d->uniqname = QString();
-    d->key = QString();
-}
-
-
-bool
-SipInfo::isValid() const
-{
-//    qDebug() << Q_FUNC_INFO << d->visible << d->host.hostName() << d->port << d->uniqname << d->key;
-    if( !d->visible.isNull() )
-    {
-        if(
-            // visible and all data available
-            (  d->visible.toBool() && !d->host.hostName().isNull() && ( d->port > 0 ) && !d->uniqname.isNull() && !d->key.isNull() )
-            // invisible and no data available
-         || ( !d->visible.toBool() &&  d->host.hostName().isNull() && ( d->port < 0 ) && d->uniqname.isNull() &&   d->key.isNull() )
-        )
-            return true;
-    }
-
-    return false;
-}
-
-
-void
-SipInfo::setVisible( bool visible )
-{
-    d->visible.setValue(visible);
-}
-
-
-bool
-SipInfo::isVisible() const
-{
-    Q_ASSERT( isValid() );
-
-    return d->visible.toBool();
-}
-
-
-void
-SipInfo::setHost( const QHostInfo& host )
-{
-    d->host = host;
-}
-
-
-const QHostInfo
-SipInfo::host() const
-{
-    Q_ASSERT( isValid() );
-
-    return d->host;
-}
-
-
-void
-SipInfo::setPort( int port )
-{
-    d->port = port;
-}
-
-
-int
-SipInfo::port() const
-{
-    Q_ASSERT( isValid() );
-
-    return d->port;
-}
-
-
-void
-SipInfo::setUniqname( const QString& uniqname )
-{
-    d->uniqname = uniqname;
-}
-
-
-const QString
-SipInfo::uniqname() const
-{
-    Q_ASSERT( isValid() );
-
-    return d->uniqname;
-}
-
-
-void
-SipInfo::setKey( const QString& key )
-{
-    d->key = key;
-}
-
-
-const QString
-SipInfo::key() const
-{
-    Q_ASSERT( isValid() );
-
-    return d->key;
-}
-
-
-const QString
-SipInfo::toJson() const
-{
-    // build variant map
-    QVariantMap m;
-    m"visible" = isVisible();
-    if( isVisible() )
-    {
-        m"ip" = host().hostName();
-        m"port" = port();
-        m"key" = key();
-        m"uniqname" = uniqname();
-    }
-
-    // serialize
-    QJson::Serializer serializer;
-    QByteArray ba = serializer.serialize( m );
-
-    return QString::fromAscii( ba );
-}
-
-
-const SipInfo
-SipInfo::fromJson( QString json )
-{
-    SipInfo info;
-
-    QJson::Parser parser;
-    bool ok;
-    QVariant v = parser.parse( json.toAscii(), &ok );
-    if ( !ok  || v.type() != QVariant::Map )
-    {
-        qDebug() << Q_FUNC_INFO << "Invalid JSON: " << json;
-        return info;
-    }
-    QVariantMap m = v.toMap();
-
-    info.setVisible( m"visible".toBool() );
-    if( m"visible".toBool() )
-    {
-        QHostInfo hostInfo;
-        hostInfo.setHostName( m"host".toString() );
-        info.setHost( hostInfo );
-        info.setPort( m"port".toInt() );
-        info.setUniqname( m"uniqname".toString() );
-        info.setKey( m"key".toString() );
-    }
-
-    return info;
-}
-
-
-QDebug operator<< ( QDebug dbg, const SipInfo& info )
-{
-    if( !info.isValid() )
-        dbg.nospace() << "info is invalid";
-    else
-        dbg.nospace() << info.toJson();
-
-    return dbg.maybeSpace();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sip/sipinfo.h Deleted

@@ -1,70 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
- *
- *   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 SIPINFO_H
-#define SIPINFO_H
-
-#include <QSharedPointer>
-#include <QHostInfo>
-
-#include "utils/logger.h"
-#include "dllmacro.h"
-
-class SipInfoPrivate;
-
-class DLLEXPORT SipInfo : public QObject
-{
-Q_OBJECT
-
-public:
-    SipInfo();
-    SipInfo(const SipInfo& other);
-    virtual ~SipInfo();
-    SipInfo& operator=(const SipInfo& info);
-
-    void clear();
-    bool isValid() const;
-
-    void setVisible( bool visible );
-    bool isVisible() const;
-
-    void setHost( const QHostInfo& host );
-    const QHostInfo host() const;
-
-    void setPort( int port );
-    int port() const;
-
-    void setUniqname( const QString& uniqname );
-    const QString uniqname() const;
-
-    void setKey( const QString& key );
-    const QString key() const;
-
-
-    const QString toJson() const;
-    static const SipInfo fromJson( QString json );
-
-private:
-    QSharedDataPointer<SipInfoPrivate> d;
-};
-
-DLLEXPORT QDebug operator<<( QDebug dbg, const SipInfo &info );
-
-
-
-#endif // SIPINFO_H
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/src/libtomahawk/source.cpp Deleted

@@ -1,466 +0,0 @@
-/* === 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
- *   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 "source.h"
-
-#include "collection.h"
-#include "sourcelist.h"
-#include "sourceplaylistinterface.h"
-
-#include "network/controlconnection.h"
-#include "database/databasecommand_addsource.h"
-#include "database/databasecommand_collectionstats.h"
-#include "database/databasecommand_sourceoffline.h"
-#include "database/databasecommand_updatesearchindex.h"
-#include "database/database.h"
-
-#include <QCoreApplication>
-
-#include "utils/logger.h"
-#include "utils/tomahawkutilsgui.h"
-#include "database/databasecommand_socialaction.h"
-
-using namespace Tomahawk;
-
-
-Source::Source( int id, const QString& username )
-    : QObject()
-    , m_isLocal( false )
-    , m_online( false )
-    , m_username( username )
-    , m_id( id )
-    , m_updateIndexWhenSynced( false )
-    , m_state( DBSyncConnection::UNKNOWN )
-    , m_cc( 0 )
-    , m_commandCount( 0 )
-    , m_avatar( 0 )
-    , m_fancyAvatar( 0 )
-{
-    m_scrubFriendlyName = qApp->arguments().contains( "--demo" );
-
-    if ( id == 0 )
-    {
-        m_isLocal = true;
-        m_online = true;
-    }
-
-    m_currentTrackTimer.setSingleShot( true );
-    connect( &m_currentTrackTimer, SIGNAL( timeout() ), this, SLOT( trackTimerFired() ) );
-}
-
-
-Source::~Source()
-{
-    qDebug() << Q_FUNC_INFO << friendlyName();
-    delete m_avatar;
-    delete m_fancyAvatar;
-}
-
-
-void
-Source::setControlConnection( ControlConnection* cc )
-{
-    m_cc = cc;
-    if ( cc )
-        connect( cc, SIGNAL( finished() ), SLOT( setOffline() ), Qt::QueuedConnection );
-}
-
-
-collection_ptr
-Source::collection() const
-{
-    if( m_collections.length() )
-        return m_collections.first();
-
-    collection_ptr tmp;
-    return tmp;
-}
-
-
-void
-Source::setStats( const QVariantMap& m )
-{
-    m_stats = m;
-    emit stats( m_stats );
-    emit stateChanged();
-}
-
-
-QString
-Source::friendlyName() const
-{
-    if ( m_friendlyname.isEmpty() )
-        return m_username;
-
-    //TODO: this is a terrible assumption, help me clean this up, mighty muesli!
-    if ( m_friendlyname.contains( "@conference." ) )
-        return QString( m_friendlyname ).remove( 0, m_friendlyname.lastIndexOf( "/" ) + 1 ).append( " via MUC" );
-
-    if ( m_friendlyname.contains( "/" ) )
-        return m_friendlyname.left( m_friendlyname.indexOf( "/" ) );
-
-    return m_friendlyname;
-}
-
-
-#ifndef ENABLE_HEADLESS
-void
-Source::setAvatar( const QPixmap& avatar )
-{
-    delete m_avatar;
-    m_avatar = new QPixmap( avatar );
-}
-
-
-QPixmap
-Source::avatar( AvatarStyle style ) const
-{
-    if ( style == FancyStyle && m_avatar && !m_fancyAvatar )
-        m_fancyAvatar = new QPixmap( TomahawkUtils::createAvatarFrame( QPixmap( *m_avatar ) ) );
-
-    if ( style == Original && m_avatar )
-        return QPixmap( *m_avatar );
-    else if ( style == FancyStyle && m_fancyAvatar )
-        return QPixmap( *m_fancyAvatar );
-    else
-        return QPixmap();
-}
-#endif
-
-
-void
-Source::setFriendlyName( const QString& fname )
-{
-    if ( fname.isEmpty() )
-        return;
-
-    m_friendlyname = fname;
-    if ( m_scrubFriendlyName )
-        m_friendlyname = m_friendlyname.split( "@" ).first();
-}
-
-
-void
-Source::addCollection( const collection_ptr& c )
-{
-    Q_ASSERT( m_collections.length() == 0 ); // only 1 source supported atm
-    m_collections.append( c );
-    emit collectionAdded( c );
-}
-
-
-void
-Source::removeCollection( const collection_ptr& c )
-{
-    Q_ASSERT( m_collections.length() == 1 && m_collections.first() == c ); // only 1 source supported atm
-    m_collections.removeAll( c );
-    emit collectionRemoved( c );
-}
-
-
-void
-Source::setOffline()
-{
-    qDebug() << Q_FUNC_INFO << friendlyName();
-    if ( !m_online )
-        return;
-
-    m_online = false;
-    emit offline();
-
-    m_currentTrack.clear();
-    emit stateChanged();
-
-    m_cc = 0;
-    DatabaseCommand_SourceOffline* cmd = new DatabaseCommand_SourceOffline( id() );
-    Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
-}
-
-
-void
-Source::setOnline()
-{
-    qDebug() << Q_FUNC_INFO << friendlyName();
-    if ( m_online )
-        return;
-
-    m_online = true;
-    emit online();
-
-    // ensure username is in the database
-    DatabaseCommand_addSource* cmd = new DatabaseCommand_addSource( m_username, friendlyName() );
-    connect( cmd, SIGNAL( done( unsigned int, QString ) ),
-                    SLOT( dbLoaded( unsigned int, const QString& ) ) );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
-}
-
-
-void
-Source::dbLoaded( unsigned int id, const QString& fname )
-{
-    m_id = id;
-    setFriendlyName( fname );
-
-    emit syncedWithDatabase();
-}
-
-
-void
-Source::scanningProgress( unsigned int files )
-{
-    if ( files )
-        m_textStatus = tr( "Scanning (%L1 tracks)" ).arg( files );
-    else
-        m_textStatus = tr( "Scanning" );
-
-    emit stateChanged();
-}
-
-
-void
-Source::scanningFinished( unsigned int files )
-{
-    Q_UNUSED( files );
-
-    m_textStatus = QString();
-
-    if ( m_updateIndexWhenSynced )
-    {
-        m_updateIndexWhenSynced = false;
-        updateTracks();
-    }
-
-    emit stateChanged();
-    emit synced();
-}
-
-
-void
-Source::onStateChanged( DBSyncConnection::State newstate, DBSyncConnection::State oldstate, const QString& info )
-{
-    Q_UNUSED( oldstate );
-
-    QString msg;
-    switch( newstate )
-    {
-        case DBSyncConnection::CHECKING:
-        {
-            msg = tr( "Checking" );
-            break;
-        }
-        case DBSyncConnection::FETCHING:
-        {
-            msg = tr( "Fetching" );
-            break;
-        }
-        case DBSyncConnection::PARSING:
-        {
-            msg = tr( "Parsing" );
-            break;
-        }
-        case DBSyncConnection::SCANNING:
-        {
-            msg = tr( "Scanning (%L1 tracks)" ).arg( info );
-            break;
-        }
-        case DBSyncConnection::SYNCED:
-        {
-            msg = QString();
-            break;
-        }
-
-        default:
-            msg = QString();
-    }
-
-    m_state = newstate;
-    m_textStatus = msg;
-    emit stateChanged();
-}
-
-
-unsigned int
-Source::trackCount() const
-{
-    return m_stats.value( "numfiles" ).toUInt();
-}
-
-
-Tomahawk::playlistinterface_ptr
-Source::playlistInterface()
-{
-    if ( m_playlistInterface.isNull() )
-    {
-        Tomahawk::source_ptr source = SourceList::instance()->get( id() );
-        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::SourcePlaylistInterface( source.data() ) );
-    }
-
-    return m_playlistInterface;
-}
-
-
-void
-Source::onPlaybackStarted( const Tomahawk::query_ptr& query, unsigned int duration )
-{
-    qDebug() << Q_FUNC_INFO << query->toString();
-
-    m_currentTrack = query;
-    m_currentTrackTimer.start( duration * 1000 + 900000 ); // duration comes in seconds
-
-    if ( m_playlistInterface.isNull() )
-        playlistInterface();
-    emit playbackStarted( query );
-}
-
-
-void
-Source::onPlaybackFinished( const Tomahawk::query_ptr& query )
-{
-    qDebug() << Q_FUNC_INFO << query->toString();
-    emit playbackFinished( query );
-
-    m_currentTrackTimer.start();
-}
-
-
-void
-Source::trackTimerFired()
-{
-    m_currentTrack.clear();
-
-    emit stateChanged();
-}
-
-
-void
-Source::addCommand( const QSharedPointer<DatabaseCommand>& command )
-{
-    if ( QThread::currentThread() != thread() )
-    {
-        QMetaObject::invokeMethod( this, "addCommand", Qt::QueuedConnection, Q_ARG( const QSharedPointer<DatabaseCommand>, command ) );
-        return;
-    }
-
-    m_cmds << command;
-    if ( !command->singletonCmd() )
-        m_lastCmdGuid = command->guid();
-
-    m_commandCount = m_cmds.count();
-}
-
-
-void
-Source::executeCommands()
-{
-    if ( QThread::currentThread() != thread() )
-    {
-        QMetaObject::invokeMethod( this, "executeCommands", Qt::QueuedConnection );
-        return;
-    }
-
-    if ( !m_cmds.isEmpty() )
-    {
-        QList< QSharedPointer<DatabaseCommand> > cmdGroup;
-        QSharedPointer<DatabaseCommand> cmd = m_cmds.takeFirst();
-        while ( cmd->groupable() )
-        {
-            cmdGroup << cmd;
-            if ( !m_cmds.isEmpty() && m_cmds.first()->groupable() && m_cmds.first()->commandname() == cmd->commandname() )
-                cmd = m_cmds.takeFirst();
-            else
-                break;
-        }
-
-        // return here when the last command finished
-        connect( cmd.data(), SIGNAL( finished() ), SLOT( executeCommands() ) );
-
-        if ( cmdGroup.count() )
-        {
-            Database::instance()->enqueue( cmdGroup );
-        }
-        else
-        {
-            Database::instance()->enqueue( cmd );
-        }
-
-        int percentage = ( float( m_commandCount - m_cmds.count() ) / (float)m_commandCount ) * 100.0;
-        m_textStatus = tr( "Saving (%1%)" ).arg( percentage );
-        emit stateChanged();
-    }
-    else
-    {
-        if ( m_updateIndexWhenSynced )
-        {
-            m_updateIndexWhenSynced = false;
-            updateTracks();
-        }
-
-        m_textStatus = QString();
-        m_state = DBSyncConnection::SYNCED;
-
-        emit commandsFinished();
-        emit stateChanged();
-        emit synced();
-    }
-}
-
-
-void
-Source::reportSocialAttributesChanged( DatabaseCommand_SocialAction* action )
-{
-    Q_ASSERT( action );
-
-    emit socialAttributesChanged( action->action() );
-
-    if ( action->action() == "latchOn" )
-    {
-        const source_ptr to = SourceList::instance()->get( action->comment() );
-        if ( !to.isNull() )
-            emit latchedOn( to );
-    }
-    else if ( action->action() == "latchOff" )
-    {
-        const source_ptr from = SourceList::instance()->get( action->comment() );
-        if ( !from.isNull() )
-            emit latchedOff( from );
-    }
-}
-
-
-void
-Source::updateTracks()
-{
-    {
-        DatabaseCommand* cmd = new DatabaseCommand_UpdateSearchIndex();
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-    }
-
-    {
-        // Re-calculate local db stats
-        DatabaseCommand_CollectionStats* cmd = new DatabaseCommand_CollectionStats( SourceList::instance()->get( id() ) );
-        connect( cmd, SIGNAL( done( QVariantMap ) ), SLOT( setStats( QVariantMap ) ), Qt::QueuedConnection );
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-    }
-}
-
-
-void
-Source::updateIndexWhenSynced()
-{
-    m_updateIndexWhenSynced = true;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/source.h Deleted

@@ -1,167 +0,0 @@
-/* === 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
- *   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 SOURCE_H
-#define SOURCE_H
-
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QVariantMap>
-
-#include "typedefs.h"
-#include "network/dbsyncconnection.h"
-#include "collection.h"
-#include "query.h"
-
-#include "dllmacro.h"
-
-class ControlConnection;
-class DatabaseCommand_LogPlayback;
-class DatabaseCommand_SocialAction;
-class DatabaseCommand_UpdateSearchIndex;
-class DatabaseCommand_DeleteFiles;
-
-namespace Tomahawk
-{
-
-class DLLEXPORT Source : public QObject
-{
-Q_OBJECT
-
-friend class ::DBSyncConnection;
-friend class ::ControlConnection;
-friend class ::DatabaseCommand_LogPlayback;
-friend class ::DatabaseCommand_SocialAction;
-friend class ::DatabaseCommand_AddFiles;
-friend class ::DatabaseCommand_DeleteFiles;
-
-public:
-    enum AvatarStyle { Original, FancyStyle };
-
-    explicit Source( int id, const QString& username = QString() );
-    virtual ~Source();
-
-    bool isLocal() const { return m_isLocal; }
-    bool isOnline() const { return m_online; }
-
-    QString userName() const { return m_username; }
-    QString friendlyName() const;
-    void setFriendlyName( const QString& fname );
-
-#ifndef ENABLE_HEADLESS
-    void setAvatar( const QPixmap& avatar );
-    QPixmap avatar( AvatarStyle style = Original ) const;
-#endif
-
-    collection_ptr collection() const;
-    void addCollection( const Tomahawk::collection_ptr& c );
-    void removeCollection( const Tomahawk::collection_ptr& c );
-
-    int id() const { return m_id; }
-    ControlConnection* controlConnection() const { return m_cc; }
-    void setControlConnection( ControlConnection* cc );
-
-    void scanningProgress( unsigned int files );
-    void scanningFinished( unsigned int files );
-
-    unsigned int trackCount() const;
-
-    Tomahawk::query_ptr currentTrack() const { return m_currentTrack; }
-    QString textStatus() const { return m_textStatus; }
-    DBSyncConnection::State state() const { return m_state; }
-
-    Tomahawk::playlistinterface_ptr playlistInterface();
-
-signals:
-    void syncedWithDatabase();
-    void synced();
-
-    void online();
-    void offline();
-
-    void collectionAdded( const collection_ptr& collection );
-    void collectionRemoved( const collection_ptr& collection );
-
-    void stats( const QVariantMap& );
-    void usernameChanged( const QString& );
-
-    void playbackStarted( const Tomahawk::query_ptr& query );
-    void playbackFinished( const Tomahawk::query_ptr& query );
-
-    void stateChanged();
-    void commandsFinished();
-
-    void socialAttributesChanged( const QString& action );
-
-    void latchedOn( const Tomahawk::source_ptr& to );
-    void latchedOff( const Tomahawk::source_ptr& from );
-
-public slots:
-    void setStats( const QVariantMap& m );
-
-private slots:
-    void dbLoaded( unsigned int id, const QString& fname );
-    QString lastCmdGuid() const { return m_lastCmdGuid; }
-    void updateIndexWhenSynced();
-
-    void setOffline();
-    void setOnline();
-
-    void onStateChanged( DBSyncConnection::State newstate, DBSyncConnection::State oldstate, const QString& info );
-
-    void onPlaybackStarted( const Tomahawk::query_ptr& query, unsigned int duration );
-    void onPlaybackFinished( const Tomahawk::query_ptr& query );
-    void trackTimerFired();
-
-    void executeCommands();
-    void addCommand( const QSharedPointer<DatabaseCommand>& command );
-
-private:
-    void updateTracks();
-    void reportSocialAttributesChanged( DatabaseCommand_SocialAction* action );
-
-    QList< QSharedPointer<Collection> > m_collections;
-    QVariantMap m_stats;
-    QString m_lastCmdGuid;
-
-    bool m_isLocal;
-    bool m_online;
-    QString m_username;
-    QString m_friendlyname;
-    int m_id;
-    bool m_scrubFriendlyName;
-    bool m_updateIndexWhenSynced;
-
-    Tomahawk::query_ptr m_currentTrack;
-    QString m_textStatus;
-    DBSyncConnection::State m_state;
-    QTimer m_currentTrackTimer;
-
-    ControlConnection* m_cc;
-    QList< QSharedPointer<DatabaseCommand> > m_cmds;
-    int m_commandCount;
-
-    QPixmap* m_avatar;
-    mutable QPixmap* m_fancyAvatar;
-
-    Tomahawk::playlistinterface_ptr m_playlistInterface;
-};
-
-} //ns
-
-#endif // SOURCE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sourcelist.cpp Deleted

@@ -1,247 +0,0 @@
-/* === 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
- *   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 "sourcelist.h"
-
-#include "database/database.h"
-#include "database/databasecommand_loadallsources.h"
-#include "network/remotecollection.h"
-#include "network/controlconnection.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-SourceList* SourceList::s_instance = 0;
-
-
-SourceList*
-SourceList::instance()
-{
-    if ( !s_instance )
-    {
-        s_instance = new SourceList();
-    }
-
-    return s_instance;
-}
-
-
-SourceList::SourceList( QObject* parent )
-    : QObject( parent )
-    , m_isReady( false )
-{
-}
-
-
-const source_ptr&
-SourceList::getLocal()
-{
-    return m_local;
-}
-
-
-void
-SourceList::setWebSource( const source_ptr& websrc )
-{
-    m_dummy = websrc;
-}
-
-
-const
-source_ptr SourceList::webSource() const
-{
-    return m_dummy;
-}
-
-
-void
-SourceList::loadSources()
-{
-    DatabaseCommand_LoadAllSources* cmd = new DatabaseCommand_LoadAllSources();
-
-    connect( cmd, SIGNAL( done( QList<Tomahawk::source_ptr> ) ),
-                    SLOT( setSources( QList<Tomahawk::source_ptr> ) ) );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-SourceList::setSources( const QList<Tomahawk::source_ptr>& sources )
-{
-    {
-        QMutexLocker lock( &m_mut );
-
-        m_isReady = true;
-        foreach( const source_ptr& src, sources )
-        {
-            add( src );
-        }
-
-        tLog() << Q_FUNC_INFO << "- Total sources now:" << m_sources.size();
-    }
-
-    emit ready();
-}
-
-
-void
-SourceList::setLocal( const Tomahawk::source_ptr& localSrc )
-{
-    Q_ASSERT( localSrc->isLocal() );
-    Q_ASSERT( m_local.isNull() );
-
-    {
-        QMutexLocker lock( &m_mut );
-        m_sources.insert( localSrc->userName(), localSrc );
-        m_local = localSrc;
-    }
-
-
-    connect( localSrc.data(), SIGNAL( latchedOn( Tomahawk::source_ptr ) ), this, SLOT( latchedOn( Tomahawk::source_ptr ) ) );
-    connect( localSrc.data(), SIGNAL( latchedOff( Tomahawk::source_ptr ) ), this, SLOT( latchedOff( Tomahawk::source_ptr ) ) );
-    emit sourceAdded( localSrc );
-}
-
-
-void
-SourceList::add( const source_ptr& source )
-{
-    Q_ASSERT( m_isReady );
-
-//    qDebug() << "Adding to sources:" << source->userName() << source->id();
-    m_sources.insert( source->userName(), source );
-
-    if ( source->id() > 0 )
-        m_sources_id2name.insert( source->id(), source->userName() );
-    connect( source.data(), SIGNAL( syncedWithDatabase() ), SLOT( sourceSynced() ) );
-
-    collection_ptr coll( new RemoteCollection( source ) );
-    source->addCollection( coll );
-
-    connect( source.data(), SIGNAL( latchedOn( Tomahawk::source_ptr ) ), this, SLOT( latchedOn( Tomahawk::source_ptr ) ) );
-    connect( source.data(), SIGNAL( latchedOff( Tomahawk::source_ptr ) ), this, SLOT( latchedOff( Tomahawk::source_ptr ) ) );
-    emit sourceAdded( source );
-}
-
-
-void
-SourceList::removeAllRemote()
-{
-    foreach( const source_ptr& s, m_sources )
-    {
-        qDebug() << "Disconnecting" << s->friendlyName() << s->isLocal() << s->controlConnection() << s->isOnline();
-        if ( !s->isLocal() && s->controlConnection() )
-        {
-            s->controlConnection()->shutdown( true );
-        }
-    }
-}
-
-
-QList<source_ptr>
-SourceList::sources( bool onlyOnline ) const
-{
-    QMutexLocker lock( &m_mut );
-
-    QList< source_ptr > sources;
-    foreach( const source_ptr& src, m_sources )
-    {
-        if ( !onlyOnline || src->controlConnection() )
-            sources << src;
-    }
-
-    return sources;
-}
-
-
-source_ptr
-SourceList::get( int id ) const
-{
-    QMutexLocker lock( &m_mut );
-
-    if ( id == 0 )
-        return m_local;
-    else
-        return m_sources.value( m_sources_id2name.value( id ) );
-}
-
-
-source_ptr
-SourceList::get( const QString& username, const QString& friendlyName )
-{
-    QMutexLocker lock( &m_mut );
-
-    source_ptr source;
-    if ( Database::instance()->dbid() == username )
-    {
-        return m_local;
-    }
-
-    if ( !m_sources.contains( username ) )
-    {
-        source = source_ptr( new Source( -1, username ) );
-        source->setFriendlyName( friendlyName );
-        add( source );
-    }
-    else
-    {
-        source = m_sources.value( username );
-        source->setFriendlyName( friendlyName );
-    }
-
-    return source;
-}
-
-
-void
-SourceList::sourceSynced()
-{
-    Source* src = qobject_cast< Source* >( sender() );
-
-    m_sources_id2name.insert( src->id(), src->userName() );
-}
-
-
-unsigned int
-SourceList::count() const
-{
-    QMutexLocker lock( &m_mut );
-    return m_sources.size();
-}
-
-void
-SourceList::latchedOff( const source_ptr& to )
-{
-    Source* s = qobject_cast< Source* >( sender() );
-    const source_ptr source = m_sources s->userName() ;
-
-    emit sourceLatchedOff( source, to );
-}
-
-void
-SourceList::latchedOn( const source_ptr& to )
-{
-
-    Source* s = qobject_cast< Source* >( sender() );
-    const source_ptr source = m_sources s->userName() ;
-
-    emit sourceLatchedOn( source, to );
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sourcelist.h Deleted

@@ -1,87 +0,0 @@
-/* === 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
- *   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 SOURCELIST_H
-#define SOURCELIST_H
-
-#include <QObject>
-#include <QMutex>
-#include <QMap>
-
-#include "typedefs.h"
-#include "source.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT SourceList : public QObject
-{
-Q_OBJECT
-
-public:
-    static SourceList* instance();
-
-    explicit SourceList( QObject* parent = 0 );
-
-    bool isReady() const { return m_isReady; }
-
-    const Tomahawk::source_ptr& getLocal();
-    void setLocal( const Tomahawk::source_ptr& localSrc );
-
-    void setWebSource( const Tomahawk::source_ptr& websrc );
-    const Tomahawk::source_ptr webSource() const;
-
-    void loadSources();
-    void removeAllRemote();
-
-    QList<Tomahawk::source_ptr> sources( bool onlyOnline = false ) const;
-    unsigned int count() const;
-
-    Tomahawk::source_ptr get( const QString& username, const QString& friendlyName = QString() );
-    Tomahawk::source_ptr get( int id ) const;
-
-signals:
-    void ready();
-
-    void sourceAdded( const Tomahawk::source_ptr& );
-    void sourceRemoved( const Tomahawk::source_ptr& );
-
-    void sourceLatchedOn( const Tomahawk::source_ptr& from, const Tomahawk::source_ptr& to );
-    void sourceLatchedOff( const Tomahawk::source_ptr& from, const Tomahawk::source_ptr& to );
-
-private slots:
-    void setSources( const QList<Tomahawk::source_ptr>& sources );
-    void sourceSynced();
-
-    void latchedOn( const Tomahawk::source_ptr& );
-    void latchedOff( const Tomahawk::source_ptr& );
-
-private:
-    void add( const Tomahawk::source_ptr& source );
-
-    QMap< QString, Tomahawk::source_ptr > m_sources;
-    QMap< int, QString > m_sources_id2name;
-
-    bool m_isReady;
-    Tomahawk::source_ptr m_local;
-    Tomahawk::source_ptr m_dummy;
-    mutable QMutex m_mut; // mutable so const methods can use a lock
-
-    static SourceList* s_instance;
-};
-
-#endif // SOURCELIST_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sourceplaylistinterface.cpp Deleted

@@ -1,154 +0,0 @@
-/* === 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
- *   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 "sourceplaylistinterface.h"
-
-#include "source.h"
-#include "pipeline.h"
-#include "audio/audioengine.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-SourcePlaylistInterface::SourcePlaylistInterface( Tomahawk::Source *source, Tomahawk::PlaylistInterface::LatchMode latchMode )
-    : PlaylistInterface()
-    , m_source( source )
-    , m_currentItem( 0 )
-    , m_gotNextItem( false )
-{
-    setLatchMode( latchMode );
-    
-    if ( !m_source.isNull() )
-        connect( m_source.data(), SIGNAL( playbackStarted( const Tomahawk::query_ptr& ) ), SLOT( onSourcePlaybackStarted( const Tomahawk::query_ptr& ) ) );
-
-    if ( AudioEngine::instance() )
-        connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( audioPaused() ) );
-}
-
-
-SourcePlaylistInterface::~SourcePlaylistInterface()
-{
-    m_source.clear();
-}
-
-
-Tomahawk::result_ptr
-SourcePlaylistInterface::siblingItem( int itemsAway )
-{
-    Q_UNUSED( itemsAway );
-    return nextItem();
-}
-
-
-Tomahawk::result_ptr
-SourcePlaylistInterface::nextItem()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-    if ( !sourceValid() )
-    {
-        tDebug( LOGEXTRA ) << Q_FUNC_INFO << " Source no longer valid";
-        m_currentItem = Tomahawk::result_ptr();
-        return m_currentItem;
-    }
-    else if ( !hasNextItem() )
-    {
-        tDebug( LOGEXTRA ) << Q_FUNC_INFO << " This song was already fetched or the source isn't playing anything";
-        return Tomahawk::result_ptr();
-    }
-
-    m_gotNextItem = false;
-    m_currentItem = m_source.data()->currentTrack()->results().first();
-    return m_currentItem;
-}
-
-
-result_ptr
-SourcePlaylistInterface::currentItem() const
-{
-    return m_currentItem;
-}
-
-
-bool
-SourcePlaylistInterface::sourceValid()
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-    if ( m_source.isNull() || m_source.data()->currentTrack().isNull() )
-        return false;
-
-    return true;
-}
-
-
-bool
-SourcePlaylistInterface::hasNextItem()
-{
-    if ( !sourceValid() )
-        return false;
-    
-    return m_gotNextItem;
-}
-
-
-QList<Tomahawk::query_ptr>
-SourcePlaylistInterface::tracks()
-{
-    QList<Tomahawk::query_ptr> tracks;
-    return tracks; // FIXME (with what?)
-}
-
-
-QWeakPointer< Tomahawk::Source >
-SourcePlaylistInterface::source() const
-{
-    return m_source;
-}
-
-
-void
-SourcePlaylistInterface::reset()
-{
-    if ( m_currentItem.isNull() )
-        m_gotNextItem = false;
-    else
-        m_gotNextItem = true;
-}
-
-
-void
-SourcePlaylistInterface::onSourcePlaybackStarted( const Tomahawk::query_ptr& query )
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-    connect( query.data(), SIGNAL( resolvingFinished( bool ) ), SLOT( resolvingFinished( bool ) ) );
-    Pipeline::instance()->resolve( query );
-    m_gotNextItem = false;
-}
-
-
-void
-SourcePlaylistInterface::resolvingFinished( bool hasResults )
-{
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO << " and has results? : " << (hasResults ? "true" : "false");
-    if ( hasResults )
-    {
-        m_gotNextItem = true;
-        emit nextTrackReady();
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sourceplaylistinterface.h Deleted

@@ -1,84 +0,0 @@
-/* === 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
- *   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 TOMAHAWKSOURCEPLAYLISTINTERFACE_H
-#define TOMAHAWKSOURCEPLAYLISTINTERFACE_H
-
-#include <QObject>
-#include <QSharedPointer>
-
-#include "typedefs.h"
-#include "playlistinterface.h"
-
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT SourcePlaylistInterface : public Tomahawk::PlaylistInterface
-{
-Q_OBJECT
-
-public:
-    SourcePlaylistInterface( Tomahawk::Source *source, Tomahawk::PlaylistInterface::LatchMode latchMode = PlaylistInterface::StayOnSong );
-    virtual ~SourcePlaylistInterface();
-
-    QList<Tomahawk::query_ptr> tracks();
-
-    virtual int trackCount() const { return 1; }
-    virtual int unfilteredTrackCount() const { return 1; }
-
-    virtual Tomahawk::result_ptr siblingItem( int itemsAway );
-    virtual bool sourceValid();
-    virtual bool hasNextItem();
-    virtual Tomahawk::result_ptr nextItem();
-    virtual Tomahawk::result_ptr currentItem() const;
-
-    virtual PlaylistInterface::RepeatMode repeatMode() const { return PlaylistInterface::NoRepeat; }
-    virtual PlaylistInterface::SeekRestrictions seekRestrictions() const { return PlaylistInterface::NoSeek; }
-    virtual PlaylistInterface::SkipRestrictions skipRestrictions() const { return PlaylistInterface::NoSkipBackwards; }
-    virtual PlaylistInterface::RetryMode retryMode() const { return Retry; }
-    virtual quint32 retryInterval() const { return 5000; }
-
-    virtual void setLatchMode( PlaylistInterface::LatchMode latchMode ) { m_latchMode = latchMode; emit latchModeChanged( latchMode ); }
-    
-    virtual bool shuffled() const { return false; }
-    virtual void setFilter( const QString& /*pattern*/ ) {}
-
-    virtual QWeakPointer< Tomahawk::Source > source() const;
-
-    virtual void reset();
-
-public slots:
-    virtual void setRepeatMode( PlaylistInterface::RepeatMode ) {}
-    virtual void setShuffled( bool ) {}
-    virtual void audioPaused() { setLatchMode( PlaylistInterface::StayOnSong ); }
-
-private slots:
-    void onSourcePlaybackStarted( const Tomahawk::query_ptr& query );
-    void resolvingFinished( bool hasResults );
-
-private:
-    QWeakPointer< Tomahawk::Source > m_source;
-    Tomahawk::result_ptr m_currentItem;
-    bool m_gotNextItem;
-};
-
-}; // ns
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/tomahawksettings.cpp Deleted

@@ -1,965 +0,0 @@
-/* === 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
- *   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 "tomahawksettings.h"
-
-#include <QDir>
-
-#include "sip/SipHandler.h"
-#include "playlistinterface.h"
-
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-
-#include "database/databasecommand_updatesearchindex.h"
-#include "database/database.h"
-
-#define VERSION 6
-
-using namespace Tomahawk;
-
-TomahawkSettings* TomahawkSettings::s_instance = 0;
-
-TomahawkSettings*
-TomahawkSettings::instance()
-{
-    return s_instance;
-}
-
-
-TomahawkSettings::TomahawkSettings( QObject* parent )
-    : QSettings( parent )
-{
-    s_instance = this;
-
-    #ifdef Q_OS_LINUX
-        QFile file( fileName() );
-        file.setPermissions( file.permissions() & ~(QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther ) );
-    #endif
-
-    if ( !contains( "configversion" ) )
-    {
-        setValue( "configversion", VERSION );
-        doInitialSetup();
-    }
-    else if ( value( "configversion" ).toUInt() != VERSION )
-    {
-        qDebug() << "Config version outdated, old:" << value( "configversion" ).toUInt()
-                 << "new:" << VERSION
-                 << "Doing upgrade, if any...";
-
-        int current = value( "configversion" ).toUInt();
-        while ( current < VERSION )
-        {
-            doUpgrade( current, current + 1 );
-
-            current++;
-        }
-        // insert upgrade code here as required
-        setValue( "configversion", VERSION );
-    }
-}
-
-
-TomahawkSettings::~TomahawkSettings()
-{
-    s_instance = 0;
-}
-
-
-void
-TomahawkSettings::doInitialSetup()
-{
-    // by default we add a local network resolver
-    addSipPlugin( "sipzeroconf_autocreated" );
-}
-
-
-void
-TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
-{
-    Q_UNUSED( newVersion );
-
-    if ( oldVersion == 1 )
-    {
-        qDebug() << "Migrating config from verson 1 to 2: script resolver config name";
-        if( contains( "script/resolvers" ) ) {
-            setValue( "script/loadedresolvers", value( "script/resolvers" ) );
-            remove( "script/resolvers" );
-        }
-    }
-    else if ( oldVersion == 2 )
-    {
-        qDebug() << "Migrating config from version 2 to 3: Converting jabber and twitter accounts to new SIP Factory approach";
-        // migrate old accounts to new system. only jabber and twitter, and max one each. create a new plugin for each if needed
-        // not pretty as we hardcode a plugin id and assume that we know how the config layout is, but hey, this is migration after all
-        if ( contains( "jabber/username" ) && contains( "jabber/password" ) )
-        {
-            QString sipName = "sipjabber";
-            if ( value( "jabber/username" ).toString().contains( "@gmail" ) )
-                sipName = "sipgoogle";
-
-            setValue( QString( "%1_legacy/username" ).arg( sipName ), value( "jabber/username" ) );
-            setValue( QString( "%1_legacy/password" ).arg( sipName ), value( "jabber/password" ) );
-            setValue( QString( "%1r_legacy/autoconnect" ).arg( sipName ), value( "jabber/autoconnect" ) );
-            setValue( QString( "%1_legacy/port" ).arg( sipName ), value( "jabber/port" ) );
-            setValue( QString( "%1_legacy/server" ).arg( sipName ), value( "jabber/server" ) );
-
-            addSipPlugin( QString( "%1_legacy" ).arg( sipName ) );
-
-            remove( "jabber/username" );
-            remove( "jabber/password" );
-            remove( "jabber/autoconnect" );
-            remove( "jabber/server" );
-            remove( "jabber/port" );
-        }
-        if ( contains( "twitter/ScreenName" ) && contains( "twitter/OAuthToken" ) )
-        {
-            setValue( "siptwitter_legacy/ScreenName", value( "twitter/ScreenName" ) );
-            setValue( "siptwitter_legacy/OAuthToken", value( "twitter/OAuthToken" ) );
-            setValue( "siptwitter_legacy/OAuthTokenSecret", value( "twitter/OAuthTokenSecret" ) );
-            setValue( "siptwitter_legacy/CachedFriendsSinceID", value( "twitter/CachedFriendsSinceID" ) );
-            setValue( "siptwitter_legacy/CachedMentionsSinceID", value( "twitter/CachedMentionsSinceID" ) );
-            setValue( "siptwitter_legacy/CachedDirectMessagesSinceID", value( "twitter/CachedDirectMessagesSinceID" ) );
-            setValue( "siptwitter_legacy/CachedPeers", value( "twitter/CachedPeers" ) );
-            setValue( "siptwitter_legacy/AutoConnect", value( "jabber/autoconnect" ) );
-
-            addSipPlugin( "siptwitter_legacy" );
-            remove( "twitter/ScreenName" );
-            remove( "twitter/OAuthToken" );
-            remove( "twitter/OAuthTokenSecret" );
-            remove( "twitter/CachedFriendsSinceID" );
-            remove( "twitter/CachedMentionsSinceID" );
-            remove( "twitter/CachedDirectMessagesSinceID" );
-        }
-        // create a zeroconf plugin too
-        addSipPlugin( "sipzeroconf_legacy" );
-    }
-    else if ( oldVersion == 3 )
-    {
-        if ( contains( "script/atticaresolverstates" ) )
-        {
-            // Do messy binary upgrade. remove attica resolvers :(
-            setValue( "script/atticaresolverstates", QVariant() );
-
-            QDir resolverDir = TomahawkUtils::appDataDir();
-            if ( !resolverDir.cd( QString( "atticaresolvers" ) ) )
-                return;
-
-            QStringList toremove;
-            QStringList resolvers = resolverDir.entryList( QDir::Dirs | QDir::NoDotAndDotDot );
-            QStringList listedResolvers = allScriptResolvers();
-            QStringList enabledResolvers = enabledScriptResolvers();
-            foreach ( const QString& resolver, resolvers )
-            {
-                foreach ( const QString& r, listedResolvers )
-                {
-                    if ( r.contains( resolver ) )
-                    {
-                        tDebug() << "Deleting listed resolver:" << r;
-                        listedResolvers.removeAll( r );
-                    }
-                }
-                foreach ( const QString& r, enabledResolvers )
-                {
-                    if ( r.contains( resolver ) )
-                    {
-                        tDebug() << "Deleting enabled resolver:" << r;
-                        enabledResolvers.removeAll( r );
-                    }
-                }
-            }
-            setAllScriptResolvers( listedResolvers );
-            setEnabledScriptResolvers( enabledResolvers );
-            tDebug() << "UPGRADING AND DELETING:" << resolverDir.absolutePath();
-            TomahawkUtils::removeDirectory( resolverDir.absolutePath() );
-        }
-    }
-    else if ( oldVersion == 4 || oldVersion == 5 )
-    {
-        // 0.3.0 contained a bug which prevent indexing local files. Force a reindex.
-        QTimer::singleShot( 0, this, SLOT( updateIndex() ) );
-    }
-}
-
-
-void
-TomahawkSettings::setAcceptedLegalWarning( bool accept )
-{
-    setValue( "acceptedLegalWarning", accept );
-}
-
-
-bool
-TomahawkSettings::acceptedLegalWarning() const
-{
-    return value( "acceptedLegalWarning", false ).toBool();
-}
-
-
-void
-TomahawkSettings::setInfoSystemCacheVersion( uint version )
-{
-    setValue( "infosystemcacheversion", version );
-}
-
-
-uint
-TomahawkSettings::infoSystemCacheVersion() const
-{
-    return value( "infosystemcacheversion", 0 ).toUInt();
-}
-
-
-QString
-TomahawkSettings::storageCacheLocation() const
-{
-    return QDir::tempPath() + "/tomahawk/";
-}
-
-
-QStringList
-TomahawkSettings::scannerPaths() const
-{
-    QString musicLocation;
-
-#if defined(Q_WS_X11)
-    musicLocation = QDir::homePath() + QLatin1String("/Music");
-#endif
-
-    return value( "scanner/paths", musicLocation ).toStringList();
-}
-
-
-void
-TomahawkSettings::setScannerPaths( const QStringList& paths )
-{
-    setValue( "scanner/paths", paths );
-}
-
-
-bool
-TomahawkSettings::hasScannerPaths() const
-{
-    //FIXME: After enough time, remove this hack
-    return contains( "scanner/paths" ) || contains( "scannerpath" ) || contains( "scannerpaths" );
-}
-
-
-uint
-TomahawkSettings::scannerTime() const
-{
-    return value( "scanner/intervaltime", 60 ).toUInt();
-}
-
-
-void
-TomahawkSettings::setScannerTime( uint time )
-{
-    setValue( "scanner/intervaltime", time );
-}
-
-
-bool
-TomahawkSettings::watchForChanges() const
-{
-    return value( "scanner/watchforchanges", false ).toBool();
-}
-
-
-void
-TomahawkSettings::setWatchForChanges( bool watch )
-{
-    setValue( "scanner/watchforchanges", watch );
-}
-
-
-bool
-TomahawkSettings::httpEnabled() const
-{
-    return value( "network/http", true ).toBool();
-}
-
-
-void
-TomahawkSettings::setHttpEnabled( bool enable )
-{
-    setValue( "network/http", enable );
-}
-
-
-bool
-TomahawkSettings::crashReporterEnabled() const
-{
-    return value( "ui/crashReporter", true ).toBool();
-}
-
-
-void
-TomahawkSettings::setCrashReporterEnabled( bool enable )
-{
-    setValue( "ui/crashReporter", enable );
-}
-
-
-QString
-TomahawkSettings::proxyHost() const
-{
-    return value( "network/proxy/host", QString() ).toString();
-}
-
-
-void
-TomahawkSettings::setProxyHost( const QString& host )
-{
-    setValue( "network/proxy/host", host );
-}
-
-
-QString
-TomahawkSettings::proxyNoProxyHosts() const
-{
-    return value( "network/proxy/noproxyhosts", QString() ).toString();
-}
-
-
-void
-TomahawkSettings::setProxyNoProxyHosts( const QString& hosts )
-{
-    setValue( "network/proxy/noproxyhosts", hosts );
-}
-
-
-qulonglong
-TomahawkSettings::proxyPort() const
-{
-    return value( "network/proxy/port", 1080 ).toULongLong();
-}
-
-
-void
-TomahawkSettings::setProxyPort( const qulonglong port )
-{
-    setValue( "network/proxy/port", port );
-}
-
-
-QString
-TomahawkSettings::proxyUsername() const
-{
-    return value( "network/proxy/username", QString() ).toString();
-}
-
-
-void
-TomahawkSettings::setProxyUsername( const QString& username )
-{
-    setValue( "network/proxy/username", username );
-}
-
-
-QString
-TomahawkSettings::proxyPassword() const
-{
-    return value( "network/proxy/password", QString() ).toString();
-}
-
-
-void
-TomahawkSettings::setProxyPassword( const QString& password )
-{
-    setValue( "network/proxy/password", password );
-}
-
-
-QNetworkProxy::ProxyType
-TomahawkSettings::proxyType() const
-{
-    return static_cast< QNetworkProxy::ProxyType>( value( "network/proxy/type", QNetworkProxy::NoProxy ).toInt() );
-}
-
-
-void
-TomahawkSettings::setProxyType( const QNetworkProxy::ProxyType type )
-{
-    setValue( "network/proxy/type", static_cast< uint >( type ) );
-}
-
-
-bool
-TomahawkSettings::proxyDns() const
-{
-    return value( "network/proxy/dns", false ).toBool();
-}
-
-
-void
-TomahawkSettings::setProxyDns( bool lookupViaProxy )
-{
-    setValue( "network/proxy/dns", lookupViaProxy );
-}
-
-
-QStringList
-TomahawkSettings::aclEntries() const
-{
-    return value( "acl/entries", QStringList() ).toStringList();
-}
-
-
-void
-TomahawkSettings::setAclEntries( const QStringList &entries )
-{
-    setValue( "acl/entries", entries );
-}
-
-
-QByteArray
-TomahawkSettings::mainWindowGeometry() const
-{
-    return value( "ui/mainwindow/geometry" ).toByteArray();
-}
-
-
-void
-TomahawkSettings::setMainWindowGeometry( const QByteArray& geom )
-{
-    setValue( "ui/mainwindow/geometry", geom );
-}
-
-
-QByteArray
-TomahawkSettings::mainWindowState() const
-{
-    return value( "ui/mainwindow/state" ).toByteArray();
-}
-
-
-void
-TomahawkSettings::setMainWindowState( const QByteArray& state )
-{
-    setValue( "ui/mainwindow/state", state );
-}
-
-
-QByteArray
-TomahawkSettings::mainWindowSplitterState() const
-{
-    return value( "ui/mainwindow/splitterState" ).toByteArray();
-}
-
-
-void
-TomahawkSettings::setMainWindowSplitterState( const QByteArray& state )
-{
-    setValue( "ui/mainwindow/splitterState", state );
-}
-
-
-bool
-TomahawkSettings::verboseNotifications() const
-{
-    return value( "ui/notifications/verbose", false ).toBool();
-}
-
-
-void
-TomahawkSettings::setVerboseNotifications( bool notifications )
-{
-    setValue( "ui/notifications/verbose", notifications );
-}
-
-
-bool
-TomahawkSettings::showOfflineSources() const
-{
-    return value( "collection/sources/showoffline", false ).toBool();
-}
-
-
-void
-TomahawkSettings::setShowOfflineSources( bool show )
-{
-    setValue( "collection/sources/showoffline", show );
-}
-
-
-bool
-TomahawkSettings::enableEchonestCatalogs() const
-{
-    return value( "collection/enable_catalogs", false ).toBool();
-}
-
-
-void
-TomahawkSettings::setEnableEchonestCatalogs( bool enable )
-{
-    setValue( "collection/enable_catalogs", enable );
-}
-
-
-QByteArray
-TomahawkSettings::playlistColumnSizes( const QString& playlistid ) const
-{
-    return value( QString( "ui/playlist/%1/columnSizes" ).arg( playlistid ) ).toByteArray();
-}
-
-
-void
-TomahawkSettings::setPlaylistColumnSizes( const QString& playlistid, const QByteArray& state )
-{
-    setValue( QString( "ui/playlist/%1/columnSizes" ).arg( playlistid ), state );
-}
-
-
-bool
-TomahawkSettings::shuffleState( const QString& playlistid ) const
-{
-    return value( QString( "ui/playlist/%1/shuffleState" ).arg( playlistid )).toBool();
-}
-
-
-void
-TomahawkSettings::setShuffleState( const QString& playlistid, bool state)
-{
-    setValue( QString( "ui/playlist/%1/shuffleState" ).arg( playlistid ), state );
-}
-
-
-void
-TomahawkSettings::removePlaylistSettings( const QString& playlistid )
-{
-    remove( QString( "ui/playlist/%1/shuffleState" ).arg( playlistid ) );
-    remove( QString( "ui/playlist/%1/repeatMode" ).arg( playlistid ) );
-}
-
-
-void
-TomahawkSettings::setRepeatMode( const QString& playlistid, Tomahawk::PlaylistInterface::RepeatMode mode )
-{
-    setValue( QString( "ui/playlist/%1/repeatMode" ).arg( playlistid ), (int)mode );
-}
-
-
-Tomahawk::PlaylistInterface::RepeatMode
-TomahawkSettings::repeatMode( const QString& playlistid )
-{
-    return (PlaylistInterface::RepeatMode)value( QString( "ui/playlist/%1/repeatMode" ).arg( playlistid )).toInt();
-}
-
-
-QList<Tomahawk::playlist_ptr>
-TomahawkSettings::recentlyPlayedPlaylists() const
-{
-    QStringList playlist_guids = value( "playlists/recentlyPlayed" ).toStringList();
-
-    QList<playlist_ptr> playlists;
-    foreach( const QString& guid, playlist_guids )
-    {
-        playlist_ptr pl = Playlist::load( guid );
-        if ( !pl.isNull() )
-            playlists << pl;
-    }
-
-    return playlists;
-}
-
-
-QStringList
-TomahawkSettings::recentlyPlayedPlaylistGuids( unsigned int amount ) const
-{
-    QStringList p = value( "playlists/recentlyPlayed" ).toStringList();
-
-    while ( amount && p.count() > (int)amount )
-        p.removeAt( 0 );
-
-    return p;
-}
-
-
-void
-TomahawkSettings::appendRecentlyPlayedPlaylist( const Tomahawk::playlist_ptr& playlist )
-{
-    QStringList playlist_guids = value( "playlists/recentlyPlayed" ).toStringList();
-
-    playlist_guids.removeAll( playlist->guid() );
-    playlist_guids.append( playlist->guid() );
-
-    setValue( "playlists/recentlyPlayed", playlist_guids );
-
-    emit recentlyPlayedPlaylistAdded( playlist );
-}
-
-
-QString
-TomahawkSettings::bookmarkPlaylist() const
-{
-    return value( "playlists/bookmark", QString() ).toString();
-}
-
-
-void
-TomahawkSettings::setBookmarkPlaylist( const QString& guid )
-{
-    setValue( "playlists/bookmark", guid );
-}
-
-
-QStringList
-TomahawkSettings::sipPlugins() const
-{
-    return value( "sip/allplugins", QStringList() ).toStringList();
-}
-
-
-void
-TomahawkSettings::setSipPlugins( const QStringList& plugins )
-{
-    setValue( "sip/allplugins", plugins );
-}
-
-
-QStringList
-TomahawkSettings::enabledSipPlugins() const
-{
-    return value( "sip/enabledplugins", QStringList() ).toStringList();
-}
-
-
-void
-TomahawkSettings::setEnabledSipPlugins( const QStringList& list )
-{
-    setValue( "sip/enabledplugins", list );
-}
-
-
-void
-TomahawkSettings::enableSipPlugin( const QString& pluginId )
-{
-    QStringList list = enabledSipPlugins();
-    list << pluginId;
-    setEnabledSipPlugins( list );
-}
-
-
-void
-TomahawkSettings::disableSipPlugin( const QString& pluginId )
-{
-    QStringList list = enabledSipPlugins();
-    list.removeAll( pluginId );
-    setEnabledSipPlugins( list );
-}
-
-
-void
-TomahawkSettings::addSipPlugin( const QString& pluginId, bool enable )
-{
-    QStringList list = sipPlugins();
-    list << pluginId;
-    setSipPlugins( list );
-
-    if ( enable )
-        enableSipPlugin( pluginId );
-}
-
-
-void
-TomahawkSettings::removeSipPlugin( const QString& pluginId )
-{
-    QStringList list = sipPlugins();
-    list.removeAll( pluginId );
-    setSipPlugins( list );
-
-    if( enabledSipPlugins().contains( pluginId ) )
-        disableSipPlugin( pluginId );
-}
-
-
-TomahawkSettings::ExternalAddressMode
-TomahawkSettings::externalAddressMode() const
-{
-    return (TomahawkSettings::ExternalAddressMode) value( "network/external-address-mode", TomahawkSettings::Upnp ).toInt();
-}
-
-
-void
-TomahawkSettings::setExternalAddressMode( ExternalAddressMode externalAddressMode )
-{
-    setValue( "network/external-address-mode", externalAddressMode );
-}
-
-
-bool TomahawkSettings::preferStaticHostPort() const
-{
-    return value( "network/prefer-static-host-and-port" ).toBool();
-}
-
-
-void TomahawkSettings::setPreferStaticHostPort( bool prefer )
-{
-    setValue( "network/prefer-static-host-and-port", prefer );
-}
-
-
-QString
-TomahawkSettings::externalHostname() const
-{
-    return value( "network/external-hostname" ).toString();
-}
-
-
-void
-TomahawkSettings::setExternalHostname(const QString& externalHostname)
-{
-    setValue( "network/external-hostname", externalHostname );
-}
-
-
-int
-TomahawkSettings::defaultPort() const
-{
-    return 50210;
-}
-
-
-int
-TomahawkSettings::externalPort() const
-{
-    return value( "network/external-port", 50210 ).toInt();
-}
-
-
-void
-TomahawkSettings::setExternalPort(int externalPort)
-{
-    if ( externalPort == 0 )
-        setValue( "network/external-port", 50210);
-    else
-        setValue( "network/external-port", externalPort);
-}
-
-
-QString
-TomahawkSettings::lastFmPassword() const
-{
-    return value( "lastfm/password" ).toString();
-}
-
-
-void
-TomahawkSettings::setLastFmPassword( const QString& password )
-{
-    setValue( "lastfm/password", password );
-}
-
-
-QByteArray
-TomahawkSettings::lastFmSessionKey() const
-{
-    return value( "lastfm/session" ).toByteArray();
-}
-
-
-void
-TomahawkSettings::setLastFmSessionKey( const QByteArray& key )
-{
-    setValue( "lastfm/session", key );
-}
-
-
-QString
-TomahawkSettings::lastFmUsername() const
-{
-    return value( "lastfm/username" ).toString();
-}
-
-
-void
-TomahawkSettings::setLastFmUsername( const QString& username )
-{
-    setValue( "lastfm/username", username );
-}
-
-
-bool
-TomahawkSettings::scrobblingEnabled() const
-{
-    return value( "lastfm/enablescrobbling", false ).toBool();
-}
-
-
-void
-TomahawkSettings::setScrobblingEnabled( bool enable )
-{
-    setValue( "lastfm/enablescrobbling", enable );
-}
-
-
-QString
-TomahawkSettings::xmppBotServer() const
-{
-    return value( "xmppBot/server", QString() ).toString();
-}
-
-
-void
-TomahawkSettings::setXmppBotServer( const QString& server )
-{
-    setValue( "xmppBot/server", server );
-}
-
-
-QString
-TomahawkSettings::xmppBotJid() const
-{
-    return value( "xmppBot/jid", QString() ).toString();
-}
-
-
-void
-TomahawkSettings::setXmppBotJid( const QString& component )
-{
-    setValue( "xmppBot/jid", component );
-}
-
-
-QString
-TomahawkSettings::xmppBotPassword() const
-{
-    return value( "xmppBot/password", QString() ).toString();
-}
-
-
-void
-TomahawkSettings::setXmppBotPassword( const QString& password )
-{
-    setValue( "xmppBot/password", password );
-}
-
-
-int
-TomahawkSettings::xmppBotPort() const
-{
-    return value( "xmppBot/port", -1 ).toInt();
-}
-
-
-void
-TomahawkSettings::setXmppBotPort( const int port )
-{
-    setValue( "xmppBot/port", port );
-}
-
-
-void
-TomahawkSettings::addScriptResolver(const QString& resolver)
-{
-    setValue( "script/resolvers", allScriptResolvers() << resolver );
-}
-
-
-QStringList
-TomahawkSettings::allScriptResolvers() const
-{
-    return value( "script/resolvers" ).toStringList();
-}
-
-
-void
-TomahawkSettings::setAllScriptResolvers( const QStringList& resolver )
-{
-    setValue( "script/resolvers", resolver );
-}
-
-
-QStringList
-TomahawkSettings::enabledScriptResolvers() const
-{
-    return value( "script/loadedresolvers" ).toStringList();
-}
-
-
-void
-TomahawkSettings::setEnabledScriptResolvers( const QStringList& resolvers )
-{
-    setValue( "script/loadedresolvers", resolvers );
-}
-
-
-QString
-TomahawkSettings::scriptDefaultPath() const
-{
-    return value( "script/defaultpath", QDir::homePath() ).toString();
-}
-
-
-void
-TomahawkSettings::setScriptDefaultPath( const QString& path )
-{
-    setValue( "script/defaultpath", path );
-}
-
-
-QString
-TomahawkSettings::playlistDefaultPath() const
-{
-    return value( "playlists/defaultpath", QDir::homePath() ).toString();
-}
-
-
-void
-TomahawkSettings::setPlaylistDefaultPath( const QString& path )
-{
-    setValue( "playlists/defaultpath", path );
-}
-
-
-bool
-TomahawkSettings::nowPlayingEnabled() const
-{
-    return value( "adium/enablenowplaying", false ).toBool();
-}
-
-
-void
-TomahawkSettings::setNowPlayingEnabled( bool enable )
-{
-    setValue( "adium/enablenowplaying", enable );
-}
-
-
-TomahawkSettings::PrivateListeningMode
-TomahawkSettings::privateListeningMode() const
-{
-    return ( TomahawkSettings::PrivateListeningMode ) value( "privatelisteningmode", TomahawkSettings::PublicListening ).toInt();
-}
-
-
-void
-TomahawkSettings::setPrivateListeningMode( TomahawkSettings::PrivateListeningMode mode )
-{
-    setValue( "privatelisteningmode", mode );
-}
-
-
-void
-TomahawkSettings::updateIndex()
-{
-    DatabaseCommand* cmd = new DatabaseCommand_UpdateSearchIndex();
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/tomahawksettings.h Deleted

@@ -1,226 +0,0 @@
-/* === 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
- *   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 TOMAHAWK_SETTINGS_H
-#define TOMAHAWK_SETTINGS_H
-
-#include "playlist.h"
-
-#include <QSettings>
-#include <QtNetwork/QNetworkProxy>
-
-#include "dllmacro.h"
-/**
- * Convenience wrapper around QSettings for tomahawk-specific config
- */
-class DLLEXPORT TomahawkSettings : public QSettings
-{
-Q_OBJECT
-
-public:
-    static TomahawkSettings* instance();
-
-    explicit TomahawkSettings( QObject* parent = 0 );
-    virtual ~TomahawkSettings();
-
-    void applyChanges() { emit changed(); }
-
-    /// General settings
-    virtual QString storageCacheLocation() const;
-    virtual QStringList scannerPaths() const; /// QDesktopServices::MusicLocation in TomahawkSettingsGui
-    void setScannerPaths( const QStringList& paths );
-    bool hasScannerPaths() const;
-    uint scannerTime() const;
-    void setScannerTime( uint time );
-    uint infoSystemCacheVersion() const;
-    void setInfoSystemCacheVersion( uint version );
-
-    bool watchForChanges() const;
-    void setWatchForChanges( bool watch );
-
-    bool acceptedLegalWarning() const;
-    void setAcceptedLegalWarning( bool accept );
-
-    /// UI settings
-    QByteArray mainWindowGeometry() const;
-    void setMainWindowGeometry( const QByteArray& geom );
-
-    QByteArray mainWindowState() const;
-    void setMainWindowState( const QByteArray& state );
-
-    QByteArray mainWindowSplitterState() const;
-    void setMainWindowSplitterState( const QByteArray& state );
-
-    bool verboseNotifications() const;
-    void setVerboseNotifications( bool notifications );
-
-    // Collection Stuff
-    bool showOfflineSources() const;
-    void setShowOfflineSources( bool show );
-
-    bool enableEchonestCatalogs() const;
-    void setEnableEchonestCatalogs( bool enable );
-
-    /// Playlist stuff
-    QByteArray playlistColumnSizes( const QString& playlistid ) const;
-    void setPlaylistColumnSizes( const QString& playlistid, const QByteArray& state );
-
-    QList<Tomahawk::playlist_ptr> recentlyPlayedPlaylists() const;
-    QStringList recentlyPlayedPlaylistGuids( unsigned int amount = 0 ) const;
-    void appendRecentlyPlayedPlaylist( const Tomahawk::playlist_ptr& playlist );
-
-    bool shuffleState( const QString& playlistid ) const;
-    void setShuffleState( const QString& playlistid, bool state );
-    Tomahawk::PlaylistInterface::RepeatMode repeatMode( const QString& playlistid );
-    void setRepeatMode( const QString& playlistid, Tomahawk::PlaylistInterface::RepeatMode mode );
-
-    // remove shuffle state and repeat state
-    void removePlaylistSettings( const QString& playlistid );
-
-    /// SIP plugins
-    // all plugins we know about. loaded, unloaded, enabled, disabled.
-    void setSipPlugins( const QStringList& plugins );
-    QStringList sipPlugins() const;
-
-    void setBookmarkPlaylist( const QString& guid );
-    QString bookmarkPlaylist() const;
-
-    // just the enabled sip plugins.
-    void setEnabledSipPlugins( const QStringList& list );
-    QStringList enabledSipPlugins() const;
-    void enableSipPlugin( const QString& pluginId );
-    void disableSipPlugin( const QString& pluginId );
-
-    void addSipPlugin( const QString& pluginId, bool enable = true );
-    void removeSipPlugin( const QString& pluginId );
-
-    /// Network settings
-    enum ExternalAddressMode { Lan, Upnp };
-    ExternalAddressMode externalAddressMode() const;
-    void setExternalAddressMode( ExternalAddressMode externalAddressMode );
-
-    bool preferStaticHostPort() const;
-    void setPreferStaticHostPort( bool prefer );
-
-    bool httpEnabled() const; /// true by default
-    void setHttpEnabled( bool enable );
-
-    bool crashReporterEnabled() const; /// true by default
-    void setCrashReporterEnabled( bool enable );
-
-    QString externalHostname() const;
-    void setExternalHostname( const QString& externalHostname );
-
-    int defaultPort() const;
-    int externalPort() const;
-    void setExternalPort( int externalPort );
-
-    QString proxyHost() const;
-    void setProxyHost( const QString &host );
-
-    QString proxyNoProxyHosts() const;
-    void setProxyNoProxyHosts( const QString &hosts );
-
-    qulonglong proxyPort() const;
-    void setProxyPort( const qulonglong port );
-
-    QString proxyUsername() const;
-    void setProxyUsername( const QString &username );
-
-    QString proxyPassword() const;
-    void setProxyPassword( const QString &password );
-
-    QNetworkProxy::ProxyType proxyType() const;
-    void setProxyType( const QNetworkProxy::ProxyType type );
-
-    bool proxyDns() const;
-    void setProxyDns( bool lookupViaProxy );
-
-    /// ACL settings
-    QStringList aclEntries() const;
-    void setAclEntries( const QStringList &entries );
-
-    /// Last.fm settings
-    bool scrobblingEnabled() const; /// false by default
-    void setScrobblingEnabled( bool enable );
-
-    QString lastFmUsername() const;
-    void setLastFmUsername( const QString& username );
-
-    QString lastFmPassword() const;
-    void setLastFmPassword( const QString& password );
-
-    QByteArray lastFmSessionKey() const;
-    void setLastFmSessionKey( const QByteArray& key );
-
-    /// XMPP Component Settings
-    QString xmppBotServer() const;
-    void setXmppBotServer( const QString &server );
-
-    QString xmppBotJid() const;
-    void setXmppBotJid( const QString &component );
-
-    QString xmppBotPassword() const;
-    void setXmppBotPassword( const QString &password );
-
-    int xmppBotPort() const;
-    void setXmppBotPort( const int port );
-
-    /// Script resolver settings
-    QStringList allScriptResolvers() const;
-    void setAllScriptResolvers( const QStringList& resolvers );
-    void addScriptResolver( const QString& resolver );
-    QStringList enabledScriptResolvers() const;
-    void setEnabledScriptResolvers( const QStringList& resolvers );
-
-
-    QString scriptDefaultPath() const;
-    void setScriptDefaultPath( const QString& path );
-    QString playlistDefaultPath() const;
-    void setPlaylistDefaultPath( const QString& path );
-
-    // Now-Playing Settings
-    // For now, just Adium. Soon, the world!
-    bool nowPlayingEnabled() const; // false by default
-    void setNowPlayingEnabled( bool enable );
-
-    enum PrivateListeningMode
-    {
-        PublicListening,
-        NoLogPlayback,
-        FullyPrivate
-    };
-    PrivateListeningMode privateListeningMode() const;
-    void setPrivateListeningMode( PrivateListeningMode mode );
-
-signals:
-    void changed();
-    void recentlyPlayedPlaylistAdded( const Tomahawk::playlist_ptr& playlist );
-
-private slots:
-    void updateIndex();
-
-private:
-    void doInitialSetup();
-    void doUpgrade( int oldVersion, int newVersion );
-
-    static TomahawkSettings* s_instance;
-};
-
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/typedefs.h Deleted

@@ -1,88 +0,0 @@
-/* === 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
- *   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 TYPEDEFS_H
-#define TYPEDEFS_H
-
-#include <QSharedPointer>
-#include <QUuid>
-#include <QPair>
-
-//template <typename T> class QSharedPointer;
-
-namespace Tomahawk
-{
-    class Artist;
-    class Album;
-    class Collection;
-    class Playlist;
-    class PlaylistEntry;
-    class PlaylistInterface;
-    class DynamicPlaylist;
-    class Query;
-    class Result;
-    class Source;
-    class DynamicControl;
-    class GeneratorInterface;
-
-    typedef QSharedPointer<Collection> collection_ptr;
-    typedef QSharedPointer<Playlist> playlist_ptr;
-    typedef QSharedPointer<PlaylistEntry> plentry_ptr;
-    typedef QSharedPointer<PlaylistInterface> playlistinterface_ptr;
-    typedef QSharedPointer<DynamicPlaylist> dynplaylist_ptr;
-    typedef QSharedPointer<Query> query_ptr;
-    typedef QSharedPointer<Result> result_ptr;
-    typedef QSharedPointer<Source> source_ptr;
-    typedef QSharedPointer<Artist> artist_ptr;
-    typedef QSharedPointer<Album> album_ptr;
-
-    typedef QSharedPointer<DynamicControl> dyncontrol_ptr;
-    typedef QSharedPointer<GeneratorInterface> geninterface_ptr;
-
-    // let's keep these typesafe, they are different kinds of GUID:
-    typedef QString QID; //query id
-    typedef QString RID; //result id
-
-    enum GeneratorMode {
-        OnDemand = 0,
-        Static
-    };
-
-    enum ModelMode
-    {
-        DatabaseMode = 0,
-        InfoSystemMode
-    };
-
-}; // ns
-
-typedef int AudioErrorCode;
-typedef int AudioState;
-typedef QList< QPair< QString, QString > > PairList;
-
-// creates 36char ascii guid without {} around it
-inline static QString uuid()
-{
-    // kinda lame, but
-    QString q = QUuid::createUuid();
-    q.remove( 0, 1 );
-    q.chop( 1 );
-    return q;
-}
-
-#endif // TYPEDEFS_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/closure.cpp Deleted

@@ -1,89 +0,0 @@
-/* This file is part of Clementine.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-
-   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/>.
-*/
-
-#include "closure.h"
-
-namespace _detail {
-
-Closure::Closure(QObject* sender,
-                 const char* signal,
-                 QObject* receiver,
-                 const char* slot,
-                 const ClosureArgumentWrapper* val0,
-                 const ClosureArgumentWrapper* val1,
-                 const ClosureArgumentWrapper* val2,
-                 const ClosureArgumentWrapper* val3)
-    : QObject(receiver),
-      callback_(NULL),
-      val0_(val0),
-      val1_(val1),
-      val2_(val2),
-      val3_(val3) {
-  const QMetaObject* meta_receiver = receiver->metaObject();
-
-  QByteArray normalised_slot = QMetaObject::normalizedSignature(slot + 1);
-  const int index = meta_receiver->indexOfSlot(normalised_slot.constData());
-  Q_ASSERT(index != -1);
-  slot_ = meta_receiver->method(index);
-
-  Connect(sender, signal);
-}
-
-Closure::Closure(QObject* sender,
-                 const char* signal,
-                 std::tr1::function<void()> callback)
-    : callback_(callback) {
-  Connect(sender, signal);
-}
-
-Closure::~Closure() {
-}
-
-void Closure::Connect(QObject* sender, const char* signal) {
-  bool success = connect(sender, signal, SLOT(Invoked()));
-  Q_ASSERT(success);
-  success = connect(sender, SIGNAL(destroyed()), SLOT(Cleanup()));
-  Q_ASSERT(success);
-  Q_UNUSED(success);
-}
-
-void Closure::Invoked() {
-  if (callback_) {
-    callback_();
-  } else {
-    slot_.invoke(
-        parent(),
-        val0_ ? val0_->arg() : QGenericArgument(),
-        val1_ ? val1_->arg() : QGenericArgument(),
-        val2_ ? val2_->arg() : QGenericArgument(),
-        val3_ ? val3_->arg() : QGenericArgument());
-  }
-  deleteLater();
-}
-
-void Closure::Cleanup() {
-  disconnect();
-  deleteLater();
-}
-
-}  // namespace _detail
-
-_detail::Closure* NewClosure(
-    QObject* sender, const char* signal,
-    QObject* receiver, const char* slot) {
-  return new _detail::Closure(sender, signal, receiver, slot);
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/closure.h Deleted

@@ -1,225 +0,0 @@
-/* This file is part of Clementine.
-   Copyright 2011, David Sansome <me@davidsansome.com>
-
-   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/>.
-*/
-
-#ifndef CLOSURE_H
-#define CLOSURE_H
-
-#include <tr1/functional>
-
-#include <QMetaMethod>
-#include <QObject>
-#include <QSharedPointer>
-
-#include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
-
-namespace _detail {
-
-class ClosureArgumentWrapper {
- public:
-  virtual ~ClosureArgumentWrapper() {}
-
-  virtual QGenericArgument arg() const = 0;
-};
-
-template<typename T>
-class ClosureArgument : public ClosureArgumentWrapper {
- public:
-  explicit ClosureArgument(const T& data) : data_(data) {}
-
-  virtual QGenericArgument arg() const {
-    return Q_ARG(T, data_);
-  }
-
- private:
-  T data_;
-};
-
-class Closure : public QObject, boost::noncopyable {
-  Q_OBJECT
-
- public:
-  Closure(QObject* sender, const char* signal,
-          QObject* receiver, const char* slot,
-          const ClosureArgumentWrapper* val0 = 0,
-          const ClosureArgumentWrapper* val1 = 0,
-          const ClosureArgumentWrapper* val2 = 0,
-          const ClosureArgumentWrapper* val3 = 0);
-
-  Closure(QObject* sender, const char* signal,
-          std::tr1::function<void()> callback);
-
-  virtual ~Closure();
-
- private slots:
-  void Invoked();
-  void Cleanup();
-
- private:
-  void Connect(QObject* sender, const char* signal);
-
-  QMetaMethod slot_;
-  std::tr1::function<void()> callback_;
-
-  boost::scoped_ptr<const ClosureArgumentWrapper> val0_;
-  boost::scoped_ptr<const ClosureArgumentWrapper> val1_;
-  boost::scoped_ptr<const ClosureArgumentWrapper> val2_;
-  boost::scoped_ptr<const ClosureArgumentWrapper> val3_;
-};
-
-class SharedPointerWrapper {
- public:
-  virtual ~SharedPointerWrapper() {}
-  virtual QObject* data() const = 0;
-};
-
-template<typename T>
-class SharedPointer : public SharedPointerWrapper {
- public:
-  explicit SharedPointer(QSharedPointer<T> ptr)
-      : ptr_(ptr) {
-  }
-
-  QObject* data() const {
-    return ptr_.data();
-  }
-
- private:
-  QSharedPointer<T> ptr_;
-};
-
-// For use with a QSharedPointer as a sender.
-class SharedClosure : public Closure {
-  Q_OBJECT
-
- public:
-  SharedClosure(SharedPointerWrapper* sender, const char* signal,
-                QObject* receiver, const char* slot,
-                const ClosureArgumentWrapper* val0 = 0,
-                const ClosureArgumentWrapper* val1 = 0,
-                const ClosureArgumentWrapper* val2 = 0,
-                const ClosureArgumentWrapper* val3 = 0)
-      : Closure(sender->data(), signal,
-                receiver, slot,
-                val0, val1, val2, val3),
-        shared_sender_(sender) {
-  }
-
- private:
-  boost::scoped_ptr<SharedPointerWrapper> shared_sender_;
-};
-
-}  // namespace _detail
-
-#define C_ARG(type, data) new _detail::ClosureArgument<type>(data)
-
-_detail::Closure* NewClosure(
-    QObject* sender,
-    const char* signal,
-    QObject* receiver,
-    const char* slot);
-
-template <typename T>
-_detail::Closure* NewClosure(
-    QObject* sender,
-    const char* signal,
-    QObject* receiver,
-    const char* slot,
-    const T& val0) {
-  return new _detail::Closure(
-      sender, signal, receiver, slot,
-      C_ARG(T, val0));
-}
-
-template <typename T0, typename T1>
-_detail::Closure* NewClosure(
-    QObject* sender,
-    const char* signal,
-    QObject* receiver,
-    const char* slot,
-    const T0& val0,
-    const T1& val1) {
-  return new _detail::Closure(
-      sender, signal, receiver, slot,
-      C_ARG(T0, val0), C_ARG(T1, val1));
-}
-
-template <typename T0, typename T1, typename T2>
-_detail::Closure* NewClosure(
-    QObject* sender,
-    const char* signal,
-    QObject* receiver,
-    const char* slot,
-    const T0& val0,
-    const T1& val1,
-    const T2& val2) {
-  return new _detail::Closure(
-      sender, signal, receiver, slot,
-      C_ARG(T0, val0), C_ARG(T1, val1), C_ARG(T2, val2));
-}
-
-template <typename T0, typename T1, typename T2, typename T3>
-_detail::Closure* NewClosure(
-    QObject* sender,
-    const char* signal,
-    QObject* receiver,
-    const char* slot,
-    const T0& val0,
-    const T1& val1,
-    const T2& val2,
-    const T3& val3) {
-  return new _detail::Closure(
-      sender, signal, receiver, slot,
-      C_ARG(T0, val0), C_ARG(T1, val1), C_ARG(T2, val2), C_ARG(T3, val3));
-}
-
-template <typename TP>
-_detail::Closure* NewClosure(
-    QSharedPointer<TP> sender,
-    const char* signal,
-    QObject* receiver,
-    const char* slot) {
-  return new _detail::SharedClosure(
-      new _detail::SharedPointer<TP>(sender), signal, receiver, slot);
-}
-
-template <typename TP, typename T0>
-_detail::Closure* NewClosure(
-    QSharedPointer<TP> sender,
-    const char* signal,
-    QObject* receiver,
-    const char* slot,
-    const T0& val0) {
-  return new _detail::SharedClosure(
-        new _detail::SharedPointer<TP>(sender), signal, receiver, slot,
-        C_ARG(T0, val0));
-}
-
-template <typename TP, typename T0, typename T1>
-_detail::Closure* NewClosure(
-    QSharedPointer<TP> sender,
-    const char* signal,
-    QObject* receiver,
-    const char* slot,
-    const T0& val0,
-    const T1& val1) {
-  return new _detail::SharedClosure(
-        new _detail::SharedPointer<TP>(sender), signal, receiver, slot,
-        C_ARG(T0, val0), C_ARG(T1, val1));
-}
-
-#endif  // CLOSURE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/dropjobnotifier.cpp Deleted

@@ -1,114 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *   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 "dropjobnotifier.h"
-
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-#include "query.h"
-#include "sourcelist.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "dropjob.h"
-#include <qjson/parser.h>
-#include "dropjobnotifier.h"
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-
-class QNetworkReply;
-
-using namespace Tomahawk;
-
-DropJobNotifier::DropJobNotifier( QPixmap servicePixmap, QString service, DropJob::DropType type, QNetworkReply* job )
-    : JobStatusItem()
-    , m_type( "unknown" )
-    , m_job( 0 )
-    , m_pixmap ( servicePixmap )
-    , m_service ( service )
-{
-    init( type );
-
-    if( m_service.isEmpty() )
-        m_service = "DropJob";
-
-    connect( job, SIGNAL( finished() ), this, SLOT( setFinished() ) );
-}
-
-DropJobNotifier::DropJobNotifier( QPixmap pixmap, DropJob::DropType type )
-    : JobStatusItem()
-    , m_job( 0 )
-    , m_pixmap( pixmap )
-{
-    init( type );
-}
-
-
-DropJobNotifier::~DropJobNotifier()
-{}
-
-void
-DropJobNotifier::init( DropJob::DropType type )
-{
-    if( type == DropJob::Playlist )
-        m_type = "playlist";
-
-    if( type == DropJob::Artist )
-        m_type = "artist";
-
-    if( type == DropJob::Track )
-        m_type = "track";
-
-    if( type == DropJob::Album )
-        m_type = "album";
-
-}
-
-
-QString
-DropJobNotifier::rightColumnText() const
-{
-    return QString();
-}
-
-QPixmap
-DropJobNotifier::icon() const
-{
-    return m_pixmap;
-}
-
-
-QString
-DropJobNotifier::mainText() const
-{
-    if ( m_service.isEmpty() )
-    {
-        return tr( "Fetching %1 from database" ).arg( m_type );
-    }
-    else
-    {
-        return tr( "Parsing %1 %2" ).arg( m_service )
-                                    .arg( m_type );
-    }
-}
-
-void
-DropJobNotifier::setFinished()
-{
-    emit finished();
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/dropjobnotifier.h Deleted

@@ -1,66 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *   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 DROPJOBNOTIFIER_H
-#define DROPJOBNOTIFIER_H
-
-#include "dllmacro.h"
-#include "dropjob.h"
-#include "typedefs.h"
-#include "query.h"
-#include "jobview/JobStatusItem.h"
-
-#include <QObject>
-#include <QSet>
-#include <QtCore/QStringList>
-
-class QNetworkReply;
-namespace Tomahawk
-{
-
-class DLLEXPORT DropJobNotifier : public JobStatusItem
-{
-    Q_OBJECT
-public:
-    DropJobNotifier( QPixmap pixmap, QString service, DropJob::DropType type, QNetworkReply* job );
-
-    // No QNetworkReply, needs manual finished call
-    DropJobNotifier( QPixmap pixmap, DropJob::DropType type );
-    virtual ~DropJobNotifier();
-
-    virtual QString rightColumnText() const;
-    virtual QString mainText() const;
-    virtual QPixmap icon() const;
-    virtual QString type() const { return m_type; }
-    virtual bool collapseItem() const { return true; }
-
-public slots:
-    void setFinished();
-
-private:
-    void init( DropJob::DropType type );
-
-    QString m_type;
-    QNetworkReply* m_job;
-    QPixmap m_pixmap;
-    QString m_service;
-};
-
-}
-
-#endif // DROPJOBNOTIFIER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/groovesharkparser.cpp Deleted

@@ -1,327 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *   Copyright 2010-2012, Stefan Derkits <stefan@derkits.at>
- *
- *   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 "groovesharkparser.h"
-
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-#include "query.h"
-#include "sourcelist.h"
-#include "dropjob.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
-#include "dropjobnotifier.h"
-#include "viewmanager.h"
-
-#include <qjson/parser.h>
-
-#include <QtCrypto>
-
-#include <QCoreApplication>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-
-#include <QWebPage>
-#include <QWebFrame>
-#include <QWebElement>
-
-using namespace Tomahawk;
-
-QPixmap* GroovesharkParser::s_pixmap = 0;
-
-const char* enApiSecret = "erCj5s0Vebyqtc9Aduyotc1CLListJ9HfO2os5hBeew=";
-
-GroovesharkParser::GroovesharkParser( const QStringList& trackUrls, bool createNewPlaylist, QObject* parent )
-    : QObject ( parent )
-    , m_limit ( 40 )
-    , m_trackMode( true )
-    , m_createNewPlaylist( createNewPlaylist )
-    , m_browseJob( 0 )
-{
-    QByteArray magic = QByteArray::fromBase64( enApiSecret );
-
-    QByteArray wand = QByteArray::fromBase64( QCoreApplication::applicationName().toLatin1() );
-    int length = magic.length(), n2 = wand.length();
-    for ( int i=0; i<length; i++ ) magici = magici ^ wandi%n2;
-
-    m_apiKey = QCA::SymmetricKey( magic );
-
-    foreach ( const QString& url, trackUrls )
-        lookupUrl( url );
-}
-
-GroovesharkParser::~GroovesharkParser()
-{
-
-}
-
-void
-GroovesharkParser::lookupUrl( const QString& link )
-{
-    if ( link.contains( "playlist" ) )
-    {
-        if ( !m_createNewPlaylist )
-            m_trackMode = true;
-        else
-            m_trackMode = false;
-
-        lookupGroovesharkPlaylist( link );
-    }
-    else if ( link.contains( "grooveshark.com/s/" ) || link.contains( "grooveshark.com/#/s/" ) )
-        lookupGroovesharkTrack( link );
-    else
-        return;
-
-}
-
-
-void
-GroovesharkParser::lookupGroovesharkPlaylist( const QString& linkRaw )
-{
-    tLog() << "Parsing Grooveshark Playlist URI:" << linkRaw;
-
-    QString urlFragment = QUrl( linkRaw ).fragment( );
-    if ( urlFragment.isEmpty() ) {
-        tDebug() << "no fragment, setting fragment to path";
-        urlFragment = QUrl(linkRaw).path();
-    }
-
-    tDebug() << urlFragment;
-
-    int paramStartingPostition = urlFragment.indexOf( "?" );
-
-    if ( paramStartingPostition != -1 )
-        urlFragment.truncate( paramStartingPostition );
-
-    bool ok;
-
-    QStringList urlParts = urlFragment.split( "/", QString::SkipEmptyParts );
-
-    tDebug() << urlParts;
-
-    int playlistID = urlParts.at( 2 ).toInt( &ok, 10 );
-    if (!ok)
-    {
-        tDebug() << "incorrect grooveshark url";
-        return;
-    }
-
-
-
-    m_title = urlParts.at( 1 );
-
-    tDebug() << "should get playlist " << playlistID;
-
-    DropJob::DropType type;
-
-    type = DropJob::Playlist;
-
-    QString base_url( "http://api.grooveshark.com/ws3.php?sig=" );
-
-    QByteArray data = QString( "{\"method\":\"getPlaylistSongs\",\"parameters\":{\"playlistID\":\"%1\"},\"header\":{\"wsKey\":\"tomahawkplayer\"}}" ).arg( playlistID ).toLocal8Bit();
-
-
-    QCA::MessageAuthenticationCode hmac( "hmac(md5)", m_apiKey );
-
-    QCA::SecureArray secdata( data );
-    hmac.update(secdata);
-    QCA::SecureArray resultArray = hmac.final();
-
-    QString hash = QCA::arrayToHex( resultArray.toByteArray() );
-    QUrl url = QUrl( base_url + hash );
-
-    tDebug() << "Looking up URL..." << url.toString();
-
-    QNetworkReply* reply = TomahawkUtils::nam()->post( QNetworkRequest( url ), data );
-    connect( reply, SIGNAL( finished() ), this, SLOT( groovesharkLookupFinished() ) );
-
-    m_browseJob = new DropJobNotifier( pixmap(), "Grooveshark", type, reply );
-    JobStatusView::instance()->model()->addJob( m_browseJob );
-
-    m_queries.insert( reply );
-}
-
-
-void
-GroovesharkParser::lookupGroovesharkTrack( const QString& track )
-{
-    tLog() << "Parsing Grooveshark Track Page:" << track;
-
-    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( QUrl( track ) ) );
-    connect( reply, SIGNAL( finished() ), this, SLOT( trackPageFetchFinished() ) );
-
-    m_browseJob = new DropJobNotifier( pixmap(), "Grooveshark", DropJob::Track, reply );
-    JobStatusView::instance()->model()->addJob( m_browseJob );
-
-    m_queries << reply;
-}
-
-
-void
-GroovesharkParser::trackPageFetchFinished()
-{
-    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
-    Q_ASSERT( r );
-
-    m_queries.remove( r );
-    r->deleteLater();
-
-    QWebPage page;
-    page.settings()->setAttribute( QWebSettings::JavascriptEnabled, false );
-    page.settings()->setAttribute( QWebSettings::PluginsEnabled, false );
-    page.settings()->setAttribute( QWebSettings::JavaEnabled, false );
-    page.settings()->setAttribute( QWebSettings::AutoLoadImages, false );
-    page.mainFrame()->setHtml( QString::fromUtf8( r->readAll() ) );
-    QWebElement title = page.mainFrame()->findFirstElement("spanitemprop='name'");
-    QWebElement artist = page.mainFrame()->findFirstElement("noscript spanitemprop='byArtist'");
-    QWebElement album = page.mainFrame()->findFirstElement("noscript spanitemprop='inAlbum'");
-
-    if ( !title.toPlainText().isEmpty() && !artist.toPlainText().isEmpty() )
-    {
-        tDebug() << "Got track info from grooveshark, enough to create a query:" << title.toPlainText() << artist.toPlainText() << album.toPlainText();
-
-        Tomahawk::query_ptr q = Tomahawk::Query::get( artist.toPlainText(), title.toPlainText(), album.toPlainText(), uuid(), true );
-        m_tracks << q;
-    }
-
-    checkTrackFinished();
-}
-
-
-void
-GroovesharkParser::groovesharkLookupFinished()
-{
-    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
-    Q_ASSERT( r );
-
-    m_queries.remove( r );
-    r->deleteLater();
-
-    if ( r->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        QVariantMap res = p.parse( r, &ok ).toMap();
-
-        if ( !ok )
-        {
-            tLog() << "Failed to parse json from Grooveshark browse item :" << p.errorString() << "On line" << p.errorLine();
-            checkTrackFinished();
-            return;
-        }
-
-        QVariantList list = res.value( "result" ).toMap().value( "songs" ).toList();
-        foreach (const QVariant& var, list)
-        {
-            QVariantMap trackResult = var.toMap();
-
-            QString title, artist, album;
-
-            title = trackResult.value( "SongName", QString() ).toString();
-            artist = trackResult.value( "ArtistName", QString() ).toString();
-            album = trackResult.value( "AlbumName", QString() ).toString();
-
-            if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
-            {
-                tLog() << "Didn't get an artist and track name from grooveshark, not enough to build a query on. Aborting" << title << artist << album;
-                return;
-            }
-
-            Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), m_trackMode );
-            m_tracks << q;
-        }
-
-
-    } else
-    {
-        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching Grooveshark information from the network!" ) ) );
-        tLog() << "Error in network request to grooveshark for track decoding:" << r->errorString();
-    }
-
-    if ( m_trackMode )
-        checkTrackFinished();
-    else
-        checkPlaylistFinished();
-}
-
-void
-GroovesharkParser::checkPlaylistFinished()
-{
-    tDebug() << "Checking for grooveshark batch playlist job finished" << m_queries.isEmpty() << m_createNewPlaylist;
-    if ( m_queries.isEmpty() ) // we're done
-    {
-        if ( m_browseJob )
-            m_browseJob->setFinished();
-
-        if( m_createNewPlaylist && !m_tracks.isEmpty() )
-        {
-            m_playlist = Playlist::create( SourceList::instance()->getLocal(),
-                                       uuid(),
-                                       m_title,
-                                       m_info,
-                                       m_creator,
-                                       false,
-                                       m_tracks );
-            connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
-            return;
-        }
-
-
-        emit tracks( m_tracks );
-
-        deleteLater();
-    }
-}
-
-void
-GroovesharkParser::checkTrackFinished()
-{
-    tDebug() << "Checking for grooveshark batch track job finished" << m_queries.isEmpty();
-    if ( m_queries.isEmpty() ) // we're done
-    {
-        if ( m_browseJob )
-            m_browseJob->setFinished();
-
-        emit tracks( m_tracks );
-
-        deleteLater();
-    }
-
-}
-
-void
-GroovesharkParser::playlistCreated()
-{
-
-    ViewManager::instance()->show( m_playlist );
-
-    deleteLater();
-}
-
-
-QPixmap
-GroovesharkParser::pixmap() const
-{
-    if ( !s_pixmap )
-        s_pixmap = new QPixmap( RESPATH "images/grooveshark.png" );
-
-    return *s_pixmap;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/groovesharkparser.h Deleted

@@ -1,90 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *   Copyright 2011, Stefan Derkits <stefan@derkits.at>
- *
- *   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 GROOVESHARKPARSER_H
-#define GROOVESHARKPARSER_H
-
-#include "dllmacro.h"
-#include "typedefs.h"
-#include "query.h"
-#include "jobview/JobStatusItem.h"
-
-#include <qca_basic.h>
-
-#include <QObject>
-#include <QSet>
-#include <QtCore/QStringList>
-
-/**
- * Small class to parse grooveshark links into query_ptrs
- *
- * Connect to the signals to get the results
- */
-
-class QNetworkReply;
-
-namespace Tomahawk
-{
-
-class DropJobNotifier;
-
-class DLLEXPORT GroovesharkParser : public QObject
-{
-    Q_OBJECT
-public:
-    explicit GroovesharkParser( const QStringList& trackUrls, bool createNewPlaylist = false, QObject* parent = 0 );
-    virtual ~GroovesharkParser();
-signals:
-    void track( const Tomahawk::query_ptr& track );
-    void tracks( const QList< Tomahawk::query_ptr > tracks );
-    void playlist( const Tomahawk::query_ptr& playlist );
-
-private slots:
-    void groovesharkLookupFinished();
-    void trackPageFetchFinished();
-
-    void playlistCreated();
-private:
-    QPixmap pixmap() const;
-
-    void lookupUrl( const QString& url );
-    void lookupGroovesharkPlaylist( const QString& playlist );
-    void lookupGroovesharkTrack( const QString& track );
-
-    void checkTrackFinished();
-    void checkPlaylistFinished();
-    int  m_limit;
-    bool m_trackMode;
-    bool m_createNewPlaylist;
-    QList< query_ptr > m_tracks;
-    QSet< QNetworkReply* > m_queries;
-    QString m_title, m_info, m_creator;
-    Tomahawk::playlist_ptr m_playlist;
-    DropJobNotifier* m_browseJob;
-
-    QCA::SymmetricKey m_apiKey;
-
-    static QPixmap* s_pixmap;
-
-};
-
-}
-
-#endif // GROOVESHARKPARSER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/itunesparser.cpp Deleted

@@ -1,200 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Written by Hugo Lindström <hugolm84@gmail.com>
- *   But based on Leo Franchi's work from spotifyParser
- *   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 "itunesparser.h"
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-#include "query.h"
-#include "sourcelist.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
-
-#include <qjson/parser.h>
-
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QRegExp>
-
-using namespace Tomahawk;
-
-QPixmap* ItunesParser::s_pixmap = 0;
-
-ItunesParser::ItunesParser( const QStringList& urls, QObject* parent )
-    : QObject ( parent )
-    , m_single( false )
-
-{
-    foreach ( const QString& url, urls )
-    {
-
-        lookupItunesUri( url );
-    }
-}
-
-ItunesParser::ItunesParser( const QString& Url, QObject* parent )
-    : QObject ( parent )
-    , m_single( true )
-{
-    lookupItunesUri( Url );
-}
-
-ItunesParser::~ItunesParser()
-{
-
-}
-
-void
-ItunesParser::lookupItunesUri( const QString& link )
-{
-    // Itunes uri parsing, using regex
-    // (\d+)(?:\?i=*)(\d+) = AlbumId and trackId
-    // (\d+)(?:\s*) = id
-    QRegExp rxAlbumTrack( "(\\d+)(?:\\?i=*)(\\d+)" );
-    QRegExp rxId( "(\\d+)(?:\\s*)" );
-    QString id, trackId;
-
-    // Doing a parse on regex in 2 stages,
-    // first, look if we have both album and track id
-    int pos = rxAlbumTrack.indexIn( link );
-    if ( pos > -1 )
-    {
-        id = rxAlbumTrack.cap( 1 );
-        trackId = rxAlbumTrack.cap( 2 );
-    }
-    else
-    {
-        // Second, if we dont have trackId, check for just Id
-        int pos = rxId.indexIn( link );
-        if ( pos > -1 )
-        {
-            id = rxId.cap( 1 );
-        }
-        else
-            return;
-
-    }
-    tLog() << "Parsing itunes track:" << link;
-
-    QUrl url;
-    DropJob::DropType type;
-    if( link.contains( "artist" ) )
-    {
-        type = DropJob::Artist;
-        url = QUrl( QString( "http://ax.phobos.apple.com.edgesuite.net/WebObjects/MZStoreServices.woa/wa/wsLookup?id=%1&entity=song&limit=30" ).arg( id ) );
-    }else
-    {
-        type = ( trackId.isEmpty() ? DropJob::Album : DropJob::Track );
-        url = QUrl( QString( "http://ax.phobos.apple.com.edgesuite.net/WebObjects/MZStoreServices.woa/wa/wsLookup?id=%1&entity=song" ).arg( ( trackId.isEmpty() ? id : trackId ) ) );
-    }
-    qDebug() << "Looking up..." << url.toString();
-
-    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-    connect( reply, SIGNAL( finished() ), this, SLOT( itunesResponseLookupFinished() ) );
-
-    DropJobNotifier* j = new DropJobNotifier( pixmap(), QString( "Itunes" ), type, reply );
-    JobStatusView::instance()->model()->addJob( j );
-
-    m_queries.insert( reply );
-
-}
-void
-ItunesParser::itunesResponseLookupFinished()
-{
-    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
-    Q_ASSERT( r );
-    m_queries.remove( r );
-    r->deleteLater();
-
-    if ( r->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        QVariantMap res = p.parse( r, &ok ).toMap();
-
-        if ( !ok )
-        {
-            tLog() << "Failed to parse json from Spotify track lookup:" << p.errorString() << "On line" << p.errorLine();
-            checkTrackFinished();
-            return;
-        } else if ( !res.contains( "results" ) )
-        {
-            tLog() << "No 'results' item in the itunes track lookup result... not doing anything";
-            checkTrackFinished();
-            return;
-        }
-        QVariantList itunesResponse = res.value( "results" ).toList();
-
-        foreach ( QVariant itune, itunesResponse )
-        {
-            QString title, artist, album;
-            QVariantMap ituneMap = itune.toMap();
-
-            if ( ituneMap.value( "wrapperType" ).toString().contains( "track" ) )
-            {
-
-                title = ituneMap.value( "trackName" ).toString();
-                artist = ituneMap.value( "artistName" ).toString();
-                album = ituneMap.value( "collectionName" ).toString();
-                if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
-                {
-                    tLog() << "Didn't get an artist and track name from itunes, not enough to build a query on. Aborting" << title << artist << album;
-
-                }else{
-
-                    Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), true );
-                    m_tracks << q;
-                }
-            }
-        }
-
-    } else
-    {
-        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching iTunes information from the network!" ) ) );
-        tLog() << "Error in network request to Itunes for track decoding:" << r->errorString();
-    }
-
-    checkTrackFinished();
-}
-
-
-void
-ItunesParser::checkTrackFinished()
-{
-    if ( m_queries.isEmpty() ) // we're done
-    {
-        if ( m_single && !m_tracks.isEmpty() )
-            emit track( m_tracks.first() );
-        else if ( !m_single && !m_tracks.isEmpty() )
-            emit tracks( m_tracks );
-
-        deleteLater();
-    }
-
-}
-
-QPixmap
-ItunesParser::pixmap() const
-{
-    if ( !s_pixmap )
-        s_pixmap = new QPixmap( RESPATH "images/itunes.png" );
-
-    return *s_pixmap;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/itunesparser.h Deleted

@@ -1,76 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Written by Hugo Lindström <hugolm84@gmail.com>
- *   But based on Leo Franchi's work from spotifyParser
- *   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 ITUNES_PARSER_H
-#define ITUNES_PARSER_H
-
-#include "dllmacro.h"
-#include "typedefs.h"
-#include "query.h"
-#include "dropjobnotifier.h"
-
-#include <QObject>
-#include <QSet>
-#include <QtCore/QStringList>
-
-class QNetworkReply;
-class TrackModel;
-
-namespace Tomahawk
-{
-
-/**
- * Small class to parse itunes links into query_ptrs
- *
- * Connect to the signals to get the results
- */
-class DLLEXPORT ItunesParser : public QObject
-{
-    Q_OBJECT
-public:
-    explicit ItunesParser( const QString& trackUrl, QObject* parent = 0 );
-    explicit ItunesParser( const QStringList& trackUrls, QObject* parent = 0 );
-    virtual ~ItunesParser();
-
-signals:
-    void track( const Tomahawk::query_ptr& track );
-    void tracks( const QList< Tomahawk::query_ptr > tracks );
-
-private slots:
-    void itunesResponseLookupFinished();
-
-private:
-    QPixmap pixmap() const;
-    void lookupItunesUri( const QString& track );
-    void checkTrackFinished();
-
-    bool m_single;
-    QList< query_ptr > m_tracks;
-    QSet< QNetworkReply* > m_queries;
-    QString m_title, m_info, m_creator;
-    Tomahawk::playlist_ptr m_playlist;
-
-    DropJobNotifier* m_browseJob;
-    static QPixmap* s_pixmap;
-};
-
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/jspfloader.cpp Deleted

@@ -1,207 +0,0 @@
-/* === 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 "jspfloader.h"
-
-
-#include <QApplication>
-#include <QDomDocument>
-#include <QMessageBox>
-
-#include <qjson/parser.h>
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include "sourcelist.h"
-#include "playlist.h"
-
-using namespace Tomahawk;
-
-JSPFLoader::JSPFLoader( bool autoCreate, QObject *parent )
-    : QObject( parent )
-    , m_autoCreate( autoCreate )
-{}
-
-JSPFLoader::~JSPFLoader()
-{
-}
-
-QList< Tomahawk::query_ptr >
-JSPFLoader::entries() const
-{
-    return m_entries;
-}
-
-
-void
-JSPFLoader::load( const QUrl& url )
-{
-    QNetworkRequest request( url );
-    Q_ASSERT( TomahawkUtils::nam() != 0 );
-    QNetworkReply* reply = TomahawkUtils::nam()->get( request );
-
-    // isn't there a race condition here? something could happen before we connect()
-    // no---the event loop is needed to make the request, i think (leo)
-    connect( reply, SIGNAL( finished() ),
-             SLOT( networkLoadFinished() ) );
-
-    connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ),
-             SLOT( networkError( QNetworkReply::NetworkError ) ) );
-}
-
-
-void
-JSPFLoader::load( QFile& file )
-{
-    if( file.open( QFile::ReadOnly ) )
-    {
-        m_body = file.readAll();
-        gotBody();
-    }
-    else
-    {
-        tLog() << "Failed to open jspf file";
-        reportError();
-    }
-}
-
-
-void
-JSPFLoader::reportError()
-{
-    emit failed();
-    deleteLater();
-}
-
-
-void
-JSPFLoader::networkLoadFinished()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-    m_body = reply->readAll();
-    gotBody();
-}
-
-
-void
-JSPFLoader::networkError( QNetworkReply::NetworkError e )
-{
-    tLog() << Q_FUNC_INFO << "Network error loading jspf" << e;
-    reportError();
-}
-
-
-void
-JSPFLoader::gotBody()
-{
-    QJson::Parser p;
-    bool retOk;
-    QVariantMap wrapper = p.parse( m_body, &retOk ).toMap();
-
-    if ( !retOk )
-    {
-        tLog() << "Failed to parse jspf json:" << p.errorString() << "on line" << p.errorLine();
-        return;
-    }
-
-    if ( !wrapper.contains( "playlist" ) )
-    {
-        tLog() << "No playlist element in JSPF!";
-        return;
-    }
-
-    QVariantMap pl = wrapper.value( "playlist" ).toMap();
-    QString origTitle = pl.value( "title" ).toString();
-    m_info = pl.value( "info" ).toString();
-    m_creator = pl.value( "creator" ).toString();
-
-    m_title = origTitle;
-    if ( m_title.isEmpty() )
-        m_title = tr( "New Playlist" );
-    if ( !m_overrideTitle.isEmpty() )
-        m_title = m_overrideTitle;
-
-    if ( pl.contains( "track" ) )
-    {
-        QVariantList tracks = pl.value( "track" ).toList();
-
-        bool shownError = false;
-        foreach ( const QVariant& currentTrack, tracks )
-        {
-            QVariantMap tM = currentTrack.toMap();
-            QString artist, album, track, duration, annotation, url;
-
-            artist = tM.value( "creator" ).toString();
-            album = tM.value( "album" ).toString();
-            track = tM.value( "title" ).toString();
-            duration = tM.value( "duration" ).toString();
-            annotation = tM.value( "annotation" ).toString();
-            if ( tM.value( "location" ).toList().size() > 0 )
-                url = tM.value( "location" ).toList().first().toString();
-
-            if( artist.isEmpty() || track.isEmpty() )
-            {
-                if( !shownError )
-                {
-                    QMessageBox::warning( 0, tr( "Failed to save tracks" ), tr( "Some tracks in the playlist do not contain an artist and a title. They will be ignored." ), QMessageBox::Ok );
-                    shownError = true;
-                }
-                continue;
-            }
-
-            query_ptr q = Tomahawk::Query::get( artist, track, album, uuid() );
-            q->setDuration( duration.toInt() / 1000 );
-            if( !url.isEmpty() )
-                q->setResultHint( url );
-
-            m_entries << q;
-        }
-    }
-
-    if ( origTitle.isEmpty() && m_entries.isEmpty() )
-    {
-        if ( m_autoCreate )
-        {
-            QMessageBox::critical( 0, tr( "XSPF Error" ), tr( "This is not a valid XSPF playlist." ) );
-            deleteLater();
-            return;
-        }
-        else
-        {
-            emit failed();
-            return;
-        }
-    }
-
-    if ( m_autoCreate )
-    {
-        m_playlist = Playlist::create( SourceList::instance()->getLocal(),
-                                       uuid(),
-                                       m_title,
-                                       m_info,
-                                       m_creator,
-                                       false,
-                                       m_entries );
-
-        deleteLater();
-    }
-
-    emit ok( m_playlist );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/jspfloader.h Deleted

@@ -1,74 +0,0 @@
-/* === 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 JSPFLOADER_H
-#define JSPFLOADER_H
-
-#include <QObject>
-#include <QUrl>
-#include <QFile>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-
-#include "playlist.h"
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-
-class DLLEXPORT JSPFLoader : public QObject
-{
-Q_OBJECT
-
-public:
-    explicit JSPFLoader( bool autoCreate = true, QObject* parent = 0 );
-
-    virtual ~JSPFLoader();
-
-    QList< Tomahawk::query_ptr > entries() const;
-    void setOverrideTitle( const QString& newTitle ) { m_overrideTitle = newTitle; }
-
-signals:
-    void failed();
-    void ok( const Tomahawk::playlist_ptr& );
-
-public slots:
-    void load( const QUrl& url );
-    void load( QFile& file );
-
-private slots:
-    void networkLoadFinished();
-    void networkError( QNetworkReply::NetworkError e );
-
-private:
-    void reportError();
-    void gotBody();
-
-    bool m_autoCreate;
-    QList< Tomahawk::query_ptr > m_entries;
-    QString m_title, m_info, m_creator, m_overrideTitle;
-
-    QByteArray m_body;
-    Tomahawk::playlist_ptr m_playlist;
-};
-
-}
-
-#endif // JSPFLOADER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/logger.cpp Deleted

@@ -1,152 +0,0 @@
-/* === 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
- *   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 "logger.h"
-
-#include <iostream>
-#include <fstream>
-
-#include <QCoreApplication>
-#include <QDir>
-#include <QFileInfo>
-#include <QMutex>
-#include <QTime>
-#include <QVariant>
-
-#include "utils/tomahawkutils.h"
-
-#define LOGFILE TomahawkUtils::appLogDir().filePath( "Tomahawk.log" ).toLocal8Bit()
-#define LOGFILE_SIZE 1024 * 256
-
-#define RELEASE_LEVEL_THRESHOLD 0
-#define DEBUG_LEVEL_THRESHOLD LOGEXTRA
-
-using namespace std;
-ofstream logfile;
-static int s_threshold = -1;
-
-namespace Logger
-{
-
-static void
-log( const char *msg, unsigned int debugLevel, bool toDisk = true )
-{
-    if ( s_threshold < 0 )
-    {
-        if ( qApp->arguments().contains( "--verbose" ) )
-            s_threshold = LOGTHIRDPARTY;
-        else
-            #ifdef QT_NO_DEBUG
-            s_threshold = RELEASE_LEVEL_THRESHOLD;
-            #else
-            s_threshold = DEBUG_LEVEL_THRESHOLD;
-            #endif
-    }
-
-    #ifdef QT_NO_DEBUG
-    if ( debugLevel > RELEASE_LEVEL_THRESHOLD )
-        toDisk = false;
-    #else
-    if ( debugLevel > DEBUG_LEVEL_THRESHOLD )
-        toDisk = false;
-    #endif
-
-    if ( toDisk || (int)debugLevel <= s_threshold )
-    {
-        logfile << QTime::currentTime().toString().toAscii().data() << " " << QString::number( debugLevel ).toAscii().data() << ": " << msg << endl;
-        logfile.flush();
-    }
-
-    if ( debugLevel <= LOGEXTRA || (int)debugLevel <= s_threshold )
-    {
-        cout << msg << endl;
-        cout.flush();
-    }
-}
-
-
-void
-TomahawkLogHandler( QtMsgType type, const char *msg )
-{
-    static QMutex s_mutex;
-
-    QMutexLocker locker( &s_mutex );
-    switch( type )
-    {
-        case QtDebugMsg:
-            log( msg, LOGTHIRDPARTY );
-            break;
-
-        case QtCriticalMsg:
-            log( msg, 0 );
-            break;
-
-        case QtWarningMsg:
-            log( msg, 0 );
-            break;
-
-        case QtFatalMsg:
-            log( msg, 0 );
-            break;
-    }
-}
-
-
-void
-setupLogfile()
-{
-    if ( QFileInfo( LOGFILE ).size() > LOGFILE_SIZE )
-    {
-        QByteArray lc;
-        {
-            QFile f( LOGFILE );
-            f.open( QIODevice::ReadOnly | QIODevice::Text );
-            lc = f.readAll();
-            f.close();
-        }
-
-        QFile::remove( LOGFILE );
-
-        {
-            QFile f( LOGFILE );
-            f.open( QIODevice::WriteOnly | QIODevice::Text );
-            f.write( lc.right( LOGFILE_SIZE - (LOGFILE_SIZE / 4) ) );
-            f.close();
-        }
-    }
-
-    logfile.open( LOGFILE, ios::app );
-    qInstallMsgHandler( TomahawkLogHandler );
-}
-
-}
-
-using namespace Logger;
-
-TLog::TLog( unsigned int debugLevel )
-    : QDebug( &m_msg )
-    , m_debugLevel( debugLevel )
-{
-}
-
-
-TLog::~TLog()
-{
-    log( m_msg.toAscii().data(), m_debugLevel );
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/logger.h Deleted

@@ -1,61 +0,0 @@
-/* === 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
- *   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 LOGGER_H
-#define LOGGER_H
-
-#include <QDebug>
-#include <QStringList>
-
-#include "dllmacro.h"
-
-namespace Logger
-{
-    class DLLEXPORT TLog : public QDebug
-    {
-    public:
-        TLog( unsigned int debugLevel = 0 );
-        virtual ~TLog();
-
-    private:
-        QString m_msg;
-        unsigned int m_debugLevel;
-    };
-
-    class DLLEXPORT TDebug : public TLog
-    {
-    public:
-        TDebug( unsigned int debugLevel = 1 ) : TLog( debugLevel )
-        {
-        }
-    };
-
-    DLLEXPORT void TomahawkLogHandler( QtMsgType type, const char *msg );
-    DLLEXPORT void setupLogfile();
-}
-
-#define tLog Logger::TLog
-#define tDebug Logger::TDebug
-
-#define LOGDEBUG 1
-#define LOGINFO 2
-#define LOGEXTRA 5
-#define LOGVERBOSE 8
-#define LOGTHIRDPARTY 9
-
-#endif
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/m3uloader.cpp Deleted

@@ -1,154 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *   Copyright 2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 "m3uloader.h"
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-#include "query.h"
-#include "sourcelist.h"
-
-#include "playlist.h"
-#include "dropjob.h"
-
-#include <QFileInfo>
-#include <QFile>
-
-/* taglib */
-#include <taglib/fileref.h>
-#include <taglib/tag.h>
-
-using namespace Tomahawk;
-
-
-M3uLoader::M3uLoader( const QStringList& urls, bool createNewPlaylist, QObject* parent )
-    : QObject( parent )
-    , m_single( false )
-    , m_trackMode( true )
-    , m_createNewPlaylist( createNewPlaylist )
-    , m_urls( urls )
-{
-}
-
-
-M3uLoader::M3uLoader( const QString& url, bool createNewPlaylist, QObject* parent )
-    : QObject( parent )
-    , m_single( false )
-    , m_trackMode( true )
-    , m_createNewPlaylist( createNewPlaylist )
-    , m_urls( url )
-{
-}
-
-
-M3uLoader::~M3uLoader()
-{
-}
-
-
-void
-M3uLoader::parse()
-{
-    foreach ( const QString& url, m_urls )
-        parseM3u( url );
-}
-
-
-void
-M3uLoader::getTags( const QFileInfo& info )
-{
-    QByteArray fileName = QFile::encodeName( info.canonicalFilePath() );
-    const char *encodedName = fileName.constData();
-
-    TagLib::FileRef f( encodedName );
-    TagLib::Tag *tag = f.tag();
-
-    QString artist = TStringToQString( tag->artist() ).trimmed();
-    QString album  = TStringToQString( tag->album() ).trimmed();
-    QString track  = TStringToQString( tag->title() ).trimmed();
-
-    if ( artist.isEmpty() || track.isEmpty() )
-    {
-        qDebug() << "Error parsing" << info.fileName();
-        return;
-    }
-    else
-    {
-        qDebug() << Q_FUNC_INFO << artist << track << album;
-        Tomahawk::query_ptr q = Tomahawk::Query::get( artist, track, album, uuid(), !m_createNewPlaylist );
-        m_tracks << q;
-    }
-}
-
-
-void
-M3uLoader::parseM3u( const QString& fileLink )
-{
-    QFileInfo fileInfo( fileLink );
-    QFile file( QUrl::fromUserInput( fileLink ).toLocalFile() );
-
-    if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) )
-    {
-        tDebug() << "Error opening m3u:" << file.errorString();
-        return;
-    }
-
-    m_title = fileInfo.baseName();
-    while ( !file.atEnd() )
-    {
-         QByteArray line = file.readLine();
-         /// If anyone wants to take on the regex for parsing EXT, go ahead
-         /// But the notion that users does not tag by a common rule. that seems hard
-         if ( line.contains( "EXT" ) )
-             continue;
-
-         QFileInfo tmpFile( QUrl::fromUserInput( QString( line.simplified() ) ).toLocalFile() );
-
-         if( tmpFile.exists() )
-             getTags( tmpFile );
-         else
-         {
-             QFileInfo tmpFile( QUrl::fromUserInput( QString( fileInfo.canonicalPath() + "/" + line.simplified() ) ).toLocalFile() );
-             if ( tmpFile.exists() )
-                getTags( tmpFile );
-         }
-    }
-
-    if ( m_tracks.isEmpty() )
-    {
-        tDebug() << Q_FUNC_INFO << "Could not parse M3U!";
-        return;
-    }
-
-    if ( m_createNewPlaylist )
-    {
-        m_playlist = Playlist::create( SourceList::instance()->getLocal(),
-                                       uuid(),
-                                       m_title,
-                                       m_info,
-                                       m_creator,
-                                       false,
-                                       m_tracks );
-
-        connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
-    }
-    else
-        emit tracks( m_tracks );
-
-    m_tracks.clear();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/m3uloader.h Deleted

@@ -1,68 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *   Copyright 2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 M3U_LOADER_H
-#define M3U_LOADER_H
-
-
-#include <QtCore/QFileInfo>
-#include "dllmacro.h"
-#include "typedefs.h"
-#include "query.h"
-#include "playlist.h"
-#include <QObject>
-#include <QSet>
-#include <QtCore/QStringList>
-
-class TrackModel;
-
-namespace Tomahawk
-{
-
-class DLLEXPORT M3uLoader : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit M3uLoader( const QString& url, bool createNewPlaylist = false, QObject* parent = 0 );
-    explicit M3uLoader( const QStringList& urls, bool createNewPlaylist = false, QObject* parent = 0 );
-    virtual ~M3uLoader();
-
-public slots:
-    void parse();
-
-signals:
-    void track( const Tomahawk::query_ptr& track );
-    void tracks( const QList< Tomahawk::query_ptr > tracks );
-
-private:
-    void parseM3u( const QString& track );
-    void getTags( const QFileInfo& info );
-    QList< query_ptr > m_tracks;
-    QString m_title, m_info, m_creator;
-    bool m_single;
-    bool m_trackMode;
-    bool m_createNewPlaylist;
-    playlist_ptr m_playlist;
-    QStringList m_urls;
-};
-
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/proxystyle.cpp Deleted

@@ -1,84 +0,0 @@
-/* === 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
- *   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 "proxystyle.h"
-
-#include <QPainter>
-#include <QSplitter>
-#include <QStyleOption>
-#include <QWidget>
-
-#include "utils/logger.h"
-
-#define ARROW_WIDTH 7
-#define ARROW_HEIGHT 7
-
-
-void
-ProxyStyle::drawPrimitive( PrimitiveElement pe, const QStyleOption* opt, QPainter* p, const QWidget* w ) const
-{
-    if ( pe == PE_IndicatorBranch )
-    {
-        if ( opt->state & QStyle::State_Children && !w->property( "flattenBranches" ).toBool() )
-        {
-            int hd = ( opt->rect.height() - ARROW_HEIGHT ) / 2;
-            int wd = ( opt->rect.width() - ARROW_WIDTH ) / 2;
-
-            QRect r = opt->rect.adjusted( wd, hd, 0, 0 );
-            QPointF pointsOpened3 = { QPointF( r.x(), r.y() ), QPointF( r.x() + ARROW_WIDTH, r.y() ), QPointF( r.x() + ARROW_WIDTH / 2, r.y() + ARROW_HEIGHT ) };
-            QPointF pointsClosed3 = { QPointF( r.x(), r.y() ), QPointF( r.x() + ARROW_WIDTH, r.y() + ARROW_HEIGHT / 2 ), QPointF( r.x(), r.y() + ARROW_HEIGHT ) };
-
-            p->save();
-            p->setRenderHint( QPainter::Antialiasing );
-
-            p->setPen( opt->palette.dark().color() );
-            p->setBrush( opt->palette.dark().color() );
-            if ( !( opt->state & QStyle::State_Open ) )
-            {
-                p->drawPolygon( pointsClosed, 3 );
-            }
-            else
-            {
-                p->drawPolygon( pointsOpened, 3 );
-            }
-
-            p->restore();
-        }
-        return;
-    }
-
-    if ( pe != PE_FrameStatusBar )
-        QProxyStyle::drawPrimitive( pe, opt, p, w );
-}
-
-
-void
-ProxyStyle::drawControl( ControlElement ce, const QStyleOption* opt, QPainter* p, const QWidget* w ) const
-{
-    if ( ce == CE_Splitter )
-    {
-        const QSplitter* splitter = qobject_cast< const QSplitter* >( w );
-        if ( !splitter->sizes().contains( 0 ) )
-        {
-            p->setPen( QColor( 0x8c, 0x8c, 0x8c ) );
-            p->drawLine( opt->rect.topLeft(), opt->rect.bottomRight() );
-        }
-    }
-    else
-        QProxyStyle::drawControl( ce, opt, p, w );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/proxystyle.h Deleted

@@ -1,36 +0,0 @@
-/* === 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
- *   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 PROXYSTYLE_H
-#define PROXYSTYLE_H
-
-#include <QtGlobal>
-#include <QProxyStyle>
-
-#include "dllmacro.h"
-
-class DLLEXPORT ProxyStyle : public QProxyStyle
-{
-public:
-    ProxyStyle() {}
-
-    virtual void drawPrimitive( PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w = 0 ) const;
-    virtual void drawControl( ControlElement ce, const QStyleOption *opt, QPainter *p, const QWidget *w = 0 ) const;
-};
-
-#endif // PROXYSTYLE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/qnr_iodevicestream.cpp Deleted

@@ -1,86 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2007 Matthias Kretz <kretz@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) version 3, or any
-    later version accepted by the membership of KDE e.V. (or its
-    successor approved by the membership of KDE e.V.), Nokia Corporation
-    (or its successors, if any) and the KDE Free Qt Foundation, which shall
-    act as a proxy defined in Section 6 of version 3 of the license.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "qnr_iodevicestream.h"
-
-#include <QtNetwork/QNetworkReply>
-
-using namespace Tomahawk;
-
-QNR_IODeviceStream::QNR_IODeviceStream(QIODevice* ioDevice, QObject* parent)
-    : Phonon::AbstractMediaStream( parent ),
-      _ioDevice(ioDevice),
-      _networkReply(0)
-{
-    _ioDevice->reset();
-    if (!_ioDevice->isOpen()) {
-        _ioDevice->open(QIODevice::ReadOnly);
-    }
-
-    Q_ASSERT(ioDevice->isOpen());
-    Q_ASSERT(ioDevice->isReadable());
-//     streamSize = ioDevice->size();
-//     streamSeekable = !ioDevice->isSequential();
-//
-    // Allow handling of QNetworkReplies WRT its isFinished() function..
-    _networkReply = qobject_cast<QNetworkReply *>(_ioDevice);
-}
-
-
-QNR_IODeviceStream::~QNR_IODeviceStream()
-{
-}
-
-void QNR_IODeviceStream::reset()
-{
-    _ioDevice->reset();
-    //resetDone();
-}
-
-void QNR_IODeviceStream::needData()
-{
-    quint32 size = 4096;
-    const QByteArray data = _ioDevice->read(size);
-// #ifdef __GNUC__
-// #warning TODO 4.5 - make sure we do not break anything without this, it is preventing IODs from working when they did not yet emit readyRead()
-// #endif
-//    if (data.isEmpty() && !d->ioDevice->atEnd()) {
-//        error(Phonon::NormalError, d->ioDevice->errorString());
-//    }
-    writeData(data);
-    if (_ioDevice->atEnd()) {
-        // If the IO device was identified as QNetworkReply also take its
-        // isFinished() into account, when triggering EOD.
-        if (!_networkReply || _networkReply->isFinished()) {
-            endOfData();
-        }
-    }
-}
-
-void QNR_IODeviceStream::seekStream(qint64 offset)
-{
-    _ioDevice->seek(offset);
-    //seekStreamDone();
-}
-
-
-// vim: sw=4 sts=4 et tw=100

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/qnr_iodevicestream.h Deleted

@@ -1,54 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2007 Matthias Kretz <kretz@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) version 3, or any
-    later version accepted by the membership of KDE e.V. (or its
-    successor approved by the membership of KDE e.V.), Nokia Corporation
-    (or its successors, if any) and the KDE Free Qt Foundation, which shall
-    act as a proxy defined in Section 6 of version 3 of the license.
-
-    This library 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
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#ifndef QNR_IODEVICESTREAM_H
-#define QNR_IODEVICESTREAM_H
-
-#include "dllmacro.h"
-
-#include <phonon/abstractmediastream.h>
-
-class QNetworkReply;
-class QIODevice;
-
-namespace Tomahawk
-{
-
-class DLLEXPORT QNR_IODeviceStream : public Phonon::AbstractMediaStream
-{
-    Q_OBJECT
-public:
-    explicit QNR_IODeviceStream(QIODevice *ioDevice, QObject *parent = 0);
-    ~QNR_IODeviceStream();
-
-    void reset();
-    void needData();
-    void seekStream(qint64);
-
-private:
-    QIODevice *_ioDevice;
-    QNetworkReply *_networkReply;
-};
-
-} // namespace Tomahawk
-
-#endif // QNR_IODEVICESTREAM_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/rdioparser.cpp Deleted

@@ -1,381 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 "rdioparser.h"
-
-#include "shortenedlinkparser.h"
-#include "config.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "dropjob.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
-#include "dropjobnotifier.h"
-#include "viewmanager.h"
-#include "sourcelist.h"
-
-#include <qjson/parser.h>
-#include <QDateTime>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QUrl>
-#include <QStringList>
-
-#include <QtCore/QCryptographicHash>
-
-using namespace Tomahawk;
-
-QPixmap* RdioParser::s_pixmap = 0;
-
-#ifdef QCA2_FOUND
-QCA::Initializer RdioParser::m_qcaInit = QCA::Initializer();
-#endif
-
-RdioParser::RdioParser( QObject* parent )
-    : QObject( parent )
-    , m_count( 0 )
-    , m_browseJob( 0 )
-    , m_createPlaylist( false )
-{
-}
-
-RdioParser::~RdioParser()
-{
-}
-
-void
-RdioParser::parse( const QString& url )
-{
-    m_multi = false;
-    m_total = 1;
-    parseUrl( url );
-}
-
-void
-RdioParser::parse( const QStringList& urls )
-{
-    m_multi = true;
-    m_total = urls.count();
-
-    foreach( const QString& url, urls )
-        parseUrl( url );
-}
-
-
-void
-RdioParser::parseUrl( const QString& url )
-{
-    if ( url.contains( "rd.io" ) ) // shortened
-    {
-        ShortenedLinkParser* p = new ShortenedLinkParser( QStringList() << url, this );
-        connect( p, SIGNAL( urls( QStringList ) ), this, SLOT( expandedLinks( QStringList ) ) );
-        return;
-    }
-
-    if ( url.contains( "artist" ) && url.contains( "album" ) && url.contains( "track" ) )
-        parseTrack( url );
-    else
-    {
-        DropJob::DropType type = DropJob::None;
-        if ( url.contains( "artist" ) && url.contains( "album" ) )
-            type = DropJob::Album;
-        else if ( url.contains( "artist" ) )
-            type = DropJob::Artist;
-        else if ( url.contains( "people" ) && url.contains( "playlist" ) )
-            type = DropJob::Playlist;
-        else
-        {
-            tLog() << "Got Rdio URL I can't parse!" << url;
-            return;
-        }
-
-        // artist, album, or playlist link requre fetching
-        fetchObjectsFromUrl( url, type );
-    }
-
-}
-
-void
-RdioParser::fetchObjectsFromUrl( const QString& url, DropJob::DropType type )
-{
-    QList< QPair< QByteArray, QByteArray > > params;
-    params.append( QPair<QByteArray, QByteArray>( "extras", "tracks" ) );
-
-    QString cleanedUrl = url;
-    cleanedUrl.replace("#/", "");
-
-    QByteArray data;
-    QNetworkRequest request = generateRequest( "getObjectFromUrl", cleanedUrl, params, &data );
-
-    request.setHeader( QNetworkRequest::ContentTypeHeader, QLatin1String( "application/x-www-form-urlencoded" ) );
-    QNetworkReply* reply = TomahawkUtils::nam()->post( request, data  );
-    connect( reply, SIGNAL( finished() ), this, SLOT( rdioReturned() ) );
-
-    m_browseJob = new DropJobNotifier( pixmap(), QString( "Rdio" ), type, reply );
-    JobStatusView::instance()->model()->addJob( m_browseJob );
-
-    m_reqQueries.insert( reply );
-}
-
-void
-RdioParser::rdioReturned()
-{
-
-    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
-    Q_ASSERT( r );
-    m_reqQueries.remove( r );
-    m_count++;
-    r->deleteLater();
-
-    if ( r->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        QVariantMap res = p.parse( r, &ok ).toMap();
-        QVariantMap result = res.value( "result" ).toMap();
-
-        if ( !ok || result.isEmpty() )
-        {
-            tLog() << "Failed to parse json from Rdio browse item :" << p.errorString() << "On line" << p.errorLine() << "With data:" << res;
-
-            return;
-        }
-
-        QVariantList tracks = result.value( "tracks" ).toList();
-        if ( tracks.isEmpty() )
-        {
-            tLog() << "Got no tracks in result, ignoring!" << result;
-            return;
-        }
-
-        // Playlists will have these
-        m_title = result "name" .toString();
-        m_creator = result "owner" .toString();
-
-        foreach( QVariant track, tracks )
-        {
-            QVariantMap rdioResult = track.toMap();
-            QString title, artist, album;
-
-            title = rdioResult.value( "name", QString() ).toString();
-            artist = rdioResult.value( "artist", QString() ).toString();
-            album = rdioResult.value( "album", QString() ).toString();
-
-            if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
-            {
-                tLog() << "Didn't get an artist and track name from Rdio, not enough to build a query on. Aborting" << title << artist << album;
-                return;
-            }
-
-            Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), !m_createPlaylist );
-            m_tracks << q;
-        }
-
-    } else
-    {
-        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching Rdio information from the network!" ) ) );
-        tLog() << "Error in network request to Rdio for track decoding:" << r->errorString();
-    }
-
-
-    checkFinished();
-
-
-}
-
-void
-RdioParser::parseTrack( const QString& origUrl )
-{
-    QString url = origUrl;
-    QString artist, trk, album, playlist;
-    QString realUrl = url.replace( "_", " " );
-    QString matchStr = "/%1/(^/*)/";
-    QString matchPlStr = "/%1/(?:^/*)/(^/*)/";
-
-    QRegExp r( QString( matchStr ).arg( "artist" ) );
-
-    int loc = r.indexIn( realUrl );
-    if ( loc >= 0 )
-        artist = r.cap( 1 );
-
-    r = QRegExp( QString( matchStr ).arg( "album" ) );
-    loc = r.indexIn( realUrl );
-    if ( loc >= 0 )
-        album = r.cap( 1 );
-
-    r = QRegExp( QString( matchStr ).arg( "track" ) );
-    loc = r.indexIn( realUrl );
-    if ( loc >= 0 )
-        trk = r.cap( 1 );
-
-    r = QRegExp( QString( matchPlStr ).arg( "playlists" ) );
-    loc = r.indexIn( realUrl );
-    if ( loc >= 0 )
-        playlist = r.cap( 1 );
-
-    if ( trk.isEmpty() || artist.isEmpty() )
-    {
-        tLog() << "Parsed Rdio track url but it's missing artist or track!" << url;
-        return;
-    }
-
-    query_ptr q = Query::get( artist, trk, album, uuid(), !m_createPlaylist );
-    m_count++;
-    m_tracks << q;
-
-    checkFinished();
-}
-
-
-QNetworkRequest
-RdioParser::generateRequest( const QString& method, const QString& url, const QList< QPair< QByteArray, QByteArray > >& extraParams, QByteArray* data )
-{
-    QUrl fetchUrl( "http://api.rdio.com/1/" );
-    QUrl toSignUrl = fetchUrl;
-
-    QPair<QByteArray, QByteArray> param;
-    foreach( param, extraParams )
-    {
-        toSignUrl.addEncodedQueryItem( param.first, param.second );
-    }
-    toSignUrl.addQueryItem( "method", method );
-    toSignUrl.addEncodedQueryItem("oauth_consumer_key", "gk8zmyzj5xztt8aj48csaart" );
-    QString nonce;
-    for ( int i = 0; i < 8; i++ )
-        nonce += QString::number( qrand() % 10 );
-    toSignUrl.addQueryItem("oauth_nonce", nonce );
-    toSignUrl.addEncodedQueryItem("oauth_signature_method", "HMAC-SHA1");
-    toSignUrl.addQueryItem("oauth_timestamp", QString::number(QDateTime::currentMSecsSinceEpoch() / 1000 ) );
-    toSignUrl.addEncodedQueryItem("oauth_version",  "1.0");
-    toSignUrl.addEncodedQueryItem( "url", QUrl::toPercentEncoding( url ) );
-    int size = toSignUrl.encodedQueryItems().size();
-    for( int i = 0; i < size; i++ ) {
-        const QPair< QByteArray, QByteArray > item = toSignUrl.encodedQueryItems().at( i );
-        data->append( item.first + "=" + item.second + "&" );
-    }
-    data->truncate( data->size() - 1 ); // remove extra &
-
-    QByteArray toSign = "POST&" + QUrl::toPercentEncoding( fetchUrl.toEncoded() ) + '&' + QUrl::toPercentEncoding( *data );
-    qDebug() << "Rdio" << toSign;
-
-    toSignUrl.addEncodedQueryItem( "oauth_signature", QUrl::toPercentEncoding( hmacSha1("yt35kakDyW&", toSign ) ) );
-
-    data->clear();
-    size = toSignUrl.encodedQueryItems().size();
-    for( int i = 0; i < size; i++ ) {
-        const QPair< QByteArray, QByteArray > item = toSignUrl.encodedQueryItems().at( i );
-        data->append( item.first + "=" + item.second + "&" );
-    }
-    data->truncate( data->size() - 1 ); // remove extra &
-
-    qDebug() << "POST data:" << *data;
-
-    QNetworkRequest request = QNetworkRequest( fetchUrl );
-    request.setHeader( QNetworkRequest::ContentTypeHeader, QLatin1String( "application/x-www-form-urlencoded" ) );
-
-    return request;
-}
-
-
-QByteArray
-RdioParser::hmacSha1(QByteArray key, QByteArray baseString)
-{
-#ifdef QCA2_FOUND
-    QCA::MessageAuthenticationCode hmacsha1( "hmac(sha1)", QCA::SecureArray() );
-    QCA::SymmetricKey keyObject( key );
-    hmacsha1.setup( keyObject );
-
-    hmacsha1.update( QCA::SecureArray( baseString ) );
-    QCA::SecureArray resultArray = hmacsha1.final();
-
-    QByteArray result = resultArray.toByteArray().toBase64();
-    return result;
-#else
-    tLog() << "Tomahawk compiled without QCA support, cannot generate HMAC signature";
-    return QByteArray();
-#endif
-}
-
-void
-RdioParser::checkFinished()
-{
-    tDebug() << "Checking for Rdio batch playlist job finished" << m_reqQueries.isEmpty();
-    if ( m_reqQueries.isEmpty() ) // we're done
-    {
-        if ( m_browseJob )
-            m_browseJob->setFinished();
-
-        if ( m_tracks.isEmpty() )
-            return;
-
-        if( m_createPlaylist )
-        {
-            m_playlist = Playlist::create( SourceList::instance()->getLocal(),
-                                           uuid(),
-                                           m_title,
-                                           "",
-                                           m_creator,
-                                           false,
-                                           m_tracks );
-
-            connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
-
-            return;
-        }
-        else
-        {
-            if ( !m_multi )
-                emit track( m_tracks.first() );
-            else if ( m_multi && m_count == m_total )
-                emit tracks( m_tracks );
-
-            m_tracks.clear();
-        }
-
-        deleteLater();
-    }
-}
-
-void
-RdioParser::playlistCreated( Tomahawk::PlaylistRevision )
-{
-    ViewManager::instance()->show( m_playlist );
-}
-
-
-void
-RdioParser::expandedLinks( const QStringList& urls )
-{
-    foreach( const QString& url, urls )
-    {
-        if ( url.contains( "rdio.com" ) || url.contains( "rd.io" ) )
-            parseUrl( url );
-    }
-}
-
-QPixmap
-RdioParser::pixmap() const
-{
-    if ( !s_pixmap )
-        s_pixmap = new QPixmap( RESPATH "images/rdio.png" );
-
-    return *s_pixmap;
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/rdioparser.h Deleted

@@ -1,103 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 RDIOPARSER_H
-#define RDIOPARSER_H
-
-#include "jobview/JobStatusItem.h"
-#include "query.h"
-#include "config.h"
-#include "dropjob.h"
-#include "typedefs.h"
-#include "playlist.h"
-
-#include <QtCore/QObject>
-#include <QStringList>
-#include <QSet>
-
-#include <QNetworkRequest>
-
-#ifdef QCA2_FOUND
-#include <QtCrypto>
-#endif
-
-class QNetworkReply;
-namespace Tomahawk
-{
-
-class DropJobNotifier;
-/**
- * Small class to parse spotify links into query_ptrs
- *
- * Connect to the signals to get the results
- */
-
-class RdioParser : public QObject
-{
-    Q_OBJECT
-public:
-
-    explicit RdioParser( QObject* parent = 0 );
-    virtual ~RdioParser();
-
-    void parse( const QString& url );
-    void parse( const QStringList& urls );
-
-    void setCreatePlaylist( bool createPlaylist ) { m_createPlaylist = createPlaylist; }
-
-signals:
-    void track( const Tomahawk::query_ptr& track );
-    void tracks( const QList< Tomahawk::query_ptr > tracks );
-
-private slots:
-    void expandedLinks( const QStringList& );
-    void rdioReturned();
-
-    void playlistCreated( Tomahawk::PlaylistRevision );
-private:
-    void parseTrack( const QString& url );
-    void fetchObjectsFromUrl( const QString& url, DropJob::DropType type );
-
-    QByteArray hmacSha1(QByteArray key, QByteArray baseString);
-    QNetworkRequest generateRequest( const QString& method, const QString& url, const QList< QPair< QByteArray, QByteArray > >& extraParams, QByteArray* postData );
-    QPixmap pixmap() const;
-    void checkFinished();
-    void parseUrl( const QString& url );
-
-    bool m_multi;
-    int m_count, m_total;
-    QSet< QNetworkReply* > m_reqQueries;
-    DropJobNotifier* m_browseJob;
-
-    QString m_title, m_creator;
-    playlist_ptr m_playlist;
-
-    static QPixmap* s_pixmap;
-
-    bool m_createPlaylist;
-    QList< query_ptr > m_tracks;
-
-#ifdef QCA2_FOUND
-    static QCA::Initializer m_qcaInit;
-#endif
-};
-
-}
-
-#endif // RDIOPARSER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/shortenedlinkparser.cpp Deleted

@@ -1,137 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 "shortenedlinkparser.h"
-
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-#include "dropjobnotifier.h"
-#include "query.h"
-#include "jobview/ErrorStatusMessage.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/JobStatusView.h"
-
-#include <qjson/parser.h>
-
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-
-using namespace Tomahawk;
-
-QPixmap* ShortenedLinkParser::s_pixmap = 0;
-
-ShortenedLinkParser::ShortenedLinkParser ( const QStringList& urls, QObject* parent )
-    : QObject( parent )
-{
-    foreach ( const QString& url, urls )
-        if ( handlesUrl( url ) )
-            lookupUrl( url ) ;
-}
-
-
-ShortenedLinkParser::~ShortenedLinkParser()
-{
-}
-
-
-bool
-ShortenedLinkParser::handlesUrl( const QString& url )
-{
-    // Whitelisted links
-    return ( url.contains( "t.co" ) ||
-             url.contains( "bit.ly" ) ||
-             url.contains( "j.mp" ) ||
-             url.contains( "spoti.fi" ) ||
-             url.contains( "ow.ly" ) ||
-             url.contains( "fb.me" ) ||
-             url.contains( "itun.es" ) ||
-             url.contains( "tinyurl.com" ) ||
-             url.contains( "tinysong.com" ) ||
-             url.contains( "grooveshark.com/s/~/" ) || // These redirect to the 'real' grooveshark track url
-             url.contains( "grooveshark.com/#/s/~/" ) ||
-             url.contains( "rd.io" ) );
-}
-
-void
-ShortenedLinkParser::lookupUrl ( const QString& url )
-{
-    tDebug() << "Looking up..." << url;
-    QString cleaned = url;
-    if ( cleaned.contains( "/#/s/" ) )
-        cleaned.replace( "/#", "" );
-
-    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( QUrl( cleaned ) ) );
-    connect( reply, SIGNAL( finished() ), this, SLOT( lookupFinished() ) );
-
-    m_queries.insert( reply );
-
-    m_expandJob = new DropJobNotifier( pixmap(), "shortened", DropJob::Track, reply );
-    JobStatusView::instance()->model()->addJob( m_expandJob );
-
-}
-
-void
-ShortenedLinkParser::lookupFinished()
-{
-    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
-    Q_ASSERT( r );
-
-    if ( r->error() != QNetworkReply::NoError )
-        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Network error parsing shortened link!" ) ) );
-
-    QVariant redir = r->attribute( QNetworkRequest::RedirectionTargetAttribute );
-    if ( redir.isValid() && !redir.toUrl().isEmpty() )
-    {
-        tDebug() << "RedirectionTargetAttribute set on " << redir;
-        m_queries.remove( r );
-        r->deleteLater();
-        lookupUrl( redir.toUrl().toString() );
-    }
-    else
-    {
-        tLog() << "Got a redirected url:" << r->url().toString();
-        m_links << r->url().toString();
-        m_queries.remove( r );
-        r->deleteLater();
-        checkFinished();
-    }
-}
-
-
-void
-ShortenedLinkParser::checkFinished()
-{
-    if ( m_queries.isEmpty() ) // we're done
-    {
-        qDebug() << "DONE and found redirected urls:" << m_links;
-        emit urls( m_links );
-
-        deleteLater();
-    }
-}
-
-
-QPixmap
-ShortenedLinkParser::pixmap()
-{
-    if ( !s_pixmap )
-        s_pixmap = new QPixmap( RESPATH "images/add.png" );
-
-    return *s_pixmap;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/shortenedlinkparser.h Deleted

@@ -1,75 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 SNORTENED_LINK_PARSER_H
-#define SNORTENED_LINK_PARSER_H
-
-#include "dllmacro.h"
-#include "typedefs.h"
-
-#include <QObject>
-#include <QSet>
-#include <QStringList>
-#include <QPixmap>
-
-class QNetworkReply;
-
-namespace Tomahawk
-{
-
-class DropJobNotifier;
-
-/**
- * Small class to parse whitelisted shortened links into the redirected urls
- *
- * Connect to urls() to get the result
- *
- */
-class DLLEXPORT ShortenedLinkParser : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit ShortenedLinkParser( const QStringList& urls, QObject* parent = 0 );
-    virtual ~ShortenedLinkParser();
-
-    static bool handlesUrl( const QString& url );
-
-public slots:
-    void lookupFinished();
-
-signals:
-    void urls( const QStringList& urls );
-
-private:
-    void lookupUrl( const QString& url );
-    void checkFinished();
-
-    static QPixmap pixmap();
-
-    QStringList m_links;
-    QSet< QNetworkReply* > m_queries;
-    DropJobNotifier* m_expandJob;
-
-    static QPixmap* s_pixmap;
-};
-
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/spotifyparser.cpp Deleted

@@ -1,361 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 "spotifyparser.h"
-
-#include "utils/logger.h"
-#include "utils/tomahawkutils.h"
-#include "query.h"
-#include "sourcelist.h"
-#include "dropjob.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
-#include "dropjobnotifier.h"
-#include "viewmanager.h"
-
-#include <qjson/parser.h>
-
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-
-using namespace Tomahawk;
-
-QPixmap* SpotifyParser::s_pixmap = 0;
-
-SpotifyParser::SpotifyParser( const QStringList& Urls, bool createNewPlaylist, QObject* parent )
-    : QObject ( parent )
-    , m_limit ( 40 )
-    , m_single( false )
-    , m_trackMode( true )
-    , m_createNewPlaylist( createNewPlaylist )
-    , m_browseJob( 0 )
-
-{
-    foreach ( const QString& url, Urls )
-        lookupUrl( url );
-}
-
-SpotifyParser::SpotifyParser( const QString& Url, bool createNewPlaylist, QObject* parent )
-    : QObject ( parent )
-    , m_limit ( 40 )
-    , m_single( true )
-    , m_trackMode( true )
-    , m_createNewPlaylist( createNewPlaylist )
-    , m_browseJob( 0 )
-{
-    lookupUrl( Url );
-}
-
-SpotifyParser::~SpotifyParser()
-{
-}
-
-
-void
-SpotifyParser::lookupUrl( const QString& link )
-{
-    if( link.contains( "track" ) )
-    {
-        m_trackMode = true;
-        lookupTrack( link );
-    }
-    else if( link.contains( "playlist" ) ||  link.contains( "album" ) || link.contains( "artist" ) )
-    {
-        if( !m_createNewPlaylist )
-            m_trackMode = true;
-        else
-            m_trackMode = false;
-
-        lookupSpotifyBrowse( link );
-    }
-    else
-        return; // Not valid spotify item
-
-}
-
-
-void
-SpotifyParser::lookupSpotifyBrowse( const QString& linkRaw )
-{
-    tLog() << "Parsing Spotify Browse URI:" << linkRaw;
-    QString browseUri = linkRaw;
-    if ( browseUri.contains( "open.spotify.com/" ) ) // convert to a URI
-    {
-        browseUri.replace( "http://open.spotify.com/", "" );
-        browseUri.replace( "/", ":" );
-        browseUri = "spotify:" + browseUri;
-    }
-
-
-    DropJob::DropType type;
-
-    if ( browseUri.contains( "spotify:user" ) )
-        type = DropJob::Playlist;
-    if ( browseUri.contains( "spotify:artist" ) )
-        type = DropJob::Artist;
-    if ( browseUri.contains( "spotify:album" ) )
-        type = DropJob::Album;
-    if ( browseUri.contains( "spotify:track" ) )
-        type = DropJob::Track;
-
-    QUrl url;
-
-    if( type != DropJob::Artist )
-         url = QUrl( QString( SPOTIFY_PLAYLIST_API_URL "/browse/%1" ).arg( browseUri ) );
-    else
-         url = QUrl( QString( SPOTIFY_PLAYLIST_API_URL "/browse/%1/%2" ).arg( browseUri )
-                                                                        .arg ( m_limit ) );
-    tDebug() << "Looking up URL..." << url.toString();
-
-    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-    connect( reply, SIGNAL( finished() ), this, SLOT( spotifyBrowseFinished() ) );
-
-    m_browseJob = new DropJobNotifier( pixmap(), "Spotify", type, reply );
-    JobStatusView::instance()->model()->addJob( m_browseJob );
-
-    m_queries.insert( reply );
-}
-
-void
-SpotifyParser::lookupTrack( const QString& link )
-{
-    tDebug() << "Got a QString " << link;
-    if ( !link.contains( "track" )) // we only support track links atm
-        return;
-
-    // we need Spotify URIs such as spotify:track:XXXXXX, so if we by chance get a http://open.spotify.com url, convert it
-    QString uri = link;
-    if ( link.contains( "open.spotify.com" ) )
-    {
-        QString hash = link;
-        hash.replace( "http://open.spotify.com/track/", "" );
-        uri = QString( "spotify:track:%1" ).arg( hash );
-    }
-
-    QUrl url = QUrl( QString( "http://ws.spotify.com/lookup/1/.json?uri=%1" ).arg( uri ) );
-    tDebug() << "Looking up URL..." << url.toString();
-
-    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-    connect( reply, SIGNAL( finished() ), this, SLOT( spotifyTrackLookupFinished() ) );
-
-    DropJobNotifier* j = new DropJobNotifier( pixmap(), QString( "Spotify" ), DropJob::Track, reply );
-    JobStatusView::instance()->model()->addJob( j );
-
-    m_queries.insert( reply );
-
-}
-
-
-void
-SpotifyParser::spotifyBrowseFinished()
-{
-    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
-    Q_ASSERT( r );
-
-    m_queries.remove( r );
-    r->deleteLater();
-
-    if ( r->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        QVariantMap res = p.parse( r, &ok ).toMap();
-
-        if ( !ok )
-        {
-            tLog() << "Failed to parse json from Spotify browse item :" << p.errorString() << "On line" << p.errorLine();
-            checkTrackFinished();
-            return;
-        }
-
-        QVariantMap resultResponse = res.value( res.value( "type" ).toString() ).toMap();
-
-
-        if ( !resultResponse.isEmpty() )
-        {
-            m_title = resultResponse.value( "name" ).toString();
-            m_single = false;
-
-            if ( res.value( "type" ).toString() == "playlist" )
-                m_creator = resultResponse.value( "creator" ).toString();
-
-            // TODO for now only take the first artist
-            foreach ( QVariant result, resultResponse.value( "result" ).toList() )
-            {
-                QVariantMap trackResult = result.toMap();
-
-                QString title, artist, album;
-
-                title = trackResult.value( "title", QString() ).toString();
-                artist = trackResult.value( "artist", QString() ).toString();
-                album = trackResult.value( "album", QString() ).toString();
-
-                if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
-                {
-                    tLog() << "Didn't get an artist and track name from spotify, not enough to build a query on. Aborting" << title << artist << album;
-                    return;
-                }
-
-                Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), m_trackMode );
-                m_tracks << q;
-            }
-
-        }
-
-    } else
-    {
-        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching Spotify information from the network!" ) ) );
-        tLog() << "Error in network request to Spotify for track decoding:" << r->errorString();
-    }
-
-    if ( m_trackMode )
-        checkTrackFinished();
-    else
-        checkBrowseFinished();
-}
-
-
-
-void
-SpotifyParser::spotifyTrackLookupFinished()
-{
-    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
-    Q_ASSERT( r );
-    m_queries.remove( r );
-    r->deleteLater();
-
-    if ( r->error() == QNetworkReply::NoError )
-    {
-        QJson::Parser p;
-        bool ok;
-        QVariantMap res = p.parse( r, &ok ).toMap();
-
-        if ( !ok )
-        {
-            tLog() << "Failed to parse json from Spotify track lookup:" << p.errorString() << "On line" << p.errorLine();
-            checkTrackFinished();
-            return;
-        } else if ( !res.contains( "track" ) )
-        {
-            tLog() << "No 'track' item in the spotify track lookup result... not doing anything";
-            checkTrackFinished();
-            return;
-        }
-
-        // lets parse this baby
-        QVariantMap t = res.value( "track" ).toMap();
-
-        QString title, artist, album;
-
-        title = t.value( "name", QString() ).toString();
-        // TODO for now only take the first artist
-        if ( t.contains( "artists" ) && t "artists" .canConvert< QVariantList >() && t "artists" .toList().size() > 0 )
-            artist = t "artists" .toList().first().toMap().value( "name", QString() ).toString();
-        if ( t.contains( "album" ) && t "album" .canConvert< QVariantMap >() )
-            album = t "album" .toMap().value( "name", QString() ).toString();
-
-        if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
-        {
-            tLog() << "Didn't get an artist and track name from spotify, not enough to build a query on. Aborting" << title << artist << album;
-            return;
-        }
-
-        Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), m_trackMode );
-        m_tracks << q;
-    } else
-    {
-        tLog() << "Error in network request to Spotify for track decoding:" << r->errorString();
-    }
-
-    if ( m_trackMode )
-        checkTrackFinished();
-    else
-        checkBrowseFinished();
-
-}
-
-void
-SpotifyParser::checkBrowseFinished()
-{
-    tDebug() << "Checking for spotify batch playlist job finished" << m_queries.isEmpty() << m_createNewPlaylist;
-    if ( m_queries.isEmpty() ) // we're done
-    {
-        if ( m_browseJob )
-            m_browseJob->setFinished();
-
-        if( m_createNewPlaylist && !m_tracks.isEmpty() )
-        {
-            m_playlist = Playlist::create( SourceList::instance()->getLocal(),
-                                       uuid(),
-                                       m_title,
-                                       m_info,
-                                       m_creator,
-                                       false,
-                                       m_tracks );
-            connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
-            return;
-        }
-
-        else if ( m_single && !m_tracks.isEmpty() )
-            emit track( m_tracks.first() );
-        else if ( !m_single && !m_tracks.isEmpty() )
-            emit tracks( m_tracks );
-
-        deleteLater();
-    }
-}
-
-void
-SpotifyParser::checkTrackFinished()
-{
-    tDebug() << "Checking for spotify batch track job finished" << m_queries.isEmpty();
-    if ( m_queries.isEmpty() ) // we're done
-    {
-        if ( m_browseJob )
-            m_browseJob->setFinished();
-
-        if ( m_single && !m_tracks.isEmpty() )
-            emit track( m_tracks.first() );
-        else if ( !m_single && !m_tracks.isEmpty() )
-            emit tracks( m_tracks );
-
-        deleteLater();
-    }
-
-}
-
-void
-SpotifyParser::playlistCreated()
-{
-
-    ViewManager::instance()->show( m_playlist );
-
-    deleteLater();
-}
-
-
-QPixmap
-SpotifyParser::pixmap() const
-{
-    if ( !s_pixmap )
-        s_pixmap = new QPixmap( RESPATH "images/spotify-logo.png" );
-
-    return *s_pixmap;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/spotifyparser.h Deleted

@@ -1,93 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
- *
- *   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 SPOTIFY_PARSER_H
-#define SPOTIFY_PARSER_H
-
-#include "dllmacro.h"
-#include "typedefs.h"
-#include "query.h"
-#include "jobview/JobStatusItem.h"
-
-#include <QObject>
-#include <QSet>
-#include <QtCore/QStringList>
-
-#define SPOTIFY_PLAYLIST_API_URL "http://spotikea.tomahawk-player.org"
-
-/**
- * Small class to parse spotify links into query_ptrs
- *
- * Connect to the signals to get the results
- */
-
-class QNetworkReply;
-namespace Tomahawk
-{
-
-class DropJobNotifier;
-
-class DLLEXPORT SpotifyParser : public QObject
-{
-    Q_OBJECT
-public:
-    friend class SpotifyJobNotifier;
-    explicit SpotifyParser( const QString& trackUrl, bool createNewPlaylist = false, QObject* parent = 0 );
-    explicit SpotifyParser( const QStringList& trackUrls, bool createNewPlaylist = false, QObject* parent = 0 );
-    virtual ~SpotifyParser();
-
-    // if true, emits track(), if false, emits tracks().
-    // only matters if you're using the QStrin constructor and explicityl dont' want
-    // the single track signal
-    void setSingleMode( bool single ) { m_single = single; }
-
-signals:
-    void track( const Tomahawk::query_ptr& track );
-    void tracks( const QList< Tomahawk::query_ptr > tracks );
-    void playlist( const Tomahawk::query_ptr& playlist );
-
-private slots:
-    void spotifyTrackLookupFinished();
-    void spotifyBrowseFinished();
-
-    void playlistCreated();
-private:
-    QPixmap pixmap() const;
-
-    void lookupUrl( const QString& url );
-    void lookupTrack( const QString& track );
-    void lookupSpotifyBrowse( const QString& playlist );
-    void checkTrackFinished();
-    void checkBrowseFinished();
-    int  m_limit;
-    bool m_single;
-    bool m_trackMode;
-    bool m_createNewPlaylist;
-    QList< query_ptr > m_tracks;
-    QSet< QNetworkReply* > m_queries;
-    QString m_title, m_info, m_creator;
-    Tomahawk::playlist_ptr m_playlist;
-    DropJobNotifier* m_browseJob;
-
-    static QPixmap* s_pixmap;
-};
-
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/stylehelper.cpp Deleted

@@ -1,177 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Casey Link <unnamedrambler@gmail.com>
- *
- *   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 "stylehelper.h"
-
-#include <QPainter>
-#include <QPixmapCache>
-#include <QApplication>
-
-
-QColor
-StyleHelper::headerUpperColor()
-{
-    return QColor( 80, 80, 80 );
-}
-
-
-QColor
-StyleHelper::headerLowerColor()
-{
-    return QColor( 72, 72, 72 );
-}
-
-
-QColor
-StyleHelper::headerHighlightColor()
-{
-    return QColor( "#333" );
-}
-
-
-void
-StyleHelper::horizontalHeader( QPainter* painter, const QRect& r )
-{
-    painter->save();
-
-    QRect upperHalf( 0, 0, r.width(), r.height() / 2 );
-    QRect lowerHalf( 0, upperHalf.height(), r.width(), r.height() );
-    painter->fillRect( upperHalf, StyleHelper::headerUpperColor() );
-    painter->fillRect( lowerHalf, StyleHelper::headerLowerColor() );
-
-    {
-        QColor lineColor( 100, 100, 100 );
-        QLine line( 0, 0, r.width(), 0 );
-        painter->setPen( lineColor );
-        painter->drawLine( line );
-    }
-    {
-        QColor lineColor( 30, 30, 30 );
-        QLine line( 0, r.height() - 1, r.width(), r.height() - 1 );
-        painter->setPen( lineColor );
-        painter->drawLine( line );
-    }
-
-    painter->restore();
-}
-
-
-QColor
-StyleHelper::headerTextColor()
-{
-    return Qt::white;
-}
-
-
-/*
- * This implementation is from QWindowsStyle (Qt 7.2)
- *
- * It is licensed under the GPL 3:
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- * Contact: Nokia Corporation (qt-info@nokia.com)
- */
-void StyleHelper::drawArrow( QStyle::PrimitiveElement element, QPainter* p, const QStyleOption* opt )
-{
-    if ( opt->rect.width() <= 1 || opt->rect.height() <= 1 )
-        return;
-
-    QRect r = opt->rect;
-    int size = qMin( r.height(), r.width() );
-    QPixmap pixmap;
-    QString pixmapName;
-
-    pixmapName.sprintf( "arrow-%s-%d-%d-%d-%lld", "$qt_ia", uint(opt->state), element, size, opt->palette.cacheKey() );
-    if ( !QPixmapCache::find( pixmapName, pixmap) )
-    {
-        int border = size / 5;
-        int sqsize = 2 * ( size / 2 );
-
-        QImage image( sqsize, sqsize, QImage::Format_ARGB32 );
-        image.fill( 0 );
-        QPainter imagePainter( &image );
-        imagePainter.setRenderHint( QPainter::Antialiasing, true );
-        QPolygon a;
-
-        switch ( element )
-        {
-            case QStyle::PE_IndicatorArrowUp:
-                a.setPoints( 3, border, sqsize / 2, sqsize / 2, border, sqsize - border, sqsize / 2 );
-                break;
-
-            case QStyle::PE_IndicatorArrowDown:
-                a.setPoints( 3, border, sqsize / 2, sqsize / 2, sqsize - border,  sqsize - border, sqsize / 2 );
-                break;
-
-            case QStyle::PE_IndicatorArrowRight:
-                a.setPoints( 3, sqsize - border, sqsize / 2, sqsize / 2, border, sqsize / 2, sqsize - border );
-                break;
-
-            case QStyle::PE_IndicatorArrowLeft:
-                a.setPoints( 3, border, sqsize / 2, sqsize / 2, border, sqsize / 2, sqsize - border );
-                break;
-
-            default:
-                break;
-        }
-
-        int bsx = 0;
-        int bsy = 0;
-
-        if ( opt->state & QStyle::State_Sunken )
-        {
-            bsx = qApp->style()->pixelMetric( QStyle::PM_ButtonShiftHorizontal );
-            bsy = qApp->style()->pixelMetric( QStyle::PM_ButtonShiftVertical );
-        }
-
-        QRect bounds = a.boundingRect();
-        int sx = sqsize / 2 - bounds.center().x() - 1;
-        int sy = sqsize / 2 - bounds.center().y() - 1;
-        imagePainter.translate( sx + bsx, sy + bsy );
-        imagePainter.setPen( opt->palette.buttonText().color() );
-        imagePainter.setBrush( opt->palette.buttonText() );
-
-        if ( !( opt->state & QStyle::State_Enabled ) )
-        {
-            QColor foreGround( 150, 150, 150, 150 );
-            imagePainter.setBrush( opt->palette.mid().color() );
-            imagePainter.setPen( opt->palette.mid().color() );
-        }
-        else
-        {
-            QColor shadow( 0, 0, 0, 100 );
-            imagePainter.translate( 0, 1 );
-            imagePainter.setPen( shadow );
-            imagePainter.setBrush( shadow );
-            QColor foreGround( 255, 255, 255, 210 );
-            imagePainter.drawPolygon( a );
-            imagePainter.translate( 0, -1 );
-            imagePainter.setPen( foreGround );
-            imagePainter.setBrush( foreGround );
-        }
-
-        imagePainter.drawPolygon( a );
-        imagePainter.end();
-
-        pixmap = QPixmap::fromImage( image );
-        QPixmapCache::insert( pixmapName, pixmap );
-    }
-
-    int xOffset = r.x() + ( r.width() - size ) / 2;
-    int yOffset = r.y() + ( r.height() - size ) / 2;
-    p->drawPixmap( xOffset, yOffset, pixmap );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/tomahawkutils.cpp Deleted

@@ -1,633 +0,0 @@
-/* === 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
- *   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 "config.h"
-#include "headlesscheck.h"
-#include "tomahawksettings.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#ifdef LIBLASTFM_FOUND
-    #include <lastfm/ws.h>
-#endif
-
-#include <QNetworkConfiguration>
-#include <QNetworkAccessManager>
-#include <QNetworkProxy>
-
-#include <QCoreApplication>
-#include <QDateTime>
-#include <QDir>
-#include <QMutex>
-#include <QCryptographicHash>
-
-#ifdef Q_WS_WIN
-    #include <windows.h>
-    #include <shlobj.h>
-#endif
-
-#ifdef Q_WS_MAC
-    #include <Carbon/Carbon.h>
-    #include <sys/sysctl.h>
-#endif
-
-namespace TomahawkUtils
-{
-static quint64 s_infosystemRequestId = 0;
-static QMutex s_infosystemRequestIdMutex;
-
-
-#ifdef Q_WS_MAC
-QString
-appSupportFolderPath()
-{
-    // honestly, it is *always* this --mxcl
-    return QDir::home().filePath( "Library/Application Support" );
-}
-#endif // Q_WS_MAC
-
-
-QString
-appFriendlyVersion()
-{
-    QStringList l = QString( TOMAHAWK_VERSION ).split( ".", QString::SkipEmptyParts );
-    while ( l.count() > 3 )
-        l.removeLast();
-
-    return l.join( "." );
-}
-
-
-QDir
-appConfigDir()
-{
-    QDir ret;
-
-#ifdef Q_WS_MAC
-    if( getenv( "HOME" ) )
-    {
-        return QDir( QString( "%1" ).arg( getenv( "HOME" ) ) );
-    }
-    else
-    {
-        qDebug() << "Error, $HOME not set.";
-        throw "$HOME not set";
-        return QDir( "/tmp" );
-    }
-
-#elif defined(Q_WS_WIN)
-    throw "TODO";
-    return QDir( "c:\\" ); //TODO refer to Qt documentation to get code to do this
-
-#else
-    if( getenv( "XDG_CONFIG_HOME" ) )
-    {
-        ret = QDir( QString( "%1/Tomahawk" ).arg( getenv( "XDG_CONFIG_HOME" ) ) );
-    }
-    else if( getenv( "HOME" ) )
-    {
-        ret = QDir( QString( "%1/.config/Tomahawk" ).arg( getenv( "HOME" ) ) );
-    }
-    else
-    {
-        qDebug() << "Error, $HOME or $XDG_CONFIG_HOME not set.";
-        throw "Error, $HOME or $XDG_CONFIG_HOME not set.";
-        ret = QDir( "/tmp" );
-    }
-
-    if( !ret.exists() )
-    {
-        ret.mkpath( ret.canonicalPath() );
-    }
-
-    return ret;
-#endif
-}
-
-
-QDir
-appDataDir()
-{
-    QString path;
-
-    #ifdef Q_WS_WIN
-        if ( ( QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based ) == 0 )
-        {
-            // Use this for non-DOS-based Windowses
-            char acPathMAX_PATH;
-            HRESULT h = SHGetFolderPathA( NULL, CSIDL_LOCAL_APPDATA | CSIDL_FLAG_CREATE,
-                                          NULL, 0, acPath );
-            if ( h == S_OK )
-            {
-                path = QString::fromLocal8Bit( acPath );
-            }
-        }
-    #elif defined(Q_WS_MAC)
-        path = appSupportFolderPath();
-    #elif defined(Q_WS_X11)
-        path = QDir::home().filePath( ".local/share" );
-    #else
-        path = QCoreApplication::applicationDirPath();
-    #endif
-
-    path += "/" + QCoreApplication::organizationName();
-    QDir d( path );
-    d.mkpath( path );
-
-    return d;
-}
-
-
-QDir
-appLogDir()
-{
-#ifndef Q_WS_MAC
-    return appDataDir();
-#else
-    return QDir( QDir::homePath() + "/Library/Logs" );
-#endif
-}
-
-
-QString
-sqlEscape( QString sql )
-{
-    return sql.replace( "'", "''" );
-}
-
-
-QString
-timeToString( int seconds )
-{
-    int hrs  = seconds / 60 / 60;
-    int mins = seconds / 60 % 60;
-    int secs = seconds % 60;
-
-    if ( seconds < 0 )
-    {
-        hrs = mins = secs = 0;
-    }
-
-    return QString( "%1%2:%3" ).arg( hrs > 0 ? hrs  < 10 ? "0" + QString::number( hrs ) + ":" : QString::number( hrs ) + ":" : "" )
-                               .arg( mins < 10 ? "0" + QString::number( mins ) : QString::number( mins ) )
-                               .arg( secs < 10 ? "0" + QString::number( secs ) : QString::number( secs ) );
-}
-
-
-QString
-ageToString( const QDateTime& time, bool appendAgoString )
-{
-    if ( time.toTime_t() == 0 )
-        return QString();
-
-    QDateTime now = QDateTime::currentDateTime();
-    int mins = time.secsTo( now ) / 60;
-    int hours = mins / 60;
-    int days = time.daysTo( now );
-    int weeks = days / 7;
-    int months = days / 30.42;
-    int years = months / 12;
-
-    if ( mins > 0 )
-    {
-        if ( years )
-        {
-            if ( appendAgoString )
-                return QObject::tr( "%n year(s) ago", "", years );
-            else
-                return QObject::tr( "%n year(s)", "", years );
-        }
-
-        if ( months )
-        {
-            if ( appendAgoString )
-                return QObject::tr( "%n month(s) ago", "", months );
-            else
-                return QObject::tr( "%n month(s)", "", months );
-        }
-
-        if ( weeks )
-        {
-            if ( appendAgoString )
-                return QObject::tr( "%n week(s) ago", "", weeks );
-            else
-                return QObject::tr( "%n week(s)", "", weeks );
-        }
-
-        if ( days )
-        {
-            if ( appendAgoString )
-                return QObject::tr( "%n day(s) ago", "", days );
-            else if ( hours >= 24 )
-                return QObject::tr( "%n day(s)", "", days );
-        }
-
-        if ( hours )
-        {
-            if ( appendAgoString )
-                return QObject::tr( "%n hour(s) ago", "", hours );
-            else
-                return QObject::tr( "%n hour(s)", "", hours );
-        }
-
-        if ( mins > 1 )
-        {
-            if ( appendAgoString )
-                return QObject::tr( "%1 minutes ago" ).arg( mins );
-            else
-                return QObject::tr( "%1 minutes" ).arg( mins );
-        }
-    }
-
-    return QObject::tr( "just now" );
-}
-
-
-QString
-filesizeToString( unsigned int size )
-{
-    if ( size == 0 )
-        return QString();
-
-    int kb = size / 1024;
-    int mb = kb / 1024;
-
-    if ( mb )
-    {
-        return QString( "%1.%2 Mb" ).arg( mb ).arg( int( ( kb % 1024 ) / 102.4 ) );
-    }
-    else if ( kb )
-    {
-        return QString( "%1 Kb" ).arg( kb );
-    }
-    else
-        return QString::number( size );
-}
-
-
-QString
-extensionToMimetype( const QString& extension )
-{
-    static QMap<QString, QString> s_ext2mime;
-    if ( s_ext2mime.isEmpty() )
-    {
-        s_ext2mime.insert( "mp3",  "audio/mpeg" );
-        s_ext2mime.insert( "ogg",  "application/ogg" );
-        s_ext2mime.insert( "oga",  "application/ogg" );
-        s_ext2mime.insert( "flac", "audio/flac" );
-        s_ext2mime.insert( "mpc",  "audio/x-musepack" );
-        s_ext2mime.insert( "wma",  "audio/x-ms-wma" );
-        s_ext2mime.insert( "aac",  "audio/mp4" );
-        s_ext2mime.insert( "m4a",  "audio/mp4" );
-        s_ext2mime.insert( "mp4",  "audio/mp4" );
-    }
-
-    return s_ext2mime.value( extension, "unknown" );
-}
-
-static QMutex s_noProxyHostsMutex;
-static QStringList s_noProxyHosts;
-
-NetworkProxyFactory::NetworkProxyFactory( const NetworkProxyFactory& other )
-{
-    m_proxy = QNetworkProxy( other.m_proxy );
-}
-
-
-QList< QNetworkProxy >
-NetworkProxyFactory::queryProxy( const QNetworkProxyQuery& query )
-{
-    tDebug() << Q_FUNC_INFO << "query hostname is " << query.peerHostName();
-    QList< QNetworkProxy > proxies;
-    QString hostname = query.peerHostName();
-    s_noProxyHostsMutex.lock();
-    if ( s_noProxyHosts.contains( hostname ) )
-        proxies << QNetworkProxy::NoProxy << systemProxyForQuery( query );
-    else if ( m_proxy.hostName().isEmpty() || hostname.isEmpty() || TomahawkSettings::instance()->proxyType() == QNetworkProxy::NoProxy )
-        proxies << systemProxyForQuery( query );
-    else
-        proxies << m_proxy << systemProxyForQuery( query );
-    s_noProxyHostsMutex.unlock();
-    return proxies;
-}
-
-
-void
-NetworkProxyFactory::setNoProxyHosts( const QStringList& hosts )
-{
-    QStringList newList;
-    tDebug() << Q_FUNC_INFO << "No-proxy hosts:" << hosts;
-    foreach( QString host, hosts )
-    {
-        QString munge = host.simplified();
-        newList << munge;
-        //TODO: wildcard support
-    }
-    tDebug() << Q_FUNC_INFO << "New no-proxy hosts:" << newList;
-    s_noProxyHostsMutex.lock();
-    s_noProxyHosts = newList;
-    s_noProxyHostsMutex.unlock();
-}
-
-
-void
-NetworkProxyFactory::setProxy( const QNetworkProxy& proxy )
-{
-    m_proxy = proxy;
-    if ( !TomahawkSettings::instance()->proxyDns() )
-        m_proxy.setCapabilities( QNetworkProxy::TunnelingCapability | QNetworkProxy::ListeningCapability | QNetworkProxy::UdpTunnelingCapability );
-    tDebug() << Q_FUNC_INFO << "Proxy using host" << proxy.hostName() << "and port" << proxy.port();
-    tDebug() << Q_FUNC_INFO << "setting proxy to use proxy DNS?" << (TomahawkSettings::instance()->proxyDns() ? "true" : "false");
-}
-
-
-NetworkProxyFactory&
-NetworkProxyFactory::operator=( const NetworkProxyFactory& rhs )
-{
-    tDebug() << Q_FUNC_INFO;
-    if ( this != &rhs )
-    {
-        m_proxy = QNetworkProxy( rhs.m_proxy );
-    }
-
-    return *this;
-}
-
-
-bool NetworkProxyFactory::operator==( const NetworkProxyFactory& other ) const
-{
-    tDebug() << Q_FUNC_INFO;
-    if ( m_proxy != other.m_proxy )
-        return false;
-
-    return true;
-}
-
-static QMap< QThread*, QNetworkAccessManager* > s_threadNamHash;
-static QMap< QThread*, NetworkProxyFactory* > s_threadProxyFactoryHash;
-static QMutex s_namAccessMutex;
-
-NetworkProxyFactory*
-proxyFactory( bool makeClone, bool noMutexLocker )
-{
-    // Don't lock if being called from nam()
-    tDebug() << Q_FUNC_INFO;
-    QMutex otherMutex;
-    QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
-
-    if ( !makeClone )
-    {
-        if ( s_threadProxyFactoryHash.contains( QThread::currentThread() ) )
-            return s_threadProxyFactoryHash QThread::currentThread() ;
-
-        if ( !s_threadProxyFactoryHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
-            return 0;
-    }
-
-    // create a new proxy factory for this thread
-    TomahawkUtils::NetworkProxyFactory *mainProxyFactory = s_threadProxyFactoryHash TOMAHAWK_APPLICATION::instance()->thread() ;
-    TomahawkUtils::NetworkProxyFactory *newProxyFactory = new TomahawkUtils::NetworkProxyFactory();
-    *newProxyFactory = *mainProxyFactory;
-
-    if ( !makeClone )
-        s_threadProxyFactoryHash QThread::currentThread()  = newProxyFactory;
-
-    return newProxyFactory;
-}
-
-
-void
-setProxyFactory( NetworkProxyFactory* factory, bool noMutexLocker )
-{
-    tDebug() << Q_FUNC_INFO;
-    Q_ASSERT( factory );
-    // Don't lock if being called from setNam()
-    QMutex otherMutex;
-    QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
-
-    if ( !s_threadProxyFactoryHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
-        return;
-
-    if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
-    {
-        foreach( QThread* thread, s_threadProxyFactoryHash.keys() )
-        {
-            if ( thread != QThread::currentThread() )
-            {
-                TomahawkUtils::NetworkProxyFactory *currFactory = s_threadProxyFactoryHash thread ;
-                *currFactory = *factory;
-            }
-        }
-        QNetworkProxyFactory::setApplicationProxyFactory( factory );
-    }
-
-    *s_threadProxyFactoryHash QThread::currentThread()  = *factory;
-}
-
-
-QNetworkAccessManager*
-nam()
-{
-    QMutexLocker locker( &s_namAccessMutex );
-    if ( s_threadNamHash.contains(  QThread::currentThread() ) )
-        return s_threadNamHash QThread::currentThread() ;
-
-    if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
-    {
-        if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
-        {
-            setNam( new QNetworkAccessManager(), true );
-            return s_threadNamHash QThread::currentThread() ;
-        }
-        else
-            return 0;
-    }
-
-    // Create a nam for this thread based on the main thread's settings but with its own proxyfactory
-    QNetworkAccessManager *mainNam = s_threadNamHash TOMAHAWK_APPLICATION::instance()->thread() ;
-    QNetworkAccessManager* newNam = new QNetworkAccessManager();
-
-    newNam->setConfiguration( QNetworkConfiguration( mainNam->configuration() ) );
-    newNam->setNetworkAccessible( mainNam->networkAccessible() );
-    newNam->setProxyFactory( proxyFactory( false, true ) );
-
-    s_threadNamHash QThread::currentThread()  = newNam;
-
-    tDebug( LOGEXTRA ) << "created new nam for thread " << QThread::currentThread();
-
-    return newNam;
-}
-
-
-void
-setNam( QNetworkAccessManager* nam, bool noMutexLocker )
-{
-    Q_ASSERT( nam );
-    // Don't lock if being called from nam()()
-    QMutex otherMutex;
-    QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
-    if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) &&
-            QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
-    {
-        tDebug( LOGEXTRA ) << "creating initial gui thread (" << TOMAHAWK_APPLICATION::instance()->thread() << ") nam";
-        // Should only get here on first initialization of the nam
-        TomahawkSettings *s = TomahawkSettings::instance();
-        TomahawkUtils::NetworkProxyFactory* proxyFactory = new TomahawkUtils::NetworkProxyFactory();
-        if ( s->proxyType() != QNetworkProxy::NoProxy && !s->proxyHost().isEmpty() )
-        {
-            tDebug( LOGEXTRA ) << "Setting proxy to saved values";
-            QNetworkProxy proxy( s->proxyType(), s->proxyHost(), s->proxyPort(), s->proxyUsername(), s->proxyPassword() );
-            proxyFactory->setProxy( proxy );
-            //FIXME: Jreen is broke without this
-            //QNetworkProxy::setApplicationProxy( proxy );
-            s_noProxyHostsMutex.lock();
-            if ( !s->proxyNoProxyHosts().isEmpty() && s_noProxyHosts.isEmpty() )
-            {
-                s_noProxyHostsMutex.unlock();
-                proxyFactory->setNoProxyHosts( s->proxyNoProxyHosts().split( ',', QString::SkipEmptyParts ) );
-            }
-            else
-                s_noProxyHostsMutex.unlock();
-        }
-
-        nam->setProxyFactory( proxyFactory );
-        s_threadNamHash QThread::currentThread()  = nam;
-        s_threadProxyFactoryHash QThread::currentThread()  = proxyFactory;
-        return;
-    }
-
-    s_threadNamHash QThread::currentThread()  = nam;
-
-    if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
-        setProxyFactory( dynamic_cast< TomahawkUtils::NetworkProxyFactory* >( nam->proxyFactory() ), true );
-}
-
-
-bool
-newerVersion( const QString& oldVersion, const QString& newVersion )
-{
-    if ( oldVersion.isEmpty() || newVersion.isEmpty() )
-        return false;
-
-    QStringList oldVList = oldVersion.split( ".", QString::SkipEmptyParts );
-    QStringList newVList = newVersion.split( ".", QString::SkipEmptyParts );
-
-    int i = 0;
-    foreach ( const QString& nvPart, newVList )
-    {
-        if ( i + 1 > oldVList.count() )
-            return true;
-
-        int nviPart = nvPart.toInt();
-        int oviPart = oldVList.at( i++ ).toInt();
-
-        if ( nviPart > oviPart )
-            return true;
-
-        if ( nviPart < oviPart )
-            return false;
-    }
-
-    return false;
-}
-
-
-QList< Tomahawk::query_ptr >
-mergePlaylistChanges( const QList< Tomahawk::query_ptr >& orig, const QList< Tomahawk::query_ptr >& newTracks, bool& changed )
-{
-    int sameCount = 0;
-    QList< Tomahawk::query_ptr > tosave = newTracks;
-    changed = false;
-
-    foreach ( const Tomahawk::query_ptr& newquery, newTracks )
-    {
-        foreach ( const Tomahawk::query_ptr& oldq, orig )
-        {
-            if ( newquery->track() == oldq->track() &&
-                newquery->artist() == oldq->artist() &&
-                newquery->album() == oldq->album() )
-            {
-                sameCount++;
-                if ( tosave.contains( newquery ) )
-                    tosave.replace( tosave.indexOf( newquery ), oldq );
-
-                break;
-            }
-        }
-    }
-
-    // No work to be done if all are the same
-    if ( orig.size() == newTracks.size() && sameCount == orig.size() )
-        return orig;
-
-    changed = true;
-    return tosave;
-}
-
-
-// taken from util/fileutils.cpp in kdevplatform
-bool
-removeDirectory( const QString& dir )
-{
-    const QDir aDir(dir);
-
-    tLog() << "Deleting DIR:" << dir;
-    bool has_err = false;
-    if (aDir.exists()) {
-        foreach(const QFileInfo& entry, aDir.entryInfoList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::NoSymLinks)) {
-            QString path = entry.absoluteFilePath();
-            if (entry.isDir()) {
-                has_err = !removeDirectory(path) || has_err;
-            } else if (!QFile::remove(path)) {
-                has_err = true;
-            }
-        }
-        if (!aDir.rmdir(aDir.absolutePath())) {
-            has_err = true;
-        }
-    }
-    return !has_err;
-}
-
-
-quint64 infosystemRequestId()
-{
-    QMutexLocker locker( &s_infosystemRequestIdMutex );
-    quint64 result = s_infosystemRequestId;
-    s_infosystemRequestId++;
-    return result;
-}
-
-
-QString
-md5( const QByteArray& data )
-{
-    QByteArray const digest = QCryptographicHash::hash( data, QCryptographicHash::Md5 );
-    return QString::fromLatin1( digest.toHex() ).rightJustified( 32, '0' );
-}
-
-
-void
-crash()
-{
-    volatile int* a = (int*)(NULL);
-    *a = 1;
-}
-
-} // ns

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/tomahawkutils.h Deleted

@@ -1,118 +0,0 @@
-/* === 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
- *   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 TOMAHAWKUTILS_H
-#define TOMAHAWKUTILS_H
-
-#include "dllmacro.h"
-
-#include <QtCore/QThread>
-#include <QtNetwork/QNetworkProxy>
-#include <QtCore/QStringList>
-#include <typedefs.h>
-
-
-#define RESPATH ":/data/"
-
-
-class QDir;
-class QNetworkAccessManager;
-
-namespace TomahawkUtils
-{
-    enum MediaType
-    {
-        MediaTypeArtist,
-        MediaTypeAlbum,
-        MediaTypeTrack
-    };
-
-    enum ImageType
-    {
-        DefaultAlbumCover,
-        DefaultArtistImage
-    };
-    enum ImageMode
-    {
-        NoDefaultCover,
-        CoverInCase,
-        ScaledCover
-    };
-
-    class DLLEXPORT NetworkProxyFactory : public QNetworkProxyFactory
-    {
-    public:
-        NetworkProxyFactory()
-            : m_proxy( QNetworkProxy::NoProxy )
-            {}
-
-        NetworkProxyFactory( const NetworkProxyFactory &other );
-        virtual ~NetworkProxyFactory() {}
-
-        virtual QList< QNetworkProxy > queryProxy( const QNetworkProxyQuery & query = QNetworkProxyQuery() );
-
-        virtual void setNoProxyHosts( const QStringList &hosts );
-        virtual QStringList noProxyHosts() const { return m_noProxyHosts; }
-        virtual void setProxy( const QNetworkProxy &proxy );
-        virtual QNetworkProxy proxy() { return m_proxy; }
-
-        virtual NetworkProxyFactory& operator=( const NetworkProxyFactory &rhs );
-        virtual bool operator==( const NetworkProxyFactory &other ) const;
-
-    private:
-        QStringList m_noProxyHosts;
-        QNetworkProxy m_proxy;
-    };
-
-    DLLEXPORT QString appFriendlyVersion();
-
-    DLLEXPORT QDir appConfigDir();
-    DLLEXPORT QDir appDataDir();
-    DLLEXPORT QDir appLogDir();
-
-    DLLEXPORT QString sqlEscape( QString sql );
-    DLLEXPORT QString timeToString( int seconds );
-    DLLEXPORT QString ageToString( const QDateTime& time, bool appendAgoString = false );
-    DLLEXPORT QString filesizeToString( unsigned int size );
-    DLLEXPORT QString extensionToMimetype( const QString& extension );
-    DLLEXPORT bool newerVersion( const QString& oldVersion, const QString& newVersion );
-
-    DLLEXPORT NetworkProxyFactory* proxyFactory( bool makeClone = false, bool noMutexLocker = false );
-    DLLEXPORT void setProxyFactory( TomahawkUtils::NetworkProxyFactory* factory, bool noMutexLocker = false );
-    DLLEXPORT QNetworkAccessManager* nam();
-    DLLEXPORT void setNam( QNetworkAccessManager* nam, bool noMutexLocker = false );
-    DLLEXPORT quint64 infosystemRequestId();
-
-    DLLEXPORT QString md5( const QByteArray& data );
-    DLLEXPORT bool removeDirectory( const QString& dir );
-
-    /**
-     * This helper is designed to help "update" an existing playlist with a newer revision of itself.
-     * To avoid re-loading the whole playlist and re-resolving tracks that are the same in the old playlist,
-     * it goes through the new playlist and adds only new tracks.
-     *
-     * The new list of tracks is returned
-     *
-     * \return true if some changes were made, false if the new tracks are the same as the current tracks in \param orig
-     */
-    DLLEXPORT QList< Tomahawk::query_ptr > mergePlaylistChanges( const QList< Tomahawk::query_ptr >& orig, const QList< Tomahawk::query_ptr >& newTracks, bool& changed );
-
-    DLLEXPORT void crash();
-}
-
-#endif // TOMAHAWKUTILS_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/tomahawkutils_mac.mm Deleted

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/tomahawkutilsgui.cpp Deleted

@@ -1,363 +0,0 @@
-/* === 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
- *   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 "config.h"
-#include "tomahawkutilsgui.h"
-
-#include <QtGui/QLayout>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmap>
-#include <QtGui/QPalette>
-#include <QtGui/QApplication>
-#include <QtGui/QWidget>
-
-#ifdef Q_WS_X11
-    #include <QtGui/QX11Info>
-    #include <libqnetwm/netwm.h>
-#endif
-
-#ifdef Q_WS_WIN
-    #include <windows.h>
-    #include <windowsx.h>
-#endif
-
-#include "logger.h"
-
-namespace TomahawkUtils
-{
-static int s_headerHeight = 0;
-
-
-QPixmap
-createDragPixmap( MediaType type, int itemCount )
-{
-    // If more than one item is dragged, align the items inside a
-    // rectangular grid. The maximum grid size is limited to 5 x 5 items.
-    int xCount = 3;
-    int size = 32;
-
-    if ( itemCount > 16 )
-    {
-        xCount = 5;
-        size = 16;
-    } else if( itemCount > 9 )
-    {
-        xCount = 4;
-        size = 22;
-    }
-
-    if( itemCount < xCount )
-    {
-        xCount = itemCount;
-    }
-
-    int yCount = itemCount / xCount;
-    if( itemCount % xCount != 0 )
-    {
-        ++yCount;
-    }
-    if( yCount > xCount )
-    {
-        yCount = xCount;
-    }
-    // Draw the selected items into the grid cells
-    QPixmap dragPixmap( xCount * size + xCount - 1, yCount * size + yCount - 1 );
-    dragPixmap.fill( Qt::transparent );
-
-    QPainter painter( &dragPixmap );
-    painter.setRenderHint( QPainter::Antialiasing );
-
-    QPixmap pixmap;
-    switch ( type )
-    {
-        case MediaTypeArtist:
-            pixmap = QPixmap( ":/data/images/artist-icon.png" ).scaledToWidth( size, Qt::SmoothTransformation );
-            break;
-        case MediaTypeAlbum:
-            pixmap = QPixmap( ":/data/images/album-icon.png" ).scaledToWidth( size, Qt::SmoothTransformation );
-            break;
-        case MediaTypeTrack:
-            pixmap = QPixmap( QString( ":/data/images/track-icon-%2x%2.png" ).arg( size ) );
-            break;
-    }
-
-    int x = 0;
-    int y = 0;
-    for( int i = 0; i < itemCount; ++i )
-    {
-
-        painter.drawPixmap( x, y, pixmap );
-
-        x += size + 1;
-        if ( x >= dragPixmap.width() )
-        {
-            x = 0;
-            y += size + 1;
-        }
-        if ( y >= dragPixmap.height() )
-        {
-            break;
-        }
-    }
-
-    return dragPixmap;
-}
-
-
-void
-drawBackgroundAndNumbers( QPainter* painter, const QString& text, const QRect& figRectIn )
-{
-    QRect figRect = figRectIn;
-    if ( text.length() == 1 )
-        figRect.adjust( -painter->fontMetrics().averageCharWidth(), 0, 0, 0 );
-
-    QPen origpen = painter->pen();
-    QPen pen = origpen;
-    pen.setWidth( 1.0 );
-    painter->setPen( pen );
-    painter->drawRect( figRect );
-
-    // circles look bad. make it an oval. (thanks, apple)
-    const int bulgeWidth = 8;
-    const int offset = 0; // number of pixels to begin, counting inwards from figRect.x() and figRect.width(). 0 means start at each end, negative means start inside the rect.
-
-    QPainterPath ppath;
-    ppath.moveTo( QPoint( figRect.x() + offset, figRect.y() + figRect.height() / 2 ) );
-    QRect leftArcRect( figRect.x() + offset - bulgeWidth, figRect.y(), 2*bulgeWidth, figRect.height() );
-    ppath.arcTo( leftArcRect, 90, 180 );
-    painter->drawPath( ppath );
-
-    ppath = QPainterPath();
-    ppath.moveTo( figRect.x() + figRect.width() - offset, figRect.y() + figRect.height() / 2 );
-    leftArcRect = QRect( figRect.x() + figRect.width() - offset - bulgeWidth, figRect.y(), 2*bulgeWidth, figRect.height() );
-    ppath.arcTo( leftArcRect, 270, 180 );
-    painter->drawPath( ppath );
-
-    painter->setPen( origpen );
-
-#ifdef Q_WS_MAC
-    figRect.adjust( -1, 0, 0, 0 );
-#endif
-
-    QTextOption to( Qt::AlignCenter );
-    painter->setPen( Qt::white );
-    painter->drawText( figRect.adjusted( -5, 0, 6, 0 ), text, to );
-}
-
-
-void
-drawQueryBackground( QPainter* p, const QPalette& palette, const QRect& r, qreal lightnessFactor )
-{
-    p->setPen( palette.highlight().color().lighter( lightnessFactor * 100 ) );
-    p->setBrush( palette.highlight().color().lighter( lightnessFactor * 100 ) );
-    p->drawRoundedRect( r, 4.0, 4.0 );
-}
-
-
-void
-unmarginLayout( QLayout* layout )
-{
-    layout->setContentsMargins( 0, 0, 0, 0 );
-    layout->setMargin( 0 );
-    layout->setSpacing( 0 );
-
-    for ( int i = 0; i < layout->count(); i++ )
-    {
-        QLayout* childLayout = layout->itemAt( i )->layout();
-        if ( childLayout )
-            unmarginLayout( childLayout );
-    }
-}
-
-
-QWidget*
-tomahawkWindow()
-{
-    QWidgetList widgetList = qApp->topLevelWidgets();
-    int i = 0;
-    while( i < widgetList.count() && widgetList.at( i )->objectName() != "TH_Main_Window" )
-        i++;
-
-    if ( i == widgetList.count() )
-    {
-        qDebug() << Q_FUNC_INFO << "could not find main Tomahawk mainwindow";
-        Q_ASSERT( false );
-        return 0;
-    }
-
-    QWidget *widget = widgetList.at( i );
-    return widget;
-}
-
-
-#ifndef Q_WS_MAC
-void
-bringToFront()
-{
-#if defined(Q_WS_X11)
-    {
-        qDebug() << Q_FUNC_INFO;
-
-        QWidget* widget = tomahawkWindow();
-        if ( !widget )
-            return;
-
-        widget->show();
-        widget->activateWindow();
-        widget->raise();
-
-        WId wid = widget->winId();
-        NETWM::init();
-
-        XEvent e;
-        e.xclient.type = ClientMessage;
-        e.xclient.message_type = NETWM::NET_ACTIVE_WINDOW;
-        e.xclient.display = QX11Info::display();
-        e.xclient.window = wid;
-        e.xclient.format = 32;
-        e.xclient.data.l0 = 2;
-        e.xclient.data.l1 = QX11Info::appTime();
-        e.xclient.data.l2 = 0;
-        e.xclient.data.l3 = 0l;
-        e.xclient.data.l4 = 0l;
-
-        XSendEvent( QX11Info::display(), RootWindow( QX11Info::display(), DefaultScreen( QX11Info::display() ) ), False, SubstructureRedirectMask | SubstructureNotifyMask, &e );
-    }
-#elif defined(Q_WS_WIN)
-    {
-        qDebug() << Q_FUNC_INFO;
-
-        QWidget* widget = tomahawkWindow();
-        if ( !widget )
-            return;
-
-        widget->show();
-        widget->activateWindow();
-        widget->raise();
-
-        WId wid = widget->winId();
-
-        HWND hwndActiveWin = GetForegroundWindow();
-        int  idActive      = GetWindowThreadProcessId(hwndActiveWin, NULL);
-        if ( AttachThreadInput(GetCurrentThreadId(), idActive, TRUE) )
-        {
-            SetForegroundWindow( wid );
-            SetFocus( wid );
-            AttachThreadInput(GetCurrentThreadId(), idActive, FALSE);
-        }
-    }
-#endif
-}
-#endif
-
-
-QPixmap
-createAvatarFrame( const QPixmap &avatar )
-{
-    QPixmap frame( ":/data/images/avatar_frame.png" );
-    QPixmap scaledAvatar = avatar.scaled( frame.height() * 75 / 100, frame.width() * 75 / 100, Qt::KeepAspectRatio, Qt::SmoothTransformation );
-
-    QPainter painter( &frame );
-    painter.drawPixmap( (frame.height() - scaledAvatar.height()) / 2, (frame.width() - scaledAvatar.width()) / 2, scaledAvatar );
-
-    return frame;
-}
-
-
-int
-headerHeight()
-{
-    return s_headerHeight;
-}
-
-
-void
-setHeaderHeight( int height )
-{
-    s_headerHeight = height;
-}
-
-
-QColor
-alphaBlend( const QColor& colorFrom, const QColor& colorTo, float opacity )
-{
-    opacity = qMax( (float)0.3, opacity );
-    int r = colorFrom.red(), g = colorFrom.green(), b = colorFrom.blue();
-    r = opacity * r + ( 1 - opacity ) * colorTo.red();
-    g = opacity * g + ( 1 - opacity ) * colorTo.green();
-    b = opacity * b + ( 1 - opacity ) * colorTo.blue();
-
-    return QColor( r, g, b );
-}
-
-
-QPixmap
-defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
-{
-    QPixmap pixmap;
-    QHash< int, QPixmap > subsubcache;
-    QHash< int, QHash< int, QPixmap > > subcache;
-    static QHash< int, QHash< int, QHash< int, QPixmap > > > cache;
-
-    if ( cache.contains( type ) )
-    {
-        subcache = cache.value( type );
-
-        if ( subcache.contains( mode ) )
-        {
-            subsubcache = subcache.value( mode );
-            
-            if ( subsubcache.contains( size.width() ) )
-                return subsubcache.value( size.width() );
-        }
-    }
-
-    switch ( type )
-    {
-        case DefaultAlbumCover:
-            if ( mode == CoverInCase )
-                pixmap = QPixmap( RESPATH "images/no-album-art-placeholder.png" );
-            else
-                pixmap = QPixmap( RESPATH "images/no-album-no-case.png" );
-            break;
-
-        case DefaultArtistImage:
-                pixmap = QPixmap( RESPATH "images/no-artist-image-placeholder.png" );
-            break;
-            
-        default:
-            break;
-    }
-
-    if ( pixmap.isNull() )
-    {
-        Q_ASSERT( false );
-        return QPixmap();
-    }
-
-    if ( !size.isNull() )
-        pixmap = pixmap.scaled( size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
-    
-    subsubcache.insert( size.width(), pixmap );
-    subcache.insert( mode, subsubcache );
-    cache.insert( type, subcache );
-
-    return pixmap;
-}
-
-} // ns

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/tomahawkutilsgui.h Deleted

@@ -1,55 +0,0 @@
-/* === 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
- *   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 TOMAHAWKUTILSGUI_H
-#define TOMAHAWKUTILSGUI_H
-
-#include <QSize>
-
-#include "tomahawkutils.h"
-#include "dllmacro.h"
-
-class QPainter;
-class QColor;
-class QPixmap;
-class QLayout;
-class QPalette;
-class QRect;
-
-namespace TomahawkUtils
-{
-    DLLEXPORT void drawQueryBackground( QPainter* p, const QPalette& palette, const QRect& r, qreal lightnessFactor = 1 );
-    DLLEXPORT QWidget* tomahawkWindow();
-    /// Platform-specific bringing tomahawk mainwindow to front, b/c qt's activate() and such don't seem to work well enough for us
-    DLLEXPORT void bringToFront();
-
-    DLLEXPORT QPixmap createAvatarFrame( const QPixmap &avatar );
-
-    DLLEXPORT QColor alphaBlend( const QColor& colorFrom, const QColor& colorTo, float opacity );
-    DLLEXPORT QPixmap createDragPixmap( MediaType type, int itemCount = 1 );
-
-    DLLEXPORT void drawBackgroundAndNumbers( QPainter* p, const QString& text, const QRect& rect );
-    DLLEXPORT void unmarginLayout( QLayout* layout );
-
-    DLLEXPORT int headerHeight();
-    DLLEXPORT void setHeaderHeight( int height );
-    
-    DLLEXPORT QPixmap defaultPixmap( ImageType type, ImageMode mode, const QSize& size = QSize( 0, 0 ) );
-}
-
-#endif // TOMAHAWKUTILSGUI_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/widgetdragfilter.cpp Deleted

@@ -1,114 +0,0 @@
-/* === 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
- *   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 "widgetdragfilter.h"
-
-#include <QMouseEvent>
-#include <QApplication>
-#include <QMenuBar>
-
-#include "utils/logger.h"
-
-
-WidgetDragFilter::WidgetDragFilter( QObject* parent )
-    : QObject( parent )
-    , m_dragStarted( false )
-{
-    Q_ASSERT( parent->isWidgetType() );
-    m_target = QWeakPointer<QWidget>(static_cast<QWidget*>(parent));
-    m_target.data()->installEventFilter( this );
-}
-
-
-bool
-WidgetDragFilter::eventFilter( QObject* obj, QEvent* event )
-{
-    if( m_target.isNull() || m_target.data() != obj )
-        return false;
-
-    if( event->type() == QEvent::MouseButtonPress ) {
-        QMouseEvent *mouseEvent = static_cast<QMouseEvent*>( event );
-        if( !canDrag( obj, mouseEvent ) )
-            return false;
-        if( !( mouseEvent->modifiers() == Qt::NoModifier && mouseEvent->button() == Qt::LeftButton ) )
-            return false;
-        m_dragPoint = mouseEvent->pos();
-        m_dragStarted = true;
-        return false;
-    } else if( event->type() == QEvent::MouseMove ) {
-        if( !m_dragStarted )
-            return false;
-        QMouseEvent* e = static_cast<QMouseEvent* >(event);
-        if( !canDrag( obj, e ) ) {
-            m_dragStarted = false;
-
-            return false;
-        }
-        if( e->buttons().testFlag( Qt::LeftButton ) ) {
-            m_target.data()->window()->move( m_target.data()->window()->pos() + ( e->pos() - m_dragPoint ) );
-            return true;
-        }
-    } else if( event->type() == QEvent::MouseButtonRelease ) {
-        m_dragStarted = false;
-    }
-    return false;
-}
-
-
-/**
- * Make sure we can really drag this widget. Checks inspired by Oxygen's oxygenwindowmanager.cpp
- */
-bool
-WidgetDragFilter::canDrag( QObject* obj, QMouseEvent* ev ) const
-{
-    if( !obj->isWidgetType() )
-        return false;
-
-    QWidget* w = static_cast< QWidget* >( obj );
-
-    if( QWidget::mouseGrabber() )
-        return false;
-
-    if( w->cursor().shape() != Qt::ArrowCursor )
-        return false;
-
-    // Now we check various things about the child position and mouse
-    QPoint position( ev->pos() );
-    QWidget* child = w->childAt( position );
-
-    if( child && child->cursor().shape() != Qt::ArrowCursor ) return false;
-
-    // Don't want to drag menubars when selecting an action
-    if( QMenuBar* menuBar = qobject_cast<QMenuBar*>( w ) )
-    {
-        // check if there is an active action
-        if( menuBar->activeAction() && menuBar->activeAction()->isEnabled() ) return false;
-
-        // check if action at position exists and is enabled
-        if( QAction* action = menuBar->actionAt( position ) )
-        {
-            if( action->isSeparator() ) return true;
-            if( action->isEnabled() ) return false;
-        }
-        // return true in all other cases
-        return true;
-
-    }
-
-    return true;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/widgetdragfilter.h Deleted

@@ -1,50 +0,0 @@
-/* === 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
- *   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 WIDGET_DRAG_FILTER_H
-#define WIDGET_DRAG_FILTER_H
-
-#include <QObject>
-#include <QPoint>
-#include <QWidget>
-
-#include "dllmacro.h"
-
-class QMouseEvent;
-class QEvent;
-
-/**
- * This class encapsulates an event filter on a widget that lets any drag events over the widget
- *  translate into move events for the whole application.
- */
-class DLLEXPORT WidgetDragFilter : public QObject
-{
-    Q_OBJECT
-public:
-    explicit WidgetDragFilter(QObject* parent = 0);  
-
-    virtual bool eventFilter(QObject* , QEvent* );
-private:
-    bool canDrag( QObject* obj, QMouseEvent* ev ) const;
-    
-    QWeakPointer<QWidget> m_target; // in case it's deleted under us
-    QPoint m_dragPoint;
-    bool m_dragStarted;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/xspfgenerator.cpp Deleted

@@ -1,76 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-    This program 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 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-
-#include "xspfgenerator.h"
-
-#include <QXmlStreamWriter>
-#include <QDateTime>
-#include <QTimer>
-
-#include "playlist.h"
-#include "query.h"
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-XSPFGenerator::XSPFGenerator( const playlist_ptr& pl, QObject* parent )
-    : QObject( parent )
-    , m_playlist( pl )
-{
-     QTimer::singleShot( 0, this, SLOT( generate() ) );
-}
-
-
-XSPFGenerator::~XSPFGenerator()
-{
-}
-
-
-void
-XSPFGenerator::generate()
-{
-    Q_ASSERT( !m_playlist.isNull() );
-
-    QByteArray xspf;
-    QXmlStreamWriter w( &xspf );
-    w.setAutoFormatting( true );
-    w.writeStartDocument();
-
-    w.writeStartElement( "playlist" );
-    w.writeAttribute( "version", "1" );
-    w.writeAttribute( "xmlns", "http://xspf.org/ns/0/" );
-
-    w.writeTextElement( "title", m_playlist->title() );
-    w.writeTextElement( "creator", m_playlist->creator() );
-    w.writeTextElement( "date", QDateTime::fromTime_t( m_playlist->createdOn() ).toString( Qt::ISODate ) );
-
-    w.writeStartElement( "trackList" );
-    foreach ( const plentry_ptr& q, m_playlist->entries() )
-    {
-        w.writeStartElement( "track" );
-        w.writeTextElement( "title", q->query()->track() );
-        w.writeTextElement( "creator", q->query()->artist() );
-        w.writeTextElement( "album", q->query()->album() );
-        w.writeEndElement();
-    }
-    w.writeEndDocument(); // will close all open elements
-
-    emit generated( xspf );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/xspfgenerator.h Deleted

@@ -1,45 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
-
-    This program 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 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-
-#ifndef XSPFGENERATOR_H
-#define XSPFGENERATOR_H
-
-#include "typedefs.h"
-
-#include <QtCore/qobject.h>
-
-
-class XSPFGenerator : public QObject
-{
-    Q_OBJECT
-public:
-    explicit XSPFGenerator( const Tomahawk::playlist_ptr& pl, QObject* parent = 0 );
-    virtual ~XSPFGenerator();
-
-signals:
-    void generated( const QByteArray& xspf );
-
-private slots:
-    void generate();
-
-private:
-    Tomahawk::playlist_ptr m_playlist;
-};
-
-#endif // XSPFGENERATOR_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/xspfloader.cpp Deleted

@@ -1,283 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2011-2012, 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 "xspfloader.h"
-
-#include "headlesscheck.h"
-
-#include <QDomDocument>
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#ifndef ENABLE_HEADLESS
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
-#endif
-
-#include "sourcelist.h"
-#include "playlist.h"
-#include <XspfUpdater.h>
-#include <pipeline.h>
-
-using namespace Tomahawk;
-
-QString
-XSPFLoader::errorToString( XSPFErrorCode error )
-{
-    switch ( error )
-    {
-    case ParseError:
-        return tr( "Failed to parse contents of XSPF playlist" );
-    case InvalidTrackError:
-        return tr( "Some playlist entries were found without artist and track name, they will be omitted");
-    case FetchError:
-        return tr( "Failed to fetch the desired playlist from the network, or the desired file does not exist" );
-    default:
-        return QString();
-    }
-}
-
-XSPFLoader::XSPFLoader( bool autoCreate, bool autoUpdate, QObject *parent )
-    : QObject( parent )
-    , m_autoCreate( autoCreate )
-    , m_autoUpdate( autoUpdate )
-    , m_autoResolve( true )
-    , m_autoDelete( true )
-    , m_NS("http://xspf.org/ns/0/")
-{
-    qRegisterMetaType< XSPFErrorCode >("XSPFErrorCode");
-}
-
-
-XSPFLoader::~XSPFLoader()
-{}
-
-
-void
-XSPFLoader::setOverrideTitle( const QString& newTitle )
-{
-    m_overrideTitle = newTitle;
-}
-
-
-QList< Tomahawk::query_ptr >
-XSPFLoader::entries() const
-{
-    return m_entries;
-}
-
-
-void
-XSPFLoader::load( const QUrl& url )
-{
-    QNetworkRequest request( url );
-    m_url = url;
-
-    Q_ASSERT( TomahawkUtils::nam() != 0 );
-    QNetworkReply* reply = TomahawkUtils::nam()->get( request );
-
-    connect( reply, SIGNAL( finished() ),
-                      SLOT( networkLoadFinished() ) );
-
-    connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ),
-                      SLOT( networkError( QNetworkReply::NetworkError ) ) );
-}
-
-
-void
-XSPFLoader::load( QFile& file )
-{
-    if ( file.open( QFile::ReadOnly ) )
-    {
-        m_body = file.readAll();
-        gotBody();
-    }
-    else
-    {
-        reportError();
-    }
-}
-
-
-void
-XSPFLoader::reportError()
-{
-    emit error( FetchError );
-#ifndef ENABLE_HEADLESS
-    const QString errorMsg = errorToString( FetchError);
-    if ( !m_errorTitle.isEmpty() )
-        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( QString( "%1: %2" ).arg( m_errorTitle ).arg( errorMsg ) ) );
-    else
-        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( errorMsg ) );
-#endif
-    deleteLater();
-}
-
-
-void
-XSPFLoader::networkLoadFinished()
-{
-    QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-    if ( reply->error() != QNetworkReply::NoError )
-        return;
-
-    m_body = reply->readAll();
-    gotBody();
-}
-
-
-void
-XSPFLoader::networkError( QNetworkReply::NetworkError /* error */ )
-{
-    reportError();
-}
-
-
-void
-XSPFLoader::gotBody()
-{
-    QDomDocument xmldoc;
-    bool namespaceProcessing = true;
-    xmldoc.setContent( m_body, namespaceProcessing );
-    QDomElement docElement( xmldoc.documentElement() );
-
-    QString origTitle;
-    QDomNodeList tracklist;
-    QDomElement n = docElement.firstChildElement();
-    for ( ; !n.isNull(); n = n.nextSiblingElement() )
-    {
-        if ( n.namespaceURI() == m_NS && n.localName() == "title" )
-        {
-            origTitle = n.text();
-        }
-        else if ( n.namespaceURI() == m_NS && n.localName() == "creator" )
-        {
-            m_creator = n.text();
-        }
-        else if ( n.namespaceURI() == m_NS && n.localName() == "info" )
-        {
-            m_info = n.text();
-        }
-        else if ( n.namespaceURI() == m_NS && n.localName() == "trackList" )
-        {
-            tracklist = n.childNodes();
-        }
-    }
-
-    m_title = origTitle;
-    if ( m_title.isEmpty() )
-        m_title = tr( "New Playlist" );
-    if ( !m_overrideTitle.isEmpty() )
-        m_title = m_overrideTitle;
-
-    bool shownError = false;
-    for ( unsigned int i = 0; i < tracklist.length(); i++ )
-    {
-        QDomNode e = tracklist.at( i );
-
-        QString artist, album, track, duration, annotation, url;
-        QDomElement n = e.firstChildElement();
-        for ( ; !n.isNull(); n = n.nextSiblingElement() )
-        {
-            if ( n.namespaceURI() == m_NS && n.localName() == "duration" )
-            {
-                duration = n.text();
-            }
-            else if ( n.namespaceURI() == m_NS && n.localName() == "annotation" )
-            {
-                annotation = n.text();
-            }
-            else if ( n.namespaceURI() == m_NS && n.localName() == "creator" )
-            {
-                artist = n.text();
-            }
-            else if ( n.namespaceURI() == m_NS && n.localName() == "album" )
-            {
-                album = n.text();
-            }
-            else if ( n.namespaceURI() == m_NS && n.localName() == "title" )
-            {
-                track = n.text();
-            }
-            else if ( n.namespaceURI() == m_NS && n.localName() == "url" )
-            {
-                url = n.text();
-            }
-        }
-
-        if ( artist.isEmpty() || track.isEmpty() )
-        {
-            if ( !shownError )
-            {
-                emit error( InvalidTrackError );
-                shownError = true;
-            }
-            continue;
-        }
-
-        query_ptr q = Tomahawk::Query::get( artist, track, album, uuid(), false );
-        q->setDuration( duration.toInt() / 1000 );
-        if ( !url.isEmpty() )
-            q->setResultHint( url );
-
-        m_entries << q;
-    }
-
-    if ( m_autoResolve )
-    {
-        for ( int i = m_entries.size() - 1; i >= 0; i-- )
-            Pipeline::instance()->resolve( m_entries i  );
-    }
-
-    if ( origTitle.isEmpty() && m_entries.isEmpty() )
-    {
-        emit error( ParseError );
-        if ( m_autoCreate )
-            deleteLater();
-        return;
-    }
-
-    if ( m_autoCreate )
-    {
-        m_playlist = Playlist::create( SourceList::instance()->getLocal(),
-                                       uuid(),
-                                       m_title,
-                                       m_info,
-                                       m_creator,
-                                       false,
-                                       m_entries );
-
-        // 10 minute default---for now, no way to change it
-        connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
-        new Tomahawk::XspfUpdater( m_playlist, 600000, m_autoUpdate, m_url.toString() );
-        emit ok( m_playlist );
-    }
-    else
-    {
-
-        if( !m_entries.isEmpty() )
-            emit tracks( m_entries );
-    }
-
-    if ( m_autoDelete )
-        deleteLater();
-
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/utils/xspfloader.h Deleted

@@ -1,84 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2011-2012, 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/>.
- */
-
-/*
-    Fetches and parses an XSPF document from a QFile or QUrl.
- */
-
-#ifndef XSPFLOADER_H
-#define XSPFLOADER_H
-
-#include <QObject>
-#include <QUrl>
-#include <QFile>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-
-#include "playlist.h"
-#include "typedefs.h"
-
-#include "dllmacro.h"
-
-class DLLEXPORT XSPFLoader : public QObject
-{
-Q_OBJECT
-
-public:
-    enum XSPFErrorCode { ParseError, InvalidTrackError, FetchError };
-    explicit XSPFLoader( bool autoCreate = true, bool autoUpdate = false, QObject* parent = 0 );
-
-    virtual ~XSPFLoader();
-    QList< Tomahawk::query_ptr > entries() const;
-
-    void setOverrideTitle( const QString& newTitle );
-    void setAutoResolveTracks( bool autoResolve ) { m_autoResolve = autoResolve; }
-    void setAutoDelete( bool autoDelete ) { m_autoDelete = autoDelete; }
-    void setErrorTitle( const QString& error ) { m_errorTitle = error; }
-
-    static QString errorToString( XSPFErrorCode error );
-
-signals:
-    void error( XSPFLoader::XSPFErrorCode error );
-    void ok( const Tomahawk::playlist_ptr& );
-    void track( const Tomahawk::query_ptr& track );
-    void tracks( const QList< Tomahawk::query_ptr > tracks );
-
-public slots:
-    void load( const QUrl& url );
-    void load( QFile& file );
-
-private slots:
-    void networkLoadFinished();
-    void networkError( QNetworkReply::NetworkError e );
-
-private:
-    void reportError();
-    void gotBody();
-
-    bool m_autoCreate, m_autoUpdate, m_autoResolve, m_autoDelete;
-    QString m_NS,m_overrideTitle;
-    QList< Tomahawk::query_ptr > m_entries;
-    QString m_title, m_info, m_creator, m_errorTitle;
-
-    QUrl m_url;
-    QByteArray m_body;
-    Tomahawk::playlist_ptr m_playlist;
-};
-
-#endif // XSPFLOADER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/viewmanager.cpp Deleted

@@ -1,972 +0,0 @@
-/* === 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
- *   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 "viewmanager.h"
-
-#include <QVBoxLayout>
-#include <QMetaMethod>
-
-#include "audio/audioengine.h"
-#include "context/ContextWidget.h"
-#include "infobar/infobar.h"
-#include "topbar/topbar.h"
-
-#include "treemodel.h"
-#include "collectionflatmodel.h"
-#include "collectionview.h"
-#include "playlistmodel.h"
-#include "playlistview.h"
-#include "trackproxymodel.h"
-#include "trackmodel.h"
-#include "artistview.h"
-#include "albumview.h"
-#include "albumproxymodel.h"
-#include "albummodel.h"
-#include "sourcelist.h"
-#include "tomahawksettings.h"
-
-#include "customplaylistview.h"
-#include "dynamic/widgets/DynamicWidget.h"
-
-#include "widgets/welcomewidget.h"
-#include "widgets/whatshotwidget.h"
-#include "widgets/infowidgets/sourceinfowidget.h"
-#include "widgets/infowidgets/ArtistInfoWidget.h"
-#include "widgets/infowidgets/AlbumInfoWidget.h"
-#include "widgets/newplaylistwidget.h"
-#include "widgets/animatedsplitter.h"
-
-#include "utils/logger.h"
-
-#define FILTER_TIMEOUT 280
-
-using namespace Tomahawk;
-
-ViewManager* ViewManager::s_instance = 0;
-
-
-ViewManager*
-ViewManager::instance()
-{
-    return s_instance;
-}
-
-
-ViewManager::ViewManager( QObject* parent )
-    : QObject( parent )
-    , m_widget( new QWidget() )
-    , m_welcomeWidget( new WelcomeWidget() )
-    , m_whatsHotWidget( new WhatsHotWidget() )
-    , m_topLovedWidget( 0 )
-    , m_currentMode( PlaylistInterface::Tree )
-    , m_loaded( false )
-{
-    s_instance = this;
-
-    m_widget->setLayout( new QVBoxLayout() );
-    m_infobar = new InfoBar();
-    m_stack = new QStackedWidget();
-
-    m_contextWidget = new ContextWidget();
-
-    m_widget->layout()->addWidget( m_infobar );
-    m_widget->layout()->addWidget( m_stack );
-    m_widget->layout()->addWidget( m_contextWidget );
-
-    m_superCollectionView = new ArtistView();
-    m_superCollectionModel = new TreeModel( m_superCollectionView );
-    m_superCollectionView->setTreeModel( m_superCollectionModel );
-    m_superCollectionView->setFrameShape( QFrame::NoFrame );
-    m_superCollectionView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    m_superCollectionView->setShowModes( false );
-//    m_superCollectionView->proxyModel()->setShowOfflineResults( false );
-
-    m_superAlbumView = new AlbumView();
-    m_superAlbumModel = new AlbumModel( m_superAlbumView );
-    m_superAlbumView->setAlbumModel( m_superAlbumModel );
-    m_superAlbumView->setFrameShape( QFrame::NoFrame );
-    m_superAlbumView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-    m_stack->setContentsMargins( 0, 0, 0, 0 );
-    m_widget->setContentsMargins( 0, 0, 0, 0 );
-    m_widget->layout()->setContentsMargins( 0, 0, 0, 0 );
-    m_widget->layout()->setMargin( 0 );
-    m_widget->layout()->setSpacing( 0 );
-
-    connect( AudioEngine::instance(), SIGNAL( playlistChanged( Tomahawk::playlistinterface_ptr ) ), this, SLOT( playlistInterfaceChanged( Tomahawk::playlistinterface_ptr ) ) );
-
-    connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) );
-    connect( m_infobar, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) );
-    connect( m_infobar, SIGNAL( autoUpdateChanged( bool ) ), SLOT( autoUpdateChanged( bool ) ) );
-
-    connect( this, SIGNAL( tomahawkLoaded() ), m_whatsHotWidget, SLOT( fetchData() ) );
-    connect( this, SIGNAL( tomahawkLoaded() ), m_welcomeWidget, SLOT( loadData() ) );
-
-/*    connect( m_infobar, SIGNAL( flatMode() ), SLOT( setTableMode() ) );
-    connect( m_infobar, SIGNAL( artistMode() ), SLOT( setTreeMode() ) );
-    connect( m_infobar, SIGNAL( albumMode() ), SLOT( setAlbumMode() ) );*/
-}
-
-
-ViewManager::~ViewManager()
-{
-    saveCurrentPlaylistSettings();
-    delete m_whatsHotWidget;
-    delete m_welcomeWidget;
-    delete m_topLovedWidget;
-    delete m_contextWidget;
-    delete m_widget;
-}
-
-
-PlaylistView*
-ViewManager::createPageForPlaylist( const playlist_ptr& pl )
-{
-    PlaylistView* view = new PlaylistView();
-    PlaylistModel* model = new PlaylistModel();
-    view->setPlaylistModel( model );
-    model->loadPlaylist( pl );
-    view->setFrameShape( QFrame::NoFrame );
-    view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    pl->resolve();
-
-    m_playlistViews.insert( pl, view );
-    return view;
-}
-
-
-playlist_ptr
-ViewManager::playlistForPage( ViewPage* page ) const
-{
-    playlist_ptr p;
-    if ( dynamic_cast< PlaylistView* >( page ) && dynamic_cast< PlaylistView* >( page )->playlistModel() &&
-        !dynamic_cast< PlaylistView* >( page )->playlistModel()->playlist().isNull() )
-    {
-        p = dynamic_cast< PlaylistView* >( page )->playlistModel()->playlist();
-    }
-    else if ( dynamic_cast< DynamicWidget* >( page ) )
-        p = dynamic_cast< DynamicWidget* >( page )->playlist();
-
-    return p;
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::show( const Tomahawk::playlist_ptr& playlist )
-{
-    PlaylistView* view;
-
-    if ( !m_playlistViews.contains( playlist ) || m_playlistViews.value( playlist ).isNull() )
-    {
-        view = createPageForPlaylist( playlist );
-    }
-    else
-    {
-        view = m_playlistViews.value( playlist ).data();
-    }
-
-    setPage( view );
-
-    emit numSourcesChanged( SourceList::instance()->count() );
-
-    return view;
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::show( const Tomahawk::dynplaylist_ptr& playlist )
-{
-    if ( !m_dynamicWidgets.contains( playlist ) || m_dynamicWidgets.value( playlist ).isNull() )
-    {
-       m_dynamicWidgets playlist  = new Tomahawk::DynamicWidget( playlist, m_stack );
-
-       playlist->resolve();
-    }
-
-    setPage( m_dynamicWidgets.value( playlist ).data() );
-
-/*    if ( playlist->mode() == Tomahawk::OnDemand )
-        hideQueue();
-    else
-        showQueue();*/
-
-    emit numSourcesChanged( SourceList::instance()->count() );
-
-    return m_dynamicWidgets.value( playlist ).data();
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::show( const Tomahawk::artist_ptr& artist )
-{
-    ArtistInfoWidget* swidget;
-    if ( !m_artistViews.contains( artist ) || m_artistViews.value( artist ).isNull() )
-    {
-        swidget = new ArtistInfoWidget( artist );
-        m_artistViews.insert( artist, swidget );
-    }
-    else
-    {
-        swidget = m_artistViews.value( artist ).data();
-    }
-
-    setPage( swidget );
-    return swidget;
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::show( const Tomahawk::album_ptr& album, Tomahawk::ModelMode initialMode )
-{
-    AlbumInfoWidget* swidget;
-    if ( !m_albumViews.contains( album ) || m_albumViews.value( album ).isNull() )
-    {
-        swidget = new AlbumInfoWidget( album, initialMode );
-        m_albumViews.insert( album, swidget );
-    }
-    else
-    {
-        swidget = m_albumViews.value( album ).data();
-    }
-
-    setPage( swidget );
-    return swidget;
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::show( const Tomahawk::collection_ptr& collection )
-{
-    qDebug() << Q_FUNC_INFO << m_currentMode;
-    m_currentCollection = collection;
-    ViewPage* shown = 0;
-    if ( m_currentMode == PlaylistInterface::Flat )
-    {
-        CollectionView* view;
-        if ( !m_collectionViews.contains( collection ) || m_collectionViews.value( collection ).isNull() )
-        {
-            view = new CollectionView();
-            CollectionFlatModel* model = new CollectionFlatModel();
-            view->setTrackModel( model );
-            view->setFrameShape( QFrame::NoFrame );
-            view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-            model->addCollection( collection );
-
-            m_collectionViews.insert( collection, view );
-        }
-        else
-        {
-            view = m_collectionViews.value( collection ).data();
-        }
-
-        shown = view;
-        setPage( view );
-    }
-
-    if ( m_currentMode == PlaylistInterface::Tree )
-    {
-        ArtistView* view;
-        if ( !m_treeViews.contains( collection ) || m_treeViews.value( collection ).isNull() )
-        {
-            view = new ArtistView();
-            TreeModel* model = new TreeModel();
-            view->setTreeModel( model );
-            view->setFrameShape( QFrame::NoFrame );
-            view->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-            model->addCollection( collection );
-
-            m_treeViews.insert( collection, view );
-        }
-        else
-        {
-            view = m_treeViews.value( collection ).data();
-        }
-
-        shown = view;
-        setPage( view );
-    }
-
-    if ( m_currentMode == PlaylistInterface::Album )
-    {
-        AlbumView* aview;
-        if ( !m_collectionAlbumViews.contains( collection ) || m_collectionAlbumViews.value( collection ).isNull() )
-        {
-            aview = new AlbumView();
-            AlbumModel* amodel = new AlbumModel( aview );
-            aview->setAlbumModel( amodel );
-            aview->setFrameShape( QFrame::NoFrame );
-            aview->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-            amodel->addCollection( collection );
-
-            m_collectionAlbumViews.insert( collection, aview );
-        }
-        else
-        {
-            aview = m_collectionAlbumViews.value( collection ).data();
-        }
-
-        shown = aview;
-        setPage( aview );
-    }
-
-    emit numSourcesChanged( 1 );
-
-    return shown;
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::show( const Tomahawk::source_ptr& source )
-{
-    SourceInfoWidget* swidget;
-    if ( !m_sourceViews.contains( source ) || m_sourceViews.value( source ).isNull() )
-    {
-        swidget = new SourceInfoWidget( source );
-        m_sourceViews.insert( source, swidget );
-    }
-    else
-    {
-        swidget = m_sourceViews.value( source ).data();
-    }
-
-    setPage( swidget );
-    return swidget;
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::show( ViewPage* page )
-{
-    setPage( page );
-
-    return page;
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::showSuperCollection()
-{
-    if ( m_superCollections.isEmpty() )
-        m_superCollectionModel->addAllCollections();
-
-    foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() )
-    {
-        if ( !m_superCollections.contains( source->collection() ) )
-        {
-            m_superCollections.append( source->collection() );
-//            m_superAlbumModel->addCollection( source->collection() );
-        }
-    }
-
-    m_superCollectionModel->setTitle( tr( "SuperCollection" ) );
-    m_superCollectionModel->setDescription( tr( "Combined libraries of all your online friends" ) );
-    m_superAlbumModel->setTitle( tr( "All available albums" ) );
-
-    ViewPage* shown = 0;
-    if ( m_currentMode == PlaylistInterface::Tree )
-    {
-        shown = m_superCollectionView;
-        setPage( m_superCollectionView );
-    }
-    else if ( m_currentMode == PlaylistInterface::Flat )
-    {
-        shown = m_superCollectionView;
-        setPage( m_superCollectionView );
-    }
-    else if ( m_currentMode == PlaylistInterface::Album )
-    {
-        shown = m_superAlbumView;
-        setPage( m_superAlbumView );
-    }
-
-    emit numSourcesChanged( m_superCollections.count() );
-
-    return shown;
-}
-
-
-void
-ViewManager::playlistInterfaceChanged( Tomahawk::playlistinterface_ptr interface )
-{
-    playlist_ptr pl = playlistForInterface( interface );
-    if ( !pl.isNull() )
-    {
-        TomahawkSettings::instance()->appendRecentlyPlayedPlaylist( pl );
-    }
-    else
-    {
-        pl = dynamicPlaylistForInterface( interface );
-        if ( !pl.isNull() )
-            TomahawkSettings::instance()->appendRecentlyPlayedPlaylist( pl );
-    }
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::showWelcomePage()
-{
-    return show( m_welcomeWidget );
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::showWhatsHotPage()
-{
-    return show( m_whatsHotWidget );
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::showTopLovedPage()
-{
-    if ( !m_topLovedWidget )
-        m_topLovedWidget = new CustomPlaylistView( CustomPlaylistView::TopLovedTracks, source_ptr(), m_widget );
-
-    return show( m_topLovedWidget );
-}
-
-
-void
-ViewManager::setTableMode()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    m_currentMode = PlaylistInterface::Flat;
-
-    if ( isSuperCollectionVisible() )
-        showSuperCollection();
-    else
-        show( m_currentCollection );
-}
-
-
-void
-ViewManager::setTreeMode()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    m_currentMode = PlaylistInterface::Tree;
-
-    if ( isSuperCollectionVisible() )
-        showSuperCollection();
-    else
-        show( m_currentCollection );
-}
-
-
-void
-ViewManager::setAlbumMode()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    m_currentMode = PlaylistInterface::Album;
-
-    if ( isSuperCollectionVisible() )
-        showSuperCollection();
-    else
-        show( m_currentCollection );
-}
-
-
-void
-ViewManager::historyBack()
-{
-    ViewPage* oldPage = m_pageHistory.takeFirst();
-
-    ViewPage* newPage = m_pageHistory.first();
-    qDebug() << "Showing page after moving backwards in history:" << newPage->widget()->metaObject()->className();
-    setPage( newPage, false );
-
-    delete oldPage;
-}
-
-
-void
-ViewManager::removeFromHistory ( ViewPage* p )
-{
-    if ( currentPage() == p )
-    {
-        historyBack();
-    }
-    else
-    {
-        m_pageHistory.removeAll( p );
-        delete p;
-    }
-
-}
-
-
-void
-ViewManager::setFilter( const QString& filter )
-{
-    m_filter = filter;
-
-    m_filterTimer.stop();
-    m_filterTimer.setInterval( FILTER_TIMEOUT );
-    m_filterTimer.setSingleShot( true );
-    m_filterTimer.start();
-}
-
-
-void
-ViewManager::applyFilter()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( currentPlaylistInterface() && currentPlaylistInterface()->filter() != m_filter )
-        currentPlaylistInterface()->setFilter( m_filter );
-}
-
-
-void
-ViewManager::autoUpdateChanged( bool toggled )
-{
-    currentPage()->setAutoUpdate( toggled );
-}
-
-
-void
-ViewManager::setPage( ViewPage* page, bool trackHistory )
-{
-    if ( !page )
-        return;
-
-    // save the old playlist shuffle state in config before we change playlists
-    saveCurrentPlaylistSettings();
-    unlinkPlaylist();
-
-    if ( !m_pageHistory.contains( page ) )
-    {
-        m_stack->addWidget( page->widget() );
-    }
-    else
-    {
-        if ( trackHistory )
-            m_pageHistory.removeAll( page );
-    }
-
-    if ( trackHistory )
-    {
-        m_pageHistory.insert( 0, page );
-    }
-
-    qDebug() << "View page shown:" << page->title();
-    emit viewPageActivated( page );
-
-    if ( page->isTemporaryPage() )
-        emit tempPageActivated( page );
-
-    if ( AudioEngine::instance()->state() == AudioEngine::Stopped )
-        AudioEngine::instance()->setPlaylist( page->playlistInterface() );
-
-    // UGH!
-    if ( QObject* obj = dynamic_cast< QObject* >( currentPage() ) )
-    {
-        // if the signal exists (just to hide the qobject runtime warning...)
-        if( obj->metaObject()->indexOfSignal( "descriptionChanged(QString)" ) > -1 )
-            connect( obj, SIGNAL( descriptionChanged( QString ) ), m_infobar, SLOT( setDescription( QString ) ), Qt::UniqueConnection );
-
-        if( obj->metaObject()->indexOfSignal( "descriptionChanged(Tomahawk::artist_ptr)" ) > -1 )
-            connect( obj, SIGNAL( descriptionChanged( Tomahawk::artist_ptr ) ), m_infobar, SLOT( setDescription( Tomahawk::artist_ptr ) ), Qt::UniqueConnection );
-
-        if( obj->metaObject()->indexOfSignal( "descriptionChanged(Tomahawk::album_ptr)" ) > -1 )
-            connect( obj, SIGNAL( descriptionChanged( Tomahawk::album_ptr ) ), m_infobar, SLOT( setDescription( Tomahawk::album_ptr ) ), Qt::UniqueConnection );
-
-        if( obj->metaObject()->indexOfSignal( "longDescriptionChanged(QString)" ) > -1 )
-            connect( obj, SIGNAL( longDescriptionChanged( QString ) ), m_infobar, SLOT( setLongDescription( QString ) ), Qt::UniqueConnection );
-
-        if( obj->metaObject()->indexOfSignal( "nameChanged(QString)" ) > -1 )
-            connect( obj, SIGNAL( nameChanged( QString ) ), m_infobar, SLOT( setCaption( QString ) ), Qt::UniqueConnection );
-
-        if( obj->metaObject()->indexOfSignal( "pixmapChanged(QPixmap)" ) > -1 )
-            connect( obj, SIGNAL( pixmapChanged( QPixmap ) ), m_infobar, SLOT( setPixmap( QPixmap ) ), Qt::UniqueConnection );
-
-        if( obj->metaObject()->indexOfSignal( "destroyed(QWidget*)" ) > -1 )
-            connect( obj, SIGNAL( destroyed( QWidget* ) ), SLOT( onWidgetDestroyed( QWidget* ) ), Qt::UniqueConnection );
-    }
-
-    m_stack->setCurrentWidget( page->widget() );
-
-    updateView();
-}
-
-
-bool
-ViewManager::isNewPlaylistPageVisible() const
-{
-    return dynamic_cast< NewPlaylistWidget* >( currentPage() ) != 0;
-}
-
-
-void
-ViewManager::unlinkPlaylist()
-{
-    if ( currentPlaylistInterface() )
-    {
-        disconnect( currentPlaylistInterface().data(), SIGNAL( sourceTrackCountChanged( unsigned int ) ),
-                    this,                                 SIGNAL( numTracksChanged( unsigned int ) ) );
-
-        disconnect( currentPlaylistInterface().data(), SIGNAL( trackCountChanged( unsigned int ) ),
-                    this,                                 SIGNAL( numShownChanged( unsigned int ) ) );
-
-        disconnect( currentPlaylistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
-                    this,                                 SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
-
-        disconnect( currentPlaylistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ),
-                    this,                                 SIGNAL( shuffleModeChanged( bool ) ) );
-    }
-}
-
-
-void
-ViewManager::saveCurrentPlaylistSettings()
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    Tomahawk::playlist_ptr pl = playlistForInterface( currentPlaylistInterface() );
-
-    if ( !pl.isNull() ) {
-        s->setShuffleState(  pl->guid(), currentPlaylistInterface()->shuffled() );
-        s->setRepeatMode( pl->guid(), currentPlaylistInterface()->repeatMode() );
-    } else {
-        Tomahawk::dynplaylist_ptr dynPl = dynamicPlaylistForInterface( currentPlaylistInterface() );
-        if ( !dynPl.isNull() ) {
-            s->setShuffleState( dynPl->guid(), currentPlaylistInterface()->shuffled() );
-            s->setRepeatMode( dynPl->guid(), currentPlaylistInterface()->repeatMode() );
-        }
-    }
-}
-
-
-void
-ViewManager::updateView()
-{
-    if ( currentPlaylistInterface() )
-    {
-        connect( currentPlaylistInterface().data(), SIGNAL( sourceTrackCountChanged( unsigned int ) ),
-                                                    SIGNAL( numTracksChanged( unsigned int ) ) );
-
-        connect( currentPlaylistInterface().data(), SIGNAL( trackCountChanged( unsigned int ) ),
-                                                    SIGNAL( numShownChanged( unsigned int ) ) );
-
-        connect( currentPlaylistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
-                                                    SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
-
-        connect( currentPlaylistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ),
-                                                    SIGNAL( shuffleModeChanged( bool ) ) );
-
-        m_infobar->setFilter( currentPlaylistInterface()->filter() );
-    }
-
-    if ( currentPage()->showStatsBar() && currentPlaylistInterface() )
-    {
-        emit numTracksChanged( currentPlaylistInterface()->unfilteredTrackCount() );
-
-        if ( !currentPlaylistInterface()->filter().isEmpty() )
-            emit numShownChanged( currentPlaylistInterface()->trackCount() );
-        else
-            emit numShownChanged( currentPlaylistInterface()->unfilteredTrackCount() );
-
-        emit repeatModeChanged( currentPlaylistInterface()->repeatMode() );
-        emit shuffleModeChanged( currentPlaylistInterface()->shuffled() );
-        emit modeChanged( currentPlaylistInterface()->viewMode() );
-    }
-
-/*    if ( currentPage()->queueVisible() )
-        showQueue();
-    else
-        hideQueue();*/
-
-    emit statsAvailable( currentPage()->showStatsBar() );
-    emit modesAvailable( currentPage()->showModes() );
-    emit filterAvailable( currentPage()->showFilter() );
-
-    emit autoUpdateAvailable( currentPage()->canAutoUpdate() );
-
-/*    if ( !currentPage()->showStatsBar() && !currentPage()->showModes() && !currentPage()->showFilter() )
-        m_topbar->setVisible( false );
-    else
-        m_topbar->setVisible( true );*/
-
-    m_infobar->setVisible( currentPage()->showInfoBar() );
-    m_infobar->setCaption( currentPage()->title() );
-    switch( currentPage()->descriptionType() )
-    {
-        case ViewPage::TextType:
-            m_infobar->setDescription( currentPage()->description() );
-            break;
-        case ViewPage::ArtistType:
-            m_infobar->setDescription( currentPage()->descriptionArtist() );
-            break;
-        case ViewPage::AlbumType:
-            m_infobar->setDescription( currentPage()->descriptionAlbum() );
-            break;
-
-    }
-    m_infobar->setLongDescription( currentPage()->longDescription() );
-    m_infobar->setPixmap( currentPage()->pixmap() );
-
-    // turn on shuffle/repeat mode for the new playlist view if specified in config
-    loadCurrentPlaylistSettings();
-}
-
-
-void
-ViewManager::loadCurrentPlaylistSettings()
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    Tomahawk::playlist_ptr pl = playlistForInterface( currentPlaylistInterface() );
-
-    if ( !pl.isNull() )
-    {
-        currentPlaylistInterface()->setShuffled( s->shuffleState( pl->guid() ));
-        currentPlaylistInterface()->setRepeatMode( s->repeatMode( pl->guid() ));
-    }
-    else
-    {
-        Tomahawk::dynplaylist_ptr dynPl = dynamicPlaylistForInterface( currentPlaylistInterface() );
-        if ( !dynPl.isNull() )
-        {
-            currentPlaylistInterface()->setShuffled( s->shuffleState( dynPl->guid() ));
-        }
-    }
-}
-
-
-void
-ViewManager::onWidgetDestroyed( QWidget* widget )
-{
-    qDebug() << "Destroyed child:" << widget << widget->metaObject()->className();
-
-    bool resetWidget = ( m_stack->currentWidget() == widget );
-
-    for ( int i = 0; i < m_pageHistory.count(); i++ )
-    {
-        ViewPage* page = m_pageHistory.at( i );
-        if ( page->widget() != widget )
-            continue;
-
-        if ( !playlistForInterface( page->playlistInterface() ).isNull() )
-        {
-            m_playlistViews.remove( playlistForInterface( page->playlistInterface() ) );
-        }
-        if ( !dynamicPlaylistForInterface( page->playlistInterface() ).isNull() )
-        {
-            m_dynamicWidgets.remove( dynamicPlaylistForInterface( page->playlistInterface() ) );
-        }
-
-        if ( page->widget() == widget && !resetWidget )
-        {
-            m_pageHistory.removeAt( i );
-        }
-    }
-
-    m_stack->removeWidget( widget );
-
-    if ( resetWidget )
-    {
-        historyBack();
-    }
-}
-
-
-void
-ViewManager::setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode mode )
-{
-    if ( currentPlaylistInterface() )
-        currentPlaylistInterface()->setRepeatMode( mode );
-}
-
-
-void
-ViewManager::setShuffled( bool enabled )
-{
-    if ( currentPlaylistInterface() )
-        currentPlaylistInterface()->setShuffled( enabled );
-}
-
-
-void
-ViewManager::createPlaylist( const Tomahawk::source_ptr& src, const QVariant& contents )
-{
-    Tomahawk::playlist_ptr p = Tomahawk::playlist_ptr( new Tomahawk::Playlist( src ) );
-    QJson::QObjectHelper::qvariant2qobject( contents.toMap(), p.data() );
-    p->reportCreated( p );
-}
-
-
-void
-ViewManager::createDynamicPlaylist( const Tomahawk::source_ptr& src, const QVariant& contents )
-{
-    Tomahawk::dynplaylist_ptr p = Tomahawk::dynplaylist_ptr( new Tomahawk::DynamicPlaylist( src, contents.toMap().value( "type", QString() ).toString()  ) );
-    QJson::QObjectHelper::qvariant2qobject( contents.toMap(), p.data() );
-    p->reportCreated( p );
-}
-
-
-void
-ViewManager::setTomahawkLoaded()
-{
-    m_loaded = true;
-    emit tomahawkLoaded();
-}
-
-
-
-ViewPage*
-ViewManager::pageForCollection( const collection_ptr& col ) const
-{
-    return m_collectionViews.value( col ).data();
-}
-
-
-ViewPage*
-ViewManager::pageForDynPlaylist(const dynplaylist_ptr& pl) const
-{
-    return m_dynamicWidgets.value( pl ).data();
-}
-
-
-ViewPage*
-ViewManager::pageForPlaylist(const playlist_ptr& pl) const
-{
-    return m_playlistViews.value( pl ).data();
-}
-
-
-ViewPage*
-ViewManager::pageForInterface( Tomahawk::playlistinterface_ptr interface ) const
-{
-    for ( int i = 0; i < m_pageHistory.count(); i++ )
-    {
-        ViewPage* page = m_pageHistory.at( i );
-        if ( page->playlistInterface() == interface )
-            return page;
-        if ( page->playlistInterface() && page->playlistInterface()->hasChildInterface( interface ) )
-            return page;
-    }
-
-    return 0;
-}
-
-
-Tomahawk::playlistinterface_ptr
-ViewManager::currentPlaylistInterface() const
-{
-    if ( currentPage() )
-        return currentPage()->playlistInterface();
-    else
-        return Tomahawk::playlistinterface_ptr();
-}
-
-
-Tomahawk::ViewPage*
-ViewManager::currentPage() const
-{
-    return m_pageHistory.isEmpty() ? 0 : m_pageHistory.front();
-}
-
-
-Tomahawk::playlist_ptr
-ViewManager::playlistForInterface( Tomahawk::playlistinterface_ptr interface ) const
-{
-    foreach ( QWeakPointer<PlaylistView> view, m_playlistViews.values() )
-    {
-        if ( !view.isNull() && view.data()->playlistInterface() == interface )
-        {
-            return m_playlistViews.key( view );
-        }
-    }
-
-    return Tomahawk::playlist_ptr();
-}
-
-
-Tomahawk::dynplaylist_ptr
-ViewManager::dynamicPlaylistForInterface( Tomahawk::playlistinterface_ptr interface ) const
-{
-    foreach ( QWeakPointer<DynamicWidget> view, m_dynamicWidgets.values() )
-    {
-        if ( !view.isNull() && view.data()->playlistInterface() == interface )
-        {
-            return m_dynamicWidgets.key( view );
-        }
-    }
-
-    return Tomahawk::dynplaylist_ptr();
-}
-
-
-Tomahawk::collection_ptr
-ViewManager::collectionForInterface( Tomahawk::playlistinterface_ptr interface ) const
-{
-    foreach ( QWeakPointer<CollectionView> view, m_collectionViews.values() )
-    {
-        if ( view.data()->playlistInterface() == interface )
-        {
-            return m_collectionViews.key( view );
-        }
-    }
-    foreach ( QWeakPointer<AlbumView> view, m_collectionAlbumViews.values() )
-    {
-        if ( view.data()->playlistInterface() == interface )
-        {
-            return m_collectionAlbumViews.key( view );
-        }
-    }
-
-    return collection_ptr();
-}
-
-
-bool
-ViewManager::isSuperCollectionVisible() const
-{
-    return ( m_pageHistory.count() &&
-           ( currentPage()->playlistInterface() == m_superCollectionView->playlistInterface() ||
-             currentPage()->playlistInterface() == m_superAlbumView->playlistInterface() ) );
-}
-
-
-void
-ViewManager::showCurrentTrack()
-{
-    ViewPage* page = pageForInterface( AudioEngine::instance()->currentTrackPlaylist() );
-
-    if ( page )
-    {
-        setPage( page );
-        page->jumpToCurrentTrack();
-
-        // reset the correct mode, if the user has changed it since
-
-        if ( dynamic_cast< CollectionView* >( page ) )
-            m_currentMode = PlaylistInterface::Flat;
-        else if ( dynamic_cast< AlbumView* >( page ) )
-            m_currentMode = PlaylistInterface::Album;
-        else if ( dynamic_cast< ArtistView* >( page ) )
-            m_currentMode = PlaylistInterface::Tree;
-        else
-            return;
-
-        emit modeChanged( (PlaylistInterface::ViewMode)m_currentMode );
-    }
-}
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/viewmanager.h Deleted

@@ -1,231 +0,0 @@
-/* === 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
- *   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 PLAYLISTMANAGER_H
-#define PLAYLISTMANAGER_H
-
-#include <QObject>
-#include <QHash>
-#include <QStackedWidget>
-
-#include "artist.h"
-#include "collection.h"
-#include "playlistinterface.h"
-#include "playlist/queueview.h"
-#include "viewpage.h"
-#include "widgets/welcomewidget.h"
-#include "widgets/whatshotwidget.h"
-
-#include "dllmacro.h"
-
-class AnimatedSplitter;
-class AlbumModel;
-class AlbumView;
-class AlbumInfoWidget;
-class ArtistInfoWidget;
-class ArtistView;
-class CollectionModel;
-class CollectionFlatModel;
-class CollectionView;
-class ContextWidget;
-class PlaylistModel;
-class PlaylistView;
-class TrackProxyModel;
-class TrackModel;
-class TreeProxyModel;
-class TreeModel;
-class TrackView;
-class SourceInfoWidget;
-class InfoBar;
-class TopBar;
-class WelcomeWidget;
-class WhatsHotWidget;
-class QPushButton;
-
-namespace Tomahawk
-{
-    class DynamicWidget;
-}
-
-class DLLEXPORT ViewManager : public QObject
-{
-Q_OBJECT
-
-public:
-    static ViewManager* instance();
-
-    explicit ViewManager( QObject* parent = 0 );
-    virtual ~ViewManager();
-
-    QWidget* widget() const { return m_widget; }
-    InfoBar* infobar() const { return m_infobar; }
-    ContextWidget* context() const { return m_contextWidget; }
-
-    PlaylistView* queue() const { return m_queue->queue(); }
-    void setQueue( QueueView* queue ) { m_queue = queue; }
-
-    bool isSuperCollectionVisible() const;
-    bool isNewPlaylistPageVisible() const;
-
-    Tomahawk::playlistinterface_ptr currentPlaylistInterface() const;
-    Tomahawk::ViewPage* currentPage() const;
-    Tomahawk::ViewPage* pageForInterface( Tomahawk::playlistinterface_ptr plInterface ) const;
-
-    Tomahawk::ViewPage* show( Tomahawk::ViewPage* page );
-
-    Tomahawk::ViewPage* welcomeWidget() const { return m_welcomeWidget; }
-    Tomahawk::ViewPage* whatsHotWidget() const { return m_whatsHotWidget; }
-    Tomahawk::ViewPage* topLovedWidget() const { return m_topLovedWidget; }
-    ArtistView* superCollectionView() const { return m_superCollectionView; }
-
-    /// Get the view page for the given item. Not pretty...
-    Tomahawk::ViewPage* pageForPlaylist( const Tomahawk::playlist_ptr& pl ) const;
-    Tomahawk::ViewPage* pageForDynPlaylist( const Tomahawk::dynplaylist_ptr& pl ) const;
-    Tomahawk::ViewPage* pageForCollection( const Tomahawk::collection_ptr& pl ) const;
-
-    /// Get a playlist (or dynamic playlist ) from a ViewPage* if the page is PlaylistView or DynamicWidget.
-    /// Lives here but used by SourcesModel
-    Tomahawk::playlist_ptr playlistForPage( Tomahawk::ViewPage* ) const;
-
-    // only use this is you need to create a playlist and show it directly and want it to be
-    // linked to the sidebar. call it right after creating the playlist
-    PlaylistView* createPageForPlaylist( const Tomahawk::playlist_ptr& pl );
-
-    bool isTomahawkLoaded() const { return m_loaded; }
-
-signals:
-    void numSourcesChanged( unsigned int sources );
-    void numTracksChanged( unsigned int tracks );
-    void numArtistsChanged( unsigned int artists );
-    void numShownChanged( unsigned int shown );
-
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void statsAvailable( bool b );
-    void modesAvailable( bool b );
-    void filterAvailable( bool b );
-    void autoUpdateAvailable( bool b );
-    void modeChanged( Tomahawk::PlaylistInterface::ViewMode mode );
-
-    void playClicked();
-    void pauseClicked();
-
-    void tempPageActivated( Tomahawk::ViewPage* );
-    void viewPageActivated( Tomahawk::ViewPage* );
-
-    void showQueueRequested();
-    void hideQueueRequested();
-
-    void tomahawkLoaded();
-
-public slots:
-    Tomahawk::ViewPage* showSuperCollection();
-    Tomahawk::ViewPage* showWelcomePage();
-    Tomahawk::ViewPage* showWhatsHotPage();
-    Tomahawk::ViewPage* showTopLovedPage();
-    void showCurrentTrack();
-
-    // Returns the shown viewpage
-    Tomahawk::ViewPage* show( const Tomahawk::playlist_ptr& playlist );
-    Tomahawk::ViewPage* show( const Tomahawk::dynplaylist_ptr& playlist );
-    Tomahawk::ViewPage* show( const Tomahawk::artist_ptr& artist );
-    Tomahawk::ViewPage* show( const Tomahawk::album_ptr& album, Tomahawk::ModelMode withInitialMode = Tomahawk::InfoSystemMode );
-    Tomahawk::ViewPage* show( const Tomahawk::collection_ptr& collection );
-    Tomahawk::ViewPage* show( const Tomahawk::source_ptr& source );
-
-    void historyBack();
-    void removeFromHistory( Tomahawk::ViewPage* p );
-
-    void showQueue() { emit showQueueRequested(); }
-    void hideQueue() { emit hideQueueRequested(); }
-
-    void setTreeMode();
-    void setTableMode();
-    void setAlbumMode();
-
-    void setRepeatMode( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void setShuffled( bool enabled );
-
-    void playlistInterfaceChanged( Tomahawk::playlistinterface_ptr );
-
-    // called by the playlist creation dbcmds
-    void createPlaylist( const Tomahawk::source_ptr& src, const QVariant& contents );
-    void createDynamicPlaylist( const Tomahawk::source_ptr& src, const QVariant& contents );
-
-    void setTomahawkLoaded();
-
-private slots:
-    void setFilter( const QString& filter );
-    void applyFilter();
-
-    void autoUpdateChanged( bool );
-
-    void onWidgetDestroyed( QWidget* widget );
-
-private:
-    void setPage( Tomahawk::ViewPage* page, bool trackHistory = true );
-    void updateView();
-    void unlinkPlaylist();
-    void saveCurrentPlaylistSettings();
-    void loadCurrentPlaylistSettings();
-
-    Tomahawk::playlist_ptr playlistForInterface( Tomahawk::playlistinterface_ptr plInterface ) const;
-    Tomahawk::dynplaylist_ptr dynamicPlaylistForInterface( Tomahawk::playlistinterface_ptr plInterface ) const;
-    Tomahawk::collection_ptr collectionForInterface( Tomahawk::playlistinterface_ptr plInterface ) const;
-
-    QWidget* m_widget;
-    InfoBar* m_infobar;
-    ContextWidget* m_contextWidget;
-    QStackedWidget* m_stack;
-    AnimatedSplitter* m_splitter;
-
-    AlbumModel* m_superAlbumModel;
-    AlbumView* m_superAlbumView;
-    TreeModel* m_superCollectionModel;
-    ArtistView* m_superCollectionView;
-    QueueView* m_queue;
-    WelcomeWidget* m_welcomeWidget;
-    WhatsHotWidget* m_whatsHotWidget;
-    Tomahawk::ViewPage* m_topLovedWidget;
-
-    QList< Tomahawk::collection_ptr > m_superCollections;
-
-    QHash< Tomahawk::dynplaylist_ptr, QWeakPointer<Tomahawk::DynamicWidget> > m_dynamicWidgets;
-    QHash< Tomahawk::collection_ptr, QWeakPointer<CollectionView> > m_collectionViews;
-    QHash< Tomahawk::collection_ptr, QWeakPointer<ArtistView> > m_treeViews;
-    QHash< Tomahawk::collection_ptr, QWeakPointer<AlbumView> > m_collectionAlbumViews;
-    QHash< Tomahawk::artist_ptr, QWeakPointer<ArtistInfoWidget> > m_artistViews;
-    QHash< Tomahawk::album_ptr, QWeakPointer<AlbumInfoWidget> > m_albumViews;
-    QHash< Tomahawk::playlist_ptr, QWeakPointer<PlaylistView> > m_playlistViews;
-    QHash< Tomahawk::source_ptr, QWeakPointer<SourceInfoWidget> > m_sourceViews;
-
-    QList<Tomahawk::ViewPage*> m_pageHistory;
-
-    Tomahawk::collection_ptr m_currentCollection;
-    int m_currentMode;
-
-    QTimer m_filterTimer;
-    QString m_filter;
-
-    bool m_loaded;
-
-    static ViewManager* s_instance;
-};
-
-#endif // PLAYLISTMANAGER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/viewpage.cpp Deleted

tomahawk-0.4.2.tar.bz2/src/libtomahawk/viewpage.h Deleted

@@ -1,88 +0,0 @@
-/* === 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
- *   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 VIEWPAGE_H
-#define VIEWPAGE_H
-
-#include "typedefs.h"
-#include "playlistinterface.h"
-#include "artist.h"
-#include "album.h"
-#include "utils/tomahawkutils.h"
-
-#include <QtGui/QPixmap>
-
-namespace Tomahawk
-{
-
-class DLLEXPORT ViewPage
-{
-public:
-    enum DescriptionType {
-        TextType = 0,
-        ArtistType = 1,
-        AlbumType = 2
-    };
-
-    ViewPage() {}
-    virtual ~ViewPage() {}
-
-    virtual QWidget* widget() = 0;
-    virtual Tomahawk::playlistinterface_ptr playlistInterface() const = 0;
-
-    virtual QString title() const = 0;
-
-    virtual DescriptionType descriptionType() { return TextType; }
-    virtual QString description() const = 0;
-    virtual Tomahawk::artist_ptr descriptionArtist() const { return Tomahawk::artist_ptr(); }
-    virtual Tomahawk::album_ptr descriptionAlbum() const { return Tomahawk::album_ptr(); }
-
-    virtual QString longDescription() const { return QString(); }
-    virtual QPixmap pixmap() const { return QPixmap( RESPATH "icons/tomahawk-icon-128x128.png" ); }
-
-    virtual bool showStatsBar() const { return true; }
-    virtual bool showInfoBar() const { return true; }
-    virtual bool showModes() const { return false; }
-    virtual bool showFilter() const { return false; }
-    virtual bool queueVisible() const { return true; }
-
-    virtual bool jumpToCurrentTrack() = 0;
-
-    virtual bool isTemporaryPage() const { return false; }
-    virtual bool isBeingPlayed() const { return false; }
-
-    virtual bool canAutoUpdate() const { return false; }
-    virtual void setAutoUpdate( bool ) {}
-    virtual bool autoUpdate() const { return false; }
-
-    /** subclasses implementing ViewPage can emit the following signals:
-     * nameChanged( const QString& )
-     * descriptionChanged( const QString& )
-     * descriptionChanged( const Tomahawk::artist_ptr& artist )
-     * descriptionChanged( const Tomahawk::album_ptr& album )
-     * longDescriptionChanged( const QString& )
-     * pixmapChanged( const QPixmap& )
-     * destroyed( QWidget* widget );
-     *
-     * See DynamicWidget for an example
-     */
-};
-
-}; // ns
-
-#endif //VIEWPAGE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/animatedcounterlabel.h Deleted

@@ -1,129 +0,0 @@
-/* === 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
- *   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 ANIMATEDCOUNTERLABEL_H
-#define ANIMATEDCOUNTERLABEL_H
-
-#include <QLabel>
-#include <QTimeLine>
-#include <QPropertyAnimation>
-#include <QEasingCurve>
-#include <cmath>
-
-#include "dllmacro.h"
-
-class DLLEXPORT AnimatedCounterLabel : public QLabel
-{
-Q_OBJECT
-
-public:
-    explicit AnimatedCounterLabel( QWidget* parent = 0, Qt::WindowFlags f = 0 )
-        : QLabel( parent, f )
-        , m_displayed( 0 )
-        , m_val( 0 )
-        , m_oldval( 0 )
-        , m_format( "%L1" )
-    {
-        connect( &m_timer, SIGNAL( frameChanged( int ) ), SLOT( frame( int ) ) );
-        connect( &m_timer, SIGNAL( finished() ), SLOT( showDiff() ) );
-    }
-
-    void setFormat( const QString& f )
-    {
-        m_format = f;
-        setText( m_format.arg( m_displayed ) );
-    }
-
-public slots:
-    void setVisible( bool b )
-    {
-        QLabel::setVisible( b );
-        if ( !m_diff.isNull() )
-            m_diff.data()->setVisible( b );
-    }
-
-    void frame( int f )
-    {
-        m_displayed = f;
-        QLabel::setText( m_format.arg( m_displayed ) );
-        QLabel::update();
-    }
-
-    void setVal( unsigned int v )
-    {
-        if( v == m_val )
-            return;
-
-        m_oldval = m_val;
-        m_val = v;
-        m_timer.stop();
-        unsigned int dur = 1000;
-        unsigned int r = abs( v - m_oldval );
-
-        if( r > 1000 )        dur = 1500;
-        else if( r > 10000 )  dur = 2000;
-        else if( r > 25000 )  dur = 2250;
-        else if( r > 50000 )  dur = 2750;
-        else if( r > 100000 ) dur = 3000;
-        else if( r > 500000 ) dur = 5000;
-
-        m_timer.setDuration( dur );
-        m_timer.setFrameRange( m_displayed, v );
-        m_timer.setEasingCurve( QEasingCurve( QEasingCurve::OutCubic ) );
-        m_timer.start();
-    }
-
-    void showDiff()
-    {
-        int differ = m_val - m_oldval;
-        m_diff = new QLabel( QString("%1 %L2" ).arg( differ > 0 ? "+" : "" )
-                                                     .arg( (int)m_val - (int)m_oldval ),
-                                                     this->parentWidget() );
-
-        m_diff.data()->setStyleSheet( "font-size:9px; color:grey;" );
-        m_diff.data()->move( QPoint( this->pos().x(), this->pos().y() ) );
-        QPropertyAnimation* a = new QPropertyAnimation( m_diff.data(), "pos" );
-        a->setEasingCurve( QEasingCurve( QEasingCurve::InQuad ) );
-        a->setStartValue( m_diff.data()->pos() + QPoint( 0, -10 ) );
-        a->setEndValue( QPoint( m_diff.data()->pos().x(), m_diff.data()->pos().y() - 25 ) );
-        a->setDuration( 1000 );
-        //        qDebug() << "ANIMATING DIFF:" << a->startValue() << a->endValue();
-
-        connect( a, SIGNAL( finished() ), m_diff.data(), SLOT( hide() ) );
-        connect( a, SIGNAL( finished() ), m_diff.data(), SLOT( deleteLater() ) );
-        connect( a, SIGNAL( finished() ), a, SLOT( deleteLater() ) );
-
-        m_diff.data()->show();
-        m_diff.data()->setVisible( this->isVisible() );
-        a->start();
-    }
-
-private:
-    QTimeLine m_timer;
-
-    // what's in the label text:
-    unsigned int m_displayed;
-
-    // current value we are storing (and displaying, or animating towards displaying)
-    unsigned int m_val, m_oldval;
-
-    QString m_format;
-    QWeakPointer<QLabel> m_diff;
-};
-
-#endif // ANIMATEDCOUNTERLABEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/animatedsplitter.cpp Deleted

@@ -1,274 +0,0 @@
-/* === 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
- *   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 "animatedsplitter.h"
-
-#include "utils/logger.h"
-
-#define ANIMATION_TIME 400
-
-
-AnimatedSplitter::AnimatedSplitter( QWidget* parent )
-    : QSplitter( parent )
-    , m_greedyIndex( 0 )
-{
-    setHandleWidth( 1 );
-}
-
-
-void
-AnimatedSplitter::show( int index, bool animate )
-{
-    QWidget* w = widget( index );
-    emit shown( w, animate );
-}
-
-
-void
-AnimatedSplitter::hide( int index, bool animate )
-{
-    QWidget* w = widget( index );
-    emit hidden( w, animate );
-}
-
-
-void
-AnimatedSplitter::addWidget( QWidget* widget )
-{
-    QSplitter::addWidget( widget );
-}
-
-
-void
-AnimatedSplitter::addWidget( AnimatedWidget* widget )
-{
-    QSplitter::addWidget( widget );
-
-    connect( widget, SIGNAL( showWidget() ), SLOT( onShowRequest() ) );
-    connect( widget, SIGNAL( hideWidget() ), SLOT( onHideRequest() ) );
-    connect( widget, SIGNAL( sizeHintChanged( QSize ) ), SLOT( onShowRequest() ) );
-    connect( widget, SIGNAL( sizeChanged( QSize ) ), SLOT( onSizeChanged( QSize ) ) );
-
-    connect( this, SIGNAL( shown( QWidget*, bool ) ), widget, SLOT( onShown( QWidget*, bool ) ) );
-    connect( this, SIGNAL( hidden( QWidget*, bool ) ), widget, SLOT( onHidden( QWidget*, bool ) ) );
-}
-
-
-void
-AnimatedSplitter::onShowRequest()
-{
-    AnimatedWidget* w = (AnimatedWidget*)(sender());
-    if ( indexOf( w ) > 0 )
-        show( indexOf( w ) );
-    else
-        qDebug() << "Could not find widget:" << sender();
-}
-
-
-void
-AnimatedSplitter::onHideRequest()
-{
-    AnimatedWidget* w = (AnimatedWidget*)(sender());
-    if ( indexOf( w ) > 0 )
-        hide( indexOf( w ) );
-    else
-        qDebug() << "Could not find widget:" << sender();
-}
-
-
-void
-AnimatedSplitter::onSizeChanged( const QSize& size )
-{
-    AnimatedWidget* w = (AnimatedWidget*)(sender());
-    int wi = indexOf( w );
-
-    QList< int > sizes;
-    for ( int i = 0; i < count(); i ++ )
-    {
-        int j = 0;
-
-        if ( i == m_greedyIndex )
-        {
-            j = height() - size.height();
-            for ( int x = 0; x < count(); x++ )
-            {
-                if ( x != i && x != wi )
-                    j -= widget( x )->height();
-            }
-        }
-        else if ( i == wi )
-        {
-            j = size.height();
-        }
-        else
-        {
-            j = widget( i )->height();
-        }
-
-        sizes << j;
-    }
-
-    setSizes( sizes );
-}
-
-
-void
-AnimatedSplitter::setGreedyWidget( int index )
-{
-    if( !widget( index ) )
-        return;
-
-    m_greedyIndex = index;
-
-    QSizePolicy policy = widget( m_greedyIndex )->sizePolicy();
-    if( orientation() == Qt::Horizontal )
-        policy.setHorizontalStretch( 1 );
-    else
-        policy.setVerticalStretch( 1 );
-
-    widget( m_greedyIndex )->setSizePolicy( policy );
-
-}
-
-
-QSplitterHandle*
-AnimatedSplitter::createHandle()
-{
-    return new AnimatedSplitterHandle( orientation(), this );
-}
-
-
-AnimatedWidget::AnimatedWidget( AnimatedSplitter* parent )
-    : m_parent( parent )
-    , m_isHidden( false )
-{
-    m_timeLine = new QTimeLine( ANIMATION_TIME, this );
-    m_timeLine->setUpdateInterval( 20 );
-    m_timeLine->setEasingCurve( QEasingCurve::OutCubic );
-
-    connect( m_timeLine, SIGNAL( frameChanged( int ) ), SLOT( onAnimationStep( int ) ) );
-    connect( m_timeLine, SIGNAL( finished() ), SLOT( onAnimationFinished() ) );
-}
-
-
-AnimatedWidget::~AnimatedWidget()
-{
-}
-
-
-void
-AnimatedWidget::onShown( QWidget* widget, bool animated )
-{
-    if ( widget != this )
-        return;
-
-    m_animateForward = true;
-    if ( animated )
-    {
-        if ( m_timeLine->state() == QTimeLine::Running )
-            m_timeLine->stop();
-
-        m_timeLine->setFrameRange( height(), sizeHint().height() );
-        m_timeLine->setDirection( QTimeLine::Forward );
-        m_timeLine->start();
-    }
-    else
-    {
-        onAnimationStep( sizeHint().height() );
-        onAnimationFinished();
-    }
-
-    m_isHidden = false;
-}
-
-
-void
-AnimatedWidget::onHidden( QWidget* widget, bool animated )
-{
-    if ( widget != this )
-        return;
-
-    m_animateForward = false;
-    int minHeight = hiddenSize().height();
-
-    if ( animated )
-    {
-        if ( m_timeLine->state() == QTimeLine::Running )
-            m_timeLine->stop();
-
-        m_timeLine->setFrameRange( minHeight, height() );
-        m_timeLine->setDirection( QTimeLine::Backward );
-        m_timeLine->start();
-    }
-    else
-    {
-        onAnimationStep( minHeight );
-        onAnimationFinished();
-    }
-
-    m_isHidden = true;
-}
-
-
-void
-AnimatedWidget::onAnimationStep( int frame )
-{
-    setFixedHeight( frame );
-
-    QSize s( 0, frame ); //FIXME
-    emit sizeChanged( s );
-}
-
-
-void
-AnimatedWidget::onAnimationFinished()
-{
-    if ( m_animateForward )
-    {
-        setMinimumHeight( hiddenSize().height() );
-        setMaximumHeight( QWIDGETSIZE_MAX );
-    }
-    else
-    {
-        setFixedHeight( hiddenSize().height() );
-    }
-}
-
-
-QSize
-AnimatedSplitterHandle::sizeHint() const
-{
-    // Re-calculate our position if the items in the splitter changed, or if we haven't calculated it yet
-    if ( m_indexInSplitter == -1 || m_lastCount != splitter()->count() )
-    {
-        for ( int i = 0; i < splitter()->count(); i++ )
-        {
-            if ( splitter()->handle( i ) == this )
-            {
-                m_indexInSplitter = i;
-            }
-        }
-        m_lastCount = splitter()->count();
-    }
-
-    // sizeHint is 0,0 if widget below handle has size 0 or is hidden
-    if ( splitter()->widget( m_indexInSplitter )->height() == 0 )
-        return QSize( 0, 0 );
-    else
-        return QSize( 1, 1 );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/animatedsplitter.h Deleted

@@ -1,121 +0,0 @@
-/* === 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
- *   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 ANIMATEDSPLITTER_H
-#define ANIMATEDSPLITTER_H
-
-#include <QSplitter>
-#include <QTimeLine>
-
-#include "dllmacro.h"
-
-class AnimatedWidget;
-
-class DLLEXPORT AnimatedSplitter : public QSplitter
-{
-Q_OBJECT
-
-public:
-    explicit AnimatedSplitter( QWidget* parent = 0 );
-
-    void show( int index, bool animate = true );
-    void hide( int index, bool animate = true );
-
-    void setGreedyWidget( int index );
-
-    void addWidget( QWidget* widget );
-    void addWidget( AnimatedWidget* widget );
-
-signals:
-    void shown( QWidget*, bool animated );
-    void hidden( QWidget*, bool animated );
-
-protected:
-    virtual QSplitterHandle* createHandle();
-
-private slots:
-    void onShowRequest();
-    void onHideRequest();
-
-    void onSizeChanged( const QSize& size );
-
-private:
-    int m_greedyIndex;
-};
-
-
-class DLLEXPORT AnimatedSplitterHandle : public QSplitterHandle
-{
-Q_OBJECT
-public:
-    explicit AnimatedSplitterHandle( Qt::Orientation orientation, QSplitter* parent )
-        : QSplitterHandle( orientation, parent )
-        , m_indexInSplitter( -1 )
-        , m_lastCount( -1 )
-    {
-        setCursor( Qt::ArrowCursor );
-    }
-
-    virtual QSize sizeHint() const;
-
-private:
-    mutable int m_indexInSplitter;
-    mutable int m_lastCount;
-};
-
-
-class DLLEXPORT AnimatedWidget : public QWidget
-{
-Q_OBJECT
-public:
-    explicit AnimatedWidget( AnimatedSplitter* parent );
-    virtual ~AnimatedWidget();
-
-    QSize hiddenSize() const { return m_hiddenSize; }
-    void setHiddenSize( const QSize& size ) { m_hiddenSize = size; emit hiddenSizeChanged(); }
-
-    bool isHidden() const { return m_isHidden; }
-
-public slots:
-    virtual void onShown( QWidget*, bool animated );
-    virtual void onHidden( QWidget*, bool animated );
-
-signals:
-    void showWidget();
-    void hideWidget();
-
-    void sizeChanged( const QSize& size );
-    void sizeHintChanged( const QSize& size );
-    void hiddenSizeChanged();
-
-private slots:
-    void onAnimationStep( int frame );
-    void onAnimationFinished();
-
-protected:
-    AnimatedSplitter* splitter() { return m_parent; }
-
-private:
-    AnimatedSplitter* m_parent;
-    bool m_animateForward;
-    QSize m_hiddenSize;
-    bool m_isHidden;
-    QTimeLine* m_timeLine;
-};
-
-#endif //ANIMATEDSPLITTER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/checkdirtree.cpp Deleted

@@ -1,396 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 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 "checkdirtree.h"
-
-#include "utils/logger.h"
-#include "tomahawksettings.h"
-
-#include <QCoreApplication>
-#include <QProcess>
-
-static QString s_macVolumePath = "/Volumes";
-
-CheckDirModel::CheckDirModel( QWidget* parent )
-    : QFileSystemModel( parent )
-    , m_shownVolumes( false )
-{
-#ifdef Q_OS_MAC
-    m_setFilePath = QString( "%1/SetFile" )        .arg( QCoreApplication::applicationDirPath() );
-    m_getFileInfoPath = QString( "%1/GetFileInfo" ).arg( QCoreApplication::applicationDirPath() );
-
-    QProcess* checkVolumeVisible = new QProcess( this );
-    connect( checkVolumeVisible, SIGNAL( readyReadStandardOutput() ), this, SLOT( getFileInfoResult() ) );
-    qDebug() << "Running GetFileInfo:" << m_getFileInfoPath << "-aV" << s_macVolumePath;
-    checkVolumeVisible->start( m_getFileInfoPath, QStringList() <<  "-aV" << s_macVolumePath );
-#endif
-}
-
-CheckDirModel::~CheckDirModel()
-{
-#ifdef Q_OS_MAC
-    // reset to previous state
-    if ( m_shownVolumes )
-        QProcess::startDetached( QString( "%1 -a V %2" ).arg( m_setFilePath).arg( s_macVolumePath ) );
-#endif
-}
-
-void
-CheckDirModel::getFileInfoResult()
-{
-#ifdef Q_OS_MAC
-    QProcess* p = qobject_cast< QProcess* >( sender() );
-    Q_ASSERT( p );
-
-    QByteArray res = p->readAll().trimmed();
-    qDebug() << "Got output from GetFileInfo:" << res;
-    // 1 means /Volumes is hidden, so we show it while the dialog is visible
-    if ( res == "1" )
-    {
-        // Remove the hidden flag for the /Volumnes folder so all mount points are visible in the default (Q)FileSystemModel
-        QProcess* showProcess = new QProcess( this );
-        qDebug() << "Running SetFile:" << QString( "%1 -a v %2" ).arg( m_setFilePath ).arg( s_macVolumePath );
-        showProcess->start( QString( "%1 -a v %2" ).arg( m_setFilePath ).arg( s_macVolumePath ) );
-        connect( showProcess, SIGNAL( readyReadStandardError() ), this, SLOT( processErrorOutput() ) );
-        m_shownVolumes = true;
-
-        QTimer::singleShot( 500, this, SLOT( volumeShowFinished() ) );
-    }
-
-    p->terminate();
-    p->deleteLater();
-#endif
-}
-
-void
-CheckDirModel::volumeShowFinished()
-{
-    reset();
-}
-
-
-void
-CheckDirModel::processErrorOutput()
-{
-    QProcess* p = qobject_cast< QProcess* >( sender() );
-    Q_ASSERT( p );
-    qDebug() << "Got ERROR OUTPUT from subprocess in CheckDirModel:" << p->readAll();
-}
-
-
-Qt::ItemFlags
-CheckDirModel::flags( const QModelIndex& index ) const
-{
-    return QFileSystemModel::flags( index ) | Qt::ItemIsUserCheckable;
-}
-
-
-QVariant
-CheckDirModel::data( const QModelIndex& index, int role ) const
-{
-#ifdef Q_WS_MAC
-    // return the 'My Computer' icon for the /Volumes folder
-    if ( index.column() == 0 && filePath( index ) == s_macVolumePath )
-    {
-        switch ( role )
-        {
-            case Qt::DecorationRole:
-                return myComputer( role );
-            default:
-                break;
-        }
-    }
-#endif
-
-    if ( role == Qt::CheckStateRole )
-    {
-        return m_checkTable.contains( index ) ? m_checkTable.value( index ) : Qt::Unchecked;
-    }
-    else
-    {
-        return QFileSystemModel::data( index, role );
-    }
-}
-
-
-bool
-CheckDirModel::setData( const QModelIndex& index, const QVariant& value, int role )
-{
-    bool b = QFileSystemModel::setData( index, value, role );
-
-    if ( role == Qt::CheckStateRole )
-    {
-        m_checkTable.insert( index, (Qt::CheckState)value.toInt() );
-        emit dataChanged( index, index );
-        emit dataChangedByUser( index );
-    }
-
-    return b;
-}
-
-
-void
-CheckDirModel::setCheck( const QModelIndex& index, const QVariant& value )
-{
-    QFileSystemModel::setData( index, value, Qt::CheckStateRole );
-    m_checkTable.insert( index, (Qt::CheckState)value.toInt() );
-    emit dataChanged( index, index );
-}
-
-
-Qt::CheckState
-CheckDirModel::getCheck( const QModelIndex& index )
-{
-    return (Qt::CheckState)data( index, Qt::CheckStateRole ).toInt();
-}
-
-
-CheckDirTree::CheckDirTree( QWidget* parent )
-    : QTreeView( parent )
-{
-    m_dirModel.setFilter( QDir::Dirs | QDir::NoDotAndDotDot );
-    m_dirModel.setRootPath( "/" );
-
-    m_dirModel.setNameFilters( QStringList() << "^\\.*" );
-
-    setModel( &m_dirModel );
-    setColumnHidden( 1, true );
-    setColumnHidden( 2, true );
-    setColumnHidden( 3, true );
-    //header()->hide();
-
-    connect( &m_dirModel, SIGNAL( dataChangedByUser( QModelIndex ) ),
-                            SLOT( updateNode( QModelIndex ) ) );
-    connect( &m_dirModel, SIGNAL( dataChangedByUser( const QModelIndex& ) ),
-                          SIGNAL( changed() ) );
-    connect( &m_dirModel, SIGNAL( modelReset() ),
-                            SLOT( modelReset() ) );
-
-    connect( this, SIGNAL( collapsed( QModelIndex ) ),
-                     SLOT( onCollapse( QModelIndex ) ) );
-    connect( this, SIGNAL( expanded( QModelIndex ) ),
-                     SLOT( onExpand( QModelIndex ) ) );
-}
-
-
-void
-CheckDirTree::checkPath( const QString& path, Qt::CheckState state )
-{
-    QModelIndex index = m_dirModel.index( path );
-    m_dirModel.setCheck( index, state );
-    updateNode( index );
-}
-
-
-void
-CheckDirTree::setExclusions( const QStringList& list )
-{
-    foreach ( const QString& path, list )
-    {
-        checkPath( path, Qt::Unchecked );
-    }
-}
-
-
-QStringList
-CheckDirTree::getCheckedPaths()
-{
-    QStringList checks;
-    QModelIndex root = rootIndex();
-
-    getChecksForNode( root, checks );
-    return checks;
-}
-
-
-void
-CheckDirTree::getChecksForNode( const QModelIndex& index, QStringList& checks )
-{
-    // Look at first node
-    // Is it checked?
-    //  - move on to next node
-    // Is it unchecked?
-    //  - add to list
-    //  - move to next node
-    // Is it partially checked?
-    //  - recurse
-
-    int numChildren = m_dirModel.rowCount( index );
-    for ( int i = 0; i < numChildren; ++i )
-    {
-        QModelIndex kid = m_dirModel.index( i, 0, index );
-        Qt::CheckState check = m_dirModel.getCheck( kid );
-        if ( check == Qt::Checked )
-        {
-            checks.append( m_dirModel.filePath( kid ) );
-        }
-        else if ( check == Qt::Unchecked )
-        {
-            continue;
-        }
-        else if ( check == Qt::PartiallyChecked )
-        {
-            getChecksForNode( kid, checks );
-        }
-        else
-        {
-            Q_ASSERT( false );
-        }
-    }
-}
-
-
-QStringList
-CheckDirTree::getExclusions()
-{
-    QStringList exclusions;
-    QModelIndex root = rootIndex();
-
-    getExclusionsForNode( root, exclusions );
-    return exclusions;
-}
-
-
-void
-CheckDirTree::getExclusionsForNode( const QModelIndex& index, QStringList& exclusions )
-{
-    // Look at first node
-    // Is it checked?
-    //  - move on to next node
-    // Is it unchecked?
-    //  - add to list
-    //  - move to next node
-    // Is it partially checked?
-    //  - recurse
-
-    int numChildren = m_dirModel.rowCount( index );
-    for ( int i = 0; i < numChildren; ++i )
-    {
-        QModelIndex kid = m_dirModel.index( i, 0, index );
-        Qt::CheckState check = m_dirModel.getCheck( kid );
-        if ( check == Qt::Checked )
-        {
-            continue;
-        }
-        else if ( check == Qt::Unchecked )
-        {
-            exclusions.append( m_dirModel.filePath( kid ) );
-        }
-        else if ( check == Qt::PartiallyChecked )
-        {
-            getExclusionsForNode( kid, exclusions );
-        }
-        else
-        {
-            Q_ASSERT( false );
-        }
-    }
-}
-
-
-void
-CheckDirTree::onCollapse( const QModelIndex& /*idx*/ )
-{
-
-}
-
-
-void
-CheckDirTree::onExpand( const QModelIndex& idx )
-{
-    // If the node is partially checked, that means we have been below it
-    // setting some stuff, so only fill down if we are unchecked.
-    if ( m_dirModel.getCheck( idx ) != Qt::PartiallyChecked )
-    {
-        fillDown( idx );
-    }
-}
-
-
-void
-CheckDirTree::updateNode( const QModelIndex& idx )
-{
-    // Start by recursing down to the bottom and then work upwards
-    fillDown( idx );
-    updateParent( idx );
-}
-
-
-void
-CheckDirTree::modelReset()
-{
-    foreach ( const QString& dir, TomahawkSettings::instance()->scannerPaths() )
-    {
-        checkPath( dir, Qt::Checked );
-    }
-}
-
-
-void
-CheckDirTree::fillDown( const QModelIndex& parent )
-{
-    // Recursion stops when we reach a directory which has never been expanded
-    // or one that has no children.
-    if ( !isExpanded( parent ) || !m_dirModel.hasChildren( parent ) )
-    {
-        return;
-    }
-
-    Qt::CheckState state = m_dirModel.getCheck( parent );
-    int numChildren = m_dirModel.rowCount( parent );
-    for ( int i = 0; i < numChildren; ++i )
-    {
-        QModelIndex kid = m_dirModel.index( i, 0, parent );
-        m_dirModel.setCheck( kid, state );
-        fillDown( kid );
-    }
-}
-
-
-void
-CheckDirTree::updateParent( const QModelIndex& index )
-{
-    QModelIndex parent = index.parent();
-    if ( !parent.isValid() )
-    {
-        // We have reached the root
-        return;
-    }
-
-    // Initialise overall state to state of first child
-    QModelIndex kid = m_dirModel.index( 0, 0, parent );
-    Qt::CheckState overall = m_dirModel.getCheck( kid );
-
-    int numChildren = m_dirModel.rowCount( parent );
-    for ( int i = 1; i <= numChildren; ++i )
-    {
-        kid = m_dirModel.index( i, 0, parent );
-        Qt::CheckState state = m_dirModel.getCheck( kid );
-        if ( state != overall )
-        {
-            // If we ever come across a state different than the first child,
-            // we are partially checked
-            overall = Qt::PartiallyChecked;
-            break;
-        }
-    }
-
-    m_dirModel.setCheck( parent, overall );
-    updateParent( parent );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/checkdirtree.h Deleted

@@ -1,91 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright      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 CHECKDIRTREE_H
-#define CHECKDIRTREE_H
-
-#include "dllmacro.h"
-
-#include <QFileSystemModel>
-#include <QTreeView>
-
-class DLLEXPORT CheckDirModel : public QFileSystemModel
-{
-    Q_OBJECT
-
-public:
-    CheckDirModel( QWidget* parent = 0 );
-    virtual ~CheckDirModel();
-
-    virtual Qt::ItemFlags flags( const QModelIndex& index ) const;
-    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-    virtual bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole );
-
-    void setCheck( const QModelIndex& index, const QVariant& value );
-    Qt::CheckState getCheck( const QModelIndex& index );
-
-signals:
-    void dataChangedByUser( const QModelIndex & index );
-
-private slots:
-    void getFileInfoResult();
-    void volumeShowFinished();
-    void processErrorOutput();
-private:
-    QHash<QPersistentModelIndex, Qt::CheckState> m_checkTable;
-
-    bool m_shownVolumes;
-    QString m_setFilePath;
-    QString m_getFileInfoPath;
-};
-
-
-class DLLEXPORT CheckDirTree : public QTreeView
-{
-    Q_OBJECT
-
-public:
-    CheckDirTree( QWidget* parent );
-
-    void checkPath( const QString& path, Qt::CheckState state );
-
-    void setExclusions( const QStringList& list );
-    QStringList getExclusions();
-    QStringList getCheckedPaths();
-
-signals:
-    void changed();
-
-private slots:
-    void onCollapse( const QModelIndex& idx );
-    void onExpand( const QModelIndex& idx );
-    void updateNode( const QModelIndex& idx );
-
-    void modelReset();
-private:
-    CheckDirModel m_dirModel;
-    QSet<qint64> m_expandedSet;
-
-    void fillDown( const QModelIndex& index );
-    void updateParent( const QModelIndex& index );
-    void getExclusionsForNode( const QModelIndex& index, QStringList& exclusions );
-    void getChecksForNode( const QModelIndex& index, QStringList& checks );
-};
-
-#endif // CHECKDIRTREE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/combobox.cpp Deleted

@@ -1,93 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Casey Link <unnamedrambler@gmail.com>
- *
- *   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 "combobox.h"
-
-#include "utils/stylehelper.h"
-#include "utils/tomahawkutilsgui.h"
-#include "utils/logger.h"
-
-#include <QStyle>
-#include <QTextOption>
-#include <QStylePainter>
-#include <QStyleOptionComboBox>
-
-
-ComboBox::ComboBox( QWidget* parent )
-    : QComboBox( parent )
-{
-}
-
-
-ComboBox::~ComboBox()
-{
-}
-
-
-QSize
-ComboBox::sizeHint() const
-{
-    return QComboBox::sizeHint() + QSize( 8, 0 );
-}
-
-
-void
-ComboBox::paintEvent( QPaintEvent* )
-{
-    QStylePainter p( this );
-    p.setPen( palette().color( QPalette::Text ) );
-    QStyleOptionComboBox cb;
-    initStyleOption( &cb );
-    QRect r = cb.rect;
-    r.setHeight( TomahawkUtils::headerHeight() );
-
-    StyleHelper::horizontalHeader( &p, r );
-
-    if ( cb.state & QStyle::State_MouseOver )
-    {
-        p.save();
-        QRect highlightRect( r );
-        QSize shrink( 3, 4 );
-        QSize hS( highlightRect.size() );
-        hS -= shrink;
-        highlightRect.setSize( hS );
-        highlightRect.translate( 0, 2 );
-        p.setRenderHint( QPainter::Antialiasing );
-        p.setBrush( StyleHelper::headerHighlightColor() );
-        p.drawRoundedRect( highlightRect, 10.0, 10.0 );
-        p.restore();
-    }
-
-    p.save();
-    QTextOption to( Qt::AlignVCenter );
-    r.adjust( 8, 0, -8, 0 );
-    p.setPen( Qt::white );
-    p.setBrush( StyleHelper::headerTextColor() );
-    p.drawText( r, cb.currentText, to );
-
-    bool reverse = cb.direction == Qt::RightToLeft;
-    int menuButtonWidth = 12;
-    int left = !reverse ? r.right() - menuButtonWidth : r.left();
-    int right = !reverse ? r.right() : r.left() + menuButtonWidth;
-    QRect arrowRect( ( left + right ) / 2 + ( reverse ? 6 : -6 ), r.center().y() - 3, 9, 9 ); //FIXME: no consts please
-
-    QStyleOption arrowOpt = cb;
-    arrowOpt.rect = arrowRect;
-    StyleHelper::drawArrow( QStyle::PE_IndicatorArrowDown, &p, &arrowOpt );
-    p.restore();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/combobox.h Deleted

@@ -1,45 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Casey Link <unnamedrambler@gmail.com>
- *
- *   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 COMBOBOX_H
-#define COMBOBOX_H
-
-#include <QComboBox>
-#include <QPaintEvent>
-
-#include "dllmacro.h"
-
-/**
- * \class ComboBox
- * \brief A styled combo box that has a header background.
- */
-class DLLEXPORT ComboBox : public QComboBox
-{
-Q_OBJECT
-
-public:
-    ComboBox( QWidget* parent = 0 );
-    virtual ~ComboBox();
-
-    virtual QSize sizeHint() const;
-
-protected:
-    virtual void paintEvent( QPaintEvent* );
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/elidedlabel.cpp Deleted

@@ -1,246 +0,0 @@
-/* === 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
- *   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 "elidedlabel.h"
-
-#include <QEvent>
-#include <QPainter>
-#include <QFontMetrics>
-#include <QApplication>
-#include <QRect>
-#include <QTextLayout>
-
-#include "utils/logger.h"
-
-
-ElidedLabel::ElidedLabel( QWidget* parent, Qt::WindowFlags flags )
-    : QFrame( parent, flags )
-{
-    init();
-}
-
-
-ElidedLabel::ElidedLabel( const QString& text, QWidget* parent, Qt::WindowFlags flags )
-    : QFrame( parent, flags )
-{
-    init( text );
-}
-
-
-ElidedLabel::~ElidedLabel()
-{
-}
-
-
-QString
-ElidedLabel::text() const
-{
-    return m_text;
-}
-
-
-void
-ElidedLabel::setText( const QString& text )
-{
-    if ( m_text != text )
-    {
-        m_text = text;
-        updateLabel();
-        emit textChanged( text );
-    }
-}
-
-
-Qt::Alignment
-ElidedLabel::alignment() const
-{
-    return m_align;
-}
-
-
-void
-ElidedLabel::setAlignment( Qt::Alignment alignment )
-{
-    if ( m_align != alignment )
-    {
-        m_align = alignment;
-        update(); // no geometry change, repaint is sufficient
-    }
-}
-
-
-Qt::TextElideMode
-ElidedLabel::elideMode() const
-{
-    return m_mode;
-}
-
-
-void
-ElidedLabel::setElideMode( Qt::TextElideMode mode )
-{
-    if ( m_mode != mode )
-    {
-        m_mode = mode;
-        updateLabel();
-    }
-}
-
-
-void
-ElidedLabel::setMargin( int margin )
-{
-    m_margin = margin;
-}
-
-
-int
-ElidedLabel::margin() const
-{
-    return m_margin;
-}
-
-
-void
-ElidedLabel::setFont( const QFont& font )
-{
-    QWidget::setFont( font );
-    updateLabel();
-}
-
-
-void
-ElidedLabel::init( const QString& txt )
-{
-    m_text = txt;
-    m_align = Qt::AlignLeft;
-    m_mode = Qt::ElideMiddle;
-    m_margin = 0;
-    m_multiLine = false;
-
-    setContentsMargins( 0, 0, 0, 0 );
-}
-
-
-void
-ElidedLabel::updateLabel()
-{
-    updateGeometry();
-    update();
-}
-
-
-QSize
-ElidedLabel::sizeHint() const
-{
-    const QFontMetrics& fm = fontMetrics();
-    return QSize( fm.width( m_text ) + m_margin * 2, fm.height() + m_margin * 2 );
-}
-
-
-QSize
-ElidedLabel::minimumSizeHint() const
-{
-    switch ( m_mode )
-    {
-        case Qt::ElideNone:
-            return sizeHint();
-
-        default:
-        {
-            const QFontMetrics& fm = fontMetrics();
-            QSize size( fm.width( "..." ), fm.height() );
-            return size;
-        }
-    }
-}
-
-
-void
-ElidedLabel::paintEvent( QPaintEvent* event )
-{
-    QFrame::paintEvent( event );
-    QPainter p( this );
-    QRect r = contentsRect();
-    r.adjust( m_margin, m_margin, -m_margin, -m_margin );
-
-    if ( m_multiLine )
-    {
-        QTextLayout textLayout( m_text );
-        textLayout.setFont( p.font() );
-        int widthUsed = 0;
-        int lineCount = 0;
-        int lineLimit = r.height() / fontMetrics().height();
-
-        textLayout.beginLayout();
-        while ( ++lineCount < lineLimit )
-        {
-            QTextLine line = textLayout.createLine();
-            if ( !line.isValid() )
-                break;
-
-            line.setLineWidth( r.width() );
-            widthUsed += line.naturalTextWidth();
-        }
-        textLayout.endLayout();
-        widthUsed += r.width();
-
-        const QString elidedText = fontMetrics().elidedText( m_text, Qt::ElideRight, widthUsed );
-        p.drawText( r, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, elidedText );
-    }
-    else
-    {
-        const QString elidedText = fontMetrics().elidedText( m_text, m_mode, r.width() );
-        p.drawText( r, m_align, elidedText );
-    }
-}
-
-
-void
-ElidedLabel::changeEvent( QEvent* event )
-{
-    QFrame::changeEvent( event );
-    switch ( event->type() )
-    {
-        case QEvent::FontChange:
-        case QEvent::ApplicationFontChange:
-            updateLabel();
-            break;
-
-        default:
-            // nothing to do
-            break;
-    }
-}
-
-
-void
-ElidedLabel::mousePressEvent( QMouseEvent* event )
-{
-    QFrame::mousePressEvent( event );
-    m_time.start();
-}
-
-
-void
-ElidedLabel::mouseReleaseEvent( QMouseEvent* event )
-{
-    QFrame::mouseReleaseEvent( event );
-    if ( m_time.elapsed() < qApp->doubleClickInterval() )
-        emit clicked();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/elidedlabel.h Deleted

@@ -1,81 +0,0 @@
-/* === 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
- *   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 ELIDEDLABEL_H
-#define ELIDEDLABEL_H
-
-#include <QFrame>
-#include <QTime>
-
-#include "dllmacro.h"
-
-class DLLEXPORT ElidedLabel : public QFrame
-{
-    Q_OBJECT
-    Q_PROPERTY( QString text READ text WRITE setText NOTIFY textChanged )
-    Q_PROPERTY( Qt::Alignment alignment READ alignment WRITE setAlignment )
-    Q_PROPERTY( Qt::TextElideMode elideMode READ elideMode WRITE setElideMode )
-
-public:
-    explicit ElidedLabel( QWidget* parent = 0, Qt::WindowFlags flags = 0 );
-    explicit ElidedLabel( const QString& text, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
-    virtual ~ElidedLabel();
-
-    QString text() const;
-
-    Qt::Alignment alignment() const;
-    void setAlignment( Qt::Alignment alignment );
-
-    Qt::TextElideMode elideMode() const;
-    void setElideMode( Qt::TextElideMode mode );
-
-    void setFont( const QFont& font );
-
-    void setMargin( int margin );
-    int margin() const;
-
-    virtual QSize sizeHint() const;
-    virtual QSize minimumSizeHint() const;
-
-    void init( const QString& txt = QString() );
-    void updateLabel();
-
-public slots:
-    void setText( const QString& text );
-    void setWordWrap( bool b ) { m_multiLine = b; }
-
-signals:
-    void clicked();
-    void textChanged( const QString& text );
-
-protected:
-    virtual void changeEvent( QEvent* event );
-    virtual void mousePressEvent( QMouseEvent* event );
-    virtual void mouseReleaseEvent( QMouseEvent* event );
-    virtual void paintEvent( QPaintEvent* event );
-
-private:
-    QTime m_time;
-    QString m_text;
-    Qt::Alignment m_align;
-    Qt::TextElideMode m_mode;
-    int m_margin;
-    bool m_multiLine;
-};
-
-#endif // ELIDEDLABEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/headerbreadcrumb.cpp Deleted

@@ -1,48 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Casey Link <unnamedrambler@gmail.com>
- *
- *   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 "headerbreadcrumb.h"
-
-#include "utils/stylehelper.h"
-
-#include <QStyle>
-#include <QStylePainter>
-#include <QPaintEvent>
-
-HeaderBreadCrumb::HeaderBreadCrumb( BreadcrumbButtonFactory* buttonFactory, QWidget* parent )
-    : BreadcrumbBar( buttonFactory, parent )
-{
-}
-
-
-HeaderBreadCrumb::HeaderBreadCrumb( QWidget* parent )
-    : BreadcrumbBar( parent )
-{
-}
-
-
-HeaderBreadCrumb::~HeaderBreadCrumb()
-{
-}
-
-
-void HeaderBreadCrumb::paintEvent( QPaintEvent* /* event */ )
-{
-    QStylePainter p( this );
-    StyleHelper::horizontalHeader( &p, rect() );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/headerbreadcrumb.h Deleted

@@ -1,41 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Casey Link <unnamedrambler@gmail.com>
- *
- *   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 HEADERBREADCRUMB_H
-#define HEADERBREADCRUMB_H
-
-#include "breadcrumbbar.h"
-
-class QPaintEvent;
-
-/**
- * \brief a bread crumb widget with Tomahawk's distinctive header style
- */
-class HeaderBreadCrumb : public BreadcrumbBar
-{
-    Q_OBJECT
-    public:
-        HeaderBreadCrumb( BreadcrumbButtonFactory* buttonFactory, QWidget* parent = 0 );
-        HeaderBreadCrumb( QWidget* parent = 0 );
-        ~HeaderBreadCrumb();
-
-    protected:
-        virtual void paintEvent( QPaintEvent* event );
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/imagebutton.cpp Deleted

@@ -1,107 +0,0 @@
-/* === 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
- *   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 "imagebutton.h"
-
-#include <QtGui/QPainter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QLayout>
-#include <QtGui/QPixmap>
-#include <QtGui/QIcon>
-#include <QtCore/QString>
-
-#include "utils/logger.h"
-
-
-ImageButton::ImageButton( QWidget* parent )
-    : QAbstractButton( parent )
-{
-}
-
-
-ImageButton::ImageButton( const QPixmap& rest, QWidget* parent )
-    : QAbstractButton( parent )
-{
-    init( rest );
-}
-
-
-ImageButton::ImageButton( const QString& path, QWidget* parent )
-    : QAbstractButton( parent )
-{
-    init( QPixmap( path ) );
-}
-
-
-void
-ImageButton::init( const QPixmap& p )
-{
-    setPixmap( p, QIcon::Off );
-    m_sizeHint = p.size();
-    updateGeometry();
-}
-
-
-void
-ImageButton::setPixmap( const QString& path )
-{
-    init( QPixmap( path ) );
-}
-
-
-void
-ImageButton::setPixmap( const QPixmap& pixmap )
-{
-    init( pixmap );
-}
-
-
-void
-ImageButton::paintEvent( QPaintEvent* event )
-{
-    QPainter p( this );
-    p.setClipRect( event->rect() );
-
-    QIcon::Mode mode = isDown()
-        ? QIcon::Active
-        : isEnabled()
-            ? QIcon::Normal
-            : QIcon::Disabled;
-
-    QIcon::State state = isChecked()
-        ? QIcon::On
-        : QIcon::Off;
-
-    icon().paint( &p, rect(), Qt::AlignCenter, mode, state );
-}
-
-
-void
-ImageButton::setPixmap( const QString& path, const QIcon::State state, const QIcon::Mode mode )
-{
-    setPixmap( QPixmap( path ), state, mode );
-}
-
-
-void
-ImageButton::setPixmap( const QPixmap& p, const QIcon::State state, const QIcon::Mode mode )
-{
-    QIcon i = icon();
-    i.addPixmap( p, mode, state );
-    setIcon( i );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/imagebutton.h Deleted

@@ -1,55 +0,0 @@
-/* === 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
- *   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 IMAGE_BUTTON_H
-#define IMAGE_BUTTON_H
-
-#include <QtGui/QAbstractButton>
-#include <QtGui/QIcon>
-#include <QtCore/QMap>
-
-#include "dllmacro.h"
-
-class DLLEXPORT ImageButton : public QAbstractButton
-{
-Q_OBJECT
-
-public:
-    /** this pixmap becomes the rest state pixmap and defines the size of the eventual widget */
-    explicit ImageButton( QWidget* parent = 0 );
-    explicit ImageButton( const QPixmap& pixmap, QWidget* parent = 0 );
-    explicit ImageButton( const QString& path, QWidget* parent = 0 );
-    
-    void setPixmap( const QString& path );
-    void setPixmap( const QPixmap& pixmap );
-
-    void setPixmap( const QString&, const QIcon::State, QIcon::Mode = QIcon::Normal );
-    void setPixmap( const QPixmap&, const QIcon::State, QIcon::Mode = QIcon::Normal );
-    
-    virtual QSize sizeHint() const { return m_sizeHint; }
-    
-protected:
-    virtual void paintEvent( QPaintEvent* event );
-    
-private:
-    void init( const QPixmap& );
-
-    QSize m_sizeHint;
-};
-
-#endif //IMAGE_BUTTON_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp Deleted

@@ -1,161 +0,0 @@
-/* === 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
- *   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 "sourceinfowidget.h"
-#include "ui_sourceinfowidget.h"
-
-#include "source.h"
-#include "viewmanager.h"
-
-#include "playlist/albummodel.h"
-#include "playlist/collectionflatmodel.h"
-#include "playlist/playlistmodel.h"
-
-#include "database/database.h"
-#include "database/databasecommand_alltracks.h"
-#include "database/databasecommand_allalbums.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include "widgets/overlaywidget.h"
-
-
-SourceInfoWidget::SourceInfoWidget( const Tomahawk::source_ptr& source, QWidget* parent )
-    : QWidget( parent )
-    , ui( new Ui::SourceInfoWidget )
-    , m_source( source )
-{
-    ui->setupUi( this );
-
-    ui->historyView->setFrameShape( QFrame::NoFrame );
-    ui->historyView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    ui->recentAlbumView->setFrameShape( QFrame::NoFrame );
-    ui->recentAlbumView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    ui->recentCollectionView->setFrameShape( QFrame::NoFrame );
-    ui->recentCollectionView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-    TomahawkUtils::unmarginLayout( layout() );
-    TomahawkUtils::unmarginLayout( ui->horizontalLayout );
-    TomahawkUtils::unmarginLayout( ui->verticalLayout );
-    TomahawkUtils::unmarginLayout( ui->verticalLayout_2 );
-    TomahawkUtils::unmarginLayout( ui->verticalLayout_3 );
-
-    ui->splitter->setStretchFactor( 0, 0 );
-    ui->splitter->setStretchFactor( 1, 1 );
-
-    ui->historyView->overlay()->setEnabled( false );
-
-    m_recentCollectionModel = new CollectionFlatModel( ui->recentCollectionView );
-    m_recentCollectionModel->setStyle( TrackModel::Short );
-    ui->recentCollectionView->setTrackModel( m_recentCollectionModel );
-    ui->recentCollectionView->sortByColumn( TrackModel::Age, Qt::DescendingOrder );
-
-    m_historyModel = new PlaylistModel( ui->historyView );
-    m_historyModel->setStyle( TrackModel::Short );
-    ui->historyView->setPlaylistModel( m_historyModel );
-    m_historyModel->loadHistory( source, 25 );
-
-    m_recentAlbumModel = new AlbumModel( ui->recentAlbumView );
-    ui->recentAlbumView->setAlbumModel( m_recentAlbumModel );
-    ui->recentAlbumView->proxyModel()->sort( -1 );
-
-    onCollectionChanged();
-
-    connect( source->collection().data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ) );
-    connect( source.data(), SIGNAL( playbackFinished( Tomahawk::query_ptr ) ), SLOT( onPlaybackFinished( Tomahawk::query_ptr ) ) );
-
-    m_title = tr( "New Additions" );
-    if ( source->isLocal() )
-    {
-        m_description = tr( "My recent activity" );
-    }
-    else
-    {
-        m_description = tr( "Recent activity from %1" ).arg( source->friendlyName() );
-    }
-
-    m_pixmap.load( RESPATH "images/new-additions.png" );
-}
-
-
-SourceInfoWidget::~SourceInfoWidget()
-{
-    delete ui;
-}
-
-
-void
-SourceInfoWidget::onCollectionChanged()
-{
-    loadTracks();
-    loadRecentAdditions();
-}
-
-
-void
-SourceInfoWidget::loadRecentAdditions()
-{
-    m_recentAlbumModel->addFilteredCollection( m_source->collection(), 20, DatabaseCommand_AllAlbums::ModificationTime, true );
-}
-
-
-void
-SourceInfoWidget::loadTracks()
-{
-    DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_source->collection() );
-    cmd->setLimit( 250 );
-    cmd->setSortOrder( DatabaseCommand_AllTracks::ModificationTime );
-    cmd->setSortDescending( true );
-
-    connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
-                    SLOT( onLoadedTrackHistory( QList<Tomahawk::query_ptr> ) ), Qt::QueuedConnection );
-
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-SourceInfoWidget::onLoadedTrackHistory( const QList<Tomahawk::query_ptr>& queries )
-{
-    m_recentCollectionModel->clear();
-    m_recentCollectionModel->append( queries );
-}
-
-
-void
-SourceInfoWidget::onPlaybackFinished( const Tomahawk::query_ptr& query )
-{
-    m_historyModel->insert( query, 0 );
-}
-
-
-void
-SourceInfoWidget::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/infowidgets/sourceinfowidget.h Deleted

@@ -1,82 +0,0 @@
-/* === 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
- *   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 SOURCEINFOWIDGET_H
-#define SOURCEINFOWIDGET_H
-
-#include <QWidget>
-
-#include "playlistinterface.h"
-#include "viewpage.h"
-
-#include "dllmacro.h"
-
-class AlbumModel;
-class CollectionFlatModel;
-class PlaylistModel;
-
-namespace Ui
-{
-    class SourceInfoWidget;
-}
-
-class DLLEXPORT SourceInfoWidget : public QWidget, public Tomahawk::ViewPage
-{
-Q_OBJECT
-
-public:
-    SourceInfoWidget( const Tomahawk::source_ptr& source, QWidget* parent = 0 );
-    ~SourceInfoWidget();
-
-    virtual QWidget* widget() { return this; }
-    virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return Tomahawk::playlistinterface_ptr(); }
-
-    virtual QString title() const { return m_title; }
-    virtual QString description() const { return m_description; }
-    virtual QPixmap pixmap() const { return m_pixmap; }
-
-    virtual bool showStatsBar() const { return false; }
-
-    virtual bool jumpToCurrentTrack() { return false; }
-
-protected:
-    void changeEvent( QEvent* e );
-
-private slots:
-    void loadTracks();
-    void loadRecentAdditions();
-
-    void onCollectionChanged();
-    void onPlaybackFinished( const Tomahawk::query_ptr& query );
-    void onLoadedTrackHistory( const QList<Tomahawk::query_ptr>& queries );
-
-private:
-    Ui::SourceInfoWidget *ui;
-
-    CollectionFlatModel* m_recentCollectionModel;
-    PlaylistModel* m_historyModel;
-    AlbumModel* m_recentAlbumModel;
-
-    Tomahawk::source_ptr m_source;
-
-    QString m_title;
-    QString m_description;
-    QPixmap m_pixmap;
-};
-
-#endif // SOURCEINFOWIDGET_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui Deleted

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SourceInfoWidget</class>
- <widget class="QWidget" name="SourceInfoWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>831</width>
-    <height>460</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="handleWidth">
-      <number>1</number>
-     </property>
-     <widget class="QWidget" name="">
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="HeaderLabel" name="label_2">
-         <property name="text">
-          <string>Recent Albums</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="AlbumView" name="recentAlbumView">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>192</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="dragEnabled">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DragDrop</enum>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="">
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <item>
-          <widget class="HeaderLabel" name="label">
-           <property name="text">
-            <string>Latest Additions</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="CollectionView" name="recentCollectionView"/>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <widget class="HeaderLabel" name="label_3">
-           <property name="text">
-            <string>Recently Played Tracks</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="PlaylistView" name="historyView"/>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>HeaderLabel</class>
-   <extends>QLabel</extends>
-   <header location="global">widgets/HeaderLabel.h</header>
-  </customwidget>
-  <customwidget>
-   <class>AlbumView</class>
-   <extends>QListView</extends>
-   <header>playlist/albumview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>PlaylistView</class>
-   <extends>QTreeView</extends>
-   <header>playlist/playlistview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>CollectionView</class>
-   <extends>QTreeView</extends>
-   <header>playlist/collectionview.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/newplaylistwidget.cpp Deleted

@@ -1,154 +0,0 @@
-/* === 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
- *   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 "newplaylistwidget.h"
-#include "ui_newplaylistwidget.h"
-
-#include <QPushButton>
-#include <QDialogButtonBox>
-
-#include "sourcelist.h"
-#include "viewmanager.h"
-#include "playlist/playlistmodel.h"
-#include "widgets/overlaywidget.h"
-
-#include "utils/xspfloader.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#define FILTER_TIMEOUT 280
-
-
-NewPlaylistWidget::NewPlaylistWidget( QWidget* parent )
-    : QWidget( parent )
-    , ui( new Ui::NewPlaylistWidget )
-{
-    ui->setupUi( this );
-
-    m_saveButton = new QPushButton( tr( "&Create Playlist" ) );
-    m_saveButton->setDefault( true );
-    m_saveButton->setEnabled( false );
-
-    ui->buttonBox->addButton( m_saveButton, QDialogButtonBox::AcceptRole );
-
-    connect( ui->titleEdit, SIGNAL( textChanged( QString ) ), SLOT( onTitleChanged( QString ) ) );
-    connect( ui->tagEdit, SIGNAL( textChanged( QString ) ), SLOT( onTagChanged() ) );
-    connect( ui->buttonBox, SIGNAL( accepted() ), SLOT( savePlaylist() ) );
-    connect( ui->buttonBox, SIGNAL( rejected() ), SLOT( cancel() ) );
-
-    m_suggestionsModel = new PlaylistModel( ui->suggestionsView );
-    ui->suggestionsView->setPlaylistModel( m_suggestionsModel );
-    ui->suggestionsView->overlay()->setEnabled( false );
-
-    connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( updateSuggestions() ) );
-
-    ui->titleEdit->setFocus();
-}
-
-
-NewPlaylistWidget::~NewPlaylistWidget()
-{
-    delete ui;
-}
-
-
-void
-NewPlaylistWidget::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-NewPlaylistWidget::onTitleChanged( const QString& title )
-{
-    m_saveButton->setEnabled( !title.isEmpty() );
-}
-
-
-void
-NewPlaylistWidget::onTagChanged()
-{
-    m_tag = ui->tagEdit->text();
-
-    m_filterTimer.stop();
-    m_filterTimer.setInterval( FILTER_TIMEOUT );
-    m_filterTimer.setSingleShot( true );
-    m_filterTimer.start();
-}
-
-
-void
-NewPlaylistWidget::updateSuggestions()
-{
-    QUrl url( QString( "http://ws.audioscrobbler.com/1.0/tag/%1/toptracks.xspf" ).arg( m_tag ) );
-
-    XSPFLoader* loader = new XSPFLoader( false );
-    connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( suggestionsFound() ) );
-
-    loader->load( url );
-}
-
-
-void
-NewPlaylistWidget::suggestionsFound()
-{
-    XSPFLoader* loader = qobject_cast<XSPFLoader*>( sender() );
-
-    m_queries = loader->entries();
-
-    delete m_suggestionsModel;
-    m_suggestionsModel = new PlaylistModel( ui->suggestionsView );
-    ui->suggestionsView->setPlaylistModel( m_suggestionsModel );
-
-    foreach( const Tomahawk::query_ptr& query, m_queries )
-    {
-        m_suggestionsModel->append( query );
-    }
-
-    loader->deleteLater();
-}
-
-
-void
-NewPlaylistWidget::savePlaylist()
-{
-    Tomahawk::playlist_ptr playlist;
-
-    playlist = Tomahawk::Playlist::create( SourceList::instance()->getLocal(), uuid(), ui->titleEdit->text(), "", "", false, m_queries );
-
-    ViewManager::instance()->show( playlist );
-    cancel();
-}
-
-
-void
-NewPlaylistWidget::cancel()
-{
-    // will be deleted by viewmanager
-    emit destroyed( this );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/newplaylistwidget.h Deleted

@@ -1,83 +0,0 @@
-/* === 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
- *   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 NEWPLAYLISTWIDGET_H
-#define NEWPLAYLISTWIDGET_H
-
-#include <QtGui/QWidget>
-#include <QtCore/QTimer>
-
-#include "playlistinterface.h"
-#include "viewpage.h"
-
-#include "dllmacro.h"
-
-class QPushButton;
-class PlaylistModel;
-
-namespace Ui
-{
-    class NewPlaylistWidget;
-}
-
-class DLLEXPORT NewPlaylistWidget : public QWidget, public Tomahawk::ViewPage
-{
-Q_OBJECT
-
-public:
-    NewPlaylistWidget( QWidget* parent = 0 );
-    ~NewPlaylistWidget();
-
-    virtual QWidget* widget() { return this; }
-    virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return Tomahawk::playlistinterface_ptr(); }
-
-    virtual QString title() const { return tr( "Create a new playlist" ); }
-    virtual QString description() const { return QString(); }
-
-    virtual bool showStatsBar() const { return false; }
-
-    virtual bool jumpToCurrentTrack() { return false; }
-
-protected:
-    void changeEvent( QEvent* e );
-
-signals:
-    void destroyed( QWidget* widget );
-
-private slots:
-    void onTitleChanged( const QString& title );
-    void onTagChanged();
-
-    void updateSuggestions();
-    void suggestionsFound();
-
-    void savePlaylist();
-    void cancel();
-
-private:
-    Ui::NewPlaylistWidget *ui;
-
-    PlaylistModel* m_suggestionsModel;
-    QList< Tomahawk::query_ptr > m_queries;
-
-    QTimer m_filterTimer;
-    QString m_tag;
-    QPushButton* m_saveButton;
-};
-
-#endif // NEWPLAYLISTWIDGET_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/newplaylistwidget.ui Deleted

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>NewPlaylistWidget</class>
- <widget class="QWidget" name="NewPlaylistWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>729</width>
-    <height>460</height>
-   </rect>
-  </property>
-  <property name="focusPolicy">
-   <enum>Qt::TabFocus</enum>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Enter a title for the new playlist:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="titleEdit">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>26</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Just enter a genre or tag name and Tomahawk will suggest a few songs to get you started with your new playlist:</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLineEdit" name="tagEdit">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>26</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="PlaylistView" name="suggestionsView"/>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>PlaylistView</class>
-   <extends>QTreeView</extends>
-   <header>playlist/playlistview.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/overlaywidget.cpp Deleted

@@ -1,173 +0,0 @@
-/* === 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
- *   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 "overlaywidget.h"
-
-#include <QPainter>
-#include <QPropertyAnimation>
-
-#include "utils/logger.h"
-
-#define CORNER_ROUNDNESS 8.0
-#define FADING_DURATION 500
-#define FONT_SIZE 16
-#define OPACITY 0.70
-
-
-OverlayWidget::OverlayWidget( QWidget* parent )
-    : QWidget( parent ) // this is on purpose!
-    , m_opacity( 0.00 )
-    , m_parent( parent )
-{
-    resize( 380, 128 );
-    setAttribute( Qt::WA_TranslucentBackground, true );
-
-    setOpacity( m_opacity );
-
-    m_timer.setSingleShot( true );
-    connect( &m_timer, SIGNAL( timeout() ), this, SLOT( hide() ) );
-
-#ifdef Q_WS_MAC
-    QFont f( font() );
-    f.setPointSize( f.pointSize() - 2 );
-    setFont( f );
-#endif
-}
-
-
-OverlayWidget::~OverlayWidget()
-{
-}
-
-
-void
-OverlayWidget::setOpacity( qreal opacity )
-{
-    m_opacity = opacity;
-
-    if ( m_opacity == 0.00 && !isHidden() )
-    {
-        QWidget::hide();
-    }
-    else if ( m_opacity > 0.00 && isHidden() )
-    {
-        QWidget::show();
-    }
-
-    repaint();
-}
-
-
-void
-OverlayWidget::setText( const QString& text )
-{
-    m_text = text;
-}
-
-
-void
-OverlayWidget::show( int timeoutSecs )
-{
-    if ( !isEnabled() )
-        return;
-
-    QPropertyAnimation* animation = new QPropertyAnimation( this, "opacity" );
-    animation->setDuration( FADING_DURATION );
-    animation->setEndValue( 1.0 );
-    animation->start();
-
-    if( timeoutSecs > 0 )
-        m_timer.start( timeoutSecs * 1000 );
-}
-
-
-void
-OverlayWidget::hide()
-{
-    if ( !isEnabled() )
-        return;
-
-    QPropertyAnimation* animation = new QPropertyAnimation( this, "opacity" );
-    animation->setDuration( FADING_DURATION );
-    animation->setEndValue( 0.00 );
-    animation->start();
-}
-
-
-bool
-OverlayWidget::shown() const
-{
-    if ( !isEnabled() )
-        return false;
-
-    return m_opacity == OPACITY;
-}
-
-
-void
-OverlayWidget::paintEvent( QPaintEvent* event )
-{
-    Q_UNUSED( event );
-
-    QPoint center( ( m_parent->width() - width() ) / 2, ( m_parent->height() - height() ) / 2 );
-    if ( center != pos() )
-    {
-        move( center );
-        return;
-    }
-
-    QPainter p( this );
-    QRect r = contentsRect();
-
-    p.setBackgroundMode( Qt::TransparentMode );
-    p.setRenderHint( QPainter::Antialiasing );
-    p.setOpacity( m_opacity );
-
-    QPen pen( palette().dark().color(), .5 );
-    p.setPen( pen );
-    p.setBrush( QColor( 30, 30, 30, 255.0 * OPACITY ) );
-
-    p.drawRoundedRect( r, CORNER_ROUNDNESS, CORNER_ROUNDNESS );
-
-    QTextOption to( Qt::AlignCenter );
-    to.setWrapMode( QTextOption::WrapAtWordBoundaryOrAnywhere );
-
-    // shrink to fit if needed
-    QFont f( font() );
-    f.setPointSize( FONT_SIZE );
-    f.setBold( true );
-
-    QRectF textRect = r.adjusted( 8, 8, -8, -8 );
-    qreal availHeight = textRect.height();
-
-    QFontMetricsF fm( f );
-    qreal textHeight = fm.boundingRect( textRect, Qt::AlignCenter | Qt::TextWordWrap, text() ).height();
-    while( textHeight > availHeight )
-    {
-        if( f.pointSize() <= 4 ) // don't try harder
-            break;
-
-        f.setPointSize( f.pointSize() - 1 );
-        fm = QFontMetricsF( f );
-        textHeight = fm.boundingRect( textRect, Qt::AlignCenter | Qt::TextWordWrap, text() ).height();
-    }
-
-    p.setFont( f );
-    p.setPen( palette().highlightedText().color() );
-    p.drawText( r.adjusted( 8, 8, -8, -8 ), text(), to );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/overlaywidget.h Deleted

@@ -1,61 +0,0 @@
-/* === 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
- *   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 OVERLAYWIDGET_H
-#define OVERLAYWIDGET_H
-
-#include <QWidget>
-#include <QAbstractItemView>
-#include <QTimer>
-
-#include "dllmacro.h"
-
-class DLLEXPORT OverlayWidget : public QWidget
-{
-Q_OBJECT
-Q_PROPERTY( qreal opacity READ opacity WRITE setOpacity )
-
-public:
-    OverlayWidget( QWidget* parent );
-    ~OverlayWidget();
-
-    qreal opacity() const { return m_opacity; }
-    void setOpacity( qreal opacity );
-
-    QString text() const { return m_text; }
-    void setText( const QString& text );
-
-    bool shown() const;
-
-public slots:
-    void show( int timeoutSecs = 0 );
-    void hide();
-
-protected:
-//    void changeEvent( QEvent* e );
-    void paintEvent( QPaintEvent* event );
-
-private:
-    QString m_text;
-    qreal m_opacity;
-
-    QWidget* m_parent;
-    QTimer m_timer;
-};
-
-#endif // OVERLAYWIDGET_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/playlisttypeselectordlg.cpp Deleted

@@ -1,92 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Christopher Reichert <creichert07@gmail.com>
- *
- *   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 "playlisttypeselectordlg.h"
-#include "ui_playlisttypeselectordlg.h"
-
-#include "widgets/newplaylistwidget.h"
-#include "viewmanager.h"
-#include "viewpage.h"
-#include "sourcelist.h"
-
-#include "utils/logger.h"
-
-
-PlaylistTypeSelectorDlg::PlaylistTypeSelectorDlg( QWidget* parent, Qt::WindowFlags f )
-    : QDialog( parent, f )
-    , ui( new Ui::PlaylistTypeSelectorDlg )
-{
-    ui->setupUi( this );
-
-#ifdef Q_WS_MAC
-//    ui->
-    ui->verticalLayout->setContentsMargins( 4, 0, 4, 4 );
-
-    setSizeGripEnabled( false );
-    resize( width(), 150 );
-    setMinimumSize( size() );
-    setMaximumSize( size() ); // to remove the resize grip on osx this is the only way
-#else
-    ui->verticalLayout->setContentsMargins( 9, 0, 9, 9 );
-#endif
-
-    ui->line->setMaximumHeight( ui->label->height() );
-    ui->line->setContentsMargins( 0, 0, 0, 0 );
-    m_isAutoPlaylist = false;
-
-    connect( ui->manualPlaylistButton, SIGNAL( clicked() ),
-             this, SLOT( createNormalPlaylist() ));
-    connect( ui->autoPlaylistButton, SIGNAL( clicked() ),
-             this, SLOT( createAutomaticPlaylist() ));
-}
-
-
-PlaylistTypeSelectorDlg::~PlaylistTypeSelectorDlg()
-{
-    delete ui;
-}
-
-
-void
-PlaylistTypeSelectorDlg::createNormalPlaylist()
-{
-    m_isAutoPlaylist = false;
-    done( QDialog::Accepted ); // return code is used to vaidate we did not exit out of the Dialog
-}
-
-
-void
-PlaylistTypeSelectorDlg::createAutomaticPlaylist()
-{
-    m_isAutoPlaylist = true;
-    done( QDialog::Accepted ); // return code is used to vaidate we did not exit out of the Dialog successfully
-}
-
-
-QString
-PlaylistTypeSelectorDlg::playlistName() const
-{
-    return ui->playlistNameLine->text();
-}
-
-
-bool
-PlaylistTypeSelectorDlg::playlistTypeIsAuto() const
-{
-    return m_isAutoPlaylist;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/playlisttypeselectordlg.h Deleted

@@ -1,53 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Christopher Reichert <creichert07@gmail.com>
- *
- *   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 PLAYLISTTYPESELECTORDLG_H
-#define PLAYLISTTYPESELECTORDLG_H
-
-#include <QDialog>
-
-#include "dllmacro.h"
-
-namespace Ui
-{
-    class PlaylistTypeSelectorDlg;
-}
-
-class DLLEXPORT PlaylistTypeSelectorDlg : public QDialog
-{
-Q_OBJECT
-
-public:
-    PlaylistTypeSelectorDlg( QWidget* parent = 0, Qt::WindowFlags = 0 );
-    ~PlaylistTypeSelectorDlg();
-    bool playlistTypeIsNormal() const;
-    bool playlistTypeIsAuto() const;
-    QString playlistName() const;
-
-private slots:
-    void createNormalPlaylist();
-    void createAutomaticPlaylist();
-
-private:
-    bool m_isAutoPlaylist; // if not an auto playlist then its a normal playlist
-
-    Ui::PlaylistTypeSelectorDlg *ui;
-
-};
-
-#endif // PlaylistTypeSelectorDlg_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/querylabel.cpp Deleted

@@ -1,683 +0,0 @@
-/* === 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
- *   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 "querylabel.h"
-
-#include <QApplication>
-#include <QEvent>
-#include <QFontMetrics>
-#include <QMouseEvent>
-#include <QPainter>
-
-#include "artist.h"
-#include "album.h"
-#include "query.h"
-#include "contextmenu.h"
-#include "utils/tomahawkutilsgui.h"
-#include "utils/logger.h"
-
-#define BOXMARGIN 2
-#define DASH "  -  "
-
-using namespace Tomahawk;
-
-
-QueryLabel::QueryLabel( QWidget* parent, Qt::WindowFlags flags )
-    : QFrame( parent, flags )
-    , m_type( Complete )
-{
-    init();
-}
-
-
-QueryLabel::QueryLabel( DisplayType type, QWidget* parent, Qt::WindowFlags flags )
-    : QFrame( parent, flags )
-    , m_type( type )
-{
-    init();
-}
-
-
-QueryLabel::QueryLabel( const Tomahawk::result_ptr& result, DisplayType type, QWidget* parent, Qt::WindowFlags flags )
-    : QFrame( parent, flags )
-    , m_type( type )
-    , m_result( result )
-{
-    init();
-}
-
-
-QueryLabel::QueryLabel( const Tomahawk::query_ptr& query, DisplayType type, QWidget* parent, Qt::WindowFlags flags )
-    : QFrame( parent, flags )
-    , m_type( type )
-    , m_query( query )
-{
-    init();
-}
-
-
-QueryLabel::~QueryLabel()
-{
-}
-
-
-void
-QueryLabel::init()
-{
-    m_contextMenu = new ContextMenu( this );
-    m_contextMenu->setSupportedActions( ContextMenu::ActionQueue | ContextMenu::ActionCopyLink );
-
-    m_hoverType = None;
-    setContentsMargins( 0, 0, 0, 0 );
-    setMouseTracking( true );
-
-    m_useCustomPen = false;
-    m_useCustomFont = false;
-    m_align = Qt::AlignLeft;
-    m_mode = Qt::ElideMiddle;
-}
-
-
-QString
-QueryLabel::text() const
-{
-    QString text;
-
-    if ( m_result.isNull() && m_query.isNull() )
-        return m_text;
-
-    if ( !m_result.isNull() )
-    {
-        if ( m_type & Artist )
-        {
-            text += m_result->artist()->name();
-        }
-        if ( m_type & Album )
-        {
-            smartAppend( text, m_result->album()->name() );
-        }
-        if ( m_type & Track )
-        {
-            smartAppend( text, m_result->track() );
-        }
-    }
-    else
-    {
-        if ( m_type & Artist )
-        {
-            text += m_query->artist();
-        }
-        if ( m_type & Album )
-        {
-            smartAppend( text, m_query->album() );
-        }
-        if ( m_type & Track )
-        {
-            smartAppend( text, m_query->track() );
-        }
-    }
-
-    return text;
-}
-
-
-QString
-QueryLabel::artist() const
-{
-    if ( m_result.isNull() && m_query.isNull() )
-        return QString();
-
-    if ( !m_result.isNull() )
-        return m_result->artist()->name();
-    else
-        return m_query->artist();
-}
-
-
-QString
-QueryLabel::album() const
-{
-    if ( m_result.isNull() && m_query.isNull() )
-        return QString();
-
-    if ( !m_result.isNull() )
-        return m_result->album()->name();
-    else
-        return m_query->album();
-}
-
-
-QString
-QueryLabel::track() const
-{
-    if ( m_result.isNull() && m_query.isNull() )
-        return QString();
-
-    if ( !m_result.isNull() )
-        return m_result->track();
-    else
-        return m_query->track();
-}
-
-
-void
-QueryLabel::setText( const QString& text )
-{
-    setContentsMargins( m_textMargins );
-
-    m_result.clear();
-    m_query.clear();
-    m_text = text;
-
-    updateLabel();
-
-    emit textChanged( m_text );
-    emit resultChanged( m_result );
-}
-
-
-void
-QueryLabel::setResult( const Tomahawk::result_ptr& result )
-{
-    if ( result.isNull() )
-        return;
-
-    if ( !m_text.isEmpty() && contentsMargins().left() != 0 ) // FIXME: hacky
-        m_textMargins = contentsMargins();
-
-    setContentsMargins( BOXMARGIN * 2, BOXMARGIN / 2, BOXMARGIN * 2, BOXMARGIN / 2);
-
-    if ( m_result.isNull() || m_result.data() != result.data() )
-    {
-        m_result = result;
-
-        m_query = m_result->toQuery();
-        QList<Tomahawk::result_ptr> rl;
-        rl << m_result;
-        m_query->addResults( rl );
-
-        updateLabel();
-
-        emit textChanged( text() );
-        emit resultChanged( m_result );
-    }
-}
-
-
-void
-QueryLabel::setQuery( const Tomahawk::query_ptr& query )
-{
-    if ( query.isNull() )
-        return;
-
-    setContentsMargins( BOXMARGIN * 2, BOXMARGIN / 2, BOXMARGIN * 2, BOXMARGIN / 2 );
-
-    if ( m_query.isNull() || m_query.data() != query.data() )
-    {
-        m_query = query;
-        m_result.clear();
-        updateLabel();
-
-        emit textChanged( text() );
-        emit queryChanged( m_query );
-    }
-}
-
-
-Qt::Alignment
-QueryLabel::alignment() const
-{
-    return m_align;
-}
-
-
-void
-QueryLabel::setAlignment( Qt::Alignment alignment )
-{
-    if ( m_align != alignment )
-    {
-        m_align = alignment;
-        update(); // no geometry change, repaint is sufficient
-    }
-}
-
-
-void
-QueryLabel::setTextPen( const QPen & pen )
-{
-    m_useCustomPen = true;
-    m_textPen = pen;
-}
-
-
-QPen
-QueryLabel::textPen() const
-{
-    return m_textPen;
-}
-
-
-Qt::TextElideMode
-QueryLabel::elideMode() const
-{
-    return m_mode;
-}
-
-
-void
-QueryLabel::setElideMode( Qt::TextElideMode mode )
-{
-    if ( m_mode != mode )
-    {
-        m_mode = mode;
-        updateLabel();
-    }
-}
-
-
-QFont
-QueryLabel::font() const
-{
-    return m_font;
-}
-
-
-void
-QueryLabel::setFont( const QFont& font )
-{
-    m_useCustomFont = true;
-    m_font = font;
-}
-
-
-void
-QueryLabel::updateLabel()
-{
-    m_hoverArea = QRect();
-    m_hoverType = None;
-
-    updateGeometry();
-    update();
-}
-
-
-void
-QueryLabel::setExtraContentsMargins( int left, int top, int right, int bottom )
-{
-    QMargins margins = contentsMargins();
-    margins.setLeft( margins.left() + left );
-    margins.setTop( margins.top() + top );
-    margins.setRight( margins.right() + right );
-    margins.setBottom( margins.bottom() + bottom );
-    setContentsMargins( margins );
-}
-
-
-QSize
-QueryLabel::sizeHint() const
-{
-    const QFontMetrics& fm = fontMetrics();
-    QSize size( fm.width( text() ) + contentsMargins().left() * 2, fm.height() + contentsMargins().top() * 2 );
-    return size;
-}
-
-
-QSize
-QueryLabel::minimumSizeHint() const
-{
-    switch ( m_mode )
-    {
-        case Qt::ElideNone:
-            return sizeHint();
-
-        default:
-        {
-            const QFontMetrics& fm = fontMetrics();
-            QSize size( fm.width( "..." ), fm.height() + contentsMargins().top() * 2  );
-            return size;
-        }
-    }
-}
-
-
-void
-QueryLabel::paintEvent( QPaintEvent* event )
-{
-    QFrame::paintEvent( event );
-    QPainter p( this );
-    QRect r = contentsRect();
-    QString s = text();
-    const QString elidedText = fontMetrics().elidedText( s, m_mode, r.width() );
-
-    p.save();
-    p.setRenderHint( QPainter::Antialiasing );
-
-    QFontMetrics fm = fontMetrics();
-    if ( m_useCustomFont )
-    {
-        p.setFont( m_font );
-        fm = QFontMetrics( m_font );
-    }
-
-    if ( m_hoverArea.width() )
-    {
-        if ( elidedText != s )
-        {
-            m_hoverArea.setLeft( 0 );
-            m_hoverArea.setRight( fm.width( elidedText ) + contentsMargins().left() * 2 );
-            m_hoverType = Track;
-        }
-
-        TomahawkUtils::drawQueryBackground( &p, palette(), m_hoverArea );
-    }
-
-    if ( elidedText != s || ( m_result.isNull() && m_query.isNull() ) )
-    {
-        if ( m_hoverArea.width() )
-        {
-            p.setPen( palette().highlightedText().color() );
-            p.setBrush( palette().highlight() );
-        }
-        else
-        {
-            p.setBrush( palette().window() );
-            p.setPen( palette().color( foregroundRole() ) );
-        }
-        p.drawText( r, m_align, elidedText );
-    }
-    else
-    {
-        int dashX = fm.width( DASH );
-        int artistX = m_type & Artist ? fm.width( artist() ) : 0;
-        int albumX = m_type & Album ? fm.width( album() ) : 0;
-        int trackX = m_type & Track ? fm.width( track() ) : 0;
-
-        if ( m_useCustomPen )
-            p.setPen( m_textPen );
-
-        if ( m_type & Artist )
-        {
-            p.setBrush( palette().window() );
-            if ( !m_useCustomPen )
-                p.setPen( palette().color( foregroundRole() ) );
-
-            if ( m_hoverType == Artist )
-            {
-                p.setPen( palette().highlightedText().color() );
-                p.setBrush( palette().highlight() );
-            }
-
-            p.drawText( r, m_align, artist() );
-            r.adjust( artistX, 0, 0, 0 );
-        }
-        if ( m_type & Album )
-        {
-            p.setBrush( palette().window() );
-            if ( !m_useCustomPen )
-                p.setPen( palette().color( foregroundRole() ) );
-
-            if ( m_type & Artist )
-            {
-                p.drawText( r, m_align, DASH );
-                r.adjust( dashX, 0, 0, 0 );
-            }
-            if ( m_hoverType == Album )
-            {
-                p.setPen( palette().highlightedText().color() );
-                p.setBrush( palette().highlight() );
-            }
-
-            p.drawText( r, m_align, album() );
-            r.adjust( albumX, 0, 0, 0 );
-        }
-        if ( m_type & Track )
-        {
-            p.setBrush( palette().window() );
-            if ( !m_useCustomPen )
-                p.setPen( palette().color( foregroundRole() ) );
-
-            if ( m_type & Artist || m_type & Album )
-            {
-                p.drawText( r, m_align, DASH );
-                r.adjust( dashX, 0, 0, 0 );
-            }
-            if ( m_hoverType == Track )
-            {
-                p.setPen( palette().highlightedText().color() );
-                p.setBrush( palette().highlight() );
-            }
-
-            p.drawText( r, m_align, track() );
-            r.adjust( trackX, 0, 0, 0 );
-        }
-    }
-
-    p.restore();
-}
-
-
-void
-QueryLabel::changeEvent( QEvent* event )
-{
-    QFrame::changeEvent( event );
-    switch ( event->type() )
-    {
-        case QEvent::FontChange:
-        case QEvent::ApplicationFontChange:
-            updateLabel();
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-QueryLabel::contextMenuEvent( QContextMenuEvent* event )
-{
-    m_contextMenu->clear();
-    m_contextMenu->setQuery( m_query );
-    m_contextMenu->exec( event->globalPos() );
-}
-
-
-void
-QueryLabel::mousePressEvent( QMouseEvent* event )
-{
-    QFrame::mousePressEvent( event );
-    m_time.restart();
-    m_dragPos = event->pos();
-}
-
-
-void
-QueryLabel::mouseReleaseEvent( QMouseEvent* event )
-{
-    QFrame::mouseReleaseEvent( event );
-
-    m_dragPos = QPoint();
-    qDebug() << "ELAPSED TIME" << m_time.elapsed() << "limit:" << qApp->doubleClickInterval();
-    if ( m_time.elapsed() < qApp->doubleClickInterval() )
-    {
-        switch( m_hoverType )
-        {
-            case Artist:
-                emit clickedArtist();
-                break;
-            case Album:
-                emit clickedAlbum();
-                break;
-            case Track:
-                emit clickedTrack();
-                break;
-
-            default:
-                emit clicked();
-        }
-    }
-}
-
-
-void
-QueryLabel::mouseMoveEvent( QMouseEvent* event )
-{
-    QFrame::mouseMoveEvent( event );
-    int x = event->x();
-
-    if ( event->buttons() & Qt::LeftButton &&
-       ( m_dragPos - event->pos() ).manhattanLength() >= QApplication::startDragDistance() )
-    {
-        startDrag();
-        leaveEvent( 0 );
-        return;
-    }
-
-    if ( m_query.isNull() && m_result.isNull() )
-    {
-        m_hoverArea = QRect();
-        m_hoverType = None;
-        return;
-    }
-
-    QFontMetrics fm = fontMetrics();
-    if ( m_useCustomFont )
-        fm = QFontMetrics( m_font );
-
-    int dashX = fm.width( DASH );
-    int artistX = m_type & Artist ? fm.width( artist() ) : 0;
-    int albumX = m_type & Album ? fm.width( album() ) : 0;
-    int trackX = m_type & Track ? fm.width( track() ) : 0;
-
-    if ( m_type & Track )
-    {
-        trackX += contentsMargins().left();
-    }
-    if ( m_type & Album )
-    {
-        trackX += albumX + dashX;
-        albumX += contentsMargins().left();
-    }
-    if ( m_type & Artist )
-    {
-        albumX += artistX + dashX;
-        trackX += artistX + dashX;
-        artistX += contentsMargins().left();
-    }
-
-    QRect hoverArea;
-    m_hoverType = None;
-    if ( m_type & Artist && x < artistX )
-    {
-        m_hoverType = Artist;
-        hoverArea.setLeft( 0 );
-        hoverArea.setRight( artistX + contentsMargins().left() - 1 );
-    }
-    else if ( m_type & Album && x < albumX && x > artistX )
-    {
-        m_hoverType = Album;
-        int spacing = ( m_type & Artist ) ? dashX : 0;
-        hoverArea.setLeft( artistX + spacing );
-        hoverArea.setRight( albumX + spacing + contentsMargins().left() - 1 );
-    }
-    else if ( m_type & Track && x < trackX && x > albumX )
-    {
-        m_hoverType = Track;
-        int spacing = ( m_type & Album ) ? dashX : 0;
-        hoverArea.setLeft( albumX + spacing );
-        hoverArea.setRight( trackX + contentsMargins().left() - 1 );
-    }
-
-    if ( hoverArea.width() )
-    {
-        hoverArea.setY( 1 );
-        hoverArea.setHeight( height() - 2 );
-    }
-    if ( hoverArea != m_hoverArea )
-    {
-        m_hoverArea = hoverArea;
-        repaint();
-    }
-}
-
-
-void
-QueryLabel::leaveEvent( QEvent* event )
-{
-    Q_UNUSED( event );
-    m_hoverArea = QRect();
-    m_hoverType = None;
-    repaint();
-}
-
-
-void
-QueryLabel::startDrag()
-{
-    if ( m_query.isNull() )
-        return;
-
-    QByteArray queryData;
-    QDataStream queryStream( &queryData, QIODevice::WriteOnly );
-    QMimeData* mimeData = new QMimeData();
-    mimeData->setText( text() );
-
-    queryStream << qlonglong( &m_query );
-
-    mimeData->setData( "application/tomahawk.query.list", queryData );
-
-    if ( m_hoverType != None )
-    {
-        QString extra;
-        switch( m_hoverType )
-        {
-            case Artist:
-                extra = "artist";
-                break;
-            case Album:
-                extra = "album";
-                break;
-            case Track:
-                extra = "track";
-                break;
-            default:
-                break;
-        }
-        mimeData->setData( "application/tomahawk.dragsource.type", extra.toUtf8() );
-    }
-    QDrag *drag = new QDrag( this );
-    drag->setMimeData( mimeData );
-    drag->setPixmap( TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeTrack ) );
-
-//    QPoint hotSpot = event->pos() - child->pos();
-//    drag->setHotSpot( hotSpot );
-
-    drag->exec( Qt::CopyAction );
-}
-
-
-QString
-QueryLabel::smartAppend( QString& text, const QString& appendage ) const
-{
-    QString s;
-    if ( !text.isEmpty() )
-        s = DASH;
-
-    text += s + appendage;
-    return text;
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/querylabel.h Deleted

@@ -1,142 +0,0 @@
-/* === 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
- *   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 QUERYLABEL_H
-#define QUERYLABEL_H
-
-#include <QFrame>
-#include <QTime>
-#include <QPen>
-
-#include "result.h"
-#include "query.h"
-#include "typedefs.h"
-#include "dllmacro.h"
-
-namespace Tomahawk
-{
-    class ContextMenu;
-};
-
-class DLLEXPORT QueryLabel : public QFrame
-{
-Q_OBJECT
-
-public:
-    enum DisplayType
-    {
-        None = 0,
-        Artist = 1,
-        Album = 2,
-        Track = 4,
-        ArtistAndAlbum = 3,
-        ArtistAndTrack = 5,
-        AlbumAndTrack = 6,
-        Complete = 7
-    };
-
-    explicit QueryLabel( QWidget* parent = 0, Qt::WindowFlags flags = 0 );
-    explicit QueryLabel( DisplayType type = Complete, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
-    explicit QueryLabel( const Tomahawk::result_ptr& result, DisplayType type = Complete, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
-    explicit QueryLabel( const Tomahawk::query_ptr& query, DisplayType type = Complete, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
-    virtual ~QueryLabel();
-
-    QString text() const;
-    QString artist() const;
-    QString album() const;
-    QString track() const;
-
-    Tomahawk::result_ptr result() const { return m_result; }
-    Tomahawk::query_ptr query() const { return m_query; }
-
-    DisplayType type() const { return m_type; }
-    void setType( DisplayType type ) { m_type = type; }
-
-    Qt::Alignment alignment() const;
-    void setAlignment( Qt::Alignment alignment );
-
-    Qt::TextElideMode elideMode() const;
-    void setElideMode( Qt::TextElideMode mode );
-
-    void setTextPen( const QPen& );
-    QPen textPen() const;
-
-    void setFont( const QFont& );
-    QFont font() const;
-
-    void setExtraContentsMargins( int left, int top, int right, int bottom );
-
-    virtual QSize sizeHint() const;
-    virtual QSize minimumSizeHint() const;
-
-    void init();
-    void updateLabel();
-
-public slots:
-    void setText( const QString& text );
-    void setResult( const Tomahawk::result_ptr& result );
-    void setQuery( const Tomahawk::query_ptr& query );
-
-signals:
-    void clicked();
-    void clickedArtist();
-    void clickedAlbum();
-    void clickedTrack();
-
-    void textChanged( const QString& text );
-    void resultChanged( const Tomahawk::result_ptr& result );
-    void queryChanged( const Tomahawk::query_ptr& query );
-
-protected:
-    virtual void contextMenuEvent( QContextMenuEvent* event );
-
-    virtual void mousePressEvent( QMouseEvent* event );
-    virtual void mouseReleaseEvent( QMouseEvent* event );
-    virtual void mouseMoveEvent( QMouseEvent* event );
-    virtual void leaveEvent( QEvent* event );
-
-    virtual void changeEvent( QEvent* event );
-    virtual void paintEvent( QPaintEvent* event );
-
-    virtual void startDrag();
-
-private:
-    QString smartAppend( QString& text, const QString& appendage ) const;
-    QTime m_time;
-
-    DisplayType m_type;
-    QString m_text;
-    Tomahawk::result_ptr m_result;
-    Tomahawk::query_ptr m_query;
-
-    Tomahawk::ContextMenu* m_contextMenu;
-
-    Qt::Alignment m_align;
-    Qt::TextElideMode m_mode;
-
-    bool m_useCustomPen, m_useCustomFont;
-    QPen m_textPen;
-    QFont m_font;
-
-    DisplayType m_hoverType;
-    QRect m_hoverArea;
-    QPoint m_dragPos;
-    QMargins m_textMargins;
-};
-
-#endif // QUERYLABEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/searchwidget.cpp Deleted

@@ -1,177 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2012       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 "searchwidget.h"
-#include "ui_searchwidget.h"
-
-#include <QPushButton>
-#include <QDialogButtonBox>
-
-#include "sourcelist.h"
-#include "viewmanager.h"
-#include "dynamic/widgets/LoadingSpinner.h"
-#include "playlist/albummodel.h"
-#include "playlist/playlistmodel.h"
-#include "widgets/overlaywidget.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-
-SearchWidget::SearchWidget( const QString& search, QWidget* parent )
-    : QWidget( parent )
-    , ui( new Ui::SearchWidget )
-    , m_search( search )
-{
-    ui->setupUi( this );
-
-    ui->resultsView->setGuid( "searchwidget" );
-    m_resultsModel = new PlaylistModel( ui->resultsView );
-    ui->resultsView->setPlaylistModel( m_resultsModel );
-    ui->resultsView->overlay()->setEnabled( false );
-    ui->resultsView->sortByColumn( PlaylistModel::Score, Qt::DescendingOrder );
-
-    m_albumsModel = new AlbumModel( ui->albumView );
-    ui->albumView->setAlbumModel( m_albumsModel );
-
-    m_artistsModel = new AlbumModel( ui->artistView );
-    ui->artistView->setAlbumModel( m_artistsModel );
-
-    ui->artistView->setAutoFitItems( false );
-    ui->albumView->setAutoFitItems( false );
-    ui->artistView->setSpacing( 8 );
-    ui->albumView->setSpacing( 8 );
-
-    ui->artistView->proxyModel()->sort( -1 );
-    ui->albumView->proxyModel()->sort( -1 );
-
-    TomahawkUtils::unmarginLayout( ui->verticalLayout );
-
-    ui->artistView->setContentsMargins( 0, 0, 0, 0 );
-    ui->artistView->setFrameShape( QFrame::NoFrame );
-    ui->artistView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-    ui->albumView->setContentsMargins( 0, 0, 0, 0 );
-    ui->albumView->setFrameShape( QFrame::NoFrame );
-    ui->albumView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-    ui->resultsView->setContentsMargins( 0, 0, 0, 0 );
-    ui->resultsView->setFrameShape( QFrame::NoFrame );
-    ui->resultsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-    ui->resultsView->loadingSpinner()->fadeIn();
-    m_queries << Tomahawk::Query::get( search, uuid() );
-
-    ui->splitter_2->setStretchFactor( 0, 0 );
-    ui->splitter_2->setStretchFactor( 1, 1 );
-
-    foreach ( const Tomahawk::query_ptr& query, m_queries )
-    {
-        connect( query.data(), SIGNAL( artistsAdded( QList<Tomahawk::artist_ptr> ) ), SLOT( onArtistsFound( QList<Tomahawk::artist_ptr> ) ) );
-        connect( query.data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr> ) ), SLOT( onAlbumsFound( QList<Tomahawk::album_ptr> ) ) );
-        connect( query.data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ), SLOT( onResultsFound( QList<Tomahawk::result_ptr> ) ) );
-        connect( query.data(), SIGNAL( resolvingFinished( bool ) ), SLOT( onQueryFinished() ) );
-    }
-}
-
-
-SearchWidget::~SearchWidget()
-{
-    delete ui;
-}
-
-
-void
-SearchWidget::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-Tomahawk::playlistinterface_ptr
-SearchWidget::playlistInterface() const
-{
-    return ui->resultsView->playlistInterface();
-}
-
-
-bool
-SearchWidget::jumpToCurrentTrack()
-{
-    return ui->resultsView->jumpToCurrentTrack();
-}
-
-
-void
-SearchWidget::onResultsFound( const QList<Tomahawk::result_ptr>& results )
-{
-    QList<Tomahawk::artist_ptr> artists;
-    QList<Tomahawk::album_ptr> albums;
-
-    foreach( const Tomahawk::result_ptr& result, results )
-    {
-        if ( !result->collection().isNull() && !result->isOnline() )
-            continue;
-
-        QList< Tomahawk::result_ptr > rl;
-        rl << result;
-
-        Tomahawk::query_ptr q = result->toQuery();
-        q->setResolveFinished( true );
-        q->addResults( rl );
-
-        m_resultsModel->append( q );
-        
-        artists << result->artist();
-        albums << result->album();
-    }
-
-    m_artistsModel->addArtists( artists );
-    m_albumsModel->addAlbums( albums );
-}
-
-
-void
-SearchWidget::onAlbumsFound( const QList<Tomahawk::album_ptr>& albums )
-{
-    m_albumsModel->addAlbums( albums );
-}
-
-
-void
-SearchWidget::onArtistsFound( const QList<Tomahawk::artist_ptr>& artists )
-{
-    m_artistsModel->addArtists( artists );
-}
-
-
-void
-SearchWidget::onQueryFinished()
-{
-    ui->resultsView->loadingSpinner()->fadeOut();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/searchwidget.h Deleted

@@ -1,85 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2012       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 SEARCHWIDGET_H
-#define SEARCHWIDGET_H
-
-#include <QWidget>
-#include <QTimer>
-
-#include "result.h"
-#include "playlistinterface.h"
-#include "viewpage.h"
-
-#include "dllmacro.h"
-
-class QPushButton;
-class AlbumModel;
-class PlaylistModel;
-
-namespace Ui
-{
-    class SearchWidget;
-}
-
-class DLLEXPORT SearchWidget : public QWidget, public Tomahawk::ViewPage
-{
-Q_OBJECT
-
-public:
-    SearchWidget( const QString& search, QWidget* parent = 0 );
-    ~SearchWidget();
-
-    virtual QWidget* widget() { return this; }
-    virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
-    virtual bool isTemporaryPage() const { return true; }
-
-    virtual QString title() const { return QString( tr( "Search: %1" ) ).arg( m_search ); }
-    virtual QString description() const { return tr( "Results for '%1'" ).arg( m_search ); }
-    virtual QPixmap pixmap() const { return QPixmap( RESPATH "images/search-icon.png" ); }
-
-    virtual bool showStatsBar() const { return false; }
-
-    virtual bool jumpToCurrentTrack();
-
-protected:
-    void changeEvent( QEvent* e );
-
-signals:
-    void destroyed( QWidget* widget );
-
-private slots:
-    void onResultsFound( const QList<Tomahawk::result_ptr>& results );
-    void onAlbumsFound( const QList<Tomahawk::album_ptr>& albums );
-    void onArtistsFound( const QList<Tomahawk::artist_ptr>& artists );
-
-    void onQueryFinished();
-
-private:
-    Ui::SearchWidget *ui;
-
-    QString m_search;
-
-    AlbumModel* m_artistsModel;
-    AlbumModel* m_albumsModel;
-    PlaylistModel* m_resultsModel;
-    QList< Tomahawk::query_ptr > m_queries;
-};
-
-#endif // NEWPLAYLISTWIDGET_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/searchwidget.ui Deleted

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SearchWidget</class>
- <widget class="QWidget" name="SearchWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>985</width>
-    <height>460</height>
-   </rect>
-  </property>
-  <property name="focusPolicy">
-   <enum>Qt::TabFocus</enum>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QSplitter" name="splitter_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="handleWidth">
-      <number>1</number>
-     </property>
-     <widget class="QSplitter" name="splitter">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="handleWidth">
-       <number>1</number>
-      </property>
-      <widget class="AlbumView" name="artistView"/>
-      <widget class="AlbumView" name="albumView"/>
-     </widget>
-     <widget class="PlaylistView" name="resultsView"/>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>PlaylistView</class>
-   <extends>QTreeView</extends>
-   <header>playlist/playlistview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>AlbumView</class>
-   <extends>QListView</extends>
-   <header>playlist/albumview.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/welcomewidget.cpp Deleted

@@ -1,374 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 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 "welcomewidget.h"
-#include "ui_welcomewidget.h"
-
-#include <QtGui/QPainter>
-
-#include "viewmanager.h"
-#include "sourcelist.h"
-#include "tomahawksettings.h"
-#include "RecentPlaylistsModel.h"
-
-#include "audio/audioengine.h"
-#include "playlist/albummodel.h"
-#include "playlist/playlistmodel.h"
-#include "widgets/overlaywidget.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "dynamic/GeneratorInterface.h"
-#include "RecentlyPlayedPlaylistsModel.h"
-
-#define HISTORY_TRACK_ITEMS 25
-#define HISTORY_PLAYLIST_ITEMS 10
-#define HISTORY_RESOLVING_TIMEOUT 2500
-
-using namespace Tomahawk;
-
-
-WelcomeWidget::WelcomeWidget( QWidget* parent )
-    : QWidget( parent )
-    , ui( new Ui::WelcomeWidget )
-{
-    ui->setupUi( this );
-    ui->splitter_2->setStretchFactor( 0, 3 );
-    ui->splitter_2->setStretchFactor( 1, 1 );
-
-    RecentPlaylistsModel* model = new RecentPlaylistsModel( HISTORY_PLAYLIST_ITEMS, this );
-
-    ui->playlistWidget->setFrameShape( QFrame::NoFrame );
-    ui->playlistWidget->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    ui->tracksView->setFrameShape( QFrame::NoFrame );
-    ui->tracksView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    ui->additionsView->setFrameShape( QFrame::NoFrame );
-    ui->additionsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-    TomahawkUtils::unmarginLayout( layout() );
-    TomahawkUtils::unmarginLayout( ui->verticalLayout->layout() );
-    TomahawkUtils::unmarginLayout( ui->verticalLayout_2->layout() );
-    TomahawkUtils::unmarginLayout( ui->verticalLayout_3->layout() );
-    TomahawkUtils::unmarginLayout( ui->verticalLayout_4->layout() );
-
-    ui->playlistWidget->setItemDelegate( new PlaylistDelegate() );
-    ui->playlistWidget->setModel( model );
-    ui->playlistWidget->overlay()->resize( 380, 86 );
-    ui->playlistWidget->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
-    updatePlaylists();
-
-    m_tracksModel = new PlaylistModel( ui->tracksView );
-    m_tracksModel->setStyle( TrackModel::ShortWithAvatars );
-    ui->tracksView->overlay()->setEnabled( false );
-    ui->tracksView->setPlaylistModel( m_tracksModel );
-
-    m_recentAlbumsModel = new AlbumModel( ui->additionsView );
-    ui->additionsView->setAlbumModel( m_recentAlbumsModel );
-    ui->additionsView->proxyModel()->sort( -1 );
-
-    m_timer = new QTimer( this );
-    connect( m_timer, SIGNAL( timeout() ), SLOT( checkQueries() ) );
-
-    connect( SourceList::instance(), SIGNAL( ready() ), SLOT( onSourcesReady() ) );
-    connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
-    connect( ui->playlistWidget, SIGNAL( activated( QModelIndex ) ), SLOT( onPlaylistActivated( QModelIndex ) ) );
-    connect( model, SIGNAL( emptinessChanged( bool ) ), this, SLOT( updatePlaylists() ) );
-}
-
-
-WelcomeWidget::~WelcomeWidget()
-{
-    delete ui;
-}
-
-
-void
-WelcomeWidget::loadData()
-{
-
-    m_recentAlbumsModel->addFilteredCollection( collection_ptr(), 20, DatabaseCommand_AllAlbums::ModificationTime, true );
-}
-
-
-Tomahawk::playlistinterface_ptr
-WelcomeWidget::playlistInterface() const
-{
-    return ui->tracksView->playlistInterface();
-}
-
-
-bool
-WelcomeWidget::jumpToCurrentTrack()
-{
-    return ui->tracksView->jumpToCurrentTrack();
-}
-
-
-bool
-WelcomeWidget::isBeingPlayed() const
-{
-    return AudioEngine::instance()->currentTrackPlaylist() == ui->tracksView->playlistInterface();
-}
-
-
-void
-WelcomeWidget::onSourcesReady()
-{
-    m_tracksModel->loadHistory( Tomahawk::source_ptr(), HISTORY_TRACK_ITEMS );
-
-    foreach ( const source_ptr& source, SourceList::instance()->sources() )
-        onSourceAdded( source );
-}
-
-
-void
-WelcomeWidget::updateRecentAdditions()
-{
-    m_recentAlbumsModel->addFilteredCollection( collection_ptr(), 20, DatabaseCommand_AllAlbums::ModificationTime, true );
-}
-
-
-void
-WelcomeWidget::updatePlaylists()
-{
-    int num = ui->playlistWidget->model()->rowCount( QModelIndex() );
-    if ( num == 0 )
-    {
-        ui->playlistWidget->overlay()->setText( tr( "No recently created playlists in your network." ) );
-        ui->playlistWidget->overlay()->show();
-    }
-    else
-        ui->playlistWidget->overlay()->hide();
-}
-
-
-void
-WelcomeWidget::onSourceAdded( const Tomahawk::source_ptr& source )
-{
-    connect( source->collection().data(), SIGNAL( changed() ), SLOT( updateRecentAdditions() ), Qt::UniqueConnection );
-    connect( source.data(), SIGNAL( playbackFinished( Tomahawk::query_ptr ) ), SLOT( onPlaybackFinished( Tomahawk::query_ptr ) ), Qt::UniqueConnection );
-}
-
-
-void
-WelcomeWidget::checkQueries()
-{
-    if ( m_timer->isActive() )
-        m_timer->stop();
-
-    m_tracksModel->ensureResolved();
-}
-
-
-void
-WelcomeWidget::onPlaybackFinished( const Tomahawk::query_ptr& query )
-{
-    int count = m_tracksModel->trackCount();
-    unsigned int playtime = query->playedBy().second;
-
-    if ( count )
-    {
-        TrackModelItem* oldestItem = m_tracksModel->itemFromIndex( m_tracksModel->index( count - 1, 0, QModelIndex() ) );
-        if ( oldestItem->query()->playedBy().second >= playtime )
-            return;
-
-        TrackModelItem* youngestItem = m_tracksModel->itemFromIndex( m_tracksModel->index( 0, 0, QModelIndex() ) );
-        if ( youngestItem->query()->playedBy().second <= playtime )
-            m_tracksModel->insert( query, 0 );
-        else
-        {
-            for ( int i = 0; i < count - 1; i++ )
-            {
-                TrackModelItem* item1 = m_tracksModel->itemFromIndex( m_tracksModel->index( i, 0, QModelIndex() ) );
-                TrackModelItem* item2 = m_tracksModel->itemFromIndex( m_tracksModel->index( i + 1, 0, QModelIndex() ) );
-
-                if ( item1->query()->playedBy().second >= playtime && item2->query()->playedBy().second <= playtime )
-                {
-                    m_tracksModel->insert( query, i + 1 );
-                    break;
-                }
-            }
-        }
-    }
-    else
-        m_tracksModel->insert( query, 0 );
-
-    if ( m_tracksModel->trackCount() > HISTORY_TRACK_ITEMS )
-        m_tracksModel->remove( HISTORY_TRACK_ITEMS );
-
-    if ( m_timer->isActive() )
-        m_timer->stop();
-    m_timer->start( HISTORY_RESOLVING_TIMEOUT );
-}
-
-
-void
-WelcomeWidget::onPlaylistActivated( const QModelIndex& item )
-{
-    Tomahawk::playlist_ptr pl = item.data( RecentlyPlayedPlaylistsModel::PlaylistRole ).value< Tomahawk::playlist_ptr >();
-    if( Tomahawk::dynplaylist_ptr dynplaylist = pl.dynamicCast< Tomahawk::DynamicPlaylist >() )
-        ViewManager::instance()->show( dynplaylist );
-    else
-        ViewManager::instance()->show( pl );
-}
-
-
-void
-WelcomeWidget::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-QSize
-PlaylistDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    Q_UNUSED( option );
-    Q_UNUSED( index );
-    return QSize( 0, 64 );
-}
-
-
-void
-PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, QModelIndex() );
-    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
-
-    if ( option.state & QStyle::State_Selected && option.state & QStyle::State_Active )
-    {
-        opt.palette.setColor( QPalette::Text, opt.palette.color( QPalette::HighlightedText ) );
-    }
-
-    painter->save();
-    painter->setRenderHint( QPainter::Antialiasing );
-    painter->setPen( opt.palette.color( QPalette::Text ) );
-
-    QTextOption to;
-    to.setAlignment( Qt::AlignCenter );
-    QFont font = opt.font;
-    font.setPixelSize( 10 );
-
-    QFont boldFont = font;
-    boldFont.setBold( true );
-    boldFont.setPixelSize( 11 );
-
-    QFont figFont = boldFont;
-    figFont.setPixelSize( 10 );
-
-    QPixmap icon;
-    RecentlyPlayedPlaylistsModel::PlaylistTypes type = (RecentlyPlayedPlaylistsModel::PlaylistTypes)index.data( RecentlyPlayedPlaylistsModel::PlaylistTypeRole ).toInt();
-    if( type == RecentlyPlayedPlaylistsModel::StaticPlaylist )
-        icon = m_playlistIcon;
-    else if( type == RecentlyPlayedPlaylistsModel::AutoPlaylist )
-        icon = m_autoIcon;
-    else if( type == RecentlyPlayedPlaylistsModel::Station )
-        icon = m_stationIcon;
-
-    QRect pixmapRect = option.rect.adjusted( 10, 13, -option.rect.width() + 48, -13 );
-    icon = icon.scaled( pixmapRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation );
-
-    painter->drawPixmap( pixmapRect, icon );
-
-    if ( type != RecentlyPlayedPlaylistsModel::Station )
-    {
-        painter->save();
-        painter->setFont( figFont );
-        QString tracks = index.data( RecentlyPlayedPlaylistsModel::TrackCountRole ).toString();
-        int width = painter->fontMetrics().width( tracks );
-//         int bottomEdge = pixmapRect
-        // right edge 10px past right edge of pixmapRect
-        // bottom edge flush with bottom of pixmap
-        QRect rect( pixmapRect.right() - width , 0, width - 8, 0 );
-        rect.adjust( -1, 0, 0, 0 );
-        rect.setTop( pixmapRect.bottom() - painter->fontMetrics().height() - 1 );
-        rect.setBottom( pixmapRect.bottom() + 1 );
-
-        QColor figColor( 153, 153, 153 );
-        painter->setPen( figColor );
-        painter->setBrush( figColor );
-
-        TomahawkUtils::drawBackgroundAndNumbers( painter, tracks, rect );
-        painter->restore();
-    }
-
-    QPixmap avatar = index.data( RecentlyPlayedPlaylistsModel::PlaylistRole ).value< Tomahawk::playlist_ptr >()->author()->avatar( Source::FancyStyle );
-    if ( avatar.isNull() )
-        avatar = m_defaultAvatar;
-    QRect r( option.rect.width() - avatar.width() - 10, option.rect.top() + option.rect.height()/2 - avatar.height()/2, avatar.width(), avatar.height() );
-    painter->drawPixmap( r, avatar );
-
-    painter->setFont( font );
-    QString author = index.data( RecentlyPlayedPlaylistsModel::PlaylistRole ).value< Tomahawk::playlist_ptr >()->author()->friendlyName();
-    if ( author.contains( "@" ) )
-        author = author.mid( 0, author.indexOf( '@' ) );
-
-    const int w = painter->fontMetrics().width( author ) + 2;
-    QRect avatarNameRect( opt.rect.width() - 10 - w, r.bottom(), w, opt.rect.bottom() - r.bottom() );
-    painter->drawText( avatarNameRect, author, QTextOption( Qt::AlignCenter ) );
-
-    const int leftEdge = opt.rect.width() - qMin( avatarNameRect.left(), r.left() );
-    QString descText;
-    if ( type == RecentlyPlayedPlaylistsModel::Station )
-    {
-        descText = index.data( RecentlyPlayedPlaylistsModel::DynamicPlaylistRole ).value< Tomahawk::dynplaylist_ptr >()->generator()->sentenceSummary();
-    }
-    else
-    {
-        descText = index.data( RecentlyPlayedPlaylistsModel::ArtistRole ).toString();
-    }
-
-    QColor c = painter->pen().color();
-    if ( !( option.state & QStyle::State_Selected && option.state & QStyle::State_Active ) )
-    {
-        painter->setPen( QColor( Qt::gray ).darker() );
-    }
-
-    QRect rectText = option.rect.adjusted( 66, 20, -leftEdge - 10, -8 );
-#ifdef Q_WS_MAC
-    rectText.adjust( 0, 1, 0, 0 );
-#elif defined Q_WS_WIN
-    rectText.adjust( 0, 2, 0, 0 );
-#endif
-
-    painter->drawText( rectText, descText );
-    painter->setPen( c );
-    painter->setFont( font );
-
-    painter->setFont( boldFont );
-    painter->drawText( option.rect.adjusted( 56, 6, -100, -option.rect.height() + 20 ), index.data().toString() );
-
-    painter->restore();
-}
-
-
-PlaylistWidget::PlaylistWidget( QWidget* parent )
-    : QListView( parent )
-{
-    m_overlay = new OverlayWidget( this );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/welcomewidget.h Deleted

@@ -1,126 +0,0 @@
-/* === 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
- *   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 WELCOMEWIDGET_H
-#define WELCOMEWIDGET_H
-
-#include <QWidget>
-#include <QListWidgetItem>
-#include <QStyledItemDelegate>
-
-#include "playlistinterface.h"
-
-#include "query.h"
-#include "source.h"
-#include "viewpage.h"
-
-#include "utils/tomahawkutilsgui.h"
-
-#include "dllmacro.h"
-
-class AlbumModel;
-class PlaylistModel;
-class OverlayWidget;
-
-namespace Ui
-{
-    class WelcomeWidget;
-}
-
-class DLLEXPORT PlaylistDelegate : public QStyledItemDelegate
-{
-Q_OBJECT
-
-public:
-    PlaylistDelegate()
-    {
-        m_playlistIcon = QPixmap( RESPATH "images/playlist-icon.png" );
-        m_autoIcon = QPixmap( RESPATH "images/automatic-playlist.png" );
-        m_stationIcon = QPixmap( RESPATH "images/station.png" );
-        m_defaultAvatar = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/user-avatar.png" ) );
-    }
-
-protected:
-    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-private:
-    QPixmap m_playlistIcon, m_autoIcon, m_stationIcon, m_defaultAvatar;
-};
-
-class DLLEXPORT PlaylistWidget : public QListView
-{
-public:
-    PlaylistWidget( QWidget* parent = 0 );
-
-    OverlayWidget* overlay() const { return m_overlay; }
-
-private:
-    OverlayWidget* m_overlay;
-};
-
-
-class DLLEXPORT WelcomeWidget : public QWidget, public Tomahawk::ViewPage
-{
-Q_OBJECT
-
-public:
-    WelcomeWidget( QWidget* parent = 0 );
-    virtual ~WelcomeWidget();
-
-    virtual QWidget* widget() { return this; }
-    virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
-
-    virtual QString title() const { return tr( "Welcome to Tomahawk" ); }
-    virtual QString description() const { return QString(); }
-
-    virtual bool showStatsBar() const { return false; }
-    virtual bool showInfoBar() const { return false; }
-
-    virtual bool jumpToCurrentTrack();
-    virtual bool isBeingPlayed() const;
-
-protected:
-    void changeEvent( QEvent* e );
-
-signals:
-    void destroyed( QWidget* widget );
-
-public slots:
-    void updatePlaylists();
-    void updateRecentAdditions();
-
-    void loadData();
-private slots:
-    void onSourcesReady();
-    void onSourceAdded( const Tomahawk::source_ptr& source );
-    void onPlaylistActivated( const QModelIndex& );
-    void onPlaybackFinished( const Tomahawk::query_ptr& query );
-
-    void checkQueries();
-
-private:
-    Ui::WelcomeWidget *ui;
-
-    PlaylistModel* m_tracksModel;
-    AlbumModel* m_recentAlbumsModel;
-
-    QTimer* m_timer;
-};
-
-#endif // WELCOMEWIDGET_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/welcomewidget.ui Deleted

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>WelcomeWidget</class>
- <widget class="QWidget" name="WelcomeWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>875</width>
-    <height>513</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
-   <item>
-    <widget class="QSplitter" name="splitter_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="handleWidth">
-      <number>1</number>
-     </property>
-     <widget class="QSplitter" name="splitter">
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <property name="handleWidth">
-       <number>1</number>
-      </property>
-      <widget class="QWidget" name="layoutWidget1">
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="HeaderLabel" name="label_4">
-          <property name="text">
-           <string>Recent Additions</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="AlbumView" name="additionsView">
-          <property name="dragEnabled">
-           <bool>true</bool>
-          </property>
-          <property name="selectionMode">
-           <enum>QAbstractItemView::ExtendedSelection</enum>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="layoutWidget2">
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="HeaderLabel" name="label_2">
-          <property name="text">
-           <string>Newest Stations &amp; Playlists</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="PlaylistWidget" name="playlistWidget"/>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="layoutWidget">
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="HeaderLabel" name="label_3">
-         <property name="text">
-          <string>Recently Played Tracks</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="PlaylistView" name="tracksView">
-         <property name="minimumSize">
-          <size>
-           <width>320</width>
-           <height>0</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>HeaderLabel</class>
-   <extends>QLabel</extends>
-   <header location="global">widgets/HeaderLabel.h</header>
-  </customwidget>
-  <customwidget>
-   <class>AlbumView</class>
-   <extends>QListView</extends>
-   <header>playlist/albumview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>PlaylistView</class>
-   <extends>QTreeView</extends>
-   <header>playlist/playlistview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>PlaylistWidget</class>
-   <extends>QListWidget</extends>
-   <header>widgets/welcomewidget.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/whatshotwidget.cpp Deleted

@@ -1,524 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 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 "whatshotwidget.h"
-#include "whatshotwidget_p.h"
-#include "ui_whatshotwidget.h"
-
-#include <QPainter>
-#include <QStandardItemModel>
-#include <QStandardItem>
-
-#include "viewmanager.h"
-#include "sourcelist.h"
-#include "tomahawksettings.h"
-#include "RecentPlaylistsModel.h"
-#include "ChartDataLoader.h"
-
-#include "audio/audioengine.h"
-#include "dynamic/GeneratorInterface.h"
-#include "playlist/playlistmodel.h"
-#include "playlist/treeproxymodel.h"
-#include "widgets/overlaywidget.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "pipeline.h"
-
-#define HISTORY_TRACK_ITEMS 25
-#define HISTORY_PLAYLIST_ITEMS 10
-#define HISTORY_RESOLVING_TIMEOUT 2500
-
-using namespace Tomahawk;
-
-static QString s_whatsHotIdentifier = QString( "WhatsHotWidget" );
-
-
-WhatsHotWidget::WhatsHotWidget( QWidget* parent )
-    : QWidget( parent )
-    , ui( new Ui::WhatsHotWidget )
-    , m_sortedProxy( 0 )
-    , m_workerThread( 0 )
-{
-    ui->setupUi( this );
-
-    ui->albumsView->setFrameShape( QFrame::NoFrame );
-    ui->albumsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-    TomahawkUtils::unmarginLayout( layout() );
-    TomahawkUtils::unmarginLayout( ui->stackLeft->layout() );
-    TomahawkUtils::unmarginLayout( ui->horizontalLayout->layout() );
-    TomahawkUtils::unmarginLayout( ui->horizontalLayout_2->layout() );
-    TomahawkUtils::unmarginLayout( ui->breadCrumbLeft->layout() );
-    TomahawkUtils::unmarginLayout( ui->verticalLayout->layout() );
-
-    m_crumbModelLeft = new QStandardItemModel( this );
-    m_sortedProxy = new QSortFilterProxyModel( this );
-    m_sortedProxy->setDynamicSortFilter( true );
-    m_sortedProxy->setFilterCaseSensitivity( Qt::CaseInsensitive );
-
-    ui->breadCrumbLeft->setRootIcon( QPixmap( RESPATH "images/charts.png" ) );
-
-    connect( ui->breadCrumbLeft, SIGNAL( activateIndex( QModelIndex ) ), SLOT( leftCrumbIndexChanged(QModelIndex) ) );
-
-    ui->tracksViewLeft->setFrameShape( QFrame::NoFrame );
-    ui->tracksViewLeft->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    ui->tracksViewLeft->overlay()->setEnabled( false );
-    ui->tracksViewLeft->setHeaderHidden( true );
-    ui->tracksViewLeft->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-
-    TreeProxyModel* artistsProxy = new TreeProxyModel( ui->artistsViewLeft );
-    artistsProxy->setFilterCaseSensitivity( Qt::CaseInsensitive );
-    artistsProxy->setDynamicSortFilter( true );
-
-    ui->artistsViewLeft->setProxyModel( artistsProxy );
-    ui->artistsViewLeft->setFrameShape( QFrame::NoFrame );
-    ui->artistsViewLeft->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
-    ui->artistsViewLeft->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
-    ui->artistsViewLeft->header()->setVisible( true );
-
-    m_playlistInterface = Tomahawk::playlistinterface_ptr( new ChartsPlaylistInterface( this ) );
-
-    m_workerThread = new QThread( this );
-    m_workerThread->start();
-
-    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 ) ) );
-}
-
-
-WhatsHotWidget::~WhatsHotWidget()
-{
-    qDeleteAll( m_workers );
-    m_workers.clear();
-    m_workerThread->exit(0);
-    m_playlistInterface.clear();
-    delete ui;
-}
-
-
-Tomahawk::playlistinterface_ptr
-WhatsHotWidget::playlistInterface() const
-{
-    return m_playlistInterface;
-}
-
-
-bool
-WhatsHotWidget::isBeingPlayed() const
-{
-    if ( AudioEngine::instance()->currentTrackPlaylist() == ui->artistsViewLeft->playlistInterface() )
-        return true;
-
-    if ( AudioEngine::instance()->currentTrackPlaylist() == ui->tracksViewLeft->playlistInterface() )
-        return true;
-
-    return false;
-}
-
-
-bool
-WhatsHotWidget::jumpToCurrentTrack()
-{
-    if ( ui->artistsViewLeft->jumpToCurrentTrack() )
-        return true;
-
-    if ( ui->tracksViewLeft->jumpToCurrentTrack() )
-        return true;
-
-    return false;
-}
-
-
-void
-WhatsHotWidget::fetchData()
-{
-    Tomahawk::InfoSystem::InfoStringHash artistInfo;
-
-    Tomahawk::InfoSystem::InfoRequestData requestData;
-    requestData.caller = s_whatsHotIdentifier;
-    requestData.customData = QVariantMap();
-    requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
-    requestData.type = Tomahawk::InfoSystem::InfoChartCapabilities;
-    requestData.timeoutMillis = 20000;
-    requestData.allSources = true;
-    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-
-    tDebug( LOGVERBOSE ) << "WhatsHot: requested InfoChartCapabilities";
-}
-
-
-void
-WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
-{
-    if ( requestData.caller != s_whatsHotIdentifier )
-        return;
-
-    if ( !output.canConvert< QVariantMap >() )
-    {
-        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "WhatsHot: Could not parse output";
-        return;
-    }
-
-    QVariantMap returnedData = output.toMap();
-    switch ( requestData.type )
-    {
-        case InfoSystem::InfoChartCapabilities:
-        {
-            QStandardItem *rootItem= m_crumbModelLeft->invisibleRootItem();
-            QVariantMap defaults;
-            if ( returnedData.contains( "defaults" ) )
-                defaults = returnedData.take( "defaults" ).toMap();
-            QString defaultSource = returnedData.take( "defaultSource" ).toString();
-
-            foreach ( const QString label, returnedData.keys() )
-            {
-                QStandardItem *childItem = parseNode( rootItem, label, returnedDatalabel );
-                rootItem->appendRow(childItem);
-            }
-
-            // Set the default source
-            // Set the default chart for each source
-            for ( int i = 0; i < rootItem->rowCount(); i++ )
-            {
-                QStandardItem* source = rootItem->child( i, 0 );
-                if ( defaultSource.toLower() == source->text().toLower() )
-                {
-                    source->setData( true, Breadcrumb::DefaultRole );
-                }
-
-                if ( defaults.contains( source->text().toLower() ) )
-                {
-                    QStringList defaultIndices = defaults source->text().toLower() .toStringList();
-                    QStandardItem* cur = source;
-
-                    foreach( const QString& index, defaultIndices )
-                    {
-                        // Go through the children of the current item, marking the default one as default
-                        for ( int k = 0; k < cur->rowCount(); k++ )
-                        {
-                            if ( cur->child( k, 0 )->text() == index )
-                            {
-                                cur = cur->child( k, 0 ); // this is the default, drill down into the default to pick the next default
-                                cur->setData( true, Breadcrumb::DefaultRole );
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-
-            m_sortedProxy->setSourceModel( m_crumbModelLeft );
-            m_sortedProxy->sort( 0, Qt::AscendingOrder );
-            ui->breadCrumbLeft->setModel( m_sortedProxy );
-            break;
-        }
-
-        case InfoSystem::InfoChart:
-        {
-            if( !returnedData.contains("type") )
-                break;
-            const QString type = returnedData"type".toString();
-            if( !returnedData.contains(type) )
-                break;
-            const QString side = requestData.customData"whatshot_side".toString();
-            const QString chartId = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >().value( "chart_id" );
-
-            m_queuedFetches.remove( chartId );
-
-            ChartDataLoader* loader = new ChartDataLoader();
-            loader->setProperty( "chartid", chartId );
-            loader->moveToThread( m_workerThread );
-
-            if ( type == "artists" )
-            {
-                loader->setType( ChartDataLoader::Artist );
-                loader->setData( returnedData "artists" .value< QStringList >() );
-
-                connect( loader, SIGNAL( artists( Tomahawk::ChartDataLoader*, QList< Tomahawk::artist_ptr > ) ), this, SLOT( chartArtistsLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::artist_ptr > ) ) );
-
-                TreeModel* artistsModel = new TreeModel( ui->artistsViewLeft );
-                artistsModel->setMode( InfoSystemMode );
-                artistsModel->setColumnStyle( TreeModel::AllColumns );
-
-                m_artistModels chartId  = artistsModel;
-
-                if ( m_queueItemToShow == chartId )
-                    setLeftViewArtists( artistsModel );
-            }
-            else if ( type == "albums" )
-            {
-
-                loader->setType( ChartDataLoader::Album );
-                loader->setData( returnedData "albums" .value< QList< Tomahawk::InfoSystem::InfoStringHash > >() );
-
-                connect( loader, SIGNAL( albums( Tomahawk::ChartDataLoader*, QList< Tomahawk::album_ptr > ) ), this, SLOT( chartAlbumsLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::album_ptr > ) ) );
-
-                AlbumModel* albumModel = new AlbumModel( ui->albumsView );
-
-                m_albumModels chartId  = albumModel;
-
-                if ( m_queueItemToShow == chartId )
-                    setLeftViewAlbums( albumModel );
-            }
-            else if ( type == "tracks" )
-            {
-
-                loader->setType( ChartDataLoader::Track );
-                loader->setData( returnedData "tracks" .value< QList< Tomahawk::InfoSystem::InfoStringHash > >() );
-
-                connect( loader, SIGNAL( tracks( Tomahawk::ChartDataLoader*, QList< Tomahawk::query_ptr > ) ), this, SLOT( chartTracksLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::query_ptr > ) ) );
-
-                PlaylistModel* trackModel = new PlaylistModel( ui->tracksViewLeft );
-                trackModel->setStyle( TrackModel::Short );
-
-                m_trackModels chartId  = trackModel;
-
-                if ( m_queueItemToShow == chartId )
-                    setLeftViewTracks( trackModel );
-            }
-
-            QMetaObject::invokeMethod( loader, "go", Qt::QueuedConnection );
-
-            break;
-        }
-
-        default:
-            return;
-    }
-}
-
-
-void
-WhatsHotWidget::infoSystemFinished( QString target )
-{
-    Q_UNUSED( target );
-}
-
-
-void
-WhatsHotWidget::leftCrumbIndexChanged( QModelIndex index )
-{
-    tDebug( LOGVERBOSE ) << "WhatsHot:: left crumb changed" << index.data();
-    QStandardItem* item = m_crumbModelLeft->itemFromIndex( m_sortedProxy->mapToSource( index ) );
-    if( !item )
-        return;
-    if( !item->data( Breadcrumb::ChartIdRole ).isValid() )
-        return;
-
-
-    QList<QModelIndex> indexes;
-    while ( index.parent().isValid() )
-    {
-        indexes.prepend(index);
-        index = index.parent();
-    }
-
-
-    const QString chartId = item->data( Breadcrumb::ChartIdRole ).toString();
-
-    if ( m_artistModels.contains( chartId ) )
-    {
-        setLeftViewArtists( m_artistModels chartId  );
-        return;
-    }
-    else if ( m_albumModels.contains( chartId ) )
-    {
-        setLeftViewAlbums( m_albumModels chartId  );
-        return;
-    }
-    else if ( m_trackModels.contains( chartId ) )
-    {
-        setLeftViewTracks( m_trackModels chartId  );
-        return;
-    }
-
-    if ( m_queuedFetches.contains( chartId ) )
-    {
-        return;
-    }
-
-    Tomahawk::InfoSystem::InfoStringHash criteria;
-    criteria.insert( "chart_id", chartId );
-    /// Remember to lower the source!
-    criteria.insert( "chart_source",  index.data().toString().toLower() );
-
-    Tomahawk::InfoSystem::InfoRequestData requestData;
-    QVariantMap customData;
-    customData.insert( "whatshot_side", "left" );
-    requestData.caller = s_whatsHotIdentifier;
-    requestData.customData = customData;
-    requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( criteria );
-    requestData.type = Tomahawk::InfoSystem::InfoChart;
-    requestData.timeoutMillis = 20000;
-    requestData.allSources = true;
-
-    qDebug() << "Making infosystem request for chart of type:" <<chartId;
-    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-
-    m_queuedFetches.insert( chartId );
-    m_queueItemToShow = chartId;
-}
-
-
-void
-WhatsHotWidget::changeEvent( QEvent* e )
-{
-    QWidget::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-QStandardItem*
-WhatsHotWidget::parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data )
-{
-    Q_UNUSED( parentItem );
-//     tDebug( LOGVERBOSE ) << "WhatsHot:: parsing " << label;
-
-    QStandardItem *sourceItem = new QStandardItem(label);
-
-    if ( data.canConvert< QList< Tomahawk::InfoSystem::InfoStringHash > >() )
-    {
-        QList< Tomahawk::InfoSystem::InfoStringHash > charts = data.value< QList< Tomahawk::InfoSystem::InfoStringHash > >();
-        foreach ( Tomahawk::InfoSystem::InfoStringHash chart, charts )
-        {
-            QStandardItem *childItem= new QStandardItem( chart "label"  );
-            childItem->setData( chart "id" , Breadcrumb::ChartIdRole );
-            if ( chart.value( "default", "" ) == "true")
-            {
-                childItem->setData( true, Breadcrumb::DefaultRole );
-            }
-            sourceItem->appendRow( childItem );
-        }
-    }
-    else if ( data.canConvert<QVariantMap>() )
-    {
-        QVariantMap dataMap = data.toMap();
-        foreach ( const QString childLabel,dataMap.keys() )
-        {
-            QStandardItem *childItem  = parseNode( sourceItem, childLabel, dataMapchildLabel );
-            sourceItem->appendRow( childItem );
-        }
-    }
-    else if ( data.canConvert<QVariantList>() )
-    {
-        QVariantList dataList = data.toList();
-
-        foreach ( const QVariant value, dataList )
-        {
-            QStandardItem *childItem= new QStandardItem(value.toString());
-            sourceItem->appendRow(childItem);
-        }
-    }
-    else
-    {
-        QStandardItem *childItem= new QStandardItem( data.toString() );
-        sourceItem->appendRow( childItem );
-    }
-    return sourceItem;
-}
-
-
-void
-WhatsHotWidget::setLeftViewAlbums( AlbumModel* model )
-{
-    ui->albumsView->setAlbumModel( model );
-    ui->albumsView->proxyModel()->sort( -1 ); // disable sorting, must be called after artistsViewLeft->setTreeModel
-    ui->stackLeft->setCurrentIndex( 2 );
-}
-
-
-void
-WhatsHotWidget::setLeftViewArtists( TreeModel* model )
-{
-    ui->artistsViewLeft->setTreeModel( model );
-    ui->artistsViewLeft->proxyModel()->sort( -1 ); // disable sorting, must be called after artistsViewLeft->setTreeModel
-    ui->stackLeft->setCurrentIndex( 1 );
-}
-
-
-void
-WhatsHotWidget::setLeftViewTracks( PlaylistModel* model )
-{
-    ui->tracksViewLeft->setPlaylistModel( model );
-    ui->tracksViewLeft->proxyModel()->sort( -1 );
-    ui->stackLeft->setCurrentIndex( 0 );
-}
-
-
-void
-WhatsHotWidget::chartArtistsLoaded( ChartDataLoader* loader, const QList< artist_ptr >& artists )
-{
-    QString chartId = loader->property( "chartid" ).toString();
-    Q_ASSERT( m_artistModels.contains( chartId ) );
-
-    if ( m_artistModels.contains( chartId ) )
-    {
-        foreach( const artist_ptr& artist, artists )
-        {
-            m_artistModels chartId ->addArtists( artist );
-        }
-    }
-
-    m_workers.remove( loader );
-    loader->deleteLater();
-}
-
-
-void
-WhatsHotWidget::chartTracksLoaded( ChartDataLoader* loader, const QList< query_ptr >& tracks )
-{
-
-    QString chartId = loader->property( "chartid" ).toString();
-    Q_ASSERT( m_trackModels.contains( chartId ) );
-
-    if ( m_trackModels.contains( chartId ) )
-    {
-        Pipeline::instance()->resolve( tracks );
-        m_trackModels chartId ->append( tracks );
-    }
-
-    m_workers.remove( loader );
-    loader->deleteLater();
-}
-
-
-void
-WhatsHotWidget::chartAlbumsLoaded( ChartDataLoader* loader, const QList< album_ptr >& albums )
-{
-    QString chartId = loader->property( "chartid" ).toString();
-    Q_ASSERT( m_albumModels.contains( chartId ) );
-
-    if ( m_albumModels.contains( chartId ) )
-        m_albumModels chartId ->addAlbums( albums );
-
-    m_workers.remove( loader );
-    loader->deleteLater();
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/whatshotwidget.h Deleted

@@ -1,127 +0,0 @@
-/* === 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
- *   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 WHATSHOTWIDGET_H
-#define WHATSHOTWIDGET_H
-
-#include <QtGui/QWidget>
-#include <QtGui/QListWidgetItem>
-#include <QtGui/QStyledItemDelegate>
-
-#include "playlistinterface.h"
-#include "infosystem/infosystem.h"
-#include "viewpage.h"
-
-#include "utils/tomahawkutils.h"
-
-#include "dllmacro.h"
-
-class QSortFilterProxyModel;
-class QStandardItemModel;
-class QStandardItem;
-class TreeModel;
-class PlaylistModel;
-class OverlayWidget;
-class TreeProxyModel;
-class AlbumModel;
-
-namespace Ui
-{
-    class WhatsHotWidget;
-}
-
-namespace Tomahawk
-{
-    class ChartDataLoader;
-    class ChartsPlaylistInterface;
-    class ChartDataLoader;
-}
-
-/**
- * \class
- * \brief The tomahawk page that shows music charts.
- */
-class DLLEXPORT WhatsHotWidget : public QWidget, public Tomahawk::ViewPage
-{
-Q_OBJECT
-
-public:
-    WhatsHotWidget( QWidget* parent = 0 );
-    ~WhatsHotWidget();
-
-    virtual QWidget* widget() { return this; }
-    virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
-
-    virtual QString title() const { return tr( "Charts" ); }
-    virtual QString description() const { return QString(); }
-
-    virtual bool showStatsBar() const { return false; }
-    virtual bool showInfoBar() const { return false; }
-
-    virtual bool jumpToCurrentTrack();
-    virtual bool isBeingPlayed() const;
-
-protected:
-    void changeEvent( QEvent* e );
-
-signals:
-    void destroyed( QWidget* widget );
-
-public slots:
-    void fetchData();
-
-private slots:
-    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-    void infoSystemFinished( QString target );
-    void leftCrumbIndexChanged( QModelIndex );
-
-    void chartArtistsLoaded( Tomahawk::ChartDataLoader*, const QList< Tomahawk::artist_ptr >& );
-    void chartAlbumsLoaded( Tomahawk::ChartDataLoader*, const QList< Tomahawk::album_ptr >& );
-    void chartTracksLoaded( Tomahawk::ChartDataLoader*, const QList< Tomahawk::query_ptr >& );
-
-private:
-    void setLeftViewArtists( TreeModel* artistModel );
-    void setLeftViewAlbums( AlbumModel* albumModel );
-    void setLeftViewTracks( PlaylistModel* trackModel );
-
-
-    QStandardItem* parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data );
-    Ui::WhatsHotWidget *ui;
-    Tomahawk::playlistinterface_ptr m_playlistInterface;
-
-    QStandardItemModel* m_crumbModelLeft;
-    QSortFilterProxyModel* m_sortedProxy;
-
-    // Load artist, album, and track objects in a thread
-    // {Artist,Album,Track}::get() calls are all synchronous db calls
-    // and we don't want to lock up out UI in case the db is busy (e.g. on startup)
-    QThread* m_workerThread;
-    QSet< Tomahawk::ChartDataLoader* > m_workers;
-
-    // Cache our model data
-    QHash< QString, AlbumModel* > m_albumModels;
-    QHash< QString, TreeModel* > m_artistModels;
-    QHash< QString, PlaylistModel* > m_trackModels;
-    QString m_queueItemToShow;
-    QSet< QString > m_queuedFetches;
-    QTimer* m_timer;
-
-    friend class Tomahawk::ChartsPlaylistInterface;
-};
-
-#endif // WHATSHOTWIDGET_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/whatshotwidget.ui Deleted

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>WhatsHotWidget</class>
- <widget class="QWidget" name="WhatsHotWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>875</width>
-    <height>513</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <widget class="Tomahawk::Breadcrumb" name="breadCrumbLeft" native="true"/>
-   </item>
-   <item>
-    <widget class="QStackedWidget" name="stackLeft">
-     <widget class="QWidget" name="page">
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="PlaylistView" name="tracksViewLeft">
-         <property name="minimumSize">
-          <size>
-           <width>320</width>
-           <height>0</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="page1">
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="ArtistView" name="artistsViewLeft">
-         <property name="minimumSize">
-          <size>
-           <width>320</width>
-           <height>0</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="page2">
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="AlbumView" name="albumsView">
-         <property name="dragEnabled">
-          <bool>true</bool>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>AlbumView</class>
-   <extends>QListView</extends>
-   <header location="global">playlist/albumview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ArtistView</class>
-   <extends>QTreeView</extends>
-   <header>artistview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>PlaylistView</class>
-   <extends>QTreeView</extends>
-   <header>playlist/playlistview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>Tomahawk::Breadcrumb</class>
-   <extends>QWidget</extends>
-   <header>widgets/Breadcrumb.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/whatshotwidget_p.h Deleted

@@ -1,112 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 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 WHATSHOTWIDGET_P_H
-#define WHATSHOTWIDGET_P_H
-
-#include "whatshotwidget.h"
-#include "playlistinterface.h"
-#include "ui_whatshotwidget.h"
-#include "treeproxymodel.h"
-#include "playlistview.h"
-#include "result.h"
-
-#include <QObject>
-
-namespace Tomahawk
-{
-
-class ChartsPlaylistInterface : public Tomahawk::PlaylistInterface
-{
-    Q_OBJECT
-public:
-    explicit ChartsPlaylistInterface( WhatsHotWidget* w )
-        : PlaylistInterface()
-        , m_w( w )
-    {
-        connect( m_w->ui->tracksViewLeft->proxyModel()->playlistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
-                 SLOT( anyRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
-        connect( m_w->ui->artistsViewLeft->proxyModel()->playlistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
-                 SLOT( anyRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
-
-        connect( m_w->ui->tracksViewLeft->proxyModel()->playlistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ),
-                 SLOT( anyShuffleChanged( bool ) ) );
-        connect( m_w->ui->artistsViewLeft->proxyModel()->playlistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ),
-                 SLOT( anyShuffleChanged( bool ) ) );
-    }
-    virtual ~ChartsPlaylistInterface() {}
-
-    // Any one is fine, we keep them all synched
-    virtual RepeatMode repeatMode() const { return m_w->ui->tracksViewLeft->proxyModel()->playlistInterface()->repeatMode(); }
-
-    virtual bool shuffled() const { return m_w->ui->tracksViewLeft->proxyModel()->playlistInterface()->shuffled(); }
-
-    // Do nothing
-    virtual Tomahawk::result_ptr currentItem() const { return Tomahawk::result_ptr(); }
-    virtual Tomahawk::result_ptr siblingItem( int ) { return Tomahawk::result_ptr(); }
-    virtual int trackCount() const { return 0; }
-    virtual QList< Tomahawk::query_ptr > tracks() { return QList< Tomahawk::query_ptr >(); }
-    virtual int unfilteredTrackCount() const { return 0; }
-
-    virtual bool hasChildInterface( Tomahawk::playlistinterface_ptr other )
-    {
-        return m_w->ui->tracksViewLeft->playlistInterface() == other ||
-               m_w->ui->artistsViewLeft->playlistInterface() == other;
-
-    }
-
-public slots:
-    virtual void setRepeatMode( RepeatMode mode )
-    {
-        m_w->ui->tracksViewLeft->proxyModel()->playlistInterface()->setRepeatMode( mode );
-        m_w->ui->artistsViewLeft->proxyModel()->playlistInterface()->setRepeatMode( mode );
-    }
-
-    virtual void setShuffled( bool enabled )
-    {
-        m_w->ui->tracksViewLeft->proxyModel()->playlistInterface()->setShuffled( enabled );
-        m_w->ui->artistsViewLeft->proxyModel()->playlistInterface()->setShuffled( enabled );
-    }
-
-signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void trackCountChanged( unsigned int tracks );
-    void sourceTrackCountChanged( unsigned int tracks );
-    void nextTrackReady();
-
-private slots:
-    void anyRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode )
-    {
-        emit repeatModeChanged( mode );
-    }
-
-    void anyShuffleChanged( bool enabled )
-    {
-        emit shuffleModeChanged( enabled );
-    }
-
-private:
-    WhatsHotWidget* m_w;
-
-};
-
-} //ns
-
-#endif

tomahawk-0.4.2.tar.bz2/src/mac/macdelegate.h Deleted

@@ -1,40 +0,0 @@
-#ifndef MACDELEGATE_H
-#define MACDELEGATE_H
-
-// This file inspired by clementine's macdelegate.h
-
-#import <AppKit/NSApplication.h>
-
-#include "SPMediaKeyTap.h"
-
-namespace Tomahawk {
-    class MacShortcutHandler;
-    class PlatformInterface;
-}
-
-#if ( defined MAC_OS_X_VERSION_10_7 || defined SNOW_LEOPARD )
-@interface AppDelegate :NSObject <NSApplicationDelegate> {
-#else
-@interface AppDelegate :NSObject {
-#endif
-  Tomahawk::PlatformInterface* application_handler_;
-  NSMenu* dock_menu_;
-  SPMediaKeyTap* key_tap_;
-  Tomahawk::MacShortcutHandler* shortcut_handler_;
-}
-
-- (id) initWithHandler: (Tomahawk::PlatformInterface*)handler;
-// NSApplicationDelegate
-- (BOOL) applicationShouldHandleReopen: (NSApplication*)app hasVisibleWindows:(BOOL)flag;
-- (NSMenu*) applicationDockMenu: (NSApplication*)sender;
-- (void) setDockMenu: (NSMenu*)menu;
-- (Tomahawk::MacShortcutHandler*) shortcutHandler;
-- (void) setShortcutHandler: (Tomahawk::MacShortcutHandler*)backend;
-- (void)applicationDidFinishLaunching:(NSNotification*)aNotification;
-- (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication*)sender;
-- (void) mediaKeyTap: (SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
-@end
-
-
-
-#endif // MACDELEGATE_H

tomahawk-0.4.2.tar.bz2/src/mac/macshortcuthandler.cpp Deleted

@@ -1,50 +0,0 @@
-/* === 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
- *   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 "macshortcuthandler.h"
-
-#include <IOKit/hidsystem/ev_keymap.h>
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-MacShortcutHandler::MacShortcutHandler(QObject *parent) :
-    Tomahawk::ShortcutHandler(parent)
-{
-
-}
-
-void
-MacShortcutHandler::macMediaKeyPressed( int key )
-{
-    switch (key) {
-      case NX_KEYTYPE_PLAY:
-        qDebug() << "emitting PlayPause pressed";
-        emit playPause();
-        break;
-      case NX_KEYTYPE_FAST:
-        qDebug() << "emitting next pressed";
-        emit next();
-        break;
-      case NX_KEYTYPE_REWIND:
-        qDebug() << "emitting prev pressed";
-        emit previous();
-        break;
-    }
-}

tomahawk-0.4.2.tar.bz2/src/mac/macshortcuthandler.h Deleted

@@ -1,40 +0,0 @@
-/* === 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
- *   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 MACSHORTCUTHANDLER_H
-#define MACSHORTCUTHANDLER_H
-
-#include "shortcuthandler.h"
-
-#include <QObject>
-
-namespace Tomahawk {
-
-
-class MacShortcutHandler : public ShortcutHandler
-{
-    Q_OBJECT
-public:
-    explicit MacShortcutHandler(QObject *parent = 0);
-
-    void macMediaKeyPressed( int key );
-};
-
-}
-
-#endif // MACSHORTCUTHANDLER_H

tomahawk-0.4.2.tar.bz2/src/mac/tomahawkapp_mac.h Deleted

@@ -1,50 +0,0 @@
-/* === 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 TOMAHAWKAPP_MAC_H
-#define TOMAHAWKAPP_MAC_H
-
-// this file and tomahawk_app.mm copied and inspired by mac_startup.* in clementine player,
-// copyright David Sansome 2010
-
-class QString;
-
-namespace Tomahawk {
-
-class MacShortcutHandler;
-
-/// Interface between cocoa and tomahawk
-class PlatformInterface {
- public:
-  // Called when the application should show itself.
-  virtual void activate() = 0;
-  virtual bool loadUrl( const QString& url ) = 0;
-
-  virtual ~PlatformInterface() {}
-};
-
-void macMain();
-void setShortcutHandler(Tomahawk::MacShortcutHandler* engine);
-// used for opening files with tomahawk
-void setApplicationHandler(PlatformInterface* handler);
-void checkForUpdates();
-void enableFullscreen();
-
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/mac/tomahawkapp_mac.mm Deleted

@@ -1,279 +0,0 @@
-/* === 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 "tomahawkapp_mac.h"
-
-#include "macdelegate.h"
-#include "macshortcuthandler.h"
-#include "config.h"
-#include "tomahawkwindow.h"
-#include "audio/audioengine.h"
-
-#import <AppKit/NSApplication.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSBundle.h>
-#import <Foundation/NSError.h>
-#import <Foundation/NSFileManager.h>
-#import <Foundation/NSPathUtilities.h>
-#import <Foundation/NSThread.h>
-#import <Foundation/NSTimer.h>
-#import <Foundation/NSAppleEventManager.h>
-#import <Foundation/NSURL.h>
-#import <AppKit/NSEvent.h>
-#import <AppKit/NSNibDeclarations.h>
-
-#ifdef HAVE_SPARKLE
-#import <Sparkle/SUUpdater.h>
-#endif
-
-#include <QDebug>
-#include <QApplication>
-
-@interface MacApplication :NSApplication {
-    AppDelegate* delegate_;
-    Tomahawk::MacShortcutHandler* shortcut_handler_;
-    Tomahawk::PlatformInterface* application_handler_;
-}
-
-- (Tomahawk::MacShortcutHandler*) shortcutHandler;
-- (void) setShortcutHandler: (Tomahawk::MacShortcutHandler*)handler;
-
-- (Tomahawk::PlatformInterface*) application_handler;
-- (void) setApplicationHandler: (Tomahawk::PlatformInterface*)handler;
-
-#ifdef HAVE_SPARKLE
-// SUUpdaterDelegate
-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update;
-#endif
-
-@end
-
-
-@implementation AppDelegate
-
-- (id) init {
-  if ((self = super init)) {
-      application_handler_ = nil;
-      shortcut_handler_ = nil;
-      //dock_menu_ = nil;
-  }
-  return self;
-}
-
-- (id) initWithHandler: (Tomahawk::PlatformInterface*)handler {
-  application_handler_ = handler;
-
-  // Register defaults for the whitelist of apps that want to use media keys
-  NSUserDefaults standardUserDefaults registerDefaults:NSDictionary dictionaryWithObjectsAndKeys:
-     SPMediaKeyTap defaultMediaKeyUserBundleIdentifiers, @"SPApplicationsNeedingMediaKeys",
-      nil;
-
-
-  return self;
-}
-
-- (BOOL) applicationShouldHandleReopen: (NSApplication*)app hasVisibleWindows:(BOOL)flag {
-  if (application_handler_) {
-    application_handler_->activate();
-  }
-  return YES;
-}
-
-- (void) setDockMenu: (NSMenu*)menu {
-  dock_menu_ = menu;
-}
-
-- (NSMenu*) applicationDockMenu: (NSApplication*)sender {
-  return dock_menu_;
-}
-
-
-- (Tomahawk::MacShortcutHandler*) shortcutHandler {
-    return shortcut_handler_;
-}
-
-- (void) setShortcutHandler: (Tomahawk::MacShortcutHandler*)handler {
-    // should be the same as MacApplication's
-  shortcut_handler_ = handler;
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
-  key_tap_ = SPMediaKeyTap alloc initWithDelegate:self;
-  if(SPMediaKeyTap usesGlobalMediaKeyTap)
-    key_tap_ startWatchingMediaKeys;
-  else
-    qWarning()<<"Media key monitoring disabled";
-
-}
-
-- (void) mediaKeyTap: (SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event {
-  NSAssert(event type == NSSystemDefined && event subtype == SPSystemDefinedEventMediaKeys, @"Unexpected NSEvent in mediaKeyTap:receivedMediaKeyEvent:");
-
-  int key_code = ((event data1 & 0xFFFF0000) >> 16);
-  int key_flags = (event data1 & 0x0000FFFF);
-  BOOL key_is_pressed = (((key_flags & 0xFF00) >> 8)) == 0xA;
-  // not used. keep just in case
-  //  int key_repeat = (key_flags & 0x1);
-
-  if (!shortcut_handler_) {
-    qWarning() << "No shortcut handler when we get a media key event...";
-    return;
-  }
-  if (key_is_pressed) {
-    shortcut_handler_->macMediaKeyPressed(key_code);
-  }
-}
-
-- (BOOL) application: (NSApplication*)app openFile:(NSString*)filename {
-
-  if (application_handler_->loadUrl(QString::fromUtf8(filename UTF8String))) {
-    return YES;
-  }
-
-  return NO;
-}
-
-- (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication*) sender {
-  return NSTerminateNow;
-}
-
-@end
-
-@implementation MacApplication
-
-- (id) init {
-  if ((self = super init)) {
-      self setShortcutHandler:nil;
-      self setApplicationHandler:nil;
-
-      NSAppleEventManager *em = NSAppleEventManager sharedAppleEventManager;
-      em
-        setEventHandler:self
-        andSelector:@selector(getUrl:withReplyEvent:)
-        forEventClass:kInternetEventClass
-        andEventID:kAEGetURL;
-      em
-        setEventHandler:self
-        andSelector:@selector(getUrl:withReplyEvent:)
-        forEventClass:'WWW!'
-        andEventID:'OURL';
-      NSString *bundleID = NSBundle mainBundle bundleIdentifier;
-      OSStatus httpResult = LSSetDefaultHandlerForURLScheme((CFStringRef)@"tomahawk", (CFStringRef)bundleID);
-
-      Q_UNUSED(httpResult);
-      //TODO: Check httpResult and httpsResult for errors
-  }
-  return self;
-}
-
-- (Tomahawk::MacShortcutHandler*) shortcutHandler {
-    return shortcut_handler_;
-}
-
-- (void) setShortcutHandler: (Tomahawk::MacShortcutHandler*)handler {
-    // should be the same as AppDelegate's
-  shortcut_handler_ = handler;
-}
-
-- (Tomahawk::PlatformInterface*) application_handler {
-  return application_handler_;
-}
-
-- (void) setApplicationHandler: (Tomahawk::PlatformInterface*)handler {
-  delegate_ = AppDelegate alloc initWithHandler:handler;
-  // App-shortcut-handler set before delegate is set.
-  // this makes sure the delegate's shortcut_handler is set
-  delegate_ setShortcutHandler:shortcut_handler_;
-  self setDelegate:delegate_;
-}
-
--(void) sendEvent: (NSEvent*)event {
-    // If event tap is not installed, handle events that reach the app instead
-    BOOL shouldHandleMediaKeyEventLocally = !SPMediaKeyTap usesGlobalMediaKeyTap;
-
-    if(shouldHandleMediaKeyEventLocally && event type == NSSystemDefined && event subtype == SPSystemDefinedEventMediaKeys) {
-      (id)self delegate mediaKeyTap: nil receivedMediaKeyEvent: event;
-    }
-
-    super sendEvent: event;
-}
-
-#ifdef HAVE_SPARKLE
-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
-{
-    tLog() << "NSApp in willInstallUpdate, deleting Phonon objects";
-    AudioEngine::instance()->stop();
-    delete AudioEngine::instance();
-}
-#endif
-
-@end
-
-void Tomahawk::macMain() {
-  NSAutoreleasePool alloc init;
-  // Creates and sets the magic global variable so QApplication will find it.
-  MacApplication sharedApplication;
-#ifdef HAVE_SPARKLE
-    // Creates and sets the magic global variable for Sparkle.
-    SUUpdater sharedUpdater setDelegate: NSApp;
-#endif
-}
-
-
-void Tomahawk::setShortcutHandler(Tomahawk::MacShortcutHandler* handler) {
-  NSApp setShortcutHandler: handler;
-}
-
-void Tomahawk::setApplicationHandler(Tomahawk::PlatformInterface* handler) {
-  NSApp setApplicationHandler: handler;
-}
-
-void Tomahawk::checkForUpdates() {
-#ifdef HAVE_SPARKLE
-  SUUpdater sharedUpdater checkForUpdates: NSApp;
-#endif
-}
-
-#ifdef LION
-#define SET_LION_FULLSCREEN NSWindowCollectionBehaviorFullScreenPrimary
-#else
-#define SET_LION_FULLSCREEN (NSUInteger)(1 << 7) // Defined as NSWindowCollectionBehaviorFullScreenPrimary in lion's NSWindow.h
-#endif
-
-void Tomahawk::enableFullscreen()
-{
-    // We don't support anything below leopard, so if it's not snow leopard it must be lion
-    // Can't check for lion as Qt 4.7 doesn't have the enum val, not checking for Unknown as it will be lion
-    // on 4.8
-    if ( QSysInfo::MacintoshVersion != QSysInfo::MV_SNOWLEOPARD &&
-         QSysInfo::MacintoshVersion != QSysInfo::MV_LEOPARD   )
-    {
-        qDebug() << "Enabling Lion Full-screeen";
-        // Can't include tomahawkapp.h in a .mm file, pulls in infosystem.h which uses
-        // the objc keyword 'id'
-        foreach( QWidget* w, QApplication::topLevelWidgets() )
-        {
-            if ( qobject_cast< TomahawkWindow* >( w ) )
-            {
-                NSView *nsview = (NSView *)w->winId();
-                NSWindow *nswindow = nsview window;
-                nswindow setCollectionBehavior:SET_LION_FULLSCREEN;
-            }
-        }
-    }
-}

tomahawk-0.4.2.tar.bz2/src/musicscanner.cpp Deleted

@@ -1,381 +0,0 @@
-/* === 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
- *   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 "musicscanner.h"
-
-#include <QtCore/QCoreApplication>
-
-#include "utils/tomahawkutils.h"
-#include "tomahawksettings.h"
-#include "sourcelist.h"
-#include "database/database.h"
-#include "database/databasecommand_dirmtimes.h"
-#include "database/databasecommand_filemtimes.h"
-#include "database/databasecommand_collectionstats.h"
-#include "database/databasecommand_addfiles.h"
-#include "database/databasecommand_deletefiles.h"
-#include "taghandlers/tag.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-void
-DirLister::go()
-{
-    foreach ( const QString& dir, m_dirs )
-    {
-        m_opcount++;
-        QMetaObject::invokeMethod( this, "scanDir", Qt::QueuedConnection, Q_ARG( QDir, QDir( dir, 0 ) ), Q_ARG( int, 0 ) );
-    }
-}
-
-
-void
-DirLister::scanDir( QDir dir, int depth )
-{
-    if ( isDeleting() )
-    {
-        m_opcount--;
-        if ( m_opcount == 0 )
-            emit finished();
-
-        return;
-    }
-
-    tDebug( LOGVERBOSE ) << "DirLister::scanDir scanning:" << dir.canonicalPath();
-    if ( !dir.exists() )
-    {
-        tDebug( LOGVERBOSE ) << "Dir no longer exists, not scanning";
-
-        m_opcount--;
-        if ( m_opcount == 0 )
-            emit finished();
-
-        return;
-    }
-
-    QFileInfoList dirs;
-
-    dir.setFilter( QDir::Files | QDir::Readable | QDir::NoDotAndDotDot );
-    dir.setSorting( QDir::Name );
-    dirs = dir.entryInfoList();
-
-    foreach ( const QFileInfo& di, dirs )
-        emit fileToScan( di );
-
-    dir.setFilter( QDir::Dirs | QDir::Readable | QDir::NoDotAndDotDot );
-    dirs = dir.entryInfoList();
-
-    foreach ( const QFileInfo& di, dirs )
-    {
-        const QString canonical = di.canonicalFilePath();
-        m_opcount++;
-        QMetaObject::invokeMethod( this, "scanDir", Qt::QueuedConnection, Q_ARG( QDir, di.canonicalFilePath() ), Q_ARG( int, depth + 1 ) );
-    }
-
-    m_opcount--;
-    if ( m_opcount == 0 )
-    {
-        tDebug() << Q_FUNC_INFO << "emitting finished";
-        emit finished();
-    }
-}
-
-
-MusicScanner::MusicScanner( const QStringList& dirs, quint32 bs )
-    : QObject()
-    , m_dirs( dirs )
-    , m_batchsize( bs )
-    , m_dirListerThreadController( 0 )
-{
-    m_ext2mime.insert( "mp3", TomahawkUtils::extensionToMimetype( "mp3" ) );
-    m_ext2mime.insert( "ogg", TomahawkUtils::extensionToMimetype( "ogg" ) );
-    m_ext2mime.insert( "oga", TomahawkUtils::extensionToMimetype( "oga" ) );
-    m_ext2mime.insert( "mpc", TomahawkUtils::extensionToMimetype( "mpc" ) );
-    m_ext2mime.insert( "wma", TomahawkUtils::extensionToMimetype( "wma" ) );
-    m_ext2mime.insert( "aac", TomahawkUtils::extensionToMimetype( "aac" ) );
-    m_ext2mime.insert( "m4a", TomahawkUtils::extensionToMimetype( "m4a" ) );
-    m_ext2mime.insert( "mp4", TomahawkUtils::extensionToMimetype( "mp4" ) );
-    m_ext2mime.insert( "flac", TomahawkUtils::extensionToMimetype( "flac" ) );
-}
-
-
-MusicScanner::~MusicScanner()
-{
-    tDebug() << Q_FUNC_INFO;
-
-    if ( !m_dirLister.isNull() )
-    {
-        m_dirListerThreadController->quit();;
-        m_dirListerThreadController->wait( 60000 );
-
-        delete m_dirLister.data();
-        delete m_dirListerThreadController;
-        m_dirListerThreadController = 0;
-    }
-}
-
-
-void
-MusicScanner::startScan()
-{
-    tDebug( LOGVERBOSE ) << "Loading mtimes...";
-    m_scanned = m_skipped = m_cmdQueue = 0;
-    m_skippedFiles.clear();
-
-    SourceList::instance()->getLocal()->scanningProgress( m_scanned );
-
-    // trigger the scan once we've loaded old filemtimes
-    //FIXME: For multiple collection support make sure the right prefix gets passed in...or not...
-    //bear in mind that simply passing in the top-level of a defined collection means it will not return items that need
-    //to be removed that aren't in that root any longer -- might have to do the filtering in setMTimes based on strings
-    DatabaseCommand_FileMtimes *cmd = new DatabaseCommand_FileMtimes();
-    connect( cmd, SIGNAL( done( QMap< QString, QMap< unsigned int, unsigned int > > ) ),
-                    SLOT( setFileMtimes( QMap< QString, QMap< unsigned int, unsigned int > > ) ) );
-
-    Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
-    return;
-}
-
-
-void
-MusicScanner::setFileMtimes( const QMap< QString, QMap< unsigned int, unsigned int > >& m )
-{
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << m.count();
-    m_filemtimes = m;
-    scan();
-}
-
-
-void
-MusicScanner::scan()
-{
-    tDebug( LOGEXTRA ) << "Num saved file mtimes from last scan:" << m_filemtimes.size();
-
-    connect( this, SIGNAL( batchReady( QVariantList, QVariantList ) ),
-                     SLOT( commitBatch( QVariantList, QVariantList ) ), Qt::DirectConnection );
-
-    m_dirListerThreadController = new QThread( this );
-    m_dirListerThreadController->setPriority( QThread::IdlePriority );
-
-    m_dirLister = QWeakPointer< DirLister >( new DirLister( m_dirs ) );
-    m_dirLister.data()->moveToThread( m_dirListerThreadController );
-
-    connect( m_dirLister.data(), SIGNAL( fileToScan( QFileInfo ) ),
-                                   SLOT( scanFile( QFileInfo ) ), Qt::QueuedConnection );
-
-    // queued, so will only fire after all dirs have been scanned:
-    connect( m_dirLister.data(), SIGNAL( finished() ),
-                                   SLOT( listerFinished() ), Qt::QueuedConnection );
-
-    m_dirListerThreadController->start();
-    QMetaObject::invokeMethod( m_dirLister.data(), "go" );
-}
-
-
-void
-MusicScanner::listerFinished()
-{
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
-
-    // any remaining stuff that wasnt emitted as a batch:
-    foreach( const QString& key, m_filemtimes.keys() )
-        m_filesToDelete << m_filemtimes key .keys().first();
-
-    tDebug() << "Lister finished: to delete:" << m_filesToDelete;
-
-    if ( m_filesToDelete.length() || m_scannedfiles.length() )
-    {
-        commitBatch( m_scannedfiles, m_filesToDelete );
-        m_scannedfiles.clear();
-        m_filesToDelete.clear();
-
-        tDebug( LOGINFO ) << "Scanning complete, saving to database. ( scanned" << m_scanned << "skipped" << m_skipped << ")";
-        tDebug( LOGEXTRA ) << "Skipped the following files (no tags / no valid audio):";
-        foreach ( const QString& s, m_skippedFiles )
-            tDebug( LOGEXTRA ) << s;
-    }
-    else
-        cleanup();
-}
-
-
-void
-MusicScanner::cleanup()
-{
-    if ( !m_dirLister.isNull() )
-    {
-        m_dirListerThreadController->quit();;
-        m_dirListerThreadController->wait( 60000 );
-
-        delete m_dirLister.data();
-        delete m_dirListerThreadController;
-        m_dirListerThreadController = 0;
-    }
-
-    tDebug() << Q_FUNC_INFO << "emitting finished!";
-    emit finished();
-}
-
-
-void
-MusicScanner::commitBatch( const QVariantList& tracks, const QVariantList& deletethese )
-{
-    if ( deletethese.length() )
-    {
-        tDebug( LOGINFO ) << Q_FUNC_INFO << "deleting" << deletethese.length() << "tracks";
-        executeCommand( QSharedPointer<DatabaseCommand>( new DatabaseCommand_DeleteFiles( deletethese, SourceList::instance()->getLocal() ) ) );
-    }
-
-    if ( tracks.length() )
-    {
-        tDebug( LOGINFO ) << Q_FUNC_INFO << "adding" << tracks.length() << "tracks";
-        executeCommand( QSharedPointer<DatabaseCommand>( new DatabaseCommand_AddFiles( tracks, SourceList::instance()->getLocal() ) ) );
-    }
-}
-
-
-void
-MusicScanner::executeCommand( QSharedPointer< DatabaseCommand > cmd )
-{
-    tDebug() << Q_FUNC_INFO << m_cmdQueue;
-    m_cmdQueue++;
-    connect( cmd.data(), SIGNAL( finished() ), SLOT( commandFinished() ) );
-    Database::instance()->enqueue( cmd );
-}
-
-
-void
-MusicScanner::commandFinished()
-{
-    tDebug() << Q_FUNC_INFO << m_cmdQueue;
-
-    if ( --m_cmdQueue == 0 )
-        cleanup();
-}
-
-
-void
-MusicScanner::scanFile( const QFileInfo& fi )
-{
-    if ( m_filemtimes.contains( "file://" + fi.canonicalFilePath() ) )
-    {
-        if ( fi.lastModified().toUTC().toTime_t() == m_filemtimes.value( "file://" + fi.canonicalFilePath() ).values().first() )
-        {
-            m_filemtimes.remove( "file://" + fi.canonicalFilePath() );
-            return;
-        }
-
-        m_filesToDelete << m_filemtimes.value( "file://" + fi.canonicalFilePath() ).keys().first();
-        m_filemtimes.remove( "file://" + fi.canonicalFilePath() );
-    }
-
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Scanning file:" << fi.canonicalFilePath();
-    QVariant m = readFile( fi );
-    if ( m.toMap().isEmpty() )
-        return;
-
-    m_scannedfiles << m;
-    if ( m_batchsize != 0 && (quint32)m_scannedfiles.length() >= m_batchsize )
-    {
-        emit batchReady( m_scannedfiles, m_filesToDelete );
-        m_scannedfiles.clear();
-        m_filesToDelete.clear();
-    }
-}
-
-
-QVariant
-MusicScanner::readFile( const QFileInfo& fi )
-{
-    const QString suffix = fi.suffix().toLower();
-
-    if ( !m_ext2mime.contains( suffix ) )
-    {
-        return QVariantMap(); // invalid extension
-    }
-
-    if ( m_scanned )
-        if ( m_scanned % 3 == 0 )
-            SourceList::instance()->getLocal()->scanningProgress( m_scanned );
-    if ( m_scanned % 100 == 0 )
-        tDebug( LOGINFO ) << "Scan progress:" << m_scanned << fi.canonicalFilePath();
-
-    #ifdef COMPLEX_TAGLIB_FILENAME
-        const wchar_t *encodedName = reinterpret_cast< const wchar_t * >( fi.canonicalFilePath().utf16() );
-    #else
-        QByteArray fileName = QFile::encodeName( fi.canonicalFilePath() );
-        const char *encodedName = fileName.constData();
-    #endif
-
-    TagLib::FileRef f( encodedName );
-    if ( f.isNull() || !f.tag() )
-    {
-        m_skippedFiles << fi.canonicalFilePath();
-        m_skipped++;
-        return QVariantMap();
-    }
-
-    int bitrate = 0;
-    int duration = 0;
-
-    Tag *tag = Tag::fromFile( f );
-
-    if ( f.audioProperties() )
-    {
-        TagLib::AudioProperties *properties = f.audioProperties();
-        duration = properties->length();
-        bitrate = properties->bitrate();
-    }
-
-    QString artist = tag->artist().trimmed();
-    QString album  = tag->album().trimmed();
-    QString track  = tag->title().trimmed();
-    if ( artist.isEmpty() || track.isEmpty() )
-    {
-        // FIXME: do some clever filename guessing
-        m_skippedFiles << fi.canonicalFilePath();
-        m_skipped++;
-        return QVariantMap();
-    }
-
-    QString mimetype = m_ext2mime.value( suffix );
-    QString url( "file://%1" );
-
-    QVariantMap m;
-    m"url"          = url.arg( fi.canonicalFilePath() );
-    m"mtime"        = fi.lastModified().toUTC().toTime_t();
-    m"size"         = (unsigned int)fi.size();
-    m"mimetype"     = mimetype;
-    m"duration"     = duration;
-    m"bitrate"      = bitrate;
-    m"artist"       = artist;
-    m"album"        = album;
-    m"track"        = track;
-    m"albumpos"     = tag->track();
-    m"year"         = tag->year();
-    m"albumartist"  = tag->albumArtist();
-    m"composer"     = tag->composer();
-    m"discnumber"   = tag->discNumber();
-    m"hash"         = ""; // TODO
-
-    m_scanned++;
-    return m;
-}

tomahawk-0.4.2.tar.bz2/src/musicscanner.h Deleted

@@ -1,126 +0,0 @@
-/* === 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
- *   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 MUSICSCANNER_H
-#define MUSICSCANNER_H
-
-#include "tomahawksettings.h"
-#include "database/databasecommand.h"
-
-/* taglib */
-#include <taglib/fileref.h>
-#include <taglib/tag.h>
-
-#include <QtCore/QVariantMap>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QString>
-#include <QtCore/QDateTime>
-#include <QtCore/QTimer>
-#include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QWeakPointer>
-#include <database/database.h>
-
-// descend dir tree comparing dir mtimes to last known mtime
-// emit signal for any dir with new content, so we can scan it.
-// finally, emit the list of new mtimes we observed.
-class DirLister : public QObject
-{
-Q_OBJECT
-
-public:
-
-    DirLister( const QStringList& dirs )
-        : QObject(), m_dirs( dirs ), m_opcount( 0 ), m_deleting( false )
-    {
-        qDebug() << Q_FUNC_INFO;
-    }
-
-    ~DirLister()
-    {
-        qDebug() << Q_FUNC_INFO;
-    }
-
-    bool isDeleting() { QMutexLocker locker( &m_deletingMutex ); return m_deleting; };
-    void setIsDeleting() { QMutexLocker locker( &m_deletingMutex ); m_deleting = true; };
-
-signals:
-    void fileToScan( QFileInfo );
-    void finished();
-
-private slots:
-    void go();
-    void scanDir( QDir dir, int depth );
-
-private:
-    QStringList m_dirs;
-
-    uint m_opcount;
-    QMutex m_deletingMutex;
-    bool m_deleting;
-};
-
-
-class MusicScanner : public QObject
-{
-Q_OBJECT
-
-public:
-    MusicScanner( const QStringList& dirs, quint32 bs = 0 );
-    ~MusicScanner();
-
-signals:
-    //void fileScanned( QVariantMap );
-    void finished();
-    void batchReady( const QVariantList&, const QVariantList& );
-
-private:
-    QVariant readFile( const QFileInfo& fi );
-    void executeCommand( QSharedPointer< DatabaseCommand > cmd );
-
-private slots:
-    void listerFinished();
-    void scanFile( const QFileInfo& fi );
-    void setFileMtimes( const QMap< QString, QMap< unsigned int, unsigned int > >& m );
-    void startScan();
-    void scan();
-    void cleanup();
-    void commitBatch( const QVariantList& tracks, const QVariantList& deletethese );
-    void commandFinished();
-
-private:
-    QStringList m_dirs;
-    QMap<QString, QString> m_ext2mime; // eg: mp3 -> audio/mpeg
-    unsigned int m_scanned;
-    unsigned int m_skipped;
-
-    QList<QString> m_skippedFiles;
-    QMap<QString, QMap< unsigned int, unsigned int > > m_filemtimes;
-
-    unsigned int m_cmdQueue;
-
-    QVariantList m_scannedfiles;
-    QVariantList m_filesToDelete;
-    quint32 m_batchsize;
-
-    QWeakPointer< DirLister > m_dirLister;
-    QThread* m_dirListerThreadController;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/proxydialog.ui Deleted

@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProxyDialog</class>
- <widget class="QDialog" name="ProxyDialog">
-  <property name="windowModality">
-   <enum>Qt::WindowModal</enum>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>222</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Proxy Settings</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
-    <number>2</number>
-   </property>
-   <item>
-    <layout class="QGridLayout" name="gridLayout">
-     <property name="rightMargin">
-      <number>8</number>
-     </property>
-     <property name="horizontalSpacing">
-      <number>4</number>
-     </property>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QComboBox" name="typeBox"/>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="hostLineEdit">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="placeholderText">
-        <string>Hostname of proxy server</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="hostLabel">
-       <property name="text">
-        <string>Host</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="portLabel">
-       <property name="text">
-        <string>Port</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QSpinBox" name="portSpinBox">
-       <property name="minimum">
-        <number>1</number>
-       </property>
-       <property name="maximum">
-        <number>65535</number>
-       </property>
-       <property name="value">
-        <number>1080</number>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QLineEdit" name="userLineEdit">
-       <property name="placeholderText">
-        <string>Proxy login</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="userLabel">
-       <property name="text">
-        <string>User</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="passwordLabel">
-       <property name="text">
-        <string>Password</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="QLineEdit" name="passwordLineEdit">
-       <property name="echoMode">
-        <enum>QLineEdit::Password</enum>
-       </property>
-       <property name="placeholderText">
-        <string>Proxy password</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="typeLabel">
-       <property name="text">
-        <string>Type</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>No Proxy Hosts:
-(Overrides system proxy)</string>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="QLineEdit" name="noHostLineEdit">
-       <property name="placeholderText">
-        <string>localhost *.example.com (space separated)</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="dnsLabel">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1">
-      <widget class="QCheckBox" name="checkBoxUseProxyForDns">
-       <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
-       </property>
-       <property name="text">
-        <string>Use proxy for DNS lookups?</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>ProxyDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>ProxyDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

tomahawk-0.4.2.tar.bz2/src/resolverconfigdelegate.cpp Deleted

@@ -1,151 +0,0 @@
-/* === 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
- *   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 "resolverconfigdelegate.h"
-
-#include "resolversmodel.h"
-#include "ExternalResolverGui.h"
-
-#include <QApplication>
-#include <QPainter>
-#include <QMouseEvent>
-
-#include "utils/logger.h"
-
-#define PADDING 4
-#define ICONSIZE 24
-
-
-ResolverConfigDelegate::ResolverConfigDelegate( QObject* parent )
-    : ConfigDelegateBase( parent )
-{
-    connect( this, SIGNAL( configPressed( QModelIndex ) ), this, SLOT( onConfigPressed( QModelIndex ) ) );
-}
-
-void
-ResolverConfigDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, index );
-    QRect itemRect = opt.rect;
-    int top = itemRect.top();
-
-    QFont name = opt.font;
-    name.setPointSize( name.pointSize() + 2 );
-    name.setBold( true );
-
-    QFont path = opt.font;
-    path.setItalic( true );
-    path.setPointSize( path.pointSize() - 1 );
-
-    const bool error =  (Tomahawk::ExternalResolver::ErrorState)index.data( ResolversModel::ErrorState ).toInt() != Tomahawk::ExternalResolver::NoError;
-    const bool fileNotFound = (Tomahawk::ExternalResolver::ErrorState)index.data( ResolversModel::ErrorState ).toInt() == Tomahawk::ExternalResolver::FileNotFound;
-    const bool failedToLoad = (Tomahawk::ExternalResolver::ErrorState)index.data( ResolversModel::ErrorState ).toInt() == Tomahawk::ExternalResolver::FailedToLoad;
-
-    QFontMetrics bfm( name );
-    QFontMetrics sfm( path );
-
-    // draw the background
-    const QWidget* w = opt.widget;
-    QStyle* style = w ? w->style() : QApplication::style();
-    style->drawPrimitive( QStyle::PE_PanelItemViewItem, &opt, painter, w );
-
-    int rightSplit = itemRect.width();
-    QRect confRect = QRect( rightSplit - ICONSIZE - 2 * PADDING, 2 * PADDING + top, ICONSIZE, ICONSIZE );
-
-    // if the resolver has a config widget, paint it first (right-aligned)
-    if( index.data( ResolversModel::HasConfig ).toBool() ) {
-        QStyleOptionToolButton topt;
-        topt.rect = confRect;
-        topt.pos = confRect.topLeft();
-
-        drawConfigWrench( painter, opt, topt );
-    }
-
-    // draw check
-    QRect checkRect = confRect;
-    checkRect.moveTo( 2 * PADDING, 2 * PADDING + top );
-    opt.rect = checkRect;
-    drawCheckBox( opt, painter, w );
-    itemRect.setX( opt.rect.topRight().x() + PADDING );
-
-    painter->save();
-    painter->setFont( name );
-    QRect textRect = itemRect.adjusted( PADDING, PADDING, -PADDING, -PADDING );
-
-    if( index.data( ResolversModel::HasConfig ).toBool() )
-        textRect.setRight( confRect.topLeft().x() - PADDING );
-
-    textRect.setBottom( itemRect.height() / 2 + top  );
-    QString nameStr = bfm.elidedText( index.data( ResolversModel::ResolverName ).toString(),Qt::ElideRight, textRect.width() );
-    painter->drawText( textRect, nameStr );
-    painter->restore();
-
-    painter->save();
-    painter->setFont( path );
-    QString pathStr = index.data( ResolversModel::ResolverPath ).toString();
-    if( error )
-    {
-        painter->setPen( QColor( Qt::red ).lighter( 150 ) );
-    } else {
-        painter->setPen( Qt::gray );
-    }
-
-    if( fileNotFound ) {
-        pathStr = tr( "Not found: %1" ).arg( pathStr );
-    } else if ( failedToLoad )
-    {
-        pathStr = tr( "Failed to load: %1" ).arg( pathStr );
-    }
-
-    textRect.moveTop(  itemRect.height() / 2 + top );
-    pathStr = sfm.elidedText( pathStr, Qt::ElideMiddle, textRect.width() );
-    painter->drawText( textRect, pathStr );
-    painter->restore();
-
-}
-
-QRect
-ResolverConfigDelegate::configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const
-{
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, idx );
-    QRect itemRect = opt.rect;
-    int top = itemRect.top();
-
-    QRect confRect = QRect( itemRect.width() - ICONSIZE - 2 * PADDING, 2 * PADDING + top, ICONSIZE, ICONSIZE );
-    return confRect;
-}
-
-QRect
-ResolverConfigDelegate::checkRectForIndex( const QStyleOptionViewItem &option, const QModelIndex &idx ) const
-{
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, idx );
-    QRect itemRect = opt.rect;
-    int top = itemRect.top();
-
-    QRect checkRect = QRect(2 * PADDING, 2 * PADDING + top, ICONSIZE, ICONSIZE );
-    return checkRect;
-}
-
-void
-ResolverConfigDelegate::onConfigPressed( const QModelIndex& idx )
-{
-    emit openConfig( idx.data( ResolversModel::ResolverPath ).toString() );
-}

tomahawk-0.4.2.tar.bz2/src/resolverconfigdelegate.h Deleted

@@ -1,42 +0,0 @@
-/* === 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
- *   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 RESOLVERCONFIGDELEGATE_H
-#define RESOLVERCONFIGDELEGATE_H
-
-#include "configdelegatebase.h"
-
-class ResolverConfigDelegate : public ConfigDelegateBase
-{
-    Q_OBJECT
-public:
-    explicit ResolverConfigDelegate( QObject* parent = 0 );
-    virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-    virtual QRect checkRectForIndex( const QStyleOptionViewItem &option, const QModelIndex &idx ) const;
-    virtual QRect configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const;
-
-private slots:
-    void onConfigPressed ( const QModelIndex& );
-
-signals:
-    void openConfig( const QString& resolverPath );
-};
-
-#endif // RESOLVERCONFIGDELEGATE_H

tomahawk-0.4.2.tar.bz2/src/resolversmodel.cpp Deleted

@@ -1,251 +0,0 @@
-/* === 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 "resolversmodel.h"
-
-#include <QFileInfo>
-
-#include "tomahawksettings.h"
-#include "tomahawkapp.h"
-#include "ExternalResolverGui.h"
-#include "pipeline.h"
-#include "config.h"
-#include "AtticaManager.h"
-#include "utils/logger.h"
-
-ResolversModel::ResolversModel( QObject* parent )
-    : QAbstractListModel( parent )
-{
-     addInstalledResolvers();
-}
-
-
-ResolversModel::~ResolversModel()
-{
-
-}
-
-
-QVariant
-ResolversModel::data( const QModelIndex& index, int role ) const
-{
-    if( !index.isValid() || !hasIndex( index.row(), index.column(), QModelIndex() ) )
-        return QVariant();
-
-    Tomahawk::ExternalResolver* r = Tomahawk::Pipeline::instance()->scriptResolvers().at( index.row() );
-    Tomahawk::ExternalResolverGui* res = qobject_cast< Tomahawk::ExternalResolverGui* >( r );
-    Q_ASSERT(res); // this is part of the gui, so there should be no non-gui resolvers
-    switch( role )
-    {
-    case Qt::DisplayRole:
-    case ResolversModel::ResolverName:
-        return res->name();
-    case ResolversModel::ResolverPath:
-        return res->filePath();
-    case ResolversModel::HasConfig:
-        return res->configUI() != 0;
-    case ResolversModel::ErrorState:
-        return res->error();
-    case Qt::CheckStateRole:
-        return res->running() ? Qt::Checked : Qt::Unchecked;
-    case Qt::ToolTipRole:
-        return res->filePath();
-    default:
-        return QVariant();
-    }
-}
-
-
-bool
-ResolversModel::setData( const QModelIndex& index, const QVariant& value, int role )
-{
-    if ( !hasIndex( index.row(), index.column(), QModelIndex() ) )
-        return false;
-
-    Tomahawk::ExternalResolver* r = Tomahawk::Pipeline::instance()->scriptResolvers().at( index.row() );
-    if ( r && r->error() == Tomahawk::ExternalResolver::FileNotFound )  // give it a shot to see if the user manually fixed paths
-    {
-        r->reload();
-
-        if( r->error() == Tomahawk::ExternalResolver::FileNotFound ) // Nope, no luck. Doesn't exist on disk, don't let user mess with it
-            return false;
-    }
-    else if ( !r && !QFile::exists( r->filePath() ) )
-    {
-        return false;
-    }
-
-    if ( role == Qt::CheckStateRole )
-    {
-        Qt::CheckState state = static_cast< Qt::CheckState >( value.toInt() );
-
-        if ( state == Qt::Checked && !r->running() ) {
-            r->start();
-        }
-        else if ( state == Qt::Unchecked )
-        {
-            r->stop();
-        }
-
-        emit dataChanged( index, index );
-        return true;
-    }
-    return false;
-}
-
-
-int
-ResolversModel::rowCount( const QModelIndex& parent ) const
-{
-    Q_UNUSED( parent );
-    return Tomahawk::Pipeline::instance()->scriptResolvers().count();
-}
-
-
-int
-ResolversModel::columnCount(const QModelIndex& parent) const
-{
-    Q_UNUSED( parent );
-    return 1;
-}
-
-
-Qt::ItemFlags
-ResolversModel::flags( const QModelIndex& index ) const
-{
-    return QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable;
-}
-
-
-void
-ResolversModel::addResolver( const QString& resolver, bool enable )
-{
-    const int count = rowCount( QModelIndex() );
-    beginInsertRows( QModelIndex(), count, count );
-    Tomahawk::ExternalResolver* r = Tomahawk::Pipeline::instance()->addScriptResolver( resolver, enable );
-    Tomahawk::ExternalResolverGui* res = qobject_cast< Tomahawk::ExternalResolverGui* >( r );
-    Q_ASSERT(res); // this is part of the gui, so there should be no non-gui resolvers
-    connect( res, SIGNAL( changed() ), this, SLOT( resolverChanged() ) );
-    endInsertRows();
-
-    if ( res->configUI() )
-        emit openConfig( res->filePath() );
-    else
-        m_waitingForLoad << resolver;
-}
-
-
-void
-ResolversModel::atticaResolverInstalled( const QString& resolverId )
-{
-#ifdef LIBATTICA_FOUND
-    Tomahawk::ExternalResolver* r = Tomahawk::Pipeline::instance()->resolverForPath( AtticaManager::instance()->pathFromId( resolverId ) );
-    if ( !r )
-        return;
-    const int idx = Tomahawk::Pipeline::instance()->scriptResolvers().indexOf( r );
-    if ( idx >= 0 )
-    {
-        beginInsertRows( QModelIndex(), idx, idx );
-        endInsertRows();
-    }
-#endif
-}
-
-
-void
-ResolversModel::removeResolver( const QString& resolver )
-{
-    const int idx = Tomahawk::Pipeline::instance()->scriptResolvers().indexOf( Tomahawk::Pipeline::instance()->resolverForPath( resolver ) );
-    if ( idx < 0 )
-        return;
-
-    beginRemoveRows( QModelIndex(), idx, idx );
-    Tomahawk::Pipeline::instance()->removeScriptResolver( resolver );
-    endRemoveRows();
-}
-
-
-void
-ResolversModel::resolverChanged()
-{
-    Tomahawk::ExternalResolver* res = qobject_cast< Tomahawk::ExternalResolver* >( sender() );
-    Q_ASSERT( res );
-
-    if ( Tomahawk::Pipeline::instance()->scriptResolvers().contains( res ) )
-    {
-        qDebug() << "Got resolverChanged signal, does it have a config UI yet?" << qobject_cast< Tomahawk::ExternalResolverGui* >(res)->configUI();
-        const QModelIndex idx = index( Tomahawk::Pipeline::instance()->scriptResolvers().indexOf( res ), 0, QModelIndex() );
-        emit dataChanged( idx, idx );
-
-        if ( m_waitingForLoad.contains( res->filePath() ) )
-        {
-            m_waitingForLoad.remove( res->filePath() );
-            emit openConfig( res->filePath() );
-        }
-    }
-}
-
-
-void
-ResolversModel::addInstalledResolvers()
-{
-    QList< QDir > pluginDirs;
-
-    QDir appDir( qApp->applicationDirPath() );
-    QDir libDir( CMAKE_INSTALL_PREFIX "/lib" );
-    QDir libexecDir( CMAKE_INSTALL_FULL_LIBEXECDIR );
-
-    QDir lib64Dir( appDir );
-    lib64Dir.cdUp();
-    lib64Dir.cd( "lib64" );
-
-    pluginDirs << appDir << libDir << lib64Dir << libexecDir;
-    foreach ( const QDir& pluginDir, pluginDirs )
-    {
-        qDebug() << "Checking directory for resolvers:" << pluginDir;
-        foreach ( QString fileName, pluginDir.entryList( QStringList() << "*_tomahawkresolver*", QDir::Files ) ){
-            if ( fileName.contains( "_tomahawkresolver" ) ) {
-                const QString path = pluginDir.absoluteFilePath( fileName );
-                bool found = false;
-                foreach ( Tomahawk::ExternalResolver* res, Tomahawk::Pipeline::instance()->scriptResolvers() )
-                {
-                    if ( res->filePath() == path )
-                        found = true;
-                }
-                if ( !found ) {
-                    Tomahawk::Pipeline::instance()->addScriptResolver( path, false );
-                }
-            }
-        }
-    }
-}
-
-
-void
-ResolversModel::saveScriptResolvers()
-{
-    QStringList enabled, all;
-    foreach ( Tomahawk::ExternalResolver* res, Tomahawk::Pipeline::instance()->scriptResolvers() )
-    {
-        all << res->filePath();
-        if ( res->running() )
-            enabled << res->filePath();
-    }
-    TomahawkSettings::instance()->setAllScriptResolvers( all );
-    TomahawkSettings::instance()->setEnabledScriptResolvers( enabled );
-}

tomahawk-0.4.2.tar.bz2/src/resolversmodel.h Deleted

@@ -1,64 +0,0 @@
-/* === 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 RESOLVERSMODEL_H
-#define RESOLVERSMODEL_H
-
-#include <QModelIndex>
-#include <QStringList>
-#include <QSet>
-
-class ResolversModel : public QAbstractListModel
-{
-    Q_OBJECT
-public:
-    enum Roles {
-        ResolverName = Qt::UserRole + 15,
-        ResolverPath = Qt::UserRole + 16,
-        HasConfig = Qt::UserRole + 17,
-        ErrorState = Qt::UserRole + 18
-    };
-
-    explicit ResolversModel( QObject* parent = 0 );
-    virtual ~ResolversModel();
-
-    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-    virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const;
-    virtual int columnCount( const QModelIndex& parent ) const;
-    virtual Qt::ItemFlags flags(const QModelIndex& index) const;
-    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
-
-    void addResolver( const QString& resolver, bool enable = false );
-    void atticaResolverInstalled ( const QString& resolverId );
-    void removeResolver( const QString& resolver );
-
-    void saveScriptResolvers();
-
-signals:
-    void openConfig( const QString& filePath );
-
-private slots:
-    void resolverChanged();
-
-private:
-    void addInstalledResolvers();
-    QSet<QString> m_waitingForLoad;
-};
-
-#endif // RESOLVERSMODEL_H

tomahawk-0.4.2.tar.bz2/src/scanmanager.cpp Deleted

@@ -1,230 +0,0 @@
-/* === 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
- *   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 "scanmanager.h"
-
-#include <QtCore/QThread>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTimer>
-
-#include "musicscanner.h"
-#include "tomahawksettings.h"
-#include "utils/tomahawkutils.h"
-#include "libtomahawk/sourcelist.h"
-
-#include "database/database.h"
-#include "database/databasecommand_filemtimes.h"
-#include "database/databasecommand_deletefiles.h"
-
-#include "utils/logger.h"
-
-ScanManager* ScanManager::s_instance = 0;
-
-
-ScanManager*
-ScanManager::instance()
-{
-    return s_instance;
-}
-
-
-ScanManager::ScanManager( QObject* parent )
-    : QObject( parent )
-    , m_musicScannerThreadController( 0 )
-    , m_currScannerPaths()
-{
-    s_instance = this;
-
-    m_scanTimer = new QTimer( this );
-    m_scanTimer->setSingleShot( false );
-    m_scanTimer->setInterval( TomahawkSettings::instance()->scannerTime() * 1000 );
-
-    connect( TomahawkSettings::instance(), SIGNAL( changed() ), SLOT( onSettingsChanged() ) );
-    connect( m_scanTimer, SIGNAL( timeout() ), SLOT( scanTimerTimeout() ) );
-
-    if ( TomahawkSettings::instance()->hasScannerPaths() )
-    {
-        m_currScannerPaths = TomahawkSettings::instance()->scannerPaths();
-        m_scanTimer->start();
-        if ( TomahawkSettings::instance()->watchForChanges() )
-            QTimer::singleShot( 1000, this, SLOT( runStartupScan() ) );
-    }
-}
-
-
-ScanManager::~ScanManager()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( !m_scanner.isNull() )
-    {
-        m_musicScannerThreadController->quit();
-        m_musicScannerThreadController->wait( 60000 );
-
-        delete m_scanner.data();
-        delete m_musicScannerThreadController;
-        m_musicScannerThreadController = 0;
-    }
-    qDebug() << Q_FUNC_INFO << "scanner thread controller finished, exiting ScanManager";
-}
-
-
-void
-ScanManager::onSettingsChanged()
-{
-    if ( !TomahawkSettings::instance()->watchForChanges() && m_scanTimer->isActive() )
-        m_scanTimer->stop();
-
-    m_scanTimer->setInterval( TomahawkSettings::instance()->scannerTime() * 1000 );
-
-    if ( TomahawkSettings::instance()->hasScannerPaths() &&
-        m_currScannerPaths != TomahawkSettings::instance()->scannerPaths() )
-    {
-        m_currScannerPaths = TomahawkSettings::instance()->scannerPaths();
-        runScan();
-    }
-
-    if ( TomahawkSettings::instance()->watchForChanges() && !m_scanTimer->isActive() )
-        m_scanTimer->start();
-}
-
-
-void
-ScanManager::runStartupScan()
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
-        QTimer::singleShot( 1000, this, SLOT( runStartupScan() ) );
-    else
-        runScan();
-}
-
-
-void
-ScanManager::scanTimerTimeout()
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( !TomahawkSettings::instance()->watchForChanges() ||
-         !Database::instance() ||
-         ( Database::instance() && !Database::instance()->isReady() ) )
-        return;
-    else
-        runScan();
-}
-
-
-void
-ScanManager::runScan( bool manualFull )
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
-        return;
-
-    if ( !m_musicScannerThreadController && m_scanner.isNull() ) //still running if these are not zero
-    {
-        if ( manualFull )
-        {
-            DatabaseCommand_DeleteFiles *cmd = new DatabaseCommand_DeleteFiles( SourceList::instance()->getLocal() );
-            connect( cmd, SIGNAL( finished() ), SLOT( filesDeleted() ) );
-            Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
-            return;
-        }
-
-        DatabaseCommand_FileMtimes *cmd = new DatabaseCommand_FileMtimes( true );
-        connect( cmd, SIGNAL( done( const QMap< QString, QMap< unsigned int, unsigned int > >& ) ),
-                        SLOT( fileMtimesCheck( const QMap< QString, QMap< unsigned int, unsigned int > >& ) ) );
-
-        Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
-    }
-    else
-    {
-        qDebug() << "Could not run dir scan, old scan still running";
-        return;
-    }
-}
-
-
-void
-ScanManager::fileMtimesCheck( const QMap< QString, QMap< unsigned int, unsigned int > >& mtimes )
-{
-    if ( !mtimes.isEmpty() && TomahawkSettings::instance()->scannerPaths().isEmpty() )
-    {
-        DatabaseCommand_DeleteFiles *cmd = new DatabaseCommand_DeleteFiles( SourceList::instance()->getLocal() );
-        connect( cmd, SIGNAL( finished() ), SLOT( filesDeleted() ) );
-        Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
-        return;
-    }
-
-    runDirScan();
-}
-
-
-void
-ScanManager::filesDeleted()
-{
-    if ( !TomahawkSettings::instance()->scannerPaths().isEmpty() )
-        runDirScan();
-    else
-        scannerFinished();
-}
-
-
-void
-ScanManager::runDirScan()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    QStringList paths = TomahawkSettings::instance()->scannerPaths();
-
-    if ( !m_musicScannerThreadController && m_scanner.isNull() ) //still running if these are not zero
-    {
-        m_scanTimer->stop();
-        m_musicScannerThreadController = new QThread( this );
-        m_musicScannerThreadController->setPriority( QThread::IdlePriority );
-        m_scanner = QWeakPointer< MusicScanner >( new MusicScanner( paths ) );
-        m_scanner.data()->moveToThread( m_musicScannerThreadController );
-        connect( m_scanner.data(), SIGNAL( finished() ), SLOT( scannerFinished() ) );
-        m_musicScannerThreadController->start( QThread::IdlePriority );
-        QMetaObject::invokeMethod( m_scanner.data(), "startScan" );
-    }
-    else
-    {
-        qDebug() << "Could not run dir scan, old scan still running";
-        return;
-    }
-}
-
-
-void
-ScanManager::scannerFinished()
-{
-    tDebug() << "deleting scanner";
-    if ( !m_scanner.isNull() )
-    {
-        m_musicScannerThreadController->quit();
-        m_musicScannerThreadController->wait( 60000 );
-
-        delete m_scanner.data();
-        delete m_musicScannerThreadController;
-        m_musicScannerThreadController = 0;
-    }
-
-    m_scanTimer->start();
-    SourceList::instance()->getLocal()->scanningFinished( 0 );
-    emit finished();
-}

tomahawk-0.4.2.tar.bz2/src/scanmanager.h Deleted

@@ -1,74 +0,0 @@
-/* === 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
- *   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 SCANMANAGER_H
-#define SCANMANAGER_H
-
-#include "typedefs.h"
-
-#include <QtCore/QHash>
-#include <QtCore/QMap>
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
-#include <QtCore/QWeakPointer>
-#include <QtCore/QSet>
-
-class MusicScanner;
-class QThread;
-class QFileSystemWatcher;
-class QTimer;
-
-class ScanManager : public QObject
-{
-Q_OBJECT
-
-public:
-    static ScanManager* instance();
-
-    explicit ScanManager( QObject* parent = 0 );
-    virtual ~ScanManager();
-
-signals:
-    void finished();
-
-public slots:
-    void runScan( bool manualFull = false );
-    void runDirScan();
-
-private slots:
-    void scannerFinished();
-
-    void runStartupScan();
-    void scanTimerTimeout();
-
-    void onSettingsChanged();
-
-    void fileMtimesCheck( const QMap< QString, QMap< unsigned int, unsigned int > >& mtimes );
-    void filesDeleted();
-
-private:
-    static ScanManager* s_instance;
-
-    QWeakPointer< MusicScanner > m_scanner;
-    QThread* m_musicScannerThreadController;
-    QStringList m_currScannerPaths;
-
-    QTimer* m_scanTimer;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/scrobbler.cpp Deleted

@@ -1,163 +0,0 @@
-/* === 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
- *   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 "scrobbler.h"
-
-#include <QDir>
-#include <QSettings>
-#include <QCryptographicHash>
-
-#include "artist.h"
-#include "album.h"
-#include "typedefs.h"
-#include "audio/audioengine.h"
-#include "tomahawksettings.h"
-#include "infosystem/infosystem.h"
-
-#include "utils/logger.h"
-
-static QString s_scInfoIdentifier = QString( "SCROBBLER" );
-
-
-Scrobbler::Scrobbler( QObject* parent )
-    : QObject( parent )
-    , m_reachedScrobblePoint( false )
-{
-    connect( AudioEngine::instance(), SIGNAL( timerSeconds( unsigned int ) ),
-                                        SLOT( engineTick( unsigned int ) ), Qt::QueuedConnection );
-
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(),
-        SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-        SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-
-    connect( AudioEngine::instance(), SIGNAL( started( const Tomahawk::result_ptr& ) ),
-             SLOT( trackStarted( const Tomahawk::result_ptr& ) ), Qt::QueuedConnection );
-
-    connect( AudioEngine::instance(), SIGNAL( paused() ),
-             SLOT( trackPaused() ), Qt::QueuedConnection );
-
-    connect( AudioEngine::instance(), SIGNAL( resumed() ),
-             SLOT( trackResumed() ), Qt::QueuedConnection );
-
-    connect( AudioEngine::instance(), SIGNAL( stopped() ),
-             SLOT( trackStopped() ), Qt::QueuedConnection );
-
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) );
-}
-
-
-Scrobbler::~Scrobbler()
-{
-}
-
-
-void
-Scrobbler::trackStarted( const Tomahawk::result_ptr& track )
-{
-    Q_ASSERT( QThread::currentThread() == thread() );
-//    qDebug() << Q_FUNC_INFO;
-
-    if( m_reachedScrobblePoint )
-    {
-        m_reachedScrobblePoint = false;
-        scrobble();
-    }
-
-    Tomahawk::InfoSystem::InfoStringHash trackInfo;
-
-    trackInfo"title" = track->track();
-    trackInfo"artist" = track->artist()->name();
-    trackInfo"album" = track->album()->name();
-    trackInfo"duration" = QString::number( track->duration() );
-
-    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
-        s_scInfoIdentifier, Tomahawk::InfoSystem::InfoSubmitNowPlaying,
-        QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo ) );
-
-    // liblastfm forces 0-length tracks to scrobble after 4 minutes, stupid.
-    if ( track->duration() == 0 )
-        m_scrobblePoint = ScrobblePoint( 30 );
-    else
-        m_scrobblePoint = ScrobblePoint( track->duration() / 2 );
-}
-
-
-void
-Scrobbler::trackPaused()
-{
-    Q_ASSERT( QThread::currentThread() == thread() );
-}
-
-
-void
-Scrobbler::trackResumed()
-{
-    Q_ASSERT( QThread::currentThread() == thread() );
-}
-
-
-void
-Scrobbler::trackStopped()
-{
-    Q_ASSERT( QThread::currentThread() == thread() );
-
-    if( m_reachedScrobblePoint )
-    {
-        m_reachedScrobblePoint = false;
-        scrobble();
-    }
-}
-
-
-void
-Scrobbler::engineTick( unsigned int secondsElapsed )
-{
-    if ( secondsElapsed > m_scrobblePoint )
-        m_reachedScrobblePoint = true;
-}
-
-
-void
-Scrobbler::scrobble()
-{
-    Q_ASSERT( QThread::currentThread() == thread() );
-
-    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
-        s_scInfoIdentifier, Tomahawk::InfoSystem::InfoSubmitScrobble,
-        QVariant() );
-}
-
-
-void
-Scrobbler::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
-{
-    Q_UNUSED( output );
-    if ( requestData.caller == s_scInfoIdentifier )
-        qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-Scrobbler::infoSystemFinished( QString target )
-{
-    if ( target == s_scInfoIdentifier )
-    {
-        qDebug() << Q_FUNC_INFO;
-        qDebug() << "Scrobbler received done signal from InfoSystem";
-    }
-}

tomahawk-0.4.2.tar.bz2/src/scrobbler.h Deleted

@@ -1,57 +0,0 @@
-/* === 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
- *   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 TOMAHAWK_SCROBBLER_H
-#define TOMAHAWK_SCROBBLER_H
-
-#include "lastfm/ScrobblePoint"
-#include "result.h"
-#include "infosystem/infosystem.h"
-
-#include <QObject>
-
-/**
- * Simple class that listens to signals from AudioEngine and scrobbles
- *  what it is playing.
- */
-class Scrobbler : public QObject
-{
-    Q_OBJECT
-public:
-    Scrobbler( QObject* parent = 0 );
-    virtual ~Scrobbler();
-
-public slots:
-    void trackStarted( const Tomahawk::result_ptr& );
-    void trackPaused();
-    void trackResumed();
-    void trackStopped();
-    void engineTick( unsigned int secondsElapsed );
-
-    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-    void infoSystemFinished( QString target );
-
-private:
-    void scrobble();
-
-    bool m_reachedScrobblePoint;
-    ScrobblePoint m_scrobblePoint;
-};
-
-
-#endif

tomahawk-0.4.2.tar.bz2/src/searchbox.ui Deleted

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>GlobalSearchWidget</class>
- <widget class="QWidget" name="GlobalSearchWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>345</width>
-    <height>51</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <widget class="SearchLineEdit" name="searchEdit">
-     <property name="minimumSize">
-      <size>
-       <width>60</width>
-       <height>27</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>180</width>
-       <height>16777215</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>SearchLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>libtomahawk/playlist/topbar/searchlineedit.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/settingsdialog.cpp Deleted

@@ -1,928 +0,0 @@
-/* === 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
- *   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 "settingsdialog.h"
-#include "config.h"
-
-#include "utils/tomahawkutilsgui.h"
-
-#include <QtGui/QDesktopServices>
-#include <QtGui/QFileDialog>
-#include <QtGui/QMessageBox>
-#include <QtNetwork/QNetworkConfiguration>
-#include <QtNetwork/QNetworkProxy>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QSizeGrip>
-
-#ifdef LIBLASTFM_FOUND
-#include <lastfm/ws.h>
-#include <lastfm/XmlQuery>
-#endif
-
-#include "AtticaManager.h"
-#include "tomahawkapp.h"
-#include "tomahawksettings.h"
-#include "delegateconfigwrapper.h"
-#include "GetNewStuffDialog.h"
-#include "musicscanner.h"
-#include "pipeline.h"
-#include "resolver.h"
-#include "ExternalResolverGui.h"
-#include "resolverconfigdelegate.h"
-#include "resolversmodel.h"
-#include "scanmanager.h"
-#include "settingslistdelegate.h"
-#include "sipconfigdelegate.h"
-#include "database/database.h"
-#include "network/servent.h"
-#include "playlist/dynamic/widgets/LoadingSpinner.h"
-#include "sip/SipHandler.h"
-#include "sip/SipModel.h"
-#include "utils/logger.h"
-
-#include "ui_proxydialog.h"
-#include "ui_stackedsettingsdialog.h"
-
-
-SettingsDialog::SettingsDialog( QWidget *parent )
-    : QDialog( parent )
-    , ui( new Ui_StackedSettingsDialog )
-    , m_proxySettings( this )
-    , m_rejected( false )
-    , m_sipModel( 0 )
-    , m_resolversModel( 0 )
-    , m_sipSpinner( 0 )
-{
-    ui->setupUi( this );
-    TomahawkSettings* s = TomahawkSettings::instance();
-
-    TomahawkUtils::unmarginLayout( layout() );
-    ui->stackedWidget->setContentsMargins( 4, 4, 4, 0 );
-
-    ui->addSipButton->setFixedWidth( 42 );
-    ui->removeSipButton->setFixedWidth( ui->addSipButton->width() );
-    ui->addScript->setFixedWidth( 42 );
-    ui->removeScript->setFixedWidth( ui->addScript->width() );
-
-    ui->checkBoxReporter->setChecked( s->crashReporterEnabled() );
-    ui->checkBoxHttp->setChecked( s->httpEnabled() );
-    ui->checkBoxStaticPreferred->setChecked( s->preferStaticHostPort() );
-    ui->checkBoxUpnp->setChecked( s->externalAddressMode() == TomahawkSettings::Upnp );
-    ui->checkBoxUpnp->setEnabled( !s->preferStaticHostPort() );
-
-    createIcons();
-#ifdef Q_WS_X11
-    ui->listWidget->setFrameShape( QFrame::StyledPanel );
-    ui->listWidget->setFrameShadow( QFrame::Sunken );
-    setContentsMargins( 4, 4, 4, 4 );
-#else
-    setContentsMargins( 0, 4, 4, 4 );
-#endif
-
-#ifdef Q_WS_MAC
-    ui->listWidget->setFixedWidth( 83 );
-#endif
-
-#ifdef Q_WS_MAC
-    // Avoid resize handles on sheets on osx
-    m_proxySettings.setSizeGripEnabled( true );
-    QSizeGrip* p = m_proxySettings.findChild< QSizeGrip* >();
-    p->setFixedSize( 0, 0 );
-#endif
-
-    // SIP PLUGINS
-    SipConfigDelegate* sipdel = new SipConfigDelegate( this );
-    ui->accountsView->setItemDelegate( sipdel );
-    ui->accountsView->setContextMenuPolicy( Qt::CustomContextMenu );
-    ui->accountsView->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
-
-    connect( ui->accountsView, SIGNAL( clicked( QModelIndex ) ), this, SLOT( sipItemClicked( QModelIndex ) ) );
-    connect( sipdel, SIGNAL( openConfig( SipPlugin* ) ), this, SLOT( openSipConfig( SipPlugin* ) ) );
-    connect( ui->accountsView, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( sipContextMenuRequest( QPoint ) ) );
-    m_sipModel = new SipModel( this );
-    ui->accountsView->setModel( m_sipModel );
-
-    if ( !Servent::instance()->isReady() )
-    {
-        m_sipSpinner = new LoadingSpinner( ui->accountsView );
-        m_sipSpinner->fadeIn();
-
-        ui->addSipButton->setEnabled( false );
-        ui->removeSipButton->setEnabled( false );
-        connect( Servent::instance(), SIGNAL( ready() ), this, SLOT( serventReady() ) );
-    }
-
-    setupSipButtons();
-
-    ui->staticHostName->setText( s->externalHostname() );
-    ui->staticPort->setValue( s->externalPort() );
-    ui->proxyButton->setVisible( true );
-
-    ui->checkBoxWatchForChanges->setChecked( s->watchForChanges() );
-    ui->scannerTimeSpinBox->setValue( s->scannerTime() );
-    ui->enableEchonestCatalog->setChecked( s->enableEchonestCatalogs() );
-
-    connect( ui->checkBoxWatchForChanges, SIGNAL( clicked( bool ) ), SLOT( updateScanOptionsView() ) );
-
-    if ( ui->checkBoxWatchForChanges->isChecked() )
-    {
-        ui->scanTimeLabel->show();
-        ui->scannerTimeSpinBox->show();
-    }
-    else
-    {
-        ui->scanTimeLabel->hide();
-        ui->scannerTimeSpinBox->hide();
-    }
-
-    foreach ( const QString& dir, TomahawkSettings::instance()->scannerPaths() )
-    {
-        ui->dirTree->checkPath( dir, Qt::Checked );
-    }
-
-    // NOW PLAYING
-#ifdef Q_WS_MAC
-    ui->checkBoxEnableAdium->setChecked( s->nowPlayingEnabled() );
-#else
-    ui->checkBoxEnableAdium->hide();
-#endif
-
-    // LAST FM
-    ui->checkBoxEnableLastfm->setChecked( s->scrobblingEnabled() );
-    ui->lineEditLastfmUsername->setText( s->lastFmUsername() );
-    ui->lineEditLastfmPassword->setText(s->lastFmPassword() );
-    connect( ui->pushButtonTestLastfmLogin, SIGNAL( clicked( bool) ), SLOT( testLastFmLogin() ) );
-
-#ifdef Q_WS_MAC // FIXME
-    ui->pushButtonTestLastfmLogin->setVisible( false );
-#endif
-
-    // SCRIPT RESOLVER
-    ui->removeScript->setEnabled( false );
-    ResolverConfigDelegate* del = new ResolverConfigDelegate( this );
-    connect( del, SIGNAL( openConfig( QString ) ), SLOT( openResolverConfig( QString ) ) );
-    ui->scriptList->setItemDelegate( del );
-    m_resolversModel = new ResolversModel( this );
-    ui->scriptList->setModel( m_resolversModel );
-    ui->scriptList->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
-    connect( m_resolversModel, SIGNAL( openConfig( QString ) ), SLOT( openResolverConfig( QString ) ) );
-
-#ifdef LIBATTICA_FOUND
-    connect( ui->getMoreResolvers, SIGNAL( clicked() ), this, SLOT( getMoreResolvers() ) );
-
-    connect( AtticaManager::instance(), SIGNAL( resolverInstalled( QString ) ), this, SLOT( atticaResolverInstalled( QString ) ) );
-    connect( AtticaManager::instance(), SIGNAL( resolverUninstalled( QString ) ), this, SLOT( atticaResolverUninstalled( QString ) ) );
-#else
-    ui->getMoreResolvers->hide();
-#endif
-
-    connect( ui->scriptList->selectionModel(), SIGNAL( selectionChanged( QItemSelection,QItemSelection ) ), this, SLOT( scriptSelectionChanged() ) );
-    connect( ui->addScript, SIGNAL( clicked( bool ) ), this, SLOT( addScriptResolver() ) );
-    connect( ui->removeScript, SIGNAL( clicked( bool ) ), this, SLOT( removeScriptResolver() ) );
-    connect( ui->proxyButton,  SIGNAL( clicked() ),  SLOT( showProxySettings() ) );
-    connect( ui->checkBoxStaticPreferred, SIGNAL( toggled(bool) ), SLOT( toggleUpnp(bool) ) );
-    connect( ui->checkBoxStaticPreferred, SIGNAL( toggled(bool) ), SLOT( requiresRestart() ) );
-    connect( ui->checkBoxUpnp, SIGNAL( toggled(bool) ), SLOT( requiresRestart() ) );
-    connect( ui->checkBoxReporter, SIGNAL( toggled(bool) ), SLOT( requiresRestart() ) );
-    connect( this, SIGNAL( rejected() ), SLOT( onRejected() ) );
-
-    ui->listWidget->setCurrentRow( 0 );
-    ui->listWidget->setItemDelegate(new SettingsListDelegate());
-}
-
-
-SettingsDialog::~SettingsDialog()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( !m_rejected )
-    {
-        TomahawkSettings* s = TomahawkSettings::instance();
-
-        s->setCrashReporterEnabled( ui->checkBoxReporter->checkState() == Qt::Checked );
-        s->setHttpEnabled( ui->checkBoxHttp->checkState() == Qt::Checked );
-        s->setPreferStaticHostPort( ui->checkBoxStaticPreferred->checkState() == Qt::Checked );
-        s->setExternalAddressMode( ui->checkBoxUpnp->checkState() == Qt::Checked ? TomahawkSettings::Upnp : TomahawkSettings::Lan );
-
-        s->setExternalHostname( ui->staticHostName->text() );
-        s->setExternalPort( ui->staticPort->value() );
-
-        s->setScannerPaths( ui->dirTree->getCheckedPaths() );
-        s->setWatchForChanges( ui->checkBoxWatchForChanges->isChecked() );
-        s->setScannerTime( ui->scannerTimeSpinBox->value() );
-        s->setEnableEchonestCatalogs( ui->enableEchonestCatalog->isChecked() );
-
-        s->setNowPlayingEnabled( ui->checkBoxEnableAdium->isChecked() );
-
-        s->setScrobblingEnabled( ui->checkBoxEnableLastfm->isChecked() );
-        s->setLastFmUsername( ui->lineEditLastfmUsername->text() );
-        s->setLastFmPassword( ui->lineEditLastfmPassword->text() );
-
-        m_resolversModel->saveScriptResolvers();
-
-        s->applyChanges();
-        s->sync();
-    }
-    else
-        qDebug() << "Settings dialog cancelled, NOT saving prefs.";
-
-    delete ui;
-}
-
-
-void
-SettingsDialog::serventReady()
-{
-    m_sipSpinner->fadeOut();
-    ui->addSipButton->setEnabled( true );
-    ui->removeSipButton->setEnabled( true );
-}
-
-
-void
-SettingsDialog::createIcons()
-{
-    /// Not fun but QListWidget sucks. Do our max-width calculation manually
-    /// so the icons arre lined up.
-    // Resolvers is the longest string... in english. fml.
-
-    ensurePolished();
-
-    int maxlen = 0;
-    QFontMetrics fm( font() );
-    QListWidgetItem *accountsButton = new QListWidgetItem( ui->listWidget );
-    accountsButton->setIcon( QIcon( RESPATH "images/account-settings.png" ) );
-    accountsButton->setText( tr( "Accounts" ) );
-    accountsButton->setTextAlignment( Qt::AlignHCenter );
-    accountsButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
-    maxlen = fm.width( accountsButton->text() );
-
-    QListWidgetItem *musicButton = new QListWidgetItem( ui->listWidget );
-    musicButton->setIcon( QIcon( RESPATH "images/music-settings.png" ) );
-    musicButton->setText( tr( "Collection" ) );
-    musicButton->setTextAlignment( Qt::AlignHCenter );
-    musicButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
-    maxlen = qMax( fm.width( musicButton->text() ), maxlen );
-
-    QListWidgetItem *lastfmButton = new QListWidgetItem( ui->listWidget );
-    lastfmButton->setIcon( QIcon( RESPATH "images/lastfm-settings.png" ) );
-    lastfmButton->setText( tr( "Last.fm" ) );
-    lastfmButton->setTextAlignment( Qt::AlignHCenter );
-    lastfmButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
-    maxlen = qMax( fm.width( lastfmButton->text() ), maxlen );
-
-    QListWidgetItem *resolversButton = new QListWidgetItem( ui->listWidget );
-    resolversButton->setIcon( QIcon( RESPATH "images/resolvers-settings.png" ) );
-    resolversButton->setText( tr( "Resolvers" ) );
-    resolversButton->setTextAlignment( Qt::AlignHCenter );
-    resolversButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
-    maxlen = qMax( fm.width( resolversButton->text() ), maxlen );
-
-    QListWidgetItem *advancedButton = new QListWidgetItem( ui->listWidget );
-    advancedButton->setIcon( QIcon( RESPATH "images/advanced-settings.png" ) );
-    advancedButton->setText( tr( "Advanced" ) );
-    advancedButton->setTextAlignment( Qt::AlignHCenter );
-    advancedButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
-    maxlen = qMax( fm.width( advancedButton->text() ), maxlen );
-
-    maxlen += 15; // padding
-    accountsButton->setSizeHint( QSize( maxlen, 60 ) );
-    musicButton->setSizeHint( QSize( maxlen, 60 ) );
-    lastfmButton->setSizeHint( QSize( maxlen, 60 ) );
-    resolversButton->setSizeHint( QSize( maxlen, 60 ) );
-    advancedButton->setSizeHint( QSize( maxlen, 60 ) );
-
-#ifndef Q_WS_MAC
-    // doesn't listen to sizehint...
-    ui->listWidget->setFixedWidth( maxlen + 8 );
-#endif
-
-    connect( ui->listWidget, SIGNAL( currentItemChanged( QListWidgetItem*, QListWidgetItem* ) ), SLOT( changePage( QListWidgetItem*, QListWidgetItem* ) ) );
-}
-
-
-void
-SettingsDialog::setupSipButtons()
-{
-    foreach( SipPluginFactory* f, SipHandler::instance()->pluginFactories() )
-    {
-        if( f->isUnique() && SipHandler::instance()->hasPluginType( f->factoryId() ) )
-        {
-            continue;
-        }
-
-        QAction* action = new QAction( f->icon(), f->prettyName(), ui->addSipButton );
-        action->setProperty( "factory", QVariant::fromValue< QObject* >( f ) );
-        ui->addSipButton->addAction( action );
-
-        connect( action, SIGNAL( triggered(bool) ), this, SLOT( factoryActionTriggered( bool ) ) );
-    }
-
-    connect( ui->removeSipButton, SIGNAL( clicked( bool ) ), this, SLOT( sipPluginDeleted( bool ) ) );
-}
-
-
-void
-SettingsDialog::changePage( QListWidgetItem* current, QListWidgetItem* previous )
-{
-    if ( !current )
-        current = previous;
-
-    ui->stackedWidget->setCurrentIndex( ui->listWidget->row(current) );
-}
-
-
-void
-SettingsDialog::onRejected()
-{
-    m_rejected = true;
-}
-
-
-void
-SettingsDialog::changeEvent( QEvent *e )
-{
-    QDialog::changeEvent( e );
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-SettingsDialog::showProxySettings()
-{
-    m_proxySettings.exec();
-    if ( m_proxySettings.result() == QDialog::Accepted )
-        m_proxySettings.saveSettings();
-}
-
-
-void
-SettingsDialog::toggleUpnp( bool preferStaticEnabled )
-{
-    if ( preferStaticEnabled )
-        ui->checkBoxUpnp->setEnabled( false );
-    else
-        ui->checkBoxUpnp->setEnabled( true );
-}
-
-
-void
-SettingsDialog::updateScanOptionsView()
-{
-    if ( ui->checkBoxWatchForChanges->isChecked() )
-    {
-        ui->scanTimeLabel->show();
-        ui->scannerTimeSpinBox->show();
-    }
-    else
-    {
-        ui->scanTimeLabel->hide();
-        ui->scannerTimeSpinBox->hide();
-    }
-}
-
-
-void
-SettingsDialog::testLastFmLogin()
-{
-#ifdef LIBLASTFM_FOUND
-    ui->pushButtonTestLastfmLogin->setEnabled( false );
-    ui->pushButtonTestLastfmLogin->setText( "Testing..." );
-
-    QString authToken = TomahawkUtils::md5( ( ui->lineEditLastfmUsername->text().toLower() + TomahawkUtils::md5( ui->lineEditLastfmPassword->text().toUtf8() ) ).toUtf8() );
-
-    // now authenticate w/ last.fm and get our session key
-    QMap<QString, QString> query;
-    query "method"  = "auth.getMobileSession";
-    query "username"  =  ui->lineEditLastfmUsername->text().toLower();
-    query "authToken"  = authToken;
-
-    // ensure they have up-to-date settings
-    lastfm::setNetworkAccessManager( TomahawkUtils::nam() );
-
-    QNetworkReply* authJob = lastfm::ws::post( query );
-
-    connect( authJob, SIGNAL( finished() ), SLOT( onLastFmFinished() ) );
-#endif
-}
-
-
-void
-SettingsDialog::onLastFmFinished()
-{
-#ifdef LIBLASTFM_FOUND
-    QNetworkReply* authJob = dynamic_cast<QNetworkReply*>( sender() );
-    if( !authJob )
-    {
-        qDebug() << Q_FUNC_INFO << "No auth job returned!";
-        return;
-    }
-    if( authJob->error() == QNetworkReply::NoError )
-    {
-        lastfm::XmlQuery lfm = lastfm::XmlQuery( authJob->readAll() );
-
-        if( lfm.children( "error" ).size() > 0 )
-        {
-            qDebug() << "ERROR from last.fm:" << lfm.text();
-            ui->pushButtonTestLastfmLogin->setText( tr( "Failed" ) );
-            ui->pushButtonTestLastfmLogin->setEnabled( true );
-        }
-        else
-        {
-            ui->pushButtonTestLastfmLogin->setText( tr( "Success" ) );
-            ui->pushButtonTestLastfmLogin->setEnabled( false );
-        }
-    }
-    else
-    {
-        switch( authJob->error() )
-        {
-            case QNetworkReply::ContentOperationNotPermittedError:
-            case QNetworkReply::AuthenticationRequiredError:
-                ui->pushButtonTestLastfmLogin->setText( tr( "Failed" ) );
-                ui->pushButtonTestLastfmLogin->setEnabled( true );
-                break;
-
-            default:
-                qDebug() << "Couldn't get last.fm auth result";
-                ui->pushButtonTestLastfmLogin->setText( tr( "Could not contact server" ) );
-                ui->pushButtonTestLastfmLogin->setEnabled( true );
-                return;
-        }
-    }
-#endif
-}
-
-
-void
-SettingsDialog::addScriptResolver()
-{
-    QString resolver = QFileDialog::getOpenFileName( this, tr( "Load script resolver file" ), TomahawkSettings::instance()->scriptDefaultPath() );
-    if( !resolver.isEmpty() )
-    {
-        m_resolversModel->addResolver( resolver, true );
-
-        QFileInfo resolverAbsoluteFilePath = resolver;
-        TomahawkSettings::instance()->setScriptDefaultPath( resolverAbsoluteFilePath.absolutePath() );
-    }
-}
-
-
-void
-SettingsDialog::removeScriptResolver()
-{
-    // only one selection
-    if( !ui->scriptList->selectionModel()->selectedIndexes().isEmpty() )
-    {
-        QString resolver = ui->scriptList->selectionModel()->selectedIndexes().first().data( ResolversModel::ResolverPath ).toString();
-#ifdef LIBATTICA_FOUND
-        AtticaManager::instance()->uninstallResolver( resolver );
-#endif
-        m_resolversModel->removeResolver( resolver );
-    }
-}
-
-
-void
-SettingsDialog::getMoreResolvers()
-{
-#if defined(Q_WS_MAC) && defined(LIBATTICA_FOUND)
-    GetNewStuffDialog* diag = new GetNewStuffDialog( this, Qt::Sheet );
-    connect( diag, SIGNAL( finished( int ) ), this, SLOT( getMoreResolversFinished( int ) ) );
-    diag->show();
-#elif defined(LIBATTICA_FOUND)
-    GetNewStuffDialog diag( this );
-    int ret = diag.exec();
-    Q_UNUSED( ret );
-#endif
-
-}
-
-
-#ifdef LIBATTICA_FOUND
-void
-SettingsDialog::atticaResolverInstalled( const QString& resolverId )
-{
-    m_resolversModel->atticaResolverInstalled( resolverId );
-}
-
-
-void
-SettingsDialog::atticaResolverUninstalled ( const QString& resolverId )
-{
-    m_resolversModel->removeResolver( AtticaManager::instance()->pathFromId( resolverId ) );
-}
-#endif
-
-
-void
-SettingsDialog::scriptSelectionChanged()
-{
-    if( !ui->scriptList->selectionModel()->selectedIndexes().isEmpty() )
-    {
-        ui->removeScript->setEnabled( true );
-    }
-    else
-    {
-        ui->removeScript->setEnabled( false );
-    }
-}
-
-
-void
-SettingsDialog::getMoreResolversFinished( int ret )
-{
-    Q_UNUSED( ret );
-}
-
-
-void
-SettingsDialog::openResolverConfig( const QString& resolver )
-{
-    Tomahawk::ExternalResolver* r = Tomahawk::Pipeline::instance()->resolverForPath( resolver );
-    Tomahawk::ExternalResolverGui* res = qobject_cast< Tomahawk::ExternalResolverGui* >( r );
-    if( res && res->configUI() )
-    {
-#ifndef Q_WS_MAC
-        DelegateConfigWrapper dialog( res->configUI(), "Resolver Configuration", this );
-        QWeakPointer< DelegateConfigWrapper > watcher( &dialog );
-        int ret = dialog.exec();
-        if( !watcher.isNull() && ret == QDialog::Accepted )
-        {
-            // send changed config to resolver
-            r->saveConfig();
-        }
-#else
-        // on osx a sheet needs to be non-modal
-        DelegateConfigWrapper* dialog = new DelegateConfigWrapper( res->configUI(), "Resolver Configuration", this, Qt::Sheet );
-        dialog->setProperty( "resolver", QVariant::fromValue< QObject* >( res ) );
-        connect( dialog, SIGNAL( finished( int ) ), this, SLOT( resolverConfigClosed( int ) ) );
-
-        dialog->show();
-#endif
-    }
-}
-
-
-void
-SettingsDialog::resolverConfigClosed( int value )
-{
-    if( value == QDialog::Accepted )
-    {
-        DelegateConfigWrapper* dialog = qobject_cast< DelegateConfigWrapper* >( sender() );
-        Tomahawk::ExternalResolver* r = qobject_cast< Tomahawk::ExternalResolver* >( dialog->property( "resolver" ).value< QObject* >() );
-        r->saveConfig();
-    }
-}
-
-
-void
-SettingsDialog::sipItemClicked( const QModelIndex& item )
-{
-    if( item.data( SipModel::FactoryRole ).toBool() )
-        if( ui->accountsView->isExpanded( item ) )
-            ui->accountsView->collapse( item );
-        else
-            ui->accountsView->expand( item );
-    else if( item.data( SipModel::FactoryItemRole ).toBool() )
-        sipFactoryClicked( qobject_cast<SipPluginFactory* >( item.data( SipModel::SipPluginFactoryData ).value< QObject* >() ) );
-}
-
-
-void
-SettingsDialog::openSipConfig( SipPlugin* p )
-{
-    if( p->configWidget() )
-    {
-#ifndef Q_WS_MAC
-        DelegateConfigWrapper dialog( p->configWidget(), QString("%1 Configuration" ).arg( p->friendlyName() ), this );
-        QWeakPointer< DelegateConfigWrapper > watcher( &dialog );
-        int ret = dialog.exec();
-        if( !watcher.isNull() && ret == QDialog::Accepted )
-        {
-            // send changed config to resolver
-            p->saveConfig();
-        }
-#else
-        // on osx a sheet needs to be non-modal
-        DelegateConfigWrapper* dialog = new DelegateConfigWrapper( p->configWidget(), QString("%1 Configuration" ).arg( p->friendlyName() ), this, Qt::Sheet );
-        dialog->setProperty( "sipplugin", QVariant::fromValue< QObject* >( p ) );
-        connect( dialog, SIGNAL( finished( int ) ), this, SLOT( sipConfigClosed( int ) ) );
-
-        dialog->show();
-#endif
-    }
-}
-
-
-void
-SettingsDialog::sipConfigClosed( int value )
-{
-    if( value == QDialog::Accepted )
-    {
-        DelegateConfigWrapper* dialog = qobject_cast< DelegateConfigWrapper* >( sender() );
-        SipPlugin* p = qobject_cast< SipPlugin* >( dialog->property( "sipplugin" ).value< QObject* >() );
-        p->saveConfig();
-    }
-}
-
-
-void
-SettingsDialog::factoryActionTriggered( bool )
-{
-    Q_ASSERT( sender() && qobject_cast< QAction* >( sender() ) );
-
-    QAction* a = qobject_cast< QAction* >( sender() );
-    Q_ASSERT( qobject_cast< SipPluginFactory* >( a->property( "factory" ).value< QObject* >() ) );
-
-    SipPluginFactory* f = qobject_cast< SipPluginFactory* >( a->property( "factory" ).value< QObject* >() );
-    sipFactoryClicked( f );
-}
-
-
-void
-SettingsDialog::sipFactoryClicked( SipPluginFactory* factory )
-{
-    //if exited with OK, create it, if not, delete it immediately!
-    SipPlugin* p = factory->createPlugin();
-    bool added = false;
-    if( p->configWidget() )
-    {
-#ifdef Q_WS_MAC
-        // on osx a sheet needs to be non-modal
-        DelegateConfigWrapper* dialog = new DelegateConfigWrapper( p->configWidget(), QString("%1 Config" ).arg( p->friendlyName() ), this, Qt::Sheet );
-        dialog->setProperty( "sipplugin", QVariant::fromValue< QObject* >( p ) );
-        connect( dialog, SIGNAL( finished( int ) ), this, SLOT( sipCreateConfigClosed( int ) ) );
-        connect( p, SIGNAL( datatError( bool ) ), dialog, SLOT( toggleOkButton( bool ) ) );
-
-        dialog->show();
-#else
-        DelegateConfigWrapper dialog( p->configWidget(), QString("%1 Config" ).arg( p->friendlyName() ), this );
-        QWeakPointer< DelegateConfigWrapper > watcher( &dialog );
-        connect( p, SIGNAL( dataError( bool ) ), &dialog, SLOT( toggleOkButton( bool ) ) );
-        int ret = dialog.exec();
-        if( !watcher.isNull() && ret == QDialog::Accepted )
-        {
-            // send changed config to resolver
-            p->saveConfig();
-
-            // accepted, so add it to tomahawk
-            TomahawkSettings::instance()->addSipPlugin( p->pluginId() );
-            SipHandler::instance()->addSipPlugin( p );
-
-            added = true;
-        }
-        else
-        {
-            // canceled, delete it
-            added = false;
-        }
-
-        handleSipPluginAdded( p, added );
-#endif
-    }
-    else
-    {
-        // no config, so just add it
-        added = true;
-        TomahawkSettings::instance()->addSipPlugin( p->pluginId() );
-        SipHandler::instance()->addSipPlugin( p );
-
-        handleSipPluginAdded( p, added );
-    }
-}
-
-
-void
-SettingsDialog::sipCreateConfigClosed( int finished )
-{
-    DelegateConfigWrapper* dialog = qobject_cast< DelegateConfigWrapper* >( sender() );
-    SipPlugin* p = qobject_cast< SipPlugin* >( dialog->property( "sipplugin" ).value< QObject* >() );
-    Q_ASSERT( p );
-
-    bool added = false;
-    if( finished == QDialog::Accepted )
-    {
-
-        p->saveConfig();
-        TomahawkSettings::instance()->addSipPlugin( p->pluginId() );
-        SipHandler::instance()->addSipPlugin( p );
-
-        added = true;
-    }
-
-    handleSipPluginAdded( p, added );
-}
-
-
-void
-SettingsDialog::handleSipPluginAdded( SipPlugin* p, bool added )
-{
-    SipPluginFactory* f = SipHandler::instance()->factoryFromPlugin( p );
-    if( added && f && f->isUnique() )
-    {
-        // remove from actions list
-        QAction* toremove = 0;
-        foreach( QAction* a, ui->addSipButton->actions() )
-        {
-            if( f == qobject_cast< SipPluginFactory* >( a->property( "factory" ).value< QObject* >() ) )
-            {
-                toremove = a;
-                break;
-            }
-        }
-        if( toremove )
-            ui->addSipButton->removeAction( toremove );
-    }
-    else if( added == false )
-    { // user pressed cancel
-        delete p;
-    }
-}
-
-
-void
-SettingsDialog::sipContextMenuRequest( const QPoint& p )
-{
-    QModelIndex idx = ui->accountsView->indexAt( p );
-    // if it's an account, allow to delete
-    if( idx.isValid() && !idx.data( SipModel::FactoryRole ).toBool() && !idx.data( SipModel::FactoryItemRole ).toBool() )
-    {
-        QList< QAction* > acts;
-        acts << new QAction( tr( "Delete Account" ), this );
-        acts.first()->setProperty( "sipplugin", idx.data( SipModel::SipPluginData ) );
-        connect( acts.first(), SIGNAL( triggered( bool ) ), this, SLOT( sipPluginRowDeleted( bool ) ) );
-        QMenu::exec( acts, ui->accountsView->mapToGlobal( p ) );
-    }
-}
-
-
-void
-SettingsDialog::sipPluginRowDeleted( bool )
-{
-    SipPlugin* p = qobject_cast< SipPlugin* >( qobject_cast< QAction* >( sender() )->property( "sipplugin" ).value< QObject* >() );
-    SipHandler::instance()->removeSipPlugin( p );
-}
-
-
-void
-SettingsDialog::sipPluginDeleted( bool )
-{
-    QModelIndexList indexes = ui->accountsView->selectionModel()->selectedIndexes();
-    // if it's an account, allow to delete
-    foreach( const QModelIndex& idx, indexes )
-    {
-        if( idx.isValid() && !idx.data( SipModel::FactoryRole ).toBool() && !idx.data( SipModel::FactoryItemRole ).toBool() )
-        {
-            SipPlugin* p = qobject_cast< SipPlugin* >( idx.data( SipModel::SipPluginData ).value< QObject* >() );
-
-            if( SipPluginFactory* f = SipHandler::instance()->factoryFromPlugin( p ) )
-            {
-                if( f->isUnique() ) // just deleted a unique plugin->re-add to add menu
-                {
-                    QAction* action = new QAction( f->icon(), f->prettyName(), ui->addSipButton );
-                    action->setProperty( "factory", QVariant::fromValue< QObject* >( f ) );
-                    ui->addSipButton->addAction( action );
-
-                    connect( action, SIGNAL( triggered(bool) ), this, SLOT( factoryActionTriggered( bool ) ) );
-                }
-            }
-            SipHandler::instance()->removeSipPlugin( p );
-        }
-    }
-}
-
-
-void
-SettingsDialog::requiresRestart()
-{
-    QMessageBox::information( this, tr( "Information" ), tr( "Changing this setting requires a restart of Tomahawk!" ) );
-}
-
-
-ProxyDialog::ProxyDialog( QWidget *parent )
-: QDialog( parent )
-, ui( new Ui::ProxyDialog )
-{
-    ui->setupUi( this );
-
-    // ugly, I know, but...
-
-    int i = 0;
-    ui->typeBox->insertItem( i, "No Proxy", QNetworkProxy::NoProxy );
-    m_forwardMap QNetworkProxy::NoProxy  = i;
-    m_backwardMap i  = QNetworkProxy::NoProxy;
-    i++;
-    ui->typeBox->insertItem( i, "SOCKS 5", QNetworkProxy::Socks5Proxy );
-    m_forwardMap QNetworkProxy::Socks5Proxy  = i;
-    m_backwardMap i  = QNetworkProxy::Socks5Proxy;
-    i++;
-
-    TomahawkSettings* s = TomahawkSettings::instance();
-
-    ui->typeBox->setCurrentIndex( m_forwardMaps->proxyType() );
-    ui->hostLineEdit->setText( s->proxyHost() );
-    ui->portSpinBox->setValue( s->proxyPort() );
-    ui->userLineEdit->setText( s->proxyUsername() );
-    ui->passwordLineEdit->setText( s->proxyPassword() );
-    ui->checkBoxUseProxyForDns->setChecked( s->proxyDns() );
-    ui->noHostLineEdit->setText( s->proxyNoProxyHosts() );
-
-    if ( s->proxyType() == QNetworkProxy::NoProxy )
-    {
-        ui->hostLineEdit->setEnabled( false );
-        ui->portSpinBox->setEnabled( false );
-        ui->userLineEdit->setEnabled( false );
-        ui->passwordLineEdit->setEnabled( false );
-        ui->checkBoxUseProxyForDns->setEnabled( false );
-    }
-
-    connect( ui->typeBox, SIGNAL( currentIndexChanged( int ) ), SLOT( proxyTypeChangedSlot( int ) ) );
-}
-
-
-void
-ProxyDialog::proxyTypeChangedSlot( int index )
-{
-    if ( m_backwardMap index  == QNetworkProxy::NoProxy )
-    {
-        ui->hostLineEdit->setEnabled( false );
-        ui->portSpinBox->setEnabled( false );
-        ui->userLineEdit->setEnabled( false );
-        ui->passwordLineEdit->setEnabled( false );
-        ui->checkBoxUseProxyForDns->setEnabled( false );
-    }
-    else
-    {
-        ui->hostLineEdit->setEnabled( true );
-        ui->portSpinBox->setEnabled( true );
-        ui->userLineEdit->setEnabled( true );
-        ui->passwordLineEdit->setEnabled( true );
-        ui->checkBoxUseProxyForDns->setEnabled( true );
-    }
-}
-
-
-void
-ProxyDialog::saveSettings()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    QNetworkProxy::ProxyType type = static_cast< QNetworkProxy::ProxyType>( m_backwardMap ui->typeBox->currentIndex()  );
-
-    //First set settings
-    TomahawkSettings* s = TomahawkSettings::instance();
-    s->setProxyHost( ui->hostLineEdit->text() );
-
-    int port = ui->portSpinBox->value();
-    s->setProxyPort( port );
-    s->setProxyNoProxyHosts( ui->noHostLineEdit->text() );
-    s->setProxyUsername( ui->userLineEdit->text() );
-    s->setProxyPassword( ui->passwordLineEdit->text() );
-    s->setProxyType( type );
-    s->setProxyDns( ui->checkBoxUseProxyForDns->checkState() == Qt::Checked );
-    s->sync();
-
-    TomahawkUtils::NetworkProxyFactory* proxyFactory = TomahawkUtils::proxyFactory();
-    tDebug() << Q_FUNC_INFO << "Got proxyFactory: " << proxyFactory;
-    if ( type == QNetworkProxy::NoProxy )
-    {
-        tDebug() << Q_FUNC_INFO << "Got NoProxy selected";
-        proxyFactory->setProxy( QNetworkProxy::NoProxy );
-    }
-    else
-    {
-        tDebug() << Q_FUNC_INFO << "Got Socks5Proxy selected";
-        proxyFactory->setProxy( QNetworkProxy( type, s->proxyHost(), s->proxyPort(), s->proxyUsername(), s->proxyPassword() ) );
-        if ( !ui->noHostLineEdit->text().isEmpty() )
-        {
-            tDebug() << Q_FUNC_INFO << "noproxy line edit is " << ui->noHostLineEdit->text();
-            tDebug() << Q_FUNC_INFO << "split noproxy line edit is " << ui->noHostLineEdit->text().split( ' ', QString::SkipEmptyParts );
-            proxyFactory->setNoProxyHosts( ui->noHostLineEdit->text().split( ' ', QString::SkipEmptyParts ) );
-        }
-    }
-}

tomahawk-0.4.2.tar.bz2/src/settingsdialog.h Deleted

@@ -1,126 +0,0 @@
-/* === 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
- *   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 SETTINGSDIALOG_H
-#define SETTINGSDIALOG_H
-
-#include <QtGui/QDialog>
-#include <QtCore/QModelIndex>
-
-#include "config.h"
-
-class LoadingSpinner;
-class QListWidgetItem;
-class Ui_StackedSettingsDialog;
-class SipPluginFactory;
-class SipPlugin;
-class SipModel;
-class ResolversModel;
-class QNetworkReply;
-
-namespace Ui
-{
-    class SettingsDialog;
-    class ProxyDialog;
-}
-
-class ProxyDialog : public QDialog
-{
-Q_OBJECT
-
-public:
-    explicit ProxyDialog( QWidget* parent = 0 );
-    ~ProxyDialog() {};
-
-    void saveSettings();
-
-private slots:
-    void proxyTypeChangedSlot( int index );
-
-private:
-    Ui::ProxyDialog* ui;
-    QHash<int,int> m_forwardMap;
-    QHash<int,int> m_backwardMap;
-};
-
-class SettingsDialog : public QDialog
-{
-Q_OBJECT
-
-public:
-    explicit SettingsDialog( QWidget* parent = 0 );
-    ~SettingsDialog();
-
-protected:
-    void changeEvent( QEvent* e );
-
-private slots:
-    void onRejected();
-
-    void toggleUpnp( bool preferStaticEnabled );
-    void showProxySettings();
-
-    void testLastFmLogin();
-    void onLastFmFinished();
-
-    void addScriptResolver();
-    void scriptSelectionChanged();
-    void removeScriptResolver();
-    void getMoreResolvers();
-    void getMoreResolversFinished( int );
-#ifdef LIBATTICA_FOUND
-    void atticaResolverInstalled( const QString& );
-    void atticaResolverUninstalled( const QString& );
-#endif
-
-    void openResolverConfig( const QString& );
-    void sipItemClicked ( const QModelIndex& );
-    void openSipConfig( SipPlugin* );
-    void factoryActionTriggered ( bool );
-    void sipFactoryClicked( SipPluginFactory* );
-    void sipContextMenuRequest( const QPoint& );
-    void sipPluginDeleted( bool );
-    void sipPluginRowDeleted( bool );
-
-    void updateScanOptionsView();
-
-    // dialog slots
-    void resolverConfigClosed( int value );
-    void sipConfigClosed( int value );
-    void sipCreateConfigClosed( int value );
-
-    void changePage( QListWidgetItem*, QListWidgetItem* );
-    void serventReady();
-
-    void requiresRestart();
-
-private:
-    void createIcons();
-    void setupSipButtons();
-    void handleSipPluginAdded( SipPlugin* p, bool added );
-
-    Ui_StackedSettingsDialog* ui;
-
-    ProxyDialog m_proxySettings;
-    bool m_rejected;
-    SipModel* m_sipModel;
-    ResolversModel* m_resolversModel;
-    LoadingSpinner* m_sipSpinner;
-};
-
-#endif // SETTINGSDIALOG_H

tomahawk-0.4.2.tar.bz2/src/settingslistdelegate.cpp Deleted

@@ -1,74 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Michael Zanetti <mzanetti@kde.org>
- *   Copyright 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 "settingslistdelegate.h"
-#include "utils/logger.h"
-
-#include <QPainter>
-#include <QIcon>
-#include <QApplication>
-
-SettingsListDelegate::SettingsListDelegate(QObject *parent) :
-    QStyledItemDelegate(parent)
-{
-}
-
-
-void SettingsListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
-{
-    painter->save();
-
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, QModelIndex() );
-    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
-
-#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
-    // On mac draw our own selection rect as we don't get one from osx (around the whole icon or around just text)
-    if ( opt.state & QStyle::State_Selected )
-    {
-        painter->setRenderHint( QPainter::Antialiasing );
-
-        QPainterPath p;
-        p.addRoundedRect( opt.rect.adjusted( 2, 1, -1, -1 ), 5, 5 );
-
-        QColor fill( 214, 214, 214 );
-        QColor border( 107, 107, 107 );
-        painter->setPen( border );
-        painter->drawPath( p );
-        painter->fillPath( p, fill );
-    }
-#else
-    if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected )
-    {
-        painter->setPen( option.palette.color( QPalette::HighlightedText ) );
-    }
-#endif
-
-    int horizontalOffset = ( option.rect.width() - option.decorationSize.width() ) /2;
-    QRect iconRect = option.rect.adjusted( horizontalOffset, 6, -horizontalOffset, -option.rect.height() + 6 + option.decorationSize.height() );
-    QPixmap avatar = index.data( Qt::DecorationRole ).value<QIcon>().pixmap( iconRect.size() );
-    painter->drawPixmap( iconRect, avatar );
-
-    QRect textRect = option.rect.adjusted( 6, iconRect.height() + 8, -6, 0 );
-    QString text = painter->fontMetrics().elidedText( index.data( Qt::DisplayRole ).toString(), Qt::ElideRight, textRect.width() );
-    QTextOption to( Qt::AlignHCenter );
-    painter->drawText( textRect, text, to );
-
-    painter->restore();
-}

tomahawk-0.4.2.tar.bz2/src/shortcuthandler.cpp Deleted

@@ -1,31 +0,0 @@
-/* === 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
- *   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 "shortcuthandler.h"
-
-using namespace Tomahawk;
-
-ShortcutHandler::ShortcutHandler( QObject *parent )
-    : QObject( parent )
-{
-
-}
-
- ShortcutHandler::~ShortcutHandler()
- {
- }

tomahawk-0.4.2.tar.bz2/src/sip Deleted

tomahawk-0.4.2.tar.bz2/src/sip/CMakeLists.txt Deleted

tomahawk-0.4.2.tar.bz2/src/sip/jabber Deleted

tomahawk-0.4.2.tar.bz2/src/sip/jabber/CMakeLists.txt Deleted

@@ -1,71 +0,0 @@
-project( tomahawk )
-
-include( ${QT_USE_FILE} )
-add_definitions( ${QT_DEFINITIONS} )
-add_definitions( -DQT_PLUGIN )
-add_definitions( -DQT_SHARED )
-add_definitions( -DSIPDLLEXPORT_PRO )
-
-set( jabberSources
-    jabber.cpp
-    tomahawksipmessage.cpp
-    tomahawksipmessagefactory.cpp
-)
-set( jabberSourcesGui
-    avatarmanager.cpp
-    xmlconsole.cpp
-)
-
-set( jabberHeaders
-    jabber.h
-)
-set( jabberHeadersGui
-    avatarmanager.h
-    xmlconsole.h
-)
-
-set( jabberUI
-    configwidget.ui
-    xmlconsole.ui
-)
-
-if(BUILD_GUI)
-    list(APPEND jabberSources ${jabberSourcesGui})
-    list(APPEND jabberHeaders ${jabberHeadersGui})
-endif()
-
-include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
-   ${QT_INCLUDE_DIR}
-   ${LIBJREEN_INCLUDE_DIR}
-)
-
-qt4_add_resources( RC_SRCS "resources.qrc" )
-qt4_wrap_ui( jabberUI_H ${jabberUI} )
-qt4_wrap_cpp( jabberMoc ${jabberHeaders} )
-add_library( tomahawk_sipjabber SHARED ${jabberSources} ${jabberMoc} ${jabberUI_H} ${RC_SRCS} )
-
-IF( WIN32 )
-SET( OS_SPECIFIC_LINK_LIBRARIES
-    ${OS_SPECIFIC_LINK_LIBRARIES}
-    "secur32.dll"
-    "crypt32.dll"
-    ${TOMAHAWK_LIBRARIES}
-)
-ENDIF( WIN32 )
-
-target_link_libraries( tomahawk_sipjabber
-    ${QT_LIBRARIES}
-    ${LIBJREEN_LIBRARY}
-    ${OS_SPECIFIC_LINK_LIBRARIES}
-    tomahawklib
-)
-
-IF( APPLE )
-#  SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
-ENDIF( APPLE )
-
-install( TARGETS tomahawk_sipjabber DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-
-if(BUILD_GUI)
-    add_subdirectory(googlewrapper)
-endif()

tomahawk-0.4.2.tar.bz2/src/sip/jabber/avatarmanager.cpp Deleted

@@ -1,192 +0,0 @@
-/* === 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
- *   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 "avatarmanager.h"
-
-#include "utils/tomahawkutils.h"
-
-#include <jreen/vcard.h>
-#include <jreen/vcardupdate.h>
-#include <jreen/presence.h>
-#include <jreen/iqreply.h>
-
-#include <QDir>
-#include <QCryptographicHash>
-#include <QPixmap>
-
-#include "utils/logger.h"
-
-
-AvatarManager::AvatarManager(Jreen::Client *client) :
-    m_cacheDir(TomahawkUtils::appDataDir().absolutePath().append("/jreen/"))
-{
-    m_client = client;
-
-    m_cachedAvatars = m_cacheDir.entryList();
-
-    connect(m_client, SIGNAL(serverFeaturesReceived(QSet<QString>)), SLOT(onNewConnection()));
-    connect(m_client, SIGNAL(presenceReceived(Jreen::Presence)), SLOT(onNewPresence(Jreen::Presence)));
-    connect(m_client, SIGNAL(iqReceived(Jreen::IQ)), SLOT(onNewIq(Jreen::IQ)));
-
-    connect(this, SIGNAL(newAvatar(QString)), SLOT(onNewAvatar(QString)));
-}
-
-AvatarManager::~AvatarManager()
-{
-}
-
-void AvatarManager::onNewConnection()
-{
-    fetchVCard( m_client->jid().bare() );
-}
-
-
-void AvatarManager::fetchVCard(const QString &jid)
-{
-//    qDebug() << Q_FUNC_INFO;
-
-    Jreen::IQ iq(Jreen::IQ::Get, jid );
-    iq.addExtension(new Jreen::VCard());
-    Jreen::IQReply *reply = m_client->send(iq);
-    connect(reply, SIGNAL(received(Jreen::IQ)), SLOT(onNewIq(Jreen::IQ)));
-}
-
-void AvatarManager::onNewPresence(const Jreen::Presence& presence)
-{
-    Jreen::VCardUpdate::Ptr update = presence.payload<Jreen::VCardUpdate>();
-    if(update)
-    {
-//        qDebug() << "vcard: found update for" << presence.from().full();
-        if(!isCached(update->photoHash()))
-        {
-//            qDebug() << presence.from().full() << "vcard: photo not cached, starting request..." << update->photoHash();
-            fetchVCard( presence.from().bare() );
-        }
-        else
-        {
-//            qDebug() << presence.from().full() << "vcard: photo already cached no request necessary " << update->photoHash();
-            m_JidsAvatarHashes.insert( update->photoHash(), presence.from().bare() );
-
-            if ( !this->avatar( presence.from().bare() ).isNull() )
-                emit newAvatar(presence.from().bare());
-        }
-    }
-    else
-    {
-//        qDebug() << Q_FUNC_INFO << presence.from().full() << "got no statusupdateextension";
-
-        //TODO: do we want this? might fetch avatars for broken clients
-        fetchVCard( presence.from().bare() );
-    }
-}
-
-void AvatarManager::onNewIq(const Jreen::IQ& iq)
-{
-    Jreen::VCard::Ptr vcard = iq.payload<Jreen::VCard>();
-    if(vcard)
-    {
-        iq.accept();
-
-//        qDebug() << Q_FUNC_INFO << "Got vcard from " << iq.from().full();
-
-        QString id = iq.from().full();
-        QString avatarHash;
-
-        const Jreen::VCard::Photo &photo = vcard->photo();
-        if (!photo.data().isEmpty()) {
-//            qDebug() << "vcard: got photo data" << id;
-
-            avatarHash = QCryptographicHash::hash(photo.data(), QCryptographicHash::Sha1).toHex();
-
-            if (!m_cacheDir.exists())
-                m_cacheDir.mkpath( avatarDir( avatarHash ).absolutePath() );
-
-
-            QFile file(avatarPath(avatarHash));
-            if (file.open(QIODevice::WriteOnly)) {
-                file.write(photo.data());
-                file.close();
-            }
-
-            m_cachedAvatars.append(avatarHash);
-            m_JidsAvatarHashes.insert( avatarHash, iq.from().bare() );
-
-            Q_ASSERT(!this->avatar(iq.from().bare()).isNull());
-            emit newAvatar(iq.from().bare());
-        }
-        else
-        {
-//            qDebug() << "vcard: got no photo data" << id;
-        }
-
-        // got own presence
-        if ( m_client->jid().bare() == id )
-        {
-//            qDebug() << Q_FUNC_INFO << "got own vcard";
-
-            Jreen::Presence presence = m_client->presence();
-            Jreen::VCardUpdate::Ptr update = presence.payload<Jreen::VCardUpdate>();
-            if (update->photoHash() != avatarHash)
-            {
-                qDebug() << Q_FUNC_INFO << "Updating own presence...";
-
-                update->setPhotoHash(avatarHash);
-                m_client->send(presence);
-            }
-        }
-    }
-}
-
-QPixmap AvatarManager::avatar(const QString &jid) const
-{
-    if( isCached( avatarHash( jid ) ) )
-    {
-        return QPixmap( avatarPath( avatarHash( jid ) ) );
-    }
-    else
-    {
-        return QPixmap();
-    }
-}
-
-QString AvatarManager::avatarHash(const QString &jid) const
-{
-    //qDebug() << Q_FUNC_INFO << jid << m_JidsAvatarHashes.key(jid);
-    return m_JidsAvatarHashes.key(jid);
-}
-
-QDir AvatarManager::avatarDir(const QString&) const
-{
-    return m_cacheDir;
-}
-
-QString AvatarManager::avatarPath(const QString &avatarHash) const
-{
-    Q_ASSERT(!avatarHash.contains("@"));
-    return avatarDir(avatarHash).absoluteFilePath(avatarHash);
-}
-
-bool AvatarManager::isCached(const QString &avatarHash) const
-{
-    return m_cachedAvatars.contains( avatarHash );
-}
-
-void AvatarManager::onNewAvatar(const QString&)
-{
-//    qDebug() << Q_FUNC_INFO <<  "Found new Avatar..." << jid;
-}

tomahawk-0.4.2.tar.bz2/src/sip/jabber/avatarmanager.h Deleted

@@ -1,62 +0,0 @@
-/* === 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
- *   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 AVATARMANAGER_H
-#define AVATARMANAGER_H
-
-#include <jreen/client.h>
-
-#include <QObject>
-#include <QDir>
-
-#include "../sipdllmacro.h"
-
-class SIPDLLEXPORT AvatarManager : public QObject
-{
-Q_OBJECT
-
-public:
-    AvatarManager(Jreen::Client *client);
-    virtual ~AvatarManager();
-
-    QPixmap avatar(const QString &jid) const;
-
-signals:
-    void newAvatar( const QString &jid );
-
-private slots:
-    void onNewPresence( const Jreen::Presence& presence );
-    void onNewIq(const Jreen::IQ &iq);
-    void onNewConnection();
-    void onNewAvatar( const QString &jid );
-
-private:
-    void fetchVCard( const QString &jid);
-    QString avatarHash(const QString &jid) const;
-    QString avatarPath(const QString &avatarHash) const;
-
-    QDir avatarDir(const QString &avatarHash) const;
-    bool isCached(const QString &avatarHash) const;
-
-    Jreen::Client *m_client;
-    QStringList m_cachedAvatars;
-    QDir m_cacheDir;
-    QMap<QString, QString> m_JidsAvatarHashes;
-};
-
-#endif // AVATARMANAGER_H

tomahawk-0.4.2.tar.bz2/src/sip/jabber/configwidget.ui Deleted

@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>JabberConfig</class>
- <widget class="QWidget" name="JabberConfig">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>451</width>
-    <height>335</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Jabber Configuration</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="logoLabel">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="pixmap">
-        <pixmap resource="resources.qrc">:/jabber-icon.png</pixmap>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="headerLabel">
-       <property name="font">
-        <font>
-         <pointsize>11</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Configure this Jabber account</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <spacer name="horizontalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="jabberBlurb">
-       <property name="text">
-        <string>Enter your Jabber login to connect with your friends using Tomahawk!</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Login Information</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_8">
-        <item>
-         <widget class="QLabel" name="emailLabel">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Jabber ID:</string>
-          </property>
-          <property name="buddy">
-           <cstring>jabberUsername</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="jabberUsername">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="placeholderText">
-           <string>e.g. user@example.com</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_4">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Password:</string>
-          </property>
-          <property name="buddy">
-           <cstring>jabberPassword</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="jabberPassword">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="inputMask">
-           <string/>
-          </property>
-          <property name="echoMode">
-           <enum>QLineEdit::Password</enum>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QLabel" name="jidExistsLabel">
-        <property name="text">
-         <string>An account with this name already exists!</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBoxJabberAdvanced">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Advanced Jabber Settings</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_5">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <widget class="QLabel" name="labelJabberServer">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>50</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Server:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <property name="buddy">
-           <cstring>jabberServer</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="jabberServer">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="labelJabberPort">
-          <property name="text">
-           <string>Port:</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="jabberPort">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>90</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>90</width>
-            <height>16777215</height>
-           </size>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-          </property>
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>65535</number>
-          </property>
-          <property name="value">
-           <number>5222</number>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>5</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="resources.qrc"/>
- </resources>
- <connections/>
-</ui>

tomahawk-0.4.2.tar.bz2/src/sip/jabber/googlewrapper Deleted

tomahawk-0.4.2.tar.bz2/src/sip/jabber/googlewrapper/CMakeLists.txt Deleted

tomahawk-0.4.2.tar.bz2/src/sip/jabber/googlewrapper/googlewrapper.cpp Deleted

@@ -1,86 +0,0 @@
-/*
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "googlewrapper.h"
-#include "ui_configwidget.h"
-
-#include "utils/tomahawkutilsgui.h"
-
-#include <QtPlugin>
-#include <QInputDialog>
-
-
-SipPlugin*
-GoogleWrapperFactory::createPlugin( const QString& pluginId )
-{
-    return new GoogleWrapper( pluginId.isEmpty() ? generateId() : pluginId );
-}
-
-
-QIcon
-GoogleWrapperFactory::icon() const
-{
-    return QIcon( ":/gmail-logo.png" );
-}
-
-
-GoogleWrapper::GoogleWrapper ( const QString& pluginID )
-    : JabberPlugin ( pluginID )
-{
-    m_ui->headerLabel->setText( tr( "Configure this Google Account" ) );
-    m_ui->emailLabel->setText( tr( "Google Address" ) );
-    m_ui->jabberBlurb->setText( tr( "Enter your Google login to connect with your friends using Tomahawk!" ) );
-    m_ui->logoLabel->setPixmap( QPixmap( ":/gmail-logo.png" ) );
-    m_ui->jabberServer->setText( "talk.google.com" );
-    m_ui->jabberPort->setValue( 5222 );
-    m_ui->groupBoxJabberAdvanced->hide();
-}
-
-
-QIcon
-GoogleWrapper::icon() const
-{
-    return QIcon( ":/gmail-logo.png" );
-}
-
-
-QString
-GoogleWrapper::defaultSuffix() const
-{
-    return "@gmail.com";
-}
-
-
-void
-GoogleWrapper::showAddFriendDialog()
-{
-    bool ok;
-    QString id = QInputDialog::getText( TomahawkUtils::tomahawkWindow(), tr( "Add Friend" ),
-                                        tr( "Enter Google Address:" ), QLineEdit::Normal, "", &ok ).trimmed();
-    if ( !ok )
-        return;
-
-    qDebug() << "Attempting to add google contact to roster:" << id;
-    addContact( id );
-}
-
-
-#ifdef GOOGLE_WRAPPER
-Q_EXPORT_PLUGIN2( sipfactory, GoogleWrapperFactory )
-#endif

tomahawk-0.4.2.tar.bz2/src/sip/jabber/googlewrapper/googlewrapper.h Deleted

@@ -1,57 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef GOOGLEWRAPPER_H
-#define GOOGLEWRAPPER_H
-
-#include "sip/jabber/jabber.h"
-
-class SIPDLLEXPORT GoogleWrapperFactory : public SipPluginFactory
-{
-    Q_OBJECT
-    Q_INTERFACES( SipPluginFactory )
-
-public:
-    GoogleWrapperFactory() {}
-    virtual ~GoogleWrapperFactory() {}
-
-    virtual QString prettyName() const { return "Google"; }
-    virtual QString factoryId() const { return "sipgoogle"; }
-    virtual QIcon icon() const;
-    virtual SipPlugin* createPlugin( const QString& pluginId );
-};
-
-class SIPDLLEXPORT GoogleWrapper : public JabberPlugin
-{
-    Q_OBJECT
-public:
-  GoogleWrapper( const QString& pluginID );
-  virtual ~GoogleWrapper() {}
-
-  virtual const QString name() const { return QString( "Google" ); }
-  virtual const QString friendlyName() const { return "Google"; }
-  virtual QIcon icon() const;
-
-protected:
-    QString defaultSuffix() const;
-
-public slots:
-    void showAddFriendDialog();
-};
-
-#endif // GOOGLEWRAPPER_H

tomahawk-0.4.2.tar.bz2/src/sip/jabber/jabber-icon.png Deleted

tomahawk-0.4.2.tar.bz2/src/sip/jabber/jabber.cpp Deleted

@@ -1,1064 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Dominik Schmidt <dev@dominik-schmidt.de>
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 "jabber.h"
-#include "ui_configwidget.h"
-
-#include "config.h"
-
-#include "tomahawksettings.h"
-#include "tomahawksipmessage.h"
-#include "tomahawksipmessagefactory.h"
-
-#include <jreen/jid.h>
-#include <jreen/capabilities.h>
-#include <jreen/vcardupdate.h>
-#include <jreen/vcard.h>
-#include <jreen/directconnection.h>
-#include <jreen/tcpconnection.h>
-#include <jreen/softwareversion.h>
-#include <jreen/iqreply.h>
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-
-#include <QtCore/QtPlugin>
-#include <QtCore/QStringList>
-#include <QtCore/QDateTime>
-#include <QtCore/QTimer>
-
-#ifndef ENABLE_HEADLESS
-    #include <QtGui/QInputDialog>
-    #include <QtGui/QLineEdit>
-    #include <QtGui/QMessageBox>
-#endif
-
-#include <utils/tomahawkutilsgui.h>
-#include "utils/logger.h"
-
-using namespace Jreen;
-
-SipPlugin*
-JabberFactory::createPlugin( const QString& pluginId )
-{
-    return new JabberPlugin( pluginId.isEmpty() ? generateId() : pluginId );
-}
-
-
-QIcon
-JabberFactory::icon() const
-{
-    return QIcon( ":/jabber-icon.png" );
-}
-
-
-JabberPlugin::JabberPlugin( const QString& pluginId )
-    : SipPlugin( pluginId )
-    , m_state( Disconnected )
-#ifndef ENABLE_HEADLESS
-    , m_menu( 0 )
-    , m_xmlConsole( 0 )
-#endif
-{
-    qDebug() << Q_FUNC_INFO;
-
-    m_currentUsername = accountName();
-    m_currentServer = readServer();
-    m_currentPassword = readPassword();
-    m_currentPort = readPort();
-
-#ifndef ENABLE_HEADLESS
-    m_configWidget = QWeakPointer< QWidget >( new QWidget );
-    m_ui = new Ui_JabberConfig;
-    m_ui->setupUi( m_configWidget.data() );
-    m_configWidget.data()->setVisible( false );
-
-    m_ui->jabberUsername->setText( m_currentUsername );
-    m_ui->jabberPassword->setText( m_currentPassword );
-    m_ui->jabberServer->setText( m_currentServer );
-    m_ui->jabberPort->setValue( m_currentPort );
-    m_ui->jidExistsLabel->hide();
-    connect( m_ui->jabberUsername, SIGNAL( textChanged( QString ) ), SLOT( onCheckJidExists( QString ) ) );
-#endif
-
-    // setup JID object
-    Jreen::JID jid = Jreen::JID( accountName() );
-
-    // general client setup
-    m_client = new Jreen::Client( jid, m_currentPassword );
-    m_client->setProxyFactory( TomahawkUtils::proxyFactory( true ) );
-    setupClientHelper();
-
-    m_client->registerPayload(new TomahawkSipMessageFactory);
-    m_currentResource = QString::fromAscii( "tomahawk%1" ).arg( QString::number( qrand() % 10000 ) );
-    m_client->setResource( m_currentResource );
-
-#ifndef ENABLE_HEADLESS
-    // instantiate XmlConsole
-    if( readXmlConsoleEnabled() )
-    {
-        m_xmlConsole = new XmlConsole( m_client );
-        m_xmlConsole->show();
-    }
-#endif
-    // add VCardUpdate extension to own presence
-    m_client->presence().addExtension( new Jreen::VCardUpdate() );
-
-    // initaliaze the roster
-    m_roster = new Jreen::SimpleRoster( m_client );
-
-#ifndef ENABLE_HEADLESS
-    // initialize the AvatarManager
-    m_avatarManager = new AvatarManager( m_client );
-#endif
-
-    // setup disco
-    m_client->disco()->setSoftwareVersion( "Tomahawk Player", TOMAHAWK_VERSION, CMAKE_SYSTEM );
-    m_client->disco()->addIdentity( Jreen::Disco::Identity( "client", "type", "tomahawk", "en" ) );
-    m_client->disco()->addFeature( TOMAHAWK_FEATURE );
-
-    // setup caps node
-    Jreen::Capabilities::Ptr caps = m_client->presence().payload<Jreen::Capabilities>();
-    caps->setNode( TOMAHAWK_CAP_NODE_NAME );
-
-    // print connection parameters
-    qDebug() << "Our JID set to:" << m_client->jid().full();
-    qDebug() << "Our Server set to:" << m_client->server();
-    qDebug() << "Our Port set to" << m_client->port();
-
-    // setup slots
-    connect(m_client, SIGNAL(serverFeaturesReceived(QSet<QString>)), SLOT(onConnect()));
-    connect(m_client, SIGNAL(disconnected(Jreen::Client::DisconnectReason)), SLOT(onDisconnect(Jreen::Client::DisconnectReason)));
-    connect(m_client, SIGNAL(messageReceived(Jreen::Message)), SLOT(onNewMessage(Jreen::Message)));
-
-    connect(m_client, SIGNAL(iqReceived(Jreen::IQ)), SLOT(onNewIq(Jreen::IQ)));
-
-    connect(m_roster, SIGNAL(presenceReceived(Jreen::RosterItem::Ptr,Jreen::Presence)),
-                      SLOT(onPresenceReceived(Jreen::RosterItem::Ptr,Jreen::Presence)));
-    connect(m_roster, SIGNAL(subscriptionReceived(Jreen::RosterItem::Ptr,Jreen::Presence)),
-                      SLOT(onSubscriptionReceived(Jreen::RosterItem::Ptr,Jreen::Presence)));
-
-#ifndef ENABLE_HEADLESS
-    connect(m_avatarManager, SIGNAL(newAvatar(QString)), SLOT(onNewAvatar(QString)));
-#endif
-}
-
-
-JabberPlugin::~JabberPlugin()
-{
-    delete m_avatarManager;
-    delete m_roster;
-#ifndef ENABLE_HEADLESS
-    delete m_xmlConsole;
-#endif
-    delete m_client;
-    delete m_ui;
-}
-
-
-const QString
-JabberPlugin::name() const
-{
-    return QString( MYNAME );
-}
-
-
-const QString
-JabberPlugin::friendlyName() const
-{
-    return QString( "Jabber" );
-}
-
-
-const QString
-JabberPlugin::accountName() const
-{
-    return TomahawkSettings::instance()->value( pluginId() + "/username" ).toString();
-}
-
-
-#ifndef ENABLE_HEADLESS
-QMenu*
-JabberPlugin::menu()
-{
-    return m_menu;
-}
-
-
-QWidget*
-JabberPlugin::configWidget()
-{
-    return m_configWidget.data();
-}
-
-
-QIcon
-JabberPlugin::icon() const
-{
-    return QIcon( ":/jabber-icon.png" );
-}
-#endif
-
-
-bool
-JabberPlugin::connectPlugin( bool startup )
-{
-    Q_UNUSED( startup );
-    qDebug() << Q_FUNC_INFO;
-
-    if(m_client->isConnected())
-    {
-        qDebug() << Q_FUNC_INFO << "Already connected to server, not connecting again...";
-        return true; //FIXME: should i return false here?!
-    }
-
-    qDebug() << "Connecting to the XMPP server..." << m_client->jid().full();
-
-    //FIXME: we're badly workarounding some missing reconnection api here, to be fixed soon
-    QTimer::singleShot( 1000, m_client, SLOT( connectToServer() ) );
-
-    if ( m_client->connection() )
-        connect(m_client->connection(), SIGNAL(error(SocketError)), SLOT(onError(SocketError)));
-
-    m_state = Connecting;
-    emit stateChanged( m_state );
-    return true;
-}
-
-
-void
-JabberPlugin::disconnectPlugin()
-{
-    if (!m_client->isConnected())
-    {
-        if ( m_state != Disconnected ) // might be Connecting
-        {
-           m_state = Disconnected;
-           emit stateChanged( m_state );
-        }
-        return;
-    }
-
-    //m_roster->deleteLater();
-    //m_roster = 0;
-    //m_room->deleteLater();
-    //m_room = 0;
-
-    m_peers.clear();
-
-    m_client->disconnectFromServer( true );
-    m_state = Disconnecting;
-    emit stateChanged( m_state );
-}
-
-
-void
-JabberPlugin::onConnect()
-{
-//    qDebug() << Q_FUNC_INFO;
-
-    // update jid resource, servers like gtalk use resource binding and may
-    // have changed our requested /resource
-    if ( m_client->jid().resource() != m_currentResource )
-    {
-        m_currentResource = m_client->jid().resource();
-        emit jidChanged( m_client->jid().full() );
-    }
-
-    qDebug() << "Connected to jabber as:" << m_client->jid().full();
-
-    // set presence to least valid value
-    m_client->setPresence(Jreen::Presence::XA, "Got Tomahawk? http://gettomahawk.com", -127);
-
-    // set ping timeout to 15 secs (TODO: verify if this works)
-    m_client->setPingInterval(1000);
-
-    // load roster
-    m_roster->load();
-
-    //FIXME: this implementation is totally broken atm, so it's disabled to avoid harm :P
-    // join MUC with bare jid as nickname
-    //TODO: make the room a list of rooms and make that configurable
-    QString mucNickname = QString( "tomahawk@conference.qutim.org/" ).append( QString( m_client->jid().bare() ).replace( "@", "-" ) );
-    //m_room = new Jreen::MUCRoom(m_client, Jreen::JID( mucNickname ) );
-    //m_room->setHistorySeconds(0);
-    //m_room->join();
-
-    // treat muc participiants like contacts
-    //connect( m_room, SIGNAL( messageReceived( Jreen::Message, bool ) ), this, SLOT( onNewMessage( Jreen::Message ) ) );
-    //connect( m_room, SIGNAL( presenceReceived( Jreen::Presence, const Jreen::MUCRoom::Participant* ) ), this, SLOT( onNewPresence( Jreen::Presence ) ) );
-
-    m_state = Connected;
-    emit stateChanged( m_state );
-
-    addMenuHelper();
-}
-
-
-void
-JabberPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    switch( reason )
-    {
-        case Jreen::Client::User:
-            break;
-
-        case Jreen::Client::AuthorizationError:
-            emit error( SipPlugin::AuthError, errorMessage( reason ) );
-            break;
-
-        case Jreen::Client::HostUnknown:
-        case Jreen::Client::ItemNotFound:
-        case Jreen::Client::RemoteStreamError:
-        case Jreen::Client::RemoteConnectionFailed:
-        case Jreen::Client::InternalServerError:
-        case Jreen::Client::SystemShutdown:
-        case Jreen::Client::Conflict:
-        case Jreen::Client::Unknown:
-            emit error( SipPlugin::ConnectionError, errorMessage( reason ) );
-            break;
-
-        default:
-            qDebug() << "Not all Client::DisconnectReasons checked";
-            Q_ASSERT(false);
-            break;
-    }
-    m_state = Disconnected;
-    emit stateChanged( m_state );
-
-    removeMenuHelper();
-
-    Q_FOREACH(const Jreen::JID &peer, m_peers.keys())
-    {
-        handlePeerStatus(peer, Jreen::Presence::Unavailable);
-    }
-}
-
-
-void
-JabberPlugin::onError( const Jreen::Connection::SocketError& e )
-{
-    tDebug() << "JABBER error:" << e;
-}
-
-
-QString
-JabberPlugin::errorMessage( Jreen::Client::DisconnectReason reason )
-{
-    switch( reason )
-    {
-        case Jreen::Client::User:
-            return tr("User Interaction");
-            break;
-        case Jreen::Client::HostUnknown:
-            return tr("Host is unknown");
-            break;
-        case Jreen::Client::ItemNotFound:
-            return tr("Item not found");
-            break;
-        case Jreen::Client::AuthorizationError:
-            return tr("Authorization Error");
-            break;
-        case Jreen::Client::RemoteStreamError:
-            return tr("Remote Stream Error");
-            break;
-        case Jreen::Client::RemoteConnectionFailed:
-            return tr("Remote Connection failed");
-            break;
-        case Jreen::Client::InternalServerError:
-            return tr("Internal Server Error");
-            break;
-        case Jreen::Client::SystemShutdown:
-            return tr("System shutdown");
-            break;
-        case Jreen::Client::Conflict:
-            return tr("Conflict");
-            break;
-
-        case Jreen::Client::Unknown:
-            return tr("Unknown");
-            break;
-
-        default:
-            qDebug() << "Not all Client::DisconnectReasons checked";
-            Q_ASSERT(false);
-            break;
-    }
-
-    m_state = Disconnected;
-    emit stateChanged( m_state );
-
-    return QString();
-}
-
-
-void
-JabberPlugin::sendMsg( const QString& to, const QString& msg )
-{
-    qDebug() << Q_FUNC_INFO << to << msg;
-
-    if ( !m_client ) {
-        return;
-    }
-
-    /*******************************************************
-     * Obsolete this by a SipMessage class
-     */
-    QJson::Parser parser;
-    bool ok;
-    QVariant v = parser.parse( msg.toAscii(), &ok );
-    if ( !ok  || v.type() != QVariant::Map )
-    {
-        qDebug() << "Invalid JSON in XMPP msg";
-        return;
-    }
-    QVariantMap m = v.toMap();
-    /*******************************************************/
-
-    TomahawkSipMessage *sipMessage;
-    if(m"visible".toBool())
-    {
-        sipMessage = new TomahawkSipMessage( m"ip".toString(),
-                                             m"port".toInt(),
-                                             m"uniqname".toString(),
-                                             m"key".toString()
-                                             );
-    }
-    else
-    {
-        sipMessage = new TomahawkSipMessage();
-    }
-
-    qDebug() << "Send sip messsage to " << to;
-    Jreen::IQ iq( Jreen::IQ::Set, to );
-    iq.addExtension( sipMessage );
-    Jreen::IQReply *reply = m_client->send( iq );
-    reply->setData( SipMessageSent );
-    connect( reply, SIGNAL( received( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
-}
-
-
-void
-JabberPlugin::broadcastMsg( const QString& msg )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( !m_client )
-        return;
-
-    foreach( const Jreen::JID& jid, m_peers.keys() )
-    {
-        sendMsg( jid.full(), msg );
-    }
-}
-
-
-void
-JabberPlugin::addContact( const QString& jid, const QString& msg )
-{
-    // Add contact to the Tomahawk group on the roster
-
-    QString realJid = jid;
-    if( !realJid.contains( '@' ) )
-        realJid += defaultSuffix();
-
-    m_roster->subscribe( realJid, msg, realJid, QStringList() << "Tomahawk" );
-
-    return;
-}
-
-
-void
-JabberPlugin::showAddFriendDialog()
-{
-#ifndef ENABLE_HEADLESS
-    bool ok;
-    QString id = QInputDialog::getText( TomahawkUtils::tomahawkWindow(), tr( "Add Friend" ),
-                                        tr( "Enter Jabber ID:" ), QLineEdit::Normal, "", &ok ).trimmed();
-    if ( !ok )
-        return;
-
-    qDebug() << "Attempting to add jabber contact to roster:" << id;
-    addContact( id );
-#endif
-}
-
-
-QString
-JabberPlugin::defaultSuffix() const
-{
-    return "@jabber.org";
-}
-
-
-void
-JabberPlugin::showXmlConsole()
-{
-#ifndef ENABLE_HEADLESS
-   m_xmlConsole->show();
-#endif
-}
-
-
-void
-JabberPlugin::checkSettings()
-{
-    bool reconnect = false;
-
-    QString username, password, server;
-    int port;
-
-    username = accountName();
-    password = readPassword();
-    server = readServer();
-    port = readPort();
-
-    if ( m_currentUsername != username )
-    {
-        m_currentUsername = username;
-        reconnect = true;
-    }
-    if ( m_currentPassword != password )
-    {
-        m_currentPassword = password;
-        reconnect = true;
-    }
-    if ( m_currentServer != server )
-    {
-        m_currentServer = server;
-        reconnect = true;
-    }
-    if ( m_currentPort != readPort() )
-    {
-        m_currentPort = port;
-        reconnect = true;
-    }
-
-    if ( !m_currentUsername.contains( '@' ) )
-    {
-        m_currentUsername += defaultSuffix();
-        TomahawkSettings::instance()->setValue( pluginId() + "/username", m_currentUsername );
-    }
-
-    if ( reconnect )
-    {
-        qDebug() << Q_FUNC_INFO << "Reconnecting jreen plugin...";
-        disconnectPlugin();
-
-        setupClientHelper();
-
-        qDebug() << Q_FUNC_INFO << "Updated settings";
-        connectPlugin( false );
-    }
-}
-
-
-void JabberPlugin::setupClientHelper()
-{
-    Jreen::JID jid = Jreen::JID( m_currentUsername );
-    m_client->setJID( jid );
-    m_client->setPassword( m_currentPassword );
-
-    if( !m_currentServer.isEmpty() )
-    {
-        // set explicit server details
-        m_client->setServer( m_currentServer );
-        m_client->setPort( m_currentPort );
-    }
-    else
-    {
-        // let jreen find out server and port via jdns
-        m_client->setServer( jid.domain() );
-        m_client->setPort( -1 );
-    }
-}
-
-
-void JabberPlugin::addMenuHelper()
-{
-#ifndef ENABLE_HEADLESS
-    if( !m_menu )
-    {
-        m_menu = new QMenu( QString( "%1 (" ).arg( friendlyName() ).append( accountName() ).append(")" ) );
-
-        QAction* addFriendAction = m_menu->addAction( tr( "Add Friend..." ) );
-        connect( addFriendAction, SIGNAL( triggered() ), this, SLOT( showAddFriendDialog() ) );
-
-        if( readXmlConsoleEnabled() )
-        {
-            QAction* showXmlConsoleAction = m_menu->addAction( tr( "XML Console...") );
-            connect( showXmlConsoleAction, SIGNAL( triggered() ), this, SLOT( showXmlConsole() ) );
-        }
-
-        emit addMenu( m_menu );
-    }
-#endif
-}
-
-
-void JabberPlugin::removeMenuHelper()
-{
-#ifndef ENABLE_HEADLESS
-    if( m_menu )
-    {
-        emit removeMenu( m_menu );
-
-        delete m_menu;
-        m_menu = 0;
-    }
-#endif
-}
-
-
-void JabberPlugin::onNewMessage( const Jreen::Message& message )
-{
-    if ( m_state != Connected )
-        return;
-
-//    qDebug() << Q_FUNC_INFO << "message type" << message.subtype();
-
-    QString from = message.from().full();
-    QString msg = message.body();
-
-    if(msg.isEmpty())
-        return;
-
-    if( message.subtype() == Jreen::Message::Error )
-    {
-        tDebug() << Q_FUNC_INFO << "Received error message from " << from << ", not answering... (Condition: "
-                 << ( message.error().isNull() ? -1 : message.error()->condition() ) << ")";
-        return;
-    }
-
-    SipInfo info = SipInfo::fromJson( msg );
-
-    if ( !info.isValid() )
-    {
-        QString to = from;
-        QString response = QString( tr("I'm sorry -- I'm just an automatic presence used by Tomahawk Player"
-                                    " (http://gettomahawk.com). If you are getting this message, the person you"
-                                    " are trying to reach is probably not signed on, so please try again later!") );
-
-        // this is not a sip message, so we send it directly through the client
-        m_client->send( Jreen::Message ( Jreen::Message::Error, Jreen::JID(to), response) );
-
-        emit msgReceived( from, msg );
-        return;
-    }
-
-    qDebug() << Q_FUNC_INFO << "From:" << message.from().full() << ":" << message.body();
-    emit sipInfoReceived( from, info );
-}
-
-
-void JabberPlugin::onPresenceReceived( const Jreen::RosterItem::Ptr &item, const Jreen::Presence& presence )
-{
-    Q_UNUSED(item);
-    if ( m_state != Connected )
-        return;
-
-    Jreen::JID jid = presence.from();
-    QString fulljid( jid.full() );
-
-    qDebug() << Q_FUNC_INFO << "* New presence:" << fulljid << presence.subtype();
-
-    if( jid == m_client->jid() )
-        return;
-
-    if ( presence.error() ) {
-        //qDebug() << Q_FUNC_INFO << fulljid << "Running tomahawk: no" << "presence error";
-        return;
-    }
-
-    // ignore anyone not Running tomahawk:
-    Jreen::Capabilities::Ptr caps = presence.payload<Jreen::Capabilities>();
-    if( caps )
-    {
-        qDebug() << Q_FUNC_INFO << fulljid << "Running tomahawk: maybe" << "caps " << caps->node() << "requesting disco...";
-
-        // request disco features
-        QString node = caps->node() + '#' + caps->ver();
-
-        Jreen::IQ featuresIq( Jreen::IQ::Get, jid );
-        featuresIq.addExtension( new Jreen::Disco::Info( node ) );
-
-        Jreen::IQReply *reply = m_client->send( featuresIq );
-        reply->setData( RequestDisco );
-        connect( reply, SIGNAL( received( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
-    }
-    else if( !caps )
-    {
-//        qDebug() << Q_FUNC_INFO << "Running tomahawk: no" << "no caps";
-        if ( presenceMeansOnline( m_peers jid  ) )
-            handlePeerStatus( jid, Jreen::Presence::Unavailable );
-    }
-}
-
-
-void JabberPlugin::onSubscriptionReceived( const Jreen::RosterItem::Ptr& item, const Jreen::Presence& presence )
-{
-    if ( m_state != Connected )
-        return;
-
-//    qDebug() << Q_FUNC_INFO << "presence type:" << presence.subtype();
-    if(item)
-        qDebug() << Q_FUNC_INFO << presence.from().full() << "subs" << item->subscription() << "ask" << item->ask();
-    else
-        qDebug() << Q_FUNC_INFO << "item empty";
-
-    // don't do anything if the contact is already subscribed to us
-    if( presence.subtype() != Jreen::Presence::Subscribe ||
-        (
-            item && (item->subscription() == Jreen::RosterItem::From || item->subscription() == Jreen::RosterItem::Both)
-        )
-    )
-    {
-        return;
-    }
-
-    // check if the requester is already on the roster
-    if(item &&
-        (
-            item->subscription() == Jreen::RosterItem::To ||
-            ( item->subscription() == Jreen::RosterItem::None && !item->ask().isEmpty() )
-        )
-    )
-    {
-        qDebug() << Q_FUNC_INFO << presence.from().bare() << "already on the roster so we assume ack'ing subscription request is okay...";
-        m_roster->allowSubscription(presence.from(), true);
-
-        return;
-    }
-#ifndef ENABLE_HEADLESS
-    // preparing the confirm box for the user
-    QMessageBox *confirmBox = new QMessageBox(
-                                QMessageBox::Question,
-                                tr( "Authorize User" ),
-                                QString( tr( "Do you want to grant <b>%1</b> access to your Collection?" ) ).arg(presence.from().bare()),
-                                QMessageBox::Yes | QMessageBox::No,
-                                TomahawkUtils::tomahawkWindow()
-                              );
-
-    // add confirmBox to m_subscriptionConfirmBoxes
-    m_subscriptionConfirmBoxes.insert( presence.from(), confirmBox );
-
-    // display the box and wait for the answer
-    confirmBox->open( this, SLOT( onSubscriptionRequestConfirmed( int ) ) );
-#endif
-}
-
-
-void
-JabberPlugin::onSubscriptionRequestConfirmed( int result )
-{
-#ifndef ENABLE_HEADLESS
-    qDebug() << Q_FUNC_INFO << result;
-
-    QList< QMessageBox* > confirmBoxes = m_subscriptionConfirmBoxes.values();
-    Jreen::JID jid;
-
-    foreach ( QMessageBox* currentBox, confirmBoxes )
-    {
-        if ( currentBox == sender() )
-        {
-            jid = m_subscriptionConfirmBoxes.key( currentBox );
-        }
-    }
-
-    // we got an answer, deleting the box
-    m_subscriptionConfirmBoxes.remove( jid );
-    sender()->deleteLater();
-
-    QMessageBox::StandardButton allowSubscription = static_cast< QMessageBox::StandardButton >( result );
-
-    if ( allowSubscription == QMessageBox::Yes )
-    {
-        qDebug() << Q_FUNC_INFO << jid.bare() << "accepted by user, adding to roster";
-        addContact(jid, "");
-    }
-    else
-    {
-        qDebug() << Q_FUNC_INFO << jid.bare() << "declined by user";
-    }
-
-    m_roster->allowSubscription( jid, allowSubscription == QMessageBox::Yes );
-#endif
-}
-
-
-void JabberPlugin::onNewIq( const Jreen::IQ& iq )
-{
-    if ( m_state != Connected )
-        return;
-
-    Jreen::IQReply *reply = qobject_cast< Jreen::IQReply* >( sender() );
-    int context = reply ? reply->data().toInt() : NoContext;
-
-    if ( context == RequestDisco )
-    {
-//        qDebug() << Q_FUNC_INFO << "Received disco IQ...";
-        Jreen::Disco::Info *discoInfo = iq.payload< Jreen::Disco::Info >().data();
-        if ( !discoInfo )
-            return;
-        iq.accept();
-
-        Jreen::JID jid = iq.from();
-
-        Jreen::DataForm::Ptr form = discoInfo->form();
-
-        if ( discoInfo->features().contains( TOMAHAWK_FEATURE ) )
-        {
-            qDebug() << Q_FUNC_INFO << jid.full() << "Running tomahawk/feature enabled: yes";
-
-            // the actual presence doesn't matter, it just needs to be "online"
-            handlePeerStatus( jid, Jreen::Presence::Available );
-        }
-    }
-    else if ( context == RequestVersion)
-    {
-        Jreen::SoftwareVersion::Ptr softwareVersion = iq.payload<Jreen::SoftwareVersion>();
-        if ( softwareVersion )
-        {
-            QString versionString = QString("%1 %2 %3").arg( softwareVersion->name(), softwareVersion->os(), softwareVersion->version() );
-            qDebug() << Q_FUNC_INFO << "Received software version for " << iq.from().full() << ":" << versionString;
-            emit softwareVersionReceived( iq.from().full(), versionString );
-        }
-    }
-    else if ( context == RequestedDisco )
-    {
-        qDebug() << "Sent IQ(Set), what should be happening here?";
-    }
-    else if( context == SipMessageSent )
-    {
-        qDebug() << "Sent SipMessage... what now?!";
-    }
-    /*else if(context == RequestedVCard )
-    {
-        qDebug() << "Requested VCard... what now?!";
-    }*/
-    else
-    {
-        TomahawkSipMessage::Ptr sipMessage = iq.payload< TomahawkSipMessage >();
-        if(sipMessage)
-        {
-            iq.accept();
-
-            qDebug() << Q_FUNC_INFO << "Got SipMessage ..."
-                     << "ip" << sipMessage->ip() << "port" << sipMessage->port() << "uniqname" << sipMessage->uniqname() << "key" << sipMessage->key() << "visible" << sipMessage->visible();
-
-            SipInfo info;
-            info.setVisible( sipMessage->visible() );
-            if( sipMessage->visible() )
-            {
-
-                QHostInfo hi;
-                hi.setHostName( sipMessage->ip() );
-                info.setHost( hi );
-                info.setPort( sipMessage->port() );
-                info.setUniqname( sipMessage->uniqname() );
-                info.setKey( sipMessage->key() );
-            }
-
-            Q_ASSERT( info.isValid() );
-
-            qDebug() << Q_FUNC_INFO << "From:" << iq.from().full() << ":" << info;
-            emit sipInfoReceived( iq.from().full(), info );
-        }
-    }
-}
-
-
-bool JabberPlugin::presenceMeansOnline( Jreen::Presence::Type p )
-{
-    switch( p )
-    {
-        case Jreen::Presence::Invalid:
-        case Jreen::Presence::Unavailable:
-        case Jreen::Presence::Error:
-            return false;
-            break;
-        default:
-            return true;
-    }
-}
-
-
-void JabberPlugin::handlePeerStatus( const Jreen::JID& jid, Jreen::Presence::Type presenceType )
-{
-    QString fulljid = jid.full();
-
-    // "going offline" event
-    if ( !presenceMeansOnline( presenceType ) &&
-         ( !m_peers.contains( jid ) ||
-           presenceMeansOnline( m_peers.value( jid ) )
-         )
-       )
-    {
-        m_peers jid  = presenceType;
-        qDebug() << Q_FUNC_INFO << "* Peer goes offline:" << fulljid;
-
-        emit peerOffline( fulljid );
-        return;
-    }
-
-    // "coming online" event
-    if ( presenceMeansOnline( presenceType ) &&
-        ( !m_peers.contains( jid ) ||
-          !presenceMeansOnline( m_peers.value( jid ) )
-        )
-       )
-    {
-        m_peers jid  = presenceType;
-        qDebug() << Q_FUNC_INFO << "* Peer goes online:" << fulljid;
-
-        emit peerOnline( fulljid );
-
-#ifndef ENABLE_HEADLESS
-        if ( !m_avatarManager->avatar( jid.bare() ).isNull() )
-            onNewAvatar( jid.bare() );
-#endif
-
-        // request software version
-        Jreen::IQ versionIq( Jreen::IQ::Get, jid );
-        versionIq.addExtension( new Jreen::SoftwareVersion() );
-        Jreen::IQReply *reply = m_client->send( versionIq );
-        reply->setData( RequestVersion );
-        connect( reply, SIGNAL( received( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
-
-        return;
-    }
-
-    //qDebug() << "Updating presence data for" << fulljid;
-    m_peers jid  = presenceType;
-}
-
-
-void JabberPlugin::onNewAvatar( const QString& jid )
-{
-#ifndef ENABLE_HEADLESS
-//    qDebug() << Q_FUNC_INFO << jid;
-    if ( m_state != Connected )
-        return;
-
-    Q_ASSERT( !m_avatarManager->avatar( jid ).isNull() );
-
-    // find peers for the jid
-    QList< Jreen::JID > peers =  m_peers.keys();
-    foreach ( const Jreen::JID &peer, peers )
-    {
-        if( peer.bare() == jid )
-        {
-            emit avatarReceived ( peer.full(),  m_avatarManager->avatar( jid ) );
-        }
-    }
-
-    if ( jid == m_client->jid().bare() )
-        // own avatar
-        emit avatarReceived ( m_avatarManager->avatar( jid ) );
-    else
-        // someone else's avatar
-        emit avatarReceived ( jid,  m_avatarManager->avatar( jid ) );
-#endif
-}
-
-
-bool
-JabberPlugin::readXmlConsoleEnabled()
-{
-    return TomahawkSettings::instance()->value( pluginId() + "/xmlconsole", QVariant( false ) ).toBool();
-}
-
-
-QString
-JabberPlugin::readPassword()
-{
-    return TomahawkSettings::instance()->value( pluginId() + "/password" ).toString();
-}
-
-
-int
-JabberPlugin::readPort()
-{
-    return TomahawkSettings::instance()->value( pluginId() + "/port", 5222 ).toInt();
-}
-
-
-QString
-JabberPlugin::readServer()
-{
-    return TomahawkSettings::instance()->value( pluginId() + "/server" ).toString();
-}
-
-
-void
-JabberPlugin::onCheckJidExists( QString jid )
-{
-    for ( int i=0; i<TomahawkSettings::instance()->sipPlugins().count(); i++ )
-    {
-        QString savedUsername = TomahawkSettings::instance()->value(
-                TomahawkSettings::instance()->sipPlugins().at( i ) + "/username" ).toString();
-        QStringList splitUserName = TomahawkSettings::instance()->value(
-                TomahawkSettings::instance()->sipPlugins().at( i ) + "/username" ).toString().split("@");
-        QString server = TomahawkSettings::instance()->value(
-                TomahawkSettings::instance()->sipPlugins().at( i ) + "/server" ).toString();
-
-        if ( ( savedUsername == jid || splitUserName.contains( jid ) ) &&
-               server == m_ui->jabberServer->text() && !jid.trimmed().isEmpty() )
-        {
-            m_ui->jidExistsLabel->show();
-            // the already jid exists
-            emit dataError( true );
-            return;
-        }
-    }
-    m_ui->jidExistsLabel->hide();
-    emit dataError( false );
-}
-
-
-void
-JabberPlugin::saveConfig()
-{
-    TomahawkSettings::instance()->setValue( pluginId() + "/username", m_ui->jabberUsername->text() );
-    TomahawkSettings::instance()->setValue( pluginId() + "/password", m_ui->jabberPassword->text() );
-    TomahawkSettings::instance()->setValue( pluginId() + "/port", m_ui->jabberPort->value() );
-    TomahawkSettings::instance()->setValue( pluginId() + "/server", m_ui->jabberServer->text() );
-
-    checkSettings();
-}
-
-
-void
-JabberPlugin::deletePlugin()
-{
-    TomahawkSettings::instance()->remove( pluginId() );
-}
-
-
-SipPlugin::ConnectionState
-JabberPlugin::connectionState() const
-{
-    return m_state;
-}
-
-#ifndef GOOGLE_WRAPPER
-Q_EXPORT_PLUGIN2( sipfactory, JabberFactory )
-#endif

tomahawk-0.4.2.tar.bz2/src/sip/jabber/jabber.h Deleted

@@ -1,168 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Dominik Schmidt <dev@dominik-schmidt.de>
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 JABBER_H
-#define JABBER_H
-
-#include "sip/SipPlugin.h"
-
-#include "avatarmanager.h"
-
-#ifndef ENABLE_HEADLESS
-    #include "xmlconsole.h"
-#endif
-
-#include <jreen/client.h>
-#include <jreen/disco.h>
-#include <jreen/message.h>
-#include <jreen/messagesession.h>
-#include <jreen/stanza.h>
-#include <jreen/jreen.h>
-#include <jreen/error.h>
-#include <jreen/presence.h>
-#include <jreen/vcard.h>
-#include <jreen/abstractroster.h>
-#include <jreen/connection.h>
-#include <jreen/mucroom.h>
-
-#ifndef ENABLE_HEADLESS
-    #include <QtGui/QMessageBox>
-#endif
-
-#define MYNAME "SIPJREEN"
-#define TOMAHAWK_FEATURE QLatin1String( "tomahawk:sip:v1" )
-#define TOMAHAWK_CAP_NODE_NAME QLatin1String( "http://tomahawk-player.org/" )
-
-#include "../sipdllmacro.h"
-
-class Ui_JabberConfig;
-
-class SIPDLLEXPORT JabberFactory : public SipPluginFactory
-{
-    Q_OBJECT
-    Q_INTERFACES( SipPluginFactory )
-
-public:
-    JabberFactory() {}
-    virtual ~JabberFactory() {}
-
-    virtual QString prettyName() const { return "Jabber"; }
-    virtual QString factoryId() const { return "sipjabber"; }
-    virtual QIcon icon() const;
-    virtual SipPlugin* createPlugin( const QString& pluginId );
-};
-
-class SIPDLLEXPORT JabberPlugin : public SipPlugin
-{
-    Q_OBJECT
-
-public:
-    JabberPlugin( const QString& pluginId );
-    virtual ~JabberPlugin();
-
-    //FIXME: Make this more correct
-    virtual bool isValid() const { return true; }
-    virtual const QString name() const;
-    virtual const QString friendlyName() const;
-    virtual const QString accountName() const;
-    virtual ConnectionState connectionState() const;
-
-#ifndef ENABLE_HEADLESS
-    virtual QMenu* menu();
-    virtual QIcon icon() const;
-    virtual QWidget* configWidget();
-#endif
-    virtual void saveConfig();
-    virtual void deletePlugin();
-
-signals:
-    void dataError( bool exists );
-    void jidChanged( const QString& );
-
-public slots:
-    virtual bool connectPlugin( bool startup );
-    void disconnectPlugin();
-    void checkSettings();
-    void sendMsg( const QString& to, const QString& msg );
-    void broadcastMsg( const QString &msg );
-    void addContact( const QString &jid, const QString& msg = QString() );
-    void showAddFriendDialog();
-
-protected:
-    virtual QString defaultSuffix() const;
-
-    Ui_JabberConfig* m_ui; // so the google wrapper can change the config dialog a bit
-
-private slots:
-    void showXmlConsole();
-    void onConnect();
-    void onDisconnect( Jreen::Client::DisconnectReason reason );
-
-    void onPresenceReceived( const Jreen::RosterItem::Ptr &item, const Jreen::Presence& presence );
-    void onSubscriptionReceived( const Jreen::RosterItem::Ptr &item, const Jreen::Presence& presence );
-    void onSubscriptionRequestConfirmed( int result );
-
-    void onNewMessage( const Jreen::Message& message );
-    void onError( const Jreen::Connection::SocketError& e );
-    void onNewIq( const Jreen::IQ &iq );
-    void onNewAvatar( const QString &jid );
-    void onCheckJidExists( QString jid );
-
-private:
-    bool readXmlConsoleEnabled();
-    QString readPassword();
-    QString readServer();
-    int readPort();
-
-    QString errorMessage( Jreen::Client::DisconnectReason reason );
-    void setupClientHelper();
-    void addMenuHelper();
-    void removeMenuHelper();
-
-    bool presenceMeansOnline( Jreen::Presence::Type p );
-    void handlePeerStatus( const Jreen::JID &jid, Jreen::Presence::Type presenceType );
-
-    using SipPlugin::errorMessage;
-
-    QString m_currentUsername;
-    QString m_currentPassword;
-    QString m_currentServer;
-    int m_currentPort;
-    ConnectionState m_state;
-
-    QWeakPointer< QWidget > m_configWidget;
-
-    QString m_currentResource;
-
-    // sort out
-    Jreen::Client *m_client;
-
-    Jreen::MUCRoom *m_room;
-    Jreen::SimpleRoster *m_roster;
-    QHash<Jreen::JID, Jreen::Presence::Type> m_peers;
-#ifndef ENABLE_HEADLESS
-    QHash<Jreen::JID, QMessageBox*> m_subscriptionConfirmBoxes;
-    QMenu* m_menu;
-    XmlConsole* m_xmlConsole;
-#endif
-    enum IqContext { NoContext, RequestDisco, RequestedDisco, SipMessageSent, RequestedVCard, RequestVersion, RequestedVersion };
-    AvatarManager *m_avatarManager;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/sip/jabber/resources.qrc Deleted

tomahawk-0.4.2.tar.bz2/src/sip/jabber/tomahawksipmessage.cpp Deleted

@@ -1,79 +0,0 @@
-/* === 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
- *   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 "tomahawksipmessage.h"
-
-#include "utils/logger.h"
-
-
-class TomahawkSipMessagePrivate
-{
-public:
-    QString ip;
-    int port;
-    QString uniqname;
-    QString key;
-    bool visible;
-};
-
-TomahawkSipMessage::TomahawkSipMessage(const QString &ip, unsigned int port, const QString &uniqname, const QString &key) : d_ptr(new TomahawkSipMessagePrivate)
-{
-    Q_D(TomahawkSipMessage);
-    d->ip = ip;
-    d->port = port;
-    d->uniqname = uniqname;
-    d->key = key;
-    d->visible = true;
-}
-
-TomahawkSipMessage::TomahawkSipMessage() : d_ptr(new TomahawkSipMessagePrivate)
-{
-    Q_D(TomahawkSipMessage);
-    d->visible = false;
-    d->port = -1;
-}
-
-
-TomahawkSipMessage::~TomahawkSipMessage()
-{
-}
-
-const QString TomahawkSipMessage::ip() const
-{
-    return d_func()->ip;
-}
-
-unsigned int TomahawkSipMessage::port() const
-{
-    return d_func()->port;
-}
-
-const QString TomahawkSipMessage::uniqname() const
-{
-    return d_func()->uniqname;
-}
-
-const QString TomahawkSipMessage::key() const
-{
-    return d_func()->key;
-}
-
-bool TomahawkSipMessage::visible() const
-{
-    return d_func()->visible;
-}

tomahawk-0.4.2.tar.bz2/src/sip/jabber/tomahawksipmessage.h Deleted

@@ -1,50 +0,0 @@
-/* === 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
- *   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 ENTITYTIME_H
-#define ENTITYTIME_H
-
-#include <jreen/stanzaextension.h>
-
-#define TOMAHAWK_SIP_MESSAGE_NS QLatin1String("http://www.tomhawk-player.org/sip/transports")
-
-#include "../sipdllmacro.h"
-
-class TomahawkSipMessagePrivate;
-class SIPDLLEXPORT TomahawkSipMessage : public Jreen::Payload
-{
-    J_PAYLOAD(TomahawkSipMessage)
-    Q_DECLARE_PRIVATE(TomahawkSipMessage)
-    public:
-        // sets visible to true
-        TomahawkSipMessage(const QString &ip, unsigned int port, const QString &uniqname, const QString &key);
-
-        // sets visible to false as we dont have any extra information
-        TomahawkSipMessage();
-        ~TomahawkSipMessage();
-
-        const QString ip() const;
-        unsigned int port() const;
-        const QString uniqname() const;
-        const QString key() const;
-        bool visible() const;
-    private:
-        QScopedPointer<TomahawkSipMessagePrivate> d_ptr;
-};
-
-#endif // ENTITYTIME_H

tomahawk-0.4.2.tar.bz2/src/sip/jabber/tomahawksipmessagefactory.cpp Deleted

@@ -1,146 +0,0 @@
-/* === 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
- *   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 "tomahawksipmessagefactory.h"
-
-#include <QStringList>
-#include <QXmlStreamWriter>
-#include <QVariant>
-
-#include "utils/logger.h"
-
-using namespace Jreen;
-
-TomahawkSipMessageFactory::TomahawkSipMessageFactory()
-{
-    m_depth = 0;
-    m_state = AtNowhere;
-}
-
-TomahawkSipMessageFactory::~TomahawkSipMessageFactory()
-{
-}
-
-QStringList TomahawkSipMessageFactory::features() const
-{
-    return QStringList(TOMAHAWK_SIP_MESSAGE_NS);
-}
-
-bool TomahawkSipMessageFactory::canParse(const QStringRef &name, const QStringRef &uri, const QXmlStreamAttributes &attributes)
-{
-    Q_UNUSED(uri);
-    Q_UNUSED(attributes);
-    return name == QLatin1String("tomahawk") && uri == TOMAHAWK_SIP_MESSAGE_NS;
-}
-
-void TomahawkSipMessageFactory::handleStartElement(const QStringRef &name, const QStringRef &uri,
-                                            const QXmlStreamAttributes &attributes)
-{
-    m_depth++;
-    if (m_depth == 1) {
-        m_state = AtNowhere;
-        m_ip = QString();
-        m_port = -1;
-        m_uniqname = QString();
-        m_key = QString();
-        m_visible = false;
-    } else if (m_depth == 2) {
-        if (name == QLatin1String("transport"))
-        {
-//            qDebug() << "Found Transport";
-            m_state = AtTransport;
-
-            m_uniqname = attributes.value(QLatin1String("uniqname")).toString();
-            m_key = attributes.value(QLatin1String("pwd")).toString();
-        }
-    } else if(m_depth == 3) {
-        if (name == QLatin1String("candidate"))
-        {
-            m_state = AtCandidate;
-//            qDebug() << "Found candidate";
-            m_ip = attributes.value(QLatin1String("ip")).toString();
-            m_port = attributes.value(QLatin1String("port")).toString().toInt();
-
-            m_visible = true;
-        }
-    }
-    Q_UNUSED(uri);
-    Q_UNUSED(attributes);
-}
-
-void TomahawkSipMessageFactory::handleEndElement(const QStringRef &name, const QStringRef &uri)
-{
-    if (m_depth == 3)
-        m_state = AtNowhere;
-    Q_UNUSED(name);
-    Q_UNUSED(uri);
-    m_depth--;
-}
-
-void TomahawkSipMessageFactory::handleCharacterData(const QStringRef &text)
-{
-    /*if (m_state == AtUtc) {
-        //m_utc = Util::fromStamp(text.toString());
-    } else if (m_state == AtTzo) {
-        QString str = text.toString();
-        int multiple = str.startsWith('-') ? -1 : 1;
-        //QTime delta = QTime::fromString(str.mid(1), QLatin1String("hh:mm"));
-        //m_tzo = multiple * (delta.hour() * 60 + delta.minute());
-    }*/
-    Q_UNUSED(text);
-}
-
-void TomahawkSipMessageFactory::serialize(Payload *extension, QXmlStreamWriter *writer)
-{
-    TomahawkSipMessage *sipMessage = se_cast<TomahawkSipMessage*>(extension);
-
-        writer->writeStartElement(QLatin1String("tomahawk"));
-        writer->writeDefaultNamespace(TOMAHAWK_SIP_MESSAGE_NS);
-
-        if(sipMessage->visible())
-        {
-            // add transport tag
-            writer->writeStartElement(QLatin1String("transport"));
-            writer->writeAttribute(QLatin1String("pwd"), sipMessage->key());
-            writer->writeAttribute(QLatin1String("uniqname"), sipMessage->uniqname());
-
-            writer->writeEmptyElement(QLatin1String("candidate"));
-            writer->writeAttribute(QLatin1String("component"), "1");
-            writer->writeAttribute(QLatin1String("id"), "el0747fg11"); // FIXME
-            writer->writeAttribute(QLatin1String("ip"), sipMessage->ip());
-            writer->writeAttribute(QLatin1String("network"), "1");
-            writer->writeAttribute(QLatin1String("port"), QVariant(sipMessage->port()).toString());
-            writer->writeAttribute(QLatin1String("priority"), "1"); //TODO
-            writer->writeAttribute(QLatin1String("protocol"), "tcp");
-            writer->writeAttribute(QLatin1String("type"), "host"); //FIXME: correct?!
-            writer->writeEndElement();
-        }
-        else
-        {
-            writer->writeEmptyElement(QLatin1String("transport"));
-        }
-        writer->writeEndElement();
-}
-
-Payload::Ptr TomahawkSipMessageFactory::createPayload()
-{
-    if(m_visible)
-        return Payload::Ptr(new TomahawkSipMessage(m_ip, m_port, m_uniqname, m_key));
-    else
-        return Payload::Ptr(new TomahawkSipMessage());
-}

tomahawk-0.4.2.tar.bz2/src/sip/jabber/tomahawksipmessagefactory.h Deleted

@@ -1,50 +0,0 @@
-/* === 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
- *   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 ENTITYTIMEFACTORY_P_H
-#define ENTITYTIMEFACTORY_P_H
-
-#include "tomahawksipmessage.h"
-
-#include <jreen/stanzaextension.h>
-
-#include "../sipdllmacro.h"
-
-class SIPDLLEXPORT TomahawkSipMessageFactory : public Jreen::PayloadFactory<TomahawkSipMessage>
-{
-public:
-    TomahawkSipMessageFactory();
-    virtual ~TomahawkSipMessageFactory();
-    QStringList features() const;
-    bool canParse(const QStringRef &name, const QStringRef &uri, const QXmlStreamAttributes &attributes);
-    void handleStartElement(const QStringRef &name, const QStringRef &uri, const QXmlStreamAttributes &attributes);
-    void handleEndElement(const QStringRef &name, const QStringRef &uri);
-    void handleCharacterData(const QStringRef &text);
-    void serialize(Jreen::Payload *extension, QXmlStreamWriter *writer);
-    Jreen::Payload::Ptr createPayload();
-private:
-    enum State { AtNowhere, AtTransport, AtCandidate } m_state;
-    int m_depth;
-    QString m_ip;
-    int m_port;
-    QString m_uniqname;
-    QString m_key;
-    bool m_visible;
-};
-
-#endif // ENTITYTIMEFACTORY_P_H

tomahawk-0.4.2.tar.bz2/src/sip/jabber/xmlconsole.cpp Deleted

@@ -1,363 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Ruslan Nigmatullin <euroelessar@ya.ru>
- *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
- *
- *   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 "xmlconsole.h"
-#include "ui_xmlconsole.h"
-
-#include <QMenu>
-#include <QActionGroup>
-#include <QStringBuilder>
-#include <QTextLayout>
-#include <QPlainTextDocumentLayout>
-#include <QFileDialog>
-#include <QTextDocumentWriter>
-
-#include "utils/logger.h"
-
-using namespace Jreen;
-
-
-XmlConsole::XmlConsole(Client* client, QWidget *parent) :
-	QWidget(parent),
-	m_ui(new Ui::XmlConsole),
-	m_client(client),	m_filter(0x1f)
-{
-	m_ui->setupUi(this);
-
-    m_client->addXmlStreamHandler(this);
-
-	QPalette pal = palette();
-	pal.setColor(QPalette::Base, Qt::black);
-	pal.setColor(QPalette::Text, Qt::white);
-	m_ui->xmlBrowser->viewport()->setPalette(pal);
-	QTextDocument *doc = m_ui->xmlBrowser->document();
-	doc->setDocumentLayout(new QPlainTextDocumentLayout(doc));
-	doc->clear();
-
-	QTextFrameFormat format = doc->rootFrame()->frameFormat();
-	format.setBackground(QColor(Qt::black));
-	format.setMargin(0);
-	doc->rootFrame()->setFrameFormat(format);
-	QMenu *menu = new QMenu(m_ui->filterButton);
-	menu->setSeparatorsCollapsible(false);
-	menu->addSeparator()->setText(tr("Filter"));
-	QActionGroup *group = new QActionGroup(menu);
-	QAction *disabled = group->addAction(menu->addAction(tr("Disabled")));
-	disabled->setCheckable(true);
-	disabled->setData(Disabled);
-	QAction *jid = group->addAction(menu->addAction(tr("By JID")));
-	jid->setCheckable(true);
-	jid->setData(ByJid);
-	QAction *xmlns = group->addAction(menu->addAction(tr("By namespace uri")));
-	xmlns->setCheckable(true);
-	xmlns->setData(ByXmlns);
-	QAction *attrb = group->addAction(menu->addAction(tr("By all attributes")));
-	attrb->setCheckable(true);
-	attrb->setData(ByAllAttributes);
-	disabled->setChecked(true);
-	connect(group, SIGNAL(triggered(QAction*)), this, SLOT(onActionGroupTriggered(QAction*)));
-	menu->addSeparator()->setText(tr("Visible stanzas"));
-	group = new QActionGroup(menu);
-	group->setExclusive(false);
-	QAction *iq = group->addAction(menu->addAction(tr("Information query")));
-	iq->setCheckable(true);
-	iq->setData(XmlNode::Iq);
-	iq->setChecked(true);
-	QAction *message = group->addAction(menu->addAction(tr("Message")));
-	message->setCheckable(true);
-	message->setData(XmlNode::Message);
-	message->setChecked(true);
-	QAction *presence = group->addAction(menu->addAction(tr("Presence")));
-	presence->setCheckable(true);
-	presence->setData(XmlNode::Presence);
-	presence->setChecked(true);
-	QAction *custom = group->addAction(menu->addAction(tr("Custom")));
-	custom->setCheckable(true);
-	custom->setData(XmlNode::Custom);
-	custom->setChecked(true);
-	connect(group, SIGNAL(triggered(QAction*)), this, SLOT(onActionGroupTriggered(QAction*)));
-	m_ui->filterButton->setMenu(menu);
-	m_stackBracketsColor = QColor(0x666666);
-	m_stackIncoming.bodyColor = QColor(0xbb66bb);
-	m_stackIncoming.tagColor = QColor(0x006666);
-	m_stackIncoming.attributeColor = QColor(0x009933);
-	m_stackIncoming.paramColor = QColor(0xcc0000);
-	m_stackOutgoing.bodyColor = QColor(0x999999);
-	m_stackOutgoing.tagColor = QColor(0x22aa22);
-	m_stackOutgoing.attributeColor = QColor(0xffff33);
-	m_stackOutgoing.paramColor = QColor(0xdd8811);
-
-	QAction *action = new QAction(tr("Close"),this);
-	action->setSoftKeyRole(QAction::NegativeSoftKey);
-	connect(action, SIGNAL(triggered()), SLOT(close()));
-	addAction(action);
-}
-
-XmlConsole::~XmlConsole()
-{
-	delete m_ui;
-}
-
-void XmlConsole::handleStreamBegin()
-{
-	m_stackIncoming.reader.clear();
-	m_stackOutgoing.reader.clear();
-	m_stackIncoming.depth = 0;
-	m_stackOutgoing.depth = 0;
-	qDeleteAll(m_stackIncoming.tokens);
-	qDeleteAll(m_stackOutgoing.tokens);
-	m_stackIncoming.tokens.clear();
-	m_stackOutgoing.tokens.clear();
-}
-
-void XmlConsole::handleStreamEnd()
-{
-	m_stackIncoming.reader.clear();
-	m_stackOutgoing.reader.clear();
-	m_stackIncoming.depth = 0;
-	m_stackOutgoing.depth = 0;
-	qDeleteAll(m_stackIncoming.tokens);
-	qDeleteAll(m_stackOutgoing.tokens);
-	m_stackIncoming.tokens.clear();
-	m_stackOutgoing.tokens.clear();
-}
-
-void XmlConsole::handleIncomingData(const char *data, qint64 size)
-{
-	stackProcess(QByteArray::fromRawData(data, size), true);
-}
-
-void XmlConsole::handleOutgoingData(const char *data, qint64 size)
-{
-	stackProcess(QByteArray::fromRawData(data, size), false);
-}
-
-QString generate_stacked_space(int depth)
-{
-	return QString(depth * 2, QLatin1Char(' '));
-}
-
-void XmlConsole::stackProcess(const QByteArray &data, bool incoming)
-{
-	StackEnvironment *d = &(incoming ? m_stackIncoming : m_stackOutgoing);
-	d->reader.addData(data);
-	StackToken *token;
-//	debug() << incoming << data;
-//	debug() << "==================================================================";
-	while (d->reader.readNext() > QXmlStreamReader::Invalid) {
-//		qDebug() << incoming << d->reader.tokenString();
-		switch(d->reader.tokenType()) {
-		case QXmlStreamReader::StartElement:
-//			dbg << d->reader.name().toString() << d->depth
-//					<< d->reader.attributes().value(QLatin1String("from")).toString();
-			d->depth++;
-			if (d->depth > 1) {
-				if (!d->tokens.isEmpty() && d->tokens.last()->type == QXmlStreamReader::Characters)
-					delete d->tokens.takeLast();
-				d->tokens << new StackToken(d->reader);
-			}
-			break;
-		case QXmlStreamReader::EndElement:
-//			dbg << d->reader.name().toString() << d->depth;
-			if (d->tokens.isEmpty())
-				break;
-			token = d->tokens.last();
-			if (token->type == QXmlStreamReader::StartElement && !token->startTag.empty)
-				token->startTag.empty = true;
-			else if (d->depth > 1)
-				d->tokens << new StackToken(d->reader);
-			if (d->depth == 2) {
-				QTextCursor cursor(m_ui->xmlBrowser->document());
-				cursor.movePosition(QTextCursor::End);
-				cursor.beginEditBlock();
-				QTextCharFormat zeroFormat = cursor.charFormat();
-				zeroFormat.setForeground(QColor(Qt::white));
-				QTextCharFormat bodyFormat = zeroFormat;
-				bodyFormat.setForeground(d->bodyColor);
-				QTextCharFormat tagFormat = zeroFormat;
-				tagFormat.setForeground(d->tagColor);
-				QTextCharFormat attributeFormat = zeroFormat;
-				attributeFormat.setForeground(d->attributeColor);
-				QTextCharFormat paramsFormat = zeroFormat;
-				paramsFormat.setForeground(d->paramColor);
-				QTextCharFormat bracketFormat = zeroFormat;
-				bracketFormat.setForeground(m_stackBracketsColor);
-				QString singleSpace = QLatin1String(" ");
-				cursor.insertBlock();
-				int depth = 0;
-				QString currentXmlns;
-				QXmlStreamReader::TokenType lastType = QXmlStreamReader::StartElement;
-				for (int i = 0; i < d->tokens.size(); i++) {
-					token = d->tokens.at(i);
-					if (token->type == QXmlStreamReader::StartElement) {
-						QString space = generate_stacked_space(depth);
-						cursor.insertText(QLatin1String("\n"));
-						cursor.insertText(space);
-						cursor.insertText(QLatin1String("<"), bracketFormat);
-						cursor.insertText(token->startTag.name->toString(), tagFormat);
-						const QStringRef &xmlns = *token->startTag.xmlns;
-						if (i == 0 || xmlns != currentXmlns) {
-							currentXmlns = xmlns.toString();
-							cursor.insertText(singleSpace);
-							cursor.insertText(QLatin1String("xmlns"), attributeFormat);
-							cursor.insertText(QLatin1String("="), zeroFormat);
-							cursor.insertText(QLatin1String("'"), paramsFormat);
-							cursor.insertText(currentXmlns, paramsFormat);
-							cursor.insertText(QLatin1String("'"), paramsFormat);
-						}
-						QXmlStreamAttributes *attributes = token->startTag.attributes;
-						for (int j = 0; j < attributes->count(); j++) {
-							const QXmlStreamAttribute &attr = attributes->at(j);
-							cursor.insertText(singleSpace);
-							cursor.insertText(attr.name().toString(), attributeFormat);
-							cursor.insertText(QLatin1String("="), zeroFormat);
-							cursor.insertText(QLatin1String("'"), paramsFormat);
-							cursor.insertText(attr.value().toString(), paramsFormat);
-							cursor.insertText(QLatin1String("'"), paramsFormat);
-						}
-						if (token->startTag.empty) {
-							cursor.insertText(QLatin1String("/>"), bracketFormat);
-						} else {
-							cursor.insertText(QLatin1String(">"), bracketFormat);
-							depth++;
-						}
-					} else if (token->type == QXmlStreamReader::EndElement) {
-						if (lastType == QXmlStreamReader::EndElement) {
-							QString space = generate_stacked_space(depth - 1);
-							cursor.insertText(QLatin1String("\n"));
-							cursor.insertText(space);
-						}
-						cursor.insertText(QLatin1String("</"), bracketFormat);
-						cursor.insertText(token->endTag.name->toString(), tagFormat);
-						cursor.insertText(QLatin1String(">"), bracketFormat);
-						depth--;
-					} else if (token->type == QXmlStreamReader::Characters) {
-						cursor.setCharFormat(bodyFormat);
-						QString text = token->charachters.text->toString();
-						if (text.contains(QLatin1Char('\n'))) {
-							QString space = generate_stacked_space(depth);
-							space.prepend(QLatin1Char('\n'));
-							QStringList lines = text.split(QLatin1Char('\n'));
-							for (int j = 0; j < lines.size(); j++) {
-								cursor.insertText(space);
-								cursor.insertText(lines.at(j));
-							}
-							space.chop(1);
-							cursor.insertText(space);
-						} else {
-							cursor.insertText(text);
-						}
-					}
-					lastType = token->type;
-					if (lastType == QXmlStreamReader::StartElement && token->startTag.empty)
-						lastType = QXmlStreamReader::EndElement;
-					delete token;
-				}
-				cursor.endEditBlock();
-				d->tokens.clear();
-			}
-			d->depth--;
-			break;
-		case QXmlStreamReader::Characters:
-			token = d->tokens.isEmpty() ? 0 : d->tokens.last();
-			if (token && token->type == QXmlStreamReader::StartElement && !token->startTag.empty) {
-				if (*token->startTag.name == QLatin1String("auth")
-						&& *token->startTag.xmlns == QLatin1String("urn:ietf:params:xml:ns:xmpp-sasl")) {
-					d->tokens << new StackToken(QLatin1String("<<Private data>>"));
-				} else {
-					d->tokens << new StackToken(d->reader);
-				}
-			}
-			break;
-		default:
-			break;
-		}
-	}
-//	qDebug() << d->reader.tokenString();
-//	if (d->reader.tokenType() == QXmlStreamReader::Invalid)
-//		dbg << d->reader.error() << d->reader.errorString();
-	if (!incoming && d->depth > 1) {
-		qFatal("outgoing depth %d on\n\"%s\"", d->depth,
-			   qPrintable(QString::fromUtf8(data, data.size())));
-	}
-}
-
-void XmlConsole::changeEvent(QEvent *e)
-{
-	QWidget::changeEvent(e);
-	switch (e->type()) {
-	case QEvent::LanguageChange:
-		m_ui->retranslateUi(this);
-		break;
-	default:
-		break;
-	}
-}
-
-void XmlConsole::onActionGroupTriggered(QAction *action)
-{
-	int type = action->data().toInt();
-	if (type >= 0x10) {
-		m_filter = (m_filter & 0xf) | type;
-		m_ui->lineEdit->setEnabled(type != 0x10);
-	} else {
-		m_filter = m_filter ^ type;
-	}
-	on_lineEdit_textChanged(m_ui->lineEdit->text());
-}
-
-void XmlConsole::on_lineEdit_textChanged(const QString &text)
-{
-	int filterType = m_filter & 0xf0;
-	JID filterJid = (filterType == ByJid) ? text : QString();
-    for (int i = 0; i < m_nodes.size(); i++) {
-		XmlNode &node = m_nodesi;
-		bool ok = true;
-		switch (filterType) {
-		case ByXmlns:
-			ok = node.xmlns.contains(text);
-			break;
-		case ByJid:
-			ok = node.jid.full() == filterJid.full() || node.jid.bare() == filterJid.full();
-			break;
-		case ByAllAttributes:
-			ok = node.attributes.contains(text);
-			break;
-		default:
-			break;
-		}
-		ok &= bool(node.type & m_filter);
-		node.block.setVisible(ok);
-		node.block.setLineCount(ok ? node.lineCount : 0);
-		//		qDebug() << node.block.lineCount();
-	}
-	QAbstractTextDocumentLayout *layout = m_ui->xmlBrowser->document()->documentLayout();
-	Q_ASSERT(qobject_cast<QPlainTextDocumentLayout*>(layout));
-	qobject_cast<QPlainTextDocumentLayout*>(layout)->requestUpdate();
-}
-
-void XmlConsole::on_saveButton_clicked()
-{
-    QString fileName = QFileDialog::getSaveFileName(this, tr("Save XMPP log to file"),
-	                                                QString(), tr("OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)"));
-	if (!fileName.isEmpty()) {
-		QTextDocumentWriter writer(fileName);
-		writer.write(m_ui->xmlBrowser->document());
-	}
-}

tomahawk-0.4.2.tar.bz2/src/sip/jabber/xmlconsole.h Deleted

@@ -1,186 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Ruslan Nigmatullin <euroelessar@ya.ru>
- *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
- *
- *   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 XMLCONSOLE_H
-#define XMLCONSOLE_H
-
-#include <jreen/client.h>
-#include <jreen/jid.h>
-
-#include <QWidget>
-#include <QXmlStreamReader>
-#include <QDateTime>
-#include <QTextBlock>
-
-namespace Ui {
-class XmlConsole;
-}
-
-#include "../sipdllmacro.h"
-
-class SIPDLLEXPORT XmlConsole : public QWidget, public Jreen::XmlStreamHandler
-{
-    Q_OBJECT
-
-public:
-	XmlConsole(Jreen::Client* client, QWidget *parent = 0);
-	~XmlConsole();
-
-	virtual void handleStreamBegin();
-	virtual void handleStreamEnd();
-	virtual void handleIncomingData(const char *data, qint64 size);
-	virtual void handleOutgoingData(const char *data, qint64 size);
-
-protected:
-	void changeEvent(QEvent *e);
-private:
-	void stackProcess(const QByteArray &data, bool incoming);
-
-	struct XmlNode
-	{
-		enum Type
-		{
-			Iq = 1,
-			Presence = 2,
-			Message = 4,
-			Custom = 8
-		};
-		QDateTime time;
-		Type type;
-		bool incoming;
-		QSet<QString> xmlns;
-		Jreen::JID jid;
-		QSet<QString> attributes;
-		QTextBlock block;
-		int lineCount;
-	};
-	enum FilterType
-	{
-		Disabled = 0x10,
-		ByJid = 0x20,
-		ByXmlns = 0x30,
-		ByAllAttributes = 0x40
-	};
-
-	enum State
-	{
-		WaitingForStanza,
-		ReadFeatures,
-		ReadStanza,
-		ReadCustom
-	};
-
-	struct StackToken
-	{
-		StackToken(QXmlStreamReader &reader)
-		{
-			type = reader.tokenType();
-			if (type == QXmlStreamReader::StartElement) {
-				QStringRef tmp = reader.name();
-				startTag.namePointer = new QString(*tmp.string());
-				startTag.name = new QStringRef(startTag.namePointer, tmp.position(), tmp.length());
-				tmp = reader.namespaceUri();
-				startTag.xmlnsPointer = new QString(*tmp.string());
-				startTag.xmlns = new QStringRef(startTag.xmlnsPointer, tmp.position(), tmp.length());
-				startTag.attributes = new QXmlStreamAttributes(reader.attributes());
-				startTag.empty = false;
-			} else if (type == QXmlStreamReader::Characters) {
-				QStringRef tmp = reader.text();
-				charachters.textPointer = new QString(*tmp.string());
-				charachters.text = new QStringRef(charachters.textPointer, tmp.position(), tmp.length());
-			} else if (type == QXmlStreamReader::EndElement) {
-				QStringRef tmp = reader.name();
-				endTag.namePointer = new QString(*tmp.string());
-				endTag.name = new QStringRef(endTag.namePointer, tmp.position(), tmp.length());
-			}
-		}
-
-		StackToken(const QString &name)
-		{
-			type = QXmlStreamReader::Characters;
-			charachters.textPointer = new QString(name);
-			charachters.text = new QStringRef(charachters.textPointer);
-		}
-
-		~StackToken()
-		{
-			if (type == QXmlStreamReader::StartElement) {
-				delete startTag.namePointer;
-				delete startTag.name;
-				delete startTag.xmlnsPointer;
-				delete startTag.xmlns;
-				delete startTag.attributes;
-			} else if (type == QXmlStreamReader::Characters) {
-				delete charachters.textPointer;
-				delete charachters.text;
-			} else if (type == QXmlStreamReader::EndElement) {
-				delete endTag.namePointer;
-				delete endTag.name;
-			}
-		}
-
-		QXmlStreamReader::TokenType type;
-		union {
-			struct {
-				QString *namePointer;
-				QStringRef *name;
-				QString *xmlnsPointer;
-				QStringRef *xmlns;
-				QXmlStreamAttributes *attributes;
-				bool empty;
-			} startTag;
-			struct {
-				QString *textPointer;
-				QStringRef *text;
-			} charachters;
-			struct {
-				QString *namePointer;
-				QStringRef *name;
-			} endTag;
-		};
-	};
-
-	struct StackEnvironment
-	{
-		QXmlStreamReader reader;
-		State state;
-		int depth;
-		QList<StackToken*> tokens;
-		QColor bodyColor;
-		QColor tagColor;
-		QColor attributeColor;
-		QColor paramColor;
-	};
-
-	Ui::XmlConsole *m_ui;
-	Jreen::Client *m_client;
-	QList<XmlNode> m_nodes;
-	StackEnvironment m_stackIncoming;
-	StackEnvironment m_stackOutgoing;
-	QColor m_stackBracketsColor;
-	int m_filter;
-
-private slots:
-	void on_lineEdit_textChanged(const QString &);
-	void onActionGroupTriggered(QAction *action);
-	void on_saveButton_clicked();
-};
-
-
-#endif // XMLCONSOLE_H

tomahawk-0.4.2.tar.bz2/src/sip/sipdllmacro.h Deleted

@@ -1,32 +0,0 @@
-/* === 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
- *   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 SIPDLLMACRO_H
-#define SIPDLLMACRO_H
-
-#ifdef Q_WS_WIN
-  #ifdef SIPDLLEXPORT_PRO
-      #define SIPDLLEXPORT __declspec(dllexport)
-  #else
-      #define SIPDLLEXPORT __declspec(dllimport)
-  #endif
-#else
-  #define SIPDLLEXPORT
-#endif
-
-#endif

tomahawk-0.4.2.tar.bz2/src/sip/twitter Deleted

tomahawk-0.4.2.tar.bz2/src/sip/twitter/CMakeLists.txt Deleted

@@ -1,54 +0,0 @@
-project( tomahawk )
-
-include( ${QT_USE_FILE} )
-add_definitions( ${QT_DEFINITIONS} )
-add_definitions( -DQT_PLUGIN )
-add_definitions( -DQT_SHARED )
-add_definitions( -DSIPDLLEXPORT_PRO )
-
-set( twitterSources
-    twitter.cpp
-    twitterconfigwidget.cpp
-    tomahawkoauthtwitter.cpp
-)
-
-set( twitterHeaders
-    twitter.h
-    twitterconfigwidget.h
-    tomahawkoauthtwitter.h
-)
-
-set( twitterUI
-    twitterconfigwidget.ui
-)
-
-include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
-   ${QT_INCLUDE_DIR}
-   ${QTWEETLIB_INCLUDE_DIR}
-)
-
-qt4_add_resources( RC_SRCS "resources.qrc" )
-qt4_wrap_cpp( twitterMoc ${twitterHeaders} )
-qt4_wrap_ui( twitterUI_H ${twitterUI} )
-add_library( tomahawk_siptwitter SHARED ${twitterUI_H} ${twitterSources} ${twitterMoc} ${RC_SRCS} )
-
-IF( WIN32 )
-SET( OS_SPECIFIC_LINK_LIBRARIES
-        ${OS_SPECIFIC_LINK_LIBRARIES}
-        "winmm.dll"
-        "iphlpapi.a"
-)
-ENDIF( WIN32 )
-
-target_link_libraries( tomahawk_siptwitter
-    ${TOMAHAWK_LIBRARIES}
-    ${QTWEETLIB_LIBRARIES}
-    ${QT_LIBRARIES}
-    ${OS_SPECIFIC_LINK_LIBRARIES}
-)
-
-IF( APPLE )
-#  SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
-ENDIF( APPLE )
-
-install( TARGETS tomahawk_siptwitter DESTINATION ${CMAKE_INSTALL_LIBDIR} )

tomahawk-0.4.2.tar.bz2/src/sip/twitter/tomahawkoauthtwitter.cpp Deleted

tomahawk-0.4.2.tar.bz2/src/sip/twitter/tomahawkoauthtwitter.h Deleted

tomahawk-0.4.2.tar.bz2/src/sip/twitter/twitter.cpp Deleted

@@ -1,1071 +0,0 @@
-/* === 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
- *   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 "twitter.h"
-
-#include "twitterconfigwidget.h"
-
-#include <QtPlugin>
-#include <QDateTime>
-#include <QRegExp>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QStringList>
-
-#include <QTweetLib/qtweetaccountverifycredentials.h>
-#include <QTweetLib/qtweetuser.h>
-#include <QTweetLib/qtweetstatus.h>
-#include <QTweetLib/qtweetusershow.h>
-
-#include <utils/tomahawkutils.h>
-#include <tomahawksettings.h>
-#include <database/database.h>
-#include <network/servent.h>
-
-#include "utils/logger.h"
-
-static QString s_gotTomahawkRegex = QString( "^(@a-zA-Z0-9+ )?(Got Tomahawk\\?) (\\{a-fA-F0-9\\-+\\}) (.*)$" );
-
-
-SipPlugin*
-TwitterFactory::createPlugin( const QString& pluginId )
-{
-    return new TwitterPlugin( pluginId.isEmpty() ? generateId() : pluginId );
-}
-
-QIcon TwitterFactory::icon() const
-{
-    return QIcon( ":/twitter-icon.png" );
-}
-
-
-TwitterPlugin::TwitterPlugin( const QString& pluginId )
-    : SipPlugin( pluginId )
-    , m_isAuthed( false )
-    , m_checkTimer( this )
-    , m_connectTimer( this )
-    , m_dmPollTimer( this )
-    , m_cachedFriendsSinceId( 0 )
-    , m_cachedMentionsSinceId( 0 )
-    , m_cachedDirectMessagesSinceId( 0 )
-    , m_cachedPeers()
-    , m_keyCache()
-    , m_state( Disconnected )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if ( Database::instance()->dbid() != twitterSavedDbid() )
-        setTwitterCachedPeers( QVariantHash() );
-
-    setTwitterSavedDbid( Database::instance()->dbid() );
-
-    m_checkTimer.setInterval( 180000 );
-    m_checkTimer.setSingleShot( false );
-    connect( &m_checkTimer, SIGNAL( timeout() ), SLOT( checkTimerFired() ) );
-
-    m_dmPollTimer.setInterval( 60000 );
-    m_dmPollTimer.setSingleShot( false );
-    connect( &m_dmPollTimer, SIGNAL( timeout() ), SLOT( pollDirectMessages() ) );
-
-    m_connectTimer.setInterval( 180000 );
-    m_connectTimer.setSingleShot( false );
-    connect( &m_connectTimer, SIGNAL( timeout() ), SLOT( connectTimerFired() ) );
-
-    m_configWidget = QWeakPointer< TwitterConfigWidget >( new TwitterConfigWidget( this, 0 ) );
-    connect( m_configWidget.data(), SIGNAL( twitterAuthed( bool ) ), SLOT( configDialogAuthedSignalSlot( bool ) ) );
-}
-
-
-void
-TwitterPlugin::configDialogAuthedSignalSlot( bool authed )
-{
-
-    if ( !authed )
-    {
-        if( m_isAuthed ) {
-            m_state = Disconnected;
-            emit stateChanged( m_state );
-        }
-
-        setTwitterScreenName( QString() );
-        setTwitterOAuthToken( QString() );
-        setTwitterOAuthTokenSecret( QString() );
-    }
-
-    m_isAuthed = authed;
-}
-
-bool
-TwitterPlugin::isValid() const
-{
-    return m_isAuthed;
-}
-
-const QString
-TwitterPlugin::name() const
-{
-    return QString( MYNAME );
-}
-
-const QString
-TwitterPlugin::friendlyName() const
-{
-    return tr("Twitter");
-}
-
-const QString
-TwitterPlugin::accountName() const
-{
-    if( twitterScreenName().isEmpty() )
-        return friendlyName();
-    else
-        return twitterScreenName();
-}
-
-QIcon
-TwitterPlugin::icon() const
-{
-    return QIcon( ":/twitter-icon.png" );
-}
-
-
-SipPlugin::ConnectionState
-TwitterPlugin::connectionState() const
-{
-    return m_state;
-}
-
-
-QWidget* TwitterPlugin::configWidget()
-{
-    return m_configWidget.data();
-}
-
-bool
-TwitterPlugin::connectPlugin( bool startup )
-{
-    Q_UNUSED( startup );
-    qDebug() << Q_FUNC_INFO;
-
-    m_cachedPeers = twitterCachedPeers();
-    QStringList peerList = m_cachedPeers.keys();
-    qStableSort( peerList.begin(), peerList.end() );
-
-    registerOffers( peerList );
-
-    if ( twitterOAuthToken().isEmpty() || twitterOAuthTokenSecret().isEmpty() )
-    {
-        qDebug() << "TwitterPlugin has empty Twitter credentials; not connecting";
-        return m_cachedPeers.isEmpty();
-    }
-
-    if ( refreshTwitterAuth() )
-    {
-      QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( m_twitterAuth.data(), this );
-      connect( credVerifier, SIGNAL( parsedUser(const QTweetUser &) ), SLOT( connectAuthVerifyReply(const QTweetUser &) ) );
-      credVerifier->verify();
-
-      m_state = Connecting;
-      emit stateChanged( m_state );
-    }
-
-    return true;
-}
-
-bool
-TwitterPlugin::refreshTwitterAuth()
-{
-    qDebug() << Q_FUNC_INFO << " begin";
-    if( !m_twitterAuth.isNull() )
-        delete m_twitterAuth.data();
-
-    Q_ASSERT( TomahawkUtils::nam() != 0 );
-    qDebug() << Q_FUNC_INFO << " with nam " << TomahawkUtils::nam();
-    m_twitterAuth = QWeakPointer<TomahawkOAuthTwitter>( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) );
-
-    if( m_twitterAuth.isNull() )
-      return false;
-
-    m_twitterAuth.data()->setOAuthToken( twitterOAuthToken().toLatin1() );
-    m_twitterAuth.data()->setOAuthTokenSecret( twitterOAuthTokenSecret().toLatin1() );
-
-    return true;
-}
-
-void
-TwitterPlugin::disconnectPlugin()
-{
-    qDebug() << Q_FUNC_INFO;
-    m_checkTimer.stop();
-    m_connectTimer.stop();
-    m_dmPollTimer.stop();
-    if( !m_friendsTimeline.isNull() )
-        delete m_friendsTimeline.data();
-    if( !m_mentions.isNull() )
-        delete m_mentions.data();
-    if( !m_directMessages.isNull() )
-        delete m_directMessages.data();
-    if( !m_directMessageNew.isNull() )
-        delete m_directMessageNew.data();
-    if( !m_directMessageDestroy.isNull() )
-        delete m_directMessageDestroy.data();
-    if( !m_twitterAuth.isNull() )
-        delete m_twitterAuth.data();
-
-    syncConfig();
-    m_cachedPeers.empty();
-    m_state = Disconnected;
-    emit stateChanged( m_state );
-}
-
-void
-TwitterPlugin::connectAuthVerifyReply( const QTweetUser &user )
-{
-    if ( user.id() == 0 )
-    {
-        qDebug() << "TwitterPlugin could not authenticate to Twitter";
-        m_isAuthed = false;
-        m_state = Disconnected;
-        m_connectTimer.stop();
-        m_checkTimer.stop();
-        m_dmPollTimer.stop();
-        emit stateChanged( m_state );
-    }
-    else
-    {
-        qDebug() << "TwitterPlugin successfully authenticated to Twitter as user " << user.screenName();
-        m_isAuthed = true;
-        if ( !m_twitterAuth.isNull() )
-        {
-            setTwitterScreenName( user.screenName() );
-            m_friendsTimeline = QWeakPointer<QTweetFriendsTimeline>( new QTweetFriendsTimeline( m_twitterAuth.data(), this ) );
-            m_mentions = QWeakPointer<QTweetMentions>( new QTweetMentions( m_twitterAuth.data(), this ) );
-            m_directMessages = QWeakPointer<QTweetDirectMessages>( new QTweetDirectMessages( m_twitterAuth.data(), this ) );
-            m_directMessageNew = QWeakPointer<QTweetDirectMessageNew>( new QTweetDirectMessageNew( m_twitterAuth.data(), this ) );
-            m_directMessageDestroy = QWeakPointer<QTweetDirectMessageDestroy>( new QTweetDirectMessageDestroy( m_twitterAuth.data(), this ) );
-            connect( m_friendsTimeline.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( friendsTimelineStatuses(const QList<QTweetStatus> &) ) );
-            connect( m_mentions.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( mentionsStatuses(const QList<QTweetStatus> &) ) );
-            connect( m_directMessages.data(), SIGNAL( parsedDirectMessages(const QList<QTweetDMStatus> &)), SLOT( directMessages(const QList<QTweetDMStatus> &) ) );
-            connect( m_directMessageNew.data(), SIGNAL( parsedDirectMessage(const QTweetDMStatus &)), SLOT( directMessagePosted(const QTweetDMStatus &) ) );
-            connect( m_directMessageNew.data(), SIGNAL( error(QTweetNetBase::ErrorCode, const QString &) ), SLOT( directMessagePostError(QTweetNetBase::ErrorCode, const QString &) ) );
-            connect( m_directMessageDestroy.data(), SIGNAL( parsedDirectMessage(const QTweetDMStatus &) ), SLOT( directMessageDestroyed(const QTweetDMStatus &) ) );
-            m_state = Connected;
-            emit stateChanged( m_state );
-            m_connectTimer.start();
-            m_checkTimer.start();
-            m_dmPollTimer.start();
-            QMetaObject::invokeMethod( this, "checkTimerFired", Qt::AutoConnection );
-            QTimer::singleShot( 20000, this, SLOT( connectTimerFired() ) );
-        }
-        else
-        {
-            if ( refreshTwitterAuth() )
-            {
-                QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( m_twitterAuth.data(), this );
-                connect( credVerifier, SIGNAL( parsedUser(const QTweetUser &) ), SLOT( connectAuthVerifyReply(const QTweetUser &) ) );
-                credVerifier->verify();
-            }
-            else
-            {
-                qDebug() << "TwitterPlugin auth pointer was null!";
-                m_isAuthed = false;
-                m_state = Disconnected;
-                m_connectTimer.stop();
-                m_checkTimer.stop();
-                m_dmPollTimer.stop();
-                emit stateChanged( m_state );
-            }
-        }
-    }
-}
-
-void
-TwitterPlugin::deletePlugin()
-{
-    TomahawkSettings::instance()->remove( pluginId() );
-}
-
-void
-TwitterPlugin::checkTimerFired()
-{
-    if ( !isValid() || m_twitterAuth.isNull() )
-        return;
-
-    if ( m_cachedFriendsSinceId == 0 )
-        m_cachedFriendsSinceId = twitterCachedFriendsSinceId();
-
-    qDebug() << "TwitterPlugin looking at friends timeline since id " << m_cachedFriendsSinceId;
-
-    if ( !m_friendsTimeline.isNull() )
-        m_friendsTimeline.data()->fetch( m_cachedFriendsSinceId, 0, 800 );
-
-    if ( m_cachedMentionsSinceId == 0 )
-        m_cachedMentionsSinceId = twitterCachedMentionsSinceId();
-
-    qDebug() << "TwitterPlugin looking at mentions timeline since id " << m_cachedMentionsSinceId;
-
-    if ( !m_mentions.isNull() )
-        m_mentions.data()->fetch( m_cachedMentionsSinceId, 0, 800 );
-}
-
-
-void
-TwitterPlugin::registerOffers( const QStringList &peerList )
-{
-    foreach( QString screenName, peerList )
-    {
-        QVariantHash peerData = m_cachedPeersscreenName.toHash();
-
-        if ( peerData.contains( "onod" ) && peerData"onod" != Database::instance()->dbid() )
-        {
-            m_cachedPeers.remove( screenName );
-            syncConfig();
-        }
-
-        if ( Servent::instance()->connectedToSession( peerData"node".toString() ) )
-        {
-            peerData"lastseen" = QDateTime::currentMSecsSinceEpoch();
-            m_cachedPeersscreenName = peerData;
-            syncConfig();
-            qDebug() << Q_FUNC_INFO << " already connected";
-            continue;
-        }
-        else if ( QDateTime::currentMSecsSinceEpoch() - peerData"lastseen".toLongLong() > 1209600000 ) // 2 weeks
-        {
-            qDebug() << Q_FUNC_INFO << " aging peer " << screenName << " out of cache";
-            m_cachedPeers.remove( screenName );
-            syncConfig();
-            m_cachedAvatars.remove( screenName );
-            continue;
-        }
-
-        if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) )
-        {
-            qDebug() << "TwitterPlugin does not have host, port and/or pkey values for " << screenName << " (this is usually *not* a bug or problem but a normal part of the process)";
-            continue;
-        }
-
-        QMetaObject::invokeMethod( this, "registerOffer", Q_ARG( QString, screenName ), Q_ARG( QVariantHash, peerData ) );
-    }
-}
-
-
-void
-TwitterPlugin::connectTimerFired()
-{
-    qDebug() << Q_FUNC_INFO << " beginning";
-    if ( !isValid() || m_cachedPeers.isEmpty() || m_twitterAuth.isNull() )
-    {
-        if ( !isValid() )
-            qDebug() << Q_FUNC_INFO << " is not valid";
-        if ( m_cachedPeers.isEmpty() )
-            qDebug() << Q_FUNC_INFO << " has empty cached peers";
-        if ( m_twitterAuth.isNull() )
-            qDebug() << Q_FUNC_INFO << " has null twitterAuth";
-        return;
-    }
-
-    qDebug() << Q_FUNC_INFO << " continuing";
-    QString myScreenName = twitterScreenName();
-    QStringList peerList = m_cachedPeers.keys();
-    qStableSort( peerList.begin(), peerList.end() );
-    registerOffers( peerList );
-}
-
-void
-TwitterPlugin::parseGotTomahawk( const QRegExp &regex, const QString &screenName, const QString &text )
-{
-    QString myScreenName = twitterScreenName();
-    qDebug() << "TwitterPlugin found an exact matching Got Tomahawk? mention or direct message from user " << screenName << ", now parsing";
-    regex.exactMatch( text );
-    if ( text.startsWith( '@' ) && regex.captureCount() >= 2 && regex.cap( 1 ) != QString( '@' + myScreenName ) )
-    {
-        qDebug() << "TwitterPlugin skipping mention because it's directed @someone that isn't us";
-        return;
-    }
-
-    QString node;
-    for ( int i = 0; i < regex.captureCount(); ++i )
-    {
-        if ( regex.cap( i ) == QString( "Got Tomahawk?" ) )
-        {
-            QString nodeCap = regex.cap( i + 1 );
-            nodeCap.chop( 1 );
-            node = nodeCap.mid( 1 );
-        }
-    }
-    if ( node.isEmpty() )
-    {
-        qDebug() << "TwitterPlugin could not parse node out of the tweet";
-        return;
-    }
-    else
-        qDebug() << "TwitterPlugin parsed node " << node << " out of the tweet";
-
-    if ( node == Database::instance()->dbid() )
-    {
-        qDebug() << "My dbid found; ignoring";
-        return;
-    }
-
-    QVariantHash peerData;
-    if( m_cachedPeers.contains( screenName ) )
-    {
-        peerData = m_cachedPeersscreenName.toHash();
-        //force a re-send of info but no need to re-register
-        peerData"resend" = QVariant::fromValue< bool >( true );
-        if ( peerData"node".toString() != node )
-            peerData"rekey" = QVariant::fromValue< bool >( true );
-    }
-    peerData"node" = QVariant::fromValue< QString >( node );
-    QMetaObject::invokeMethod( this, "registerOffer", Q_ARG( QString, screenName ), Q_ARG( QVariantHash, peerData ) );
-}
-
-void
-TwitterPlugin::friendsTimelineStatuses( const QList< QTweetStatus > &statuses )
-{
-    qDebug() << Q_FUNC_INFO;
-    QRegExp regex( s_gotTomahawkRegex, Qt::CaseSensitive, QRegExp::RegExp2 );
-
-    QHash< QString, QTweetStatus > latestHash;
-    foreach ( QTweetStatus status, statuses )
-    {
-        if ( !regex.exactMatch( status.text() ) )
-            continue;
-
-        if ( !latestHash.contains( status.user().screenName() ) )
-            latestHashstatus.user().screenName() = status;
-        else
-        {
-            if ( status.id() > latestHashstatus.user().screenName().id() )
-                latestHashstatus.user().screenName() = status;
-        }
-    }
-
-    foreach( QTweetStatus status, latestHash.values() )
-    {
-        if ( status.id() > m_cachedFriendsSinceId )
-            m_cachedFriendsSinceId = status.id();
-
-        qDebug() << "TwitterPlugin checking mention from " << status.user().screenName() << " with content " << status.text();
-        parseGotTomahawk( regex, status.user().screenName(), status.text() );
-    }
-
-    setTwitterCachedFriendsSinceId( m_cachedFriendsSinceId );
-}
-
-void
-TwitterPlugin::mentionsStatuses( const QList< QTweetStatus > &statuses )
-{
-    qDebug() << Q_FUNC_INFO;
-    QRegExp regex( s_gotTomahawkRegex, Qt::CaseSensitive, QRegExp::RegExp2 );
-
-    QHash< QString, QTweetStatus > latestHash;
-    foreach ( QTweetStatus status, statuses )
-    {
-        if ( !regex.exactMatch( status.text() ) )
-            continue;
-
-        if ( !latestHash.contains( status.user().screenName() ) )
-            latestHashstatus.user().screenName() = status;
-        else
-        {
-            if ( status.id() > latestHashstatus.user().screenName().id() )
-                latestHashstatus.user().screenName() = status;
-        }
-    }
-
-    foreach( QTweetStatus status, latestHash.values() )
-    {
-        if ( status.id() > m_cachedMentionsSinceId )
-            m_cachedMentionsSinceId = status.id();
-
-        qDebug() << "TwitterPlugin checking mention from " << status.user().screenName() << " with content " << status.text();
-        parseGotTomahawk( regex, status.user().screenName(), status.text() );
-    }
-
-    setTwitterCachedMentionsSinceId( m_cachedMentionsSinceId );
-}
-
-void
-TwitterPlugin::pollDirectMessages()
-{
-    if ( !isValid() )
-        return;
-
-    if ( m_cachedDirectMessagesSinceId == 0 )
-            m_cachedDirectMessagesSinceId = twitterCachedDirectMessagesSinceId();
-
-    qDebug() << "TwitterPlugin looking for direct messages since id " << m_cachedDirectMessagesSinceId;
-
-    if ( !m_directMessages.isNull() )
-        m_directMessages.data()->fetch( m_cachedDirectMessagesSinceId, 0, 800 );
-}
-
-void
-TwitterPlugin::directMessages( const QList< QTweetDMStatus > &messages )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    QRegExp regex( s_gotTomahawkRegex, Qt::CaseSensitive, QRegExp::RegExp2 );
-    QString myScreenName = twitterScreenName();
-
-    QHash< QString, QTweetDMStatus > latestHash;
-    foreach ( QTweetDMStatus status, messages )
-    {
-        if ( !regex.exactMatch( status.text() ) )
-        {
-            QStringList splitList = status.text().split(':');
-            if ( splitList.length() != 5 )
-                continue;
-            if ( splitList0 != "TOMAHAWKPEER" )
-                continue;
-            if ( !splitList1.startsWith( "Host=" ) || !splitList2.startsWith( "Port=" ) || !splitList3.startsWith( "Node=" ) || !splitList4.startsWith( "PKey=" ) )
-                continue;
-            int port = splitList2.mid( 5 ).toInt();
-            if ( port == 0 )
-                continue;
-        }
-
-        if ( !latestHash.contains( status.senderScreenName() ) )
-            latestHashstatus.senderScreenName() = status;
-        else
-        {
-            if ( status.id() > latestHashstatus.senderScreenName().id() )
-                latestHashstatus.senderScreenName() = status;
-        }
-    }
-
-    foreach( QTweetDMStatus status, latestHash.values() )
-    {
-        qDebug() << "TwitterPlugin checking direct message from " << status.senderScreenName() << " with content " << status.text();
-        if ( status.id() > m_cachedDirectMessagesSinceId )
-            m_cachedDirectMessagesSinceId = status.id();
-
-        if ( regex.exactMatch( status.text() ) )
-            parseGotTomahawk( regex, status.sender().screenName(), status.text() );
-        else
-        {
-            QStringList splitList = status.text().split(':');
-            qDebug() << "TwitterPlugin found " << splitList.length() << " parts to the message; the parts are:";
-            foreach( QString part, splitList )
-                qDebug() << part;
-            //validity is checked above
-            int port = splitList2.mid( 5 ).toInt();
-            QString host = splitList1.mid( 5 );
-            QString node = splitList3.mid( 5 );
-            QString pkey = splitList4.mid( 5 );
-            QStringList splitNode = node.split('*');
-            if ( splitNode.length() != 2 )
-            {
-                qDebug() << "Old-style node info found, ignoring";
-                continue;
-            }
-            qDebug() << "TwitterPlugin found a peerstart message from " << status.senderScreenName() << " with host " << host << " and port " << port << " and pkey " << pkey << " and node " << splitNode0 << " destined for node " << splitNode1;
-
-
-            QVariantHash peerData = ( m_cachedPeers.contains( status.senderScreenName() ) ) ?
-                                                        m_cachedPeersstatus.senderScreenName().toHash() :
-                                                        QVariantHash();
-
-            peerData"host" = QVariant::fromValue< QString >( host );
-            peerData"port" = QVariant::fromValue< int >( port );
-            peerData"pkey" = QVariant::fromValue< QString >( pkey );
-            peerData"node" = QVariant::fromValue< QString >( splitNode0 );
-            peerData"dirty" = QVariant::fromValue< bool >( true );
-
-            QMetaObject::invokeMethod( this, "registerOffer", Q_ARG( QString, status.senderScreenName() ), Q_ARG( QVariantHash, peerData ) );
-
-            if ( Database::instance()->dbid().startsWith( splitNode1 ) )
-            {
-                qDebug() << "TwitterPlugin found message destined for this node; destroying it";
-                if ( !m_directMessageDestroy.isNull() )
-                    m_directMessageDestroy.data()->destroyMessage( status.id() );
-            }
-        }
-    }
-
-    setTwitterCachedDirectMessagesSinceId( m_cachedDirectMessagesSinceId );
-}
-
-void
-TwitterPlugin::registerOffer( const QString &screenName, const QVariantHash &peerData )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    bool peersChanged = false;
-    bool needToSend = false;
-    bool needToAddToCache = false;
-
-    QString friendlyName = QString( '@' + screenName );
-
-    if ( !m_cachedAvatars.contains( screenName ) )
-        QMetaObject::invokeMethod( this, "fetchAvatar", Q_ARG( QString, screenName ) );
-
-    QVariantHash _peerData( peerData );
-
-    if ( _peerData.contains( "dirty" ) )
-    {
-        peersChanged = true;
-        _peerData.remove( "dirty" );
-    }
-
-    if ( _peerData.contains( "resend" ) )
-    {
-        needToSend = true;
-        peersChanged = true;
-        _peerData.remove( "resend" );
-    }
-
-    if ( !_peerData.contains( "okey" ) ||
-         !_peerData.contains( "onod" ) ||
-         ( _peerData.contains( "onod" ) && _peerData"onod" != Database::instance()->dbid() ) )
-    {
-        QString okey = QUuid::createUuid().toString().split( '-' ).last();
-        okey.chop( 1 );
-        _peerData"okey" = QVariant::fromValue< QString >( okey );
-        _peerData"onod" = QVariant::fromValue< QString >( Database::instance()->dbid() );
-        peersChanged = true;
-        needToAddToCache = true;
-        needToSend = true;
-    }
-
-    if ( _peerData.contains( "rekey" ) || !m_keyCache.contains( _peerData"okey".toString() ) )
-    {
-        _peerData.remove( "rekey" );
-        needToAddToCache = true;
-    }
-
-    if ( !_peerData.contains( "ohst" ) || !_peerData.contains( "oprt" ) ||
-            _peerData"ohst".toString() != Servent::instance()->externalAddress() ||
-            _peerData"oprt".toInt() != Servent::instance()->externalPort()
-        )
-        needToSend = true;
-
-    if( needToAddToCache && _peerData.contains( "node" ) )
-    {
-        qDebug() << "TwitterPlugin registering offer to " << friendlyName << " with node " << _peerData"node".toString() << " and offeredkey " << _peerData"okey".toString();
-        m_keyCache << Servent::instance()->createConnectionKey( friendlyName, _peerData"node".toString(), _peerData"okey".toString(), false );
-    }
-
-    if( needToSend && _peerData.contains( "node") )
-    {
-        qDebug() << "TwitterPlugin needs to send and has node";
-        _peerData"ohst" = QVariant::fromValue< QString >( Servent::instance()->externalAddress() );
-        _peerData"oprt" = QVariant::fromValue< int >( Servent::instance()->externalPort() );
-        peersChanged = true;
-        if( !Servent::instance()->externalAddress().isEmpty() && !Servent::instance()->externalPort() == 0 )
-            QMetaObject::invokeMethod( this, "sendOffer", Q_ARG( QString, screenName ), Q_ARG( QVariantHash, _peerData ) );
-        else
-            qDebug() << "TwitterPlugin did not send offer because external address is " << Servent::instance()->externalAddress() << " and external port is " << Servent::instance()->externalPort();
-    }
-
-    if ( peersChanged )
-    {
-        _peerData"lastseen" = QString::number( QDateTime::currentMSecsSinceEpoch() );
-        m_cachedPeersscreenName = QVariant::fromValue< QVariantHash >( _peerData );
-        syncConfig();
-    }
-
-    if ( m_state == Connected && _peerData.contains( "host" ) && _peerData.contains( "port" ) && _peerData.contains( "pkey" ) )
-        QMetaObject::invokeMethod( this, "makeConnection", Q_ARG( QString, screenName ), Q_ARG( QVariantHash, _peerData ) );
-
-}
-
-void
-TwitterPlugin::sendOffer( const QString &screenName, const QVariantHash &peerData )
-{
-    qDebug() << Q_FUNC_INFO;
-    QString offerString = QString( "TOMAHAWKPEER:Host=%1:Port=%2:Node=%3*%4:PKey=%5" ).arg( peerData"ohst".toString() )
-                                                                                      .arg( peerData"oprt".toString() )
-                                                                                      .arg( Database::instance()->dbid() )
-                                                                                      .arg( peerData"node".toString().left( 8 ) )
-                                                                                      .arg( peerData"okey".toString() );
-    qDebug() << "TwitterPlugin sending message to " << screenName << ": " << offerString;
-    if( !m_directMessageNew.isNull() )
-        m_directMessageNew.data()->post( screenName, offerString );
-}
-
-void
-TwitterPlugin::makeConnection( const QString &screenName, const QVariantHash &peerData )
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) || !peerData.contains( "node" ) ||
-         peerData"host".toString().isEmpty() || peerData"port".toString().isEmpty() || peerData"pkey".toString().isEmpty() || peerData"node".toString().isEmpty() )
-    {
-        qDebug() << "TwitterPlugin could not find host and/or port and/or pkey and/or node for peer " << screenName;
-        return;
-    }
-
-    if ( peerData"host".toString() == Servent::instance()->externalAddress() &&
-         peerData"port".toInt() == Servent::instance()->externalPort() )
-    {
-        qDebug() << "TwitterPlugin asked to make connection to our own host and port, ignoring " << screenName;
-        return;
-    }
-
-    QString friendlyName = QString( '@' + screenName );
-    if ( !Servent::instance()->connectedToSession( peerData"node".toString() ) )
-        Servent::instance()->connectToPeer( peerData"host".toString(),
-                                            peerData"port".toString().toInt(),
-                                            peerData"pkey".toString(),
-                                            friendlyName,
-                                            peerData"node".toString() );
-}
-
-void
-TwitterPlugin::directMessagePosted( const QTweetDMStatus& message )
-{
-    qDebug() << Q_FUNC_INFO;
-    qDebug() << "TwitterPlugin sent message to " << message.recipientScreenName() << " containing: " << message.text();
-
-}
-
-void
-TwitterPlugin::directMessagePostError( QTweetNetBase::ErrorCode errorCode, const QString &message )
-{
-    Q_UNUSED( errorCode );
-    Q_UNUSED( message );
-    qDebug() << Q_FUNC_INFO;
-    qDebug() << "TwitterPlugin received an error posting direct message: " << m_directMessageNew.data()->lastErrorMessage();
-}
-
-void
-TwitterPlugin::directMessageDestroyed( const QTweetDMStatus& message )
-{
-    qDebug() << Q_FUNC_INFO;
-    qDebug() << "TwitterPlugin destroyed message " << message.text();
-}
-
-void
-TwitterPlugin::fetchAvatar( const QString& screenName )
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( m_twitterAuth.isNull() )
-        return;
-    QTweetUserShow *userShowFetch = new QTweetUserShow( m_twitterAuth.data(), this );
-    connect( userShowFetch, SIGNAL( parsedUserInfo( QTweetUser ) ), SLOT( avatarUserDataSlot( QTweetUser ) ) );
-    userShowFetch->fetch( screenName );
-}
-
-void
-TwitterPlugin::avatarUserDataSlot( const QTweetUser &user )
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( user.profileImageUrl().isEmpty() || m_twitterAuth.isNull() )
-        return;
-
-    QNetworkRequest request( user.profileImageUrl() );
-    QNetworkReply *reply = m_twitterAuth.data()->networkAccessManager()->get( request );
-    reply->setProperty( "screenname", user.screenName() );
-    connect( reply, SIGNAL( finished() ), this, SLOT( profilePicReply() ) );
-}
-
-void
-TwitterPlugin::refreshProxy()
-{
-    if ( !m_twitterAuth.isNull() )
-        m_twitterAuth.data()->setNetworkAccessManager( TomahawkUtils::nam() );
-}
-
-void
-TwitterPlugin::profilePicReply()
-{
-    qDebug() << Q_FUNC_INFO;
-    QNetworkReply *reply = qobject_cast< QNetworkReply* >( sender() );
-    if ( !reply || reply->error() != QNetworkReply::NoError || !reply->property( "screenname" ).isValid() )
-    {
-        qDebug() << Q_FUNC_INFO << " reply not valid or came back with error";
-        return;
-    }
-    QString screenName = reply->property( "screenname" ).toString();
-    QString friendlyName = '@' + screenName;
-    QByteArray rawData = reply->readAll();
-    QImage image;
-    image.loadFromData( rawData, "PNG" );
-    QPixmap pixmap = QPixmap::fromImage( image );
-    m_cachedAvatarsscreenName = pixmap;
-    emit avatarReceived( friendlyName, QPixmap::fromImage( image ) );
-}
-
-void
-TwitterPlugin::checkSettings()
-{
-    if ( m_state == Disconnected )
-        return;
-    disconnectPlugin();
-    connectPlugin( false );
-}
-
-
-void
-TwitterPlugin::setTwitterSavedDbid( const QString& dbid )
-{
-    TomahawkSettings::instance()->setValue( pluginId() + "/saveddbid", dbid );
-}
-
-
-QString
-TwitterPlugin::twitterSavedDbid() const
-{
-    return TomahawkSettings::instance()->value( pluginId() + "/saveddbid", QString() ).toString();
-}
-
-
-QString
-TwitterPlugin::twitterScreenName() const
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    s->beginGroup( pluginId() );
-    QStringList keys = s->childKeys();
-    if ( keys.contains( "ScreenName", Qt::CaseSensitive ) )
-    {
-        s->setValue( "screenname_tmp",
-            s->value( "ScreenName" ).toString() );
-        s->remove( "ScreenName" );
-
-        s->sync();
-    }
-    keys = s->childKeys();
-    if ( keys.contains( "screenname_tmp", Qt::CaseSensitive ) )
-    {
-        s->setValue( "screenname",
-            s->value( "screenname_tmp" ).toString() );
-        s->remove( "screenname_tmp" );
-
-        s->sync();
-    }
-    s->endGroup();
-
-    return s->value( pluginId() + "/screenname" ).toString();
-}
-
-void
-TwitterPlugin::setTwitterScreenName( const QString& screenName )
-{
-    TomahawkSettings::instance()->setValue( pluginId() + "/screenname", screenName );
-}
-
-QString
-TwitterPlugin::twitterOAuthToken() const
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    s->beginGroup( pluginId() );
-    QStringList keys = s->childKeys();
-    if ( keys.contains( "OAuthToken", Qt::CaseSensitive ) )
-    {
-        s->setValue( "oauthtoken_tmp",
-            s->value( "OAuthToken" ).toString() );
-        s->remove( "OAuthToken" );
-
-        s->sync();
-
-    }
-    keys = s->childKeys();
-    if ( keys.contains( "oauthtoken_tmp", Qt::CaseSensitive ) )
-    {
-        s->setValue( "oauthtoken",
-            s->value( "oauthtoken_tmp" ).toString() );
-        s->remove( "oauthtoken_tmp" );
-
-        s->sync();
-    }
-    s->endGroup();
-
-    return s->value( pluginId() + "/oauthtoken" ).toString();
-}
-
-void
-TwitterPlugin::setTwitterOAuthToken( const QString& oauthtoken )
-{
-    TomahawkSettings::instance()->setValue( pluginId() + "/oauthtoken", oauthtoken );
-}
-
-QString
-TwitterPlugin::twitterOAuthTokenSecret() const
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    s->beginGroup( pluginId() );
-    QStringList keys = s->childKeys();
-    if ( keys.contains( "OAuthTokenSecret", Qt::CaseSensitive ) )
-    {
-        s->setValue( "oauthtokensecret_tmp",
-            s->value( "OAuthTokenSecret" ).toString() );
-        s->remove( "OAuthTokenSecret" );
-
-        s->sync();
-    }
-    keys = s->childKeys();
-    if ( keys.contains( "oauthtokensecret_tmp", Qt::CaseSensitive ) )
-    {
-        s->setValue( "oauthtokensecret",
-            s->value( "oauthtokensecret_tmp" ).toString() );
-        s->remove( "oauthtokensecret_tmp" );
-
-        s->sync();
-    }
-    s->endGroup();
-
-    return s->value( pluginId() + "/oauthtokensecret" ).toString();
-}
-
-void
-TwitterPlugin::setTwitterOAuthTokenSecret( const QString& oauthtokensecret )
-{
-    TomahawkSettings::instance()->setValue( pluginId() + "/oauthtokensecret", oauthtokensecret );
-}
-
-qint64
-TwitterPlugin::twitterCachedFriendsSinceId() const
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    s->beginGroup( pluginId() );
-    QStringList keys = s->childKeys();
-    if ( keys.contains( "CachedFriendsSinceID", Qt::CaseSensitive ) )
-    {
-        s->setValue( "cachedfriendssinceid_tmp",
-            s->value( "CachedFriendsSinceID" ).toLongLong() );
-        s->remove( "CachedFriendsSinceID" );
-
-        s->sync();
-    }
-    keys = s->childKeys();
-    if ( keys.contains( "cachedfriendssinceid_tmp", Qt::CaseSensitive ) )
-    {
-        s->setValue( "cachedfriendssinceid",
-            s->value( "cachedfriendssinceid_tmp" ).toLongLong() );
-        s->remove( "cachedfriendssinceid_tmp" );
-
-        s->sync();
-    }
-    s->endGroup();
-
-    return s->value( pluginId() + "/cachedfriendssinceid", 0 ).toLongLong();
-}
-
-void
-TwitterPlugin::setTwitterCachedFriendsSinceId( qint64 cachedId )
-{
-    TomahawkSettings::instance()->setValue( pluginId() + "/cachedfriendssinceid", cachedId );
-}
-
-qint64
-TwitterPlugin::twitterCachedMentionsSinceId() const
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    s->beginGroup( pluginId() );
-    QStringList keys = s->childKeys();
-    if ( keys.contains( "CachedMentionsSinceID", Qt::CaseSensitive ) )
-    {
-        s->setValue( "cachedmentionssinceid_tmp",
-            s->value( "CachedMentionsSinceID" ).toLongLong() );
-        s->remove( "CachedMentionsSinceID" );
-
-        s->sync();
-    }
-    keys = s->childKeys();
-    if ( keys.contains( "cachedmentionssinceid_tmp", Qt::CaseSensitive ) )
-    {
-        s->setValue( "cachedmentionssinceid",
-            s->value( "cachedmentionssinceid_tmp" ).toLongLong() );
-        s->remove( "cachedmentionssinceid_tmp" );
-
-        s->sync();
-    }
-    s->endGroup();
-
-    return s->value( pluginId() + "/cachedmentionssinceid", 0 ).toLongLong();
-}
-
-void
-TwitterPlugin::setTwitterCachedMentionsSinceId( qint64 cachedId )
-{
-    TomahawkSettings::instance()->setValue( pluginId() + "/cachedmentionssinceid", cachedId );
-}
-
-qint64
-TwitterPlugin::twitterCachedDirectMessagesSinceId() const
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    s->beginGroup( pluginId() );
-    QStringList keys = s->childKeys();
-    if ( keys.contains( "CachedDirectMessagesSinceID", Qt::CaseSensitive ) )
-    {
-        s->setValue( "cacheddirectmessagessinceid_tmp",
-            s->value( "CachedDirectMessagesSinceID" ).toLongLong() );
-        s->remove( "CachedDirectMessagesSinceID" );
-
-        s->sync();
-    }
-    keys = s->childKeys();
-    if ( keys.contains( "cacheddirectmessagessinceid_tmp", Qt::CaseSensitive ) )
-    {
-        s->setValue( "cacheddirectmessagessinceid",
-            s->value( "cacheddirectmessagessinceid_tmp" ).toLongLong() );
-        s->remove( "cacheddirectmessagessinceid_tmp" );
-
-        s->sync();
-    }
-    s->endGroup();
-
-    return s->value( pluginId() + "/cacheddirectmessagessinceid", 0 ).toLongLong();
-}
-
-void
-TwitterPlugin::setTwitterCachedDirectMessagesSinceId( qint64 cachedId )
-{
-    TomahawkSettings::instance()->setValue( pluginId() + "/cacheddirectmessagessinceid", cachedId );
-}
-
-QVariantHash
-TwitterPlugin::twitterCachedPeers() const
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    s->beginGroup( pluginId() );
-    QStringList keys = s->childKeys();
-    if ( keys.contains( "CachedPeers", Qt::CaseSensitive ) )
-    {
-        s->setValue( "cachedpeers_tmp",
-            s->value( "CachedPeers" ).toHash() );
-        s->remove( "CachedPeers" );
-
-        s->sync();
-    }
-    keys = s->childKeys();
-    if ( keys.contains( "cachedpeers_tmp", Qt::CaseSensitive ) )
-    {
-        s->setValue( "cachedpeers",
-            s->value( "cachedpeers_tmp" ).toHash() );
-        s->remove( "cachedpeers_tmp" );
-
-        s->sync();
-    }
-    s->endGroup();
-
-    return s->value( pluginId() + "/cachedpeers", QVariantHash() ).toHash();
-}
-
-void
-TwitterPlugin::setTwitterCachedPeers( const QVariantHash &cachedPeers )
-{
-    TomahawkSettings::instance()->setValue( pluginId() + "/cachedpeers", cachedPeers );
-    TomahawkSettings::instance()->sync();
-}
-
-Q_EXPORT_PLUGIN2( sipfactory, TwitterFactory )

tomahawk-0.4.2.tar.bz2/src/sip/twitter/twitter.h Deleted

@@ -1,166 +0,0 @@
-/* === 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
- *   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 TWITTER_H
-#define TWITTER_H
-
-#include "twitterconfigwidget.h"
-
-#include <QTimer>
-#include <QWeakPointer>
-#include <QSet>
-
-#include <QTweetLib/qtweetuser.h>
-#include <QTweetLib/qtweetnetbase.h>
-#include <QTweetLib/qtweetfriendstimeline.h>
-#include <QTweetLib/qtweetdirectmessages.h>
-#include <QTweetLib/qtweetdirectmessagenew.h>
-#include <QTweetLib/qtweetdirectmessagedestroy.h>
-#include <QTweetLib/qtweetmentions.h>
-#include <QTweetLib/qtweetdmstatus.h>
-
-#include "../sipdllmacro.h"
-#include "sip/SipPlugin.h"
-#include "tomahawkoauthtwitter.h"
-
-#define MYNAME "SIPTWITTER"
-
-class SIPDLLEXPORT TwitterFactory : public SipPluginFactory
-{
-    Q_OBJECT
-    Q_INTERFACES( SipPluginFactory )
-
-public:
-    TwitterFactory() {}
-    virtual ~TwitterFactory() {}
-
-    virtual QString prettyName() const { return "Twitter"; }
-    virtual QString factoryId() const { return "siptwitter"; }
-    virtual QIcon icon() const;
-    virtual SipPlugin* createPlugin( const QString& pluginId = QString() );
-};
-
-class SIPDLLEXPORT TwitterPlugin : public SipPlugin
-{
-    Q_OBJECT
-
-public:
-    TwitterPlugin( const QString& pluginId );
-
-    virtual ~TwitterPlugin() {}
-
-    virtual bool isValid() const;
-    virtual const QString name() const;
-    virtual const QString accountName() const;
-    virtual const QString friendlyName() const;
-    virtual ConnectionState connectionState() const;
-    virtual QIcon icon() const;
-    virtual QWidget* configWidget();
-
-public slots:
-    virtual bool connectPlugin( bool startup );
-    void disconnectPlugin();
-    void checkSettings();
-    void refreshProxy();
-    void deletePlugin();
-
-    void sendMsg( const QString& to, const QString& msg )
-    {
-        Q_UNUSED( to );
-        Q_UNUSED( msg );
-    }
-
-    void broadcastMsg( const QString &msg )
-    {
-        Q_UNUSED( msg );
-    }
-
-    void addContact( const QString &jid, const QString& msg = QString() )
-    {
-        Q_UNUSED( jid );
-        Q_UNUSED( msg );
-    }
-
-private slots:
-    void configDialogAuthedSignalSlot( bool authed );
-    void connectAuthVerifyReply( const QTweetUser &user );
-    void checkTimerFired();
-    void connectTimerFired();
-    void friendsTimelineStatuses( const QList< QTweetStatus > &statuses );
-    void mentionsStatuses( const QList< QTweetStatus > &statuses );
-    void pollDirectMessages();
-    void directMessages( const QList< QTweetDMStatus > &messages );
-    void directMessagePosted( const QTweetDMStatus &message );
-    void directMessagePostError( QTweetNetBase::ErrorCode errorCode, const QString &message );
-    void directMessageDestroyed( const QTweetDMStatus &message );
-    void registerOffers( const QStringList &peerList );
-    void registerOffer( const QString &screenName, const QVariantHash &peerdata );
-    void sendOffer( const QString &screenName, const QVariantHash &peerdata );
-    void makeConnection( const QString &screenName, const QVariantHash &peerdata );
-    void fetchAvatar( const QString &screenName );
-    void avatarUserDataSlot( const QTweetUser &user );
-    void profilePicReply();
-
-private:
-    inline void syncConfig() { setTwitterCachedPeers( m_cachedPeers ); }
-    bool refreshTwitterAuth();
-    void parseGotTomahawk( const QRegExp &regex, const QString &screenName, const QString &text );
-    // handle per-plugin config
-    QString twitterSavedDbid() const;
-    void setTwitterSavedDbid( const QString& dbid );
-    QString twitterScreenName() const;
-    void setTwitterScreenName( const QString& screenName );
-    QString twitterOAuthToken() const;
-    void setTwitterOAuthToken( const QString& oauthtoken );
-    QString twitterOAuthTokenSecret() const;
-    void setTwitterOAuthTokenSecret( const QString& oauthtokensecret );
-    qint64 twitterCachedFriendsSinceId() const;
-    void setTwitterCachedFriendsSinceId( qint64 sinceid );
-    qint64 twitterCachedMentionsSinceId() const;
-    void setTwitterCachedMentionsSinceId( qint64 sinceid );
-    qint64 twitterCachedDirectMessagesSinceId() const;
-    void setTwitterCachedDirectMessagesSinceId( qint64 sinceid );
-    QVariantHash twitterCachedPeers() const;
-    void setTwitterCachedPeers( const QVariantHash &cachedPeers );
-
-    QWeakPointer< TomahawkOAuthTwitter > m_twitterAuth;
-    QWeakPointer< QTweetFriendsTimeline > m_friendsTimeline;
-    QWeakPointer< QTweetMentions > m_mentions;
-    QWeakPointer< QTweetDirectMessages > m_directMessages;
-    QWeakPointer< QTweetDirectMessageNew > m_directMessageNew;
-    QWeakPointer< QTweetDirectMessageDestroy > m_directMessageDestroy;
-
-    bool m_isAuthed;
-    QTimer m_checkTimer;
-    QTimer m_connectTimer;
-    QTimer m_dmPollTimer;
-    qint64 m_cachedFriendsSinceId;
-    qint64 m_cachedMentionsSinceId;
-    qint64 m_cachedDirectMessagesSinceId;
-    QVariantHash m_cachedPeers;
-    QHash< QString, QPixmap > m_cachedAvatars;
-    QSet<QString> m_keyCache;
-    ConnectionState m_state;
-
-    QWeakPointer<TwitterConfigWidget > m_configWidget;
-
-    // for settings access
-    friend class TwitterConfigWidget;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/sip/twitter/twitterconfigwidget.cpp Deleted

@@ -1,270 +0,0 @@
-/* === 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
- *   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 "twitterconfigwidget.h"
-#include "twitter.h"
-#include "ui_twitterconfigwidget.h"
-
-#include "tomahawksettings.h"
-#include "utils/tomahawkutils.h"
-#include "database/database.h"
-
-#include "tomahawkoauthtwitter.h"
-#include <QTweetLib/qtweetaccountverifycredentials.h>
-#include <QTweetLib/qtweetstatusupdate.h>
-#include <QTweetLib/qtweetdirectmessagenew.h>
-
-#include <QMessageBox>
-
-#include "utils/logger.h"
-
-
-TwitterConfigWidget::TwitterConfigWidget( TwitterPlugin* plugin, QWidget *parent ) :
-    QWidget( parent ),
-    ui( new Ui::TwitterConfigWidget ),
-    m_plugin( plugin )
-{
-    ui->setupUi( this );
-
-    connect( ui->twitterAuthenticateButton, SIGNAL( pressed() ),
-            this, SLOT( authDeauthTwitter() ) );
-    connect( ui->twitterTweetGotTomahawkButton, SIGNAL( pressed() ),
-            this, SLOT( startPostGotTomahawkStatus() ) );
-    connect( ui->twitterTweetComboBox, SIGNAL( currentIndexChanged( int ) ),
-            this, SLOT( tweetComboBoxIndexChanged( int ) ) );
-
-    ui->twitterTweetComboBox->setCurrentIndex( 0 );
-    ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) );
-
-    if ( m_plugin->twitterOAuthToken().isEmpty() || m_plugin->twitterOAuthTokenSecret().isEmpty() || m_plugin->twitterScreenName().isEmpty() )
-    {
-        ui->twitterStatusLabel->setText( tr( "Status: No saved credentials" ) );
-        ui->twitterAuthenticateButton->setText( tr( "Authenticate" ) );
-        ui->twitterSyncGroupBox->setVisible( false );
-
-        emit twitterAuthed( false );
-    }
-    else
-    {
-        ui->twitterStatusLabel->setText( tr( "Status: Credentials saved for %1" ).arg( m_plugin->twitterScreenName() ) );
-        ui->twitterAuthenticateButton->setText( tr( "De-authenticate" ) );
-        ui->twitterSyncGroupBox->setVisible( true );
-        ui->twitterUserTweetLineEdit->setVisible( false );
-
-        emit twitterAuthed( true );
-    }
-
-}
-
-TwitterConfigWidget::~TwitterConfigWidget()
-{
-    delete ui;
-}
-
-void
-TwitterConfigWidget::authDeauthTwitter()
-{
-    if ( ui->twitterAuthenticateButton->text() == tr( "Authenticate" ) ) //FIXME: don't rely on UI strings here!
-        authenticateTwitter();
-    else
-        deauthenticateTwitter();
-}
-
-void
-TwitterConfigWidget::authenticateTwitter()
-{
-    qDebug() << Q_FUNC_INFO;
-    TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this );
-    twitAuth->authorizePin();
-
-    m_plugin->setTwitterOAuthToken( twitAuth->oauthToken() );
-    m_plugin->setTwitterOAuthTokenSecret( twitAuth->oauthTokenSecret() );
-
-    QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( twitAuth, this );
-    connect( credVerifier, SIGNAL( parsedUser( const QTweetUser & ) ), SLOT( authenticateVerifyReply( const QTweetUser & ) ) );
-    connect( credVerifier, SIGNAL( error( QTweetNetBase::ErrorCode, QString ) ), SLOT( authenticateVerifyError( QTweetNetBase::ErrorCode, QString ) ) );
-    credVerifier->verify();
-}
-
-void
-TwitterConfigWidget::authenticateVerifyReply( const QTweetUser &user )
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( user.id() == 0 )
-    {
-        QMessageBox::critical( this, tr("Tweetin' Error"), tr("The credentials could not be verified.\nYou may wish to try re-authenticating.") );
-        emit twitterAuthed( false );
-        return;
-    }
-
-    m_plugin->setTwitterScreenName( user.screenName() );
-    m_plugin->setTwitterCachedFriendsSinceId( 0 );
-    m_plugin->setTwitterCachedMentionsSinceId( 0 );
-
-    ui->twitterStatusLabel->setText( tr( "Status: Credentials saved for %1" ).arg( m_plugin->twitterScreenName() ) );
-    ui->twitterAuthenticateButton->setText( tr( "De-authenticate" ) );
-    ui->twitterSyncGroupBox->setVisible( true );
-    ui->twitterTweetComboBox->setCurrentIndex( 0 );
-    ui->twitterUserTweetLineEdit->setVisible( false );
-    ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) );
-
-    m_plugin->connectPlugin( false );
-
-    emit twitterAuthed( true );
-    emit sizeHintChanged();
-}
-
-void
-TwitterConfigWidget::authenticateVerifyError( QTweetNetBase::ErrorCode code, const QString &errorMsg )
-{
-    qDebug() << Q_FUNC_INFO;
-    qDebug() << "Error validating credentials, error code is " << code << ", error message is " << errorMsg;
-    ui->twitterStatusLabel->setText(tr("Status: Error validating credentials"));
-    emit twitterAuthed( false );
-    return;
-}
-
-void
-TwitterConfigWidget::deauthenticateTwitter()
-{
-    qDebug() << Q_FUNC_INFO;
-    m_plugin->setTwitterOAuthToken( QString() );
-    m_plugin->setTwitterOAuthTokenSecret( QString() );
-    m_plugin->setTwitterScreenName( QString() );
-
-    ui->twitterStatusLabel->setText(tr("Status: No saved credentials"));
-    ui->twitterAuthenticateButton->setText( tr( "Authenticate" ) );
-    ui->twitterSyncGroupBox->setVisible( false );
-
-    emit twitterAuthed( false );
-    emit sizeHintChanged();
-}
-
-void
-TwitterConfigWidget::tweetComboBoxIndexChanged( int index )
-{
-    Q_UNUSED( index );
-    if ( ui->twitterTweetComboBox->currentText() == tr( "Global Tweet" ) ) //FIXME: use data!
-        ui->twitterUserTweetLineEdit->setVisible( false );
-    else
-        ui->twitterUserTweetLineEdit->setVisible( true );
-
-    if ( ui->twitterTweetComboBox->currentText() == tr( "Direct Message" ) ) //FIXME: use data!
-        ui->twitterTweetGotTomahawkButton->setText( tr( "Send Message!" ) );
-    else if ( ui->twitterTweetComboBox->currentText() == tr( "@Mention" ) )
-        ui->twitterTweetGotTomahawkButton->setText( tr( "Send Mention!" ) );
-    else
-        ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) );
-}
-
-void
-TwitterConfigWidget::startPostGotTomahawkStatus()
-{
-    qDebug() << Q_FUNC_INFO;
-    m_postGTtype = ui->twitterTweetComboBox->currentText();
-
-    if ( m_postGTtype != "Global Tweet" && ( ui->twitterUserTweetLineEdit->text().isEmpty() || ui->twitterUserTweetLineEdit->text() == "@" ) )
-    {
-        QMessageBox::critical( this, tr("Tweetin' Error"), tr("You must enter a user name for this type of tweet.") );
-        return;
-    }
-
-    qDebug() << "Posting Got Tomahawk status";
-    if ( m_plugin->twitterOAuthToken().isEmpty() || m_plugin->twitterOAuthTokenSecret().isEmpty() || m_plugin->twitterScreenName().isEmpty() )
-    {
-        QMessageBox::critical( this, tr("Tweetin' Error"), tr("Your saved credentials could not be loaded.\nYou may wish to try re-authenticating.") );
-        emit twitterAuthed( false );
-        return;
-    }
-    TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this );
-    twitAuth->setOAuthToken( m_plugin->twitterOAuthToken().toLatin1() );
-    twitAuth->setOAuthTokenSecret( m_plugin->twitterOAuthTokenSecret().toLatin1() );
-    QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( twitAuth, this );
-    connect( credVerifier, SIGNAL( parsedUser(const QTweetUser &) ), SLOT( postGotTomahawkStatusAuthVerifyReply(const QTweetUser &) ) );
-    credVerifier->verify();
-}
-
-void
-TwitterConfigWidget::postGotTomahawkStatusAuthVerifyReply( const QTweetUser &user )
-{
-    qDebug() << Q_FUNC_INFO;
-    if ( user.id() == 0 )
-    {
-        QMessageBox::critical( this, tr("Tweetin' Error"), tr("Your saved credentials could not be verified.\nYou may wish to try re-authenticating.") );
-        emit twitterAuthed( false );
-        return;
-    }
-    m_plugin->setTwitterScreenName( user.screenName() );
-    TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this );
-    twitAuth->setOAuthToken( m_plugin->twitterOAuthToken().toLatin1() );
-    twitAuth->setOAuthTokenSecret( m_plugin->twitterOAuthTokenSecret().toLatin1() );
-    if ( m_postGTtype != "Direct Message" )
-    {
-        QTweetStatusUpdate *statUpdate = new QTweetStatusUpdate( twitAuth, this );
-        connect( statUpdate, SIGNAL( postedStatus(const QTweetStatus &) ), SLOT( postGotTomahawkStatusUpdateReply(const QTweetStatus &) ) );
-        connect( statUpdate, SIGNAL( error(QTweetNetBase::ErrorCode, const QString&) ), SLOT( postGotTomahawkStatusUpdateError(QTweetNetBase::ErrorCode, const QString &) ) );
-        QString uuid = QUuid::createUuid();
-        QString message = QString( "Got Tomahawk? {" ) + Database::instance()->dbid() + QString( "} (" ) + uuid.mid( 1, 8 ) + QString( ")" ) + QString( " http://gettomahawk.com" );
-        if ( m_postGTtype == "@Mention" )
-        {
-            QString user = ui->twitterUserTweetLineEdit->text();
-            if ( user.startsWith( "@" ) )
-                user.remove( 0, 1 );
-            message = QString( "@" ) + user + QString( " " ) + message;
-        }
-        statUpdate->post( message );
-    }
-    else
-    {
-        QTweetDirectMessageNew *statUpdate = new QTweetDirectMessageNew( twitAuth, this );
-        connect( statUpdate, SIGNAL( parsedDirectMessage(const QTweetDMStatus &)), SLOT( postGotTomahawkDirectMessageReply(const QTweetDMStatus &) ) );
-        connect( statUpdate, SIGNAL( error(QTweetNetBase::ErrorCode, const QString&) ), SLOT( postGotTomahawkStatusUpdateError(QTweetNetBase::ErrorCode, const QString &) ) );
-        QString uuid = QUuid::createUuid();
-        QString message = QString( "Got Tomahawk? {" ) + Database::instance()->dbid() + QString( "} (" ) + uuid.mid( 1, 8 ) + QString( ")" ) + QString( " http://gettomahawk.com" );
-        QString user = ui->twitterUserTweetLineEdit->text();
-        if ( user.startsWith( "@" ) )
-            user.remove( 0, 1 );
-        statUpdate->post( user, message );
-    }
-}
-
-void
-TwitterConfigWidget::postGotTomahawkStatusUpdateReply( const QTweetStatus& status )
-{
-    if ( status.id() == 0 )
-        QMessageBox::critical( this, tr("Tweetin' Error"), tr("There was an error posting your status -- sorry!") );
-    else
-        QMessageBox::information( this, tr("Tweeted!"), tr("Your tweet has been posted!") );
-}
-
-void
-TwitterConfigWidget::postGotTomahawkDirectMessageReply( const QTweetDMStatus& status )
-{
-    if ( status.id() == 0 )
-        QMessageBox::critical( this, tr("Tweetin' Error"), tr("There was an error posting your direct message -- sorry!") );
-    else
-        QMessageBox::information( this, tr("Tweeted!"), tr("Your message has been posted!") );
-}
-
-void
-TwitterConfigWidget::postGotTomahawkStatusUpdateError( QTweetNetBase::ErrorCode code, const QString& errorMsg )
-{
-    qDebug() << Q_FUNC_INFO;
-    qDebug() << "Error posting Got Tomahawk message, error code is " << code << ", error message is " << errorMsg;
-    QMessageBox::critical( this, tr("Tweetin' Error"), tr("There was an error posting your status -- sorry!") );
-}

tomahawk-0.4.2.tar.bz2/src/sip/twitter/twitterconfigwidget.h Deleted

@@ -1,69 +0,0 @@
-/* === 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
- *   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 TWITTERCONFIGWIDGET_H
-#define TWITTERCONFIGWIDGET_H
-
-#include "sip/SipPlugin.h"
-
-#include <QTweetLib/qtweetstatus.h>
-#include <QTweetLib/qtweetdmstatus.h>
-#include <QTweetLib/qtweetuser.h>
-#include <QTweetLib/qtweetnetbase.h>
-
-#include <QWidget>
-
-class TwitterPlugin;
-
-namespace Ui {
-    class TwitterConfigWidget;
-}
-
-class TwitterConfigWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit TwitterConfigWidget( TwitterPlugin* plugin = 0, QWidget *parent = 0 );
-    ~TwitterConfigWidget();
-
-signals:
-    void twitterAuthed( bool authed );
-
-    void sizeHintChanged();
-private slots:
-    void authDeauthTwitter();
-    void startPostGotTomahawkStatus();
-    void authenticateVerifyReply( const QTweetUser &user );
-    void authenticateVerifyError( QTweetNetBase::ErrorCode code, const QString &errorMsg );
-    void postGotTomahawkStatusAuthVerifyReply( const QTweetUser &user );
-    void postGotTomahawkStatusUpdateReply( const QTweetStatus &status );
-    void postGotTomahawkDirectMessageReply( const QTweetDMStatus &status );
-    void postGotTomahawkStatusUpdateError( QTweetNetBase::ErrorCode, const QString &errorMsg );
-    void tweetComboBoxIndexChanged( int index );
-
-private:
-    void authenticateTwitter();
-    void deauthenticateTwitter();
-
-    Ui::TwitterConfigWidget *ui;
-    TwitterPlugin *m_plugin;
-    QString m_postGTtype;
-};
-
-#endif // TWITTERCONFIGWIDGET_H

tomahawk-0.4.2.tar.bz2/src/sip/zeroconf Deleted

tomahawk-0.4.2.tar.bz2/src/sip/zeroconf/CMakeLists.txt Deleted

@@ -1,45 +0,0 @@
-project( tomahawk )
-
-include( ${QT_USE_FILE} )
-add_definitions( ${QT_DEFINITIONS} )
-add_definitions( -DQT_PLUGIN )
-add_definitions( -DQT_SHARED )
-add_definitions( -DSIPDLLEXPORT_PRO )
-
-set( zeroconfSources
-        zeroconf.cpp
-)
-
-set( zeroconfHeaders
-	zeroconf.h
-	tomahawkzeroconf.h
-)
-
-include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
-   ${QT_INCLUDE_DIR}
-)
-
-qt4_wrap_ui( UI_SRCS configwidget.ui )
-qt4_add_resources( RC_SRCS "resources.qrc" )
-qt4_wrap_cpp( zeroconfMoc ${zeroconfHeaders} )
-add_library( tomahawk_sipzeroconf SHARED ${zeroconfSources} ${zeroconfMoc} ${RC_SRCS} ${UI_SRCS} )
-
-IF( WIN32 )
-SET( OS_SPECIFIC_LINK_LIBRARIES
-	${OS_SPECIFIC_LINK_LIBRARIES}
-	"winmm.dll"
-    "iphlpapi.a"
-)
-ENDIF( WIN32 )
-
-target_link_libraries( tomahawk_sipzeroconf
-	${QT_LIBRARIES}
-	${OS_SPECIFIC_LINK_LIBRARIES}
-	${TOMAHAWK_LIBRARIES}
-)
-
-IF( APPLE )
-#  SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
-ENDIF( APPLE )
-
-install( TARGETS tomahawk_sipzeroconf DESTINATION ${CMAKE_INSTALL_LIBDIR} )

tomahawk-0.4.2.tar.bz2/src/sip/zeroconf/tomahawkzeroconf.h Deleted

@@ -1,155 +0,0 @@
-/* === 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
- *   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 TOMAHAWKZCONF
-#define TOMAHAWKZCONF
-
-#define ZCONF_PORT 50210
-
-#include <QList>
-#include <QHostAddress>
-#include <QHostInfo>
-#include <QNetworkProxy>
-#include <QUdpSocket>
-#include <QTimer>
-
-#include "database/database.h"
-#include "network/servent.h"
-
-#include "../sipdllmacro.h"
-
-class SIPDLLEXPORT Node : public QObject
-{
-Q_OBJECT
-
-public:
-    Node( const QString& i, const QString& n, int p )
-        : ip( i ), nid( n ), port( p )
-    {
-        qDebug() << Q_FUNC_INFO;
-    }
-
-    ~Node()
-    {
-        qDebug() << Q_FUNC_INFO;
-    }
-
-signals:
-    void tomahawkHostFound( const QString&, int, const QString&, const QString& );
-
-public slots:
-    void resolved( QHostInfo i )
-    {
-        if ( i.hostName().length() )
-            emit tomahawkHostFound( ip, port, i.hostName(), nid );
-        else
-            emit tomahawkHostFound( ip, port, "Unknown", nid );
-        this->deleteLater();
-    }
-    
-    void resolve()
-    {
-        QHostInfo::lookupHost( ip, this, SLOT( resolved( QHostInfo ) ) );
-    }
-
-private:
-    QString ip;
-    QString nid;
-    int port;
-};
-
-
-class SIPDLLEXPORT TomahawkZeroconf : public QObject
-{
-Q_OBJECT
-
-public:
-    TomahawkZeroconf( int port, QObject* parent = 0 )
-        : QObject( parent ), m_sock( this ), m_port( port )
-    {
-        qDebug() << Q_FUNC_INFO;
-        m_sock.setProxy( QNetworkProxy::NoProxy );
-        m_sock.bind( ZCONF_PORT, QUdpSocket::ShareAddress );
-        connect( &m_sock, SIGNAL( readyRead() ), this, SLOT( readPacket() ) );
-    }
-
-    virtual ~TomahawkZeroconf()
-    {
-        qDebug() << Q_FUNC_INFO;
-    }
-
-public slots:
-    void advertise()
-    {
-        qDebug() << "Advertising us on the LAN";
-        QByteArray advert = QString( "TOMAHAWKADVERT:%1:%2" )
-                            .arg( m_port )
-                            .arg( Database::instance()->dbid() )
-                            .toAscii();
-        m_sock.writeDatagram( advert.data(), advert.size(),
-                              QHostAddress::Broadcast, ZCONF_PORT );
-    }
-
-signals:
-    // IP, port, name, session
-    void tomahawkHostFound( const QString&, int, const QString&, const QString& );
-
-private slots:
-    void readPacket()
-    {
-        if ( !m_sock.hasPendingDatagrams() )
-            return;
-
-        QByteArray datagram;
-        datagram.resize( m_sock.pendingDatagramSize() );
-        QHostAddress sender;
-        quint16 senderPort;
-        m_sock.readDatagram( datagram.data(), datagram.size(), &sender, &senderPort );
-        qDebug() << "DATAGRAM RCVD" << QString::fromAscii( datagram ) << sender;
-
-        // only process msgs originating on the LAN:
-        if ( datagram.startsWith( "TOMAHAWKADVERT:" ) &&
-            Servent::isIPWhitelisted( sender ) )
-        {
-            QStringList parts = QString::fromAscii( datagram ).split( ':' );
-            if ( parts.length() == 3 )
-            {
-                bool ok;
-                int port = parts.at(1).toInt( &ok );
-                if(ok && Database::instance()->dbid() != parts.at( 2 ) )
-                {
-                    qDebug() << "ADVERT received:" << sender << port;
-                    Node *n = new Node( sender.toString(), parts.at( 2 ), port );
-                    connect( n,    SIGNAL( tomahawkHostFound( QString, int, QString, QString ) ),
-                             this, SIGNAL( tomahawkHostFound( QString, int, QString, QString ) ) );
-                    n->resolve();
-                }
-            }
-        }
-
-        if ( m_sock.hasPendingDatagrams() )
-            QTimer::singleShot( 0, this, SLOT( readPacket() ) );
-    }
-
-private:
-    QUdpSocket m_sock;
-    int m_port;
-};
-
-#endif
-

tomahawk-0.4.2.tar.bz2/src/sip/zeroconf/zeroconf-icon.png Deleted

tomahawk-0.4.2.tar.bz2/src/sip/zeroconf/zeroconf.cpp Deleted

@@ -1,157 +0,0 @@
-/* === 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
- *   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 "zeroconf.h"
-
-#include <QtPlugin>
-
-#include <QtCore/QTimer>
-
-#include "tomahawksettings.h"
-#include "utils/logger.h"
-
-
-SipPlugin*
-ZeroconfFactory::createPlugin( const QString& pluginId )
-{
-    return new ZeroconfPlugin( pluginId.isEmpty() ? generateId() : pluginId );
-}
-
-ZeroconfPlugin::ZeroconfPlugin() : SipPlugin( "" ) {}
-
-ZeroconfPlugin::ZeroconfPlugin ( const QString& pluginId )
-    : SipPlugin( pluginId )
-    , m_zeroconf( 0 )
-    , m_state( Disconnected )
-    , m_cachedNodes()
-{
-    qDebug() << Q_FUNC_INFO;
-    m_advertisementTimer.setInterval( 60000 );
-    m_advertisementTimer.setSingleShot( false );
-    connect( &m_advertisementTimer, SIGNAL( timeout() ), this, SLOT( advertise() ) );
-}
-
-ZeroconfPlugin::~ZeroconfPlugin() {}
-
-const QString
-ZeroconfPlugin::name() const
-{
-    return QString( MYNAME );
-}
-
-const QString
-ZeroconfPlugin::accountName() const
-{
-    return QString( MYNAME );
-}
-
-const QString
-ZeroconfPlugin::friendlyName() const
-{
-    return QString( MYNAME );
-}
-
-SipPlugin::ConnectionState
-ZeroconfPlugin::connectionState() const
-{
-    return m_state;
-}
-
-#ifndef ENABLE_HEADLESS
-QIcon
-ZeroconfFactory::icon() const
-{
-    return QIcon( ":/zeroconf-icon.png" );
-}
-#endif
-
-bool
-ZeroconfPlugin::connectPlugin( bool /*startup*/ )
-{
-    delete m_zeroconf;
-    m_zeroconf = new TomahawkZeroconf( Servent::instance()->port(), this );
-    QObject::connect( m_zeroconf, SIGNAL( tomahawkHostFound( QString, int, QString, QString ) ),
-                                    SLOT( lanHostFound( QString, int, QString, QString ) ) );
-
-    advertise();
-    m_state = Connected;
-
-    foreach( const QStringList& nodeSet, m_cachedNodes )
-    {
-        if ( !Servent::instance()->connectedToSession( nodeSet3 ) )
-            Servent::instance()->connectToPeer( nodeSet0, nodeSet1.toInt(), "whitelist", nodeSet2, nodeSet3 );
-    }
-    m_cachedNodes.clear();
-
-    m_advertisementTimer.start();
-
-    return true;
-}
-
-void
-ZeroconfPlugin::disconnectPlugin()
-{
-    m_advertisementTimer.stop();
-    m_state = Disconnected;
-
-    delete m_zeroconf;
-    m_zeroconf = 0;
-}
-
-
-#ifndef ENABLE_HEADLESS
-QIcon
-ZeroconfPlugin::icon() const
-{
-    return QIcon( ":/zeroconf-icon.png" );
-}
-#endif
-
-
-void
-ZeroconfPlugin::advertise()
-{
-    m_zeroconf->advertise();
-}
-
-
-void
-ZeroconfPlugin::lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid )
-{
-    if ( sender() != m_zeroconf )
-        return;
-
-    qDebug() << "Found LAN host:" << host << port << nodeid;
-
-    if ( m_state != Connected )
-    {
-        qDebug() << "Not online, so not connecting.";
-        QStringList nodeSet;
-        nodeSet << host << QString::number( port ) << name << nodeid;
-        m_cachedNodes.append( nodeSet );
-        return;
-    }
-
-    if ( !Servent::instance()->connectedToSession( nodeid ) )
-        Servent::instance()->connectToPeer( host, port, "whitelist", name, nodeid );
-    else
-        qDebug() << "Already connected to" << host;
-}
-
-
-Q_EXPORT_PLUGIN2( sipfactory, ZeroconfFactory )

tomahawk-0.4.2.tar.bz2/src/sip/zeroconf/zeroconf.h Deleted

@@ -1,90 +0,0 @@
-/* === 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
- *   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 ZEROCONF_H
-#define ZEROCONF_H
-
-#include "sip/SipPlugin.h"
-#include "tomahawkzeroconf.h"
-
-#include "../sipdllmacro.h"
-
-#include <QtCore/QTimer>
-
-#define MYNAME "Local Network"
-
-class SIPDLLEXPORT ZeroconfFactory : public SipPluginFactory
-{
-    Q_OBJECT
-    Q_INTERFACES( SipPluginFactory )
-public:
-    ZeroconfFactory() {}
-    virtual ~ZeroconfFactory() {}
-
-    virtual QString factoryId() const { return "sipzeroconf"; }
-    virtual QString prettyName() const { return "Local Network"; }
-    virtual bool isUnique() const { return true; }
-#ifndef ENABLE_HEADLESS
-    virtual QIcon icon() const;
-#endif
-
-
-    virtual SipPlugin* createPlugin ( const QString& pluginId = QString() );
-};
-
-class SIPDLLEXPORT ZeroconfPlugin : public SipPlugin
-{
-    Q_OBJECT
-
-public:
-    ZeroconfPlugin();
-    ZeroconfPlugin( const QString& pluginId );
-
-    virtual ~ZeroconfPlugin();
-
-    virtual const QString name() const;
-    virtual const QString friendlyName() const;
-    virtual const QString accountName() const;
-    virtual ConnectionState connectionState() const;
-    virtual bool isValid() const { return true; }
-#ifndef ENABLE_HEADLESS
-    virtual QIcon icon() const;
-#endif
-    virtual void checkSettings() {}
-
-public slots:
-    virtual bool connectPlugin( bool startup );
-    void disconnectPlugin();
-
-    void advertise();
-
-    void sendMsg( const QString& , const QString&  ) {}
-    void broadcastMsg( const QString & ) {}
-    void addContact( const QString &, const QString&  ) {}
-
-private slots:
-    void lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid );
-
-private:
-    TomahawkZeroconf* m_zeroconf;
-    ConnectionState m_state;
-    QVector<QStringList> m_cachedNodes;
-    QTimer m_advertisementTimer;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/sipconfigdelegate.cpp Deleted

@@ -1,282 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "sipconfigdelegate.h"
-
-#include <QApplication>
-#include <QPainter>
-
-#include "sip/SipModel.h"
-#include "sip/SipPlugin.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#define ICONSIZE 24
-#define CHECK_LEFT_EDGE 8
-
-
-SipConfigDelegate::SipConfigDelegate( QObject* parent )
-    : ConfigDelegateBase ( parent )
-{
-    connect( this, SIGNAL( configPressed( QModelIndex ) ), this, SLOT( askedForEdit( QModelIndex ) ) );
-}
-
-bool
-SipConfigDelegate::editorEvent ( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
-{
-    return ConfigDelegateBase::editorEvent( event, model, option, index );
-}
-
-void
-SipConfigDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, index );
-    QRect itemRect = opt.rect;
-    int top = itemRect.top();
-    int mid = itemRect.height() / 2;
-
-    // one line bold for account name
-    // space below it fro an error
-    // checkbox, icon, name, online/offline status, config icon
-    QFont name = opt.font;
-    name.setPointSize( name.pointSize() + 2 );
-    name.setBold( true );
-
-    QFont error = opt.font;
-    error.setItalic( true );
-    error.setPointSize( error.pointSize() - 2 );
-
-    // draw the background
-    const QWidget* w = opt.widget;
-    QStyle* style = w ? w->style() : QApplication::style();
-    style->drawPrimitive( QStyle::PE_PanelItemViewItem, &opt, painter, w );
-
-    int iconLeftEdge = CHECK_LEFT_EDGE + ICONSIZE + PADDING;
-    int textLeftEdge = iconLeftEdge + ICONSIZE + PADDING;
-
-    if( index.data( SipModel::FactoryRole ).toBool() ) { // this is the "add new account" row
-        // draw a border and background
-        painter->save();
-        painter->setRenderHints( QPainter::Antialiasing );
-        painter->setBrush( QApplication::palette().color( QPalette::Active, QPalette::Highlight ).lighter( 150 ) );
-        QPainterPath roundedRect;
-        roundedRect.addRoundedRect( itemRect.adjusted( 1, 1, -1, -1 ), 3, 3 );
-        painter->drawPath( roundedRect );
-        painter->setBrush( QApplication::palette().color( QPalette::Active, QPalette::Highlight ).lighter( 170 ) );
-        painter->fillPath( roundedRect, painter->brush() );
-        painter->restore();
-
-        // draw "+" icon in checkbox column
-        int rectW = 18;
-        int diff = ( ICONSIZE/ 2 ) - ( rectW / 2) ;
-        int pos = ( mid ) - ( rectW / 2 );
-        QRect plusRect = QRect( CHECK_LEFT_EDGE + diff, pos + top, rectW, rectW );
-        QPixmap p( RESPATH "images/list-add.png" );
-        painter->drawPixmap( plusRect, p );
-
-        // draw text
-        QFont f = opt.font;
-        f.setPointSize( f.pointSize() );
-        f.setBold( true );
-        QFontMetrics fm( f );
-        QString text = index.data( Qt::DisplayRole ).toString();
-        QRect textR = fm.boundingRect( text );
-        textR.moveLeft( textLeftEdge );
-        textR.moveTop( mid - ( textR.height() / 2 ) + top );
-        textR.setRight( itemRect.right() );
-        painter->setFont( f );
-        painter->drawText( textR, text );
-    } else if( index.data( SipModel::FactoryItemRole ).toBool() ) { // this is an account type
-
-//         ConfigDelegateBase::paint( painter, opt, index );
-//         int indent = 10;
-        // draw a border and background
-        painter->save();
-        painter->setRenderHints( QPainter::Antialiasing );
-        painter->setBrush( QApplication::palette().color( QPalette::Active, QPalette::Highlight ).lighter( 170 ) );
-        QPainterPath roundedRect;
-        roundedRect.addRoundedRect( itemRect.adjusted( 1, 1, -1, -1 ), 3, 3 );
-        painter->drawPath( roundedRect );
-        painter->setBrush( QApplication::palette().color( QPalette::Active, QPalette::Highlight ).lighter( 180 ) );
-        painter->fillPath( roundedRect, painter->brush() );
-        painter->restore();
-
-        QIcon icon = index.data( SipModel::FactoryItemIcon ).value< QIcon >();
-        if( !icon.isNull() ) {
-            int rectW = 18;
-            int diff = ( ICONSIZE/ 2 ) - ( rectW / 2) ;
-            int pos = ( mid ) - ( rectW / 2 );
-            QRect rect = QRect( CHECK_LEFT_EDGE + diff, pos + top, rectW, rectW );
-            QPixmap p( icon.pixmap( rect.size() ) );
-            painter->drawPixmap( rect, p );
-        }
-
-        // draw text
-        QFont f = opt.font;
-        f.setPointSize( f.pointSize() );
-        f.setBold( true );
-        QFontMetrics fm( f );
-        QString text = index.data( Qt::DisplayRole ).toString();
-        QRect textR = fm.boundingRect( text );
-        textR.moveLeft( textLeftEdge );
-        textR.moveTop( mid - ( textR.height() / 2 ) + top );
-        textR.setRight( itemRect.right() );
-        painter->setFont( f );
-        painter->drawText( textR, text );
-    } else { // this is an existing account to show
-        // draw checkbox first
-        int pos = ( mid ) - ( ICONSIZE / 2 );
-        QRect checkRect = QRect( CHECK_LEFT_EDGE, pos + top, ICONSIZE, ICONSIZE );
-        opt.rect = checkRect;
-        drawCheckBox( opt, painter, w );
-
-        // draw the icon if it exists
-        pos = ( mid ) - ( ICONSIZE / 2 );
-        if( !index.data( Qt::DecorationRole ).value< QIcon >().isNull() ) {
-            QRect prect = QRect( iconLeftEdge, pos + top, ICONSIZE, ICONSIZE );
-
-            painter->save();
-            painter->drawPixmap( prect, index.data( Qt::DecorationRole ).value< QIcon >().pixmap( prect.size() ) );
-            painter->restore();
-        }
-
-        // from the right edge--config status and online/offline
-        QRect confRect = QRect( itemRect.width() - ICONSIZE - 2 * PADDING, mid - ICONSIZE / 2 + top, ICONSIZE, ICONSIZE );
-        if( index.data( SipModel::HasConfig ).toBool() ) {
-
-            QStyleOptionToolButton topt;
-            topt.rect = confRect;
-            topt.pos = confRect.topLeft();
-
-            drawConfigWrench( painter, opt, topt );
-        }
-
-        // draw the online/offline status
-        int statusIconSize = 18;
-        int statusX = confRect.left() - 2*PADDING - statusIconSize;
-        QFont statusF = opt.font;
-        statusF.setPointSize( statusF.pointSize() - 2 );
-        QFontMetrics statusFM( statusF );
-
-        QPixmap p;
-        QString statusText;
-        SipPlugin::ConnectionState state = static_cast< SipPlugin::ConnectionState >( index.data( SipModel::ConnectionStateRole ).toInt() );
-        if( state == SipPlugin::Connected ) {
-            p = QPixmap( RESPATH "images/sipplugin-online.png" );
-            statusText = tr( "Online" );
-        } else if( state == SipPlugin::Connecting ) {
-            p = QPixmap( RESPATH "images/sipplugin-offline.png" );
-            statusText = tr( "Connecting..." );
-        } else {
-            p = QPixmap( RESPATH "images/sipplugin-offline.png" );
-            statusText = tr( "Offline" );
-        }
-        p = p.scaled( statusIconSize, statusIconSize, Qt::KeepAspectRatio, Qt::SmoothTransformation );
-        painter->drawPixmap( statusX, mid - statusIconSize / 2 + top, statusIconSize, statusIconSize, p );
-        int width = statusFM.width( statusText );
-        statusX = statusX - PADDING - width;
-        painter->save();
-        painter->setFont( statusF );
-        painter->drawText( QRect( statusX, mid - statusFM.height() / 2 + top, width, statusFM.height() ), statusText );
-        painter->restore();
-
-        // name
-        painter->save();
-        QFontMetrics namefm( name );
-        int nameHeight = namefm.boundingRect( "test" ).height();
-        // pos will the top-left point of the text rect
-        pos = mid - ( nameHeight / 2 );
-        // TODO bound with config icon and offline/online status
-        width = itemRect.width() - textLeftEdge;
-
-        if( !index.data( SipModel::ErrorString ).toString().isEmpty() ) { // error, show that too
-            QRect errorRect( textLeftEdge, mid + top, width, mid - PADDING + 1 );
-
-            QFontMetrics errorFm( error );
-            QString str = errorFm.elidedText( index.data( SipModel::ErrorString ).toString(), Qt::ElideRight, errorRect.width() );
-            painter->setFont( error );
-            painter->drawText( errorRect, str );
-
-            pos = mid - errorRect.height() - 2; // move the name rect up
-        }
-        QString nameStr = namefm.elidedText( index.data( Qt::DisplayRole ).toString(), Qt::ElideRight, width );
-        painter->setFont( name );
-        painter->drawText( QRect( textLeftEdge, pos + top, width, nameHeight + 1 ), nameStr );
-        painter->restore();
-    }
-}
-
-QRect
-SipConfigDelegate::checkRectForIndex( const QStyleOptionViewItem &option, const QModelIndex &idx ) const
-{
-    if( !idx.data( SipModel::FactoryItemRole ).toBool() && !idx.data( SipModel::FactoryRole ).toBool() )
-    {
-        QStyleOptionViewItemV4 opt = option;
-        initStyleOption( &opt, idx );
-        int mid = opt.rect.height() / 2;
-        int pos = ( mid ) - ( ICONSIZE / 2 );
-        QRect checkRect = QRect( CHECK_LEFT_EDGE, pos + opt.rect.top(), ICONSIZE, ICONSIZE );
-
-        return checkRect;
-    }
-    return QRect();
-}
-
-QRect
-SipConfigDelegate::configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const
-{
-    if( !idx.data( SipModel::FactoryItemRole ).toBool() && !idx.data( SipModel::FactoryRole ).toBool() )
-    {
-        QStyleOptionViewItemV4 opt = option;
-        initStyleOption( &opt, idx );
-        QRect itemRect = opt.rect;
-        QRect confRect = QRect( itemRect.width() - ICONSIZE - 2 * PADDING, (opt.rect.height() / 2) - ICONSIZE / 2 + opt.rect.top(), ICONSIZE, ICONSIZE );
-        return confRect;
-    }
-    return QRect();
-}
-
-
-QSize
-SipConfigDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    if( index.data( SipModel::FactoryRole ).toBool() || index.data( SipModel::FactoryItemRole ).toBool() ) { // this is the "add new account" row
-        // enough space for one line of text
-        QStyleOptionViewItemV4 opt = option;
-        initStyleOption( &opt, index );
-        int width = QStyledItemDelegate::sizeHint( option, index ).width();
-
-        QFont name = opt.font;
-        name.setPointSize( name.pointSize() + 1 );
-        name.setBold( true );
-        QFontMetrics sfm( name );
-        return QSize( width, 3 * PADDING + sfm.height() );
-    } else { // this is an existing account to show
-        return ConfigDelegateBase::sizeHint( option, index );
-    }
-}
-
-void
-SipConfigDelegate::askedForEdit( const QModelIndex& idx )
-{
-    emit openConfig( qobject_cast< SipPlugin* >( idx.data( SipModel::SipPluginData ).value< QObject* >() ) );
-}
-
-

tomahawk-0.4.2.tar.bz2/src/sipconfigdelegate.h Deleted

@@ -1,46 +0,0 @@
-/*
-    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
-
-    This program 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.
-
-    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef SIPCONFIGDELEGATE_H
-#define SIPCONFIGDELEGATE_H
-
-#include "configdelegatebase.h"
-
-class SipPlugin;
-class SipPluginFactory;
-class SipConfigDelegate : public ConfigDelegateBase
-{
-    Q_OBJECT
-public:
-    SipConfigDelegate( QObject* parent = 0);
-
-    virtual void paint ( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    virtual bool editorEvent ( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
-    virtual QSize sizeHint ( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-    virtual QRect checkRectForIndex( const QStyleOptionViewItem &option, const QModelIndex &idx ) const;
-    virtual QRect configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const;
-private slots:
-    void askedForEdit( const QModelIndex& idx );
-
-signals:
-    void sipFactoryClicked( SipPluginFactory* );
-    void openConfig( SipPlugin* );
-};
-
-#endif // SIPCONFIGDELEGATE_H

tomahawk-0.4.2.tar.bz2/src/sourcetree/animationhelper.cpp Deleted

@@ -1,130 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2011, Michael Zanetti <mzanetti@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 "animationhelper.h"
-
-#include "QDebug"
-
-AnimationHelper::AnimationHelper( const QModelIndex& index, QObject *parent )
-    :QObject( parent )
-    , m_index( index )
-    , m_fullyExpanded( false )
-    , m_expandAnimation( 0 )
-{
-    m_expandTimer.setSingleShot( true );
-    m_expandTimer.setInterval( 600 );
-    connect( &m_expandTimer, SIGNAL(timeout()), SLOT(expandTimeout()));
-
-    m_collapseTimer.setSingleShot( true );
-    m_collapseTimer.setInterval( 600 );
-    connect( &m_collapseTimer, SIGNAL(timeout()), SLOT(collapseTimeout()));
-}
-
-bool AnimationHelper::initialized() const
-{
-    return m_expandAnimation != 0;
-}
-
-void AnimationHelper::initialize( const QSize& startValue, const QSize& endValue, int duration )
-{
-    m_size = startValue;
-    m_targetSize = endValue;
-    m_startSize = startValue;
-
-    m_expandAnimation = new QPropertyAnimation( this, "size", this );
-    m_expandAnimation->setStartValue( startValue );
-    m_expandAnimation->setEndValue( endValue );
-    m_expandAnimation->setDuration( duration );
-    m_expandAnimation->setEasingCurve( QEasingCurve::OutExpo );
-    qDebug() << "starting animation" << startValue << endValue << duration;
-    connect( m_expandAnimation, SIGNAL( finished() ), SLOT(expandAnimationFinished()));
-
-    m_collapseAnimation= new QPropertyAnimation( this, "size", this );
-    m_collapseAnimation->setStartValue( endValue );
-    m_collapseAnimation->setEndValue( startValue );
-    m_collapseAnimation->setDuration( duration );
-    m_collapseAnimation->setEasingCurve( QEasingCurve::InExpo );
-    connect( m_collapseAnimation, SIGNAL( finished() ), SLOT(collapseAnimationFinished()));
-
-}
-
-void AnimationHelper::setSize( const QSize& size )
-{
-    m_size = size;
-    emit sizeChanged();
-    //qDebug() << "animaton setting size to" << size;
-}
-
-void AnimationHelper::expand()
-{
-    m_collapseTimer.stop();
-    m_expandTimer.start();
-}
-
-void AnimationHelper::collapse( bool immediately )
-{
-    if ( m_expandTimer.isActive() )
-    {
-        m_expandTimer.stop();
-        emit finished( m_index );
-        return;
-    }
-
-    if ( immediately )
-    {
-        m_fullyExpanded = false;
-        m_collapseAnimation->start();
-    }
-    else
-        m_collapseTimer.start();
-}
-
-bool AnimationHelper::partlyExpanded()
-{
-    return m_size != m_startSize;
-//    return m_fullyExpanded
-//            || ( m_expandAnimation->state() == QPropertyAnimation::Running && m_expandAnimation->currentTime() > 250 )
-//            || ( m_collapseAnimation->state() == QPropertyAnimation::Running && m_collapseAnimation->currentTime() < 100 );
-}
-
-bool AnimationHelper::fullyExpanded()
-{
-    return m_fullyExpanded;
-}
-
-void AnimationHelper::expandTimeout()
-{
-    m_expandAnimation->start();
-}
-
-void AnimationHelper::collapseTimeout()
-{
-    m_fullyExpanded = false;
-    m_collapseAnimation->start();
-}
-
-void AnimationHelper::expandAnimationFinished()
-{
-    m_fullyExpanded = true;
-}
-
-void AnimationHelper::collapseAnimationFinished()
-{
-    emit finished( m_index );
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/categoryitems.cpp Deleted

@@ -1,412 +0,0 @@
-/*
- *  Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *  This program 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 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "categoryitems.h"
-
-#include <QMimeData>
-
-#include "tomahawkapp.h"
-#include "viewmanager.h"
-#include "viewpage.h"
-#include "sourcelist.h"
-#include "sourcetreeview.h"
-#include "utils/tomahawkutils.h"
-#include "widgets/newplaylistwidget.h"
-#include "widgets/playlisttypeselectordlg.h"
-#include <playlist/dynamic/GeneratorInterface.h>
-#include "utils/logger.h"
-#include "dropjob.h"
-
-#include <echonest/Playlist.h>
-
-using namespace Tomahawk;
-
-
-/// CategoryAddItem
-
-CategoryAddItem::CategoryAddItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::CategoryType type )
-    : SourceTreeItem( model, parent, SourcesModel::CategoryAdd )
-    , m_categoryType( type )
-{
-    m_icon = QIcon( RESPATH "images/add.png" );
-}
-
-
-CategoryAddItem::~CategoryAddItem()
-{
-}
-
-
-QString
-CategoryAddItem::text() const
-{
-    switch( m_categoryType ) {
-        case SourcesModel::PlaylistsCategory:
-            return tr( "New Playlist" );
-        case SourcesModel::StationsCategory:
-            return tr( "New Station" );
-    }
-
-    return QString();
-}
-
-
-void
-CategoryAddItem::activate()
-{
-    switch( m_categoryType )
-    {
-        case SourcesModel::PlaylistsCategory: {
-
-            PlaylistTypeSelectorDlg* playlistSelectorDlg = new PlaylistTypeSelectorDlg( TomahawkApp::instance()->mainWindow(), Qt::Sheet );
-#ifndef Q_WS_MAC
-            playlistSelectorDlg->setModal( true );
-#endif
-            connect( playlistSelectorDlg, SIGNAL( finished( int ) ), this, SLOT( dialogClosed( int ) ) );
-
-            playlistSelectorDlg->show();
-            break;
-        }
-        case SourcesModel::StationsCategory:
-            APP->mainWindow()->createStation();
-            break;
-    }
-}
-
-void
-CategoryAddItem::dialogClosed( int ret )
-{
-    PlaylistTypeSelectorDlg* playlistSelectorDlg = qobject_cast< PlaylistTypeSelectorDlg* >( sender() );
-    Q_ASSERT( playlistSelectorDlg );
-
-    QString playlistName = playlistSelectorDlg->playlistName();
-    if ( playlistName.isEmpty() )
-        playlistName = tr( "New Playlist" );
-
-    if ( !playlistSelectorDlg->playlistTypeIsAuto() && ret ) {
-
-        playlist_ptr playlist = Tomahawk::Playlist::create( SourceList::instance()->getLocal(), uuid(), playlistName, "", "", false, QList< query_ptr>() );
-        ViewManager::instance()->show( playlist );
-
-    } else if ( playlistSelectorDlg->playlistTypeIsAuto() && ret ) {
-       // create Auto Playlist
-       APP->mainWindow()->createAutomaticPlaylist( playlistName );
-    } else if ( !ret ) {
-        model()->viewPageActivated( ViewManager::instance()->currentPage() );
-    }
-    playlistSelectorDlg->deleteLater();
-}
-
-Qt::ItemFlags
-CategoryAddItem::flags() const
-{
-    switch ( m_categoryType )
-    {
-        case SourcesModel::PlaylistsCategory:
-            return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
-        case SourcesModel::StationsCategory:
-            return Qt::ItemIsEnabled | Qt::ItemIsDropEnabled;
-        default:
-            return Qt::ItemIsEnabled;
-            break;
-    }
-}
-
-
-QIcon
-CategoryAddItem::icon() const
-{
-    return m_icon;
-}
-
-
-bool
-CategoryAddItem::willAcceptDrag( const QMimeData* data ) const
-{
-    if ( ( m_categoryType == SourcesModel::PlaylistsCategory || m_categoryType == SourcesModel::StationsCategory ) && DropJob::acceptsMimeData( data ) )
-    {
-        return true;
-    }
-    return false;
-}
-
-SourceTreeItem::DropTypes
-CategoryAddItem::supportedDropTypes( const QMimeData* data ) const
-{
-    SourceTreeItem::DropTypes types = DropTypesNone;
-
-    if ( m_categoryType == SourcesModel::PlaylistsCategory )
-    {
-        if ( data->hasFormat( "application/tomahawk.query.list" ) )
-            return types | DropTypeThisTrack | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
-        else if ( data->hasFormat( "application/tomahawk.result.list" ) )
-            return types | DropTypeThisTrack | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
-        else if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
-            return types | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
-        else if ( data->hasFormat( "application/tomahawk.metadata.artist" ) )
-            return types | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
-    }
-
-    return types;
-}
-
-
-bool
-CategoryAddItem::dropMimeData( const QMimeData* data, Qt::DropAction )
-{
-    // As DropJob always converts dropped items to query_ptrs for all tracks we need to extract album/artist metadata ourselves for stations
-    if ( m_categoryType == SourcesModel::StationsCategory &&
-         ( data->hasFormat( "application/tomahawk.metadata.artist" ) || data->hasFormat( "application/tomahawk.metadata.album" ) ) )
-    {
-        QByteArray mimeData;
-        if ( data->hasFormat( "application/tomahawk.metadata.artist" ) )
-            mimeData = data->data( "application/tomahawk.metadata.artist" );
-        else if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
-            mimeData = data->data( "application/tomahawk.metadata.album" );
-
-        QDataStream stream( &mimeData, QIODevice::ReadOnly );
-
-        dynplaylist_ptr newpl = DynamicPlaylist::create( SourceList::instance()->getLocal(), uuid(), QString(), "", SourceList::instance()->getLocal()->friendlyName(), OnDemand, false );
-        newpl->setMode( OnDemand );
-
-        QString firstArtist;
-        // now we want to add each artist as a filter...
-        QList< dyncontrol_ptr > contrls;
-        while ( !stream.atEnd() )
-        {
-            QString artist;
-            stream >> artist;
-            if ( firstArtist.isEmpty() )
-                firstArtist = artist;
-
-            QString album;
-            if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
-                stream >> album; // throw away album title... we only create artists filters for now
-
-            dyncontrol_ptr c = newpl->generator()->createControl( "Artist" );
-            c->setInput( QString( "%1" ).arg( artist ) );
-            contrls << c;
-        }
-
-        QString name = firstArtist.isEmpty() ? tr( "New Station" ) : tr( "%1 Station" ).arg( firstArtist );
-        newpl->createNewRevision( uuid(), newpl->currentrevision(), newpl->type(), contrls );
-        newpl->setProperty( "newname", name );
-        connect( newpl.data(), SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ), this, SLOT( playlistToRenameLoaded() ) );
-
-        ViewManager::instance()->show( newpl );
-        return true;
-    }
-
-    // This could be needed once echonest supports filtering by album.
-    // If they never will, or if they do and this code still is not used, throw it away!
-    // If you enable this, make sure to remove the checks for album above.
-
-    /* if ( m_categoryType == SourcesModel::StationsCategory && data->hasFormat( "application/tomahawk.metadata.album" ) )
-    {
-        QByteArray mimeData = data->data( "application/tomahawk.metadata.album" );
-        QDataStream stream( &mimeData, QIODevice::ReadOnly );
-
-        dynplaylist_ptr newpl = DynamicPlaylist::create( SourceList::instance()->getLocal(), uuid(), QString(), "", SourceList::instance()->getLocal()->friendlyName(), OnDemand, false );
-        newpl->setMode( OnDemand );
-
-        QString firstAlbum;
-        // now we want to add each artist as a filter...
-        QList< dyncontrol_ptr > contrls;
-        while ( !stream.atEnd() )
-        {
-            QString artist;
-            stream >> artist;
-            QString album;
-            stream >> album;
-
-            if ( firstAlbum.isEmpty() )
-            {
-                firstAlbum = album;
-            }
-
-            dyncontrol_ptr c = newpl->generator()->createControl( "Album" );
-            c->setInput( QString( "%1" ).arg( artist ) );
-            contrls << c;
-        }
-
-        QString name = firstAlbum.isEmpty() ? tr( "New Station" ) : tr( "%1 Station" ).arg( firstAlbum );
-        newpl->rename( name );
-        newpl->createNewRevision( uuid(), newpl->currentrevision(), newpl->type(), contrls );
-
-        ViewManager::instance()->show( newpl );
-        // Give a shot to try to rename it. The playlist has to be created first. ugly.
-        QTimer::singleShot( 300, APP->mainWindow()->sourceTreeView(), SLOT( renamePlaylist() ) );
-        return true;
-
-    } */
-
-    // Create a new playlist seeded with these items
-    DropJob *dj = new DropJob();
-    if ( data->hasFormat( "application/tomahawk.dragsource.type" ) )
-        dj->setProperty( "dragsource", QString::fromUtf8( data->data( "application/tomahawk.dragsource.type" ) ) );
-
-    connect( dj, SIGNAL( tracks( QList< Tomahawk::query_ptr > ) ), this, SLOT( parsedDroppedTracks( QList< Tomahawk::query_ptr > ) ), Qt::QueuedConnection );
-    if ( dropType() == DropTypeAllFromArtist )
-        dj->setGetWholeArtists( true );
-    if ( dropType() == DropTypeThisAlbum )
-        dj->setGetWholeAlbums( true );
-
-    if ( dropType() == DropTypeLocalItems )
-    {
-        dj->setGetWholeArtists( true );
-        dj->tracksFromMimeData( data, false, true );
-    }
-    else if ( dropType() == DropTypeTop50 )
-    {
-        dj->setGetWholeArtists( true );
-        dj->tracksFromMimeData( data, false, false, true );
-    }
-    else
-        dj->tracksFromMimeData( data, false, false );
-
-    return true;
-}
-
-void
-CategoryAddItem::playlistToRenameLoaded()
-{
-    Playlist* pl = qobject_cast< Playlist* >( sender() );
-    Q_ASSERT( pl );
-
-    QString name = sender()->property( "newname" ).toString();
-    if ( !name.isEmpty() )
-        pl->rename( name );
-    else
-        QTimer::singleShot( 400, APP->mainWindow()->sourceTreeView(), SLOT( renamePlaylist() ) );
-
-    disconnect( pl, SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ), this, SLOT( playlistToRenameLoaded() ) );
-    disconnect( pl, SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistToRenameLoaded() ) );
-}
-
-
-void
-CategoryAddItem::parsedDroppedTracks( const QList< query_ptr >& tracks )
-{
-    if( m_categoryType == SourcesModel::PlaylistsCategory ) {
-
-        playlist_ptr newpl = Playlist::create( SourceList::instance()->getLocal(), uuid(), "New Playlist", "", SourceList::instance()->getLocal()->friendlyName(), false, tracks );
-        ViewManager::instance()->show( newpl );
-
-        connect( newpl.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistToRenameLoaded() ) );
-    } else if( m_categoryType == SourcesModel::StationsCategory ) {
-        // seed the playlist with these song or artist filters
-        QString name;
-        if ( sender() && sender()->property( "dragsource" ).toString() == "artist" )
-            name = tracks.isEmpty() ? tr( "New Station" ) : tr( "%1 Station" ).arg( ( tracks.first()->artist() ) );
-        else
-            name = tracks.isEmpty() ? tr( "New Station" ) : tr( "%1 Station" ).arg( tracks.first()->track() );
-
-        dynplaylist_ptr newpl = DynamicPlaylist::create( SourceList::instance()->getLocal(), uuid(), name, "", SourceList::instance()->getLocal()->friendlyName(), OnDemand, false );
-        newpl->setMode( OnDemand );
-
-        // now we want to add each query as a song or similar artist filter...
-        QList< dyncontrol_ptr > contrls;
-        if ( sender() && sender()->property( "dragsource" ).toString() == "artist" )
-        {
-            foreach( const Tomahawk::query_ptr& q, tracks ) {
-                dyncontrol_ptr c = newpl->generator()->createControl( "Artist" );
-                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistRadioType ) );
-                c->setInput( QString( "%1" ).arg( q->artist() ) );
-                contrls << c;
-            }
-        }
-        else
-        {
-            foreach( const Tomahawk::query_ptr& q, tracks ) {
-                dyncontrol_ptr c = newpl->generator()->createControl( "Song" );
-                c->setInput( QString( "%1 %2" ).arg( q->track() ).arg( q->artist() ) );
-                contrls << c;
-            }
-        }
-
-        newpl->createNewRevision( uuid(), newpl->currentrevision(), newpl->type(), contrls );
-
-        ViewManager::instance()->show( newpl );
-        connect( newpl.data(), SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ), this, SLOT( playlistToRenameLoaded() ) );
-    }
-}
-
-
-int
-CategoryAddItem::peerSortValue() const
-{
-    return INT_MAX; // after any siblings
-}
-
-
-/// CategoryItem
-
-CategoryItem::CategoryItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::CategoryType category, bool showAddItem )
-    : SourceTreeItem( model, parent, SourcesModel::Category )
-    , m_category( category )
-    , m_addItem( 0 )
-    , m_showAdd( showAddItem )
-{
-    // in the constructor we're still being added to the parent, so we don't exist to have rows addded yet. so this is safe.
-    //     beginRowsAdded( 0, 0 );
-    if( m_showAdd ) {
-        m_addItem = new CategoryAddItem( model, this, m_category );
-    }
-    //     endRowsAdded();
-}
-
-
-void
-CategoryItem::insertItem( SourceTreeItem* item )
-{
-    insertItems( QList< SourceTreeItem* >() << item );
-}
-
-
-void
-CategoryItem::insertItems( QList< SourceTreeItem* > items )
-{
-    // add the items to the category, and connect to the signals
-    int curCount = children().size();
-    if( m_showAdd ) // if there's an add item, add it before that
-        curCount--;
-    beginRowsAdded( curCount, curCount + items.size() - 1 );
-    foreach( SourceTreeItem* item, items ) {
-        insertChild( children().count() - 1, item );
-    }
-    endRowsAdded();
-}
-
-
-int
-CategoryItem::peerSortValue() const
-{
-    if( m_category == SourcesModel::PlaylistsCategory )
-        return -100;
-    else if( m_category == SourcesModel::StationsCategory )
-        return 100;
-    else
-        return 0;
-}
-
-
-void
-CategoryItem::activate()
-{
-    emit toggleExpandRequest( this );
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/categoryitems.h Deleted

@@ -1,86 +0,0 @@
-/*
- *  Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *  This program 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 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef CATEGORY_ITEM_H
-#define CATEGORY_ITEM_H
-
-#include "sourcetreeitem.h"
-
-class CategoryAddItem : public SourceTreeItem
-{
-    Q_OBJECT
-public:
-    CategoryAddItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::CategoryType type );
-    ~CategoryAddItem();
-
-    virtual Qt::ItemFlags flags() const;
-    virtual QString text() const;
-    virtual void activate();
-    virtual QIcon icon() const;
-    virtual int peerSortValue() const;
-
-    virtual bool willAcceptDrag(const QMimeData* data) const;
-    virtual DropTypes supportedDropTypes(const QMimeData* data) const;
-    virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action);
-
-private slots:
-    void parsedDroppedTracks( const QList< Tomahawk::query_ptr >& tracks );
-    void dialogClosed( int ret );
-
-    // Do the rename only after the revision is loaded
-    void playlistToRenameLoaded();
-private:
-    SourcesModel::CategoryType m_categoryType;
-    QIcon m_icon;
-
-};
-
-class CategoryItem : public SourceTreeItem
-{
-    Q_OBJECT
-public:
-    CategoryItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::CategoryType category, bool showAddItem );
-
-    virtual QString text() const {
-        switch( m_category )
-        {
-            case SourcesModel::PlaylistsCategory:
-                return tr( "Playlists" );
-            case SourcesModel::StationsCategory:
-                return tr( "Stations" );
-        }
-        return QString();
-    }
-    virtual void activate();
-    virtual int peerSortValue() const;
-    virtual Qt::ItemFlags flags() const { return Qt::ItemIsEnabled; }
-
-    // inserts an item at the end, but before the category add item
-    void insertItem( SourceTreeItem* item );
-    void insertItems( QList< SourceTreeItem* > item );
-
-    SourcesModel::CategoryType categoryType() { return m_category; }
-
-private:
-    SourcesModel::CategoryType m_category;
-    CategoryAddItem* m_addItem;
-    bool m_showAdd;
-};
-
-
-#endif

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/genericpageitems.cpp Deleted

@@ -1,92 +0,0 @@
-/*
- *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *    This program 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 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "genericpageitems.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "viewmanager.h"
-#include "audio/audioengine.h"
-
-using namespace Tomahawk;
-
-
-/// Generic page item
-GenericPageItem::GenericPageItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, const QIcon& icon, boost::function< ViewPage* () > show, boost::function< ViewPage* () > get )
-    : SourceTreeItem( model, parent, SourcesModel::GenericPage )
-    , m_icon( icon )
-    , m_text( text )
-    , m_sortValue( 0 )
-    , m_show( show )
-    , m_get( get )
-{
-    if( ViewPage* p = m_get() )
-        model->linkSourceItemToPage( this, p );
-}
-
-
-GenericPageItem::~GenericPageItem()
-{
-}
-
-
-void
-GenericPageItem::activate()
-{
-    ViewPage* p = m_show();
-    model()->linkSourceItemToPage( this, p );
-}
-
-
-QString
-GenericPageItem::text() const
-{
-    return m_text;
-}
-
-
-QIcon
-GenericPageItem::icon() const
-{
-    return m_icon;
-}
-
-
-bool
-GenericPageItem::willAcceptDrag(const QMimeData* data) const
-{
-    Q_UNUSED( data );
-    return false;
-}
-
-
-void
-GenericPageItem::setText( const QString &text )
-{
-    m_text = text;
-    emit updated();
-}
-
-bool
-GenericPageItem::isBeingPlayed() const
-{
-    if ( m_get() )
-        return m_get()->isBeingPlayed();
-
-    return false;
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/genericpageitems.h Deleted

@@ -1,57 +0,0 @@
-/*
- *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *    This program 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 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef GENERIC_PAGE_ITEM_H
-#define GENERIC_PAGE_ITEM_H
-
-#include "sourcetreeitem.h"
-
-#include "boost/function.hpp"
-#include "boost/bind.hpp"
-
-// generic item that has some name, some text, and calls a certain slot when activated. badabing!
-class GenericPageItem : public SourceTreeItem
-{
-    Q_OBJECT
-public:
-    // takes 2 function pointers: show: called when wanting to show the desired view page. get: called to get the view page from ViewManager if it exists
-    GenericPageItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, const QIcon& icon, boost::function<Tomahawk::ViewPage*()> show, boost::function<Tomahawk::ViewPage*()> get );
-    virtual ~GenericPageItem();
-
-    virtual QString text() const;
-    virtual void activate();
-    virtual bool willAcceptDrag( const QMimeData* data ) const;
-    virtual QIcon icon() const;
-    virtual int peerSortValue() const { return m_sortValue; } // How to sort relative to peers in the tree.
-    virtual bool isBeingPlayed() const;
-
-    void setText( const QString& text );
-    void setSortValue( int value ) { m_sortValue = value; }
-
-signals:
-    void activated();
-
-private:
-    QIcon m_icon;
-    QString m_text;
-    int m_sortValue;
-    boost::function< Tomahawk::ViewPage*() > m_show;
-    boost::function< Tomahawk::ViewPage*() > m_get;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/groupitem.cpp Deleted

@@ -1,73 +0,0 @@
-/* === 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
- *   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 "groupitem.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "viewmanager.h"
-#include "audio/audioengine.h"
-
-using namespace Tomahawk;
-
-
-GroupItem::GroupItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, int peerSortValue )
-    : SourceTreeItem( model, parent, SourcesModel::Group, peerSortValue )
-    , m_text( text )
-    , m_defaultExpanded( true )
-{
-}
-
-
-GroupItem::~GroupItem()
-{
-}
-
-
-void
-GroupItem::activate()
-{
-    emit toggleExpandRequest( this );
-}
-
-
-void
-GroupItem::requestExpanding()
-{
-    emit expandRequest( this );
-}
-
-
-void
-GroupItem::checkExpandedState()
-{
-    if ( m_defaultExpanded )
-    {
-        // only default expand once
-        m_defaultExpanded = false;
-        requestExpanding();
-    }
-}
-
-
-QString
-GroupItem::text() const
-{
-    return m_text;
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/groupitem.h Deleted

@@ -1,58 +0,0 @@
-/* === 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
- *   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 GROUP_ITEM_H
-#define GROUP_ITEM_H
-
-#include "sourcetreeitem.h"
-
-#include "boost/function.hpp"
-#include "boost/bind.hpp"
-
-class GroupItem : public SourceTreeItem
-{
-    Q_OBJECT
-public:
-    // takes 2 function pointers: show: called when wanting to show the desired view page. get: called to get the view page from ViewManager if it exists
-    GroupItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, int peerSortValue = 0 );
-    virtual ~GroupItem();
-
-    virtual QString text() const;
-    virtual bool willAcceptDrag( const QMimeData* data ) const { Q_UNUSED( data ); return false; }
-    virtual QIcon icon() const { return QIcon(); }
-    virtual bool isBeingPlayed() const { return false; }
-
-    void checkExpandedState();
-    void setDefaultExpanded( bool b ) { m_defaultExpanded = b; }
-
-public slots:
-    virtual void activate();
-
-signals:
-    void activated();
-
-private slots:
-    void requestExpanding();
-
-private:
-    QString m_text;
-    bool m_defaultExpanded;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/historyitem.cpp Deleted

@@ -1,88 +0,0 @@
-/* === 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
- *   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 "historyitem.h"
-
-#include "viewmanager.h"
-#include "genericpageitems.h"
-#include "utils/tomahawkutilsgui.h"
-#include "utils/logger.h"
-#include "playlist/customplaylistview.h"
-#include "temporarypageitem.h"
-#include "sourcelist.h"
-
-using namespace Tomahawk;
-
-
-HistoryItem::HistoryItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, int peerSortValue )
-    : GroupItem( model, parent, text, peerSortValue )
-{
-    connect( ViewManager::instance(), SIGNAL( tempPageActivated( Tomahawk::ViewPage* ) ), SLOT( tempPageActivated( Tomahawk::ViewPage* ) ) );
-}
-
-
-HistoryItem::~HistoryItem()
-{
-}
-
-
-void
-HistoryItem::tempPageActivated( Tomahawk::ViewPage* v )
-{
-    const int idx = children().count();
-    int latest = idx;
-    if ( idx )
-    {
-        latest = children().last()->IDValue();
-
-        foreach ( TemporaryPageItem* page, m_tempItems )
-        {
-            if ( page->page() == v )
-            {
-                emit selectRequest( page );
-                return;
-            }
-        }
-    }
-
-    // Only keep 5 temporary pages at once
-    while ( m_tempItems.size() > 4 )
-    {
-        TemporaryPageItem* item = m_tempItems.takeFirst();
-        QTimer::singleShot( 0, item, SLOT( removeFromList() ) );
-    }
-
-    emit beginRowsAdded( idx, idx );
-
-    TemporaryPageItem* tempPage = new TemporaryPageItem( model(), this, v, latest + 1 );
-    connect( tempPage, SIGNAL( removed() ), this, SLOT( temporaryPageDestroyed() ) );
-    m_tempItems << tempPage;
-    endRowsAdded();
-
-    emit selectRequest( tempPage );
-}
-
-
-void
-HistoryItem::temporaryPageDestroyed()
-{
-    TemporaryPageItem* tempPage = qobject_cast< TemporaryPageItem* >( sender() );
-    Q_ASSERT( tempPage );
-    m_tempItems.removeAll( tempPage );
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/historyitem.h Deleted

@@ -1,51 +0,0 @@
-/* === 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
- *   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 HISTORY_ITEM_H
-#define HISTORY_ITEM_H
-
-#include "groupitem.h"
-
-class TemporaryPageItem;
-class GenericPageItem;
-class CategoryItem;
-
-namespace Tomahawk
-{
-    class ViewPage;
-}
-
-class HistoryItem : public GroupItem
-{
-    Q_OBJECT
-public:
-    HistoryItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, int peerSortValue = 0 );
-    virtual ~HistoryItem();
-
-private slots:
-    void tempPageActivated( Tomahawk::ViewPage* );
-    void temporaryPageDestroyed();
-
-private:
-    QList< TemporaryPageItem* > m_tempItems;
-
-private:
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/playlistitems.cpp Deleted

@@ -1,450 +0,0 @@
-/*
- *
- *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *    This program 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 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "playlistitems.h"
-
-#include <QMimeData>
-
-#include "query.h"
-#include "viewmanager.h"
-#include "playlist/dynamic/GeneratorInterface.h"
-#include "playlist/playlistview.h"
-#include "categoryitems.h"
-#include "sourceitem.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "dropjob.h"
-#include "source.h"
-#include "audio/audioengine.h"
-
-using namespace Tomahawk;
-
-
-PlaylistItem::PlaylistItem( SourcesModel* mdl, SourceTreeItem* parent, const playlist_ptr& pl, int index )
-    : SourceTreeItem( mdl, parent, SourcesModel::StaticPlaylist, index )
-    , m_loaded( false )
-    , m_playlist( pl )
-{
-    connect( pl.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ),
-             SLOT( onPlaylistLoaded( Tomahawk::PlaylistRevision ) ), Qt::QueuedConnection );
-    connect( pl.data(), SIGNAL( changed() ),
-             SIGNAL( updated() ), Qt::QueuedConnection );
-
-    m_icon = QIcon( RESPATH "images/playlist-icon.png" );
-
-    if( ViewManager::instance()->pageForPlaylist( pl ) )
-        model()->linkSourceItemToPage( this, ViewManager::instance()->pageForPlaylist( pl ) );
-}
-
-
-QString
-PlaylistItem::text() const
-{
-    return m_playlist->title();
-}
-
-
-Tomahawk::playlist_ptr
-PlaylistItem::playlist() const
-{
-    return m_playlist;
-}
-
-
-void
-PlaylistItem::onPlaylistLoaded( Tomahawk::PlaylistRevision revision )
-{
-    Q_UNUSED( revision );
-
-    m_loaded = true;
-    emit updated();
-}
-
-
-void
-PlaylistItem::onPlaylistChanged()
-{
-    emit updated();
-}
-
-
-int
-PlaylistItem::peerSortValue() const
-{
-//    return m_playlist->createdOn();
-    return 0;
-}
-
-
-int
-PlaylistItem::IDValue() const
-{
-    return m_playlist->createdOn();
-}
-
-bool
-PlaylistItem::isBeingPlayed() const
-{
-    if ( ViewManager::instance()->pageForPlaylist( m_playlist ) )
-        return AudioEngine::instance()->currentTrackPlaylist() == ViewManager::instance()->pageForPlaylist( m_playlist )->playlistInterface();
-    return false;
-}
-
-
-Qt::ItemFlags
-PlaylistItem::flags() const
-{
-    Qt::ItemFlags flags = SourceTreeItem::flags();
-    flags |= Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
-
-    if ( !m_loaded )
-        flags &= !Qt::ItemIsEnabled;
-    if ( playlist()->author()->isLocal() )
-        flags |= Qt::ItemIsEditable;
-
-    if ( playlist()->busy() )
-    {
-        flags &= !Qt::ItemIsEnabled;
-        flags &= !Qt::ItemIsEditable;
-        flags &= !Qt::ItemIsDropEnabled;
-    }
-
-    return flags;
-}
-
-
-void
-PlaylistItem::activate()
-{
-    ViewPage* p = ViewManager::instance()->show( m_playlist );
-    model()->linkSourceItemToPage( this, p );
-}
-
-
-void
-PlaylistItem::doubleClicked()
-{
-    ViewPage* p = ViewManager::instance()->currentPage();
-    if ( PlaylistView* view = dynamic_cast< PlaylistView* >( p ) )
-    {
-        view->startPlayingFromStart();
-    }
-}
-
-
-void
-PlaylistItem::setLoaded( bool loaded )
-{
-    m_loaded = loaded;
-}
-
-
-bool
-PlaylistItem::willAcceptDrag( const QMimeData* data ) const
-{
-    Q_UNUSED( data );
-    return !m_playlist.isNull() && m_playlist->author()->isLocal() && DropJob::acceptsMimeData( data, DropJob::Track ) && !m_playlist->busy();
-}
-
-PlaylistItem::DropTypes
-PlaylistItem::supportedDropTypes( const QMimeData* data ) const
-{
-    if ( data->hasFormat( "application/tomahawk.query.list" ) )
-        return DropTypeThisTrack | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
-    else if ( data->hasFormat( "application/tomahawk.result.list" ) )
-        return DropTypeThisTrack | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
-    else if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
-        return DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
-    else if ( data->hasFormat( "application/tomahawk.metadata.artist" ) )
-        return DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
-    else if ( data->hasFormat( "application/tomahawk.mixed" ) )
-    {
-        return DropTypesNone;
-    }
-    else if ( data->hasFormat( "text/plain" ) )
-    {
-        return DropTypesNone;
-    }
-    return DropTypesNone;
-}
-
-
-bool
-PlaylistItem::dropMimeData( const QMimeData* data, Qt::DropAction action )
-{
-    Q_UNUSED( action );
-
-    if ( m_playlist->busy() )
-        return false;
-
-    QList< Tomahawk::query_ptr > queries;
-
-    if ( data->hasFormat( "application/tomahawk.playlist.id" ) &&
-        data->data( "application/tomahawk.playlist.id" ) == m_playlist->guid() )
-        return false; // don't allow dropping on ourselves
-
-    if ( !DropJob::acceptsMimeData( data, DropJob::Track ) )
-        return false;
-
-    DropJob *dj = new DropJob();
-    dj->setDropTypes( DropJob::Track );
-    dj->setDropAction( DropJob::Append );
-
-    connect( dj, SIGNAL( tracks( QList< Tomahawk::query_ptr > ) ), this, SLOT( parsedDroppedTracks( QList< Tomahawk::query_ptr > ) ) );
-
-    if ( dropType() == DropTypeAllFromArtist )
-        dj->setGetWholeArtists( true );
-    if ( dropType() == DropTypeThisAlbum )
-        dj->setGetWholeAlbums( true );
-
-    if ( dropType() == DropTypeLocalItems )
-    {
-        dj->setGetWholeArtists( true );
-        dj->tracksFromMimeData( data, false, true );
-    }
-    else if ( dropType() == DropTypeTop50 )
-    {
-        dj->setGetWholeArtists( true );
-        dj->tracksFromMimeData( data, false, false, true );
-    }
-    else
-        dj->tracksFromMimeData( data, false, false );
-
-    // TODO can't know if it works or not yet...
-    return true;
-}
-
-
-void
-PlaylistItem::parsedDroppedTracks( const QList< query_ptr >& tracks )
-{
-    qDebug() << "adding" << tracks.count() << "tracks";
-    if ( tracks.count() && !m_playlist.isNull() && m_playlist->author()->isLocal() )
-    {
-        qDebug() << "on playlist:" << m_playlist->title() << m_playlist->guid() << m_playlist->currentrevision();
-
-        m_playlist->addEntries( tracks, m_playlist->currentrevision() );
-    }
-}
-
-
-QIcon
-PlaylistItem::icon() const
-{
-    return m_icon;
-}
-
-
-bool
-PlaylistItem::setData( const QVariant& v, bool role )
-{
-    Q_UNUSED( role );
-
-    if ( m_playlist->author()->isLocal() )
-    {
-        m_playlist->rename( v.toString() );
-
-        return true;
-    }
-    return false;
-}
-
-SourceTreeItem*
-PlaylistItem::activateCurrent()
-{
-    if( ViewManager::instance()->pageForPlaylist( m_playlist ) == ViewManager::instance()->currentPage() )
-    {
-        model()->linkSourceItemToPage( this, ViewManager::instance()->currentPage() );
-        emit selectRequest( this );
-
-        return this;
-    }
-
-    return 0;
-}
-
-
-DynamicPlaylistItem::DynamicPlaylistItem( SourcesModel* mdl, SourceTreeItem* parent, const dynplaylist_ptr& pl, int index )
-    : PlaylistItem( mdl, parent, pl.staticCast< Playlist >(), index )
-    , m_dynplaylist( pl )
-{
-    setRowType( m_dynplaylist->mode() == Static ? SourcesModel::AutomaticPlaylist : SourcesModel::Station );
-
-    connect( pl.data(), SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ),
-             SLOT( onDynamicPlaylistLoaded( Tomahawk::DynamicPlaylistRevision ) ), Qt::QueuedConnection );
-
-    m_stationIcon = QIcon( RESPATH "images/station.png" );
-    m_automaticPlaylistIcon = QIcon( RESPATH "images/automatic-playlist.png" );
-
-    if( ViewManager::instance()->pageForDynPlaylist( pl ) )
-        model()->linkSourceItemToPage( this, ViewManager::instance()->pageForDynPlaylist( pl ) );
-}
-
-
-DynamicPlaylistItem::~DynamicPlaylistItem()
-{
-}
-
-
-void
-DynamicPlaylistItem::activate()
-{
-    ViewPage* p = ViewManager::instance()->show( m_dynplaylist );
-    model()->linkSourceItemToPage( this, p );
-}
-
-
-void
-DynamicPlaylistItem::onDynamicPlaylistLoaded( DynamicPlaylistRevision revision )
-{
-    setLoaded( true );
-    checkReparentHackNeeded( revision );
-    // END HACK
-    emit updated();
-}
-
-
-int
-DynamicPlaylistItem::peerSortValue() const
-{
-//    return m_dynplaylist->createdOn();
-    return 0;
-}
-
-
-int
-DynamicPlaylistItem::IDValue() const
-{
-    return m_dynplaylist->createdOn();
-}
-
-
-void
-DynamicPlaylistItem::checkReparentHackNeeded( const DynamicPlaylistRevision& revision )
-{
-    // HACK HACK HACK  workaround for an ugly hack where we have to be compatible with older tomahawks (pre-0.1.0) that created dynplaylists as OnDemand then changed them to Static if they were static.
-    //  we need to reparent this playlist to the correct category :-/.
-    CategoryItem* cat = qobject_cast< CategoryItem* >( parent() );
-
-//    qDebug() << "with category" << cat;
-//    if( cat ) qDebug() << "and cat type:" << cat->categoryType();
-    if( cat )
-    {
-        CategoryItem* from = cat;
-        CategoryItem* to = 0;
-        if( cat->categoryType() == SourcesModel::PlaylistsCategory && revision.mode == OnDemand ) { // WRONG
-            SourceItem* col = qobject_cast< SourceItem* >( cat->parent() );
-            to = col->stationsCategory();
-            if( !to ) { // you have got to be fucking kidding me
-                int fme = col->children().count();
-                col->beginRowsAdded( fme, fme );
-                to = new CategoryItem( model(), col, SourcesModel::StationsCategory, false );
-                col->appendChild( to ); // we f'ing know it's not local b/c we're not getting into this mess ourselves
-                col->endRowsAdded();
-                col->setStationsCategory( to );
-            }
-        } else if( cat->categoryType() == SourcesModel::StationsCategory && revision.mode == Static ) { // WRONG
-            SourceItem* col = qobject_cast< SourceItem* >( cat->parent() );
-            to = col->playlistsCategory();
-//            qDebug() << "TRYING TO HACK TO:" << to;
-            if( !to ) { // you have got to be fucking kidding me
-                int fme = col->children().count();
-                col->beginRowsAdded( fme, fme );
-                to = new CategoryItem( model(), col, SourcesModel::PlaylistsCategory, false );
-                col->appendChild( to ); // we f'ing know it's not local b/c we're not getting into this mess ourselves
-                col->endRowsAdded();
-                col->setPlaylistsCategory( to );
-            }
-        }
-        if( to ) {
-//            qDebug() << "HACKING! moving dynamic playlist from" << from->text() << "to:" << to->text();
-            // remove and add
-            int idx = from->children().indexOf( this );
-            from->beginRowsRemoved( idx, idx );
-            from->removeChild( this );
-            from->endRowsRemoved();
-
-            idx = to->children().count();
-            to->beginRowsAdded( idx, idx );
-            to->appendChild( this );
-            to->endRowsAdded();
-
-            setParentItem( to );
-        }
-    }
-}
-
-
-dynplaylist_ptr
-DynamicPlaylistItem::dynPlaylist() const
-{
-    return m_dynplaylist;
-}
-
-
-QString
-DynamicPlaylistItem::text() const
-{
-    return m_dynplaylist->title();
-}
-
-
-bool
-DynamicPlaylistItem::willAcceptDrag( const QMimeData* data ) const
-{
-    Q_UNUSED( data );
-    return false;
-}
-
-
-QIcon
-DynamicPlaylistItem::icon() const
-{
-    if ( m_dynplaylist->mode() == OnDemand )
-    {
-        return m_stationIcon;
-    }
-    else
-    {
-        return m_automaticPlaylistIcon;
-    }
-}
-
-SourceTreeItem*
-DynamicPlaylistItem::activateCurrent()
-{
-    if( ViewManager::instance()->pageForDynPlaylist( m_dynplaylist ) == ViewManager::instance()->currentPage() )
-    {
-        model()->linkSourceItemToPage( this, ViewManager::instance()->currentPage() );
-        emit selectRequest( this );
-
-        return this;
-    }
-
-    return 0;
-}
-
-bool
-DynamicPlaylistItem::isBeingPlayed() const
-{
-    if ( ViewManager::instance()->pageForDynPlaylist( m_dynplaylist ) )
-        return AudioEngine::instance()->currentTrackPlaylist() == ViewManager::instance()->pageForDynPlaylist( m_dynplaylist )->playlistInterface();
-    return false;
-}
-

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/playlistitems.h Deleted

@@ -1,96 +0,0 @@
-/*
- *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *    This program 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 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef PLAYLIST_ITEM_H
-#define PLAYLIST_ITEM_H
-
-#include "sourcetreeitem.h"
-#include "playlist/dynamic/DynamicPlaylist.h"
-
-class PlaylistItem : public SourceTreeItem
-{
-    Q_OBJECT
-public:
-    PlaylistItem( SourcesModel* model, SourceTreeItem* parent, const Tomahawk::playlist_ptr& pl, int index = -1 );
-
-    virtual QString text() const;
-    virtual Tomahawk::playlist_ptr playlist() const;
-    virtual Qt::ItemFlags flags() const;
-    virtual bool willAcceptDrag( const QMimeData* data ) const;
-    virtual DropTypes supportedDropTypes( const QMimeData* data ) const;
-    virtual bool dropMimeData( const QMimeData* data, Qt::DropAction action );
-    virtual QIcon icon() const;
-    virtual bool setData(const QVariant& v, bool role);
-    virtual int peerSortValue() const;
-    virtual int IDValue() const;
-    virtual bool isBeingPlayed() const;
-
-    virtual SourceTreeItem* activateCurrent();
-
-public slots:
-    virtual void activate();
-    virtual void doubleClicked();
-
-protected:
-    void setLoaded( bool loaded );
-
-private slots:
-    void onPlaylistLoaded( Tomahawk::PlaylistRevision revision );
-    void onPlaylistChanged();
-    void parsedDroppedTracks( const QList<Tomahawk::query_ptr>& tracks );
-
-private:
-    bool m_loaded;
-    Tomahawk::playlist_ptr m_playlist;
-    QIcon m_icon;
-};
-Q_DECLARE_OPERATORS_FOR_FLAGS(PlaylistItem::DropTypes)
-
-// can be a station or an auto playlist
-class DynamicPlaylistItem : public PlaylistItem
-{
-    Q_OBJECT
-public:
-    DynamicPlaylistItem( SourcesModel* model, SourceTreeItem* parent, const Tomahawk::dynplaylist_ptr& pl, int index = -1 );
-    virtual ~DynamicPlaylistItem();
-
-    virtual QString text() const;
-    Tomahawk::dynplaylist_ptr dynPlaylist() const;
-    virtual bool willAcceptDrag( const QMimeData* data ) const;
-    virtual void activate();
-    virtual int peerSortValue() const;
-    virtual int IDValue() const;
-    virtual QIcon icon() const;
-
-    virtual SourceTreeItem* activateCurrent();
-    virtual bool isBeingPlayed() const;
-
-private slots:
-    void onDynamicPlaylistLoaded( Tomahawk::DynamicPlaylistRevision revision );
-
-private:
-    void checkReparentHackNeeded( const Tomahawk::DynamicPlaylistRevision& rev );
-
-    Tomahawk::dynplaylist_ptr m_dynplaylist;
-
-    QIcon m_stationIcon;
-    QIcon m_automaticPlaylistIcon;
-};
-
-
-#endif

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/sourceitem.cpp Deleted

@@ -1,500 +0,0 @@
-/*
- *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *    This program 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 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "sourceitem.h"
-
-#include "categoryitems.h"
-#include "playlistitems.h"
-#include "viewmanager.h"
-#include "playlist.h"
-#include "genericpageitems.h"
-#include "utils/tomahawkutilsgui.h"
-#include "utils/logger.h"
-#include "widgets/SocialPlaylistWidget.h"
-#include "playlist/customplaylistview.h"
-#include "source.h"
-#include "sourcelist.h"
-
-/// SourceItem
-
-using namespace Tomahawk;
-
-SourceItem::SourceItem( SourcesModel* mdl, SourceTreeItem* parent, const Tomahawk::source_ptr& source )
-    : SourceTreeItem( mdl, parent, SourcesModel::Collection )
-    , m_source( source )
-    , m_playlists( 0 )
-    , m_stations( 0 )
-    , m_latchedOn( false )
-    , m_sourceInfoItem( 0   )
-    , m_coolPlaylistsItem( 0 )
-    , m_collectionPage( 0 )
-    , m_sourceInfoPage( 0 )
-    , m_coolPlaylistsPage( 0 )
-    , m_lovedTracksPage( 0 )
-    , m_whatsHotPage( 0 )
-{
-    if ( m_source.isNull() )
-    {
-        m_superCol = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/supercollection.png" ) );
-        return;
-    }
-
-    m_lovedTracksItem = new GenericPageItem( model(), this, tr( "Loved Tracks" ), QIcon( RESPATH "images/loved_playlist.png" ),
-                                             boost::bind( &SourceItem::lovedTracksClicked, this ),
-                                             boost::bind( &SourceItem::getLovedTracksPage, this ) );
-    m_lovedTracksItem->setSortValue( -250 );
-
-    m_collectionItem = new GenericPageItem( model(), this, tr( "Collection" ), QIcon( RESPATH "images/drop-song.png" ), //FIXME different icon
-                                            boost::bind( &SourceItem::collectionClicked, this ),
-                                            boost::bind( &SourceItem::getCollectionPage, this ) );
-    m_collectionItem->setSortValue( -350 );
-
-    m_sourceInfoItem = new GenericPageItem( model(), this, tr( "New Additions" ), QIcon( RESPATH "images/new-additions.png" ),
-                                            boost::bind( &SourceItem::sourceInfoClicked, this ),
-                                            boost::bind( &SourceItem::getSourceInfoPage, this ) );
-    m_sourceInfoItem->setSortValue( -300 );
-
-    // create category items if there are playlists to show, or stations to show
-    QList< playlist_ptr > playlists = source->collection()->playlists();
-    QList< dynplaylist_ptr > autoplaylists = source->collection()->autoPlaylists();
-    QList< dynplaylist_ptr > stations = source->collection()->stations();
-
-    if ( !playlists.isEmpty() || !autoplaylists.isEmpty() || source->isLocal() )
-    {
-        m_playlists = new CategoryItem( model(), this, SourcesModel::PlaylistsCategory, source->isLocal() );
-        onPlaylistsAdded( playlists );
-        onAutoPlaylistsAdded( autoplaylists );
-    }
-    if ( !stations.isEmpty() || source->isLocal() )
-    {
-        m_stations = new CategoryItem( model(), this, SourcesModel::StationsCategory, source->isLocal() );
-        onStationsAdded( stations );
-    }
-
-    if( ViewManager::instance()->pageForCollection( source->collection() ) )
-        model()->linkSourceItemToPage( this, ViewManager::instance()->pageForCollection( source->collection() ) );
-
-    m_defaultAvatar = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/user-avatar.png" ) );
-
-    // load auto playlists and stations!
-
-    connect( source.data(), SIGNAL( stats( QVariantMap ) ), SIGNAL( updated() ) );
-    connect( source.data(), SIGNAL( syncedWithDatabase() ), SIGNAL( updated() ) );
-    connect( source.data(), SIGNAL( playbackStarted( Tomahawk::query_ptr ) ), SIGNAL( updated() ) );
-    connect( source.data(), SIGNAL( stateChanged() ), SIGNAL( updated() ) );
-    connect( source.data(), SIGNAL( offline() ), SIGNAL( updated() ) );
-    connect( source.data(), SIGNAL( online() ), SIGNAL( updated() ) );
-    connect( SourceList::instance(), SIGNAL( sourceLatchedOn( Tomahawk::source_ptr, Tomahawk::source_ptr ) ), SLOT( latchedOn( Tomahawk::source_ptr, Tomahawk::source_ptr ) ) );
-    connect( SourceList::instance(), SIGNAL( sourceLatchedOff( Tomahawk::source_ptr, Tomahawk::source_ptr ) ), SLOT( latchedOff( Tomahawk::source_ptr, Tomahawk::source_ptr ) ) );
-
-    connect( source->collection().data(), SIGNAL( playlistsAdded( QList<Tomahawk::playlist_ptr> ) ),
-             SLOT( onPlaylistsAdded( QList<Tomahawk::playlist_ptr> ) ), Qt::QueuedConnection );
-    connect( source->collection().data(), SIGNAL( autoPlaylistsAdded( QList< Tomahawk::dynplaylist_ptr > ) ),
-             SLOT( onAutoPlaylistsAdded( QList<Tomahawk::dynplaylist_ptr> ) ), Qt::QueuedConnection );
-    connect( source->collection().data(), SIGNAL( stationsAdded( QList<Tomahawk::dynplaylist_ptr> ) ),
-             SLOT( onStationsAdded( QList<Tomahawk::dynplaylist_ptr> ) ), Qt::QueuedConnection );
-    
-    if ( m_source->isLocal() )
-        QTimer::singleShot( 0, this, SLOT( requestExpanding() ) );
-}
-
-
-Tomahawk::source_ptr
-SourceItem::source() const
-{
-    return m_source;
-}
-
-
-QString
-SourceItem::text() const
-{
-    return m_source.isNull() ? tr( "SuperCollection" ) : m_source->friendlyName();
-}
-
-
-int
-SourceItem::IDValue() const
-{
-    if ( m_source.isNull() )
-        return -1;
-    if ( m_source->isLocal() )
-        return 0;
-
-    return m_source->id();
-}
-
-
-int
-SourceItem::peerSortValue() const
-{
-    if ( m_source.isNull() || m_source->isLocal() )
-        return -1;
-
-    return 1;
-}
-
-
-void
-SourceItem::activate()
-{
-    ViewPage* p = 0;
-    if ( source().isNull() )
-        p = ViewManager::instance()->showSuperCollection();
-    else
-        emit toggleExpandRequest( this );
-
-    model()->linkSourceItemToPage( this, p );
-}
-
-
-QIcon
-SourceItem::icon() const
-{
-    if ( m_source.isNull() )
-       return m_superCol;
-    else
-    {
-        if ( m_source->avatar().isNull() )
-            return m_defaultAvatar;
-        else
-            return m_source->avatar( Source::FancyStyle );
-    }
-}
-
-
-bool
-SourceItem::localLatchedOn() const
-{
-    // Don't show a listen icon if this is the local collection and we are latched on to someone who went offline
-    // we are technically still latched on (if they come back online we'll be still listening along) but it's not visible
-    // in the UI and confusing to the user why the red headphones are still there
-
-    if ( !m_source.isNull() && m_source->isLocal() &&
-         !m_latchedOnTo.isNull() && !m_latchedOnTo->isOnline() )
-        return false;
-
-    return m_latchedOn;
-}
-
-
-Tomahawk::PlaylistInterface::LatchMode
-SourceItem::localLatchMode() const
-{
-    if ( !m_source.isNull() && !m_source->isLocal() )
-        return m_source->playlistInterface()->latchMode();
-
-    return Tomahawk::PlaylistInterface::StayOnSong;
-}
-
-
-void
-SourceItem::latchedOff( const source_ptr& from, const source_ptr& to )
-{
-    if ( from->isLocal() && ( m_source == to || m_source == from ) )
-    {
-        m_latchedOn = false;
-        disconnect( m_latchedOnTo->playlistInterface().data(), SIGNAL( latchModeChanged( Tomahawk::PlaylistInterface::LatchMode ) ) );
-        m_latchedOnTo.clear();
-        emit updated();
-    }
-}
-
-
-void
-SourceItem::latchedOn( const source_ptr& from, const source_ptr& to )
-{
-    if ( from->isLocal() && ( m_source == to || m_source == from ) )
-    {
-        m_latchedOn = true;
-        m_latchedOnTo = to;
-        connect( m_latchedOnTo->playlistInterface().data(), SIGNAL( latchModeChanged( Tomahawk::PlaylistInterface::LatchMode ) ), SLOT( latchModeChanged( Tomahawk::PlaylistInterface::LatchMode ) ) );
-        emit updated();
-    }
-}
-
-
-void
-SourceItem::latchModeChanged( Tomahawk::PlaylistInterface::LatchMode mode )
-{
-    Q_UNUSED( mode );
-    emit updated();
-}
-
-
-void
-SourceItem::playlistsAddedInternal( SourceTreeItem* parent, const QList< dynplaylist_ptr >& playlists )
-{
-    QList< SourceTreeItem* > items;
-    int addOffset = playlists.first()->author()->isLocal() ? 1 : 0;
-
-    int from = parent->children().count() - addOffset;
-    parent->beginRowsAdded( from, from + playlists.count() - 1 );
-    foreach ( const dynplaylist_ptr& p, playlists )
-    {
-        DynamicPlaylistItem* plItem = new DynamicPlaylistItem( model(), parent, p, parent->children().count() - addOffset );
-//        qDebug() << "Dynamic Playlist added:" << p->title() << p->creator() << p->info();
-        p->loadRevision();
-        items << plItem;
-
-        if ( p->mode() == Static )
-        {
-            if ( m_source->isLocal() )
-                connect( p.data(), SIGNAL( aboutToBeDeleted( Tomahawk::dynplaylist_ptr ) ),
-                        SLOT( onAutoPlaylistDeleted( Tomahawk::dynplaylist_ptr ) ), Qt::QueuedConnection );
-            else
-                connect( p.data(), SIGNAL( deleted( Tomahawk::dynplaylist_ptr ) ),
-                        SLOT( onAutoPlaylistDeleted( Tomahawk::dynplaylist_ptr ) ), Qt::QueuedConnection );
-        }
-        else
-        {
-            if ( m_source->isLocal() )
-                connect( p.data(), SIGNAL( aboutToBeDeleted( Tomahawk::dynplaylist_ptr ) ),
-                        SLOT( onStationDeleted( Tomahawk::dynplaylist_ptr ) ), Qt::QueuedConnection );
-            else
-                connect( p.data(), SIGNAL( deleted( Tomahawk::dynplaylist_ptr ) ),
-                        SLOT( onStationDeleted( Tomahawk::dynplaylist_ptr ) ), Qt::QueuedConnection );
-        }
-    }
-    parent->endRowsAdded();
-}
-
-
-template< typename T >
-void
-SourceItem::playlistDeletedInternal( SourceTreeItem* parent, const T& p )
-{
-    Q_ASSERT( parent ); // How can we delete playlists if we have none?
-    int curCount = parent->children().count();
-    for( int i = 0; i < curCount; i++ )
-    {
-        PlaylistItem* pl = qobject_cast< PlaylistItem* >( parent->children().at( i ) );
-        if( pl && pl->playlist() == p )
-        {
-            parent->beginRowsRemoved( i, i );
-            parent->removeChild( pl );
-            parent->endRowsRemoved();
-
-            delete pl;
-            break;
-        }
-    }
-
-    if( ( parent == m_playlists || parent == m_stations ) &&
-         parent->children().isEmpty() && parent->parent() ) // Don't leave an empty Playlist or Station category
-    {
-        int idx = parent->parent()->children().indexOf( parent );
-        if( idx < 0 )
-            return;
-
-        parent->parent()->beginRowsRemoved( idx, idx );
-        parent->parent()->removeChild( parent );
-        parent->parent()->endRowsRemoved();
-
-        if( parent == m_playlists )
-            m_playlists = 0;
-        else if( parent == m_stations )
-            m_stations = 0;
-        delete parent;
-    }
-}
-
-
-void
-SourceItem::onPlaylistsAdded( const QList< playlist_ptr >& playlists )
-{
-//    qDebug() << Q_FUNC_INFO << m_source->friendlyName() << playlists.count();
-
-    if( playlists.isEmpty() )
-        return;
-
-    if( !m_playlists )
-    {
-        // add the category too
-        int cur = children().count();
-        beginRowsAdded( cur, cur );
-        m_playlists = new CategoryItem( model(), this, SourcesModel::PlaylistsCategory, source()->isLocal() );
-        endRowsAdded();
-    }
-
-    QList< SourceTreeItem* > items;
-    int addOffset = playlists.first()->author()->isLocal() ? 1 : 0;
-
-    int from = m_playlists->children().count() - addOffset;
-    m_playlists->beginRowsAdded( from, from + playlists.count() - 1 );
-    foreach( const playlist_ptr& p, playlists )
-    {
-        PlaylistItem* plItem = new PlaylistItem( model(), m_playlists, p, m_playlists->children().count() - addOffset );
-//        qDebug() << "Playlist added:" << p->title() << p->creator() << p->info();
-        p->loadRevision();
-        items << plItem;
-
-        if( m_source->isLocal() )
-            connect( p.data(), SIGNAL( aboutToBeDeleted( Tomahawk::playlist_ptr ) ),
-                    SLOT( onPlaylistDeleted( Tomahawk::playlist_ptr ) ), Qt::QueuedConnection );
-        else
-            connect( p.data(), SIGNAL( deleted( Tomahawk::playlist_ptr ) ),
-                    SLOT( onPlaylistDeleted( Tomahawk::playlist_ptr ) ), Qt::QueuedConnection );
-
-    }
-    m_playlists->endRowsAdded();
-}
-
-
-void
-SourceItem::onPlaylistDeleted( const  playlist_ptr& playlist )
-{
-    playlistDeletedInternal( m_playlists, playlist );
-}
-
-
-void
-SourceItem::onAutoPlaylistsAdded( const QList< dynplaylist_ptr >& playlists )
-{
-    if( playlists.isEmpty() )
-        return;
-
-    if( !m_playlists )
-    {
-        // add the category too
-        int cur = children().count();
-        beginRowsAdded( cur, cur );
-        m_playlists = new CategoryItem( model(), this, SourcesModel::PlaylistsCategory, source()->isLocal() );
-        endRowsAdded();
-    }
-
-    playlistsAddedInternal( m_playlists, playlists );
-}
-
-
-void
-SourceItem::onAutoPlaylistDeleted( const dynplaylist_ptr& playlist )
-{
-    if( !m_playlists )
-        qDebug() << "NO playlist category item for a deleting playlist..";
-
-    playlistDeletedInternal( m_playlists, playlist );
-}
-
-
-void
-SourceItem::onStationsAdded( const QList< dynplaylist_ptr >& stations )
-{
-    if( stations.isEmpty() )
-        return;
-
-    if( !m_stations )
-    {
-        // add the category too
-        int cur = children().count();
-        beginRowsAdded( cur, cur );
-        m_stations = new CategoryItem( model(), this, SourcesModel::StationsCategory, source()->isLocal() );
-        endRowsAdded();
-    }
-
-    playlistsAddedInternal( m_stations, stations );
-}
-
-
-void
-SourceItem::onStationDeleted( const dynplaylist_ptr& station )
-{
-    playlistDeletedInternal( m_stations, station );
-}
-
-
-void
-SourceItem::requestExpanding()
-{
-    emit expandRequest( this );
-}
-
-
-ViewPage*
-SourceItem::sourceInfoClicked()
-{
-    if( m_source.isNull() )
-        return 0;
-
-    m_sourceInfoPage = ViewManager::instance()->show( m_source );
-    return m_sourceInfoPage;
-}
-
-
-ViewPage*
-SourceItem::getSourceInfoPage() const
-{
-    return m_sourceInfoPage;
-}
-
-
-ViewPage*
-SourceItem::collectionClicked()
-{
-    if( m_source.isNull() )
-        return 0;
-
-    m_collectionPage = ViewManager::instance()->show( m_source->collection() );
-    return m_collectionPage;
-}
-
-
-ViewPage*
-SourceItem::getCollectionPage() const
-{
-    return m_collectionPage;;
-}
-
-
-ViewPage*
-SourceItem::coolPlaylistsClicked()
-{
-    if ( !m_source.isNull() )
-        return 0;
-
-    if ( !m_coolPlaylistsPage )
-        m_coolPlaylistsPage = new SocialPlaylistWidget( ViewManager::instance()->widget() );
-
-    ViewManager::instance()->show( m_coolPlaylistsPage );
-    return m_coolPlaylistsPage;
-}
-
-
-ViewPage*
-SourceItem::getCoolPlaylistsPage() const
-{
-    return m_coolPlaylistsPage;
-}
-
-
-ViewPage*
-SourceItem::lovedTracksClicked()
-{
-    if ( !m_lovedTracksPage )
-        m_lovedTracksPage = new CustomPlaylistView( m_source.isNull() ? CustomPlaylistView::TopLovedTracks : CustomPlaylistView::SourceLovedTracks, m_source, ViewManager::instance()->widget() );
-
-    ViewManager::instance()->show( m_lovedTracksPage );
-    return m_lovedTracksPage;
-}
-
-
-ViewPage*
-SourceItem::getLovedTracksPage() const
-{
-    return m_lovedTracksPage;
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/sourceitem.h Deleted

@@ -1,109 +0,0 @@
-/*
- *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *    This program 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 2 of the License, or
- *    (at your option) any later version.
- *
- *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef SOURCE_ITEM_H
-#define SOURCE_ITEM_H
-
-#include "sourcetreeitem.h"
-
-class TemporaryPageItem;
-class GenericPageItem;
-class CategoryItem;
-
-namespace Tomahawk
-{
-    class ViewPage;
-}
-
-class SourceItem : public SourceTreeItem
-{
-    Q_OBJECT
-public:
-    SourceItem( SourcesModel* model, SourceTreeItem* parent, const Tomahawk::source_ptr& source );
-
-    virtual QString text() const;
-    virtual QIcon icon() const;
-    virtual int peerSortValue() const;
-    virtual int IDValue() const;
-
-    virtual bool localLatchedOn() const;
-    virtual Tomahawk::PlaylistInterface::LatchMode localLatchMode() const;
-
-    Tomahawk::source_ptr source() const;
-
-    CategoryItem* stationsCategory() const { return m_stations; }
-    CategoryItem* playlistsCategory() const { return m_playlists; }
-    void setStationsCategory( CategoryItem* item ) { m_stations = item; }
-    void setPlaylistsCategory( CategoryItem* item ) { m_playlists = item; }
-
-public slots:
-    virtual void activate();
-
-private slots:
-    void onPlaylistsAdded( const QList<Tomahawk::playlist_ptr>& playlists );
-    void onPlaylistDeleted( const Tomahawk::playlist_ptr& playlists );
-    void onAutoPlaylistsAdded( const QList<Tomahawk::dynplaylist_ptr>& playlists );
-    void onAutoPlaylistDeleted( const Tomahawk::dynplaylist_ptr& playlists );
-    void onStationsAdded( const QList<Tomahawk::dynplaylist_ptr>& stations );
-    void onStationDeleted( const Tomahawk::dynplaylist_ptr& stations );
-
-    void latchedOn( const Tomahawk::source_ptr&, const Tomahawk::source_ptr& );
-    void latchedOff( const Tomahawk::source_ptr&, const Tomahawk::source_ptr& );
-    void latchModeChanged( Tomahawk::PlaylistInterface::LatchMode mode );
-
-    void requestExpanding();
-
-    Tomahawk::ViewPage* sourceInfoClicked();
-    Tomahawk::ViewPage* getSourceInfoPage() const;
-
-    Tomahawk::ViewPage* collectionClicked();
-    Tomahawk::ViewPage* getCollectionPage() const;
-
-    Tomahawk::ViewPage* coolPlaylistsClicked();
-    Tomahawk::ViewPage* getCoolPlaylistsPage() const;
-
-    Tomahawk::ViewPage* lovedTracksClicked();
-    Tomahawk::ViewPage* getLovedTracksPage() const;
-
-private:
-    void playlistsAddedInternal( SourceTreeItem* parent, const QList< Tomahawk::dynplaylist_ptr >& playlists );
-    template< typename T >
-    void playlistDeletedInternal( SourceTreeItem* parent, const T& playlists );
-
-    Tomahawk::source_ptr m_source;
-    QPixmap m_superCol, m_defaultAvatar;
-    CategoryItem* m_playlists;
-    CategoryItem* m_stations;
-
-    bool m_latchedOn;
-    Tomahawk::source_ptr m_latchedOnTo;
-
-    GenericPageItem* m_collectionItem;
-    GenericPageItem* m_sourceInfoItem;
-    GenericPageItem* m_coolPlaylistsItem;
-    GenericPageItem* m_lovedTracksItem;
-
-    Tomahawk::ViewPage* m_collectionPage;
-    Tomahawk::ViewPage* m_sourceInfoPage;
-    Tomahawk::ViewPage* m_coolPlaylistsPage;
-    Tomahawk::ViewPage* m_lovedTracksPage;
-    Tomahawk::ViewPage* m_whatsHotPage;
-};
-
-
-#endif

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/sourcetreeitem.cpp Deleted

@@ -1,56 +0,0 @@
-/*
-    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
-
-    This program 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 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "sourcetreeitem.h"
-
-#include "utils/logger.h"
-
-using namespace Tomahawk;
-
-
-SourceTreeItem::SourceTreeItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::RowType thisType, int peerSortValue, int index )
-    : QObject()
-    , m_type( thisType )
-    , m_parent( parent )
-    , m_model( model )
-    , m_peerSortValue( peerSortValue )
-{
-    connect( this, SIGNAL( beginChildRowsAdded( int, int ) ), m_model, SLOT( onItemRowsAddedBegin( int, int ) ) );
-    connect( this, SIGNAL( beginChildRowsRemoved( int, int ) ), m_model, SLOT( onItemRowsRemovedBegin( int, int ) ) );
-    connect( this, SIGNAL( childRowsAdded() ), m_model, SLOT( onItemRowsAddedDone() ) );
-    connect( this, SIGNAL( childRowsRemoved() ), m_model, SLOT( onItemRowsRemovedDone() ) );
-    connect( this, SIGNAL( updated() ), m_model, SLOT( itemUpdated() ) );
-    connect( this, SIGNAL( selectRequest( SourceTreeItem* ) ), m_model, SLOT( itemSelectRequest( SourceTreeItem* ) ) );
-    connect( this, SIGNAL( expandRequest( SourceTreeItem* ) ), m_model, SLOT( itemExpandRequest( SourceTreeItem* ) ) );
-    connect( this, SIGNAL( toggleExpandRequest( SourceTreeItem* ) ), m_model, SLOT( itemToggleExpandRequest( SourceTreeItem* ) ) );
-
-    if ( !m_parent )
-        return;
-
-    // caller must call begin/endInsertRows
-    if ( index < 0 )
-        m_parent->appendChild( this );
-    else
-        m_parent->insertChild( index, this );
-}
-
-
-SourceTreeItem::~SourceTreeItem()
-{
-    qDeleteAll( m_children );
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/sourcetreeitem.h Deleted

@@ -1,112 +0,0 @@
-/*
-    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
-
-    This program 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 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef SOURCETREEITEM_H
-#define SOURCETREEITEM_H
-
-#include <QIcon>
-
-#include "typedefs.h"
-#include "sourcesmodel.h"
-
-class QMimeData;
-
-class SourceTreeItem : public QObject
-{
-    Q_OBJECT
-public:
-    enum DropType
-    {
-        DropTypesNone =         0x00,
-        DropTypeThisTrack =     0x01,
-        DropTypeThisAlbum =     0x02,
-        DropTypeAllFromArtist = 0x04,
-        DropTypeLocalItems =    0x08,
-        DropTypeTop50 =         0x10,
-        DropTypesAllTypes =     0xff
-    };
-    Q_DECLARE_FLAGS( DropTypes, DropType )
-
-    SourceTreeItem() : m_type( SourcesModel::Invalid ), m_parent( 0 ), m_model( 0 ) {}
-    SourceTreeItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::RowType thisType, int peerSortValue = 0, int index = -1 ); // if index is -1, append at end of parent's child list
-    virtual ~SourceTreeItem();
-
-    // generic info used by the tree model
-    SourcesModel::RowType type() const { return m_type; }
-    SourceTreeItem* parent() const { return m_parent; }
-    SourcesModel* model() const { return m_model; }
-
-    QList< SourceTreeItem* > children() const { return m_children; }
-    void appendChild( SourceTreeItem* item ) { m_children.append( item ); }
-    void insertChild( int index, SourceTreeItem* item ) { m_children.insert( index, item ); }
-    void removeChild( SourceTreeItem* item ) { m_children.removeAll( item ); }
-
-    // varies depending on the type of the item
-    virtual QString text() const { return QString(); }
-    virtual Qt::ItemFlags flags() const { return Qt::ItemIsSelectable | Qt::ItemIsEnabled; }
-    virtual QIcon icon() const { return QIcon(); }
-    virtual bool willAcceptDrag( const QMimeData* ) const { return false; }
-    virtual bool dropMimeData( const QMimeData*, Qt::DropAction ) { return false; }
-    virtual bool setData( const QVariant&, bool ) { return false; }
-    virtual int peerSortValue() const { return m_peerSortValue; } // How to sort relative to peers in the tree.
-    virtual int IDValue() const { return 0; }
-    virtual DropTypes supportedDropTypes( const QMimeData* mimeData ) const { Q_UNUSED( mimeData ); return DropTypesNone; }
-    virtual void setDropType( DropType type ) { m_dropType = type; }
-    virtual DropType dropType() const { return m_dropType; }
-    virtual bool isBeingPlayed() const { return false; }
-
-    /// don't call me unless you are a sourcetreeitem. i prefer this to making everyone a friend
-    void beginRowsAdded( int from, int to ) { emit beginChildRowsAdded( from, to ); }
-    void endRowsAdded() { emit childRowsAdded(); }
-    void beginRowsRemoved( int from, int to ) { emit beginChildRowsRemoved( from, to ); }
-    void endRowsRemoved() { emit childRowsRemoved(); }
-
-public slots:
-    virtual void activate() {}
-    virtual void doubleClicked() {}
-
-signals:
-    void updated();
-    void selectRequest( SourceTreeItem* );
-    void expandRequest( SourceTreeItem* );
-    void toggleExpandRequest( SourceTreeItem* );
-
-    void beginChildRowsAdded( int fromRow, int toRow );
-    void childRowsAdded();
-
-    void beginChildRowsRemoved( int fromRow, int toRow );
-    void childRowsRemoved();
-
-protected:
-    void setRowType( SourcesModel::RowType t ) { m_type = t; }
-    void setParentItem( SourceTreeItem* item ) { m_parent = item; }
-
-private:
-    SourcesModel::RowType m_type;
-
-    SourceTreeItem* m_parent;
-    QList< SourceTreeItem* > m_children;
-    SourcesModel* m_model;
-    int m_peerSortValue;
-
-    DropType m_dropType;
-};
-
-Q_DECLARE_METATYPE( SourceTreeItem* );
-
-#endif // SOURCETREEITEM_H

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/temporarypageitem.cpp Deleted

@@ -1,94 +0,0 @@
-/* === 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 "temporarypageitem.h"
-#include "viewmanager.h"
-#include "widgets/infowidgets/AlbumInfoWidget.h"
-#include "widgets/infowidgets/ArtistInfoWidget.h"
-#include "widgets/searchwidget.h"
-
-using namespace Tomahawk;
-
-TemporaryPageItem::TemporaryPageItem ( SourcesModel* mdl, SourceTreeItem* parent, ViewPage* page, int sortValue )
-    : SourceTreeItem( mdl, parent, SourcesModel::TemporaryPage )
-    , m_page( page )
-    , m_icon( QIcon( RESPATH "images/playlist-icon.png" ) )
-    , m_sortValue( sortValue )
-{
-    if ( dynamic_cast< ArtistInfoWidget* >( page ) )
-        m_icon = QIcon( RESPATH "images/artist-icon.png" );
-    else if ( dynamic_cast< AlbumInfoWidget* >( page ) )
-        m_icon = QIcon( RESPATH "images/album-icon.png" );
-    else if ( dynamic_cast< SearchWidget* >( page ) )
-        m_icon = QIcon( RESPATH "images/search-icon.png" );
-
-    model()->linkSourceItemToPage( this, page );
-}
-
-
-QString
-TemporaryPageItem::text() const
-{
-    return m_page->title();
-}
-
-
-void
-TemporaryPageItem::activate()
-{
-    ViewManager::instance()->show( m_page );
-}
-
-
-QIcon
-TemporaryPageItem::icon() const
-{
-    return m_icon;
-}
-
-
-int
-TemporaryPageItem::peerSortValue() const
-{
-    return m_sortValue;
-}
-
-
-int
-TemporaryPageItem::IDValue() const
-{
-    return m_sortValue;
-}
-
-
-void
-TemporaryPageItem::removeFromList()
-{
-    ViewManager::instance()->removeFromHistory( m_page );
-
-    model()->removeSourceItemLink( this );
-
-    int idx = parent()->children().indexOf( this );
-    parent()->beginRowsRemoved( idx, idx );
-    parent()->removeChild( this );
-    parent()->endRowsRemoved();
-
-    emit removed();
-
-    deleteLater();
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/items/temporarypageitem.h Deleted

@@ -1,53 +0,0 @@
-/* === 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 TEMPORARYPAGEITEM_H
-#define TEMPORARYPAGEITEM_H
-
-#include "items/sourcetreeitem.h"
-#include "viewpage.h"
-
-class TemporaryPageItem : public SourceTreeItem
-{
-    Q_OBJECT
-public:
-    TemporaryPageItem ( SourcesModel* model, SourceTreeItem* parent, Tomahawk::ViewPage* page, int sortValue );
-
-    virtual QString text() const;
-    virtual void activate();
-
-    virtual QIcon icon() const;
-    virtual int peerSortValue() const;
-    virtual int IDValue() const;
-
-    Tomahawk::ViewPage* page() const { return m_page; }
-    virtual bool isBeingPlayed() const { return m_page->isBeingPlayed(); }
-
-public slots:
-    void removeFromList();
-
-signals:
-    bool removed();
-
-private:
-    Tomahawk::ViewPage* m_page;
-    QIcon m_icon;
-    int m_sortValue;
-};
-
-#endif // TEMPORARYPAGEITEM_H

tomahawk-0.4.2.tar.bz2/src/sourcetree/sourcedelegate.cpp Deleted

@@ -1,739 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2011, Michael Zanetti <mzanetti@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 "sourcedelegate.h"
-
-#include "items/sourcetreeitem.h"
-#include "items/sourceitem.h"
-#include "items/playlistitems.h"
-#include "items/categoryitems.h"
-#include "items/temporarypageitem.h"
-
-#include "utils/tomahawkutilsgui.h"
-#include "animationhelper.h"
-#include "source.h"
-#include "tomahawksettings.h"
-
-#include <QtGui/QApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QMouseEvent>
-#include <audio/audioengine.h>
-#include <actioncollection.h>
-
-#define TREEVIEW_INDENT_ADD 12
-
-
-SourceDelegate::SourceDelegate( QAbstractItemView* parent )
-    : QStyledItemDelegate( parent )
-    , m_parent( parent )
-    , m_lastClicked( -1 )
-{
-    m_dropTypeMap.insert( 0, SourceTreeItem::DropTypeThisTrack );
-    m_dropTypeMap.insert( 1, SourceTreeItem::DropTypeThisAlbum );
-    m_dropTypeMap.insert( 2, SourceTreeItem::DropTypeAllFromArtist );
-    m_dropTypeMap.insert( 3, SourceTreeItem::DropTypeLocalItems );
-    m_dropTypeMap.insert( 4, SourceTreeItem::DropTypeTop50 );
-
-    m_dropTypeTextMap.insert( 0, tr( "Track" ) );
-    m_dropTypeTextMap.insert( 1, tr( "Album" ) );
-    m_dropTypeTextMap.insert( 2, tr( "Artist" ) );
-    m_dropTypeTextMap.insert( 3, tr( "Local" ) );
-    m_dropTypeTextMap.insert( 4, tr( "Top 10" ) );
-
-    m_dropTypeImageMap.insert( 0, QPixmap( RESPATH "images/drop-song.png" ).scaledToWidth( 32, Qt::SmoothTransformation ) );
-    m_dropTypeImageMap.insert( 1, QPixmap( RESPATH "images/drop-album.png" ).scaledToWidth( 32, Qt::SmoothTransformation ) );
-    m_dropTypeImageMap.insert( 2, QPixmap( RESPATH "images/drop-all-songs.png" ).scaledToHeight( 32, Qt::SmoothTransformation ) );
-    m_dropTypeImageMap.insert( 3, QPixmap( RESPATH "images/drop-local-songs.png" ).scaledToWidth( 32, Qt::SmoothTransformation ) );
-    m_dropTypeImageMap.insert( 4, QPixmap( RESPATH "images/drop-top-songs.png" ).scaledToWidth( 32, Qt::SmoothTransformation ) );
-
-    m_dropMimeData = new QMimeData();
-
-    m_headphonesOff.load( RESPATH "images/headphones-off.png" );
-    m_headphonesOn.load( RESPATH "images/headphones-sidebar.png" );
-    m_realtimeLocked.load( RESPATH "images/closed-padlock.png" );
-    m_realtimeUnlocked.load( RESPATH "images/open-padlock.png" );
-    m_nowPlayingSpeaker.load( RESPATH "images/now-playing-speaker.png" );
-    m_nowPlayingSpeakerDark.load( RESPATH "images/now-playing-speaker-dark.png" );
-}
-
-
-SourceDelegate::~SourceDelegate()
-{
-    delete m_dropMimeData;
-}
-
-
-QSize
-SourceDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
-    SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() );
-
-    if ( type == SourcesModel::Collection )
-    {
-        return QSize( option.rect.width(), 40 );
-    }
-    else if ( type == SourcesModel::Divider )
-    {
-        return QSize( option.rect.width(), 6 );
-    }
-    else if ( type == SourcesModel::Group && index.row() > 0 )
-    {
-        return QSize( option.rect.width(), 24 );
-    }
-    else if ( m_expandedMap.contains( index ) )
-    {
-        if ( !m_expandedMap.value( index )->initialized() )
-        {
-            int dropTypes = dropTypeCount( item );
-            QSize originalSize = QStyledItemDelegate::sizeHint( option, index );
-            QSize targetSize = originalSize + QSize( 0, dropTypes == 0 ? 0 : 56 );
-            m_expandedMap.value( index )->initialize( originalSize, targetSize, 300 );
-            m_expandedMap.value( index )->expand();
-        }
-        QMetaObject::invokeMethod( m_parent, "update", Qt::QueuedConnection, Q_ARG( QModelIndex, index ) );
-        return m_expandedMap.value( index )->size();
-    }
-    else
-        return QStyledItemDelegate::sizeHint( option, index );
-}
-
-
-void
-SourceDelegate::paintDecorations( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() );
-    SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
-
-    // Paint the speaker icon next to the currently-playing playlist
-    const bool playable = ( type == SourcesModel::StaticPlaylist ||
-        type == SourcesModel::AutomaticPlaylist ||
-        type == SourcesModel::Station ||
-        type == SourcesModel::TemporaryPage ||
-        type == SourcesModel::GenericPage );
-    const bool playing = ( AudioEngine::instance()->isPlaying() || AudioEngine::instance()->isPaused() );
-
-    if ( playable && playing && item->isBeingPlayed() )
-    {
-        const int iconW = option.rect.height() - 4;
-        QRect iconRect = QRect( 4, option.rect.y() + 2, iconW, iconW );
-        QPixmap speaker = option.state & QStyle::State_Selected ? m_nowPlayingSpeaker : m_nowPlayingSpeakerDark;
-        speaker = speaker.scaledToHeight( iconW, Qt::SmoothTransformation );
-        painter->drawPixmap( iconRect, speaker );
-    }
-}
-
-
-void
-SourceDelegate::paintCollection( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QFont normal = painter->font();
-    QFont bold = painter->font();
-    bold.setBold( true );
-    QFont figFont = bold;
-    figFont.setPixelSize( 10 );
-
-    SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
-    SourceItem* colItem = qobject_cast< SourceItem* >( item );
-    Q_ASSERT( colItem );
-    bool status = !( !colItem || colItem->source().isNull() || !colItem->source()->isOnline() );
-
-    QString tracks;
-    QString name = index.data().toString();
-    int figWidth = 0;
-
-    if ( status && colItem && !colItem->source().isNull() )
-    {
-        tracks = QString::number( colItem->source()->trackCount() );
-        figWidth = QFontMetrics( figFont ).width( tracks );
-        name = colItem->source()->friendlyName();
-    }
-
-    QRect iconRect = option.rect.adjusted( 4, 6, -option.rect.width() + option.rect.height() - 12 + 4, -6 );
-
-    QPixmap avatar = colItem->icon().pixmap( iconRect.size() );
-    painter->drawPixmap( iconRect, avatar.scaledToHeight( iconRect.height(), Qt::SmoothTransformation ) );
-
-    if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected )
-    {
-        painter->setPen( option.palette.color( QPalette::HighlightedText ) );
-    }
-
-    QRect textRect = option.rect.adjusted( iconRect.width() + 8, 6, -figWidth - 24, 0 );
-    if ( status || colItem->source().isNull() )
-        painter->setFont( bold );
-    QString text = painter->fontMetrics().elidedText( name, Qt::ElideRight, textRect.width() );
-    painter->drawText( textRect, text );
-
-    bool isPlaying = false;
-    QString desc = status ? colItem->source()->textStatus() : tr( "Offline" );
-    if ( colItem->source().isNull() )
-        desc = tr( "All available tracks" );
-    if ( status && desc.isEmpty() && !colItem->source()->currentTrack().isNull() )
-    {
-        desc = colItem->source()->currentTrack()->artist() + " - " + colItem->source()->currentTrack()->track();
-        isPlaying = true;
-    }
-    if ( desc.isEmpty() )
-        desc = tr( "Online" );
-
-    painter->setFont( normal );
-    textRect = option.rect.adjusted( iconRect.width() + 8, option.rect.height() / 2, -figWidth - 24, -6 );
-
-    bool privacyOn = TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::FullyPrivate;
-    if ( !colItem->source().isNull() && colItem->source()->isLocal() && privacyOn )
-    {
-        QRect pmRect = textRect;
-        pmRect.setRight( pmRect.left() + pmRect.height() );
-        ActionCollection::instance()->getAction( "togglePrivacy" )->icon().paint( painter, pmRect );
-        textRect.adjust( pmRect.width() + 3, 0, 0, 0 );
-    }
-    if ( isPlaying || ( !colItem->source().isNull() && colItem->source()->isLocal() ) )
-    {
-        // Show a listen icon
-        QPixmap listenAlongPixmap;
-        QPixmap realtimeListeningAlongPixmap;
-        if ( index.data( SourcesModel::LatchedOnRole ).toBool() )
-        {
-            // Currently listening along
-            listenAlongPixmap = m_headphonesOn;
-            if ( !colItem->source()->isLocal() )
-            {
-                realtimeListeningAlongPixmap =
-                    colItem->source()->playlistInterface()->latchMode() == Tomahawk::PlaylistInterface::RealTime ?
-                        m_realtimeLocked : m_realtimeUnlocked;
-            }
-        }
-        else if ( !colItem->source()->isLocal() )
-        {
-            listenAlongPixmap = m_headphonesOff;
-        }
-
-        if ( !listenAlongPixmap.isNull() )
-        {
-            QRect pmRect = textRect;
-            pmRect.setRight( pmRect.left() + pmRect.height() );
-            painter->drawPixmap( pmRect, listenAlongPixmap.scaledToHeight( pmRect.height(), Qt::SmoothTransformation ) );
-            textRect.adjust( pmRect.width() + 3, 0, 0, 0 );
-        }
-
-        if ( !realtimeListeningAlongPixmap.isNull() )
-        {
-            QRect pmRect = textRect;
-            pmRect.setRight( pmRect.left() + pmRect.height() );
-            painter->drawPixmap( pmRect, realtimeListeningAlongPixmap.scaledToHeight( pmRect.height(), Qt::SmoothTransformation ) );
-            textRect.adjust( pmRect.width() + 3, 0, 0, 0 );
-        }
-    }
-
-    textRect.adjust( 0, 0, 0, 2 );
-    text = painter->fontMetrics().elidedText( desc, Qt::ElideRight, textRect.width() - 4 );
-    QTextOption to( Qt::AlignVCenter );
-    to.setWrapMode( QTextOption::NoWrap );
-    painter->drawText( textRect, text, to );
-
-    if ( status )
-    {
-        painter->setRenderHint( QPainter::Antialiasing );
-
-        QRect figRect = option.rect.adjusted( option.rect.width() - figWidth - 8, 0, -13, -option.rect.height() + 16 );
-        int hd = ( option.rect.height() - figRect.height() ) / 2;
-        figRect.adjust( 0, hd, 0, hd );
-
-        painter->setFont( figFont );
-
-        QColor figColor( 167, 183, 211 );
-        painter->setPen( figColor );
-        painter->setBrush( figColor );
-
-        TomahawkUtils::drawBackgroundAndNumbers( painter, tracks, figRect );
-    }
-}
-
-
-void
-SourceDelegate::paintCategory( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QTextOption to( Qt::AlignVCenter );
-
-    painter->setPen( option.palette.color( QPalette::Base ) );
-    painter->setBrush( option.palette.color( QPalette::Base ) );
-    painter->drawRect( option.rect );
-    painter->setRenderHint( QPainter::Antialiasing );
-
-    painter->setPen( Qt::white );
-    painter->drawText( option.rect.translated( 4, 1 ), index.data().toString().toUpper(), to );
-    painter->setPen( QColor( 99, 113, 128 ) );
-    painter->drawText( option.rect.translated( 4, 0 ), index.data().toString().toUpper(), to );
-
-    if ( option.state & QStyle::State_MouseOver )
-    {
-        QString text = tr( "Show" );
-        if ( option.state & QStyle::State_Open )
-            text = tr( "Hide" );
-
-        QFont font = painter->font();
-        font.setPixelSize( 11 );
-        font.setBold( true );
-        painter->setFont( font );
-        QTextOption to( Qt::AlignVCenter | Qt::AlignRight );
-
-        // draw close icon
-        painter->setPen( Qt::white );
-        painter->drawText( option.rect.translated( -4, 1 ), text, to );
-        painter->setPen( QColor( 99, 113, 128 ) );
-        painter->drawText( option.rect.translated( -4, 0 ), text, to );
-    }
-}
-
-
-void
-SourceDelegate::paintGroup( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QFont font = painter->font();
-    font.setPixelSize( 12 );
-    font.setBold( true );
-    painter->setFont( font );
-
-    QTextOption to( Qt::AlignBottom );
-
-    painter->setPen( option.palette.color( QPalette::Base ) );
-    painter->setBrush( option.palette.color( QPalette::Base ) );
-    painter->drawRect( option.rect );
-    painter->setRenderHint( QPainter::Antialiasing );
-
-    painter->setPen( Qt::white );
-    painter->drawText( option.rect.translated( 4, 1 ), index.data().toString().toUpper(), to );
-    painter->setPen( QColor( 99, 113, 128 ) );
-    painter->drawText( option.rect.translated( 4, 0 ), index.data().toString().toUpper(), to );
-
-    if ( option.state & QStyle::State_MouseOver )
-    {
-        QString text = tr( "Show" );
-        if ( option.state & QStyle::State_Open )
-            text = tr( "Hide" );
-
-        font.setPixelSize( font.pixelSize() - 1 );
-        painter->setFont( font );
-        QTextOption to( Qt::AlignBottom | Qt::AlignRight );
-
-        // draw close icon
-        painter->setPen( Qt::white );
-        painter->drawText( option.rect.translated( -4, 1 ), text, to );
-        painter->setPen( QColor( 99, 113, 128 ) );
-        painter->drawText( option.rect.translated( -4, 0 ), text, to );
-    }
-}
-
-
-void
-SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QStyleOptionViewItem o = option;
-    QStyleOptionViewItemV4 o3 = option;
-
-    painter->save();
-
-    QFont font = painter->font();
-    font.setPixelSize( 11 );
-    painter->setFont( font );
-    o.font = font;
-    o3.font = font;
-
-    SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() );
-    SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
-    Q_ASSERT( item );
-
-    if ( ( option.state & QStyle::State_Enabled ) == QStyle::State_Enabled )
-    {
-        o.state = QStyle::State_Enabled;
-
-        if ( ( option.state & QStyle::State_MouseOver ) == QStyle::State_MouseOver )
-        {
-            o.state |= QStyle::State_MouseOver;
-            o3.state |= QStyle::State_MouseOver;
-        }
-
-        if ( ( option.state & QStyle::State_Open ) == QStyle::State_Open )
-        {
-            o.state |= QStyle::State_Open;
-        }
-
-        if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected )
-        {
-            if ( type != SourcesModel::Collection )
-                o3.state |= QStyle::State_Selected;
-            else
-                o3.state &= ~QStyle::State_Selected;
-
-            o.palette.setColor( QPalette::Base, QColor( 0, 0, 0, 0 ) );
-            o.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) );
-            o3.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) );
-        }
-    }
-
-    // shrink the indentations
-    {
-        int indentMult = 0;
-        QModelIndex counter = index;
-        while ( counter.parent().isValid() )
-        {
-            indentMult++;
-            counter = counter.parent();
-        }
-
-        int indentDelta = o.rect.x() - m_parent->viewport()->x();
-        o.rect.setX( o.rect.x() - indentDelta + indentMult * TREEVIEW_INDENT_ADD );
-        o3.rect.setX( 0 );
-    }
-
-    if ( type != SourcesModel::Group && type != SourcesModel::Category && type != SourcesModel::Divider )
-        QApplication::style()->drawControl( QStyle::CE_ItemViewItem, &o3, painter );
-
-    if ( type == SourcesModel::Collection )
-    {
-        paintCollection( painter, o, index );
-    }
-    else if ( ( type == SourcesModel::StaticPlaylist || type == SourcesModel::CategoryAdd ) &&
-              m_expandedMap.contains( index ) && m_expandedMap.value( index )->partlyExpanded() && dropTypeCount( item ) > 0 )
-    {
-        // Let Qt paint the original item. We add our stuff after it
-        o.state &= ~QStyle::State_Selected;
-        o.showDecorationSelected = false;
-        o.rect.adjust( 0, 0, 0, - option.rect.height() + m_expandedMap.value( index )->originalSize().height() );
-        QStyledItemDelegate::paint( painter, o, index );
-
-        // Get whole rect for the menu
-        QRect itemsRect = option.rect.adjusted( -option.rect.x(), m_expandedMap.value( index )->originalSize().height(), 0, 0 );
-        QPoint cursorPos = m_parent->mapFromGlobal( QCursor::pos() );
-        bool cursorInRect = itemsRect.contains( cursorPos );
-
-        // draw the background
-        if ( m_gradient.finalStop() != itemsRect.bottomLeft() )
-        {
-            m_gradient = QLinearGradient( itemsRect.topLeft(), itemsRect.bottomLeft() );
-            m_gradient.setColorAt( 0.0, Qt::white );
-            m_gradient.setColorAt( 0.9, QColor( 0x88, 0x88, 0x88 ) );
-            m_gradient.setColorAt( 1.0, QColor( 0x99, 0x99, 0x99 ) ); // dark grey
-        }
-
-        QPen pen = painter->pen();
-        painter->setPen( QPen( Qt::NoPen ) );
-        painter->setBrush( m_gradient );
-        painter->drawRect( itemsRect );
-
-        // calculate sizes for the icons
-        int totalCount = dropTypeCount( item );
-        int itemWidth = itemsRect.width() / totalCount;
-        int iconSpacing = ( itemWidth - 32 ) / 2;
-
-        // adjust to one single entry
-        itemsRect.adjust( 0, 0, -itemsRect.width() + itemWidth, 0 );
-
-        pen.setColor( Qt::white );
-        painter->setPen( pen );
-
-        QFont font = painter->font();
-        font.setPixelSize( 12 );
-        painter->setFont( font );
-        QFont fontBold = painter->font();
-        fontBold.setBold( true );
-
-        QRect textRect;
-        QRect imageRect;
-        SourceTreeItem::DropTypes dropTypes = item->supportedDropTypes( m_dropMimeData );
-
-        int count = 0;
-        for ( int i = 0; i < 5; ++i )
-        {
-            if ( !dropTypes.testFlag( m_dropTypeMap.value( i ) ) )
-                continue;
-
-            if ( count > 0 )
-                itemsRect.adjust( itemWidth, 0, itemWidth, 0 );
-
-            if ( itemsRect.contains( cursorPos ) | !cursorInRect )
-            {
-                painter->setFont( fontBold );
-                m_hoveredDropType = m_dropTypeMap.value( i );
-                cursorInRect = true;
-            }
-            else
-                painter->setFont( font );
-
-            int textSpacing = ( itemWidth - painter->fontMetrics().width( m_dropTypeTextMap.value( i ) ) ) / 2;
-            textRect = itemsRect.adjusted( textSpacing - 1, itemsRect.height() - painter->fontMetrics().height() - 2, 0, 0 );
-            painter->drawText( textRect, m_dropTypeTextMap.value( i ) );
-
-            int maxHeight = itemsRect.height() - textRect.height() - 2;
-            int verticalOffset = qMax( 0, maxHeight - 32 );
-            if ( itemsRect.bottom() - textRect.height() - 2 > itemsRect.top() )
-            {
-                imageRect = itemsRect.adjusted( iconSpacing, verticalOffset, -iconSpacing, -textRect.height() - 2 );
-                painter->drawPixmap( imageRect.x(), imageRect.y(), m_dropTypeImageMap.value( i ).copy( 0, 32 - imageRect.height(), 32, imageRect.height() ) );
-            }
-
-            count++;
-        }
-    }
-    else if ( type == SourcesModel::Group )
-    {
-        paintGroup( painter, o3, index );
-    }
-    else if ( type == SourcesModel::Category )
-    {
-        paintCategory( painter, o, index );
-    }
-    else if ( type == SourcesModel::Divider )
-    {
-        QRect middle = o.rect.adjusted( 0, 2, 0, -2 );
-        painter->setRenderHint( QPainter::Antialiasing, false );
-
-        QColor bgcolor = o3.palette.color( QPalette::Base );
-
-        painter->setPen( bgcolor.darker( 120 ) );
-        painter->drawLine( middle.topLeft(), middle.topRight() );
-        painter->setPen( bgcolor.lighter( 120 ) );
-        painter->drawLine( middle.bottomLeft(), middle.bottomRight() );
-    }
-    else
-    {
-        o.state &= ~QStyle::State_MouseOver;
-        if ( !index.parent().parent().isValid() )
-            o.rect.adjust( 7, 0, 0, 0 );
-
-        QStyledItemDelegate::paint( painter, o, index );
-
-        if ( type == SourcesModel::TemporaryPage )
-        {
-            TemporaryPageItem* gpi = qobject_cast< TemporaryPageItem* >( item );
-            Q_ASSERT( gpi );
-
-            if ( gpi && o3.state & QStyle::State_MouseOver )
-            {
-                // draw close icon
-                int padding = 3;
-                m_iconHeight = ( o3.rect.height() - 2 * padding );
-                QPixmap p( RESPATH "images/list-remove.png" );
-                p = p.scaledToHeight( m_iconHeight, Qt::SmoothTransformation );
-
-                QRect r( o3.rect.right() - padding - m_iconHeight, padding + o3.rect.y(), m_iconHeight, m_iconHeight );
-                painter->drawPixmap( r, p );
-            }
-        }
-    }
-
-    paintDecorations( painter, o3, index );
-
-    painter->restore();
-}
-
-
-void
-SourceDelegate::updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    if ( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() == SourcesModel::StaticPlaylist )
-        editor->setGeometry( option.rect.adjusted( 20, 0, 0, 0 ) );
-    else
-        QStyledItemDelegate::updateEditorGeometry( editor, option, index );
-
-    editor->setGeometry( editor->geometry().adjusted( 2 * TREEVIEW_INDENT_ADD, 0, 0, 0 ) );
-}
-
-
-bool
-SourceDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
-{
-    if ( event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonPress )
-    {
-        SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() );
-        if ( type == SourcesModel::TemporaryPage )
-        {
-            TemporaryPageItem* gpi = qobject_cast< TemporaryPageItem* >( index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
-            Q_ASSERT( gpi );
-            QMouseEvent* ev = static_cast< QMouseEvent* >( event );
-
-            QStyleOptionViewItemV4 o = option;
-            initStyleOption( &o, index );
-            int padding = 3;
-            QRect r ( o.rect.right() - padding - m_iconHeight, padding + o.rect.y(), m_iconHeight, m_iconHeight );
-
-            if ( r.contains( ev->pos() ) )
-            {
-                if ( event->type() == QEvent::MouseButtonRelease )
-                {
-                    gpi->removeFromList();
-
-                    // Send a new mouse event to the view, since if the mouse is now over another item's delete area we want it to show up
-                    QMouseEvent* ev = new QMouseEvent( QEvent::MouseMove, m_parent->viewport()->mapFromGlobal( QCursor::pos() ), Qt::NoButton, Qt::NoButton, Qt::NoModifier );
-                    QApplication::postEvent( m_parent->viewport(), ev );
-                }
-
-                return true;
-            }
-        }
-        else if ( type == SourcesModel::Collection )
-        {
-            SourceItem* colItem = qobject_cast< SourceItem* >( index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
-            Q_ASSERT( colItem );
-
-            if ( !colItem->source().isNull() && !colItem->source()->currentTrack().isNull() && !colItem->source()->isLocal() )
-            {
-                QMouseEvent* ev = static_cast< QMouseEvent* >( event );
-
-                QStyleOptionViewItemV4 o = option;
-                initStyleOption( &o, index );
-                QFontMetrics fm( o.font );
-                const int height = fm.height() + 3;
-
-                QRect headphonesRect( option.rect.height() + 10, o.rect.bottom() - height, height, height );
-                bool headphonesRectContainsClick = headphonesRect.contains( ev->pos() );
-                QRect lockRect( option.rect.height() + 20, o.rect.bottom() - height, height, height );
-                bool lockRectContainsClick = lockRect.contains( ev->pos() );
-                if ( headphonesRectContainsClick || lockRectContainsClick )
-                {
-                    if ( event->type() == QEvent::MouseButtonRelease )
-                    {
-                        if ( headphonesRectContainsClick )
-                        {
-                            if ( index.data( SourcesModel::LatchedOnRole ).toBool() )
-                                // unlatch
-                                emit latchOff( colItem->source() );
-                            else
-                                emit latchOn( colItem->source() );
-                        }
-                        else // it's in the lock rect
-                            emit toggleRealtimeLatch( colItem->source(), !index.data( SourcesModel::LatchedRealtimeRole ).toBool() );
-                    }
-                    return true;
-                }
-            }
-        }
-    }
-
-    // We emit our own clicked() signal instead of relying on QTreeView's, because that is fired whether or not a delegate accepts
-    // a mouse press event. Since we want to swallow click events when they are on headphones other action items, here wemake sure we only
-    // emit if we really want to
-    if ( event->type() == QEvent::MouseButtonRelease )
-    {
-        if ( m_lastClicked == -1 )
-        {
-            m_lastClicked = QDateTime::currentMSecsSinceEpoch();
-            emit clicked( index );
-        }
-        else
-        {
-            qint64 elapsed = QDateTime::currentMSecsSinceEpoch() - m_lastClicked;
-            if ( elapsed < QApplication::doubleClickInterval() )
-            {
-                m_lastClicked = -1;
-                emit doubleClicked( index );
-            } else
-            {
-                m_lastClicked = QDateTime::currentMSecsSinceEpoch();
-                emit clicked( index );
-            }
-        }
-
-    }
-
-    return QStyledItemDelegate::editorEvent ( event, model, option, index );
-}
-
-
-int
-SourceDelegate::dropTypeCount( SourceTreeItem* item ) const
-{
-    int menuCount = 0;
-    if ( item->supportedDropTypes( m_dropMimeData ).testFlag( SourceTreeItem::DropTypeThisTrack ) )
-        menuCount++;
-
-    if ( item->supportedDropTypes( m_dropMimeData ).testFlag( SourceTreeItem::DropTypeThisAlbum ) )
-        menuCount++;
-
-    if ( item->supportedDropTypes( m_dropMimeData ).testFlag( SourceTreeItem::DropTypeAllFromArtist ) )
-        menuCount++;
-
-    if ( item->supportedDropTypes( m_dropMimeData ).testFlag( SourceTreeItem::DropTypeLocalItems ) )
-        menuCount++;
-
-    if ( item->supportedDropTypes( m_dropMimeData ).testFlag( SourceTreeItem::DropTypeTop50 ) )
-        menuCount++;
-
-    return menuCount;
-}
-
-
-SourceTreeItem::DropType
-SourceDelegate::hoveredDropType() const
-{
-    return m_hoveredDropType;
-}
-
-
-void
-SourceDelegate::hovered( const QModelIndex& index, const QMimeData* mimeData )
-{
-    if ( !index.isValid() )
-    {
-        foreach ( AnimationHelper *helper, m_expandedMap )
-        {
-            helper->collapse();
-        }
-        return;
-    }
-
-    if ( !m_expandedMap.contains( index ) )
-    {
-        foreach ( AnimationHelper *helper, m_expandedMap )
-        {
-            helper->collapse();
-        }
-
-        m_newDropHoverIndex = index;
-        m_dropMimeData->clear();
-        foreach ( const QString &mimeDataFormat, mimeData->formats() )
-        {
-            m_dropMimeData->setData( mimeDataFormat, mimeData->data( mimeDataFormat ) );
-        }
-
-        m_expandedMap.insert( m_newDropHoverIndex, new AnimationHelper( m_newDropHoverIndex ) );
-        connect( m_expandedMap.value( m_newDropHoverIndex ), SIGNAL( finished( QModelIndex ) ), SLOT( animationFinished( QModelIndex ) ) );
-    }
-    else
-        qDebug() << "expandedMap already contains index" << index;
-}
-
-
-void
-SourceDelegate::dragLeaveEvent()
-{
-    foreach ( AnimationHelper* helper, m_expandedMap )
-    {
-        helper->collapse( true );
-    }
-}
-
-
-void
-SourceDelegate::animationFinished( const QModelIndex& index )
-{
-    delete m_expandedMap.take( index );
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/sourcedelegate.h Deleted

@@ -1,85 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2011, Michael Zanetti <mzanetti@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 SOURCEDELEGATE_H
-#define SOURCEDELEGATE_H
-
-#include "sourcetreeview.h"
-#include "items/sourcetreeitem.h"
-
-#include <QtGui/QStyledItemDelegate>
-#include <QtCore/QPropertyAnimation>
-
-class AnimationHelper;
-
-class SourceDelegate : public QStyledItemDelegate
-{
-    Q_OBJECT
-public:
-    SourceDelegate( QAbstractItemView* parent = 0 );
-    ~SourceDelegate();
-
-    void hovered( const QModelIndex &index, const QMimeData *mimeData );
-    void dragLeaveEvent();
-
-    SourceTreeItem::DropType hoveredDropType() const;
-
-signals:
-    void clicked( const QModelIndex& idx );
-    void doubleClicked( const QModelIndex& idx );
-    void latchOn( const Tomahawk::source_ptr& idx );
-    void latchOff( const Tomahawk::source_ptr& idx );
-    void toggleRealtimeLatch( const Tomahawk::source_ptr& idx, bool realtime );
-
-protected:
-    virtual QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    virtual void updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    virtual int dropTypeCount( SourceTreeItem* item ) const;
-    virtual bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
-
-private slots:
-    void animationFinished( const QModelIndex& );
-
-private:
-    void paintDecorations( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-    void paintCollection( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    void paintCategory( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    void paintGroup( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-    QAbstractItemView* m_parent;
-    mutable int m_iconHeight;
-    QModelIndex m_dropHoverIndex;
-    QModelIndex m_newDropHoverIndex;
-    QMimeData *m_dropMimeData;
-    mutable SourceTreeItem::DropType m_hoveredDropType; // Hack to keep easily track of the current highlighted DropType in paint()
-    QMap< QModelIndex, AnimationHelper* > m_expandedMap;
-    QPixmap m_headphonesOn, m_headphonesOff, m_realtimeLocked, m_realtimeUnlocked, m_nowPlayingSpeaker, m_nowPlayingSpeakerDark;
-    qint64 m_lastClicked;
-
-    QMap< int, SourceTreeItem::DropType > m_dropTypeMap;
-    QMap< int, QString > m_dropTypeTextMap;
-    QMap< int, QPixmap > m_dropTypeImageMap;
-
-    mutable QLinearGradient m_gradient;
-};
-
-#endif // SOURCEDELEGATE_H

tomahawk-0.4.2.tar.bz2/src/sourcetree/sourcesmodel.cpp Deleted

@@ -1,655 +0,0 @@
-/* === 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
- *   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 "sourcetree/sourcesmodel.h"
-
-#include <boost/bind.hpp>
-
-#include <QMimeData>
-#include <QSize>
-
-#include "sourcetree/items/sourcetreeitem.h"
-#include "sourcetree/items/sourceitem.h"
-#include "sourcetree/items/groupitem.h"
-#include "sourcetree/items/genericpageitems.h"
-#include "sourcetree/items/historyitem.h"
-#include "sourcelist.h"
-#include "playlist.h"
-#include "collection.h"
-#include "source.h"
-#include "viewmanager.h"
-
-#include "utils/logger.h"
-#include "globalactionmanager.h"
-#include "dropjob.h"
-#include "items/playlistitems.h"
-#include "playlist/artistview.h"
-#include "playlist/playlistview.h"
-#include "playlist/dynamic/widgets/DynamicWidget.h"
-
-using namespace Tomahawk;
-
-
-SourcesModel::SourcesModel( QObject* parent )
-    : QAbstractItemModel( parent )
-    , m_rootItem( 0 )
-    , m_viewPageDelayedCacheItem( 0 )
-{
-    m_rootItem = new SourceTreeItem( this, 0, Invalid );
-
-    appendGroups();
-    onSourcesAdded( SourceList::instance()->sources() );
-
-    connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
-    connect( SourceList::instance(), SIGNAL( sourceRemoved( Tomahawk::source_ptr ) ), SLOT( onSourceRemoved( Tomahawk::source_ptr ) ) );
-    connect( ViewManager::instance(), SIGNAL( viewPageActivated( Tomahawk::ViewPage* ) ), this, SLOT( viewPageActivated( Tomahawk::ViewPage* ) ) );
-}
-
-
-SourcesModel::~SourcesModel()
-{
-    delete m_rootItem;
-}
-
-
-QString
-SourcesModel::rowTypeToString( RowType type )
-{
-    switch ( type )
-    {
-        case Group:
-            return tr( "Group" );
-
-        case Collection:
-            return tr( "Collection" );
-
-        case StaticPlaylist:
-            return tr( "Playlist" );
-
-        case AutomaticPlaylist:
-            return tr( "Automatic Playlist" );
-
-        case Station:
-            return tr( "Station" );
-
-        default:
-            return QString( "Unknown" );
-    }
-}
-
-
-QVariant
-SourcesModel::data( const QModelIndex& index, int role ) const
-{
-    if ( !index.isValid() )
-        return QVariant();
-
-    switch ( role )
-    {
-        case Qt::SizeHintRole:
-            return QSize( 0, 18 );
-        case SourceTreeItemRole:
-            return QVariant::fromValue< SourceTreeItem* >( itemFromIndex( index ) );
-        case SourceTreeItemTypeRole:
-            return itemFromIndex( index )->type();
-        case Qt::DisplayRole:
-        case Qt::EditRole:
-            return itemFromIndex( index )->text();
-        case Qt::DecorationRole:
-            return itemFromIndex( index )->icon();
-        case SourcesModel::SortRole:
-            return itemFromIndex( index )->peerSortValue();
-        case SourcesModel::IDRole:
-            return itemFromIndex( index )->IDValue();
-        case SourcesModel::LatchedOnRole:
-        {
-            if ( itemFromIndex( index )->type() == Collection )
-            {
-                SourceItem* cItem = qobject_cast< SourceItem* >( itemFromIndex( index ) );
-                return cItem->localLatchedOn();
-            }
-            return false;
-        }
-        case SourcesModel::LatchedRealtimeRole:
-        {
-            if ( itemFromIndex( index )->type() == Collection )
-            {
-                SourceItem* cItem = qobject_cast< SourceItem* >( itemFromIndex( index ) );
-                return cItem->localLatchMode() == Tomahawk::PlaylistInterface::RealTime;
-            }
-            return false;
-        }
-    }
-    return QVariant();
-}
-
-
-int
-SourcesModel::columnCount( const QModelIndex& ) const
-{
-    return 1;
-}
-
-
-int
-SourcesModel::rowCount( const QModelIndex& parent ) const
-{
-    if( !parent.isValid() )
-    {
-        return m_rootItem->children().count();
-    }
-
-    return itemFromIndex( parent )->children().count();
-}
-
-
-QModelIndex
-SourcesModel::parent( const QModelIndex& child ) const
-{
-    if( !child.isValid() )
-    {
-        return QModelIndex();
-    }
-
-    SourceTreeItem* node = itemFromIndex( child );
-    SourceTreeItem* parent = node->parent();
-    if( parent == m_rootItem )
-        return QModelIndex();
-
-    return createIndex( rowForItem( parent ), 0, parent );
-}
-
-
-QModelIndex
-SourcesModel::index( int row, int column, const QModelIndex& parent ) const
-{
-    if( row < 0 || column < 0 )
-        return QModelIndex();
-
-    if( hasIndex( row, column, parent ) )
-    {
-        SourceTreeItem *parentNode = itemFromIndex( parent );
-        SourceTreeItem *childNode = parentNode->children().at( row );
-        return createIndex( row, column, childNode );
-    }
-
-    return QModelIndex();
-
-}
-
-
-bool
-SourcesModel::setData( const QModelIndex& index, const QVariant& value, int role )
-{
-    SourceTreeItem* item = itemFromIndex( index );
-    return item->setData( value, role );
-}
-
-
-QStringList
-SourcesModel::mimeTypes() const
-{
-    return DropJob::mimeTypes();
-}
-
-
-QMimeData*
-SourcesModel::mimeData( const QModelIndexList& ) const
-{
-    // TODO
-    return new QMimeData();
-}
-
-
-bool
-SourcesModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent )
-{
-    SourceTreeItem* item = 0;
-//    qDebug() << "Got mime data dropped:" << row << column << parent << itemFromIndex( parent )->text();
-    if( row == -1 && column == -1 )
-        item = itemFromIndex( parent );
-    else if( column == 0 )
-        item = itemFromIndex( index( row, column, parent ) );
-    else if( column == -1 ) // column is -1, that means the drop is happening "below" the indices. that means we actually want the one before it
-        item = itemFromIndex( index( row - 1, 0, parent ) );
-
-    Q_ASSERT( item );
-
-//    qDebug() << "Dropping on:" << item->text();
-    return item->dropMimeData( data, action );
-}
-
-
-Qt::DropActions
-SourcesModel::supportedDropActions() const
-{
-#ifdef Q_WS_MAC
-    return Qt::CopyAction | Qt::MoveAction;
-#else
-    return Qt::CopyAction;
-#endif
-}
-
-
-Qt::ItemFlags
-SourcesModel::flags( const QModelIndex& index ) const
-{
-    if ( index.isValid() )
-    {
-        return itemFromIndex( index )->flags();
-    }
-    else
-        return 0;
-}
-
-
-void
-SourcesModel::appendGroups()
-{
-    beginInsertRows( QModelIndex(), rowCount(), rowCount() + 2 );
-
-    GroupItem* browse = new GroupItem( this, m_rootItem, tr( "Browse" ), 0 );
-    new HistoryItem( this, m_rootItem, tr( "Search History" ), 1 );
-//    new SourceTreeItem( this, m_rootItem, SourcesModel::Divider, 2 );
-    m_myMusicGroup = new GroupItem( this, m_rootItem, tr( "My Music" ), 3 );
-
-    // super collection
-    GenericPageItem* sc = new GenericPageItem( this, browse, tr( "SuperCollection" ), QIcon( RESPATH "images/supercollection.png" ),
-                                                  boost::bind( &ViewManager::showSuperCollection, ViewManager::instance() ),
-                                                  boost::bind( &ViewManager::superCollectionView, ViewManager::instance() ) );
-    sc->setSortValue( 1 );
-
-    // browse section
-    GenericPageItem* loved = new GenericPageItem( this, browse, tr( "Top Loved Tracks" ), QIcon( RESPATH "images/loved_playlist.png" ),
-                                                  boost::bind( &ViewManager::showTopLovedPage, ViewManager::instance() ),
-                                                  boost::bind( &ViewManager::topLovedWidget, ViewManager::instance() ) );
-    loved->setSortValue( 2 );
-
-    GenericPageItem* recent = new GenericPageItem( this, browse, tr( "Dashboard" ), QIcon( RESPATH "images/dashboard.png" ),
-                                                   boost::bind( &ViewManager::showWelcomePage, ViewManager::instance() ),
-                                                   boost::bind( &ViewManager::welcomeWidget, ViewManager::instance() ) );
-    recent->setSortValue( 0 );
-
-    GenericPageItem* hot = new GenericPageItem( this, browse, tr( "Charts" ), QIcon( RESPATH "images/charts.png" ),
-                                                boost::bind( &ViewManager::showWhatsHotPage, ViewManager::instance() ),
-                                                boost::bind( &ViewManager::whatsHotWidget, ViewManager::instance() ) );
-    hot->setSortValue( 3 );
-
-    m_collectionsGroup = new GroupItem( this, m_rootItem, tr( "Friends" ), 4 );
-
-    endInsertRows();
-}
-
-
-void
-SourcesModel::appendItem( const Tomahawk::source_ptr& source )
-{
-    GroupItem* parent;
-    if ( !source.isNull() && source->isLocal() )
-    {
-        parent = m_myMusicGroup;
-    }
-    else
-    {
-        parent = m_collectionsGroup;
-    }
-
-    QModelIndex idx = indexFromItem( parent );
-    beginInsertRows( idx, rowCount( idx ), rowCount( idx ) );
-    new SourceItem( this, parent, source );
-    endInsertRows();
-    
-    parent->checkExpandedState();
-}
-
-
-bool
-SourcesModel::removeItem( const Tomahawk::source_ptr& source )
-{
-//    qDebug() << "Removing source item from SourceTree:" << source->friendlyName();
-
-    QModelIndex idx;
-    int rows = rowCount();
-    for ( int row = 0; row < rows; row++ )
-    {
-        QModelIndex idx = index( row, 0, QModelIndex() );
-        SourceItem* item = static_cast< SourceItem* >( idx.internalPointer() );
-        if ( item && item->source() == source )
-        {
-//            qDebug() << "Found removed source item:" << item->source()->userName();
-            beginRemoveRows( QModelIndex(), row, row );
-            m_rootItem->removeChild( item );
-            endRemoveRows();
-
-//             onItemOffline( idx );
-
-            delete item;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-
-void
-SourcesModel::viewPageActivated( Tomahawk::ViewPage* page )
-{
-    if ( !m_sourcesWithViewPage.isEmpty() )
-    {
-        // Hide again any offline sources we exposed, since we're showing a different page now. they'll be re-shown if the user selects a playlist that is from an offline user
-        QList< source_ptr > temp = m_sourcesWithViewPage;
-        m_sourcesWithViewPage.clear();
-        foreach ( const source_ptr& s, temp )
-        {
-            QModelIndex idx = indexFromItem( m_sourcesWithViewPageItems.value( s ) );
-            emit dataChanged( idx, idx );
-        }
-        m_sourcesWithViewPageItems.clear();
-    }
-
-    if ( m_sourceTreeLinks.contains( page ) )
-    {
-        Q_ASSERT( m_sourceTreeLinks page  );
-//        qDebug() << "Got view page activated for item:" << m_sourceTreeLinks page ->text();
-        QModelIndex idx = indexFromItem( m_sourceTreeLinks page  );
-
-        if ( !idx.isValid() )
-            m_sourceTreeLinks.remove( page );
-        else
-            emit selectRequest( QPersistentModelIndex( idx ) );
-    }
-    else
-    {
-        playlist_ptr p = ViewManager::instance()->playlistForPage( page );
-        // HACK
-        // try to find it if it is a playlist. not pretty at all.... but this happens when ViewManager loads a playlist or dynplaylist NOT from the sidebar but from somewhere else
-        // we don't know which sourcetreeitem is related to it, so we have to find it. we also don't know if this page is a playlist or dynplaylist or not, but we can't check as we can't
-        // include DynamicWidget.h here (so can't dynamic_cast).
-        // this could also be fixed by keeping a master list of playlists/sourcetreeitems... but that's even uglier i think. this is only called the first time a certain viewpage is clicked from external
-        // sources.
-        SourceTreeItem* item = activatePlaylistPage( page, m_rootItem );
-        m_viewPageDelayedCacheItem = page;
-
-        if ( !p.isNull() )
-        {
-            source_ptr s= p->author();
-            if ( !s.isNull() && !s->isOnline() && item )
-            {
-                m_sourcesWithViewPage << s;
-
-                // show the collection now... yeah.
-                if ( !item->parent() || !item->parent()->parent() )
-                {
-                    tLog() << "Found playlist item with no category parent or collection parent!" << item->text();
-                    return;
-                }
-
-                SourceTreeItem* collectionOfPlaylist = item->parent()->parent();
-                if ( !m_rootItem->children().contains( collectionOfPlaylist ) ) // verification to make sure we're not stranded
-                {
-                    tLog() << "Got what we assumed to be a parent col of a playlist not as a child of our root node...:" << collectionOfPlaylist;
-                    return;
-                }
-
-                QModelIndex idx = indexFromItem( collectionOfPlaylist );
-                m_sourcesWithViewPageItems s  = collectionOfPlaylist;
-                tDebug() << "Emitting dataChanged for offline source:" << idx << idx.isValid() << collectionOfPlaylist << collectionOfPlaylist->text();
-                emit dataChanged( idx, idx );
-            }
-        }
-    }
-}
-
-
-SourceTreeItem*
-SourcesModel::activatePlaylistPage( ViewPage* p, SourceTreeItem* i )
-{
-    if( !i )
-        return 0;
-
-    if( qobject_cast< PlaylistItem* >( i ) &&
-        qobject_cast< PlaylistItem* >( i )->activateCurrent() )
-        return i;
-
-    SourceTreeItem* ret = 0;
-    for( int k = 0; k < i->children().size(); k++ )
-    {
-        if( SourceTreeItem* retItem = activatePlaylistPage( p, i->children().at( k ) ) )
-            ret = retItem;
-    }
-
-    return ret;
-}
-
-
-void
-SourcesModel::loadSources()
-{
-    QList<source_ptr> sources = SourceList::instance()->sources();
-
-    foreach( const source_ptr& source, sources )
-        appendItem( source );
-}
-
-
-void
-SourcesModel::onSourcesAdded( const QList<source_ptr>& sources )
-{
-    foreach( const source_ptr& source, sources )
-        appendItem( source );
-}
-
-
-void
-SourcesModel::onSourceAdded( const source_ptr& source )
-{
-    appendItem( source );
-}
-
-
-void
-SourcesModel::onSourceRemoved( const source_ptr& source )
-{
-    removeItem( source );
-}
-
-
-void
-SourcesModel::itemUpdated()
-{
-    Q_ASSERT( qobject_cast< SourceTreeItem* >( sender() ) );
-    SourceTreeItem* item = qobject_cast< SourceTreeItem* >( sender() );
-
-    if( !item )
-        return;
-
-    QModelIndex idx = indexFromItem( item );
-    if( idx.isValid() )
-        emit dataChanged( idx, idx );
-}
-
-
-void
-SourcesModel::onItemRowsAddedBegin( int first, int last )
-{
-    Q_ASSERT( qobject_cast< SourceTreeItem* >( sender() ) );
-    SourceTreeItem* item = qobject_cast< SourceTreeItem* >( sender() );
-
-    if( !item )
-        return;
-
-    QModelIndex idx = indexFromItem( item );
-    beginInsertRows( idx, first, last );
-}
-
-
-void
-SourcesModel::onItemRowsAddedDone()
-{
-    Q_ASSERT( qobject_cast< SourceTreeItem* >( sender() ) );
-
-    endInsertRows();
-}
-
-
-void
-SourcesModel::onItemRowsRemovedBegin( int first, int last )
-{
-    Q_ASSERT( qobject_cast< SourceTreeItem* >( sender() ) );
-    SourceTreeItem* item = qobject_cast< SourceTreeItem* >( sender() );
-
-    if( !item )
-        return;
-
-    QModelIndex idx = indexFromItem( item );
-    beginRemoveRows( idx, first, last );
-}
-
-
-void
-SourcesModel::onItemRowsRemovedDone()
-{
-    Q_ASSERT( qobject_cast< SourceTreeItem* >( sender() ) );
-
-    endRemoveRows();
-}
-
-
-void
-SourcesModel::linkSourceItemToPage( SourceTreeItem* item, ViewPage* p )
-{
-    // TODO handle removal
-    m_sourceTreeLinks p  = item;
-
-    if( m_viewPageDelayedCacheItem == p )
-        emit selectRequest( QPersistentModelIndex( indexFromItem( item ) ) );
-
-    if ( QObject* obj = dynamic_cast< QObject* >( p ) )
-    {
-        if( obj->metaObject()->indexOfSignal( "destroyed(QWidget*)" ) > -1 )
-            connect( obj, SIGNAL( destroyed( QWidget* ) ), SLOT( onWidgetDestroyed( QWidget* ) ), Qt::UniqueConnection );
-    }
-    m_viewPageDelayedCacheItem = 0;
-}
-
-
-void
-SourcesModel::onWidgetDestroyed( QWidget* w )
-{
-    int ret = m_sourceTreeLinks.remove( dynamic_cast< Tomahawk::ViewPage* > ( w ) );
-    qDebug() << "REMOVED STALE SOURCE PAGE?" << ret;
-}
-
-
-void
-SourcesModel::removeSourceItemLink( SourceTreeItem* item )
-{
-    QList< ViewPage* > pages = m_sourceTreeLinks.keys( item );
-    foreach( ViewPage* p, pages )
-        m_sourceTreeLinks.remove( p );
-}
-
-
-SourceTreeItem*
-SourcesModel::itemFromIndex( const QModelIndex& idx ) const
-{
-    if( !idx.isValid() )
-        return m_rootItem;
-
-    Q_ASSERT( idx.internalPointer() );
-
-    return reinterpret_cast< SourceTreeItem* >( idx.internalPointer() );
-}
-
-
-QModelIndex
-SourcesModel::indexFromItem( SourceTreeItem* item ) const
-{
-    if( !item || !item->parent() ) // should never happen..
-        return QModelIndex();
-
-    // reconstructs a modelindex from a sourcetreeitem that is somewhere in the tree
-    // traverses the item to the root node, then rebuilds the qmodeindices from there back down
-    // each int is the row of that item in the parent.
-    /**
-     * In this diagram, if the \param item is G, childIndexList will contain 0, 2, 0
-     *
-     *    A
-     *      D
-     *      E
-     *      F
-     *        G
-     *        H
-     *    B
-     *    C
-     *
-     **/
-    QList< int > childIndexList;
-    SourceTreeItem* curItem = item;
-    while( curItem != m_rootItem ) {
-        int row  = rowForItem( curItem );
-        if( row < 0 ) // something went wrong, bail
-            return QModelIndex();
-
-        childIndexList << row;
-
-        curItem = curItem->parent();
-    }
-//     qDebug() << "build child index list:" << childIndexList;
-    // now rebuild the qmodelindex we need
-    QModelIndex idx;
-    for( int i = childIndexList.size() - 1; i >= 0 ; i-- ) {
-        idx = index( childIndexList i , 0, idx );
-    }
-//     qDebug() << "Got index from item:" << idx << idx.data( Qt::DisplayRole ).toString();
-//     qDebug() << "parent:" << idx.parent();
-    return idx;
-}
-
-
-int
-SourcesModel::rowForItem( SourceTreeItem* item ) const
-{
-    if ( !item || !item->parent() || !item->parent()->children().contains( item ) )
-        return -1;
-
-    return item->parent()->children().indexOf( item );
-}
-
-
-void
-SourcesModel::itemSelectRequest( SourceTreeItem* item )
-{
-    emit selectRequest( QPersistentModelIndex( indexFromItem( item ) ) );
-}
-
-
-void
-SourcesModel::itemExpandRequest( SourceTreeItem *item )
-{
-    emit expandRequest( QPersistentModelIndex( indexFromItem( item ) ) );
-}
-
-
-void
-SourcesModel::itemToggleExpandRequest( SourceTreeItem *item )
-{
-    emit toggleExpandRequest( QPersistentModelIndex( indexFromItem( item ) ) );
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/sourcesmodel.h Deleted

@@ -1,151 +0,0 @@
-/* === 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
- *   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 SOURCESMODEL_H
-#define SOURCESMODEL_H
-
-#include <QModelIndex>
-#include <QStringList>
-
-#include "typedefs.h"
-#include "source.h"
-
-class QMimeData;
-
-class SourceTreeItem;
-class GroupItem;
-
-namespace Tomahawk {
-    class Source;
-    class Playlist;
-    class ViewPage;
-}
-
-class SourcesModel : public QAbstractItemModel
-{
-    Q_OBJECT
-public:
-    enum RowType {
-        Invalid = -1,
-        Divider = 9,
-
-        Collection = 0,
-        Group = 8,
-
-        Category = 1,
-        CategoryAdd = 2,
-
-        StaticPlaylist = 3,
-        AutomaticPlaylist = 4,
-        Station = 5,
-
-        GenericPage = 6,
-        TemporaryPage = 7
-    };
-
-    enum CategoryType {
-        PlaylistsCategory = 0,
-        StationsCategory = 1
-    };
-
-    enum Roles {
-        SourceTreeItemRole      = Qt::UserRole + 10,
-        SourceTreeItemTypeRole  = Qt::UserRole + 11,
-        SortRole                = Qt::UserRole + 12,
-        IDRole                  = Qt::UserRole + 13,
-        LatchedOnRole           = Qt::UserRole + 14,
-        LatchedRealtimeRole     = Qt::UserRole + 15
-    };
-
-    SourcesModel( QObject* parent = 0 );
-    virtual ~SourcesModel();
-
-    static QString rowTypeToString( RowType type );
-
-    // reimplemented from QAIM
-    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
-    virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
-    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
-    virtual QModelIndex parent(const QModelIndex& child) const;
-    virtual QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const;
-    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
-
-    virtual QStringList mimeTypes() const;
-    virtual QMimeData* mimeData(const QModelIndexList& indexes) const;
-    virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
-    virtual Qt::DropActions supportedDropActions() const;
-    virtual Qt::ItemFlags flags(const QModelIndex& index) const;
-
-    void appendGroups();
-
-    void appendItem( const Tomahawk::source_ptr& source );
-    bool removeItem( const Tomahawk::source_ptr& source );
-
-    void linkSourceItemToPage( SourceTreeItem* item, Tomahawk::ViewPage* p );
-    void removeSourceItemLink( SourceTreeItem* item );
-
-    QModelIndex indexFromItem( SourceTreeItem* item ) const;
-
-    QList< Tomahawk::source_ptr > sourcesWithViewPage() const { return m_sourcesWithViewPage; }
-
-public slots:
-    void loadSources();
-
-    void itemUpdated();
-    void onItemRowsAddedBegin( int first, int last );
-    void onItemRowsAddedDone();
-    void onItemRowsRemovedBegin( int first, int last );
-    void onItemRowsRemovedDone();
-
-    void viewPageActivated( Tomahawk::ViewPage* );
-
-    void itemSelectRequest( SourceTreeItem* item );
-    void itemExpandRequest( SourceTreeItem* item );
-    void itemToggleExpandRequest( SourceTreeItem* item );
-
-signals:
-    void selectRequest( const QPersistentModelIndex& idx );
-    void expandRequest( const QPersistentModelIndex& idx );
-    void toggleExpandRequest( const QPersistentModelIndex& idx );
-
-private slots:
-    void onSourcesAdded( const QList<Tomahawk::source_ptr>& sources );
-    void onSourceAdded( const Tomahawk::source_ptr& source );
-    void onSourceRemoved( const Tomahawk::source_ptr& source );
-
-    void onWidgetDestroyed( QWidget* w );
-
-private:
-    SourceTreeItem* itemFromIndex( const QModelIndex& idx ) const;
-    int rowForItem( SourceTreeItem* item ) const;
-    SourceTreeItem* activatePlaylistPage( Tomahawk::ViewPage* p, SourceTreeItem* i );
-
-    SourceTreeItem* m_rootItem;
-    GroupItem* m_collectionsGroup;
-    GroupItem* m_myMusicGroup;
-
-    QList< Tomahawk::source_ptr > m_sourcesWithViewPage;
-    QHash< Tomahawk::source_ptr, SourceTreeItem* > m_sourcesWithViewPageItems;
-
-    QHash< Tomahawk::ViewPage*, SourceTreeItem* > m_sourceTreeLinks;
-    Tomahawk::ViewPage* m_viewPageDelayedCacheItem;
-};
-
-#endif // SOURCESMODEL_H

tomahawk-0.4.2.tar.bz2/src/sourcetree/sourcesproxymodel.cpp Deleted

@@ -1,130 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 "sourcesproxymodel.h"
-
-#include <QtGui/QTreeView>
-
-#include "sourcelist.h"
-#include "sourcesmodel.h"
-#include "sourcetree/items/sourceitem.h"
-
-#include "utils/logger.h"
-
-
-SourcesProxyModel::SourcesProxyModel( SourcesModel* model, QObject* parent )
-    : QSortFilterProxyModel( parent )
-    , m_model( model )
-    , m_filtered( false )
-{
-    setDynamicSortFilter( true );
-    setSortRole( SourcesModel::SortRole );
-
-    setSourceModel( model );
-
-    connect( model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( onModelChanged() ) );
-    connect( model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), SLOT( onModelChanged() ) );
-
-    if ( model && model->metaObject()->indexOfSignal( "toggleExpandRequest(QPersistentModelIndex)" ) > -1 )
-        connect( model, SIGNAL( toggleExpandRequest( QPersistentModelIndex ) ), this, SLOT( toggleExpandRequested( QPersistentModelIndex ) ), Qt::QueuedConnection );
-    if ( model && model->metaObject()->indexOfSignal( "expandRequest(QPersistentModelIndex)" ) > -1 )
-        connect( model, SIGNAL( expandRequest( QPersistentModelIndex ) ), this, SLOT( expandRequested( QPersistentModelIndex ) ), Qt::QueuedConnection );
-    if ( model && model->metaObject()->indexOfSignal( "selectRequest(QPersistentModelIndex)" ) > -1 )
-        connect( model, SIGNAL( selectRequest( QPersistentModelIndex ) ), this, SLOT( selectRequested( QPersistentModelIndex ) ), Qt::QueuedConnection );
-}
-
-
-void
-SourcesProxyModel::showOfflineSources( bool offlineSourcesShown )
-{
-    m_filtered = !offlineSourcesShown;
-    invalidateFilter();
-}
-
-
-bool
-SourcesProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
-{
-    // always filter empty top-level groups
-    SourceTreeItem* item = m_model->data( sourceModel()->index( sourceRow, 0, sourceParent ), SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
-
-    if ( item && item->type() != SourcesModel::Divider && item->parent()->parent() == 0 && !item->children().count() )
-        return false;
-   
-    if ( !m_filtered )
-        return true;
-
-    SourceItem* sti = qobject_cast< SourceItem* >( item );
-    if ( sti )
-    {
-        if ( sti->source().isNull() || sti->source()->isOnline() )
-            return true;
-        else if ( m_model->sourcesWithViewPage().contains( sti->source() ) )
-            return true;
-        else
-            return false;
-    }
-
-    // accept rows that aren't sources
-    return true;
-}
-
-
-void
-SourcesProxyModel::selectRequested( const QPersistentModelIndex& idx )
-{
-    emit selectRequest( QPersistentModelIndex( mapFromSource( idx ) ) );
-}
-
-
-void
-SourcesProxyModel::expandRequested( const QPersistentModelIndex& idx )
-{
-    emit expandRequest( QPersistentModelIndex( mapFromSource( idx ) ) );
-}
-
-
-void
-SourcesProxyModel::toggleExpandRequested( const QPersistentModelIndex& idx )
-{
-    emit toggleExpandRequest( QPersistentModelIndex( mapFromSource( idx ) ) );
-}
-
-
-bool
-SourcesProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
-{
-    if ( m_model->data( left, SourcesModel::SortRole ) != m_model->data( right, SourcesModel::SortRole ) )
-        return ( m_model->data( left, SourcesModel::SortRole ).toInt() < m_model->data( right, SourcesModel::SortRole ).toInt() );
-
-    const QString& lefts = left.data().toString().toLower();
-    const QString& rights = right.data().toString().toLower();
-
-    if ( lefts == rights )
-        return ( m_model->data( left, SourcesModel::IDRole ).toInt() < m_model->data( right, SourcesModel::IDRole ).toInt() );
-    else
-        return QString::localeAwareCompare( lefts, rights ) < 0;
-}
-
-
-void
-SourcesProxyModel::onModelChanged()
-{
-    invalidateFilter();
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/sourcesproxymodel.h Deleted

@@ -1,58 +0,0 @@
-/* === 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 SOURCESPROXYMODEL_H
-#define SOURCESPROXYMODEL_H
-
-#include <QtGui/QSortFilterProxyModel>
-
-class SourcesModel;
-
-class SourcesProxyModel : public QSortFilterProxyModel
-{
-Q_OBJECT
-
-public:
-    explicit SourcesProxyModel( SourcesModel* model, QObject* parent = 0 );
-
-public slots:
-    void showOfflineSources( bool offlineSourcesShown );
-
-    void selectRequested( const QPersistentModelIndex& );
-    void expandRequested( const QPersistentModelIndex& );
-    void toggleExpandRequested( const QPersistentModelIndex& );
-
-signals:
-    void selectRequest( const QPersistentModelIndex& idx );
-    void expandRequest( const QPersistentModelIndex& idx );
-    void toggleExpandRequest( const QPersistentModelIndex& idx );
-
-protected:
-    bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const;
-    bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
-
-private slots:
-    void onModelChanged();
-
-private:
-    SourcesModel* m_model;
-
-    bool m_filtered;
-};
-
-#endif // SOURCESPROXYMODEL_H

tomahawk-0.4.2.tar.bz2/src/sourcetree/sourcetreeview.cpp Deleted

@@ -1,710 +0,0 @@
-/* === 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
- *   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 "sourcetreeview.h"
-
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QContextMenuEvent>
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPainter>
-#include <QtGui/QStyledItemDelegate>
-#include <QtCore/QSize>
-#include <QtGui/QFileDialog>
-
-#include "actioncollection.h"
-#include "playlist.h"
-#include "viewmanager.h"
-#include "sourcesproxymodel.h"
-#include "sourcelist.h"
-#include "sourcedelegate.h"
-#include "sourcetree/items/playlistitems.h"
-#include "sourcetree/items/sourceitem.h"
-#include "audio/audioengine.h"
-#include "sourceplaylistinterface.h"
-#include "tomahawksettings.h"
-#include "globalactionmanager.h"
-#include "dropjob.h"
-#include "utils/logger.h"
-#include "items/genericpageitems.h"
-#include "items/temporarypageitem.h"
-#include "database/databasecommand_socialaction.h"
-#include "database/database.h"
-#include "LatchManager.h"
-
-using namespace Tomahawk;
-
-
-SourceTreeView::SourceTreeView( QWidget* parent )
-    : QTreeView( parent )
-    , m_latchManager( new LatchManager( this ) )
-    , m_dragging( false )
-{
-    setProperty( "flattenBranches", QVariant( true ) );
-
-    setFrameShape( QFrame::NoFrame );
-    setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    setContentsMargins( 0, 0, 0, 0 );
-    setMinimumWidth( 220 );
-
-    setHeaderHidden( true );
-    setRootIsDecorated( true );
-    setExpandsOnDoubleClick( false );
-
-    setSelectionBehavior( QAbstractItemView::SelectRows );
-    setDragDropMode( QAbstractItemView::DropOnly );
-    setAcceptDrops( true );
-    setDropIndicatorShown( false );
-    setAllColumnsShowFocus( true );
-    setUniformRowHeights( false );
-    setIndentation( 0 );
-    setSortingEnabled( true );
-    sortByColumn( 0, Qt::AscendingOrder );
-    setVerticalScrollMode( QTreeView::ScrollPerPixel );
-    setMouseTracking( true );
-    setEditTriggers( NoEditTriggers );
-
-    // TODO animation conflicts with the expanding-playlists-when-collection-is-null
-    // so investigate
-//     setAnimated( true );
-
-    m_delegate = new SourceDelegate( this );
-    connect( m_delegate, SIGNAL( latchOn( Tomahawk::source_ptr ) ), SLOT( latchOnOrCatchUp( Tomahawk::source_ptr ) ) );
-    connect( m_delegate, SIGNAL( latchOff( Tomahawk::source_ptr ) ), SLOT( latchOff( Tomahawk::source_ptr ) ) );
-    connect( m_delegate, SIGNAL( toggleRealtimeLatch( Tomahawk::source_ptr, bool ) ), m_latchManager, SLOT( latchModeChangeRequest( Tomahawk::source_ptr,bool ) ) );
-    connect( m_delegate, SIGNAL( clicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
-    connect( m_delegate, SIGNAL( doubleClicked( QModelIndex ) ), SLOT( onItemDoubleClicked( QModelIndex ) ) );
-
-    setItemDelegate( m_delegate );
-
-    setContextMenuPolicy( Qt::CustomContextMenu );
-    connect( this, SIGNAL( customContextMenuRequested( QPoint ) ), SLOT( onCustomContextMenu( QPoint ) ) );
-
-    m_model = new SourcesModel( this );
-    m_proxyModel = new SourcesProxyModel( m_model, this );
-    connect( m_proxyModel, SIGNAL( selectRequest( QPersistentModelIndex ) ), SLOT( selectRequest( QPersistentModelIndex ) ), Qt::QueuedConnection );
-    connect( m_proxyModel, SIGNAL( expandRequest( QPersistentModelIndex ) ), SLOT( expandRequest( QPersistentModelIndex ) ) );
-    connect( m_proxyModel, SIGNAL( toggleExpandRequest( QPersistentModelIndex ) ), SLOT( toggleExpandRequest( QPersistentModelIndex ) ) );
-
-    setModel( m_proxyModel );
-
-    header()->setStretchLastSection( false );
-    header()->setResizeMode( 0, QHeaderView::Stretch );
-
-    connect( this, SIGNAL( expanded( QModelIndex ) ), SLOT( onItemExpanded( QModelIndex ) ) );
-//     connect( selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ), SLOT( onSelectionChanged() ) );
-
-    showOfflineSources( TomahawkSettings::instance()->showOfflineSources() );
-
-    // Light-blue sourcetree on osx
-#ifdef Q_WS_MAC
-    setStyleSheet( "SourceTreeView:active { background: #DDE4EB; } "
-                   "SourceTreeView        { background: #EDEDED; } " );
-#endif
-
-    connect( this, SIGNAL( latchRequest( Tomahawk::source_ptr ) ), m_latchManager, SLOT( latchRequest( Tomahawk::source_ptr ) ) );
-    connect( this, SIGNAL( unlatchRequest( Tomahawk::source_ptr ) ), m_latchManager, SLOT( unlatchRequest( Tomahawk::source_ptr ) ) );
-    connect( this, SIGNAL( catchUpRequest() ), m_latchManager, SLOT( catchUpRequest() ) );
-    connect( this, SIGNAL( latchModeChangeRequest( Tomahawk::source_ptr, bool ) ), m_latchManager, SLOT( latchModeChangeRequest( Tomahawk::source_ptr, bool ) ) );
-
-    connect( ActionCollection::instance(), SIGNAL( privacyModeChanged() ), SLOT( repaint() ) );
-}
-
-
-SourceTreeView::~SourceTreeView()
-{
-}
-
-
-void
-SourceTreeView::setupMenus()
-{
-    m_playlistMenu.clear();
-    m_roPlaylistMenu.clear();
-    m_latchMenu.clear();
-    m_privacyMenu.clear();
-
-    bool readonly = true;
-    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
-    if ( type == SourcesModel::StaticPlaylist || type == SourcesModel::AutomaticPlaylist || type == SourcesModel::Station )
-    {
-
-        PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
-        playlist_ptr playlist = item->playlist();
-        if ( !playlist.isNull() )
-        {
-            readonly = !playlist->author()->isLocal();
-        }
-    }
-
-    QAction* latchOnAction = ActionCollection::instance()->getAction( "latchOn" );
-    m_latchMenu.addAction( latchOnAction );
-
-    m_privacyMenu.addAction( ActionCollection::instance()->getAction( "togglePrivacy" ) );
-
-    if ( type == SourcesModel::Collection )
-    {
-        SourceItem* item = itemFromIndex< SourceItem >( m_contextMenuIndex );
-        source_ptr source = item->source();
-        if ( !source.isNull() )
-        {
-            if ( m_latchManager->isLatched( source ) )
-            {
-                QAction *latchOffAction = ActionCollection::instance()->getAction( "latchOff" );
-                m_latchMenu.addAction( latchOffAction );
-                connect( latchOffAction, SIGNAL( triggered() ), SLOT( latchOff() ) );
-                m_latchMenu.addSeparator();
-                QAction *latchRealtimeAction = ActionCollection::instance()->getAction( "realtimeFollowingAlong" );
-                latchRealtimeAction->setChecked( source->playlistInterface()->latchMode() == Tomahawk::PlaylistInterface::RealTime );
-                m_latchMenu.addAction( latchRealtimeAction );
-                connect( latchRealtimeAction, SIGNAL( toggled( bool ) ), SLOT( latchModeToggled( bool ) ) );
-            }
-        }
-    }
-
-    QAction *loadPlaylistAction = ActionCollection::instance()->getAction( "loadPlaylist" );
-    m_playlistMenu.addAction( loadPlaylistAction );
-    QAction *renamePlaylistAction = ActionCollection::instance()->getAction( "renamePlaylist" );
-    m_playlistMenu.addAction( renamePlaylistAction );
-    m_playlistMenu.addSeparator();
-
-    QAction *copyPlaylistAction = m_playlistMenu.addAction( tr( "&Copy Link" ) );
-    QAction *deletePlaylistAction = m_playlistMenu.addAction( tr( "&Delete %1" ).arg( SourcesModel::rowTypeToString( type ) ) );
-
-    QString addToText = QString( "Add to my %1" );
-    if ( type == SourcesModel::StaticPlaylist )
-        addToText = addToText.arg( "Playlists" );
-    if ( type == SourcesModel::AutomaticPlaylist )
-        addToText = addToText.arg( "Automatic Playlists" );
-    else if ( type == SourcesModel::Station )
-        addToText = addToText.arg( "Stations" );
-
-    QAction *addToLocalAction = m_roPlaylistMenu.addAction( tr( addToText.toUtf8(), "Adds the given playlist, dynamic playlist, or station to the users's own list" ) );
-
-    m_roPlaylistMenu.addAction( copyPlaylistAction );
-    deletePlaylistAction->setEnabled( !readonly );
-    renamePlaylistAction->setEnabled( !readonly );
-    addToLocalAction->setEnabled( readonly );
-
-    if ( type == SourcesModel::StaticPlaylist )
-        copyPlaylistAction->setText( tr( "&Export Playlist" ) );
-
-    connect( loadPlaylistAction,   SIGNAL( triggered() ), SLOT( loadPlaylist() ) );
-    connect( renamePlaylistAction, SIGNAL( triggered() ), SLOT( renamePlaylist() ) );
-    connect( deletePlaylistAction, SIGNAL( triggered() ), SLOT( deletePlaylist() ) );
-    connect( copyPlaylistAction,   SIGNAL( triggered() ), SLOT( copyPlaylistLink() ) );
-    connect( addToLocalAction,     SIGNAL( triggered() ), SLOT( addToLocal() ) );
-    connect( latchOnAction,        SIGNAL( triggered() ), SLOT( latchOnOrCatchUp() ), Qt::QueuedConnection );
-}
-
-
-void
-SourceTreeView::showOfflineSources( bool offlineSourcesShown )
-{
-    m_proxyModel->showOfflineSources( offlineSourcesShown );
-}
-
-
-void
-SourceTreeView::onItemActivated( const QModelIndex& index )
-{
-    if ( !index.isValid() || !index.flags().testFlag( Qt::ItemIsEnabled ) )
-        return;
-
-    SourceTreeItem* item = itemFromIndex< SourceTreeItem >( index );
-    item->activate();
-}
-
-
-void
-SourceTreeView::onItemDoubleClicked( const QModelIndex& idx )
-{
-    if ( !selectionModel()->selectedIndexes().contains( idx ) )
-        onItemActivated( idx );
-
-    SourceTreeItem* item = itemFromIndex< SourceTreeItem >( idx );
-    item->doubleClicked();
-}
-
-
-void
-SourceTreeView::onItemExpanded( const QModelIndex& idx )
-{
-    // make sure to expand children nodes for collections
-    if( idx.data( SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::Collection )
-    {
-       for( int i = 0; i < model()->rowCount( idx ); i++ )
-       {
-           setExpanded( model()->index( i, 0, idx ), true );
-       }
-    }
-}
-
-
-void
-SourceTreeView::selectRequest( const QPersistentModelIndex& idx )
-{
-    if ( !selectionModel()->selectedIndexes().contains( idx ) )
-    {
-        scrollTo( idx, QTreeView::EnsureVisible );
-        selectionModel()->select( idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Current );
-    }
-}
-
-
-void
-SourceTreeView::expandRequest( const QPersistentModelIndex& idx )
-{
-    expand( idx );
-}
-
-
-void
-SourceTreeView::toggleExpandRequest( const QPersistentModelIndex& idx )
-{
-    if ( isExpanded( idx ) )
-        collapse( idx );
-    else
-        expand( idx );
-}
-
-
-void
-SourceTreeView::loadPlaylist()
-{
-    onItemActivated( m_contextMenuIndex );
-}
-
-
-void
-SourceTreeView::deletePlaylist( const QModelIndex& idxIn )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    QModelIndex idx = idxIn.isValid() ? idxIn : m_contextMenuIndex;
-    if ( !idx.isValid() )
-        return;
-
-    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( idx, SourcesModel::SourceTreeItemTypeRole ).toInt();
-    if ( type == SourcesModel::StaticPlaylist )
-    {
-        PlaylistItem* item = itemFromIndex< PlaylistItem >( idx );
-        playlist_ptr playlist = item->playlist();
-        Playlist::remove( playlist );
-    }
-    else if( type == SourcesModel::AutomaticPlaylist || type == SourcesModel::Station )
-    {
-        DynamicPlaylistItem* item = itemFromIndex< DynamicPlaylistItem >( idx );
-        dynplaylist_ptr playlist = item->dynPlaylist();
-        DynamicPlaylist::remove( playlist );
-    }
-}
-
-
-void
-SourceTreeView::copyPlaylistLink()
-{
-    QModelIndex idx = m_contextMenuIndex;
-    if ( !idx.isValid() )
-        return;
-
-    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
-    if( type == SourcesModel::AutomaticPlaylist || type == SourcesModel::Station )
-    {
-        DynamicPlaylistItem* item = itemFromIndex< DynamicPlaylistItem >( m_contextMenuIndex );
-        dynplaylist_ptr playlist = item->dynPlaylist();
-        GlobalActionManager::instance()->copyPlaylistToClipboard( playlist );
-    }
-    else if ( type == SourcesModel::StaticPlaylist )
-    {
-        PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
-        playlist_ptr playlist = item->playlist();
-
-        QString suggestedFilename = TomahawkSettings::instance()->playlistDefaultPath() + "/" + playlist->title();
-        QString filename = QFileDialog::getSaveFileName( TomahawkUtils::tomahawkWindow(), tr( "Save XSPF" ),
-                                                         suggestedFilename, tr( "Playlists (*.xspf)" ) );
-        if ( !filename.isEmpty() )
-        {
-            QFileInfo playlistAbsoluteFilePath = filename;
-            TomahawkSettings::instance()->setPlaylistDefaultPath( playlistAbsoluteFilePath.absolutePath() );
-            GlobalActionManager::instance()->savePlaylistToFile( playlist, filename );
-        }
-    }
-}
-
-
-void
-SourceTreeView::addToLocal()
-{
-    QModelIndex idx = m_contextMenuIndex;
-    if ( !idx.isValid() )
-        return;
-
-    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
-    if( type == SourcesModel::AutomaticPlaylist || type == SourcesModel::Station )
-    {
-        DynamicPlaylistItem* item = itemFromIndex< DynamicPlaylistItem >( m_contextMenuIndex );
-        dynplaylist_ptr playlist = item->dynPlaylist();
-
-        // copy to a link and then generate a new playlist from that
-        // this way we cheaply regenerate the needed controls
-        QString link = GlobalActionManager::instance()->copyPlaylistToClipboard( playlist );
-        GlobalActionManager::instance()->parseTomahawkLink( link );
-    }
-    else if ( type == SourcesModel::StaticPlaylist )
-    {
-        PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
-        playlist_ptr playlist = item->playlist();
-
-        // just create the new playlist with the same values
-        QList< query_ptr > queries;
-        foreach( const plentry_ptr& e, playlist->entries() )
-            queries << e->query();
-
-        playlist_ptr newpl = Playlist::create( SourceList::instance()->getLocal(), uuid(), playlist->title(), playlist->info(), playlist->creator(), playlist->shared(), queries );
-    }
-}
-
-
-void
-SourceTreeView::latchOnOrCatchUp()
-{
-    disconnect( this, SLOT( latchOnOrCatchUp() ) );
-    if ( !m_contextMenuIndex.isValid() )
-        return;
-
-    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
-    if( type != SourcesModel::Collection )
-        return;
-
-    SourceItem* item = itemFromIndex< SourceItem >( m_contextMenuIndex );
-    source_ptr source = item->source();
-
-    latchOnOrCatchUp( source );
-}
-
-
-void
-SourceTreeView::latchOff()
-{
-    disconnect( this, SLOT( latchOff() ) );
-    qDebug() << Q_FUNC_INFO;
-    if ( !m_contextMenuIndex.isValid() )
-        return;
-
-    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
-    if( type != SourcesModel::Collection )
-        return;
-
-    const SourceItem* item = itemFromIndex< SourceItem >( m_contextMenuIndex );
-    const source_ptr source = item->source();
-
-    latchOff( source );
-}
-
-
-void
-SourceTreeView::latchOnOrCatchUp( const Tomahawk::source_ptr& source )
-{
-    if ( m_latchManager->isLatched( source ) )
-        emit catchUpRequest();
-    else
-        emit latchRequest( source );
-}
-
-
-void
-SourceTreeView::latchOff( const Tomahawk::source_ptr& source )
-{
-    emit unlatchRequest( source );
-}
-
-
-void
-SourceTreeView::latchModeToggled( bool checked )
-{
-
-    disconnect( this, SLOT( latchOff() ) );
-    qDebug() << Q_FUNC_INFO;
-    if ( !m_contextMenuIndex.isValid() )
-        return;
-
-    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
-    if( type != SourcesModel::Collection )
-        return;
-
-    const SourceItem* item = itemFromIndex< SourceItem >( m_contextMenuIndex );
-    const source_ptr source = item->source();
-    emit latchModeChangeRequest( source, checked );
-}
-
-
-void
-SourceTreeView::renamePlaylist()
-{
-    if( !m_contextMenuIndex.isValid() && !selectionModel()->selectedIndexes().isEmpty() )
-        edit( selectionModel()->selectedIndexes().first() );
-    else
-        edit( m_contextMenuIndex );
-}
-
-
-void
-SourceTreeView::onCustomContextMenu( const QPoint& pos )
-{
-    qDebug() << Q_FUNC_INFO;
-
-    QModelIndex idx = m_contextMenuIndex = indexAt( pos );
-    if ( !idx.isValid() )
-        return;
-
-    setupMenus();
-
-    if ( model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::StaticPlaylist ||
-         model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::AutomaticPlaylist ||
-         model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::Station )
-    {
-        PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
-        if( item->playlist()->author()->isLocal() )
-            m_playlistMenu.exec( mapToGlobal( pos ) );
-        else
-            m_roPlaylistMenu.exec( mapToGlobal( pos ) );
-    }
-    else if ( model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::Collection )
-    {
-        SourceItem* item = itemFromIndex< SourceItem >( m_contextMenuIndex );
-        if ( !item->source().isNull() && !item->source()->isLocal() )
-            m_latchMenu.exec( mapToGlobal( pos ) );
-        else if ( !item->source().isNull() )
-            m_privacyMenu.exec( mapToGlobal( pos ) );
-    }
-}
-
-
-void
-SourceTreeView::dragEnterEvent( QDragEnterEvent* event )
-{
-    qDebug() << Q_FUNC_INFO;
-    QTreeView::dragEnterEvent( event );
-
-    if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Track | DropJob::Artist | DropJob::Album | DropJob::Playlist,  DropJob::Create ) )
-    {
-           m_dragging = true;
-           m_dropRect = QRect();
-           m_dropIndex = QPersistentModelIndex();
-
-           qDebug() << Q_FUNC_INFO << "Accepting Drag Event";
-           event->setDropAction( Qt::CopyAction );
-           event->acceptProposedAction();
-     }
-}
-
-
-void
-SourceTreeView::dragLeaveEvent( QDragLeaveEvent* event )
-{
-    QTreeView::dragLeaveEvent( event );
-
-    m_dragging = false;
-    setDirtyRegion( m_dropRect );
-
-    m_delegate->dragLeaveEvent();
-    dataChanged( m_dropIndex, m_dropIndex );
-    m_dropIndex = QPersistentModelIndex();
-}
-
-
-void
-SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
-{
-    bool accept = false;
-
-    // Don't highlight the drop for a playlist, as it won't get added to the playlist but created generally
-    if ( DropJob::isDropType( DropJob::Playlist, event->mimeData()  ) )
-    {
-        event->accept();
-        return;
-    }
-
-    QTreeView::dragMoveEvent( event );
-
-    if ( DropJob::acceptsMimeData( event->mimeData(),  DropJob::Track, DropJob::Append ) )
-    {
-        setDirtyRegion( m_dropRect );
-        const QPoint pos = event->pos();
-        const QModelIndex index = indexAt( pos );
-        dataChanged(m_dropIndex, m_dropIndex);
-        m_dropIndex = QPersistentModelIndex( index );
-
-        if ( index.isValid() )
-        {
-            const QRect rect = visualRect( index );
-            m_dropRect = rect;
-
-            SourceTreeItem* item = itemFromIndex< SourceTreeItem >( index );
-            if( item->willAcceptDrag( event->mimeData() ) )
-            {
-
-                accept = true;
-                m_delegate->hovered( index, event->mimeData() );
-                dataChanged(index, index);
-            }
-            else
-                m_delegate->hovered( QModelIndex(), 0 );
-        }
-        else
-        {
-            m_dropRect = QRect();
-        }
-
-        if ( accept || DropJob::isDropType( DropJob::Playlist, event->mimeData() ) )
-        {
-            // Playlists are accepted always since they can be dropped anywhere
-            //tDebug() << Q_FUNC_INFO << "Accepting";
-            event->setDropAction( Qt::CopyAction );
-            event->accept();
-        }
-        else
-        {
-//             tDebug() << Q_FUNC_INFO << "Ignoring";
-            event->ignore();
-        }
-    }
-    else if ( DropJob::acceptsMimeData( event->mimeData(),  DropJob::Playlist | DropJob::Artist | DropJob::Album, DropJob::Create ) )
-    {
-        event->setDropAction( Qt::CopyAction );
-        event->accept();
-    }
-    setDirtyRegion( m_dropRect );
-}
-
-
-void
-SourceTreeView::dropEvent( QDropEvent* event )
-{
-    const QPoint pos = event->pos();
-    const QModelIndex index = indexAt( pos );
-
-    if ( model()->data( index, SourcesModel::SourceTreeItemTypeRole ).toInt() == SourcesModel::StaticPlaylist
-         || model()->data( index, SourcesModel::SourceTreeItemTypeRole ).toInt() == SourcesModel::CategoryAdd )
-    {
-        SourceTreeItem* item = itemFromIndex< SourceTreeItem >( index );
-        Q_ASSERT( item );
-
-        item->setDropType( m_delegate->hoveredDropType() );
-        qDebug() << Q_FUNC_INFO << "dropType is " << m_delegate->hoveredDropType();
-    }
-
-    // if it's a playlist drop, accept it anywhere in the sourcetree by manually parsing it.
-    if ( DropJob::isDropType( DropJob::Playlist, event->mimeData()  ) )
-    {
-        qDebug() << Q_FUNC_INFO << "Current Event";
-        DropJob *dropThis = new DropJob;
-        dropThis->setDropTypes( DropJob::Playlist );
-        dropThis->setDropAction( DropJob::Create );
-        dropThis->parseMimeData( event->mimeData() );
-
-        // Don't add it to the playlist under drop, it's a new playlist now
-        return;
-    }
-
-    // Need to fake the dropevent because the treeview would reject it if it is outside the item (on the tree)
-    if ( pos.x() < 100 )
-    {
-        QDropEvent* newEvent = new QDropEvent( pos + QPoint( 100, 0 ), event->possibleActions(), event->mimeData(), event->mouseButtons(), event->keyboardModifiers(), event->type() );
-        QTreeView::dropEvent( newEvent );
-        delete newEvent;
-    }
-    else
-    {
-        QTreeView::dropEvent( event );
-    }
-
-    m_dragging = false;
-    m_dropIndex = QPersistentModelIndex();
-    m_delegate->dragLeaveEvent();
-    dataChanged( index, index );
-}
-
-
-void
-SourceTreeView::keyPressEvent( QKeyEvent *event )
-{
-    if( ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace ) && !selectionModel()->selectedIndexes().isEmpty() )
-    {
-        QModelIndex idx = selectionModel()->selectedIndexes().first();
-        if ( model()->data( idx, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::StaticPlaylist ||
-             model()->data( idx, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::AutomaticPlaylist ||
-             model()->data( idx, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::Station )
-        {
-            PlaylistItem* item = itemFromIndex< PlaylistItem >( idx );
-            Q_ASSERT( item );
-
-            if( item->playlist()->author()->isLocal() ) {
-                deletePlaylist( idx );
-            }
-        }
-    }
-}
-
-
-void
-SourceTreeView::paintEvent( QPaintEvent* event )
-{
-    if ( m_dragging && !m_dropRect.isEmpty() )
-    {
-        QPainter painter( viewport() );
-        const QRect itemRect = visualRect( m_dropIndex );
-
-        QStyleOptionViewItemV4 opt;
-        opt.initFrom( this );
-        opt.rect = itemRect;
-        opt.state = QStyle::State_Enabled | QStyle::State_Selected;
-
-        style()->drawPrimitive( QStyle::PE_PanelItemViewRow, &opt, &painter, this );
-    }
-
-    QTreeView::paintEvent( event );
-}
-
-
-void
-SourceTreeView::drawRow( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QTreeView::drawRow( painter, option, index );
-}
-
-
-template< typename T > T*
-SourceTreeView::itemFromIndex( const QModelIndex& index ) const
-{
-    Q_ASSERT( model()->data( index, SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
-
-    T* item = qobject_cast< T* >( model()->data( index, SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
-    Q_ASSERT( item );
-
-    return item;
-}
-
-
-void
-SourceTreeView::update( const QModelIndex &index )
-{
-    dataChanged( index, index );
-}

tomahawk-0.4.2.tar.bz2/src/sourcetree/sourcetreeview.h Deleted

@@ -1,117 +0,0 @@
-/* === 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
- *   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 SOURCETREEVIEW_H
-#define SOURCETREEVIEW_H
-
-#include "typedefs.h"
-#include "sourceplaylistinterface.h"
-
-#include <QtGui/QTreeView>
-#include <QtGui/QMenu>
-
-class CollectionModel;
-class PlaylistModel;
-class SourcesModel;
-class SourcesProxyModel;
-class SourceDelegate;
-
-namespace Tomahawk
-{
-    class LatchManager;
-}
-
-class SourceTreeView : public QTreeView
-{
-Q_OBJECT
-
-public:
-    explicit SourceTreeView( QWidget* parent = 0 );
-    ~SourceTreeView();
-
-public slots:
-    void showOfflineSources( bool offlineSourcesShown );
-
-    void renamePlaylist();
-
-    void update( const QModelIndex &index );
-
-signals:
-    void onOnline( const QModelIndex& index );
-    void onOffline( const QModelIndex& index );
-
-    void latchRequest( const Tomahawk::source_ptr& source );
-    void unlatchRequest( const Tomahawk::source_ptr& source );
-    void catchUpRequest();
-    void latchModeChangeRequest( const Tomahawk::source_ptr& source, bool realtime );
-
-private slots:
-    void onItemExpanded( const QModelIndex& idx );
-    void onItemActivated( const QModelIndex& index );
-    void selectRequest( const QPersistentModelIndex& idx );
-    void expandRequest( const QPersistentModelIndex& idx );
-    void toggleExpandRequest( const QPersistentModelIndex& idx );
-    void onItemDoubleClicked( const QModelIndex& idx );
-
-    void loadPlaylist();
-    void deletePlaylist( const QModelIndex& = QModelIndex() );
-    void copyPlaylistLink();
-    void addToLocal();
-
-    void latchOnOrCatchUp();
-    void latchOff();
-    void latchOnOrCatchUp( const Tomahawk::source_ptr& source );
-    void latchOff( const Tomahawk::source_ptr& source );
-    void latchModeToggled( bool checked );
-
-    void onCustomContextMenu( const QPoint& pos );
-
-protected:
-    void drawRow( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-    virtual void paintEvent( QPaintEvent* event );
-
-    virtual void dragEnterEvent( QDragEnterEvent* event );
-    virtual void dragLeaveEvent( QDragLeaveEvent* event );
-    virtual void dragMoveEvent( QDragMoveEvent* event );
-    virtual void dropEvent( QDropEvent* event );
-    virtual void keyPressEvent( QKeyEvent* event );
-
-private:
-    void setupMenus();
-
-    template< typename T >
-    T* itemFromIndex( const QModelIndex& index ) const;
-
-    SourcesModel* m_model;
-    SourcesProxyModel* m_proxyModel;
-    QModelIndex m_contextMenuIndex;
-    SourceDelegate* m_delegate;
-    Tomahawk::LatchManager* m_latchManager;
-
-    QMenu m_playlistMenu;
-    QMenu m_roPlaylistMenu;
-    QMenu m_latchMenu;
-    QMenu m_privacyMenu;
-
-    bool m_dragging;
-    QRect m_dropRect;
-    QPersistentModelIndex m_dropIndex;
-};
-
-#endif // SOURCETREEVIEW_H

tomahawk-0.4.2.tar.bz2/src/stackedsettingsdialog.ui Deleted

@@ -1,732 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>StackedSettingsDialog</class>
- <widget class="QDialog" name="StackedSettingsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>641</width>
-    <height>393</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Tomahawk Settings</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_12">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="QListWidget" name="listWidget">
-         <property name="focusPolicy">
-          <enum>Qt::NoFocus</enum>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
-         </property>
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOff</enum>
-         </property>
-         <property name="horizontalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOff</enum>
-         </property>
-         <property name="autoScroll">
-          <bool>true</bool>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>32</width>
-           <height>32</height>
-          </size>
-         </property>
-         <property name="movement">
-          <enum>QListView::Static</enum>
-         </property>
-         <property name="resizeMode">
-          <enum>QListView::Adjust</enum>
-         </property>
-         <property name="layoutMode">
-          <enum>QListView::Batched</enum>
-         </property>
-         <property name="spacing">
-          <number>1</number>
-         </property>
-         <property name="viewMode">
-          <enum>QListView::IconMode</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Fixed</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>1</width>
-           <height>4</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QStackedWidget" name="stackedWidget">
-       <property name="currentIndex">
-        <number>0</number>
-       </property>
-       <widget class="QWidget" name="accountsPage">
-        <layout class="QVBoxLayout" name="verticalLayout_11">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QGroupBox" name="groupBox_4">
-           <property name="title">
-            <string>Accounts</string>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_14">
-            <property name="margin">
-             <number>2</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="label_2">
-              <property name="text">
-               <string>Connect to your friends with Google Chat, Twitter, and more.</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_2">
-              <item>
-               <widget class="QTreeView" name="accountsView">
-                <property name="indentation">
-                 <number>0</number>
-                </property>
-                <property name="rootIsDecorated">
-                 <bool>false</bool>
-                </property>
-                <property name="uniformRowHeights">
-                 <bool>false</bool>
-                </property>
-                <property name="animated">
-                 <bool>true</bool>
-                </property>
-                <property name="headerHidden">
-                 <bool>true</bool>
-                </property>
-                <property name="expandsOnDoubleClick">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <layout class="QVBoxLayout" name="addSipLayout">
-                <item>
-                 <widget class="QToolButton" name="addSipButton">
-                  <property name="text">
-                   <string>...</string>
-                  </property>
-                  <property name="icon">
-                   <iconset resource="../resources.qrc">
-                    <normaloff>:/data/images/sipplugin-add.png</normaloff>:/data/images/sipplugin-add.png</iconset>
-                  </property>
-                  <property name="popupMode">
-                   <enum>QToolButton::InstantPopup</enum>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QToolButton" name="removeSipButton">
-                  <property name="text">
-                   <string>...</string>
-                  </property>
-                  <property name="icon">
-                   <iconset resource="../resources.qrc">
-                    <normaloff>:/data/images/sipplugin-remove.png</normaloff>:/data/images/sipplugin-remove.png</iconset>
-                  </property>
-                  <property name="popupMode">
-                   <enum>QToolButton::DelayedPopup</enum>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="verticalSpacer_6">
-                  <property name="orientation">
-                   <enum>Qt::Vertical</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>40</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QWidget" name="scannerPage">
-        <layout class="QVBoxLayout" name="verticalLayout_5">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QGroupBox" name="groupBox_2">
-           <property name="title">
-            <string>Local Music Information</string>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_17">
-            <item>
-             <layout class="QVBoxLayout" name="verticalLayout_4">
-              <item>
-               <widget class="QLabel" name="label_5">
-                <property name="text">
-                 <string>Path to scan for music files:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="CheckDirTree" name="dirTree"/>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <layout class="QVBoxLayout" name="verticalLayout_16">
-              <item>
-               <widget class="QCheckBox" name="enableEchonestCatalog">
-                <property name="toolTip">
-                 <string>The Echo Nest supports keeping track of your catalog metadata
- and using it to craft personalized radios. Enabling this option
- will allow you (and all your friends) to create automatic playlists
- and stations based on your personal taste profile.</string>
-                </property>
-                <property name="text">
-                 <string>Upload collection list to The Echo Nest to enable user radio</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBoxWatchForChanges">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string>Watch for changes</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_7">
-                <item>
-                 <widget class="QLabel" name="scanTimeLabel">
-                  <property name="text">
-                   <string>Time between scans, in seconds:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QSpinBox" name="scannerTimeSpinBox">
-                  <property name="minimum">
-                   <number>60</number>
-                  </property>
-                  <property name="maximum">
-                   <number>999999999</number>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QWidget" name="lastfmPage">
-        <layout class="QVBoxLayout" name="verticalLayout_7">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QGroupBox" name="groupBox">
-           <property name="title">
-            <string>Now Playing Information</string>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_15">
-            <item>
-             <widget class="QLabel" name="label_6">
-              <property name="text">
-               <string>Applications to update with currently playing track:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_3">
-              <item>
-               <layout class="QVBoxLayout" name="verticalLayout_6">
-                <item>
-                 <widget class="QCheckBox" name="checkBoxEnableAdium">
-                  <property name="text">
-                   <string>Adium</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="verticalSpacer_2">
-                  <property name="orientation">
-                   <enum>Qt::Vertical</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>40</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QVBoxLayout" name="verticalLayout_2">
-                <item>
-                 <widget class="QCheckBox" name="checkBoxEnableLastfm">
-                  <property name="layoutDirection">
-                   <enum>Qt::LeftToRight</enum>
-                  </property>
-                  <property name="text">
-                   <string>Scrobble tracks to Last.fm</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <layout class="QGridLayout" name="gridLayout_3">
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="label_3">
-                    <property name="text">
-                     <string>Username:</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="0" column="1">
-                   <widget class="QLineEdit" name="lineEditLastfmUsername"/>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="label_4">
-                    <property name="text">
-                     <string>Password:</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="1">
-                   <widget class="QLineEdit" name="lineEditLastfmPassword">
-                    <property name="echoMode">
-                     <enum>QLineEdit::Password</enum>
-                    </property>
-                   </widget>
-                  </item>
-                 </layout>
-                </item>
-                <item>
-                 <widget class="QPushButton" name="pushButtonTestLastfmLogin">
-                  <property name="text">
-                   <string>Test Login</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="verticalSpacer">
-                  <property name="orientation">
-                   <enum>Qt::Vertical</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>40</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QWidget" name="resolversPage">
-        <layout class="QVBoxLayout" name="verticalLayout_10">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QGroupBox" name="groupBox_3">
-           <property name="title">
-            <string>Script Resolvers</string>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_9">
-            <property name="margin">
-             <number>2</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>Script resolvers search for a given track to make it playable.</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="getMoreResolvers">
-              <property name="text">
-               <string>Get more resolvers...</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_4">
-              <item>
-               <widget class="QTreeView" name="scriptList">
-                <property name="alternatingRowColors">
-                 <bool>true</bool>
-                </property>
-                <property name="selectionMode">
-                 <enum>QAbstractItemView::SingleSelection</enum>
-                </property>
-                <property name="rootIsDecorated">
-                 <bool>false</bool>
-                </property>
-                <property name="uniformRowHeights">
-                 <bool>true</bool>
-                </property>
-                <property name="itemsExpandable">
-                 <bool>false</bool>
-                </property>
-                <property name="animated">
-                 <bool>true</bool>
-                </property>
-                <property name="headerHidden">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <layout class="QVBoxLayout" name="verticalLayout_8">
-                <item>
-                 <widget class="QToolButton" name="addScript">
-                  <property name="text">
-                   <string/>
-                  </property>
-                  <property name="icon">
-                   <iconset resource="../resources.qrc">
-                    <normaloff>:/data/images/list-add.png</normaloff>:/data/images/list-add.png</iconset>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QToolButton" name="removeScript">
-                  <property name="text">
-                   <string/>
-                  </property>
-                  <property name="icon">
-                   <iconset resource="../resources.qrc">
-                    <normaloff>:/data/images/list-remove.png</normaloff>:/data/images/list-remove.png</iconset>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <spacer name="verticalSpacer_4">
-                  <property name="orientation">
-                   <enum>Qt::Vertical</enum>
-                  </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>20</width>
-                    <height>40</height>
-                   </size>
-                  </property>
-                 </spacer>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-       <widget class="QWidget" name="advancedPage">
-        <layout class="QVBoxLayout" name="verticalLayout_3">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QGroupBox" name="groupBoxNetworkAdvanced">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="title">
-            <string>Advanced Network Settings</string>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_13">
-            <property name="margin">
-             <number>2</number>
-            </property>
-            <item>
-             <layout class="QVBoxLayout" name="staticSettingsLayout">
-              <item>
-               <layout class="QHBoxLayout" name="staticPreferredLayout"/>
-              </item>
-              <item>
-               <widget class="QLabel" name="staticHostNamePortLabel">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string>If you'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!</string>
-                </property>
-                <property name="wordWrap">
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="staticHostNamePortLayout">
-                <item>
-                 <widget class="QLabel" name="staticHostNameLabel">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Static Host Name:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QLineEdit" name="staticHostName"/>
-                </item>
-                <item>
-                 <widget class="QLabel" name="staticPortLabel">
-                  <property name="sizePolicy">
-                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
-                  <property name="text">
-                   <string>Static Port:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QSpinBox" name="staticPort">
-                  <property name="maximum">
-                   <number>65535</number>
-                  </property>
-                  <property name="value">
-                   <number>50210</number>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <widget class="QCheckBox" name="checkBoxStaticPreferred">
-                <property name="layoutDirection">
-                 <enum>Qt::RightToLeft</enum>
-                </property>
-                <property name="text">
-                 <string>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="proxySettingsHLayout">
-              <item>
-               <spacer name="proxySettingsLeftSpacer">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QPushButton" name="proxyButton">
-                <property name="text">
-                 <string>Proxy Settings...</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="proxySettingsRightSpacer">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <spacer name="verticalSpacer_5">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>40</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QCheckBox" name="checkBoxReporter">
-              <property name="layoutDirection">
-               <enum>Qt::RightToLeft</enum>
-              </property>
-              <property name="text">
-               <string>Send reports after Tomahawk crashed</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QCheckBox" name="checkBoxHttp">
-              <property name="layoutDirection">
-               <enum>Qt::RightToLeft</enum>
-              </property>
-              <property name="text">
-               <string>Allow web browsers to interact with Tomahawk</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QCheckBox" name="checkBoxUpnp">
-              <property name="layoutDirection">
-               <enum>Qt::RightToLeft</enum>
-              </property>
-              <property name="text">
-               <string>Use UPnP to establish port forward</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>CheckDirTree</class>
-   <extends>QTreeView</extends>
-   <header location="global">widgets/checkdirtree.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="../resources.qrc"/>
- </resources>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>StackedSettingsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>222</x>
-     <y>347</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>StackedSettingsDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>290</x>
-     <y>353</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

tomahawk-0.4.2.tar.bz2/src/tomahawkapp.cpp Deleted

@@ -1,661 +0,0 @@
-/* === 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
- *   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 "tomahawkapp.h"
-
-#include <iostream>
-
-#include <QtCore/QPluginLoader>
-#include <QtCore/QDir>
-#include <QtCore/QMetaType>
-#include <QtCore/QTime>
-#include <QtNetwork/QNetworkReply>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-
-#include "artist.h"
-#include "album.h"
-#include "collection.h"
-#include "infosystem/infosystem.h"
-#include "database/database.h"
-#include "database/databasecollection.h"
-#include "database/databasecommand_collectionstats.h"
-#include "database/databaseresolver.h"
-#include "sip/SipHandler.h"
-#include "playlist/dynamic/GeneratorFactory.h"
-#include "playlist/dynamic/echonest/EchonestGenerator.h"
-#include "playlist/dynamic/database/DatabaseGenerator.h"
-#include "network/servent.h"
-#include "web/api_v1.h"
-#include "sourcelist.h"
-#include "shortcuthandler.h"
-#include "scanmanager.h"
-#include "tomahawksettings.h"
-#include "globalactionmanager.h"
-#include "database/localcollection.h"
-#include "musicscanner.h"
-#include "pipeline.h"
-#include "dropjob.h"
-#include "EchonestCatalogSynchronizer.h"
-
-#include "audio/audioengine.h"
-#include "utils/xspfloader.h"
-#include "utils/jspfloader.h"
-#include "utils/logger.h"
-#include "utils/tomahawkutilsgui.h"
-
-#include "config.h"
-
-#ifndef ENABLE_HEADLESS
-    #include "resolvers/qtscriptresolver.h"
-    #include "resolvers/scriptresolver.h"
-    #include "utils/spotifyparser.h"
-    #include "AtticaManager.h"
-    #include "tomahawkwindow.h"
-    #include "settingsdialog.h"
-    #include "actioncollection.h"
-    #include <QtGui/QMessageBox>
-    #include "widgets/HeaderLabel.h"
-    #include <TomahawkSettingsGui.h>
-#endif
-
-// should go to a plugin actually
-#ifdef GLOOX_FOUND
-    #include "xmppbot/xmppbot.h"
-#endif
-
-#ifdef Q_WS_MAC
-#include "mac/macshortcuthandler.h"
-
-#include <sys/resource.h>
-#include <sys/sysctl.h>
-#endif
-
-const char* enApiSecret = "BNvTzfthHr/d1eNhHLvL1Jo=";
-
-void
-increaseMaxFileDescriptors()
-{
-#ifdef Q_WS_MAC
-    /// Following code taken from Clementine project, main.cpp. Thanks!
-    // Bump the soft limit for the number of file descriptors from the default of 256 to
-    // the maximum (usually 1024).
-    struct rlimit limit;
-    getrlimit( RLIMIT_NOFILE, &limit );
-
-    // getrlimit() lies about the hard limit so we have to check sysctl.
-    int max_fd = 0;
-    size_t len = sizeof( max_fd );
-    sysctlbyname( "kern.maxfilesperproc", &max_fd, &len, NULL, 0 );
-
-    limit.rlim_cur = max_fd;
-    int ret = setrlimit( RLIMIT_NOFILE, &limit );
-
-    if ( ret == 0 )
-      qDebug() << "Max fd:" << max_fd;
-#endif
-}
-
-
-using namespace Tomahawk;
-
-TomahawkApp::TomahawkApp( int& argc, char *argv )
-    : TOMAHAWK_APPLICATION( argc, argv )
-    , m_headless( false )
-    , m_loaded( false )
-{
-    setOrganizationName( QLatin1String( TOMAHAWK_ORGANIZATION_NAME ) );
-    setOrganizationDomain( QLatin1String( TOMAHAWK_ORGANIZATION_DOMAIN ) );
-    setApplicationName( QLatin1String( TOMAHAWK_APPLICATION_NAME ) );
-    setApplicationVersion( QLatin1String( TOMAHAWK_VERSION ) );
-
-    registerMetaTypes();
-}
-
-
-void
-TomahawkApp::init()
-{
-    if ( arguments().contains( "--help" ) || arguments().contains( "-h" ) )
-    {
-        printHelp();
-        ::exit( 0 );
-    }
-
-    qDebug() << "TomahawkApp thread:" << thread();
-    Logger::setupLogfile();
-    qsrand( QTime( 0, 0, 0 ).secsTo( QTime::currentTime() ) );
-
-    tLog() << "Starting Tomahawk...";
-
-#ifdef ENABLE_HEADLESS
-    m_headless = true;
-#else
-    m_mainwindow = 0;
-    m_headless = arguments().contains( "--headless" );
-    setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
-    setQuitOnLastWindowClosed( false );
-
-    QFont f = APP->font();
-    f.setPixelSize( HeaderLabel::defaultFontSize() );
-    QFontMetrics fm( f );
-    TomahawkUtils::setHeaderHeight( fm.height() + 8 );
-#endif
-
-    TomahawkSettings* s = TomahawkSettings::instance();
-
-    tDebug( LOGINFO ) << "Setting NAM.";
-    // Cause the creation of the nam, but don't need to address it directly, so prevent warning
-    Q_UNUSED( TomahawkUtils::nam() );
-
-    m_audioEngine = QWeakPointer<AudioEngine>( new AudioEngine );
-    m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) );
-
-    // init pipeline and resolver factories
-    new Pipeline();
-
-#ifndef ENABLE_HEADLESS
-    Pipeline::instance()->addExternalResolverFactory( boost::bind( &QtScriptResolver::factory, _1 ) );
-    Pipeline::instance()->addExternalResolverFactory( boost::bind( &ScriptResolver::factory, _1 ) );
-
-    new ActionCollection( this );
-    connect( ActionCollection::instance()->getAction( "quit" ), SIGNAL( triggered() ), SLOT( quit() ), Qt::UniqueConnection );
-#endif
-
-    m_servent = QWeakPointer<Servent>( new Servent( this ) );
-    connect( m_servent.data(), SIGNAL( ready() ), SLOT( initSIP() ) );
-
-    tDebug() << "Init Database.";
-    initDatabase();
-
-    QByteArray magic = QByteArray::fromBase64( enApiSecret );
-    QByteArray wand = QByteArray::fromBase64( QCoreApplication::applicationName().toLatin1() );
-    int length = magic.length(), n2 = wand.length();
-    for ( int i=0; i<length; i++ ) magici = magici ^ wandi%n2;
-    Echonest::Config::instance()->setAPIKey( magic );
-
-#ifndef ENABLE_HEADLESS
-    tDebug() << "Init Echonest Factory.";
-    GeneratorFactory::registerFactory( "echonest", new EchonestFactory );
-#endif
-    tDebug() << "Init Database Factory.";
-    GeneratorFactory::registerFactory( "database", new DatabaseFactory );
-
-    // Register shortcut handler for this platform
-#ifdef Q_WS_MAC
-    m_shortcutHandler = QWeakPointer<Tomahawk::ShortcutHandler>( new MacShortcutHandler( this ) );
-    Tomahawk::setShortcutHandler( static_cast<MacShortcutHandler*>( m_shortcutHandler.data() ) );
-
-    Tomahawk::setApplicationHandler( this );
-    increaseMaxFileDescriptors();
-#endif
-
-    // Connect up shortcuts
-    if ( !m_shortcutHandler.isNull() )
-    {
-        connect( m_shortcutHandler.data(), SIGNAL( playPause() ), m_audioEngine.data(), SLOT( playPause() ) );
-        connect( m_shortcutHandler.data(), SIGNAL( pause() ), m_audioEngine.data(), SLOT( pause() ) );
-        connect( m_shortcutHandler.data(), SIGNAL( stop() ), m_audioEngine.data(), SLOT( stop() ) );
-        connect( m_shortcutHandler.data(), SIGNAL( previous() ), m_audioEngine.data(), SLOT( previous() ) );
-        connect( m_shortcutHandler.data(), SIGNAL( next() ), m_audioEngine.data(), SLOT( next() ) );
-        connect( m_shortcutHandler.data(), SIGNAL( volumeUp() ), m_audioEngine.data(), SLOT( raiseVolume() ) );
-        connect( m_shortcutHandler.data(), SIGNAL( volumeDown() ), m_audioEngine.data(), SLOT( lowerVolume() ) );
-        connect( m_shortcutHandler.data(), SIGNAL( mute() ), m_audioEngine.data(), SLOT( mute() ) );
-    }
-
-    tDebug() << "Init InfoSystem.";
-    m_infoSystem = QWeakPointer<Tomahawk::InfoSystem::InfoSystem>( new Tomahawk::InfoSystem::InfoSystem( this ) );
-
-    Echonest::Config::instance()->setNetworkAccessManager( TomahawkUtils::nam() );
-#ifndef ENABLE_HEADLESS
-    EchonestGenerator::setupCatalogs();
-
-    if ( !m_headless )
-    {
-        tDebug() << "Init MainWindow.";
-        m_mainwindow = new TomahawkWindow();
-        m_mainwindow->setWindowTitle( "Tomahawk" );
-        m_mainwindow->setObjectName( "TH_Main_Window" );
-        if ( !arguments().contains( "--hide" ) )
-        {
-            m_mainwindow->show();
-        }
-    }
-#endif
-
-    tDebug() << "Init Local Collection.";
-    initLocalCollection();
-    tDebug() << "Init Pipeline.";
-    initPipeline();
-
-#ifdef LIBATTICA_FOUND
-#ifndef ENABLE_HEADLESS
-    // load remote list of resolvers able to be installed
-    AtticaManager::instance();
-#endif
-#endif
-
-    if ( arguments().contains( "--http" ) || TomahawkSettings::instance()->value( "network/http", true ).toBool() )
-    {
-        initHTTP();
-    }
-    connect( TomahawkSettings::instance(), SIGNAL( changed() ), SLOT( initHTTP() ) );
-
-#ifndef ENABLE_HEADLESS
-    if ( !s->hasScannerPaths() )
-    {
-        m_mainwindow->showSettingsDialog();
-    }
-#endif
-
-#ifdef LIBLASTFM_FOUND
-    tDebug() << "Init Scrobbler.";
-    m_scrobbler = new Scrobbler( this );
-#endif
-
-    if ( arguments().contains( "--filescan" ) )
-    {
-        m_scanManager.data()->runScan( true );
-    }
-
-    // Set up echonest catalog synchronizer
-    Tomahawk::EchonestCatalogSynchronizer::instance();
-
-#ifndef ENABLE_HEADLESS
-    // Make sure to init GAM in the gui thread
-    GlobalActionManager::instance();
-
-    // check if our spotify playlist api server is up and running, and enable spotify playlist drops if so
-    QNetworkReply* r = TomahawkUtils::nam()->get( QNetworkRequest( QUrl( SPOTIFY_PLAYLIST_API_URL "/pong" ) ) );
-    connect( r, SIGNAL( finished() ), this, SLOT( spotifyApiCheckFinished() ) );
-#endif
-
-#ifdef Q_WS_MAC
-    // Make sure to do this after main window is inited
-    Tomahawk::enableFullscreen();
-#endif
-}
-
-
-TomahawkApp::~TomahawkApp()
-{
-    tLog() << "Shutting down Tomahawk...";
-
-    if ( !m_session.isNull() )
-        delete m_session.data();
-    if ( !m_connector.isNull() )
-        delete m_connector.data();
-    
-    Pipeline::instance()->stop();
-
-    if ( !m_servent.isNull() )
-        delete m_servent.data();
-    if ( !m_scanManager.isNull() )
-        delete m_scanManager.data();
-
-    if ( !m_audioEngine.isNull() )
-        delete m_audioEngine.data();
-
-    delete SipHandler::instance();
-
-#ifndef ENABLE_HEADLESS
-    delete m_mainwindow;
-    #ifdef LIBATTICA_FOUND
-    delete AtticaManager::instance();
-    #endif
-#endif
-
-    if ( !m_database.isNull() )
-        delete m_database.data();
-
-    delete Pipeline::instance();
-
-    if ( !m_infoSystem.isNull() )
-        delete m_infoSystem.data();
-
-    tLog() << "Finished shutdown.";
-}
-
-
-TomahawkApp*
-TomahawkApp::instance()
-{
-    return (TomahawkApp*)TOMAHAWK_APPLICATION::instance();
-}
-
-
-void
-TomahawkApp::printHelp()
-{
-    #define echo( X ) std::cout << QString( X ).toAscii().data()
-
-    echo( "Usage: " + arguments().at( 0 ) + " options url\n" );
-    echo( "Options are:\n" );
-    echo( "  --help         Show this help\n" );
-    echo( "  --http         Initialize HTTP server\n" );
-    echo( "  --filescan     Scan files on startup\n" );
-    echo( "  --hide         Hide main window on startup\n" );
-    echo( "  --testdb       Use a test database instead of real collection\n" );
-    echo( "  --noupnp       Disable UPnP\n" );
-    echo( "  --nosip        Disable SIP\n" );
-    echo( "\nPlayback Controls:\n" );
-    echo( "  --playpause    Toggle playing/paused state\n" );
-    echo( "  --play         Start/resume playback\n" );
-    echo( "  --pause        Pause playback\n" );
-    echo( "  --stop         Stop playback\n" );
-    echo( "  --next         Advances to the next track (if available)\n" );
-    echo( "  --prev         Returns to the previous track (if available)\n" );
-    echo( "\nurl is a tomahawk:// command or alternatively a url that Tomahawk can recognize.\n" );
-    echo( "For more documentation, see http://wiki.tomahawk-player.org/mediawiki/index.php/Tomahawk://_Links\n" );
-}
-
-
-#ifndef ENABLE_HEADLESS
-AudioControls*
-TomahawkApp::audioControls()
-{
-    return m_mainwindow->audioControls();
-}
-#endif
-
-
-void
-TomahawkApp::registerMetaTypes()
-{
-    qRegisterMetaType< QSharedPointer<DatabaseCommand> >("QSharedPointer<DatabaseCommand>");
-    qRegisterMetaType< DBSyncConnection::State >("DBSyncConnection::State");
-    qRegisterMetaType< msg_ptr >("msg_ptr");
-    qRegisterMetaType< QList<dbop_ptr> >("QList<dbop_ptr>");
-    qRegisterMetaType< QList<QVariantMap> >("QList<QVariantMap>");
-    qRegisterMetaType< QList<QString> >("QList<QString>");
-    qRegisterMetaType< QList<uint> >("QList<uint>");
-    qRegisterMetaType< Connection* >("Connection*");
-    qRegisterMetaType< QAbstractSocket::SocketError >("QAbstractSocket::SocketError");
-    qRegisterMetaType< QTcpSocket* >("QTcpSocket*");
-    qRegisterMetaType< QSharedPointer<QIODevice> >("QSharedPointer<QIODevice>");
-    qRegisterMetaType< QFileInfo >("QFileInfo");
-    qRegisterMetaType< QDir >("QDir");
-    qRegisterMetaType< QHostAddress >("QHostAddress");
-    qRegisterMetaType< QMap<QString, unsigned int> >("QMap<QString, unsigned int>");
-    qRegisterMetaType< QMap< QString, plentry_ptr > >("QMap< QString, plentry_ptr >");
-    qRegisterMetaType< QHash< QString, QMap<quint32, quint16> > >("QHash< QString, QMap<quint32, quint16> >");
-    qRegisterMetaType< QMap< QString, QMap< unsigned int, unsigned int > > >("QMap< QString, QMap< unsigned int, unsigned int > >");
-    qRegisterMetaType< PairList >("PairList");
-
-    qRegisterMetaType< GeneratorMode>("GeneratorMode");
-    qRegisterMetaType<Tomahawk::GeneratorMode>("Tomahawk::GeneratorMode");
-
-    // Extra definition for namespaced-versions of signals/slots required
-    qRegisterMetaType< Tomahawk::source_ptr >("Tomahawk::source_ptr");
-    qRegisterMetaType< Tomahawk::collection_ptr >("Tomahawk::collection_ptr");
-    qRegisterMetaType< Tomahawk::result_ptr >("Tomahawk::result_ptr");
-    qRegisterMetaType< Tomahawk::query_ptr >("Tomahawk::query_ptr");
-    qRegisterMetaType< Tomahawk::source_ptr >("Tomahawk::source_ptr");
-    qRegisterMetaType< Tomahawk::dyncontrol_ptr >("Tomahawk::dyncontrol_ptr");
-    qRegisterMetaType< Tomahawk::playlist_ptr >("Tomahawk::playlist_ptr");
-    qRegisterMetaType< Tomahawk::playlistinterface_ptr >("Tomahawk::playlistinterface_ptr");
-    qRegisterMetaType< Tomahawk::dynplaylist_ptr >("Tomahawk::dynplaylist_ptr");
-    qRegisterMetaType< Tomahawk::geninterface_ptr >("Tomahawk::geninterface_ptr");
-    qRegisterMetaType< QList<Tomahawk::playlist_ptr> >("QList<Tomahawk::playlist_ptr>");
-    qRegisterMetaType< QList<Tomahawk::dynplaylist_ptr> >("QList<Tomahawk::dynplaylist_ptr>");
-    qRegisterMetaType< QList<Tomahawk::dyncontrol_ptr> >("QList<Tomahawk::dyncontrol_ptr>");
-    qRegisterMetaType< QList<Tomahawk::geninterface_ptr> >("QList<Tomahawk::geninterface_ptr>");
-    qRegisterMetaType< QList<Tomahawk::plentry_ptr> >("QList<Tomahawk::plentry_ptr>");
-    qRegisterMetaType< QList<Tomahawk::query_ptr> >("QList<Tomahawk::query_ptr>");
-    qRegisterMetaType< QList<Tomahawk::result_ptr> >("QList<Tomahawk::result_ptr>");
-    qRegisterMetaType< QList<Tomahawk::artist_ptr> >("QList<Tomahawk::artist_ptr>");
-    qRegisterMetaType< QList<Tomahawk::album_ptr> >("QList<Tomahawk::album_ptr>");
-    qRegisterMetaType< QList<Tomahawk::source_ptr> >("QList<Tomahawk::source_ptr>");
-    qRegisterMetaType< QMap< QString, Tomahawk::plentry_ptr > >("QMap< QString, Tomahawk::plentry_ptr >");
-    qRegisterMetaType< Tomahawk::PlaylistRevision >("Tomahawk::PlaylistRevision");
-    qRegisterMetaType< Tomahawk::DynamicPlaylistRevision >("Tomahawk::DynamicPlaylistRevision");
-    qRegisterMetaType< Tomahawk::QID >("Tomahawk::QID");
-
-    qRegisterMetaType< AudioErrorCode >("AudioErrorCode");
-
-    qRegisterMetaType< Tomahawk::InfoSystem::InfoStringHash >( "Tomahawk::InfoSystem::InfoStringHash" );
-    qRegisterMetaType< Tomahawk::InfoSystem::InfoType >( "Tomahawk::InfoSystem::InfoType" );
-    qRegisterMetaType< Tomahawk::InfoSystem::InfoRequestData >( "Tomahawk::InfoSystem::InfoRequestData" );
-    qRegisterMetaType< Tomahawk::InfoSystem::InfoSystemCache* >( "Tomahawk::InfoSystem::InfoSystemCache*" );
-    qRegisterMetaType< QList< Tomahawk::InfoSystem::InfoStringHash > >("QList< Tomahawk::InfoSystem::InfoStringHash > ");
-
-    qRegisterMetaTypeStreamOperators< QList< Tomahawk::InfoSystem::InfoStringHash > >("QList< Tomahawk::InfoSystem::InfoStringHash > ");
-    qRegisterMetaType< QPersistentModelIndex >( "QPersistentModelIndex" );
-
-    qRegisterMetaType< Tomahawk::PlaylistInterface::LatchMode >( "Tomahawk::PlaylistInterface::LatchMode" );
-}
-
-
-void
-TomahawkApp::initDatabase()
-{
-    QString dbpath;
-    if ( arguments().contains( "--testdb" ) )
-    {
-        dbpath = QDir::currentPath() + "/test.db";
-    }
-    else
-    {
-        dbpath = TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.db" );
-    }
-
-    tDebug( LOGEXTRA ) << "Using database:" << dbpath;
-    m_database = QWeakPointer<Database>( new Database( dbpath, this ) );
-    Pipeline::instance()->databaseReady();
-}
-
-
-void
-TomahawkApp::initHTTP()
-{
-    if ( !TomahawkSettings::instance()->httpEnabled() )
-    {
-        tLog() << "Stopping HTTPd, not enabled";
-        if ( !m_session.isNull() )
-            delete m_session.data();
-        if ( !m_connector.isNull() )
-            delete m_connector.data();
-        return;
-    }
-
-    if ( m_session )
-    {
-        tLog() << "HTTPd session already exists, returning";
-        return;
-    }
-    
-    m_session = QWeakPointer< QxtHttpSessionManager >( new QxtHttpSessionManager() );
-    m_connector = QWeakPointer< QxtHttpServerConnector >( new QxtHttpServerConnector );
-    if ( m_session.isNull() || m_connector.isNull() )
-    {
-        if ( !m_session.isNull() )
-            delete m_session.data();
-        if ( !m_connector.isNull() )
-            delete m_connector.data();
-        tLog() << "Failed to start HTTPd, could not create object";
-        return;
-    }
-    
-    m_session.data()->setPort( 60210 ); //TODO config
-    m_session.data()->setListenInterface( QHostAddress::LocalHost );
-    m_session.data()->setConnector( m_connector.data() );
-
-    Api_v1* api = new Api_v1( m_session.data() );
-    m_session.data()->setStaticContentService( api );
-
-    tLog() << "Starting HTTPd on" << m_session.data()->listenInterface().toString() << m_session.data()->port();
-    m_session.data()->start();
-}
-
-
-void
-TomahawkApp::initPipeline()
-{
-    // setup resolvers for local content, and (cached) remote collection content
-    Pipeline::instance()->addResolver( new DatabaseResolver( 100 ) );
-    // load script resolvers
-    QStringList enabled = TomahawkSettings::instance()->enabledScriptResolvers();
-    foreach ( QString resolver, TomahawkSettings::instance()->allScriptResolvers() )
-    {
-        const bool enable = enabled.contains( resolver );
-        Pipeline::instance()->addScriptResolver( resolver, enable );
-    }
-}
-
-
-void
-TomahawkApp::initLocalCollection()
-{
-    connect( SourceList::instance(), SIGNAL( ready() ), SLOT( initServent() ) );
-
-    source_ptr src( new Source( 0, tr( "My Collection" ) ) );
-    collection_ptr coll( new LocalCollection( src ) );
-
-    src->addCollection( coll );
-    SourceList::instance()->setLocal( src );
-    SourceList::instance()->loadSources();
-
-    // to make the stats signal be emitted by our local source
-    // this will update the sidebar, etc.
-    DatabaseCommand_CollectionStats* cmd = new DatabaseCommand_CollectionStats( src );
-    connect( cmd,       SIGNAL( done( const QVariantMap& ) ),
-             src.data(),  SLOT( setStats( const QVariantMap& ) ), Qt::QueuedConnection );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-}
-
-
-void
-TomahawkApp::initServent()
-{
-    tDebug() << "Init Servent.";
-
-    bool upnp = !arguments().contains( "--noupnp" ) && TomahawkSettings::instance()->value( "network/upnp", true ).toBool() && !TomahawkSettings::instance()->preferStaticHostPort();
-    int port = TomahawkSettings::instance()->externalPort();
-    if ( !Servent::instance()->startListening( QHostAddress( QHostAddress::Any ), upnp, port ) )
-    {
-        tLog() << "Failed to start listening with servent";
-        exit( 1 );
-    }
-}
-
-
-// Called after Servent emits ready()
-void
-TomahawkApp::initSIP()
-{
-    //FIXME: jabber autoconnect is really more, now that there is sip -- should be renamed and/or split out of jabber-specific settings
-    if ( !arguments().contains( "--nosip" ) )
-    {
-#ifdef GLOOX_FOUND
-        m_xmppBot = QWeakPointer<XMPPBot>( new XMPPBot( this ) );
-#endif
-
-        tDebug( LOGINFO ) << "Connecting SIP classes";
-        //SipHandler::instance()->refreshProxy();
-        SipHandler::instance()->loadFromConfig( true );
-    }
-
-    m_loaded = true;
-    emit tomahawkLoaded();
-}
-
-
-void
-TomahawkApp::spotifyApiCheckFinished()
-{
-#ifndef ENABLE_HEADLESS
-    QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
-    Q_ASSERT( reply );
-
-    DropJob::setCanParseSpotifyPlaylists( !reply->error() );
-#endif
-}
-
-
-void
-TomahawkApp::activate()
-{
-#ifndef ENABLE_HEADLESS
-    TomahawkUtils::bringToFront();
-#endif
-}
-
-
-bool
-TomahawkApp::loadUrl( const QString& url )
-{
-#ifndef ENABLE_HEADLESS
-    if ( url.startsWith( "tomahawk://" ) )
-        return GlobalActionManager::instance()->parseTomahawkLink( url );
-    else if ( url.contains( "open.spotify.com" ) || url.contains( "spotify:track" ) )
-        return GlobalActionManager::instance()->openSpotifyLink( url );
-    else if ( url.contains( "www.rdio.com" ) )
-        return GlobalActionManager::instance()->openRdioLink( url );
-    else
-    {
-        QFile f( url );
-        QFileInfo info( f );
-        if ( info.suffix() == "xspf" )
-        {
-            XSPFLoader* l = new XSPFLoader( true, this );
-            tDebug( LOGINFO ) << "Loading spiff:" << url;
-            l->load( QUrl::fromUserInput( url ) );
-
-            return true;
-        }
-        else if ( info.suffix() == "jspf" )
-        {
-            JSPFLoader* l = new JSPFLoader( true, this );
-            tDebug( LOGINFO ) << "Loading j-spiff:" << url;
-            l->load( QUrl::fromUserInput( url ) );
-
-            return true;
-        }
-    }
-#endif
-    return false;
-}
-
-
-void
-TomahawkApp::instanceStarted( KDSingleApplicationGuard::Instance instance )
-{
-    tDebug( LOGINFO ) << "Instance started!" << instance.pid << instance.arguments;
-
-    activate();
-    if ( instance.arguments.size() < 2 )
-        return;
-
-    QString arg1 = instance.arguments 1 ;
-    if ( loadUrl( arg1 ) )
-        return;
-
-    if ( instance.arguments.contains( "--next" ) )
-        AudioEngine::instance()->next();
-    else if ( instance.arguments.contains( "--prev" ) )
-        AudioEngine::instance()->previous();
-    else if ( instance.arguments.contains( "--playpause" ) )
-        AudioEngine::instance()->playPause();
-    else if ( instance.arguments.contains( "--play" ) )
-        AudioEngine::instance()->play();
-    else if ( instance.arguments.contains( "--pause" ) )
-        AudioEngine::instance()->pause();
-    else if ( instance.arguments.contains( "--stop" ) )
-        AudioEngine::instance()->stop();
-}

tomahawk-0.4.2.tar.bz2/src/tomahawkapp.h Deleted

@@ -1,145 +0,0 @@
-/* === 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
- *   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 TOMAHAWKAPP_H
-#define TOMAHAWKAPP_H
-
-#define APP TomahawkApp::instance()
-
-#include "headlesscheck.h"
-#include "config.h"
-
-#include <QtCore/QRegExp>
-#include <QtCore/QFile>
-#include <QtCore/QSettings>
-#include <QtCore/QDir>
-#include <QtCore/QPersistentModelIndex>
-
-#include "QxtHttpServerConnector"
-#include "QxtHttpSessionManager"
-
-#include "mac/tomahawkapp_mac.h" // for PlatforInterface
-#include "typedefs.h"
-#include "utils/tomahawkutils.h"
-#include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
-
-class AudioEngine;
-class Database;
-class ScanManager;
-class Servent;
-class SipHandler;
-class TomahawkSettings;
-class XMPPBot;
-
-namespace Tomahawk
-{
-    class ShortcutHandler;
-    namespace InfoSystem
-    {
-        class InfoSystem;
-    }
-}
-
-#ifdef LIBLASTFM_FOUND
-#include <lastfm/NetworkAccessManager>
-#include "scrobbler.h"
-#endif
-
-#ifndef TOMAHAWK_HEADLESS
-class TomahawkWindow;
-#endif
-
-
-// this also acts as a a container for important top-level objects
-// that other parts of the app need to find
-// (eg, library, pipeline, friends list)
-class TomahawkApp : public TOMAHAWK_APPLICATION, public Tomahawk::PlatformInterface
-{
-Q_OBJECT
-
-public:
-    TomahawkApp( int& argc, char *argv );
-    virtual ~TomahawkApp();
-
-    void init();
-    static TomahawkApp* instance();
-
-    XMPPBot* xmppBot() { return m_xmppBot.data(); }
-
-#ifndef ENABLE_HEADLESS
-    AudioControls* audioControls();
-    TomahawkWindow* mainWindow() const { return m_mainwindow; }
-#endif
-
-    // PlatformInterface
-    virtual bool loadUrl( const QString& url );
-
-    bool isTomahawkLoaded() const { return m_loaded; }
-
-signals:
-    void tomahawkLoaded();
-
-public slots:
-    virtual void activate();
-    void instanceStarted( KDSingleApplicationGuard::Instance );
-
-private slots:
-    void initServent();
-    void initSIP();
-    void initHTTP();
-
-    void spotifyApiCheckFinished();
-
-private:
-    void registerMetaTypes();
-
-    void printHelp();
-
-    // Start-up order: database, collection, pipeline, servent, http
-    void initDatabase();
-    void initLocalCollection();
-    void initPipeline();
-
-    QWeakPointer<Database> m_database;
-    QWeakPointer<ScanManager> m_scanManager;
-    QWeakPointer<AudioEngine> m_audioEngine;
-    QWeakPointer<Servent> m_servent;
-    QWeakPointer<Tomahawk::InfoSystem::InfoSystem> m_infoSystem;
-    QWeakPointer<XMPPBot> m_xmppBot;
-    QWeakPointer<Tomahawk::ShortcutHandler> m_shortcutHandler;
-    bool m_scrubFriendlyName;
-
-#ifdef LIBLASTFM_FOUND
-    Scrobbler* m_scrobbler;
-#endif
-
-#ifndef TOMAHAWK_HEADLESS
-    TomahawkWindow* m_mainwindow;
-#endif
-
-    bool m_headless, m_loaded;
-
-    QWeakPointer< QxtHttpServerConnector > m_connector;
-    QWeakPointer< QxtHttpSessionManager > m_session;
-};
-
-Q_DECLARE_METATYPE( QPersistentModelIndex )
-Q_DECLARE_METATYPE( PairList )
-
-#endif // TOMAHAWKAPP_H
-

tomahawk-0.4.2.tar.bz2/src/tomahawktrayicon.cpp Deleted

@@ -1,250 +0,0 @@
-/* === 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
- *   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 "tomahawktrayicon.h"
-
-#include <QtGui/QWheelEvent>
-
-#include "artist.h"
-
-#include "audio/audioengine.h"
-#include "tomahawkapp.h"
-#include "tomahawkwindow.h"
-
-#include "utils/logger.h"
-#include <actioncollection.h>
-
-
-TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
-    : QSystemTrayIcon( parent )
-    , m_currentAnimationFrame( 0 )
-    , m_showWindowAction( 0 )
-{
-    QIcon icon( RESPATH "icons/tomahawk-icon-128x128.png" );
-    setIcon( icon );
-
-    refreshToolTip();
-
-    m_contextMenu = new QMenu();
-    setContextMenu( m_contextMenu );
-
-    ActionCollection *ac = ActionCollection::instance();
-    m_contextMenu->addAction( ac->getAction( "playPause" ) );
-    m_contextMenu->addAction( ac->getAction( "stop" ) );
-    m_contextMenu->addSeparator();
-    m_contextMenu->addAction( ac->getAction( "previousTrack" ) );
-    m_contextMenu->addAction( ac->getAction( "nextTrack" ) );
-    m_contextMenu->addSeparator();
-    m_contextMenu->addAction( ActionCollection::instance()->getAction( "togglePrivacy" ) );
-
-#ifdef Q_WS_MAC
-    // On mac you can close the windows while leaving the app open. We then need a way to show the main window again
-    m_contextMenu->addSeparator();
-    m_showWindowAction = m_contextMenu->addAction( tr( "Hide Tomahawk Window" ) );
-    m_showWindowAction->setData( true );
-    connect( m_showWindowAction, SIGNAL( triggered() ), this, SLOT( showWindow() ) );
-
-    connect( m_contextMenu, SIGNAL( aboutToShow() ), this, SLOT( menuAboutToShow() ) );
-#endif
-
-    m_contextMenu->addSeparator();
-    m_contextMenu->addAction( ac->getAction( "quit" ) );
-
-    connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), SLOT( setResult( Tomahawk::result_ptr ) ) );
-    connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( enablePause() ) );
-    connect( AudioEngine::instance(), SIGNAL( resumed() ), this, SLOT( enablePause() ) );
-    connect( AudioEngine::instance(), SIGNAL( stopped() ), this, SLOT( enablePlay() ) );
-    connect( AudioEngine::instance(), SIGNAL( paused() ),  this, SLOT( enablePlay() ) );
-
-    connect( &m_animationTimer, SIGNAL( timeout() ), SLOT( onAnimationTimer() ) );
-    connect( this, SIGNAL( activated( QSystemTrayIcon::ActivationReason ) ), SLOT( onActivated( QSystemTrayIcon::ActivationReason ) ) );
-
-    show();
-}
-
-
-TomahawkTrayIcon::~TomahawkTrayIcon()
-{
-    delete m_contextMenu;
-}
-
-
-void
-TomahawkTrayIcon::setShowHideWindow( bool show )
-{
-    if ( show )
-    {
-        m_showWindowAction->setText( tr( "Hide Tomahawk Window" ) );
-        m_showWindowAction->setData( show );
-    }
-    else
-    {
-        m_showWindowAction->setText( tr( "Show Tomahawk Window" ) );
-    }
-
-    m_showWindowAction->setData( show );
-}
-
-
-void
-TomahawkTrayIcon::showWindow()
-{
-    if( !m_showWindowAction->data().toBool() )
-    {
-        APP->mainWindow()->show();
-        APP->mainWindow()->raise();
-
-        setShowHideWindow( true );
-    }
-    else
-    {
-        APP->mainWindow()->hide();
-
-        setShowHideWindow( false );
-    }
-}
-
-
-void
-TomahawkTrayIcon::menuAboutToShow()
-{
-    // When using Cmd-H on mac to hide a window, it is an OS-level hide that is different from QWidget::hide().
-    // Qt returns isVisible() == true for windows that are hidden with Cmd-H, which is weird. isActiveWindow() returns
-    // the proper information though.
-    setShowHideWindow( APP->mainWindow()->isActiveWindow() );
-}
-
-
-void
-TomahawkTrayIcon::setResult( const Tomahawk::result_ptr& result )
-{
-    m_currentTrack = result;
-    refreshToolTip();
-}
-
-
-void
-TomahawkTrayIcon::refreshToolTip()
-{
-    #ifdef Q_WS_MAC
-    // causes issues with OS X menubar, also none
-    // of the other OS X menubar icons have a tooltip
-    return;
-    #endif
-
-    QString tip;
-    if ( !m_currentTrack.isNull() )
-    {
-        tip = m_currentTrack->artist()->name() + " " + QChar( 8211 ) /*en dash*/ + " " + m_currentTrack->track();
-    }
-    else
-    {
-        tip = tr( "Currently not playing." );
-    }
-
-    #ifdef Q_WS_WIN
-        // Good old crappy Win32
-        tip.replace( "&", "&&&" );
-    #endif
-
-    setToolTip( tip );
-}
-
-
-void
-TomahawkTrayIcon::onAnimationTimer()
-{
-/*    m_currentAnimationFrame++;
-    if( m_currentAnimationFrame >= m_animationPixmaps.count() )
-        m_currentAnimationFrame = 0;
-
-    setIcon( m_animationPixmaps.at( m_currentAnimationFrame ) );*/
-}
-
-
-void
-TomahawkTrayIcon::onActivated( QSystemTrayIcon::ActivationReason reason )
-{
-#ifdef Q_WS_MAC
-    return;
-#endif
-
-    switch( reason )
-    {
-        case QSystemTrayIcon::Trigger:
-        {
-            TomahawkWindow* mainwindow = APP->mainWindow();
-            if ( mainwindow->isVisible() )
-            {
-                mainwindow->hide();
-            }
-            else
-            {
-                mainwindow->show();
-            }
-        }
-        break;
-
-        case QSystemTrayIcon::MiddleClick:
-        {
-            AudioEngine::instance()->playPause();
-        }
-        break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-TomahawkTrayIcon::enablePlay()
-{
-    ActionCollection::instance()->getAction( "playPause" )->setText( tr( "Play" ) );
-}
-
-
-void
-TomahawkTrayIcon::enablePause()
-{
-    ActionCollection::instance()->getAction( "playPause" )->setText( tr( "Pause" ) );
-}
-
-
-bool
-TomahawkTrayIcon::event( QEvent* e )
-{
-    // Beginning with Qt 4.3, QSystemTrayIcon supports wheel events, but only
-    // on X11. Let's make it adjust the volume.
-    if ( e->type() == QEvent::Wheel )
-    {
-        if ( ((QWheelEvent*)e)->delta() > 0 )
-        {
-            AudioEngine::instance()->raiseVolume();
-        }
-        else
-        {
-            AudioEngine::instance()->lowerVolume();
-        }
-
-        return true;
-    }
-
-    return QSystemTrayIcon::event( e );
-}
-

tomahawk-0.4.2.tar.bz2/src/tomahawktrayicon.h Deleted

@@ -1,66 +0,0 @@
-/* === 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
- *   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 TOMAHAWK_TRAYICON_H
-#define TOMAHAWK_TRAYICON_H
-
-#include <QtGui/QSystemTrayIcon>
-#include <QtCore/QTimer>
-#include <QtGui/QMenu>
-
-#include "result.h"
-
-class TomahawkTrayIcon : public QSystemTrayIcon
-{
-    Q_OBJECT
-
-public:
-    TomahawkTrayIcon( QObject* parent );
-    virtual bool event( QEvent* e );
-
-    void setShowHideWindow( bool show = true );
-
-public slots:
-    void setResult( const Tomahawk::result_ptr& result );
-
-private slots:
-    void onAnimationTimer();
-    void onActivated( QSystemTrayIcon::ActivationReason reason );
-    void showWindow();
-
-    void enablePlay();
-    void enablePause();
-
-    void menuAboutToShow();
-private:
-    void refreshToolTip();
-    ~TomahawkTrayIcon();
-
-    QTimer m_animationTimer;
-    Tomahawk::result_ptr m_currentTrack;
-
-    QList<QPixmap> m_animationPixmaps;
-    int m_currentAnimationFrame;
-
-    QMenu* m_contextMenu;
-
-    QAction* m_showWindowAction;
-};
-
-#endif // TOMAHAWK_TRAYICON_H
-

tomahawk-0.4.2.tar.bz2/src/tomahawkwindow.cpp Deleted

@@ -1,847 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2010-2012, 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 "tomahawkwindow.h"
-#include "ui_tomahawkwindow.h"
-
-#include <QAction>
-#include <QCloseEvent>
-#include <QShowEvent>
-#include <QHideEvent>
-#include <QInputDialog>
-#include <QPixmap>
-#include <QPropertyAnimation>
-#include <QLineEdit>
-#include <QMessageBox>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QTimer>
-#include <QToolBar>
-
-#include "playlist.h"
-#include "query.h"
-#include "artist.h"
-#include "viewmanager.h"
-#include "sip/SipHandler.h"
-#include "sourcetree/sourcetreeview.h"
-#include "network/servent.h"
-#include "utils/proxystyle.h"
-#include "widgets/animatedsplitter.h"
-#include "widgets/newplaylistwidget.h"
-#include "widgets/searchwidget.h"
-#include "widgets/playlisttypeselectordlg.h"
-#include "thirdparty/Qocoa/qsearchfield.h"
-#include "playlist/dynamic/GeneratorInterface.h"
-#include "playlist/playlistmodel.h"
-#include "playlist/playlistview.h"
-#include "playlist/queueview.h"
-
-#include "audiocontrols.h"
-#include "settingsdialog.h"
-#include "diagnosticsdialog.h"
-#include "tomahawksettings.h"
-#include "sourcelist.h"
-#include "jobview/JobStatusView.h"
-#include "jobview/JobStatusModel.h"
-#include "jobview/ErrorStatusMessage.h"
-#include "tomahawktrayicon.h"
-#include "scanmanager.h"
-#include "tomahawkapp.h"
-
-#ifdef Q_WS_WIN
-#include <qtsparkle/Updater>
-#endif
-
-#include "utils/logger.h"
-#include "jobview/JobStatusModel.h"
-#include "LoadXSPFDialog.h"
-#include <actioncollection.h>
-
-using namespace Tomahawk;
-
-
-TomahawkWindow::TomahawkWindow( QWidget* parent )
-    : QMainWindow( parent )
-    , ui( new Ui::TomahawkWindow )
-    , m_searchWidget( 0 )
-    , m_audioControls( new AudioControls( this ) )
-    , m_trayIcon( new TomahawkTrayIcon( this ) )
-    , m_audioRetryCounter( 0 )
-{
-    setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
-
-    ViewManager* vm = new ViewManager( this );
-    connect( vm, SIGNAL( showQueueRequested() ), SLOT( showQueue() ) );
-    connect( vm, SIGNAL( hideQueueRequested() ), SLOT( hideQueue() ) );
-    connect( APP, SIGNAL( tomahawkLoaded() ), vm, SLOT( setTomahawkLoaded() ) ); // Pass loaded signal into libtomahawk so components in there can connect to ViewManager
-
-    ui->setupUi( this );
-
-    ui->menuApp->insertAction( ui->actionCreatePlaylist, ActionCollection::instance()->getAction( "togglePrivacy" ) );
-    ui->menuApp->insertSeparator( ui->actionCreatePlaylist );
-
-    applyPlatformTweaks();
-
-    ui->centralWidget->setContentsMargins( 0, 0, 0, 0 );
-    TomahawkUtils::unmarginLayout( ui->centralWidget->layout() );
-
-    setupSideBar();
-    statusBar()->addPermanentWidget( m_audioControls, 1 );
-
-    setupUpdateCheck();
-    loadSettings();
-    setupSignals();
-
-    if ( qApp->arguments().contains( "--debug" ) )
-    {
-        ui->menu_Help->addSeparator();
-        ui->menu_Help->addAction( "Crash now...", this, SLOT( crashNow() ) );
-    }
-
-    // set initial state
-    onSipDisconnected();
-    vm->setQueue( m_queueView );
-    vm->showWelcomePage();
-}
-
-
-TomahawkWindow::~TomahawkWindow()
-{
-    saveSettings();
-    delete ui;
-}
-
-
-void
-TomahawkWindow::loadSettings()
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-
-    // Workaround for broken window geometry restoring on Qt Cocoa when setUnifiedTitleAndToolBarOnMac is true.
-    // See http://bugreports.qt.nokia.com/browse/QTBUG-3116 and
-    // http://lists.qt.nokia.com/pipermail/qt-interest/2009-August/011491.html
-    // for the 'fix'
-#ifdef QT_MAC_USE_COCOA
-     bool workaround = !isVisible();
-     if ( workaround )
-     {
-       // make "invisible"
-       setWindowOpacity( 0 );
-       // let Qt update its frameStruts
-       show();
-     }
-#endif
-
-    if ( !s->mainWindowGeometry().isEmpty() )
-        restoreGeometry( s->mainWindowGeometry() );
-    if ( !s->mainWindowState().isEmpty() )
-        restoreState( s->mainWindowState() );
-    if ( !s->mainWindowSplitterState().isEmpty() )
-        ui->splitter->restoreState( s->mainWindowSplitterState() );
-    else
-    {
-        ui->splitter->setStretchFactor( 0, 0 );
-        ui->splitter->setStretchFactor( 1, 1 );
-    }
-
-#ifdef QT_MAC_USE_COCOA
-     if ( workaround )
-     {
-       // Make it visible again
-       setWindowOpacity( 1 );
-     }
-#endif
-}
-
-
-void
-TomahawkWindow::saveSettings()
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    s->setMainWindowGeometry( saveGeometry() );
-    s->setMainWindowState( saveState() );
-    s->setMainWindowSplitterState( ui->splitter->saveState() );
-}
-
-
-void
-TomahawkWindow::applyPlatformTweaks()
-{
-    // HACK QtCurve causes an infinite loop on startup. This is because setStyle calls setPalette, which calls ensureBaseStyle,
-    // which loads QtCurve. QtCurve calls setPalette, which creates an infinite loop. The UI will look like CRAP with QtCurve, but
-    // the user is asking for it explicitly... so he's gonna be stuck with an ugly UI.
-    if ( !QString( qApp->style()->metaObject()->className() ).toLower().contains( "qtcurve" ) )
-        qApp->setStyle( new ProxyStyle() );
-
-#ifdef Q_WS_MAC
-    setUnifiedTitleAndToolBarOnMac( true );
-    delete ui->hline1;
-    delete ui->hline2;
-#else
-    ui->hline1->setStyleSheet( "border: 1px solid gray;" );
-    ui->hline2->setStyleSheet( "border: 1px solid gray;" );
-#endif
-}
-
-
-void
-TomahawkWindow::setupSideBar()
-{
-    // Delete fake designer widgets
-    delete ui->sidebarWidget;
-    delete ui->playlistWidget;
-
-    QWidget* sidebarWidget = new QWidget();
-    sidebarWidget->setLayout( new QVBoxLayout() );
-
-    m_sidebar = new AnimatedSplitter();
-    m_sidebar->setOrientation( Qt::Vertical );
-    m_sidebar->setChildrenCollapsible( false );
-
-    m_searchWidget = new QSearchField( m_sidebar );
-    m_searchWidget->setPlaceholderText( tr( "Global Search..." ) );
-    connect( m_searchWidget, SIGNAL( returnPressed() ), this, SLOT( onFilterEdited() ) );
-
-    m_sourcetree = new SourceTreeView();
-    JobStatusView* jobsView = new JobStatusView( m_sidebar );
-    m_jobsModel = new JobStatusModel( jobsView );
-    jobsView->setModel( m_jobsModel );
-
-    m_queueView = new QueueView( m_sidebar );
-    m_queueModel = new PlaylistModel( m_queueView );
-    m_queueModel->setStyle( PlaylistModel::Short );
-    m_queueView->queue()->setPlaylistModel( m_queueModel );
-    m_queueView->queue()->playlistModel()->setReadOnly( false );
-    AudioEngine::instance()->setQueue( m_queueView->queue()->proxyModel()->playlistInterface() );
-
-    m_sidebar->addWidget( m_searchWidget );
-    m_sidebar->addWidget( m_sourcetree );
-    m_sidebar->addWidget( jobsView );
-    m_sidebar->addWidget( m_queueView );
-
-    m_sidebar->setGreedyWidget( 1 );
-    m_sidebar->hide( 1, false );
-    m_sidebar->hide( 2, false );
-    m_sidebar->hide( 3, false );
-    m_sidebar->hide( 4, false );
-
-    sidebarWidget->layout()->addWidget( m_sidebar );
-    sidebarWidget->setContentsMargins( 0, 0, 0, 0 );
-    sidebarWidget->layout()->setContentsMargins( 0, 0, 0, 0 );
-    sidebarWidget->layout()->setMargin( 0 );
-
-#ifndef Q_WS_MAC
-    sidebarWidget->layout()->setSpacing( 0 );
-#endif
-
-    ui->splitter->addWidget( sidebarWidget );
-    ui->splitter->addWidget( ViewManager::instance()->widget() );
-    ui->splitter->setCollapsible( 1, false );
-
-    ui->actionShowOfflineSources->setChecked( TomahawkSettings::instance()->showOfflineSources() );
-}
-
-
-void
-TomahawkWindow::setupUpdateCheck()
-{
-#ifndef Q_WS_MAC
-    ui->menu_Help->insertSeparator( ui->actionAboutTomahawk );
-#endif
-
-#if defined( Q_WS_MAC ) && defined( HAVE_SPARKLE )
-    QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check For Updates..." ) );
-    checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole );
-    connect( checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) );
-#elif defined( Q_WS_WIN )
-    QUrl updaterUrl;
-
-    if ( qApp->arguments().contains( "--debug" ) )
-        updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin-debug" );
-    else
-        updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin" );
-
-    qtsparkle::Updater* updater = new qtsparkle::Updater( updaterUrl, this );
-    Q_ASSERT( TomahawkUtils::nam() != 0 );
-    updater->SetNetworkAccessManager( TomahawkUtils::nam() );
-    updater->SetVersion( TomahawkUtils::appFriendlyVersion() );
-
-    ui->menu_Help->addSeparator();
-    QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check For Updates..." ) );
-    connect( checkForUpdates, SIGNAL( triggered() ), updater, SLOT( CheckNow() ) );
-#endif
-}
-
-
-void
-TomahawkWindow::setupSignals()
-{
-    // <From PlaylistManager>
-    connect( ViewManager::instance(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
-             m_audioControls,           SLOT( onRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
-    connect( ViewManager::instance(), SIGNAL( shuffleModeChanged( bool ) ),
-             m_audioControls,           SLOT( onShuffleModeChanged( bool ) ) );
-
-    // <From AudioEngine>
-    connect( AudioEngine::instance(), SIGNAL( error( AudioEngine::AudioErrorCode ) ), SLOT( onAudioEngineError( AudioEngine::AudioErrorCode ) ) );
-    connect( AudioEngine::instance(), SIGNAL( loading( const Tomahawk::result_ptr& ) ), SLOT( onPlaybackLoading( const Tomahawk::result_ptr& ) ) );
-    connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( audioStarted() ) );
-    connect( AudioEngine::instance(), SIGNAL( resumed()), SLOT( audioStarted() ) );
-    connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( audioStopped() ) );
-    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( audioStopped() ) );
-
-    // <Menu Items>
-    //    connect( ui->actionAddPeerManually, SIGNAL( triggered() ), SLOT( addPeerManually() ) );
-    connect( ui->actionPreferences, SIGNAL( triggered() ), SLOT( showSettingsDialog() ) );
-    connect( ui->actionDiagnostics, SIGNAL( triggered() ), SLOT( showDiagnosticsDialog() ) );
-    connect( ui->actionToggleConnect, SIGNAL( triggered() ), SipHandler::instance(), SLOT( toggleConnect() ) );
-    connect( ui->actionUpdateCollection, SIGNAL( triggered() ), SLOT( updateCollectionManually() ) );
-    connect( ui->actionRescanCollection, SIGNAL( triggered() ), SLOT( rescanCollectionManually() ) );
-    connect( ui->actionLoadXSPF, SIGNAL( triggered() ), SLOT( loadSpiff() ));
-    connect( ui->actionCreatePlaylist, SIGNAL( triggered() ), SLOT( createPlaylist() ));
-    connect( ui->actionCreate_New_Station, SIGNAL( triggered() ), SLOT( createStation() ));
-    connect( ui->actionAboutTomahawk, SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) );
-    connect( ui->actionExit, SIGNAL( triggered() ), qApp, SLOT( quit() ) );
-    connect( ui->actionShowOfflineSources, SIGNAL( triggered() ), SLOT( showOfflineSources() ) );
-
-    connect( ui->actionPlay, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( playPause() ) );
-    connect( ui->actionNext, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( next() ) );
-    connect( ui->actionPrevious, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( previous() ) );
-
-#if defined( Q_WS_MAC )
-    connect( ui->actionMinimize, SIGNAL( triggered() ), SLOT( minimize() ) );
-    connect( ui->actionZoom, SIGNAL( triggered() ), SLOT( maximize() ) );
-#else
-    ui->menuWindow->clear();
-    ui->menuWindow->menuAction()->setVisible( false );
-#endif
-
-    // <SipHandler>
-    connect( SipHandler::instance(), SIGNAL( connected( SipPlugin* ) ), SLOT( onSipConnected() ) );
-    connect( SipHandler::instance(), SIGNAL( disconnected( SipPlugin* ) ), SLOT( onSipDisconnected() ) );
-    connect( SipHandler::instance(), SIGNAL( authError( SipPlugin* ) ), SLOT( onSipError() ) );
-
-    // <SipMenu>
-    connect( SipHandler::instance(), SIGNAL( pluginAdded( SipPlugin* ) ), this, SLOT( onSipPluginAdded( SipPlugin* ) ) );
-    connect( SipHandler::instance(), SIGNAL( pluginRemoved( SipPlugin* ) ), this, SLOT( onSipPluginRemoved( SipPlugin* ) ) );
-    foreach( SipPlugin *plugin, SipHandler::instance()->allPlugins() )
-    {
-        connect( plugin, SIGNAL( addMenu( QMenu* ) ), this, SLOT( pluginMenuAdded( QMenu* ) ) );
-        connect( plugin, SIGNAL( removeMenu( QMenu* ) ), this, SLOT( pluginMenuRemoved( QMenu* ) ) );
-    }
-}
-
-
-void
-TomahawkWindow::changeEvent( QEvent* e )
-{
-    QMainWindow::changeEvent( e );
-
-    switch ( e->type() )
-    {
-        case QEvent::LanguageChange:
-            ui->retranslateUi( this );
-            break;
-
-        default:
-            break;
-    }
-}
-
-
-void
-TomahawkWindow::closeEvent( QCloseEvent* e )
-{
-#ifndef Q_WS_MAC
-    if ( e->spontaneous() && QSystemTrayIcon::isSystemTrayAvailable() )
-    {
-        hide();
-        e->ignore();
-        return;
-    }
-#else
-    m_trayIcon->setShowHideWindow( false );
-#endif
-
-    e->accept();
-}
-
-
-void
-TomahawkWindow::showEvent( QShowEvent* e )
-{
-    QMainWindow::showEvent( e );
-
-#if defined( Q_WS_MAC )
-    ui->actionMinimize->setDisabled( false );
-    ui->actionZoom->setDisabled( false );
-#endif
-}
-
-
-void
-TomahawkWindow::hideEvent( QHideEvent* e )
-{
-    QMainWindow::hideEvent( e );
-
-#if defined( Q_WS_MAC )
-    ui->actionMinimize->setDisabled( true );
-    ui->actionZoom->setDisabled( true );
-#endif
-}
-
-
-void
-TomahawkWindow::showSettingsDialog()
-{
-    SettingsDialog win;
-    win.exec();
-}
-
-
-void TomahawkWindow::showDiagnosticsDialog()
-{
-    DiagnosticsDialog win;
-    win.exec();
-}
-
-
-void
-TomahawkWindow::updateCollectionManually()
-{
-    if ( TomahawkSettings::instance()->hasScannerPaths() )
-        ScanManager::instance()->runScan();
-}
-
-
-void
-TomahawkWindow::rescanCollectionManually()
-{
-    if ( TomahawkSettings::instance()->hasScannerPaths() )
-        ScanManager::instance()->runScan( true );
-}
-
-
-void
-TomahawkWindow::addPeerManually()
-{
-    TomahawkSettings* s = TomahawkSettings::instance();
-    bool ok;
-    QString addr = QInputDialog::getText( this, tr( "Connect To Peer" ),
-                                                tr( "Enter peer address:" ), QLineEdit::Normal,
-                                                s->value( "connip" ).toString(), &ok ); // FIXME
-    if ( !ok )
-        return;
-
-    s->setValue( "connip", addr );
-    QString ports = QInputDialog::getText( this, tr( "Connect To Peer" ),
-                                                 tr( "Enter peer port:" ), QLineEdit::Normal,
-                                                 s->value( "connport", "50210" ).toString(), &ok );
-    if ( !ok )
-        return;
-
-    s->setValue( "connport", ports );
-    int port = ports.toInt();
-    QString key = QInputDialog::getText( this, tr( "Connect To Peer" ),
-                                               tr( "Enter peer key:" ), QLineEdit::Normal,
-                                               "whitelist", &ok );
-    if ( !ok )
-        return;
-
-    qDebug() << "Attempting to connect to" << addr;
-    Servent::instance()->connectToPeer( addr, port, key );
-}
-
-
-void
-TomahawkWindow::pluginMenuAdded( QMenu* menu )
-{
-    ui->menuNetwork->addMenu( menu );
-}
-
-
-void
-TomahawkWindow::pluginMenuRemoved( QMenu* menu )
-{
-    foreach( QAction* action, ui->menuNetwork->actions() )
-    {
-        if( action->menu() == menu )
-        {
-            ui->menuNetwork->removeAction( action );
-            return;
-        }
-    }
-}
-
-
-void
-TomahawkWindow::showOfflineSources()
-{
-    m_sourcetree->showOfflineSources( ui->actionShowOfflineSources->isChecked() );
-    TomahawkSettings::instance()->setShowOfflineSources( ui->actionShowOfflineSources->isChecked() );
-}
-
-
-void
-TomahawkWindow::loadSpiff()
-{
-    LoadXSPFDialog* diag = new LoadXSPFDialog( this, Qt::Sheet );
-#ifdef Q_WS_MAC
-    connect( diag, SIGNAL( finished( int ) ), this, SLOT( loadXspfFinished( int ) ) );
-    diag->show();
-#else
-    QWeakPointer< LoadXSPFDialog > safe( diag );
-
-    int ret = diag->exec();
-    if ( !safe.isNull() && ret == QDialog::Accepted )
-    {
-        QUrl url = QUrl::fromUserInput( safe.data()->xspfUrl() );
-        bool autoUpdate = safe.data()->autoUpdate();
-
-        XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
-        connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
-        connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onXSPFOk( Tomahawk::playlist_ptr ) ) );
-        loader->load( url );
-    }
-#endif
-}
-
-
-void
-TomahawkWindow::loadXspfFinished( int ret )
-{
-    LoadXSPFDialog* d = qobject_cast< LoadXSPFDialog* >( sender() );
-    Q_ASSERT( d );
-    if ( ret == QDialog::Accepted )
-    {
-        QUrl url = QUrl::fromUserInput( d->xspfUrl() );
-        bool autoUpdate = d->autoUpdate();
-
-        XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
-        connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
-        connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onXSPFOk( Tomahawk::playlist_ptr ) ) );
-        loader->load( url );
-    }
-    d->deleteLater();
-}
-
-
-void
-TomahawkWindow::onXSPFOk( const Tomahawk::playlist_ptr& pl )
-{
-    ViewManager::instance()->show( pl );
-}
-
-
-void
-TomahawkWindow::onXSPFError( XSPFLoader::XSPFErrorCode error )
-{
-    switch ( error )
-    {
-        case XSPFLoader::ParseError:
-            QMessageBox::critical( this, tr( "XSPF Error" ), tr( "This is not a valid XSPF playlist." ) );
-            break;
-
-        case XSPFLoader::InvalidTrackError:
-            QMessageBox::warning( this, tr( "Failed to save tracks" ), tr( "Some tracks in the playlist do not contain an artist and a title. They will be ignored." ), QMessageBox::Ok );
-            break;
-        default:
-            //FIXME: This includes FetchError
-            break;
-    }
-}
-
-
-void
-TomahawkWindow::onAudioEngineError( AudioEngine::AudioErrorCode /* error */ )
-{
-    QString msg;
-#ifdef Q_WS_X11
-    msg = tr( "Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed." );
-#else
-    msg = tr( "Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped." );
-#endif
-    JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( msg, 15 ) );
-
-    if ( m_audioRetryCounter < 3 )
-        AudioEngine::instance()->play();
-    m_audioRetryCounter++;
-}
-
-
-void
-TomahawkWindow::createAutomaticPlaylist( QString playlistName )
-{
-    QString name = playlistName;
-
-    if ( name.isEmpty() )
-        return;
-
-    source_ptr author = SourceList::instance()->getLocal();
-    QString id = uuid();
-    QString info  = ""; // FIXME
-    QString creator = "someone"; // FIXME
-    dynplaylist_ptr playlist = DynamicPlaylist::create( author, id, name, info, creator, Static, false );
-    playlist->setMode( Static );
-    playlist->createNewRevision( uuid(), playlist->currentrevision(), playlist->type(), playlist->generator()->controls(), playlist->entries() );
-    ViewManager::instance()->show( playlist );
-}
-
-
-void
-TomahawkWindow::createStation()
-{
-    bool ok;
-    QString name = QInputDialog::getText( this, tr( "Create New Station" ), tr( "Name:" ), QLineEdit::Normal, tr( "New Station" ), &ok );
-    if ( !ok || name.isEmpty() )
-        return;
-
-    source_ptr author = SourceList::instance()->getLocal();
-    QString id = uuid();
-    QString info  = ""; // FIXME
-    QString creator = "someone"; // FIXME
-    dynplaylist_ptr playlist = DynamicPlaylist::create( author, id, name, info, creator, OnDemand, false );
-    playlist->setMode( OnDemand );
-    playlist->createNewRevision( uuid(), playlist->currentrevision(), playlist->type(), playlist->generator()->controls() );
-    ViewManager::instance()->show( playlist );
-}
-
-
-void
-TomahawkWindow::createPlaylist()
-{
-    PlaylistTypeSelectorDlg* playlistSelectorDlg = new PlaylistTypeSelectorDlg( TomahawkApp::instance()->mainWindow(), Qt::Sheet );
-#ifndef Q_WS_MAC
-    playlistSelectorDlg->setModal( true );
-#endif
-    connect( playlistSelectorDlg, SIGNAL( finished( int ) ), this, SLOT( playlistCreateDialogFinished( int ) ) );
-
-    playlistSelectorDlg->show();
-}
-
-
-void
-TomahawkWindow::playlistCreateDialogFinished( int ret )
-{
-    PlaylistTypeSelectorDlg* playlistSelectorDlg = qobject_cast< PlaylistTypeSelectorDlg* >( sender() );
-    Q_ASSERT( playlistSelectorDlg );
-
-    QString playlistName = playlistSelectorDlg->playlistName();
-    if ( playlistName.isEmpty() )
-        playlistName = tr( "New Playlist" );
-
-    if ( !playlistSelectorDlg->playlistTypeIsAuto() && ret ) {
-
-        playlist_ptr playlist = Tomahawk::Playlist::create( SourceList::instance()->getLocal(), uuid(), playlistName, "", "", false, QList< query_ptr>() );
-        ViewManager::instance()->show( playlist );
-    } else if ( playlistSelectorDlg->playlistTypeIsAuto() && ret ) {
-       // create Auto Playlist
-       createAutomaticPlaylist( playlistName );
-    }
-    playlistSelectorDlg->deleteLater();
-}
-
-
-void
-TomahawkWindow::audioStarted()
-{
-    m_audioRetryCounter = 0;
-    ui->actionPlay->setText( tr( "Pause" ) );
-}
-
-
-void
-TomahawkWindow::audioStopped()
-{
-
-    ui->actionPlay->setText( tr( "Play" ) );
-}
-
-
-void
-TomahawkWindow::onPlaybackLoading( const Tomahawk::result_ptr& result )
-{
-    m_currentTrack = result;
-    setWindowTitle( m_windowTitle );
-}
-
-
-void
-TomahawkWindow::onSipConnected()
-{
-    ui->actionToggleConnect->setText( tr( "Go &offline" ) );
-}
-
-
-void
-TomahawkWindow::onSipDisconnected()
-{
-    ui->actionToggleConnect->setText( tr( "Go &online" ) );
-}
-
-
-void
-TomahawkWindow::onSipPluginAdded( SipPlugin* p )
-{
-    connect( p, SIGNAL( addMenu( QMenu* ) ), SLOT( pluginMenuAdded( QMenu* ) ) );
-    connect( p, SIGNAL( removeMenu( QMenu* ) ), SLOT( pluginMenuRemoved( QMenu* ) ) );
-}
-
-
-void
-TomahawkWindow::onSipPluginRemoved( SipPlugin* p )
-{
-    Q_UNUSED( p );
-}
-
-
-void
-TomahawkWindow::onSipError()
-{
-    onSipDisconnected();
-
-    QMessageBox::warning( this,
-                          tr( "Authentication Error" ),
-                          QString( "Error connecting to SIP: Authentication failed!" ),
-                          QMessageBox::Ok );
-}
-
-
-void
-TomahawkWindow::setWindowTitle( const QString& title )
-{
-    m_windowTitle = title;
-
-    if ( m_currentTrack.isNull() )
-        QMainWindow::setWindowTitle( title );
-    else
-    {
-        QString s = tr( "%1 by %2", "track, artist name" ).arg( m_currentTrack->track(), m_currentTrack->artist()->name() );
-        QMainWindow::setWindowTitle( tr( "%1 - %2", "current track, some window title" ).arg( s, title ) );
-    }
-}
-
-
-void
-TomahawkWindow::showAboutTomahawk()
-{
-    QString head, desc;
-
-#ifdef DEBUG_BUILD
-    head = tr( "<h2><b>Tomahawk %1<br/>(%2)</h2>" )
-         .arg( TomahawkUtils::appFriendlyVersion() )
-         .arg( qApp->applicationVersion() );
-#else
-    head = tr( "<h2><b>Tomahawk %1</h2>" )
-         .arg( TomahawkUtils::appFriendlyVersion() );
-#endif
-
-    desc = tr( "Copyright 2010 - 2012<br/>Christian Muehlhaeuser &lt;muesli@tomahawk-player.org&gt;<br/><br/>"
-               "Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson" );
-
-    QMessageBox::about( this, tr( "About Tomahawk" ), head + desc );
-}
-
-
-void
-TomahawkWindow::checkForUpdates()
-{
-#ifdef Q_WS_MAC
-    Tomahawk::checkForUpdates();
-#endif
-}
-
-
-void
-TomahawkWindow::onSearch( const QString& search )
-{
-    if ( !search.trimmed().isEmpty() )
-        ViewManager::instance()->show( new SearchWidget( search, this ) );
-}
-
-
-void
-TomahawkWindow::onFilterEdited()
-{
-    onSearch( m_searchWidget->text() );
-    m_searchWidget->clear();
-}
-
-
-void
-TomahawkWindow::showQueue()
-{
-    if ( QThread::currentThread() != thread() )
-    {
-        qDebug() << "Reinvoking in correct thread:" << Q_FUNC_INFO;
-        QMetaObject::invokeMethod( this, "showQueue", Qt::QueuedConnection );
-        return;
-    }
-
-    m_queueView->show();
-}
-
-
-void
-TomahawkWindow::hideQueue()
-{
-    if ( QThread::currentThread() != thread() )
-    {
-        qDebug() << "Reinvoking in correct thread:" << Q_FUNC_INFO;
-        QMetaObject::invokeMethod( this, "hideQueue", Qt::QueuedConnection );
-        return;
-    }
-
-    m_queueView->hide();
-}
-
-
-void
-TomahawkWindow::minimize()
-{
-    if ( isMinimized() )
-    {
-        showNormal();
-    }
-    else
-    {
-        showMinimized();
-    }
-}
-
-
-void
-TomahawkWindow::maximize()
-{
-    if ( isMaximized() )
-    {
-        showNormal();
-    }
-    else
-    {
-        showMaximized();
-    }
-}
-
-
-void
-TomahawkWindow::crashNow()
-{
-    TomahawkUtils::crash();
-}

tomahawk-0.4.2.tar.bz2/src/tomahawkwindow.h Deleted

@@ -1,148 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2010-2012, 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 TOMAHAWKWINDOW_H
-#define TOMAHAWKWINDOW_H
-
-#include <QMainWindow>
-#include <QVariantMap>
-#include <QPushButton>
-#include <QString>
-#include <QStackedWidget>
-
-#include "result.h"
-#include "audio/audioengine.h"
-#include "utils/xspfloader.h"
-
-class JobStatusModel;
-class QSearchField;
-class SipPlugin;
-class SourceTreeView;
-class QAction;
-
-class MusicScanner;
-class AudioControls;
-class TomahawkTrayIcon;
-class PlaylistModel;
-class QueueView;
-class AnimatedSplitter;
-
-namespace Ui
-{
-    class TomahawkWindow;
-    class GlobalSearchWidget;
-}
-
-class TomahawkWindow : public QMainWindow
-{
-Q_OBJECT
-
-public:
-    TomahawkWindow( QWidget* parent = 0 );
-    ~TomahawkWindow();
-
-    AudioControls* audioControls() { return m_audioControls; }
-    SourceTreeView* sourceTreeView() const { return m_sourcetree; }
-
-    void setWindowTitle( const QString& title );
-
-protected:
-    void changeEvent( QEvent* e );
-    void closeEvent( QCloseEvent* e );
-    void showEvent( QShowEvent* e );
-    void hideEvent( QHideEvent* e );
-
-public slots:
-    void createAutomaticPlaylist( QString );
-    void createStation();
-    void createPlaylist();
-    void loadSpiff();
-    void showSettingsDialog();
-    void showDiagnosticsDialog();
-    void updateCollectionManually();
-    void rescanCollectionManually();
-    void pluginMenuAdded(QMenu*);
-    void pluginMenuRemoved(QMenu*);
-    void showOfflineSources();
-
-private slots:
-    void onSipConnected();
-    void onSipDisconnected();
-    void onSipError();
-
-    void onAudioEngineError( AudioEngine::AudioErrorCode error );
-
-    void onXSPFError( XSPFLoader::XSPFErrorCode error );
-    void onXSPFOk( const Tomahawk::playlist_ptr& );
-
-    void addPeerManually();
-
-    void onPlaybackLoading( const Tomahawk::result_ptr& result );
-
-    void audioStarted();
-    void audioStopped();
-
-    void showAboutTomahawk();
-    void checkForUpdates();
-
-    void onSipPluginAdded( SipPlugin* p );
-    void onSipPluginRemoved( SipPlugin* p );
-
-    void onSearch( const QString& search );
-    void onFilterEdited();
-
-    void loadXspfFinished( int );
-
-    void showQueue();
-    void hideQueue();
-
-    void minimize();
-    void maximize();
-
-    void playlistCreateDialogFinished( int ret );
-
-    void crashNow();
-
-private:
-    void loadSettings();
-    void saveSettings();
-
-    void applyPlatformTweaks();
-    void setupSignals();
-    void setupSideBar();
-    void setupUpdateCheck();
-
-    Ui::TomahawkWindow* ui;
-    QSearchField* m_searchWidget;
-    AudioControls* m_audioControls;
-    TomahawkTrayIcon* m_trayIcon;
-    SourceTreeView* m_sourcetree;
-    QPushButton* m_statusButton;
-    QPushButton* m_queueButton;
-    PlaylistModel* m_queueModel;
-    QueueView* m_queueView;
-    AnimatedSplitter* m_sidebar;
-    JobStatusModel* m_jobsModel;
-
-    Tomahawk::result_ptr m_currentTrack;
-    QString m_windowTitle;
-    int m_audioRetryCounter;
-};
-
-#endif // TOMAHAWKWINDOW_H

tomahawk-0.4.2.tar.bz2/src/tomahawkwindow.ui Deleted

@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TomahawkWindow</class>
- <widget class="QMainWindow" name="TomahawkWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1000</width>
-    <height>660</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Tomahawk</string>
-  </property>
-  <widget class="QWidget" name="centralWidget">
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <widget class="QFrame" name="hline1">
-      <property name="maximumSize">
-       <size>
-        <width>16777215</width>
-        <height>1</height>
-       </size>
-      </property>
-      <property name="frameShape">
-       <enum>QFrame::HLine</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QSplitter" name="splitter">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="handleWidth">
-       <number>1</number>
-      </property>
-      <widget class="QWidget" name="sidebarWidget" native="true"/>
-      <widget class="QWidget" name="playlistWidget" native="true"/>
-     </widget>
-    </item>
-    <item>
-     <widget class="QFrame" name="hline2">
-      <property name="maximumSize">
-       <size>
-        <width>16777215</width>
-        <height>1</height>
-       </size>
-      </property>
-      <property name="frameShape">
-       <enum>QFrame::HLine</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>1000</width>
-     <height>20</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuSettings">
-    <property name="title">
-     <string>&amp;Settings</string>
-    </property>
-    <addaction name="actionPreferences"/>
-   </widget>
-   <widget class="QMenu" name="menuApp">
-    <property name="title">
-     <string>&amp;Controls</string>
-    </property>
-    <addaction name="actionPlay"/>
-    <addaction name="actionPrevious"/>
-    <addaction name="actionNext"/>
-    <addaction name="separator"/>
-    <addaction name="actionCreatePlaylist"/>
-    <addaction name="actionCreate_New_Station"/>
-    <addaction name="actionLoadXSPF"/>
-    <addaction name="separator"/>
-    <addaction name="actionUpdateCollection"/>
-    <addaction name="actionRescanCollection"/>
-    <addaction name="separator"/>
-    <addaction name="actionShowOfflineSources"/>
-    <addaction name="separator"/>
-    <addaction name="actionExit"/>
-   </widget>
-   <widget class="QMenu" name="menuNetwork">
-    <property name="title">
-     <string>&amp;Network</string>
-    </property>
-    <addaction name="actionToggleConnect"/>
-    <addaction name="separator"/>
-   </widget>
-   <widget class="QMenu" name="menuWindow">
-    <property name="title">
-     <string>&amp;Window</string>
-    </property>
-    <addaction name="actionMinimize"/>
-    <addaction name="actionZoom"/>
-   </widget>
-   <widget class="QMenu" name="menu_Help">
-    <property name="title">
-     <string>&amp;Help</string>
-    </property>
-    <addaction name="actionDiagnostics"/>
-    <addaction name="actionAboutTomahawk"/>
-   </widget>
-   <addaction name="menuApp"/>
-   <addaction name="menuNetwork"/>
-   <addaction name="menuSettings"/>
-   <addaction name="menuWindow"/>
-   <addaction name="menu_Help"/>
-  </widget>
-  <widget class="QStatusBar" name="statusBar"/>
-  <action name="actionExit">
-   <property name="text">
-    <string>&amp;Quit</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+Q</string>
-   </property>
-   <property name="menuRole">
-    <enum>QAction::QuitRole</enum>
-   </property>
-  </action>
-  <action name="actionToggleConnect">
-   <property name="text">
-    <string>Go &amp;Online</string>
-   </property>
-  </action>
-  <action name="actionAddFriendManually">
-   <property name="text">
-    <string>Add &amp;Friend...</string>
-   </property>
-  </action>
-  <action name="actionUpdateCollection">
-   <property name="text">
-    <string>U&amp;pdate Collection</string>
-   </property>
-   <property name="toolTip">
-    <string>Update Collection</string>
-   </property>
-  </action>
-  <action name="actionPreferences">
-   <property name="text">
-    <string>&amp;Configure Tomahawk...</string>
-   </property>
-   <property name="menuRole">
-    <enum>QAction::PreferencesRole</enum>
-   </property>
-  </action>
-  <action name="actionLoadXSPF">
-   <property name="text">
-    <string>Load &amp;XSPF...</string>
-   </property>
-  </action>
-  <action name="actionCreatePlaylist">
-   <property name="text">
-    <string>Create &amp;New Playlist...</string>
-   </property>
-  </action>
-  <action name="actionAboutTomahawk">
-   <property name="text">
-    <string>About &amp;Tomahawk...</string>
-   </property>
-   <property name="menuRole">
-    <enum>QAction::AboutRole</enum>
-   </property>
-  </action>
-  <action name="actionCreateAutomaticPlaylist">
-   <property name="text">
-    <string>Create New &amp;Automatic Playlist</string>
-   </property>
-  </action>
-  <action name="actionCreate_New_Station">
-   <property name="text">
-    <string>Create New &amp;Station</string>
-   </property>
-  </action>
-  <action name="actionShowOfflineSources">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Show Offline Sources</string>
-   </property>
-  </action>
-  <action name="actionHideOfflineSources">
-   <property name="text">
-    <string>Hide Offline Sources</string>
-   </property>
-  </action>
-  <action name="actionMinimize">
-   <property name="text">
-    <string>Minimize</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+M</string>
-   </property>
-  </action>
-  <action name="actionZoom">
-   <property name="text">
-    <string>Zoom</string>
-   </property>
-   <property name="shortcut">
-    <string>Meta+Ctrl+Z</string>
-   </property>
-  </action>
-  <action name="actionDiagnostics">
-   <property name="text">
-    <string>Diagnostics...</string>
-   </property>
-   <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
-   </property>
-  </action>
-  <action name="actionRescanCollection">
-   <property name="text">
-    <string>Fully &amp;Rescan Collection</string>
-   </property>
-   <property name="toolTip">
-    <string>Fully Rescan Collection</string>
-   </property>
-  </action>
-  <action name="actionPlay">
-   <property name="text">
-    <string>Play</string>
-   </property>
-   <property name="shortcut">
-    <string>Space</string>
-   </property>
-  </action>
-  <action name="actionPrevious">
-   <property name="text">
-    <string>Previous</string>
-   </property>
-  </action>
-  <action name="actionNext">
-   <property name="text">
-    <string>Next</string>
-   </property>
-  </action>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
- <slots>
-  <slot>on_btnResolve_clicked()</slot>
- </slots>
-</ui>

tomahawk-0.4.2.tar.bz2/src/ubuntuunityhack.cpp Deleted

@@ -1,83 +0,0 @@
-/* This file is part of Clementine.
-   Copyright 2010, David Sansome <me@davidsansome.com>
-
-   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/>.
-*/
-
-#include "ubuntuunityhack.h"
-#include "utils/logger.h"
-
-#include <QProcess>
-
-const char* UbuntuUnityHack::kGSettingsFileName     = "gsettings";
-const char* UbuntuUnityHack::kUnityPanel            = "com.canonical.Unity.Panel";
-const char* UbuntuUnityHack::kUnitySystrayWhitelist = "systray-whitelist";
-
-UbuntuUnityHack::UbuntuUnityHack(QObject* parent)
-  : QObject(parent)
-{
-  // Get the systray whitelist from gsettings.  If this fails we're probably
-  // not running on a system with unity
-  QProcess* get = new QProcess(this);
-  connect(get, SIGNAL(finished(int)), SLOT(GetFinished(int)));
-  connect(get, SIGNAL(error(QProcess::ProcessError)), SLOT(GetError()));
-  get->start(kGSettingsFileName, QStringList()
-             << "get" << kUnityPanel << kUnitySystrayWhitelist);
-}
-
-void UbuntuUnityHack::GetError() {
-  QProcess* get = qobject_cast<QProcess*>(sender());
-  if (!get) {
-    return;
-  }
-
-  get->deleteLater();
-}
-
-void UbuntuUnityHack::GetFinished(int exit_code) {
-  QProcess* get = qobject_cast<QProcess*>(sender());
-  if (!get) {
-    return;
-  }
-
-  get->deleteLater();
-
-  if (exit_code != 0) {
-    // Probably not running in Unity.
-    return;
-  }
-
-  QByteArray whitelist = get->readAllStandardOutput();
-
-  tDebug() << "Unity whitelist is" << whitelist;
-
-  int index = whitelist.lastIndexOf('');
-  if (index == -1 || whitelist.contains("'tomahawk'")) {
-    return;
-  }
-
-  whitelist = whitelist.left(index) + QString(", 'tomahawk'").toUtf8() +
-              whitelist.mid(index);
-
-  tLog() << "Setting unity whitelist to" << whitelist;
-
-  QProcess* set = new QProcess(this);
-  connect(set, SIGNAL(finished(int)), set, SLOT(deleteLater()));
-  set->start(kGSettingsFileName, QStringList()
-             << "set" << kUnityPanel << kUnitySystrayWhitelist << whitelist);
-
-  tLog() << "Tomahawk has added itself to the Unity system tray" <<
-                "whitelist, but this won't take effect until the next time" <<
-                "you log out and log back in.";
-}

tomahawk-0.4.2.tar.bz2/src/web/api_v1.cpp Deleted

@@ -1,377 +0,0 @@
-/* === 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
- *   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 "api_v1.h"
-
-#include <QHash>
-
-#include "utils/logger.h"
-
-#include "utils/tomahawkutils.h"
-#include "database/database.h"
-#include "database/databasecommand_addclientauth.h"
-#include "database/databasecommand_clientauthvalid.h"
-#include "network/servent.h"
-#include "pipeline.h"
-
-using namespace Tomahawk;
-
-
-void
-Api_v1::auth_1( QxtWebRequestEvent* event, QString arg )
-{
-    qDebug() << "AUTH_1 HTTP" << event->url.toString() << arg;
-
-    if ( !event->url.hasQueryItem( "website" ) || !event->url.hasQueryItem( "name" ) )
-    {
-        qDebug() << "Malformed HTTP resolve request";
-        send404( event );
-    }
-
-    QString formToken = uuid();
-
-    if ( event->url.hasQueryItem( "json" ) )
-    {
-        // JSON response
-        QVariantMap m;
-        m "formtoken"  = formToken;
-        sendJSON( m, event );
-    }
-    else
-    {
-        // webpage request
-        QString authPage = RESPATH "www/auth.html";
-        QHash< QString, QString > args;
-        if( event->url.hasQueryItem( "receiverurl" ) )
-            args "url"  = QUrl::fromPercentEncoding( event->url.queryItemValue( "receiverurl" ).toUtf8() );
-
-        args "formtoken"  = formToken;
-        args "website"  = QUrl::fromPercentEncoding( event->url.queryItemValue( "website" ).toUtf8() );
-        args "name"  = QUrl::fromPercentEncoding( event->url.queryItemValue( "name" ).toUtf8() );
-        sendWebpageWithArgs( event, authPage, args );
-    }
-}
-
-
-void
-Api_v1::auth_2( QxtWebRequestEvent* event, QString arg )
-{
-    qDebug() << "AUTH_2 HTTP" << event->url.toString() << arg;
-    if( event->content.isNull() )
-    {
-        qDebug() << "Null content";
-        send404( event );
-        return;
-    }
-
-    QString params = QUrl::fromPercentEncoding( event->content->readAll() );
-    params = params.mid( params.indexOf( '?' ) );
-    QStringList pieces = params.split( '&' );
-    QHash< QString, QString > queryItems;
-
-    foreach ( const QString& part, pieces )
-    {
-        QStringList keyval = part.split( '=' );
-        if( keyval.size() == 2 )
-            queryItems.insert( keyval.first(), keyval.last() );
-        else
-            qDebug() << "Failed parsing url parameters: " << part;
-    }
-
-    qDebug() << "has query items:" << pieces;
-    if( !params.contains( "website" ) || !params.contains( "name" ) || !params.contains( "formtoken" ) )
-    {
-        qDebug() << "Malformed HTTP resolve request";
-        send404( event );
-        return;
-    }
-
-    QString website = queryItems "website" ;
-    QString name  = queryItems "name" ;
-    QByteArray authtoken = uuid().toLatin1();
-    qDebug() << "HEADERS:" << event->headers;
-    if( !queryItems.contains( "receiverurl" ) || queryItems.value( "receiverurl" ).isEmpty() )
-    {
-        //no receiver url, so do it ourselves
-        if( queryItems.contains( "json" ) )
-        {
-            QVariantMap m;
-            m "authtoken"  = authtoken;
-
-            sendJSON( m, event );
-        }
-        else
-        {
-            QString authPage = RESPATH "www/auth.na.html";
-            QHash< QString, QString > args;
-            args "authcode"  = authtoken;
-            args "website"  = website;
-            args "name"  = name;
-            sendWebpageWithArgs( event, authPage, args );
-        }
-    }
-    else
-    {
-        // do what the client wants
-        QUrl receiverurl = QUrl( queryItems.value( "receiverurl" ), QUrl::TolerantMode );
-        receiverurl.addEncodedQueryItem( "authtoken", "#" + authtoken );
-        qDebug() << "Got receiver url:" << receiverurl.toString();
-
-        QxtWebRedirectEvent* e = new QxtWebRedirectEvent( event->sessionID, event->requestID, receiverurl.toString() );
-        postEvent( e );
-        // TODO validation of receiverurl?
-    }
-
-    DatabaseCommand_AddClientAuth* dbcmd = new DatabaseCommand_AddClientAuth( authtoken, website, name, event->headers.key( "ua" ) );
-    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(dbcmd) );
-}
-
-
-// all v1 api calls go to /api/
-void
-Api_v1::api( QxtWebRequestEvent* event )
-{
-    qDebug() << "HTTP" << event->url.toString();
-
-    const QUrl& url = event->url;
-    if( url.hasQueryItem( "method" ) )
-    {
-        const QString method = url.queryItemValue( "method" );
-
-        if( method == "stat" )        return stat( event );
-        if( method == "resolve" )     return resolve( event );
-        if( method == "get_results" ) return get_results( event );
-    }
-
-    send404( event );
-}
-
-
-// request for stream: /sid/<id>
-void
-Api_v1::sid( QxtWebRequestEvent* event, QString unused )
-{
-    Q_UNUSED( unused );
-
-    RID rid = event->url.path().mid( 5 );
-    qDebug() << "Request for sid " << rid;
-
-    result_ptr rp = Pipeline::instance()->result( rid );
-    if( rp.isNull() )
-    {
-        return send404( event );
-    }
-
-    QSharedPointer<QIODevice> iodev = Servent::instance()->getIODeviceForUrl( rp );
-    if( iodev.isNull() )
-    {
-        return send404( event ); // 503?
-    }
-
-    QxtWebPageEvent* e = new QxtWebPageEvent( event->sessionID, event->requestID, iodev );
-    e->streaming = iodev->isSequential();
-    e->contentType = rp->mimetype().toAscii();
-    if( rp->size() > 0 )
-        e->headers.insert( "Content-Length", QString::number( rp->size() ) );
-    postEvent( e );
-}
-
-
-void
-Api_v1::send404( QxtWebRequestEvent* event )
-{
-    qDebug() << "404" << event->url.toString();
-    QxtWebPageEvent* wpe = new QxtWebPageEvent( event->sessionID, event->requestID, "<h1>Not Found</h1>" );
-    wpe->status = 404;
-    wpe->statusMessage = "no event found";
-    postEvent( wpe );
-}
-
-
-void
-Api_v1::stat( QxtWebRequestEvent* event )
-{
-    qDebug() << "Got Stat request:" << event->url.toString();
-    m_storedEvent = event;
-
-    if( !event->content.isNull() )
-        qDebug() << "BODY:" << event->content->readAll();
-
-    if( event->url.hasQueryItem( "auth" ) )
-    {
-        // check for auth status
-        DatabaseCommand_ClientAuthValid* dbcmd = new DatabaseCommand_ClientAuthValid( event->url.queryItemValue( "auth" ) );
-        connect( dbcmd, SIGNAL( authValid( QString, QString, bool ) ), this, SLOT( statResult( QString, QString, bool ) ) );
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(dbcmd) );
-    }
-    else
-    {
-        statResult( QString(), QString(), false );
-    }
-}
-
-
-void
-Api_v1::statResult( const QString& clientToken, const QString& name, bool valid )
-{
-    Q_UNUSED( clientToken )
-    Q_UNUSED( name )
-    QVariantMap m;
-    m.insert( "name", "playdar" );
-    m.insert( "version", "0.1.1" ); // TODO (needs to be >=0.1.1 for JS to work)
-    m.insert( "authenticated", valid ); // TODO
-    m.insert( "capabilities", QVariantList() );
-    sendJSON( m, m_storedEvent );
-
-    m_storedEvent = 0;
-}
-
-
-void
-Api_v1::resolve( QxtWebRequestEvent* event )
-{
-    if( !event->url.hasQueryItem( "artist" ) ||
-        !event->url.hasQueryItem( "track" ) )
-    {
-        qDebug() << "Malformed HTTP resolve request";
-        send404( event );
-    }
-
-    QString qid;
-    if ( event->url.hasQueryItem( "qid" ) )
-        qid = event->url.queryItemValue( "qid" );
-    else
-        qid = uuid();
-
-    query_ptr qry = Query::get( QUrl::fromPercentEncoding( event->url.queryItemValue( "artist" ).toUtf8() ), QUrl::fromPercentEncoding( event->url.queryItemValue( "track" ).toUtf8() ), QUrl::fromPercentEncoding( event->url.queryItemValue( "album" ).toUtf8() ), qid, false );
-    Pipeline::instance()->resolve( qry, true, true );
-
-    QVariantMap r;
-    r.insert( "qid", qid );
-    sendJSON( r, event );
-}
-
-
-void
-Api_v1::staticdata( QxtWebRequestEvent* event, const QString& str )
-{
-    qDebug() << "STATIC request:" << event << str;
-    if( str.contains( "tomahawk_auth_logo.png" ) )
-    {
-        QFile f( RESPATH "www/tomahawk_banner_small.png" );
-        f.open( QIODevice::ReadOnly );
-        QByteArray data = f.readAll();
-        QxtWebPageEvent * e = new QxtWebPageEvent( event->sessionID, event->requestID, data );
-        e->contentType = "image/png";
-        postEvent( e );
-    }
-}
-
-
-void
-Api_v1::get_results( QxtWebRequestEvent* event )
-{
-    if( !event->url.hasQueryItem("qid") )
-    {
-        qDebug() << "Malformed HTTP get_results request";
-        send404(event);
-    }
-
-    query_ptr qry = Pipeline::instance()->query( event->url.queryItemValue( "qid" ) );
-    if( qry.isNull() )
-    {
-        send404( event );
-        return;
-    }
-
-    QVariantMap r;
-    r.insert( "qid", qry->id() );
-    r.insert( "poll_interval", 1300 );
-    r.insert( "refresh_interval", 1000 );
-    r.insert( "poll_limit", 14 );
-    r.insert( "solved", qry->playable() );
-    r.insert( "query", qry->toVariant() );
-
-    QVariantList res;
-    foreach( const result_ptr& rp, qry->results() )
-    {
-        res << rp->toVariant();
-    }
-    r.insert( "results", res );
-
-    sendJSON( r, event );
-}
-
-
-void
-Api_v1::sendJSON( const QVariantMap& m, QxtWebRequestEvent* event )
-{
-    QJson::Serializer ser;
-    QByteArray ctype;
-    QByteArray body = ser.serialize( m );
-
-    if( event->url.hasQueryItem("jsonp") && !event->url.queryItemValue( "jsonp" ).isEmpty() )
-    {
-        ctype = "text/javascript; charset=utf-8";
-        body.prepend( QString("%1( ").arg( event->url.queryItemValue( "jsonp" ) ).toAscii() );
-        body.append( " );" );
-    }
-    else
-    {
-        ctype = "appplication/json; charset=utf-8";
-    }
-
-    QxtWebPageEvent * e = new QxtWebPageEvent( event->sessionID, event->requestID, body );
-    e->contentType = ctype;
-    e->headers.insert( "Content-Length", QString::number( body.length() ) );
-    postEvent( e );
-    qDebug() << "JSON response" << event->url.toString() << body;
-}
-
-
-// load an html template from a file, replace args from map
-// then serve
-void
-Api_v1::sendWebpageWithArgs( QxtWebRequestEvent* event, const QString& filenameSource, const QHash< QString, QString >& args )
-{
-    if( !QFile::exists( filenameSource ) )
-        qWarning() << "Passed invalid file for html source:" << filenameSource;
-
-    QFile f( filenameSource );
-    f.open( QIODevice::ReadOnly );
-    QByteArray html = f.readAll();
-
-    foreach( const QString& param, args.keys() )
-    {
-        html.replace( QString( "<%%1%>" ).arg( param.toUpper() ), args.value( param ).toUtf8() );
-    }
-    // workaround for receiverurl
-    if( !args.keys().contains( "URL" ) )
-        html.replace( QString( "<%URL%>" ).toLatin1(), QByteArray() );
-
-
-    QxtWebPageEvent* e = new QxtWebPageEvent( event->sessionID, event->requestID, html );
-    postEvent( e );
-}
-
-
-void
-Api_v1::index( QxtWebRequestEvent* event )
-{
-    send404( event );
-}

tomahawk-0.4.2.tar.bz2/src/web/api_v1.h Deleted

@@ -1,79 +0,0 @@
-/* === 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
- *   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 TOMAHAWK_WEBAPI_V1
-#define TOMAHAWK_WEBAPI_V1
-
-// See: http://doc.libqxt.org/tip/qxtweb.html
-
-#include "QxtHttpServerConnector"
-#include "QxtHttpSessionManager"
-#include "QxtWebContent"
-#include "QxtWebSlotService"
-#include "QxtWebPageEvent"
-
-#include <qjson/parser.h>
-#include <qjson/serializer.h>
-#include <qjson/qobjecthelper.h>
-
-#include <QFile>
-#include <QSharedPointer>
-#include <QStringList>
-
-class Api_v1 : public QxtWebSlotService
-{
-Q_OBJECT
-
-public:
-
-    Api_v1( QxtAbstractWebSessionManager* sm, QObject* parent = 0 )
-        : QxtWebSlotService( sm, parent )
-    {
-    }
-
-public slots:
-    // authenticating uses /auth_1
-    // we redirect to /auth_2 for the callback
-    void auth_1( QxtWebRequestEvent* event, QString unused = QString() );
-    void auth_2( QxtWebRequestEvent* event, QString unused = QString() );
-
-    // all v1 api calls go to /api/
-    void api( QxtWebRequestEvent* event );
-
-    // request for stream: /sid/<id>
-    void sid( QxtWebRequestEvent* event, QString unused = QString() );
-    void send404( QxtWebRequestEvent* event );
-    void stat( QxtWebRequestEvent* event );
-    void statResult( const QString& clientToken, const QString& name, bool valid );
-    void resolve( QxtWebRequestEvent* event );
-    void staticdata( QxtWebRequestEvent* event,const QString& );
-    void get_results( QxtWebRequestEvent* event );
-    void sendJSON( const QVariantMap& m, QxtWebRequestEvent* event );
-
-    // load an html template from a file, replace args from map
-    // then serve
-    void sendWebpageWithArgs( QxtWebRequestEvent* event, const QString& filenameSource, const QHash< QString, QString >& args );
-
-    void index( QxtWebRequestEvent* event );
-
-private:
-    QxtWebRequestEvent* m_storedEvent;
-};
-
-#endif
-

tomahawk-0.4.2.tar.bz2/src/xmppbot/xmppbot.cpp Deleted

@@ -1,448 +0,0 @@
-/* === 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
- *   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 "xmppbot.h"
-
-#include "infosystem/infosystem.h"
-#include "album.h"
-#include "typedefs.h"
-#include "tomahawksettings.h"
-
-#include "audio/audioengine.h"
-
-#include <gloox/client.h>
-#include <gloox/rostermanager.h>
-#include <gloox/message.h>
-#include <gloox/connectiontcpclient.h>
-
-#include <QtCore/QStringList>
-
-#include "utils/logger.h"
-
-using namespace gloox;
-using namespace Tomahawk::InfoSystem;
-
-static QString s_botInfoIdentifier = QString( "XMPPBot" );
-
-
-XMPPBot::XMPPBot(QObject *parent)
-    : QObject(parent)
-    , m_currReturnMessage("\n")
-{
-    qDebug() << Q_FUNC_INFO;
-    TomahawkSettings *settings = TomahawkSettings::instance();
-    QString server = settings->xmppBotServer();
-    QString jidstring = settings->xmppBotJid();
-    QString password = settings->xmppBotPassword();
-    int port = settings->xmppBotPort();
-    if (jidstring.isEmpty() || password.isEmpty())
-        return;
-
-    JID jid(jidstring.toStdString());
-    jid.setResource( QString( "tomahawkbot%1" ).arg( qrand() ).toStdString() );
-
-    m_client = new XMPPBotClient(this, jid, password.toStdString(), port);
-    if (!server.isEmpty())
-        m_client.data()->setServer(server.toStdString());
-
-    m_client.data()->registerConnectionListener(this);
-    m_client.data()->registerSubscriptionHandler(this);
-    m_client.data()->registerMessageHandler(this);
-    m_client.data()->setPresence(Presence::Available, 1, "Tomahawkbot available");
-
-    connect(AudioEngine::instance(), SIGNAL(started(const Tomahawk::result_ptr &)),
-            SLOT(newTrackSlot(const Tomahawk::result_ptr &)));
-
-    connect(InfoSystem::instance(),
-        SIGNAL(info(QString, Tomahawk::InfoSystem::InfoType, QVariant, QVariant, QVariantMap)),
-        SLOT(infoReturnedSlot(QString, Tomahawk::InfoSystem::InfoType, QVariant, QVariant, QVariantMap)));
-
-    connect(InfoSystem::instance(), SIGNAL(finished(QString)), SLOT(infoFinishedSlot(QString)));
-
-    bool success = m_client.data()->gloox::Client::connect(false);
-    if (success)
-        m_client.data()->run();
-    else
-        qDebug() << "XMPPBot failed to connect with Client";
-}
-
-XMPPBot::~XMPPBot()
-{
-    qDebug() << Q_FUNC_INFO;
-    if (!m_client.isNull())
-        m_client.data()->gloox::Client::disconnect();
-}
-
-void XMPPBot::newTrackSlot(const Tomahawk::result_ptr &track)
-{
-    m_currTrack = track;
-    if (!track)
-        return;
-    QString status = QString("%1 - %2 (%3)")
-                    .arg(track->artist()->name())
-                    .arg(track->track())
-                    .arg(track->album()->name());
-
-    m_client.data()->setPresence(Presence::Available, 1, status.toStdString());
-}
-
-void XMPPBot::onConnect()
-{
-    qDebug() << Q_FUNC_INFO;
-    qDebug() << "XMPPBot Connected";
-}
-
-void XMPPBot::onDisconnect(ConnectionError e)
-{
-    qDebug() << Q_FUNC_INFO;
-    qDebug() << "XMPPBot Disconnected";
-    qDebug() << "Connection error msg:" << e;
-}
-
-bool XMPPBot::onTLSConnect(const gloox::CertInfo& info)
-{
-    //WARNING: Blindly accepts all certificates, at the moment
-    qDebug() << Q_FUNC_INFO;
-    return true;
-}
-
-void XMPPBot::handleSubscription(const gloox::Subscription& subscription)
-{
-    qDebug() << Q_FUNC_INFO;
-    if (subscription.subtype() == Subscription::Subscribed)
-    {
-        qDebug() << "XMPPBot is now subscribed to " << subscription.from().bare().c_str();
-        return;
-    }
-    else if(subscription.subtype() == Subscription::Unsubscribed)
-    {
-        qDebug() << "XMPPBot is now unsubscribed from " << subscription.from().bare().c_str();
-        return;
-    }
-    else if(subscription.subtype() == Subscription::Subscribe)
-    {
-        m_client.data()->rosterManager()->ackSubscriptionRequest(subscription.from().bareJID(), true);
-        m_client.data()->rosterManager()->subscribe(subscription.from().bareJID(), EmptyString, StringList(), "Let me in?");
-    }
-    else if(subscription.subtype() == Subscription::Unsubscribe)
-    {
-        m_client.data()->rosterManager()->ackSubscriptionRequest(subscription.from().bareJID(), true);
-        m_client.data()->rosterManager()->unsubscribe(subscription.from().bareJID(), "Sorry to see you go.");
-    }
-}
-
-void XMPPBot::handleMessage(const Message& msg, MessageSession* session)
-{
-    //TODO: implement "properly" with MessageSessions, if the bot is to be multi-user
-    if (msg.subtype() != Message::Chat || msg.from().full().empty() || msg.to().full().empty())
-        return;
-
-    QString body = QString::fromStdString( msg.body() ).toLower().trimmed();
-    QString originatingJid = QString::fromStdString( msg.from().full() );
-
-    if ( body.startsWith( "play" ) )
-    {
-        QStringList tokens = body.right( body.length() - 5 ).split( QString( "-" ), QString::SkipEmptyParts );
-        if ( tokens.count() < 2 )
-            AudioEngine::instance()->play();
-
-        Tomahawk::query_ptr q = Tomahawk::Query::get( tokens.first().trimmed(), tokens.last().trimmed(), QString() );
-        connect( q.data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ),
-                             SLOT( onResultsAdded( QList<Tomahawk::result_ptr> ) ) );
-
-        return;
-    }
-    else if ( body.startsWith( "stop" ) )
-    {
-        AudioEngine::instance()->stop();
-        return;
-    }
-    else if ( body.startsWith( "prev" ) )
-    {
-        AudioEngine::instance()->previous();
-        return;
-    }
-    else if ( body.startsWith( "next" ) )
-    {
-        AudioEngine::instance()->next();
-        return;
-    }
-    else if ( body.startsWith( "pause" ) )
-    {
-        AudioEngine::instance()->pause();
-        return;
-    }
-
-    QStringList tokens( body.split( QString( " and " ), QString::SkipEmptyParts ) );
-    if ( tokens.isEmpty() )
-        return;
-
-    qDebug() << "jid from:" << QString::fromStdString(msg.from().full()) << ", jid to:" << QString::fromStdString(msg.to().full());
-    qDebug() << "Operating on tokens:" << tokens;
-
-    if (m_currTrack.isNull() || m_currTrack->artist()->name().isEmpty() || m_currTrack->track().isEmpty())
-    {
-        qDebug() << "XMPPBot can't figure out track";
-        QString m_currReturnMessage("\n\nSorry, I can't figure out what track is playing.\n\n");
-        Message retMsg(Message::Chat, JID(originatingJid.toStdString()), m_currReturnMessage.toStdString());
-        m_client.data()->send(retMsg);
-        return;
-    }
-
-    InfoTypeMap infoMap;
-    Q_FOREACH(QString token, tokens)
-    {
-        if (token == "biography")
-            infoMapInfoArtistBiography = m_currTrack.data()->artist()->name();
-        if (token == "terms")
-            infoMapInfoArtistTerms = m_currTrack.data()->artist()->name();
-        if (token == "hotttness")
-            infoMapInfoArtistHotttness = m_currTrack.data()->artist()->name();
-        if (token == "familiarity")
-            infoMapInfoArtistFamiliarity = m_currTrack.data()->artist()->name();
-        if (token == "lyrics")
-        {
-            QVariantMap myhash;
-            myhash"trackName" = QVariant::fromValue<QString>(m_currTrack.data()->track());
-            myhash"artistName" = QVariant::fromValue<QString>(m_currTrack.data()->artist()->name());
-            infoMapInfoTrackLyrics = QVariant::fromValue<QVariantMap>(myhash);
-        }
-    }
-
-    if (infoMap.isEmpty())
-    {
-        qDebug() << "XMPPBot can't figure out track";
-        QString m_currReturnMessage("\n\nSorry, I couldn't recognize any commands.\n\n");
-        Message retMsg(Message::Chat, JID(originatingJid.toStdString()), m_currReturnMessage.toStdString());
-        m_client.data()->send(retMsg);
-        return;
-    }
-
-    m_currInfoMap.unite(infoMap);
-    QString waitMsg("Please wait...");
-    Message retMsg(Message::Chat, JID(originatingJid.toStdString()), waitMsg.toStdString());
-    m_client.data()->send(retMsg);
-    QVariantMap hash;
-    hash"XMPPBotSendToJID" = originatingJid;
-    InfoSystem::instance()->getInfo(s_botInfoIdentifier, infoMap, hash);
-}
-
-void XMPPBot::infoReturnedSlot(QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input, QVariant output, QVariantMap customData)
-{
-    qDebug() << Q_FUNC_INFO;
-
-    if (caller != s_botInfoIdentifier ||
-        input.isNull() || !input.isValid() ||
-        !customData.contains("XMPPBotSendToJID")
-       )
-    {
-        qDebug() << "Not the right object, custom data is null, or don't have a set JID";
-        return;
-    }
-
-    if (!m_currInfoMap.contains(type))
-    {
-        qDebug() << "not in currInfoMap";
-        return;
-    }
-    else
-        m_currInfoMap.remove(type);
-
-    QString jid = customData"XMPPBotSendToJID".toString();
-    if (!m_currReturnJid.isEmpty() && m_currReturnJid != jid && !m_currReturnMessage.isEmpty())
-    {
-        gloox::Message msg(Message::Chat, JID(jid.toStdString()), m_currReturnMessage.toStdString());
-        m_client.data()->send(msg);
-        m_currReturnMessage = QString("\n");
-    }
-    m_currReturnJid = jid;
-
-    switch(type)
-    {
-        case InfoArtistBiography:
-        {
-            qDebug() << "Artist bio requested";
-            if (!output.canConvert<Tomahawk::InfoSystem::InfoGenericMap>() ||
-                !input.canConvert<QString>()
-               )
-            {
-                qDebug() << "Variants failed to be valid";
-                break;
-            }
-            InfoGenericMap bmap = output.value<Tomahawk::InfoSystem::InfoGenericMap>();
-            QString artist = input.toString();
-            m_currReturnMessage += QString("\nBiographies for %1\n").arg(artist);
-            Q_FOREACH(QString source, bmap.keys())
-            {
-                m_currReturnMessage += (bmapsource"attribution".isEmpty() ?
-                        QString("From %1:\n").arg(bmapsource"site") :
-                        QString("From %1 at %2:\n").arg(bmapsource"attribution").arg(bmapsource"site"));
-                m_currReturnMessage += bmapsource"text" + QString("\n");
-            }
-            break;
-        }
-        case InfoArtistTerms:
-        {
-            qDebug() << "Artist terms requested";
-            if (!output.canConvert<Tomahawk::InfoSystem::InfoGenericMap>() ||
-                !input.canConvert<QString>()
-               )
-            {
-                qDebug() << "Variants failed to be valid";
-                break;
-            }
-            InfoGenericMap tmap = output.value<Tomahawk::InfoSystem::InfoGenericMap>();
-            QString artist = input.toString();
-            m_currReturnMessage += tr("\nTerms for %1:\n").arg(artist);
-            if (tmap.isEmpty())
-                m_currReturnMessage += tr("No terms found, sorry.");
-            else
-            {
-                bool first = true;
-                Q_FOREACH(QString term, tmap.keys())
-                {
-                    if (first)
-                        m_currReturnMessage += (first ?
-                            QString("%1 (weight %2, frequency %3)")
-                                .arg(term).arg(tmapterm"weight").arg(tmapterm"frequency")
-                              :
-                            QString("\n%1 (weight %2, frequency %3)")
-                                .arg(term).arg(tmapterm"weight").arg(tmapterm"frequency")
-                              );
-                    first = false;
-                }
-                m_currReturnMessage += QString("\n");
-            }
-            break;
-        }
-        case InfoArtistHotttness:
-        {
-            qDebug() << "Artist hotttness requested";
-            if (!output.canConvert<qreal>() ||
-                !input.canConvert<QString>()
-               )
-            {
-                qDebug() << "Variants failed to be valid";
-                break;
-            }
-            QString artist = input.toString();
-            qreal retVal = output.toReal();
-            QString retValString = (retVal == 0.0 ? "(none)" : QString::number(retVal));
-            m_currReturnMessage += tr("\nHotttness for %1: %2\n").arg(artist, retValString);
-            break;
-        }
-        case InfoArtistFamiliarity:
-        {
-            qDebug() << "Artist familiarity requested";
-            if (!output.canConvert<qreal>() ||
-                !input.canConvert<QString>()
-               )
-            {
-                qDebug() << "Variants failed to be valid";
-                break;
-            }
-            QString artist = input.toString();
-            qreal retVal = output.toReal();
-            QString retValString = (retVal == 0.0 ? "(none)" : QString::number(retVal));
-            m_currReturnMessage += tr("\nFamiliarity for %1: %2\n").arg(artist, retValString);
-            break;
-        }
-        case InfoTrackLyrics:
-        {
-            qDebug() << "Lyrics requested";
-            if (!output.canConvert<QString>() ||
-                !input.canConvert<QVariantMap>()
-               )
-            {
-                qDebug() << "Variants failed to be valid";
-                break;
-            }
-            QVariantMap inHash = input.value<QVariantMap>();
-            QString artist = inHash"artistName".toString();
-            QString track = inHash"trackName".toString();
-            QString lyrics = output.toString();
-            qDebug() << "lyrics = " << lyrics;
-            m_currReturnMessage += tr("\nLyrics for \"%1\" by %2:\n\n%3\n").arg(track, artist, lyrics);
-            break;
-        }
-        default:
-            break;
-    }
-
-    if (m_currReturnMessage.isEmpty())
-    {
-        qDebug() << "Empty message, not sending anything back";
-        return;
-    }
-
-    qDebug() << "Going to send message: " << m_currReturnMessage << " to " << jid;
-
-    //gloox::Message msg(Message::Chat, JID(jid.toStdString()), m_currReturnMessage.toStdString());
-    //m_client.data()->send(msg);
-}
-
-void XMPPBot::infoFinishedSlot(QString caller)
-{
-    qDebug() << Q_FUNC_INFO;
-    qDebug() << "current return message is" << m_currReturnMessage;
-    qDebug() << "id is" << caller << "and our id is" << s_botInfoIdentifier;
-    if (m_currReturnMessage.isEmpty() || caller != s_botInfoIdentifier)
-        return;
-
-    qDebug() << "Sending message to JID" << m_currReturnJid;
-    gloox::Message msg(Message::Chat, JID(m_currReturnJid.toStdString()), m_currReturnMessage.toStdString());
-    m_client.data()->send(msg);
-    m_currReturnMessage = QString("\n");
-    m_currReturnJid.clear();
-}
-
-
-void XMPPBot::onResultsAdded( const QList<Tomahawk::result_ptr>& result )
-{
-    AudioEngine::instance()->playItem( 0, result.first() );
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-
-XMPPBotClient::XMPPBotClient(QObject *parent, JID &jid, std::string password, int port)
-    : QObject(parent)
-    , Client(jid, password, port)
-    , m_timer(this)
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-XMPPBotClient::~XMPPBotClient()
-{
-    qDebug() << Q_FUNC_INFO;
-}
-
-void XMPPBotClient::run()
-{
-    qDebug() << Q_FUNC_INFO;
-    QObject::connect(&m_timer, SIGNAL(timeout()), SLOT(recvSlot()));
-    m_timer.start(200);
-    qDebug() << "XMPPBot running";
-}
-
-void XMPPBotClient::recvSlot()
-{
-    gloox::ConnectionError error = recv(100);
-    if (error != gloox::ConnNoError)
-        qDebug() << "ERROR: in XMPPBotClient::recvSlot" << error;
-}

tomahawk-0.4.2.tar.bz2/src/xmppbot/xmppbot.h Deleted

@@ -1,95 +0,0 @@
-/* === 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
- *   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 XMPPBOT_H
-#define XMPPBOT_H
-
-#include <result.h>
-#include <infosystem/infosystem.h>
-
-#include <QtCore/QObject>
-#include <QtCore/qsharedpointer.h>
-#include <QTimer>
-
-#include <gloox/messagehandler.h>
-#include <gloox/messagesessionhandler.h>
-#include <gloox/client.h>
-#include <gloox/connectionlistener.h>
-#include <gloox/subscriptionhandler.h>
-#include <gloox/messagehandler.h>
-
-class XMPPBotClient
-    : public QObject
-    , public gloox::Client
-{
-    Q_OBJECT
-
-public:
-    XMPPBotClient(QObject* parent, gloox::JID &jid, std::string password, int port);
-    virtual ~XMPPBotClient();
-
-    void run();
-
-private slots:
-    void recvSlot();
-
-private:
-    QTimer m_timer;
-};
-
-class XMPPBot
-    : public QObject
-    , public gloox::ConnectionListener
-    , public gloox::SubscriptionHandler
-    , public gloox::MessageHandler
-{
-    Q_OBJECT
-
-public:
-    XMPPBot(QObject *parent);
-    virtual ~XMPPBot();
-
-public slots:
-    virtual void newTrackSlot(const Tomahawk::result_ptr &track);
-    virtual void infoReturnedSlot(QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input, QVariant output, QVariantMap customData);
-    virtual void infoFinishedSlot(QString caller);
-
-protected:
-    // ConnectionListener
-    virtual void onConnect();
-    virtual void onDisconnect(gloox::ConnectionError e);
-    virtual bool onTLSConnect(const gloox::CertInfo &info);
-
-    // SubscriptionHandler
-    virtual void handleSubscription(const gloox::Subscription &subscription);
-
-    // MessageHandler
-    virtual void handleMessage(const gloox::Message &msg, gloox::MessageSession *session = 0);
-
-private slots:
-    void onResultsAdded( const QList<Tomahawk::result_ptr>& result );
-
-private:
-    QWeakPointer<XMPPBotClient> m_client;
-    Tomahawk::result_ptr m_currTrack;
-    Tomahawk::InfoSystem::InfoTypeMap m_currInfoMap;
-    QString m_currReturnMessage;
-    QString m_currReturnJid;
-};
-
-#endif // XMPPBOT_H

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper_unittest.cc Deleted

@@ -1,429 +0,0 @@
-// Copyright (c) 2009, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <string>
-
-#include <fcntl.h>
-#include <limits.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdint.h>
-#include <sys/mman.h>
-#include <sys/poll.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "breakpad_googletest_includes.h"
-#include "client/linux/minidump_writer/linux_dumper.h"
-#include "common/linux/eintr_wrapper.h"
-#include "common/linux/file_id.h"
-#include "common/memory.h"
-
-using std::string;
-using namespace google_breakpad;
-
-namespace {
-typedef testing::Test LinuxDumperTest;
-
-string GetHelperBinary() {
-  // Locate helper binary next to the current binary.
-  char self_pathPATH_MAX;
-  if (readlink("/proc/self/exe", self_path, sizeof(self_path) - 1) == -1) {
-    return "";
-  }
-  string helper_path(self_path);
-  size_t pos = helper_path.rfind('/');
-  if (pos == string::npos) {
-    return "";
-  }
-  helper_path.erase(pos + 1);
-  helper_path += "linux_dumper_unittest_helper";
-
-  return helper_path;
-}
-
-}
-
-TEST(LinuxDumperTest, Setup) {
-  LinuxDumper dumper(getpid());
-}
-
-TEST(LinuxDumperTest, FindMappings) {
-  LinuxDumper dumper(getpid());
-  ASSERT_TRUE(dumper.Init());
-
-  ASSERT_TRUE(dumper.FindMapping(reinterpret_cast<void*>(getpid)));
-  ASSERT_TRUE(dumper.FindMapping(reinterpret_cast<void*>(printf)));
-  ASSERT_FALSE(dumper.FindMapping(NULL));
-}
-
-TEST(LinuxDumperTest, ThreadList) {
-  LinuxDumper dumper(getpid());
-  ASSERT_TRUE(dumper.Init());
-
-  ASSERT_GE(dumper.threads().size(), (size_t)1);
-  bool found = false;
-  for (size_t i = 0; i < dumper.threads().size(); ++i) {
-    if (dumper.threads()i == getpid()) {
-      found = true;
-      break;
-    }
-  }
-}
-
-// Helper stack class to close a file descriptor and unmap
-// a mmap'ed mapping.
-class StackHelper {
-public:
-  StackHelper(int fd, char* mapping, size_t size)
-    : fd_(fd), mapping_(mapping), size_(size) {}
-  ~StackHelper() {
-    munmap(mapping_, size_);
-    close(fd_);
-  }
-
-private:
-  int fd_;
-  char* mapping_;
-  size_t size_;
-};
-
-TEST(LinuxDumperTest, MergedMappings) {
-  string helper_path(GetHelperBinary());
-  if (helper_path.empty()) {
-    FAIL() << "Couldn't find helper binary";
-    exit(1);
-  }
-
-  // mmap two segments out of the helper binary, one
-  // enclosed in the other, but with different protections.
-  const size_t kPageSize = sysconf(_SC_PAGESIZE);
-  const size_t kMappingSize = 3 * kPageSize;
-  int fd = open(helper_path.c_str(), O_RDONLY);
-  ASSERT_NE(-1, fd);
-  char* mapping =
-    reinterpret_cast<char*>(mmap(NULL,
-                                 kMappingSize,
-                                 PROT_READ,
-                                 MAP_SHARED,
-                                 fd,
-                                 0));
-  ASSERT_TRUE(mapping);
-
-  const u_int64_t kMappingAddress = reinterpret_cast<u_int64_t>(mapping);
-
-  // Ensure that things get cleaned up.
-  StackHelper helper(fd, mapping, kMappingSize);
-
-  // Carve a page out of the first mapping with different permissions.
-  char* inside_mapping =  reinterpret_cast<char*>(mmap(mapping + 2 *kPageSize,
-                                 kPageSize,
-                                 PROT_NONE,
-                                 MAP_SHARED | MAP_FIXED,
-                                 fd,
-                                 // Map a different offset just to
-                                 // better test real-world conditions.
-                                 kPageSize));
-  ASSERT_TRUE(inside_mapping);
-
-  // Now check that LinuxDumper interpreted the mappings properly.
-  LinuxDumper dumper(getpid());
-  ASSERT_TRUE(dumper.Init());
-  int mapping_count = 0;
-  for (unsigned i = 0; i < dumper.mappings().size(); ++i) {
-    const MappingInfo& mapping = *dumper.mappings()i;
-    if (strcmp(mapping.name, helper_path.c_str()) == 0) {
-      // This mapping should encompass the entire original mapped
-      // range.
-      EXPECT_EQ(kMappingAddress, mapping.start_addr);
-      EXPECT_EQ(kMappingSize, mapping.size);
-      EXPECT_EQ(0, mapping.offset);
-      mapping_count++;
-    }
-  }
-  EXPECT_EQ(1, mapping_count);
-}
-
-TEST(LinuxDumperTest, VerifyStackReadWithMultipleThreads) {
-  static const int kNumberOfThreadsInHelperProgram = 5;
-  char kNumberOfThreadsArgument2;
-  sprintf(kNumberOfThreadsArgument, "%d", kNumberOfThreadsInHelperProgram);
-
-  int fds2;
-  ASSERT_NE(-1, pipe(fds));
-
-  pid_t child_pid = fork();
-  if (child_pid == 0) {
-    // In child process.
-    close(fds0);
-
-    string helper_path(GetHelperBinary());
-    if (helper_path.empty()) {
-      FAIL() << "Couldn't find helper binary";
-      exit(1);
-    }
-
-    // Pass the pipe fd and the number of threads as arguments.
-    char pipe_fd_string8;
-    sprintf(pipe_fd_string, "%d", fds1);
-    execl(helper_path.c_str(),
-          "linux_dumper_unittest_helper",
-          pipe_fd_string,
-          kNumberOfThreadsArgument,
-          NULL);
-    // Kill if we get here.
-    printf("Errno from exec: %d", errno);
-    FAIL() << "Exec of " << helper_path << " failed: " << strerror(errno);
-    exit(0);
-  }
-  close(fds1);
-  // Wait for the child process to signal that it's ready.
-  struct pollfd pfd;
-  memset(&pfd, 0, sizeof(pfd));
-  pfd.fd = fds0;
-  pfd.events = POLLIN | POLLERR;
-
-  const int r = HANDLE_EINTR(poll(&pfd, 1, 1000));
-  ASSERT_EQ(1, r);
-  ASSERT_TRUE(pfd.revents & POLLIN);
-  uint8_t junk;
-  read(fds0, &junk, sizeof(junk));
-  close(fds0);
-
-  // Child is ready now.
-  LinuxDumper dumper(child_pid);
-  ASSERT_TRUE(dumper.Init());
-  EXPECT_EQ((size_t)kNumberOfThreadsInHelperProgram, dumper.threads().size());
-  EXPECT_TRUE(dumper.ThreadsSuspend());
-
-  ThreadInfo one_thread;
-  for(size_t i = 0; i < dumper.threads().size(); ++i) {
-    EXPECT_TRUE(dumper.ThreadInfoGet(dumper.threads()i, &one_thread));
-    // In the helper program, we stored a pointer to the thread id in a
-    // specific register. Check that we can recover its value.
-#if defined(__ARM_EABI__)
-    pid_t *process_tid_location = (pid_t *)(one_thread.regs.uregs3);
-#elif defined(__i386)
-    pid_t *process_tid_location = (pid_t *)(one_thread.regs.ecx);
-#elif defined(__x86_64)
-    pid_t *process_tid_location = (pid_t *)(one_thread.regs.rcx);
-#else
-#error This test has not been ported to this platform.
-#endif
-    pid_t one_thread_id;
-    dumper.CopyFromProcess(&one_thread_id,
-                           dumper.threads()i,
-                           process_tid_location,
-                           4);
-    EXPECT_EQ(dumper.threads()i, one_thread_id);
-  }
-  kill(child_pid, SIGKILL);
-}
-
-TEST(LinuxDumperTest, BuildProcPath) {
-  const pid_t pid = getpid();
-  LinuxDumper dumper(pid);
-
-  char maps_path256 = "dummymappath";
-  char maps_path_expected256;
-  snprintf(maps_path_expected, sizeof(maps_path_expected),
-           "/proc/%d/maps", pid);
-  dumper.BuildProcPath(maps_path, pid, "maps");
-  ASSERT_STREQ(maps_path, maps_path_expected);
-
-  // In release mode, we expect BuildProcPath to handle the invalid
-  // parameters correctly and fill map_path with an empty
-  // NULL-terminated string.
-#ifdef NDEBUG
-  snprintf(maps_path, sizeof(maps_path), "dummymappath");
-  dumper.BuildProcPath(maps_path, 0, "maps");
-  EXPECT_STREQ(maps_path, "");
-
-  snprintf(maps_path, sizeof(maps_path), "dummymappath");
-  dumper.BuildProcPath(maps_path, getpid(), "");
-  EXPECT_STREQ(maps_path, "");
-
-  snprintf(maps_path, sizeof(maps_path), "dummymappath");
-  dumper.BuildProcPath(maps_path, getpid(), NULL);
-  EXPECT_STREQ(maps_path, "");
-#endif
-}
-
-#if !defined(__ARM_EABI__)
-// Ensure that the linux-gate VDSO is included in the mapping list.
-TEST(LinuxDumperTest, MappingsIncludeLinuxGate) {
-  LinuxDumper dumper(getpid());
-  ASSERT_TRUE(dumper.Init());
-
-  void* linux_gate_loc = dumper.FindBeginningOfLinuxGateSharedLibrary(getpid());
-  ASSERT_TRUE(linux_gate_loc);
-  bool found_linux_gate = false;
-
-  const wasteful_vector<MappingInfo*> mappings = dumper.mappings();
-  const MappingInfo* mapping;
-  for (unsigned i = 0; i < mappings.size(); ++i) {
-    mapping = mappingsi;
-    if (!strcmp(mapping->name, kLinuxGateLibraryName)) {
-      found_linux_gate = true;
-      break;
-    }
-  }
-  EXPECT_TRUE(found_linux_gate);
-  EXPECT_EQ(linux_gate_loc, reinterpret_cast<void*>(mapping->start_addr));
-  EXPECT_EQ(0, memcmp(linux_gate_loc, ELFMAG, SELFMAG));
-}
-
-// Ensure that the linux-gate VDSO can generate a non-zeroed File ID.
-TEST(LinuxDumperTest, LinuxGateMappingID) {
-  LinuxDumper dumper(getpid());
-  ASSERT_TRUE(dumper.Init());
-
-  bool found_linux_gate = false;
-  const wasteful_vector<MappingInfo*> mappings = dumper.mappings();
-  unsigned index = 0;
-  for (unsigned i = 0; i < mappings.size(); ++i) {
-    if (!strcmp(mappingsi->name, kLinuxGateLibraryName)) {
-      found_linux_gate = true;
-      index = i;
-      break;
-    }
-  }
-  ASSERT_TRUE(found_linux_gate);
-
-  uint8_t identifiersizeof(MDGUID);
-  ASSERT_TRUE(dumper.ElfFileIdentifierForMapping(*mappingsindex,
-                                                 true,
-                                                 index,
-                                                 identifier));
-  uint8_t empty_identifiersizeof(MDGUID);
-  memset(empty_identifier, 0, sizeof(empty_identifier));
-  EXPECT_NE(0, memcmp(empty_identifier, identifier, sizeof(identifier)));
-}
-
-// Ensure that the linux-gate VDSO can generate a non-zeroed File ID
-// from a child process.
-TEST(LinuxDumperTest, LinuxGateMappingIDChild) {
-  int fds2;
-  ASSERT_NE(-1, pipe(fds));
-
-  // Fork a child so ptrace works.
-  const pid_t child = fork();
-  if (child == 0) {
-    close(fds1);
-    // Now wait forever for the parent.
-    char b;
-    HANDLE_EINTR(read(fds0, &b, sizeof(b)));
-    close(fds0);
-    syscall(__NR_exit);
-  }
-  close(fds0);
-
-  LinuxDumper dumper(child);
-  ASSERT_TRUE(dumper.Init());
-
-  bool found_linux_gate = false;
-  const wasteful_vector<MappingInfo*> mappings = dumper.mappings();
-  unsigned index = 0;
-  for (unsigned i = 0; i < mappings.size(); ++i) {
-    if (!strcmp(mappingsi->name, kLinuxGateLibraryName)) {
-      found_linux_gate = true;
-      index = i;
-      break;
-    }
-  }
-  ASSERT_TRUE(found_linux_gate);
-
-  // Need to suspend the child so ptrace actually works.
-  ASSERT_TRUE(dumper.ThreadsSuspend());
-  uint8_t identifiersizeof(MDGUID);
-  ASSERT_TRUE(dumper.ElfFileIdentifierForMapping(*mappingsindex,
-                                                 true,
-                                                 index,
-                                                 identifier));
-  uint8_t empty_identifiersizeof(MDGUID);
-  memset(empty_identifier, 0, sizeof(empty_identifier));
-  EXPECT_NE(0, memcmp(empty_identifier, identifier, sizeof(identifier)));
-  EXPECT_TRUE(dumper.ThreadsResume());
-  close(fds1);
-}
-#endif
-
-TEST(LinuxDumperTest, FileIDsMatch) {
-  // Calculate the File ID of our binary using both
-  // FileID::ElfFileIdentifier and LinuxDumper::ElfFileIdentifierForMapping
-  // and ensure that we get the same result from both.
-  char exe_namePATH_MAX;
-  ssize_t len = readlink("/proc/self/exe", exe_name, PATH_MAX - 1);
-  ASSERT_NE(len, -1);
-  exe_namelen = '\0';
-
-  int fds2;
-  ASSERT_NE(-1, pipe(fds));
-
-  // Fork a child so ptrace works.
-  const pid_t child = fork();
-  if (child == 0) {
-    close(fds1);
-    // Now wait forever for the parent.
-    char b;
-    HANDLE_EINTR(read(fds0, &b, sizeof(b)));
-    close(fds0);
-    syscall(__NR_exit);
-  }
-  close(fds0);
-
-  LinuxDumper dumper(child);
-  ASSERT_TRUE(dumper.Init());
-  const wasteful_vector<MappingInfo*> mappings = dumper.mappings();
-  bool found_exe = false;
-  unsigned i;
-  for (i = 0; i < mappings.size(); ++i) {
-    const MappingInfo* mapping = mappingsi;
-    if (!strcmp(mapping->name, exe_name)) {
-      found_exe = true;
-      break;
-    }
-  }
-  ASSERT_TRUE(found_exe);
-
-  uint8_t identifier1sizeof(MDGUID);
-  uint8_t identifier2sizeof(MDGUID);
-  EXPECT_TRUE(dumper.ElfFileIdentifierForMapping(*mappingsi, true, i,
-                                                 identifier1));
-  FileID fileid(exe_name);
-  EXPECT_TRUE(fileid.ElfFileIdentifier(identifier2));
-  char identifier_string137;
-  char identifier_string237;
-  FileID::ConvertIdentifierToString(identifier1, identifier_string1,
-                                    37);
-  FileID::ConvertIdentifierToString(identifier2, identifier_string2,
-                                    37);
-  EXPECT_STREQ(identifier_string1, identifier_string2);
-  close(fds1);
-}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/breakpad_exc_server.c Deleted

@@ -1,1750 +0,0 @@
-/*
- * IDENTIFICATION:
- * stub generated Mon Jun 16 18:08:10 2008
- * with a MiG generated Tue Feb 19 02:01:43 PST 2008 by root@b75.local
- * OPTIONS: 
- */
-
-/* Module exc */
-
-#define	__MIG_check__Request__exc_subsystem__ 1
-#define	__NDR_convert__Request__exc_subsystem__ 1
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifndef	mig_internal
-#define	mig_internal	static __inline__
-#endif	/* mig_internal */
-
-#ifndef	mig_external
-#define mig_external
-#endif	/* mig_external */
-
-#if	!defined(__MigTypeCheck) && defined(TypeCheck)
-#define	__MigTypeCheck		TypeCheck	/* Legacy setting */
-#endif	/* !defined(__MigTypeCheck) */
-
-#if	!defined(__MigKernelSpecificCode) && defined(_MIG_KERNEL_SPECIFIC_CODE_)
-#define	__MigKernelSpecificCode	_MIG_KERNEL_SPECIFIC_CODE_	/* Legacy setting */
-#endif	/* !defined(__MigKernelSpecificCode) */
-
-#ifndef	LimitCheck
-#define	LimitCheck 0
-#endif	/* LimitCheck */
-
-#ifndef	min
-#define	min(a,b)  ( ((a) < (b))? (a): (b) )
-#endif	/* min */
-
-#if !defined(_WALIGN_)
-#define _WALIGN_(x) (((x) + 3) & ~3)
-#endif /* !defined(_WALIGN_) */
-
-#if !defined(_WALIGNSZ_)
-#define _WALIGNSZ_(x) _WALIGN_(sizeof(x))
-#endif /* !defined(_WALIGNSZ_) */
-
-#ifndef	UseStaticTemplates
-#define	UseStaticTemplates	0
-#endif	/* UseStaticTemplates */
-
-#ifndef	__DeclareRcvRpc
-#define	__DeclareRcvRpc(_NUM_, _NAME_)
-#endif	/* __DeclareRcvRpc */
-
-#ifndef	__BeforeRcvRpc
-#define	__BeforeRcvRpc(_NUM_, _NAME_)
-#endif	/* __BeforeRcvRpc */
-
-#ifndef	__AfterRcvRpc
-#define	__AfterRcvRpc(_NUM_, _NAME_)
-#endif	/* __AfterRcvRpc */
-
-#ifndef	__DeclareRcvSimple
-#define	__DeclareRcvSimple(_NUM_, _NAME_)
-#endif	/* __DeclareRcvSimple */
-
-#ifndef	__BeforeRcvSimple
-#define	__BeforeRcvSimple(_NUM_, _NAME_)
-#endif	/* __BeforeRcvSimple */
-
-#ifndef	__AfterRcvSimple
-#define	__AfterRcvSimple(_NUM_, _NAME_)
-#endif	/* __AfterRcvSimple */
-
-#define novalue void
-
-#define msgh_request_port	msgh_local_port
-#define MACH_MSGH_BITS_REQUEST(bits)	MACH_MSGH_BITS_LOCAL(bits)
-#define msgh_reply_port		msgh_remote_port
-#define MACH_MSGH_BITS_REPLY(bits)	MACH_MSGH_BITS_REMOTE(bits)
-
-#define MIG_RETURN_ERROR(X, code)	{\
-				((mig_reply_error_t *)X)->RetCode = code;\
-				((mig_reply_error_t *)X)->NDR = NDR_record;\
-				return;\
-				}
-
-/* typedefs for all requests */
-
-#ifndef __Request__exc_subsystem__defined
-#define __Request__exc_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t thread;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code2;
-	} __Request__exception_raise_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code2;
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state144;
-	} __Request__exception_raise_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t thread;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code2;
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state144;
-	} __Request__exception_raise_state_identity_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__exc_subsystem__defined */
-
-/* typedefs for all replies */
-
-#ifndef __Reply__exc_subsystem__defined
-#define __Reply__exc_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__exception_raise_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		int flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state144;
-	} __Reply__exception_raise_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		int flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state144;
-	} __Reply__exception_raise_state_identity_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__exc_subsystem__defined */
-
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__breakpad_exc_subsystem__defined
-#define __ReplyUnion__breakpad_exc_subsystem__defined
-union __ReplyUnion__breakpad_exc_subsystem {
-	__Reply__exception_raise_t Reply_exception_raise;
-	__Reply__exception_raise_state_t Reply_exception_raise_state;
-	__Reply__exception_raise_state_identity_t Reply_exception_raise_state_identity;
-};
-#endif /* __RequestUnion__breakpad_exc_subsystem__defined */
-/* Forward Declarations */
-
-
-mig_internal novalue _Xexception_raise
-	(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-
-mig_internal novalue _Xexception_raise_state
-	(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-
-mig_internal novalue _Xexception_raise_state_identity
-	(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-
-
-#if ( __MigTypeCheck || __NDR_convert__ )
-#if __MIG_check__Request__exc_subsystem__
-#if !defined(__MIG_check__Request__exception_raise_t__defined)
-#define __MIG_check__Request__exception_raise_t__defined
-#ifndef __NDR_convert__int_rep__Request__exception_raise_t__exception__defined
-#if	defined(__NDR_convert__int_rep__exc__exception_type_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__int_rep__exc__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exception_type_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__int_rep__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exc__int__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__int_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__int_rep__int__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__int_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exc__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__int_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__int_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_t__exception__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_t__code__defined
-#if	defined(__NDR_convert__int_rep__exc__exception_data_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__int_rep__exc__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__int_rep__exception_data_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__int_rep__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__int_rep__exc__integer_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__int_rep__exc__integer_t)
-#elif	defined(__NDR_convert__int_rep__integer_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__int_rep__integer_t)
-#elif	defined(__NDR_convert__int_rep__exc__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__int_rep__exc__int32_t)
-#elif	defined(__NDR_convert__int_rep__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__int_rep__int32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_t__code__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_t__codeCnt__defined
-#if	defined(__NDR_convert__int_rep__exc__mach_msg_type_number_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__codeCnt__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__codeCnt(a, f) \
-	__NDR_convert__int_rep__exc__mach_msg_type_number_t((mach_msg_type_number_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__mach_msg_type_number_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_t__codeCnt__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_t__codeCnt(a, f) \
-	__NDR_convert__int_rep__mach_msg_type_number_t((mach_msg_type_number_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_t__codeCnt__defined */
-
-#ifndef __NDR_convert__char_rep__Request__exception_raise_t__exception__defined
-#if	defined(__NDR_convert__char_rep__exc__exception_type_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__char_rep__exc__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exception_type_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__char_rep__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exc__int__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__char_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__char_rep__int__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__char_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exc__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__char_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__char_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__char_rep__Request__exception_raise_t__exception__defined */
-
-#ifndef __NDR_convert__char_rep__Request__exception_raise_t__code__defined
-#if	defined(__NDR_convert__char_rep__exc__exception_data_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__char_rep__exc__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__char_rep__exception_data_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__char_rep__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__char_rep__exc__integer_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__char_rep__exc__integer_t)
-#elif	defined(__NDR_convert__char_rep__integer_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__char_rep__integer_t)
-#elif	defined(__NDR_convert__char_rep__exc__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__char_rep__exc__int32_t)
-#elif	defined(__NDR_convert__char_rep__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__char_rep__int32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__char_rep__Request__exception_raise_t__code__defined */
-
-#ifndef __NDR_convert__float_rep__Request__exception_raise_t__exception__defined
-#if	defined(__NDR_convert__float_rep__exc__exception_type_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__float_rep__exc__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exception_type_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__float_rep__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exc__int__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__float_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__float_rep__int__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__float_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exc__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__float_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__exception(a, f) \
-	__NDR_convert__float_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__float_rep__Request__exception_raise_t__exception__defined */
-
-#ifndef __NDR_convert__float_rep__Request__exception_raise_t__code__defined
-#if	defined(__NDR_convert__float_rep__exc__exception_data_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__float_rep__exc__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__float_rep__exception_data_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__float_rep__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__float_rep__exc__integer_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__float_rep__exc__integer_t)
-#elif	defined(__NDR_convert__float_rep__integer_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__float_rep__integer_t)
-#elif	defined(__NDR_convert__float_rep__exc__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__float_rep__exc__int32_t)
-#elif	defined(__NDR_convert__float_rep__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__float_rep__int32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__float_rep__Request__exception_raise_t__code__defined */
-
-
-mig_internal kern_return_t __MIG_check__Request__exception_raise_t(__attribute__((__unused__)) __Request__exception_raise_t *In0P)
-{
-
-	typedef __Request__exception_raise_t __Request;
-#if	__MigTypeCheck
-	unsigned int msgh_size;
-#endif	/* __MigTypeCheck */
-
-#if	__MigTypeCheck
-	msgh_size = In0P->Head.msgh_size;
-	if (!(In0P->Head.msgh_bits & MACH_MSGH_BITS_COMPLEX) ||
-	    (In0P->msgh_body.msgh_descriptor_count != 2) ||
-	    (msgh_size < (mach_msg_size_t)(sizeof(__Request) - 8)) ||  (msgh_size > (mach_msg_size_t)sizeof(__Request))
-)
-		return MIG_BAD_ARGUMENTS;
-#endif	/* __MigTypeCheck */
-
-#if	__MigTypeCheck
-	if (In0P->thread.type != MACH_MSG_PORT_DESCRIPTOR ||
-	    In0P->thread.disposition != 17)
-		return MIG_TYPE_ERROR;
-#endif	/* __MigTypeCheck */
-
-#if	__MigTypeCheck
-	if (In0P->task.type != MACH_MSG_PORT_DESCRIPTOR ||
-	    In0P->task.disposition != 17)
-		return MIG_TYPE_ERROR;
-#endif	/* __MigTypeCheck */
-
-#if defined(__NDR_convert__int_rep__Request__exception_raise_t__codeCnt__defined)
-	if (In0P->NDR.int_rep != NDR_record.int_rep)
-		__NDR_convert__int_rep__Request__exception_raise_t__codeCnt(&In0P->codeCnt, In0P->NDR.int_rep);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_t__codeCnt__defined */
-#if	__MigTypeCheck
-	if (msgh_size != (mach_msg_size_t)(sizeof(__Request) - 8) + ((4 * In0P->codeCnt)))
-		return MIG_BAD_ARGUMENTS;
-#endif	/* __MigTypeCheck */
-
-#if	defined(__NDR_convert__int_rep__Request__exception_raise_t__exception__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_t__code__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_t__codeCnt__defined)
-	if (In0P->NDR.int_rep != NDR_record.int_rep) {
-#if defined(__NDR_convert__int_rep__Request__exception_raise_t__exception__defined)
-		__NDR_convert__int_rep__Request__exception_raise_t__exception(&In0P->exception, In0P->NDR.int_rep);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_t__exception__defined */
-#if defined(__NDR_convert__int_rep__Request__exception_raise_t__code__defined)
-		__NDR_convert__int_rep__Request__exception_raise_t__code(&In0P->code, In0P->NDR.int_rep, In0P->codeCnt);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_t__code__defined */
-	}
-#endif	/* defined(__NDR_convert__int_rep...) */
-
-#if	defined(__NDR_convert__char_rep__Request__exception_raise_t__exception__defined) || \
-	defined(__NDR_convert__char_rep__Request__exception_raise_t__code__defined) || \
-	0
-	if (In0P->NDR.char_rep != NDR_record.char_rep) {
-#if defined(__NDR_convert__char_rep__Request__exception_raise_t__exception__defined)
-		__NDR_convert__char_rep__Request__exception_raise_t__exception(&In0P->exception, In0P->NDR.char_rep);
-#endif	/* __NDR_convert__char_rep__Request__exception_raise_t__exception__defined */
-#if defined(__NDR_convert__char_rep__Request__exception_raise_t__code__defined)
-		__NDR_convert__char_rep__Request__exception_raise_t__code(&In0P->code, In0P->NDR.char_rep, In0P->codeCnt);
-#endif	/* __NDR_convert__char_rep__Request__exception_raise_t__code__defined */
-	}
-#endif	/* defined(__NDR_convert__char_rep...) */
-
-#if	defined(__NDR_convert__float_rep__Request__exception_raise_t__exception__defined) || \
-	defined(__NDR_convert__float_rep__Request__exception_raise_t__code__defined) || \
-	0
-	if (In0P->NDR.float_rep != NDR_record.float_rep) {
-#if defined(__NDR_convert__float_rep__Request__exception_raise_t__exception__defined)
-		__NDR_convert__float_rep__Request__exception_raise_t__exception(&In0P->exception, In0P->NDR.float_rep);
-#endif	/* __NDR_convert__float_rep__Request__exception_raise_t__exception__defined */
-#if defined(__NDR_convert__float_rep__Request__exception_raise_t__code__defined)
-		__NDR_convert__float_rep__Request__exception_raise_t__code(&In0P->code, In0P->NDR.float_rep, In0P->codeCnt);
-#endif	/* __NDR_convert__float_rep__Request__exception_raise_t__code__defined */
-	}
-#endif	/* defined(__NDR_convert__float_rep...) */
-
-	return MACH_MSG_SUCCESS;
-}
-#endif /* !defined(__MIG_check__Request__exception_raise_t__defined) */
-#endif /* __MIG_check__Request__exc_subsystem__ */
-#endif /* ( __MigTypeCheck || __NDR_convert__ ) */
-
-
-/* Routine exception_raise */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t breakpad_exception_raise
-(
-	mach_port_t exception_port,
-	mach_port_t thread,
-	mach_port_t task,
-	exception_type_t exception,
-	exception_data_t code,
-	mach_msg_type_number_t codeCnt
-);
-
-/* Routine exception_raise */
-mig_internal novalue _Xexception_raise
-	(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP)
-{
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t thread;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code2;
-		mach_msg_trailer_t trailer;
-	} Request;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-	typedef __Request__exception_raise_t __Request;
-	typedef __Reply__exception_raise_t Reply;
-
-	/*
-	 * typedef struct {
-	 * 	mach_msg_header_t Head;
-	 * 	NDR_record_t NDR;
-	 * 	kern_return_t RetCode;
-	 * } mig_reply_error_t;
-	 */
-
-	Request *In0P = (Request *) InHeadP;
-	Reply *OutP = (Reply *) OutHeadP;
-#ifdef	__MIG_check__Request__exception_raise_t__defined
-	kern_return_t check_result;
-#endif	/* __MIG_check__Request__exception_raise_t__defined */
-
-	__DeclareRcvRpc(2401, "exception_raise")
-	__BeforeRcvRpc(2401, "exception_raise")
-
-#if	defined(__MIG_check__Request__exception_raise_t__defined)
-	check_result = __MIG_check__Request__exception_raise_t((__Request *)In0P);
-	if (check_result != MACH_MSG_SUCCESS)
-		{ MIG_RETURN_ERROR(OutP, check_result); }
-#endif	/* defined(__MIG_check__Request__exception_raise_t__defined) */
-
-	OutP->RetCode = breakpad_exception_raise(In0P->Head.msgh_request_port, In0P->thread.name, In0P->task.name, In0P->exception, In0P->code, In0P->codeCnt);
-
-	OutP->NDR = NDR_record;
-
-
-	__AfterRcvRpc(2401, "exception_raise")
-}
-
-#if ( __MigTypeCheck || __NDR_convert__ )
-#if __MIG_check__Request__exc_subsystem__
-#if !defined(__MIG_check__Request__exception_raise_state_t__defined)
-#define __MIG_check__Request__exception_raise_state_t__defined
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined
-#if	defined(__NDR_convert__int_rep__exc__exception_type_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__int_rep__exc__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exception_type_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__int_rep__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exc__int__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__int_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__int_rep__int__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__int_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exc__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__int_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__int_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_t__code__defined
-#if	defined(__NDR_convert__int_rep__exc__exception_data_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__int_rep__exc__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__int_rep__exception_data_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__int_rep__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__int_rep__exc__integer_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__int_rep__exc__integer_t)
-#elif	defined(__NDR_convert__int_rep__integer_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__int_rep__integer_t)
-#elif	defined(__NDR_convert__int_rep__exc__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__int_rep__exc__int32_t)
-#elif	defined(__NDR_convert__int_rep__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__int_rep__int32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_t__code__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_t__codeCnt__defined
-#if	defined(__NDR_convert__int_rep__exc__mach_msg_type_number_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__codeCnt__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__codeCnt(a, f) \
-	__NDR_convert__int_rep__exc__mach_msg_type_number_t((mach_msg_type_number_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__mach_msg_type_number_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__codeCnt__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__codeCnt(a, f) \
-	__NDR_convert__int_rep__mach_msg_type_number_t((mach_msg_type_number_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_t__codeCnt__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_t__flavor__defined
-#if	defined(__NDR_convert__int_rep__exc__int__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__int_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__int_rep__int__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__int_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exc__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__int_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__int_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_t__flavor__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined
-#if	defined(__NDR_convert__int_rep__exc__thread_state_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__int_rep__exc__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__int_rep__thread_state_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__int_rep__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__int_rep__exc__natural_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__int_rep__exc__natural_t)
-#elif	defined(__NDR_convert__int_rep__natural_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__int_rep__natural_t)
-#elif	defined(__NDR_convert__int_rep__exc__uint32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__int_rep__exc__uint32_t)
-#elif	defined(__NDR_convert__int_rep__uint32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__int_rep__uint32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_t__old_stateCnt__defined
-#if	defined(__NDR_convert__int_rep__exc__mach_msg_type_number_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_stateCnt__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_stateCnt(a, f) \
-	__NDR_convert__int_rep__exc__mach_msg_type_number_t((mach_msg_type_number_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__mach_msg_type_number_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_stateCnt__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_t__old_stateCnt(a, f) \
-	__NDR_convert__int_rep__mach_msg_type_number_t((mach_msg_type_number_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_t__old_stateCnt__defined */
-
-#ifndef __NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined
-#if	defined(__NDR_convert__char_rep__exc__exception_type_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__char_rep__exc__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exception_type_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__char_rep__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exc__int__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__char_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__char_rep__int__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__char_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exc__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__char_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__char_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined */
-
-#ifndef __NDR_convert__char_rep__Request__exception_raise_state_t__code__defined
-#if	defined(__NDR_convert__char_rep__exc__exception_data_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__char_rep__exc__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__char_rep__exception_data_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__char_rep__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__char_rep__exc__integer_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__char_rep__exc__integer_t)
-#elif	defined(__NDR_convert__char_rep__integer_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__char_rep__integer_t)
-#elif	defined(__NDR_convert__char_rep__exc__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__char_rep__exc__int32_t)
-#elif	defined(__NDR_convert__char_rep__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__char_rep__int32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__char_rep__Request__exception_raise_state_t__code__defined */
-
-#ifndef __NDR_convert__char_rep__Request__exception_raise_state_t__flavor__defined
-#if	defined(__NDR_convert__char_rep__exc__int__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__char_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__char_rep__int__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__char_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exc__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__char_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__char_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__char_rep__Request__exception_raise_state_t__flavor__defined */
-
-#ifndef __NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined
-#if	defined(__NDR_convert__char_rep__exc__thread_state_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__char_rep__exc__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__char_rep__thread_state_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__char_rep__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__char_rep__exc__natural_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__char_rep__exc__natural_t)
-#elif	defined(__NDR_convert__char_rep__natural_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__char_rep__natural_t)
-#elif	defined(__NDR_convert__char_rep__exc__uint32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__char_rep__exc__uint32_t)
-#elif	defined(__NDR_convert__char_rep__uint32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__char_rep__uint32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined */
-
-#ifndef __NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined
-#if	defined(__NDR_convert__float_rep__exc__exception_type_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__float_rep__exc__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exception_type_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__float_rep__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exc__int__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__float_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__float_rep__int__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__float_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exc__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__float_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__exception(a, f) \
-	__NDR_convert__float_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined */
-
-#ifndef __NDR_convert__float_rep__Request__exception_raise_state_t__code__defined
-#if	defined(__NDR_convert__float_rep__exc__exception_data_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__float_rep__exc__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__float_rep__exception_data_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__float_rep__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__float_rep__exc__integer_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__float_rep__exc__integer_t)
-#elif	defined(__NDR_convert__float_rep__integer_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__float_rep__integer_t)
-#elif	defined(__NDR_convert__float_rep__exc__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__float_rep__exc__int32_t)
-#elif	defined(__NDR_convert__float_rep__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__float_rep__int32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__float_rep__Request__exception_raise_state_t__code__defined */
-
-#ifndef __NDR_convert__float_rep__Request__exception_raise_state_t__flavor__defined
-#if	defined(__NDR_convert__float_rep__exc__int__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__float_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__float_rep__int__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__float_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exc__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__float_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__flavor__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__flavor(a, f) \
-	__NDR_convert__float_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__float_rep__Request__exception_raise_state_t__flavor__defined */
-
-#ifndef __NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined
-#if	defined(__NDR_convert__float_rep__exc__thread_state_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__float_rep__exc__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__float_rep__thread_state_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__float_rep__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__float_rep__exc__natural_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__float_rep__exc__natural_t)
-#elif	defined(__NDR_convert__float_rep__natural_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__float_rep__natural_t)
-#elif	defined(__NDR_convert__float_rep__exc__uint32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__float_rep__exc__uint32_t)
-#elif	defined(__NDR_convert__float_rep__uint32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__float_rep__uint32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined */
-
-
-mig_internal kern_return_t __MIG_check__Request__exception_raise_state_t(__attribute__((__unused__)) __Request__exception_raise_state_t *In0P, __attribute__((__unused__)) __Request__exception_raise_state_t **In1PP)
-{
-
-	typedef __Request__exception_raise_state_t __Request;
-	__Request *In1P;
-#if	__MigTypeCheck
-	unsigned int msgh_size;
-#endif	/* __MigTypeCheck */
-	unsigned int msgh_size_delta;
-
-#if	__MigTypeCheck
-	msgh_size = In0P->Head.msgh_size;
-	if ((In0P->Head.msgh_bits & MACH_MSGH_BITS_COMPLEX) ||
-	    (msgh_size < (mach_msg_size_t)(sizeof(__Request) - 584)) ||  (msgh_size > (mach_msg_size_t)sizeof(__Request)))
-		return MIG_BAD_ARGUMENTS;
-#endif	/* __MigTypeCheck */
-
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_t__codeCnt__defined)
-	if (In0P->NDR.int_rep != NDR_record.int_rep)
-		__NDR_convert__int_rep__Request__exception_raise_state_t__codeCnt(&In0P->codeCnt, In0P->NDR.int_rep);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_t__codeCnt__defined */
-	msgh_size_delta = (4 * In0P->codeCnt);
-#if	__MigTypeCheck
-	if (msgh_size < (mach_msg_size_t)(sizeof(__Request) - 584) + msgh_size_delta)
-		return MIG_BAD_ARGUMENTS;
-	msgh_size -= msgh_size_delta;
-#endif	/* __MigTypeCheck */
-
-	*In1PP = In1P = (__Request *) ((pointer_t) In0P + msgh_size_delta - 8);
-
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_t__old_stateCnt__defined)
-	if (In0P->NDR.int_rep != NDR_record.int_rep)
-		__NDR_convert__int_rep__Request__exception_raise_state_t__old_stateCnt(&In1P->old_stateCnt, In1P->NDR.int_rep);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_t__old_stateCnt__defined */
-#if	__MigTypeCheck
-	if (msgh_size != (mach_msg_size_t)(sizeof(__Request) - 584) + ((4 * In1P->old_stateCnt)))
-		return MIG_BAD_ARGUMENTS;
-#endif	/* __MigTypeCheck */
-
-#if	defined(__NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_state_t__code__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_state_t__codeCnt__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_state_t__flavor__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_state_t__old_stateCnt__defined)
-	if (In0P->NDR.int_rep != NDR_record.int_rep) {
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined)
-		__NDR_convert__int_rep__Request__exception_raise_state_t__exception(&In0P->exception, In0P->NDR.int_rep);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_t__exception__defined */
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_t__code__defined)
-		__NDR_convert__int_rep__Request__exception_raise_state_t__code(&In0P->code, In0P->NDR.int_rep, In0P->codeCnt);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_t__code__defined */
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_t__flavor__defined)
-		__NDR_convert__int_rep__Request__exception_raise_state_t__flavor(&In1P->flavor, In0P->NDR.int_rep);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_t__flavor__defined */
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined)
-		__NDR_convert__int_rep__Request__exception_raise_state_t__old_state(&In1P->old_state, In0P->NDR.int_rep, In1P->old_stateCnt);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_t__old_state__defined */
-	}
-#endif	/* defined(__NDR_convert__int_rep...) */
-
-#if	defined(__NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined) || \
-	defined(__NDR_convert__char_rep__Request__exception_raise_state_t__code__defined) || \
-	0 || \
-	defined(__NDR_convert__char_rep__Request__exception_raise_state_t__flavor__defined) || \
-	defined(__NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined) || \
-	0
-	if (In0P->NDR.char_rep != NDR_record.char_rep) {
-#if defined(__NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined)
-		__NDR_convert__char_rep__Request__exception_raise_state_t__exception(&In0P->exception, In0P->NDR.char_rep);
-#endif	/* __NDR_convert__char_rep__Request__exception_raise_state_t__exception__defined */
-#if defined(__NDR_convert__char_rep__Request__exception_raise_state_t__code__defined)
-		__NDR_convert__char_rep__Request__exception_raise_state_t__code(&In0P->code, In0P->NDR.char_rep, In0P->codeCnt);
-#endif	/* __NDR_convert__char_rep__Request__exception_raise_state_t__code__defined */
-#if defined(__NDR_convert__char_rep__Request__exception_raise_state_t__flavor__defined)
-		__NDR_convert__char_rep__Request__exception_raise_state_t__flavor(&In1P->flavor, In0P->NDR.char_rep);
-#endif	/* __NDR_convert__char_rep__Request__exception_raise_state_t__flavor__defined */
-#if defined(__NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined)
-		__NDR_convert__char_rep__Request__exception_raise_state_t__old_state(&In1P->old_state, In0P->NDR.char_rep, In1P->old_stateCnt);
-#endif	/* __NDR_convert__char_rep__Request__exception_raise_state_t__old_state__defined */
-	}
-#endif	/* defined(__NDR_convert__char_rep...) */
-
-#if	defined(__NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined) || \
-	defined(__NDR_convert__float_rep__Request__exception_raise_state_t__code__defined) || \
-	0 || \
-	defined(__NDR_convert__float_rep__Request__exception_raise_state_t__flavor__defined) || \
-	defined(__NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined) || \
-	0
-	if (In0P->NDR.float_rep != NDR_record.float_rep) {
-#if defined(__NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined)
-		__NDR_convert__float_rep__Request__exception_raise_state_t__exception(&In0P->exception, In0P->NDR.float_rep);
-#endif	/* __NDR_convert__float_rep__Request__exception_raise_state_t__exception__defined */
-#if defined(__NDR_convert__float_rep__Request__exception_raise_state_t__code__defined)
-		__NDR_convert__float_rep__Request__exception_raise_state_t__code(&In0P->code, In0P->NDR.float_rep, In0P->codeCnt);
-#endif	/* __NDR_convert__float_rep__Request__exception_raise_state_t__code__defined */
-#if defined(__NDR_convert__float_rep__Request__exception_raise_state_t__flavor__defined)
-		__NDR_convert__float_rep__Request__exception_raise_state_t__flavor(&In1P->flavor, In0P->NDR.float_rep);
-#endif	/* __NDR_convert__float_rep__Request__exception_raise_state_t__flavor__defined */
-#if defined(__NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined)
-		__NDR_convert__float_rep__Request__exception_raise_state_t__old_state(&In1P->old_state, In0P->NDR.float_rep, In1P->old_stateCnt);
-#endif	/* __NDR_convert__float_rep__Request__exception_raise_state_t__old_state__defined */
-	}
-#endif	/* defined(__NDR_convert__float_rep...) */
-
-	return MACH_MSG_SUCCESS;
-}
-#endif /* !defined(__MIG_check__Request__exception_raise_state_t__defined) */
-#endif /* __MIG_check__Request__exc_subsystem__ */
-#endif /* ( __MigTypeCheck || __NDR_convert__ ) */
-
-
-/* Routine exception_raise_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t breakpad_exception_raise_state
-(
-	mach_port_t exception_port,
-	exception_type_t exception,
-	const exception_data_t code,
-	mach_msg_type_number_t codeCnt,
-	int *flavor,
-	const thread_state_t old_state,
-	mach_msg_type_number_t old_stateCnt,
-	thread_state_t new_state,
-	mach_msg_type_number_t *new_stateCnt
-);
-
-/* Routine exception_raise_state */
-mig_internal novalue _Xexception_raise_state
-	(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP)
-{
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code2;
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state144;
-		mach_msg_trailer_t trailer;
-	} Request;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-	typedef __Request__exception_raise_state_t __Request;
-	typedef __Reply__exception_raise_state_t Reply;
-
-	/*
-	 * typedef struct {
-	 * 	mach_msg_header_t Head;
-	 * 	NDR_record_t NDR;
-	 * 	kern_return_t RetCode;
-	 * } mig_reply_error_t;
-	 */
-
-	Request *In0P = (Request *) InHeadP;
-	Request *In1P;
-	Reply *OutP = (Reply *) OutHeadP;
-#ifdef	__MIG_check__Request__exception_raise_state_t__defined
-	kern_return_t check_result;
-#endif	/* __MIG_check__Request__exception_raise_state_t__defined */
-
-	__DeclareRcvRpc(2402, "exception_raise_state")
-	__BeforeRcvRpc(2402, "exception_raise_state")
-
-#if	defined(__MIG_check__Request__exception_raise_state_t__defined)
-	check_result = __MIG_check__Request__exception_raise_state_t((__Request *)In0P, (__Request **)&In1P);
-	if (check_result != MACH_MSG_SUCCESS)
-		{ MIG_RETURN_ERROR(OutP, check_result); }
-#endif	/* defined(__MIG_check__Request__exception_raise_state_t__defined) */
-
-	OutP->new_stateCnt = 144;
-
-	OutP->RetCode = breakpad_exception_raise_state(In0P->Head.msgh_request_port, In0P->exception, In0P->code, In0P->codeCnt, &In1P->flavor, In1P->old_state, In1P->old_stateCnt, OutP->new_state, &OutP->new_stateCnt);
-	if (OutP->RetCode != KERN_SUCCESS) {
-		MIG_RETURN_ERROR(OutP, OutP->RetCode);
-	}
-
-	OutP->NDR = NDR_record;
-
-
-	OutP->flavor = In1P->flavor;
-	OutP->Head.msgh_size = (mach_msg_size_t)(sizeof(Reply) - 576) + (((4 * OutP->new_stateCnt)));
-
-	__AfterRcvRpc(2402, "exception_raise_state")
-}
-
-#if ( __MigTypeCheck || __NDR_convert__ )
-#if __MIG_check__Request__exc_subsystem__
-#if !defined(__MIG_check__Request__exception_raise_state_identity_t__defined)
-#define __MIG_check__Request__exception_raise_state_identity_t__defined
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined
-#if	defined(__NDR_convert__int_rep__exc__exception_type_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__int_rep__exc__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exception_type_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__int_rep__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exc__int__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__int_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__int_rep__int__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__int_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exc__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__int_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__int_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined
-#if	defined(__NDR_convert__int_rep__exc__exception_data_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__int_rep__exc__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__int_rep__exception_data_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__int_rep__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__int_rep__exc__integer_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__int_rep__exc__integer_t)
-#elif	defined(__NDR_convert__int_rep__integer_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__int_rep__integer_t)
-#elif	defined(__NDR_convert__int_rep__exc__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__int_rep__exc__int32_t)
-#elif	defined(__NDR_convert__int_rep__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__int_rep__int32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_identity_t__codeCnt__defined
-#if	defined(__NDR_convert__int_rep__exc__mach_msg_type_number_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__codeCnt__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__codeCnt(a, f) \
-	__NDR_convert__int_rep__exc__mach_msg_type_number_t((mach_msg_type_number_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__mach_msg_type_number_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__codeCnt__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__codeCnt(a, f) \
-	__NDR_convert__int_rep__mach_msg_type_number_t((mach_msg_type_number_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__codeCnt__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor__defined
-#if	defined(__NDR_convert__int_rep__exc__int__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__int_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__int_rep__int__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__int_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__int_rep__exc__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__int_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__int32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__int_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined
-#if	defined(__NDR_convert__int_rep__exc__thread_state_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__int_rep__exc__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__int_rep__thread_state_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__int_rep__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__int_rep__exc__natural_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__int_rep__exc__natural_t)
-#elif	defined(__NDR_convert__int_rep__natural_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__int_rep__natural_t)
-#elif	defined(__NDR_convert__int_rep__exc__uint32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__int_rep__exc__uint32_t)
-#elif	defined(__NDR_convert__int_rep__uint32_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__int_rep__uint32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined */
-
-#ifndef __NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_stateCnt__defined
-#if	defined(__NDR_convert__int_rep__exc__mach_msg_type_number_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_stateCnt__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_stateCnt(a, f) \
-	__NDR_convert__int_rep__exc__mach_msg_type_number_t((mach_msg_type_number_t *)(a), f)
-#elif	defined(__NDR_convert__int_rep__mach_msg_type_number_t__defined)
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_stateCnt__defined
-#define	__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_stateCnt(a, f) \
-	__NDR_convert__int_rep__mach_msg_type_number_t((mach_msg_type_number_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_stateCnt__defined */
-
-#ifndef __NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined
-#if	defined(__NDR_convert__char_rep__exc__exception_type_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__char_rep__exc__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exception_type_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__char_rep__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exc__int__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__char_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__char_rep__int__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__char_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exc__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__char_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__char_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined */
-
-#ifndef __NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined
-#if	defined(__NDR_convert__char_rep__exc__exception_data_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__char_rep__exc__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__char_rep__exception_data_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__char_rep__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__char_rep__exc__integer_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__char_rep__exc__integer_t)
-#elif	defined(__NDR_convert__char_rep__integer_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__char_rep__integer_t)
-#elif	defined(__NDR_convert__char_rep__exc__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__char_rep__exc__int32_t)
-#elif	defined(__NDR_convert__char_rep__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__char_rep__int32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined */
-
-#ifndef __NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor__defined
-#if	defined(__NDR_convert__char_rep__exc__int__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__char_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__char_rep__int__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__char_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__char_rep__exc__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__char_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__char_rep__int32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__char_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor__defined */
-
-#ifndef __NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined
-#if	defined(__NDR_convert__char_rep__exc__thread_state_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__char_rep__exc__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__char_rep__thread_state_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__char_rep__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__char_rep__exc__natural_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__char_rep__exc__natural_t)
-#elif	defined(__NDR_convert__char_rep__natural_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__char_rep__natural_t)
-#elif	defined(__NDR_convert__char_rep__exc__uint32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__char_rep__exc__uint32_t)
-#elif	defined(__NDR_convert__char_rep__uint32_t__defined)
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__char_rep__uint32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined */
-
-#ifndef __NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined
-#if	defined(__NDR_convert__float_rep__exc__exception_type_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__float_rep__exc__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exception_type_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__float_rep__exception_type_t((exception_type_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exc__int__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__float_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__float_rep__int__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__float_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exc__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__float_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception(a, f) \
-	__NDR_convert__float_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined */
-
-#ifndef __NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined
-#if	defined(__NDR_convert__float_rep__exc__exception_data_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__float_rep__exc__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__float_rep__exception_data_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__float_rep__exception_data_t((exception_data_t *)(a), f, c)
-#elif	defined(__NDR_convert__float_rep__exc__integer_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__float_rep__exc__integer_t)
-#elif	defined(__NDR_convert__float_rep__integer_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((integer_t *)(a), f, c, __NDR_convert__float_rep__integer_t)
-#elif	defined(__NDR_convert__float_rep__exc__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__float_rep__exc__int32_t)
-#elif	defined(__NDR_convert__float_rep__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code(a, f, c) \
-	__NDR_convert__ARRAY((int32_t *)(a), f, c, __NDR_convert__float_rep__int32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined */
-
-#ifndef __NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor__defined
-#if	defined(__NDR_convert__float_rep__exc__int__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__float_rep__exc__int((int *)(a), f)
-#elif	defined(__NDR_convert__float_rep__int__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__float_rep__int((int *)(a), f)
-#elif	defined(__NDR_convert__float_rep__exc__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__float_rep__exc__int32_t((int32_t *)(a), f)
-#elif	defined(__NDR_convert__float_rep__int32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor(a, f) \
-	__NDR_convert__float_rep__int32_t((int32_t *)(a), f)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor__defined */
-
-#ifndef __NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined
-#if	defined(__NDR_convert__float_rep__exc__thread_state_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__float_rep__exc__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__float_rep__thread_state_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__float_rep__thread_state_t((thread_state_t *)(a), f, c)
-#elif	defined(__NDR_convert__float_rep__exc__natural_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__float_rep__exc__natural_t)
-#elif	defined(__NDR_convert__float_rep__natural_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((natural_t *)(a), f, c, __NDR_convert__float_rep__natural_t)
-#elif	defined(__NDR_convert__float_rep__exc__uint32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__float_rep__exc__uint32_t)
-#elif	defined(__NDR_convert__float_rep__uint32_t__defined)
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined
-#define	__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state(a, f, c) \
-	__NDR_convert__ARRAY((uint32_t *)(a), f, c, __NDR_convert__float_rep__uint32_t)
-#endif /* defined(__NDR_convert__*__defined) */
-#endif /* __NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined */
-
-
-mig_internal kern_return_t __MIG_check__Request__exception_raise_state_identity_t(__attribute__((__unused__)) __Request__exception_raise_state_identity_t *In0P, __attribute__((__unused__)) __Request__exception_raise_state_identity_t **In1PP)
-{
-
-	typedef __Request__exception_raise_state_identity_t __Request;
-	__Request *In1P;
-#if	__MigTypeCheck
-	unsigned int msgh_size;
-#endif	/* __MigTypeCheck */
-	unsigned int msgh_size_delta;
-
-#if	__MigTypeCheck
-	msgh_size = In0P->Head.msgh_size;
-	if (!(In0P->Head.msgh_bits & MACH_MSGH_BITS_COMPLEX) ||
-	    (In0P->msgh_body.msgh_descriptor_count != 2) ||
-	    (msgh_size < (mach_msg_size_t)(sizeof(__Request) - 584)) ||  (msgh_size > (mach_msg_size_t)sizeof(__Request))
-)
-		return MIG_BAD_ARGUMENTS;
-#endif	/* __MigTypeCheck */
-
-#if	__MigTypeCheck
-	if (In0P->thread.type != MACH_MSG_PORT_DESCRIPTOR ||
-	    In0P->thread.disposition != 17)
-		return MIG_TYPE_ERROR;
-#endif	/* __MigTypeCheck */
-
-#if	__MigTypeCheck
-	if (In0P->task.type != MACH_MSG_PORT_DESCRIPTOR ||
-	    In0P->task.disposition != 17)
-		return MIG_TYPE_ERROR;
-#endif	/* __MigTypeCheck */
-
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__codeCnt__defined)
-	if (In0P->NDR.int_rep != NDR_record.int_rep)
-		__NDR_convert__int_rep__Request__exception_raise_state_identity_t__codeCnt(&In0P->codeCnt, In0P->NDR.int_rep);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__codeCnt__defined */
-	msgh_size_delta = (4 * In0P->codeCnt);
-#if	__MigTypeCheck
-	if (msgh_size < (mach_msg_size_t)(sizeof(__Request) - 584) + msgh_size_delta)
-		return MIG_BAD_ARGUMENTS;
-	msgh_size -= msgh_size_delta;
-#endif	/* __MigTypeCheck */
-
-	*In1PP = In1P = (__Request *) ((pointer_t) In0P + msgh_size_delta - 8);
-
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_stateCnt__defined)
-	if (In0P->NDR.int_rep != NDR_record.int_rep)
-		__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_stateCnt(&In1P->old_stateCnt, In1P->NDR.int_rep);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_stateCnt__defined */
-#if	__MigTypeCheck
-	if (msgh_size != (mach_msg_size_t)(sizeof(__Request) - 584) + ((4 * In1P->old_stateCnt)))
-		return MIG_BAD_ARGUMENTS;
-#endif	/* __MigTypeCheck */
-
-#if	defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__codeCnt__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined) || \
-	defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_stateCnt__defined)
-	if (In0P->NDR.int_rep != NDR_record.int_rep) {
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined)
-		__NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception(&In0P->exception, In0P->NDR.int_rep);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__exception__defined */
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined)
-		__NDR_convert__int_rep__Request__exception_raise_state_identity_t__code(&In0P->code, In0P->NDR.int_rep, In0P->codeCnt);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__code__defined */
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor__defined)
-		__NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor(&In1P->flavor, In0P->NDR.int_rep);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__flavor__defined */
-#if defined(__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined)
-		__NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state(&In1P->old_state, In0P->NDR.int_rep, In1P->old_stateCnt);
-#endif	/* __NDR_convert__int_rep__Request__exception_raise_state_identity_t__old_state__defined */
-	}
-#endif	/* defined(__NDR_convert__int_rep...) */
-
-#if	defined(__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined) || \
-	defined(__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined) || \
-	0 || \
-	defined(__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor__defined) || \
-	defined(__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined) || \
-	0
-	if (In0P->NDR.char_rep != NDR_record.char_rep) {
-#if defined(__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined)
-		__NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception(&In0P->exception, In0P->NDR.char_rep);
-#endif	/* __NDR_convert__char_rep__Request__exception_raise_state_identity_t__exception__defined */
-#if defined(__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined)
-		__NDR_convert__char_rep__Request__exception_raise_state_identity_t__code(&In0P->code, In0P->NDR.char_rep, In0P->codeCnt);
-#endif	/* __NDR_convert__char_rep__Request__exception_raise_state_identity_t__code__defined */
-#if defined(__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor__defined)
-		__NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor(&In1P->flavor, In0P->NDR.char_rep);
-#endif	/* __NDR_convert__char_rep__Request__exception_raise_state_identity_t__flavor__defined */
-#if defined(__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined)
-		__NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state(&In1P->old_state, In0P->NDR.char_rep, In1P->old_stateCnt);
-#endif	/* __NDR_convert__char_rep__Request__exception_raise_state_identity_t__old_state__defined */
-	}
-#endif	/* defined(__NDR_convert__char_rep...) */
-
-#if	defined(__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined) || \
-	defined(__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined) || \
-	0 || \
-	defined(__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor__defined) || \
-	defined(__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined) || \
-	0
-	if (In0P->NDR.float_rep != NDR_record.float_rep) {
-#if defined(__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined)
-		__NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception(&In0P->exception, In0P->NDR.float_rep);
-#endif	/* __NDR_convert__float_rep__Request__exception_raise_state_identity_t__exception__defined */
-#if defined(__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined)
-		__NDR_convert__float_rep__Request__exception_raise_state_identity_t__code(&In0P->code, In0P->NDR.float_rep, In0P->codeCnt);
-#endif	/* __NDR_convert__float_rep__Request__exception_raise_state_identity_t__code__defined */
-#if defined(__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor__defined)
-		__NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor(&In1P->flavor, In0P->NDR.float_rep);
-#endif	/* __NDR_convert__float_rep__Request__exception_raise_state_identity_t__flavor__defined */
-#if defined(__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined)
-		__NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state(&In1P->old_state, In0P->NDR.float_rep, In1P->old_stateCnt);
-#endif	/* __NDR_convert__float_rep__Request__exception_raise_state_identity_t__old_state__defined */
-	}
-#endif	/* defined(__NDR_convert__float_rep...) */
-
-	return MACH_MSG_SUCCESS;
-}
-#endif /* !defined(__MIG_check__Request__exception_raise_state_identity_t__defined) */
-#endif /* __MIG_check__Request__exc_subsystem__ */
-#endif /* ( __MigTypeCheck || __NDR_convert__ ) */
-
-
-/* Routine exception_raise_state_identity */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t breakpad_exception_raise_state_identity
-(
-	mach_port_t exception_port,
-	mach_port_t thread,
-	mach_port_t task,
-	exception_type_t exception,
-	exception_data_t code,
-	mach_msg_type_number_t codeCnt,
-	int *flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t old_stateCnt,
-	thread_state_t new_state,
-	mach_msg_type_number_t *new_stateCnt
-);
-
-/* Routine exception_raise_state_identity */
-mig_internal novalue _Xexception_raise_state_identity
-	(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP)
-{
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t thread;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code2;
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state144;
-		mach_msg_trailer_t trailer;
-	} Request;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-	typedef __Request__exception_raise_state_identity_t __Request;
-	typedef __Reply__exception_raise_state_identity_t Reply;
-
-	/*
-	 * typedef struct {
-	 * 	mach_msg_header_t Head;
-	 * 	NDR_record_t NDR;
-	 * 	kern_return_t RetCode;
-	 * } mig_reply_error_t;
-	 */
-
-	Request *In0P = (Request *) InHeadP;
-	Request *In1P;
-	Reply *OutP = (Reply *) OutHeadP;
-#ifdef	__MIG_check__Request__exception_raise_state_identity_t__defined
-	kern_return_t check_result;
-#endif	/* __MIG_check__Request__exception_raise_state_identity_t__defined */
-
-	__DeclareRcvRpc(2403, "exception_raise_state_identity")
-	__BeforeRcvRpc(2403, "exception_raise_state_identity")
-
-#if	defined(__MIG_check__Request__exception_raise_state_identity_t__defined)
-	check_result = __MIG_check__Request__exception_raise_state_identity_t((__Request *)In0P, (__Request **)&In1P);
-	if (check_result != MACH_MSG_SUCCESS)
-		{ MIG_RETURN_ERROR(OutP, check_result); }
-#endif	/* defined(__MIG_check__Request__exception_raise_state_identity_t__defined) */
-
-	OutP->new_stateCnt = 144;
-
-	OutP->RetCode = breakpad_exception_raise_state_identity(In0P->Head.msgh_request_port, In0P->thread.name, In0P->task.name, In0P->exception, In0P->code, In0P->codeCnt, &In1P->flavor, In1P->old_state, In1P->old_stateCnt, OutP->new_state, &OutP->new_stateCnt);
-	if (OutP->RetCode != KERN_SUCCESS) {
-		MIG_RETURN_ERROR(OutP, OutP->RetCode);
-	}
-
-	OutP->NDR = NDR_record;
-
-
-	OutP->flavor = In1P->flavor;
-	OutP->Head.msgh_size = (mach_msg_size_t)(sizeof(Reply) - 576) + (((4 * OutP->new_stateCnt)));
-
-	__AfterRcvRpc(2403, "exception_raise_state_identity")
-}
-
-
-extern boolean_t exc_server(
-		mach_msg_header_t *InHeadP,
-		mach_msg_header_t *OutHeadP);
-
-extern mig_routine_t exc_server_routine(
-		mach_msg_header_t *InHeadP);
-
-
-/* Description of this subsystem, for use in direct RPC */
-const struct breakpad_exc_subsystem {
-	mig_server_routine_t 	server;	/* Server routine */
-	mach_msg_id_t	start;	/* Min routine number */
-	mach_msg_id_t	end;	/* Max routine number + 1 */
-	unsigned int	maxsize;	/* Max msg size */
-	vm_address_t	reserved;	/* Reserved */
-	struct routine_descriptor	/*Array of routine descriptors */
-		routine3;
-} breakpad_exc_subsystem = {
-	exc_server_routine,
-	2401,
-	2404,
-	(mach_msg_size_t)sizeof(union __ReplyUnion__breakpad_exc_subsystem),
-	(vm_address_t)0,
-	{
-          { (mig_impl_routine_t) 0,
-            (mig_stub_routine_t) _Xexception_raise, 6, 0, (routine_arg_descriptor_t)0, (mach_msg_size_t)sizeof(__Reply__exception_raise_t)},
-          { (mig_impl_routine_t) 0,
-            (mig_stub_routine_t) _Xexception_raise_state, 9, 0, (routine_arg_descriptor_t)0, (mach_msg_size_t)sizeof(__Reply__exception_raise_state_t)},
-          { (mig_impl_routine_t) 0,
-            (mig_stub_routine_t) _Xexception_raise_state_identity, 11, 0, (routine_arg_descriptor_t)0, (mach_msg_size_t)sizeof(__Reply__exception_raise_state_identity_t)},
-	}
-};
-
-mig_external boolean_t exc_server
-	(mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP)
-{
-	/*
-	 * typedef struct {
-	 * 	mach_msg_header_t Head;
-	 * 	NDR_record_t NDR;
-	 * 	kern_return_t RetCode;
-	 * } mig_reply_error_t;
-	 */
-
-	register mig_routine_t routine;
-
-	OutHeadP->msgh_bits = MACH_MSGH_BITS(MACH_MSGH_BITS_REPLY(InHeadP->msgh_bits), 0);
-	OutHeadP->msgh_remote_port = InHeadP->msgh_reply_port;
-	/* Minimal size: routine() will update it if different */
-	OutHeadP->msgh_size = (mach_msg_size_t)sizeof(mig_reply_error_t);
-	OutHeadP->msgh_local_port = MACH_PORT_NULL;
-	OutHeadP->msgh_id = InHeadP->msgh_id + 100;
-
-	if ((InHeadP->msgh_id > 2403) || (InHeadP->msgh_id < 2401) ||
-	    ((routine = breakpad_exc_subsystem.routineInHeadP->msgh_id - 2401.stub_routine) == 0)) {
-		((mig_reply_error_t *)OutHeadP)->NDR = NDR_record;
-		((mig_reply_error_t *)OutHeadP)->RetCode = MIG_BAD_ID;
-		return FALSE;
-	}
-	(*routine) (InHeadP, OutHeadP);
-	return TRUE;
-}
-
-mig_external mig_routine_t exc_server_routine
-	(mach_msg_header_t *InHeadP)
-{
-	register int msgh_id;
-
-	msgh_id = InHeadP->msgh_id - 2401;
-
-	if ((msgh_id > 2) || (msgh_id < 0))
-		return 0;
-
-	return breakpad_exc_subsystem.routinemsgh_id.stub_routine;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/breakpad_exc_server.h Deleted

@@ -1,258 +0,0 @@
-#ifndef	_exc_user_
-#define	_exc_user_
-
-/* Module exc */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry 	*function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	exc_MSG_COUNT
-#define	exc_MSG_COUNT	3
-#endif	/* exc_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine exception_raise */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t exception_raise
-(
-	mach_port_t exception_port,
-	mach_port_t thread,
-	mach_port_t task,
-	exception_type_t exception,
-	exception_data_t code,
-	mach_msg_type_number_t codeCnt
-);
-
-/* Routine exception_raise_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t exception_raise_state
-(
-	mach_port_t exception_port,
-	exception_type_t exception,
-	const exception_data_t code,
-	mach_msg_type_number_t codeCnt,
-	int *flavor,
-	const thread_state_t old_state,
-	mach_msg_type_number_t old_stateCnt,
-	thread_state_t new_state,
-	mach_msg_type_number_t *new_stateCnt
-);
-
-/* Routine exception_raise_state_identity */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t exception_raise_state_identity
-(
-	mach_port_t exception_port,
-	mach_port_t thread,
-	mach_port_t task,
-	exception_type_t exception,
-	exception_data_t code,
-	mach_msg_type_number_t codeCnt,
-	int *flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t old_stateCnt,
-	thread_state_t new_state,
-	mach_msg_type_number_t *new_stateCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__exc_subsystem__defined
-#define __Request__exc_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t thread;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code2;
-	} __Request__exception_raise_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code2;
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state144;
-	} __Request__exception_raise_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t thread;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code2;
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state144;
-	} __Request__exception_raise_state_identity_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__exc_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__exc_subsystem__defined
-#define __RequestUnion__exc_subsystem__defined
-union __RequestUnion__exc_subsystem {
-	__Request__exception_raise_t Request_exception_raise;
-	__Request__exception_raise_state_t Request_exception_raise_state;
-	__Request__exception_raise_state_identity_t Request_exception_raise_state_identity;
-};
-#endif /* !__RequestUnion__exc_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__exc_subsystem__defined
-#define __Reply__exc_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__exception_raise_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		int flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state144;
-	} __Reply__exception_raise_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		int flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state144;
-	} __Reply__exception_raise_state_identity_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__exc_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__exc_subsystem__defined
-#define __ReplyUnion__exc_subsystem__defined
-union __ReplyUnion__exc_subsystem {
-	__Reply__exception_raise_t Reply_exception_raise;
-	__Reply__exception_raise_state_t Reply_exception_raise_state;
-	__Reply__exception_raise_state_identity_t Reply_exception_raise_state_identity;
-};
-#endif /* !__RequestUnion__exc_subsystem__defined */
-
-#ifndef subsystem_to_name_map_exc
-#define subsystem_to_name_map_exc \
-    { "exception_raise", 2401 },\
-    { "exception_raise_state", 2402 },\
-    { "exception_raise_state_identity", 2403 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _exc_user_ */

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/tests/auto_tempdir.h Deleted

@@ -1,72 +0,0 @@
-// Copyright (c) 2010, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Utility class for creating a temporary directory for unit tests
-// that is deleted in the destructor.
-#ifndef GOOGLE_BREAKPAD_CLIENT_MAC_TESTS_AUTO_TEMPDIR
-#define GOOGLE_BREAKPAD_CLIENT_MAC_TESTS_AUTO_TEMPDIR
-
-#include <dirent.h>
-#include <sys/types.h>
-
-#include <string>
-
-namespace google_breakpad {
-
-class AutoTempDir {
- public:
-  AutoTempDir() {
-    char tempDir16 = "/tmp/XXXXXXXXXX";
-    mkdtemp(tempDir);
-    path = tempDir;
-  }
-
-  ~AutoTempDir() {
-    // First remove any files in the dir
-    DIR* dir = opendir(path.c_str());
-    if (!dir)
-      return;
-
-    dirent* entry;
-    while ((entry = readdir(dir)) != NULL) {
-      if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
-	continue;
-      std::string entryPath = path + "/" + entry->d_name;
-      unlink(entryPath.c_str());
-    }
-    closedir(dir);
-    rmdir(path.c_str());
-  }
-
-  std::string path;
-};
-
-}  // namespace google_breakpad
-
-#endif  // GOOGLE_BREAKPAD_CLIENT_MAC_TESTS_AUTO_TEMPDIR

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/md5.c Deleted

@@ -1,246 +0,0 @@
-/*
- * written by Colin Plumb in 1993, no copyright is claimed.
- * This code is in the public domain; do with it what you wish.
- *
- * Equivalent code is available from RSA Data Security, Inc.
- * This code has been tested against that, and is equivalent,
- * except that you don't need to include two pages of legalese
- * with every copy.
- *
- * To compute the message digest of a chunk of bytes, declare an
- * MD5Context structure, pass it to MD5Init, call MD5Update as
- * needed on buffers full of bytes, and then call MD5Final, which
- * will fill a supplied 16-byte array with the digest.
- */
-
-#include <string.h>
-
-#include "common/md5.h"
-
-#ifndef WORDS_BIGENDIAN
-#define byteReverse(buf, len)   /* Nothing */
-#else
-/*
- * Note: this code is harmless on little-endian machines.
- */
-static void byteReverse(unsigned char *buf, unsigned longs)
-{
-  u32 t;
-  do {
-    t = (u32) ((unsigned) buf3 << 8 | buf2) << 16 |
-      ((unsigned) buf1 << 8 | buf0);
-    *(u32 *) buf = t;
-    buf += 4;
-  } while (--longs);
-}
-#endif
-
-static void MD5Transform(u32 buf4, u32 const in16);
-
-/*
- * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
- * initialization constants.
- */
-void MD5Init(struct MD5Context *ctx)
-{
-  ctx->buf0 = 0x67452301;
-  ctx->buf1 = 0xefcdab89;
-  ctx->buf2 = 0x98badcfe;
-  ctx->buf3 = 0x10325476;
-
-  ctx->bits0 = 0;
-  ctx->bits1 = 0;
-}
-
-/*
- * Update context to reflect the concatenation of another buffer full
- * of bytes.
- */
-void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
-{
-  u32 t;
-
-  /* Update bitcount */
-
-  t = ctx->bits0;
-  if ((ctx->bits0 = t + ((u32) len << 3)) < t)
-    ctx->bits1++;         /* Carry from low to high */
-  ctx->bits1 += len >> 29;
-
-  t = (t >> 3) & 0x3f;        /* Bytes already in shsInfo->data */
-
-  /* Handle any leading odd-sized chunks */
-
-  if (t) {
-    unsigned char *p = (unsigned char *) ctx->in + t;
-
-    t = 64 - t;
-    if (len < t) {
-      memcpy(p, buf, len);
-      return;
-    }
-    memcpy(p, buf, t);
-    byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (u32 *) ctx->in);
-    buf += t;
-    len -= t;
-  }
-  /* Process data in 64-byte chunks */
-
-  while (len >= 64) {
-    memcpy(ctx->in, buf, 64);
-    byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (u32 *) ctx->in);
-    buf += 64;
-    len -= 64;
-  }
-
-  /* Handle any remaining bytes of data. */
-
-  memcpy(ctx->in, buf, len);
-}
-
-/*
- * Final wrapup - pad to 64-byte boundary with the bit pattern
- * 1 0* (64-bit count of bits processed, MSB-first)
- */
-void MD5Final(unsigned char digest16, struct MD5Context *ctx)
-{
-  unsigned count;
-  unsigned char *p;
-
-  /* Compute number of bytes mod 64 */
-  count = (ctx->bits0 >> 3) & 0x3F;
-
-  /* Set the first char of padding to 0x80.  This is safe since there is
-     always at least one byte free */
-  p = ctx->in + count;
-  *p++ = 0x80;
-
-  /* Bytes of padding needed to make 64 bytes */
-  count = 64 - 1 - count;
-
-  /* Pad out to 56 mod 64 */
-  if (count < 8) {
-    /* Two lots of padding:  Pad the first block to 64 bytes */
-    memset(p, 0, count);
-    byteReverse(ctx->in, 16);
-    MD5Transform(ctx->buf, (u32 *) ctx->in);
-
-    /* Now fill the next block with 56 bytes */
-    memset(ctx->in, 0, 56);
-  } else {
-    /* Pad block to 56 bytes */
-    memset(p, 0, count - 8);
-  }
-  byteReverse(ctx->in, 14);
-
-  /* Append length in bits and transform */
-  ((u32 *) ctx->in)14 = ctx->bits0;
-  ((u32 *) ctx->in)15 = ctx->bits1;
-
-  MD5Transform(ctx->buf, (u32 *) ctx->in);
-  byteReverse((unsigned char *) ctx->buf, 4);
-  memcpy(digest, ctx->buf, 16);
-  memset(ctx, 0, sizeof(*ctx));        /* In case it's sensitive */
-}
-
-/* The four core functions - F1 is optimized somewhat */
-
-/* #define F1(x, y, z) (x & y | ~x & z) */
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-
-/* This is the central step in the MD5 algorithm. */
-#define MD5STEP(f, w, x, y, z, data, s) \
-  ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
-
-/*
- * The core of the MD5 algorithm, this alters an existing MD5 hash to
- * reflect the addition of 16 longwords of new data.  MD5Update blocks
- * the data and converts bytes into longwords for this routine.
- */
-static void MD5Transform(u32 buf4, u32 const in16)
-{
-  register u32 a, b, c, d;
-
-  a = buf0;
-  b = buf1;
-  c = buf2;
-  d = buf3;
-
-  MD5STEP(F1, a, b, c, d, in0 + 0xd76aa478, 7);
-  MD5STEP(F1, d, a, b, c, in1 + 0xe8c7b756, 12);
-  MD5STEP(F1, c, d, a, b, in2 + 0x242070db, 17);
-  MD5STEP(F1, b, c, d, a, in3 + 0xc1bdceee, 22);
-  MD5STEP(F1, a, b, c, d, in4 + 0xf57c0faf, 7);
-  MD5STEP(F1, d, a, b, c, in5 + 0x4787c62a, 12);
-  MD5STEP(F1, c, d, a, b, in6 + 0xa8304613, 17);
-  MD5STEP(F1, b, c, d, a, in7 + 0xfd469501, 22);
-  MD5STEP(F1, a, b, c, d, in8 + 0x698098d8, 7);
-  MD5STEP(F1, d, a, b, c, in9 + 0x8b44f7af, 12);
-  MD5STEP(F1, c, d, a, b, in10 + 0xffff5bb1, 17);
-  MD5STEP(F1, b, c, d, a, in11 + 0x895cd7be, 22);
-  MD5STEP(F1, a, b, c, d, in12 + 0x6b901122, 7);
-  MD5STEP(F1, d, a, b, c, in13 + 0xfd987193, 12);
-  MD5STEP(F1, c, d, a, b, in14 + 0xa679438e, 17);
-  MD5STEP(F1, b, c, d, a, in15 + 0x49b40821, 22);
-
-  MD5STEP(F2, a, b, c, d, in1 + 0xf61e2562, 5);
-  MD5STEP(F2, d, a, b, c, in6 + 0xc040b340, 9);
-  MD5STEP(F2, c, d, a, b, in11 + 0x265e5a51, 14);
-  MD5STEP(F2, b, c, d, a, in0 + 0xe9b6c7aa, 20);
-  MD5STEP(F2, a, b, c, d, in5 + 0xd62f105d, 5);
-  MD5STEP(F2, d, a, b, c, in10 + 0x02441453, 9);
-  MD5STEP(F2, c, d, a, b, in15 + 0xd8a1e681, 14);
-  MD5STEP(F2, b, c, d, a, in4 + 0xe7d3fbc8, 20);
-  MD5STEP(F2, a, b, c, d, in9 + 0x21e1cde6, 5);
-  MD5STEP(F2, d, a, b, c, in14 + 0xc33707d6, 9);
-  MD5STEP(F2, c, d, a, b, in3 + 0xf4d50d87, 14);
-  MD5STEP(F2, b, c, d, a, in8 + 0x455a14ed, 20);
-  MD5STEP(F2, a, b, c, d, in13 + 0xa9e3e905, 5);
-  MD5STEP(F2, d, a, b, c, in2 + 0xfcefa3f8, 9);
-  MD5STEP(F2, c, d, a, b, in7 + 0x676f02d9, 14);
-  MD5STEP(F2, b, c, d, a, in12 + 0x8d2a4c8a, 20);
-
-  MD5STEP(F3, a, b, c, d, in5 + 0xfffa3942, 4);
-  MD5STEP(F3, d, a, b, c, in8 + 0x8771f681, 11);
-  MD5STEP(F3, c, d, a, b, in11 + 0x6d9d6122, 16);
-  MD5STEP(F3, b, c, d, a, in14 + 0xfde5380c, 23);
-  MD5STEP(F3, a, b, c, d, in1 + 0xa4beea44, 4);
-  MD5STEP(F3, d, a, b, c, in4 + 0x4bdecfa9, 11);
-  MD5STEP(F3, c, d, a, b, in7 + 0xf6bb4b60, 16);
-  MD5STEP(F3, b, c, d, a, in10 + 0xbebfbc70, 23);
-  MD5STEP(F3, a, b, c, d, in13 + 0x289b7ec6, 4);
-  MD5STEP(F3, d, a, b, c, in0 + 0xeaa127fa, 11);
-  MD5STEP(F3, c, d, a, b, in3 + 0xd4ef3085, 16);
-  MD5STEP(F3, b, c, d, a, in6 + 0x04881d05, 23);
-  MD5STEP(F3, a, b, c, d, in9 + 0xd9d4d039, 4);
-  MD5STEP(F3, d, a, b, c, in12 + 0xe6db99e5, 11);
-  MD5STEP(F3, c, d, a, b, in15 + 0x1fa27cf8, 16);
-  MD5STEP(F3, b, c, d, a, in2 + 0xc4ac5665, 23);
-
-  MD5STEP(F4, a, b, c, d, in0 + 0xf4292244, 6);
-  MD5STEP(F4, d, a, b, c, in7 + 0x432aff97, 10);
-  MD5STEP(F4, c, d, a, b, in14 + 0xab9423a7, 15);
-  MD5STEP(F4, b, c, d, a, in5 + 0xfc93a039, 21);
-  MD5STEP(F4, a, b, c, d, in12 + 0x655b59c3, 6);
-  MD5STEP(F4, d, a, b, c, in3 + 0x8f0ccc92, 10);
-  MD5STEP(F4, c, d, a, b, in10 + 0xffeff47d, 15);
-  MD5STEP(F4, b, c, d, a, in1 + 0x85845dd1, 21);
-  MD5STEP(F4, a, b, c, d, in8 + 0x6fa87e4f, 6);
-  MD5STEP(F4, d, a, b, c, in15 + 0xfe2ce6e0, 10);
-  MD5STEP(F4, c, d, a, b, in6 + 0xa3014314, 15);
-  MD5STEP(F4, b, c, d, a, in13 + 0x4e0811a1, 21);
-  MD5STEP(F4, a, b, c, d, in4 + 0xf7537e82, 6);
-  MD5STEP(F4, d, a, b, c, in11 + 0xbd3af235, 10);
-  MD5STEP(F4, c, d, a, b, in2 + 0x2ad7d2bb, 15);
-  MD5STEP(F4, b, c, d, a, in9 + 0xeb86d391, 21);
-
-  buf0 += a;
-  buf1 += b;
-  buf2 += c;
-  buf3 += d;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/third_party/libdisasm/.dirstamp Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2 Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/CMakeLists.txt Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/COPYING Deleted

@@ -1,621 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/README Deleted

@@ -1,138 +0,0 @@
-liblastfm
-=========
-liblastfm is a collection of libraries to help you integrate Last.fm services
-into your rich desktop software. It is officially supported software developed
-by Last.fm staff.
-
-Max Howell   http://twitter.com/mxcl
-Jono Cole    http://twitter.com/jonocole
-Doug Mansell http://twitter.com/dougma
-
-Fork it: http://github.com/mxcl/liblastfm
-
-
-Dependencies
-============
-liblastfm dynamically links to:
-
-* Qt 4.4
-  http://www.qtsoftware.com
-* FFTW 3.2
-  Compiled with single precision
-  http://www.fftw.org
-* Secret Rabbit code (aka libsamplerate)
-  http://www.mega-nerd.com/SRC
-
-Additionally, to build you will need Ruby and GNU make (or Microsoft nmake).
-
-Mac OS X
---------
-    sudo port selfupdate
-    sudo port upgrade installed
-    sudo port install libsamplerate fftw-3 qt4-mac-devel
-
-qt4-mac-devel will take a long time to build. So you may want to install the
-Trolltech binary package instead.
-
-MacPorts carries liblastfm now, so you may have downloaded this package simply
-to perform this next line:
-
-    sudo port install liblastfm
-
-Linux/*NIX
-----------
-Do something like this:
-
-    sudo apt-get install qt4-qmake pkg-config libsamplerate-dev libfftw3-dev ruby g++ libqt4-dev
-
-Additionally on Linux the configure process requires lsb_release. This is
-usually already installed (correct me if I'm wrong).
-
-Please note, we have only tested on Linux, but we think it'll work on all
-varieties of UNIX. If it doesn't, report the bug to mxcl on GitHub.
-
-Windows
--------
-Install Ruby. Install Visual Studio 2005 or higher. Install Qt. Install the
-Windows Server 2003 Platform SDK r2:
-
-http://www.microsoft.com/Downloads/details.aspx?FamilyID=484269e2-3b89-47e3-8eb7-1f2be6d7123a
-
-Set up your environment variables so all include paths and tools are
-available.
-
-Build and install FFTW and Secret Rabbit Code.
-
-Open a plain Windows shell (Cygwin will work but we don't recommend it), and
-see the next section.
-
-
-Installing liblastfm
-====================
-    ruby configure --release --prefix /usr/local && make && sudo make install
-
-Packaging liblastfm
--------------------
-DESTDIR is supported.
-
-liblastfm builds to two dynamic libraries (liblastfm.so and
-liblastfm_fingerprint.so). liblastfm.so links only to Qt, but the
-fingerprinting part has additional dependencies. So ideally, you would
-distribute two packages.
-
-
-Using liblastfm
-===============
-We have copied the API at http://last.fm/api onto C++, so like you find
-artist.getInfo there you will find an lastfm::Artist::getInfo function in our
-C++ API. lastfm is a namespace, Artist a class and getInfo a function.
-
-Thus the API is quite easy to learn. We suggest installing and checking the
-include/lastfm/* directory to find out all capabilities.
-
-The demos directory shows some further basic usage including Audioscrobbling
-and getting metadata for music via our fingerprinting technology.
-
-You need an API key from http://last.fm/api to use the webservice API.
-
-Your link line needs to include the following:
-
-    -llastfm -lQtCore -lQtNetwork -lQtXml
-
-Radio
------
-Please set an identifiable UserAgent on your HTTP requests for the actual MP3s,
-in extreme cases we'll contact you directly and demand you do so :P
-
-HTTP & Networking
------------------
-You can specify your own QNetworkAccessManager derived class for liblastfm to
-use with lastfm::setNetworkAccessManager(). Our default is pretty good
-though, auto-determining proxy settings on Windows and OS X for instance.
-
-
-Using liblastfm_fingerprint
-===========================
-The liblastfm_fingerprint library does not decode audio files. We anticipate
-that Phonon will soon do that work for us. In the meantime, sample *Source
-files for MP3, Ogg Vorbis, FLAC, and AAC/MP4 are available in
-src/fingerprint/contrib. If you want to fingerprint files or get metadata
-suggestions, you either need to add the *Source files to your project, or
-implement your own.
-
-
-Development
-===========
-Public Headers
---------------
-1. Header guards should be prefixed with LASTFM, eg. LASTFM_WS_REPLY_H
-2. #includes should be to the system path eg. #include <lastfm/Scrobbler>
-3. Don't make a header public unless it is absolutely required!
-4. To make the header public edit the headers.files line in the pro file
-
-Private Headers
----------------
-1. For consistency and to make it more obvious it is a private header, don't
-   prefix the header guard with LASTFM
-2. #includes should be the full source tree path, eg.
-   #include "../core/UrlBuilder.h"

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/admin Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/admin/lastfm.h.rb Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/admin/utils.rb Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/cmake Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/cmake/modules Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/cmake/modules/FindLibFFTW3.cmake Deleted

@@ -1,45 +0,0 @@
-# This file is copyrighted under the BSD-license for buildsystem files of KDE
-# copyright 2010, Patrick von Reth <patrick.vonreth@gmail.com>
-#
-#
-# - Try to find the LIBFFTW3 library
-# Once done this will define
-#
-#  LIBFFTW3_FOUND            Set to TRUE if LIBFFTW3 librarys and include directory is found
-#  LIBFFTW3_INCLUDE_DIR      The libfftw3 include directory
-#  LIBFFTW3_LIBRARY          The libfftw3 librarys
-
-if(NOT LIBFFTW3_PRECISION)
-  message(STATUS "Searching for LIBFFTW3, using default precision float")
-  set(LIBFFTW3_PRECISION FLOAT)
-endif(NOT LIBFFTW3_PRECISION)
-
-find_path(LIBFFTW3_INCLUDE_DIR fftw3.h)
-
-if(LIBFFTW3_PRECISION STREQUAL FLOAT)
-  set(LIBFFTW3_PRECISION_SUFFIX f)
-endif(LIBFFTW3_PRECISION STREQUAL FLOAT)
-
-if(LIBFFTW3_PRECISION STREQUAL DOUBLE)
-  set(LIBFFTW3_PRECISION_SUFFIX "")
-endif(LIBFFTW3_PRECISION STREQUAL DOUBLE)
-
-if(LIBFFTW3_PRECISION STREQUAL LDOUBLE)
-  set(LIBFFTW3_PRECISION_SUFFIX l)
-endif(LIBFFTW3_PRECISION STREQUAL LDOUBLE)
-
-find_library(LIBFFTW3_LIBRARY NAMES fftw3${LIBFFTW3_PRECISION_SUFFIX} libfftw3${LIBFFTW3_PRECISION_SUFFIX}-3 fftw3${LIBFFTW3_PRECISION_SUFFIX}-3)
-
-if(FIND_LIBFFTW3_VERBOSE)
-  message(STATUS 
-  "LIBFFTW3_PRECISION ${LIBFFTW3_PRECISION}, searched for fftw3${LIBFFTW3_PRECISION_SUFFIX} libfftw3${LIBFFTW3_PRECISION_SUFFIX}-3 fftw3${LIBFFTW3_PRECISION_SUFFIX}-3
-    and found ${LIBFFTW3_LIBRARY}"
-  )
-endif(FIND_LIBFFTW3_VERBOSE)
-
-if(LIBFFTW3_LIBRARY AND LIBFFTW3_INCLUDE_DIR)
-    set(LIBFFTW3_FOUND TRUE)
-    message(STATUS "Found libfftw3 ${LIBFFTW3_LIBRARY}")
-else(LIBFFTW3_LIBRARY AND LIBFFTW3_PLUGIN_PATH)
-    message(STATUS "Could not find libfftw3, get it http://www.fftw.org/")
-endif(LIBFFTW3_LIBRARY AND LIBFFTW3_INCLUDE_DIR)

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/cmake/modules/FindLibSamplerate.cmake Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/configure Deleted

@@ -1,46 +0,0 @@
-#!/usr/bin/ruby
-cwd = File.dirname( __FILE__ )
-require "#{cwd}/admin/utils.rb"
-
- h2 'Determining installation prefix' do
-    if ARGV.include? '--prefix'
-      n=ARGV.index '--prefix'
-      ENV'LFM_PREFIX' = ARGVn+1
-    end
-    ENV'LFM_PREFIX' = '/usr/local' if ENV'LFM_PREFIX'.nil?
-    if File.exists? ENV'LFM_PREFIX' and !File.directory? ENV'LFM_PREFIX'
-      abort "Installation prefix exists but isn't a directory: "+ENV'LFM_PREFIX'
-    end
-    puts "Will install to: "+ENV'LFM_PREFIX'
-  end
-
-  h2 "Configuring qmake..." do
-    args=Array.new
-    if ARGV.include? '--release'
-      args << '-config release'
-    else
-      args << '-config debug'
-    end
-    if ARGV.include? '--no-strip'
-      args << '"CONFIG += nostrip"'
-    end
-    ENV'LFM_QMAKE' = "#{$qmake} #{args.join(' ')}"
-  end
-
-  h2 "Generating Makefile..." do
-    hs = Array.new
-    hs << 'global.h'
-    hs << 'core/UrlBuilder.h' << 'core/XmlQuery.h' << 'core/misc.h'
-    hs << 'fingerprint/Fingerprint.h' << 'fingerprint/FingerprintableSource.h'
-    hs << 'radio/RadioStation.h' << 'radio/RadioTuner.h'
-    hs << 'scrobble/Audioscrobbler.h' << 'scrobble/ScrobblePoint.h' << 'scrobble/ScrobbleCache.h'
-    hs << 'types/Tasteometer.h' << 'types/AbstractType.h' << 'types/Track.h' << 'types/Mbid.h' << 'types/Artist.h' << 'types/Album.h' << 'types/FingerprintId.h' << 'types/Playlist.h' << 'types/Tag.h' << 'types/User.h' << 'types/Xspf.h'
-    hs << 'ws/ws.h' << 'ws/InternetConnectionMonitor.h' << 'ws/NetworkAccessManager.h'
-    uname = `uname`
-	ENV'LFM_VERSION'="0.4.0" 
-	File.new("#{cwd}/Makefile", 'w').write `ruby admin/Makefile.rb #{hs.join(' ')}`
-  end
-
-  puts
-  puts "Good, your configure is finished! Now type: make"
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/demos Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/demos/demo1.cpp Deleted

@@ -1,95 +0,0 @@
-/*
-   This software is in the public domain, furnished "as is", without technical 
-   support, and with no warranty, express or implied, as to its usefulness for 
-   any purpose.
-*/
-#include <lastfm.h> // this includes everything in liblastfm, you may prefer 
-#include <QtCore>   // to just include what you need with your project. Still
-#include <QtGui>    // we've given you the option.
-#include <QPointer>
-#include <QNetworkReply>
-
-class ArtistList : public QListWidget
-{
-    Q_OBJECT
-    
-    QPointer<QNetworkReply> reply;
-    QString artist;
-    
-public:
-    ArtistList()
-    {
-        connect( this,
-                 SIGNAL(itemActivated( QListWidgetItem* )),
-                 SLOT(onItemActivated( QListWidgetItem* )) );
-    }
-    
-    void getSimilar( const QString& artist )
-    {
-        this->artist = artist;
-        setWindowTitle( "Loading " + artist + "..." );
-        
-        // deleting a reply cancels the request and disconnects all signals
-        delete reply;
-        reply = lastfm::Artist( artist ).getSimilar();
-        connect( reply, SIGNAL(finished()), SLOT(onGotSimilar()) );
-    }
-    
-private slots:
-    void onGotSimilar()
-    {
-        QNetworkReply* r = static_cast<QNetworkReply*>(sender());
-        // always enclose retrieval functions in a try block, as they will
-        // throw if they can't parse the data
-        try
-        {
-            // you decode the response using the equivalent static function
-            QMap<int, QString> artists = lastfm::Artist::getSimilar( r );
-
-            clear();
-
-            // we iterate backwards because best match is last because the map
-            // sorts itself by key
-            QStringListIterator i( artists.values() );
-            i.toBack();
-            while (i.hasPrevious())
-                addItem( i.previous() );
-                
-            setWindowTitle( artist );
-        }
-        catch (std::runtime_error& e)
-        {
-            // if getSimilar() failed to parse the QNetworkReply, then e will 
-            // be of type lastfm::ws::ParseError, which derives 
-            // std::runtime_error
-            qWarning() << e.what();
-        }
-    }
-    
-    void onItemActivated( QListWidgetItem* item )
-    {
-        getSimilar( item->text() );
-    }
-};
-
-
-int main( int argc, char** argv )
-{
-    QApplication app( argc, argv );
-    app.setApplicationName( "liblastfm" ); // used to generate UserAgent
-    
-    // all you need for non-authenticated webservices is your API key
-    // this one is a public one, it can only do artist.getSimilar calls, so
-    // I suggest you don't use it :P
-    lastfm::ws::ApiKey = "b25b959554ed76058ac220b7b2e0a026";
-
-    ArtistList artists;
-    artists.getSimilar( "nirvana" );
-    artists.resize( 300, 400 ); // Qt picks truly asanine default sizes for its widgets
-    artists.show();
-
-    return app.exec();
-}
-
-
-#include "demo1.moc"

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/demos/demo2.cpp Deleted

@@ -1,114 +0,0 @@
-/*
-   This software is in the public domain, furnished "as is", without technical 
-   support, and with no warranty, express or implied, as to its usefulness for 
-   any purpose.
-*/
-#include <lastfm.h>
-#include <QtCore>
-
-
-struct MyCoreApp : QCoreApplication
-{
-    Q_OBJECT
-    
-public:
-    MyCoreApp( int& argc, char**& argv ) : QCoreApplication( argc, argv )
-    {}
-    
-private slots:
-    void onWsError( lastfm::ws::Error e )
-    {
-        // QNetworkReply will invoke this slot on application level errors
-        // mostly this is only stuff like Ws::InvalidSessionKey and
-        // Ws::InvalidApiKey    
-        qWarning() << e;
-    }
-};
-
-
-int main( int argc, char** argv )
-{
-    MyCoreApp app( argc, argv );
-    // this is used to generate the UserAgent for webservice requests
-    // please set it to something sensible in your application
-    app.setApplicationName( "liblastfm" );
-    
-////// you'll need to fill these in for this demo to work
-    lastfm::ws::Username = 
-    lastfm::ws::ApiKey = 
-    lastfm::ws::SharedSecret = 
-    QString password = 
-
-////// Usually you never have to construct an Last.fm WS API call manually
-    // eg. Track.getTopTags() just returns a QNetworkReply* but authentication is
-    // different.
-    // We're using getMobileSession here as we're a console app, but you 
-    // should use getToken if you can as the user will be presented with a
-    // route that feels my trustworthy to them than entering their password
-    // into some random app they just downloaded... ;)
-    QMap<QString, QString> params;
-    params"method" = "auth.getMobileSession";
-    params"username" = lastfm::ws::Username;
-    params"authToken" = lastfm::md5( (lastfm::ws::Username + lastfm::md5( password.toUtf8() )).toUtf8() );
-    QNetworkReply* reply = lastfm::ws::post( params );
-    
-    // never do this when an event loop is running it's a real HACK
-    QEventLoop loop;
-    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
-    loop.exec();
-    
-    try
-    {
-    ////// Usually there is a convenience function to decode the output from
-        // ws calls too, but again, authentication is different. We think you
-        // need to handle it yourselves :P Also conveniently it means you
-        // can learn more about what our webservices return, eg. this service
-        // will return an XML document like this:
-        //
-        // <lfm status="ok">
-        //   <session>
-        //     <name>mxcl</name>
-        //      <key>d580d57f32848f5dcf574d1ce18d78b2</key>
-        //      <subscriber>1</subscriber>
-        //   </session>
-        // </lfm>
-        //
-        // If status is not "ok" then this function throws
-        lastfm::XmlQuery const lfm = lastfm::ws::parse( reply );
-        
-        // replace username; because eg. perhaps the user typed their
-        // username with the wrong case
-        lastfm::ws::Username = lfm"session""name".text();
-        
-        // we now have a session key, you should save this, forever! Really.
-        // DO NOT AUTHENTICATE EVERY TIME THE APP STARTS! You only have to do
-        // this once. Or again if the user deletes your key on the site. If 
-        // that happens you'll get notification to your onWsError() function,
-        // see above.
-        lastfm::ws::SessionKey = lfm"session""key".text();
-        
-        qDebug() << "sk:" << lastfm::ws::SessionKey;
-        
-    ////// because the SessionKey is now set, the AuthenticatedUser class will
-        // work. And we can call authenticated calls
-        QNetworkReply* reply = lastfm::AuthenticatedUser().getRecommendedArtists();
-
-        // again, you shouldn't do this.. ;)
-        QEventLoop loop;
-        loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
-        loop.exec();
-        
-        // yay, a list rec'd artists to stderr :)
-        qDebug() << lastfm::Artist::list( reply );
-    }
-    catch (std::runtime_error& e)
-    {
-        // lastfm::ws::parse() can throw lastfm::ws::ParseError, this 
-        // exception derives std::runtime_error
-        qWarning() << e.what();
-        return 1;
-    }
-}
-
-
-#include "demo2.moc"

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/demos/demo3.cpp Deleted

@@ -1,63 +0,0 @@
-/*
-   This software is in the public domain, furnished "as is", without technical 
-   support, and with no warranty, express or implied, as to its usefulness for 
-   any purpose.
-*/
-#include <lastfm.h>
-#include <QtCore>
-#include <QtNetwork>
-#include "src/_version.h"
-
-
-struct MyCoreApp : QCoreApplication
-{
-    Q_OBJECT
-
-public:
-    MyCoreApp( int& argc, char** argv ) : QCoreApplication( argc, argv )
-    {}
-
-public slots:
-    void onStatus( int status )
-    {
-        qDebug() << lastfm::Audioscrobbler::Status(status);
-    }
-};
-
-
-int main( int argc, char** argv )
-{
-    // all 6 of these lines are REQUIRED in order to scrobble
-    // this demo requires you to fill in the blanks as well...
-    lastfm::ws::Username = 
-    lastfm::ws::ApiKey =
-    lastfm::ws::SharedSecret =
-    lastfm::ws::SessionKey = // you need to auth to get this... try demo2
-    QCoreApplication::setApplicationName( "liblastfm" );
-    QCoreApplication::setApplicationVersion( VERSION );
-
-    MyCoreApp app( argc, argv );
-    
-    lastfm::MutableTrack t;
-    t.setArtist( "Max Howell" );
-    t.setTitle( "I Told You Not To Trust Me With Your Daughter" );
-    t.setDuration( 30 );
-    t.stamp(); //sets track start time
-    
-    lastfm::Audioscrobbler as( "ass" );
-    as.nowPlaying( t );
-    // Audioscrobbler will submit whatever is in the cache when you call submit.
-    // And the cache is persistent between sessions. So you should cache at the
-    // scrobble point usually, not before
-    as.cache( t );
-    
-    //FIXME I don't get it, but the timer never triggers! pls fork and fix!
-    QTimer::singleShot( 31*1000, &as, SLOT(submit()) );
-    
-    app.connect( &as, SIGNAL(status(int)), SLOT(onStatus(int)) );
-    
-    return app.exec();
-}
-
-
-#include "demo3.moc"

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/demos/demos.pro Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/CMakeLists.txt Deleted

@@ -1,125 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-# Macro to copy and rename headers
-macro(copy_header from to)
-  configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/${from}
-    ${CMAKE_CURRENT_BINARY_DIR}/lastfm/${to}
-    COPY_ONLY
-  )
-endmacro(copy_header)
-
-# Copy headers
-copy_header(core/misc.h misc.h)
-copy_header(core/XmlQuery.h XmlQuery)
-copy_header(core/UrlBuilder.h UrlBuilder)
-copy_header(global.h global.h)
-copy_header(radio/RadioTuner.h RadioTuner)
-copy_header(radio/RadioStation.h RadioStation)
-copy_header(scrobble/Audioscrobbler.h Audioscrobbler)
-copy_header(scrobble/ScrobbleCache.h ScrobbleCache)
-copy_header(scrobble/ScrobblePoint.h ScrobblePoint)
-copy_header(types/AbstractType.h AbstractType)
-copy_header(types/Album.h Album)
-copy_header(types/Artist.h Artist)
-copy_header(types/FingerprintId.h FingerprintId)
-copy_header(types/Mbid.h Mbid)
-copy_header(types/Playlist.h Playlist)
-copy_header(types/Tag.h Tag)
-copy_header(types/Track.h Track)
-copy_header(types/User.h User)
-copy_header(types/User.h UserList)
-copy_header(types/Xspf.h Xspf)
-copy_header(ws/ws.h ws.h)
-copy_header(ws/InternetConnectionMonitor.h InternetConnectionMonitor)
-copy_header(ws/NetworkAccessManager.h NetworkAccessManager)
-
-include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
-
-set(SOURCES
-    scrobble/ScrobbleCache.cpp
-    scrobble/Audioscrobbler.cpp
-    types/FingerprintId.cpp
-    types/Artist.cpp
-    types/Tag.cpp
-    types/Track.cpp
-    types/User.cpp
-    types/Xspf.cpp
-    types/Album.cpp
-    types/Playlist.cpp
-    types/Mbid.cpp
-    radio/RadioTuner.cpp
-    radio/RadioStation.cpp
-    core/UrlBuilder.cpp
-    core/misc.cpp
-    core/XmlQuery.cpp
-    ws/NetworkAccessManager.cpp
-    ws/ws.cpp
-    ws/InternetConnectionMonitor.cpp
-    ws/NetworkConnectionMonitor.cpp
-)
-
-set(MOC_HEADERS
-  scrobble/Audioscrobbler.h
-  types/Track.h
-  types/Xspf.h
-  radio/RadioTuner.h
-  ws/NetworkConnectionMonitor.h
-  ws/InternetConnectionMonitor.h
-  ws/NetworkAccessManager.h
-)
-
-if(UNIX)
-  if(APPLE)
-    set(SOURCES ${SOURCES} ws/mac/MNetworkConnectionMonitor_mac.cpp)
-    set(MOC_HEADERS ${MOC_HEADERS} ws/mac/MNetworkConnectionMonitor.h)
-  else(APPLE)
-    set(SOURCES ${SOURCES} ws/linux/LNetworkConnectionMonitor_linux.cpp)
-    set(MOC_HEADERS ${MOC_HEADERS} ws/linux/LNetworkConnectionMonitor.h)
-  endif(APPLE)
-endif(UNIX)
-if(WIN32)
-  set(SOURCES ${SOURCES} ws/win/WNetworkConnectionMonitor_win.cpp ws/win/Pac.cpp ws/win/NdisEvents.cpp )
-  set(MOC_HEADERS ${MOC_HEADERS} ws/win/WNetworkConnectionMonitor.h)
-  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../winhttp)
-endif(WIN32)
-
-qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
-
-IF( WIN32 )
-    add_definitions( -DLASTFM_LIB )
-    add_library(tomahawk_lastfm2 SHARED
-    ${SOURCES}
-    ${MOC_SOURCES}
-    )
-ELSE()
-    add_definitions(-fPIC)
-    add_library(tomahawk_lastfm2 STATIC
-    ${SOURCES}
-    ${MOC_SOURCES}
-    )
-ENDIF()
-
-target_link_libraries(tomahawk_lastfm2
-  ${QT_LIBRARIES}
-  ${QT_QTDBUS_LIBRARY}
-
-)
-
-set_target_properties(tomahawk_lastfm2 PROPERTIES COMPILE_FLAGS "-DLASTFM_OHAI_QMAKE"  )
-
-if(APPLE)
-  target_link_libraries(tomahawk_lastfm2
-    /System/Library/Frameworks/CoreFoundation.framework
-    /System/Library/Frameworks/SystemConfiguration.framework
-  )
-endif(APPLE)
-
-
-IF( WIN32 )
-    install(TARGETS tomahawk_lastfm2
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    )
-ENDIF()

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/core Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/core/README Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/core/UrlBuilder.cpp Deleted

@@ -1,83 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "UrlBuilder.h"
-#include <QRegExp>
-#include <QStringList>
-
-
-QUrl
-lastfm::UrlBuilder::url() const
-{
-    QUrl url;
-    url.setScheme( "http" );
-    url.setHost( host() );
-    url.setEncodedPath( path );
-    return url;
-}
-
-
-QByteArray //static
-lastfm::UrlBuilder::encode( QString s )
-{
-    foreach (QChar c, QList<QChar>() << '%' << '&' << '/' << ';' << '+' << '#' << '"')
-        if (s.contains( c ))
-            // the middle step may seem odd but this is what the site does
-            // eg. search for the exact string "Radiohead 2 + 2 = 5"
-            return QUrl::toPercentEncoding( s ).replace( "%20", "+" ).toPercentEncoding( "", "+" );;
-
-    return QUrl::toPercentEncoding( s.replace( ' ', '+' ), "+" );
-}
-
-
-QString //static
-lastfm::UrlBuilder::host( const QLocale& locale )
-{
-    switch (locale.language())
-    {
-        case QLocale::Portuguese: return "www.lastfm.com.br";
-        case QLocale::Turkish:    return "www.lastfm.com.tr";                    
-        case QLocale::French:     return "www.lastfm.fr";
-        case QLocale::Italian:    return "www.lastfm.it";
-        case QLocale::German:     return "www.lastfm.de";
-        case QLocale::Spanish:    return "www.lastfm.es";
-        case QLocale::Polish:     return "www.lastfm.pl";
-        case QLocale::Russian:    return "www.lastfm.ru";
-        case QLocale::Japanese:   return "www.lastfm.jp";
-        case QLocale::Swedish:    return "www.lastfm.se";
-        case QLocale::Chinese:    return "cn.last.fm";
-        default:                  return "www.last.fm";
-    }
-}
-
-
-QUrl //static
-lastfm::UrlBuilder::localize( QUrl url)
-{
-    url.setHost( url.host().replace( QRegExp("^(www.)?last.fm"), host() ) );
-    return url;
-}
-
-
-QUrl //static
-lastfm::UrlBuilder::mobilize( QUrl url )
-{
-    url.setHost( url.host().replace( QRegExp("^(www.)?last"), "m.last" ) );
-    return url;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/core/UrlBuilder.h Deleted

@@ -1,69 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_URL_BUILDER_H
-#define LASTFM_URL_BUILDER_H
-
-#include <lastfm/global.h>
-#include <QLocale>
-#include <QString>
-#include <QUrl>
-  
-
-namespace lastfm
-{
-    /** For building www.last.fm urls. We have special rules for encoding and that */
-    class LASTFM_DLLEXPORT UrlBuilder
-    {
-        QByteArray path;
-
-    public:
-        /** Careful, the base is not encoded at all, we assume it is ASCII!
-          * If you need it encoded at all you must use the slash function.
-          * eg. UrlBuilder( "user" ).slash( "mxcl" ) ==> http://last.fm/user/mxcl
-          */
-        UrlBuilder( const QString& base ) : path( '/' + base.toAscii() )
-        {}
-
-        UrlBuilder& slash( const QString& path ) { this->path += '/' + encode( path ); return *this; }
-
-        QUrl url() const;
-
-        /** www.last.fm becomes the local version, eg www.lastfm.de */
-        static QUrl localize( QUrl );
-        /** www.last.fm becomes m.last.fm, localisation is preserved */
-        static QUrl mobilize( QUrl );
-
-        /** Use this to URL encode any database item (artist, track, album). It
-          * internally calls UrlEncodeSpecialChars to double encode some special
-          * symbols according to the same pattern as that used on the website.
-          *
-          * &, /, ;, +, #
-          *
-          * Use for any urls that go to www.last.fm
-          * Do not use for ws.audioscrobbler.com
-          */
-        static QByteArray encode( QString );
-
-        /** returns eg. www.lastfm.de */
-        static QString host( const QLocale& = QLocale() );
-    };
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/core/XmlQuery.cpp Deleted

@@ -1,105 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "XmlQuery.h"
-
-#include <QCoreApplication>
-#include <QStringList>
-
-using lastfm::XmlQuery;
-
-
-XmlQuery::XmlQuery( const QByteArray& bytes ) throw( lastfm::ws::ParseError )
-{  
-    try
-    {
-        if ( !bytes.size() )
-            throw lastfm::ws::ParseError( lastfm::ws::MalformedResponse, "No data" );
-
-        if( !domdoc.setContent( bytes ) )
-            throw lastfm::ws::ParseError( lastfm::ws::MalformedResponse, "Invalid XML" );
-
-        e = domdoc.documentElement();
-
-        if (e.isNull())
-            throw lastfm::ws::ParseError( lastfm::ws::MalformedResponse, "Lfm is null" );
-
-        QString const status = e.attribute( "status" );
-        QDomElement error = e.firstChildElement( "error" );
-        uint const n = e.childNodes().count();
-
-        // no elements beyond the lfm is perfectably acceptable <-- wtf?
-        // if (n == 0) // nothing useful in the response
-        if (status == "failed" || (n == 1 && !error.isNull()) )
-            throw error.isNull()
-                    ? lastfm::ws::ParseError( lastfm::ws::MalformedResponse, "" )
-                    : lastfm::ws::ParseError( lastfm::ws::Error( error.attribute( "code" ).toUInt() ), error.text() );
-
-    }
-    catch ( lastfm::ws::ParseError e )
-    {
-        switch ( e.enumValue() )
-        {
-            case lastfm::ws::OperationFailed:
-            case lastfm::ws::InvalidApiKey:
-            case lastfm::ws::InvalidSessionKey:
-                // NOTE will never be received during the LoginDialog stage
-                // since that happens before this slot is registered with
-                // QMetaObject in App::App(). Neat :)
-                QMetaObject::invokeMethod( qApp, "onWsError", Q_ARG( lastfm::ws::Error, e.enumValue() ) );
-            default:
-                throw e;
-        }
-    }
-}
-
-
-XmlQuery
-XmlQuery::operator( const QString& name ) const
-{
-    QStringList parts = name.split( ' ' );
-    if (parts.size() >= 2)
-    {
-        QString tagName = parts0;
-        parts = parts1.split( '=' );
-        QString attributeName = parts.value( 0 );
-        QString attributeValue = parts.value( 1 );
-
-        foreach (XmlQuery e, children( tagName ))
-            if (e.e.attribute( attributeName ) == attributeValue)
-                return e;
-    }
-    XmlQuery xq( e.firstChildElement( name ), name.toUtf8().data() );
-    xq.domdoc = this->domdoc;
-    return xq;
-}
-
-
-QList<XmlQuery>
-XmlQuery::children( const QString& named ) const
-{
-    QList<XmlQuery> elements;
-    QDomNodeList nodes = e.elementsByTagName( named );
-    for (int x = 0; x < nodes.count(); ++x) {
-        XmlQuery xq( nodes.at( x ).toElement() );
-        xq.domdoc = this->domdoc;
-        elements += xq;
-    }
-    return elements;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/core/XmlQuery.h Deleted

@@ -1,78 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_XMLQUERY_H
-#define LASTFM_XMLQUERY_H
-
-#include <lastfm/global.h>
-#include <lastfm/ws.h>
-#include <QDomDocument>
-#include <QDomElement>
-
-namespace lastfm
-{
-    /** Qt's XmlQuery implementation is totally unimpressive, so this is a 
-      * hack that feels like jQuery */
-    class LASTFM_DLLEXPORT XmlQuery
-    {
-        QDomDocument domdoc;
-        QDomElement e;
-
-    public:
-        /** we assume the bytearray is an XML document, this object will then
-          * represent the documentElement of that document, eg. if this is a
-          * Last.fm webservice response:
-          *
-          * XmlQuery xq = lastfm::ws::parse(response);
-          * qDebug() << xq"artist".text()
-          *
-          * Notice the lfm node is not referenced, that is because it is the
-          * document-element of the XML document.
-          */
-        XmlQuery( const QByteArray& ) throw( lastfm::ws::ParseError );
-        
-        XmlQuery( const QDomElement& e, const char* name = "" ) : e( e )
-        {
-            if (e.isNull()) qWarning() << "Expected node absent:" << name;
-        }
-
-        /** Selects a DIRECT child element, you can specify attributes like so:
-          *
-          * e"element""element attribute=value".text();
-          */
-        XmlQuery operator( const QString& name ) const;
-        QString text() const { return e.text(); }
-        QString attribute( const QString& name ) const{ return e.attribute( name ); }
-        
-        /** selects all children with specified name, recursively */
-        QList<XmlQuery> children( const QString& named ) const;
-
-        operator QDomElement() const { return e; }
-    };
-}
-
-inline QDebug operator<<( QDebug d, const lastfm::XmlQuery& xq )
-{
-    QString s;
-    QTextStream t( &s, QIODevice::WriteOnly );
-    QDomElement(xq).save( t, 2 );
-    return d << s;
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/core/misc.cpp Deleted

@@ -1,175 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "misc.h"
-#include <QDir>
-#ifdef WIN32
-    #include <shlobj.h>
-#endif
-#ifdef Q_WS_MAC
-    #include <Carbon/Carbon.h>
-#endif
-
-
-#ifdef Q_WS_MAC
-QDir
-lastfm::dir::bundle()
-{
-    // Trolltech provided example
-    CFURLRef appUrlRef = CFBundleCopyBundleURL( CFBundleGetMainBundle() );
-    CFStringRef macPath = CFURLCopyFileSystemPath( appUrlRef, kCFURLPOSIXPathStyle );
-    QString path = CFStringToQString( macPath );
-    CFRelease(appUrlRef);
-    CFRelease(macPath);
-    return QDir( path );
-}
-#endif
-
-
-static QDir dataDotDot()
-{
-#ifdef WIN32
-    if ((QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based) == 0)
-    {
-        // Use this for non-DOS-based Windowses
-        char pathMAX_PATH;
-        HRESULT h = SHGetFolderPathA( NULL, 
-                                      CSIDL_LOCAL_APPDATA | CSIDL_FLAG_CREATE,
-                                      NULL, 
-                                      0, 
-                                      path );
-        if (h == S_OK)
-            return QString::fromLocal8Bit( path );
-    }
-    return QDir::home();
-
-#elif defined(Q_WS_MAC)
-    return QDir::home().filePath( "Library/Application Support" );
-
-#elif defined(Q_WS_X11)
-    return QDir::home().filePath( ".local/share" );
-
-#else
-    return QDir::home();
-#endif
-}
-
-
-QDir
-lastfm::dir::runtimeData()
-{
-    return dataDotDot().filePath( "Last.fm" );
-}
-
-
-QDir
-lastfm::dir::logs()
-{
-#ifdef Q_WS_MAC
-    return QDir::home().filePath( "Library/Logs/Last.fm" );
-#else
-    return runtimeData();    
-#endif
-}
-
-
-QDir
-lastfm::dir::cache()
-{
-#ifdef Q_WS_MAC
-    return QDir::home().filePath( "Library/Caches/Last.fm" );
-#else
-    return runtimeData().filePath( "cache" );
-#endif
-}
-
-
-#ifdef WIN32
-QDir
-lastfm::dir::programFiles()
-{
-    char pathMAX_PATH;
-
-    // TODO: this call is dependant on a specific version of shell32.dll.
-    // Need to degrade gracefully. Need to bundle SHFolder.exe with installer
-    // and execute it on install for this to work on Win98.
-    HRESULT h = SHGetFolderPathA( NULL,
-                                 CSIDL_PROGRAM_FILES, 
-                                 NULL,
-                                 0, // current path
-                                 path );
-
-    if (h != S_OK)
-    {
-        qCritical() << "Couldn't get Program Files dir. Possibly Win9x?";
-        return QDir();
-    }
-
-    return QString::fromLocal8Bit( path );
-}
-#endif
-
-#ifdef Q_WS_MAC
-CFStringRef
-lastfm::QStringToCFString( const QString &s )
-{
-    return CFStringCreateWithCharacters( 0, (UniChar*)s.unicode(), s.length() );
-}
-
-QByteArray
-lastfm::CFStringToUtf8( CFStringRef s )
-{
-    QByteArray result;
-
-    if (s != NULL) 
-    {
-        CFIndex length;
-        length = CFStringGetLength( s );
-        length = CFStringGetMaximumSizeForEncoding( length, kCFStringEncodingUTF8 ) + 1;
-        char* buffer = new charlength;
-
-        if (CFStringGetCString( s, buffer, length, kCFStringEncodingUTF8 ))
-            result = QByteArray( buffer );
-        else
-            qWarning() << "CFString conversion failed.";
-
-        delete buffer;
-    }
-
-    return result;
-}
-#endif
-
-#if 0
-// this is a Qt implementation I found
-QString cfstring2qstring(CFStringRef str)
-{
-    if(!str)
-        return QString();
-    
-    CFIndex length = CFStringGetLength(str);
-    if(const UniChar *chars = CFStringGetCharactersPtr(str))
-        return QString((QChar *)chars, length);
-    UniChar *buffer = (UniChar*)malloc(length * sizeof(UniChar));
-    CFStringGetCharacters(str, CFRangeMake(0, length), buffer);
-    QString ret((QChar *)buffer, length);
-    free(buffer);
-    return ret;
-}
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/core/misc.h Deleted

@@ -1,111 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_MISC_H
-#define LASTFM_MISC_H
-
-#include <lastfm/global.h>
-#include <QCryptographicHash>
-#include <QDir>
-#include <QString>
-
-#ifdef Q_WS_MAC
-typedef const struct __CFString* CFStringRef;
-#endif
-
-namespace lastfm
-{
-    namespace dir
-    {
-    #ifdef Q_WS_WIN
-        LASTFM_DLLEXPORT QDir programFiles();
-    #endif
-    #ifdef Q_WS_MAC
-        LASTFM_DLLEXPORT QDir bundle();
-    #endif
-        LASTFM_DLLEXPORT QDir runtimeData();
-        LASTFM_DLLEXPORT QDir cache();
-        LASTFM_DLLEXPORT QDir logs();
-    }
-   
-#ifdef Q_WS_MAC 
-    LASTFM_DLLEXPORT QByteArray CFStringToUtf8( CFStringRef );
-    LASTFM_DLLEXPORT CFStringRef QStringToCFString( const QString& );
-    inline QString CFStringToQString( CFStringRef s );
-#endif
-
-    inline const char* platform()
-    {
-        #ifdef Q_WS_WIN
-        switch (QSysInfo::WindowsVersion)
-        {
-            case QSysInfo::WV_32s:        return "Windows 3.1 with Win32s";
-            case QSysInfo::WV_95:         return "Windows 95";
-            case QSysInfo::WV_98:         return "Windows 98";
-            case QSysInfo::WV_Me:         return "Windows Me";
-            case QSysInfo::WV_DOS_based:  return "MS-DOS-based Windows";
-
-            case QSysInfo::WV_NT:         return "Windows NT";
-            case QSysInfo::WV_2000:       return "Windows 2000";
-            case QSysInfo::WV_XP:         return "Windows XP";
-            case QSysInfo::WV_2003:       return "Windows Server 2003";
-            case QSysInfo::WV_VISTA:      return "Windows Vista";
-            case QSysInfo::WV_NT_based:   return "NT-based Windows";
-
-            case QSysInfo::WV_CE:         return "Windows CE";
-            case QSysInfo::WV_CENET:      return "Windows CE.NET";
-            case QSysInfo::WV_CE_based:   return "CE-based Windows";
-
-            default:                      return "Unknown";
-        }
-        #elif defined Q_WS_MAC
-        switch (QSysInfo::MacintoshVersion)
-        {
-            case QSysInfo::MV_Unknown:    return "Unknown Mac";
-            case QSysInfo::MV_9:          return "Mac OS 9";
-            case QSysInfo::MV_10_0:       return "Mac OS X 10.0";
-            case QSysInfo::MV_10_1:       return "Mac OS X 10.1";
-            case QSysInfo::MV_10_2:       return "Mac OS X 10.2";
-            case QSysInfo::MV_10_3:       return "Mac OS X 10.3";
-            case QSysInfo::MV_10_4:       return "Mac OS X 10.4";
-            case QSysInfo::MV_10_5:       return "Mac OS X 10.5";
-
-            default:                      return "Unknown";
-        }
-        #elif defined Q_WS_X11
-            return "UNIX X11";
-        #else
-            return "Unknown";
-        #endif
-    }
-    
-    inline QString md5( const QByteArray& src )
-    {
-        QByteArray const digest = QCryptographicHash::hash( src, QCryptographicHash::Md5 );
-        return QString::fromLatin1( digest.toHex() ).rightJustified( 32, '0' ).toLower();
-    }
-}
-
-#ifdef Q_WS_MAC
-inline QString lastfm::CFStringToQString( CFStringRef s )
-{
-    return QString::fromUtf8( CFStringToUtf8( s ) );
-}
-#endif
-#endif //LASTFM_MISC_H

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/CMakeLists.txt Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/Collection.cpp Deleted

@@ -1,267 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "Collection.h"
-#include "../core/misc.h"
-#include <QCoreApplication>
-#include <QFileInfo>
-#include <QMutexLocker>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QStringList>
-#include <QVariant>
-
-static const int k_collectionDbVersion = 1;
-
-// Singleton instance needs to be initialised
-Collection* Collection::s_instance = NULL;
-
-
-Collection::Collection()
-{
-    m_db = QSqlDatabase::addDatabase( "QSQLITE", "collection" );
-    m_db.setDatabaseName( lastfm::dir::runtimeData().filePath( "collection.db" ) );
-    
-    if (!m_db.open()) {
-        qDebug() << m_db.lastError();
-        return;
-    }
-
-    if (!m_db.isValid()) {
-        qWarning() << "collection.db connection is not valid";
-        return;
-    }
-
-    if (!m_db.tables().contains( "files" ))
-    {
-        qDebug() << "Creating Collection database";
-
-        query( "CREATE TABLE artists ("
-                    "id          INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    "serverUid   INTEGER,"
-                    "lcName      TEXT NOT NULL,"
-                    "displayName TEXT NOT NULL );" );
-
-        query( "CREATE TABLE albums ("
-                    "id            INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    "serverUid     INTEGER,"
-                    "lcName        TEXT NOT NULL,"
-                    "displayName   TEXT NOT NULL,"
-                    "primaryArtist INTEGER NOT NULL );" );
-
-        query( "CREATE UNIQUE INDEX album_names_idx ON albums ( primaryArtist, lcName );" );
-
-        query( "CREATE TABLE tracks ("
-                    "id                INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    "lcName            TEXT NOT NULL,"
-                    "displayName       TEXT NOT NULL,"
-                    "primaryArtist     INTEGER NOT NULL,"
-                    "primaryAlbum      INTEGER );" );
-
-        query( "CREATE UNIQUE INDEX track_names_idx ON tracks ( primaryArtist, lcName );" );
-
-        query( "CREATE TABLE files ("
-                    "id                INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    "uri               TEXT NOT NULL,"
-                    "track             INTEGER NOT NULL,"
-                    "bitrate           INTEGER,"
-                    "samplerate        INTEGER,"
-                    "duration          INTEGER,"
-                    "filesize          INTEGER,"
-                    "source            INTEGER,"
-                    "modificationDate  INTEGER,"
-                    "lastPlayDate      INTEGER,"
-                    "playCounter       INTEGER,"
-                    "mbId              VARCHAR( 36 ),"
-                    "fpId              INTEGER );" );
-
-        query( "CREATE UNIQUE INDEX files_uri_idx ON files ( uri );" );
-        query( "CREATE INDEX files_track_idx ON files ( track );" );
-        query( "CREATE INDEX files_fpId_idx ON files ( fpId );" );
-        query( "CREATE INDEX files_source_idx ON files ( source );" );
-
-        query( "CREATE TABLE sources ("
-                    "id          INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    "name        TEXT UNIQUE,"
-                    "available   INTEGER,"
-                    "host        TEXT,"
-                    "cost        INTEGER );" );
-
-        query( "CREATE TABLE genres ("
-                    "id          INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    "name        TEXT UNIQUE );" );
-
-        query( "CREATE TABLE labels ("
-                    "id          INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    "serverUid   INTEGER UNIQUE,"
-                    "name        TEXT );" );
-    }
-    
-    int const v = version();
-    if ( v < k_collectionDbVersion )
-    {
-        qDebug() << "Upgrading Collection::db from" << v << "to" << k_collectionDbVersion;
-
-        /**********************************************
-         * README!!!!!!!                              *
-         * Ensure you use v < x                       *
-         * Ensure you do upgrades in ascending order! *
-         **********************************************/
-    
-        if ( v < 1 )
-        {
-            // Norman discovered that he stored some fpId's wrong prior to 17th December 2007
-            // So we have to wipe the fpIds for databases without the metadata table
-            // we didn't store version information before that, which was a bad decision wasn't it?
-
-            // this will trigger refingerprinting of every track
-            query( "UPDATE files SET fpId = NULL;" );
-
-            query( "CREATE TABLE metadata ("
-                        "key         TEXT UNIQUE NOT NULL,"
-                        "value       TEXT );" );
-
-            query( "INSERT INTO metadata (key, value) VALUES ('version', '1');" );
-        }
-
-
-        // do last, update DB version number
-        query( "UPDATE metadata set key='version', value='"
-                    + QString::number( k_collectionDbVersion ) + "';" );
-    }
-}
-
-
-Collection& //static
-Collection::instance()
-{
-    static QMutex mutex;
-    QMutexLocker locker( &mutex );
-    
-    if ( !s_instance )
-    {
-        s_instance = new Collection;
-        qAddPostRoutine(destroy);
-    }
-    
-    return *s_instance;
-}
-
-
-void //static
-Collection::destroy()
-{
-    delete s_instance;
-    QSqlDatabase::removeDatabase( "collection" );
-}
-
-
-int
-Collection::version() const 
-{   
-    QSqlQuery sql( m_db );
-    sql.exec( "SELECT value FROM metadata WHERE key='version';" );
-
-    if ( sql.next() )
-    {
-        return sql.value( 0 ).toInt();
-    }
-
-    return 0;
-}
-
-
-bool
-Collection::query( const QString& queryToken )
-{
-    QSqlQuery query( m_db );
-    query.exec( queryToken );
-
-    if ( query.lastError().isValid() )
-    {
-        qDebug() << "SQL query failed:" << query.lastQuery() << endl
-                 << "SQL error was:"    << query.lastError().databaseText() << endl
-                 << "SQL error type:"   << query.lastError().type();
-
-        return false;
-    }
-
-    return true;
-}
-
-
-QString
-Collection::fileURI( const QString& filePath )
-{
-    QString prefix( "file:/" );
-
-#ifdef WIN32
-    prefix = "file://";
-#endif
-
-    return prefix + QFileInfo( filePath ).absoluteFilePath();
-}
-
-
-QString
-Collection::getFingerprintId( const QString& filePath )
-{
-    QSqlQuery query( m_db );
-    query.prepare( "SELECT fpId FROM files WHERE uri = :uri" );
-    query.bindValue( ":uri", fileURI( filePath ) );
-
-    query.exec();
-    if ( query.lastError().isValid() )
-    {
-        qDebug() << "SQL query failed:" << query.lastQuery() << endl
-                 << "SQL error was:"    << query.lastError().databaseText() << endl
-                 << "SQL error type:"   << query.lastError().type();
-    }
-    else if (query.next())
-        return query.value( 0 ).toString();
-
-    return "";
-}
-
-
-bool
-Collection::setFingerprintId( const QString& filePath, QString fpId )
-{
-    bool isNumeric;
-    int intFpId = fpId.toInt( &isNumeric );
-    Q_ASSERT( isNumeric );
-
-    QSqlQuery query( m_db );
-    query.prepare( "REPLACE INTO files ( uri, track, fpId ) VALUES ( :uri, 0, :fpId )" );
-    query.bindValue( ":uri", fileURI( filePath ) );
-    query.bindValue( ":fpId", intFpId );
-    query.exec();
-
-    if ( query.lastError().isValid() )
-    {
-        qDebug() << "SQL query failed:" << query.lastQuery() << endl
-                 << "SQL error was:"    << query.lastError().databaseText() << endl
-                 << "SQL error type:"   << query.lastError().type();
-
-        return false;
-    }
-
-    return true;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/Collection.h Deleted

@@ -1,59 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/** Class that we use to store fingerprints, basically
-  */
-
-#ifndef COLLECTION_H
-#define COLLECTION_H
-
-#include <QObject>
-#include <QSqlDatabase>
-
-
-/** @author: <chris@last.fm> */
-class Collection
-{
-public:
-    static Collection& instance();
-
-    /** \brief Temp method: Gets a fingerprint id. Returns "" if none found. */
-    QString getFingerprintId( const QString& filePath );
-
-    /** \brief Temp method: Sets a fingerprint id. */
-    bool setFingerprintId( const QString& filePath, QString fpId );
-
-private:
-    Collection();
-
-    /** the database version
-        * version 0: up until 1.4.1
-        * version 1: from 1.4.2 */
-    int version() const;
-    bool query( const QString& queryToken );
-    QString fileURI( const QString& filePath );
-
-    static void destroy();    
-    
-    static Collection* s_instance;
-    QSqlDatabase m_db;
-};
-
-#endif // COLLECTION_H

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/EXAMPLE.cpp Deleted

@@ -1,76 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <lastfm/Fingerprint>
-#include <lastfm/FingerprintId>
-#include <QtCore>
-#include <QtNetwork>
-
-using namespace lastfm;
-
-
-static void finish( QNetworkReply* reply )
-{
-    QEventLoop loop;
-    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
-    loop.exec();
-}
-
-
-int main( int argc, char** argv )
-{
-    QCoreApplication app( argc, argv );
-    
-    // these fields are required
-    MutableTrack t;
-    t.setArtist( "Air" );
-    t.setTitle( "Redhead Girl" );
-    t.setAlbum( "Pocket Symphony" );
-    t.setUrl( QUrl::fromLocalFile( "/Users/mxcl/Music/iTunes/iTunes Music/Air/Pocket Symphony/1-11 Redhead Girl.mp3") );
-    
-    try
-    {
-        Fingerprint fp( t );
-        
-        // we cache FingerprintIds in an sqlite3 db, as the generate() function
-        // is expensive
-        if (fp.id().isNull())
-        {
-            // this generates the full fingerprint hash, which is about 20kB
-            fp.generate();
-            
-            // this asks Last.fm for a FingerprintId
-            // the finish function is a Qt hack to allow syncronous HTTP
-            finish( fp.submit() );
-            
-            // the decode step sets the FingerprintId
-            // the FingerprintId is required to obtain suggestions
-            // id will now be valid, or this function throws
-            fp.decode( reply );
-        }
-
-        finish( fp.id().getSuggestions() );
-
-        qDebug() << FingerprintId::getSuggestions( reply );
-    }
-    catch (Fingerprint::Error e)
-    {
-        qWarning() << e; //TODO enum debug thing
-    }    
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/Fingerprint.cpp Deleted

@@ -1,300 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "Fingerprint.h"
-#include "FingerprintableSource.h"
-#include "Collection.h"
-#include "Sha256.h"
-#include "fplib/FingerprintExtractor.h"
-#include "../ws/ws.h"
-#include <QFileInfo>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QStringList>
-#include <fstream>
-
-using lastfm::Track;
-
-static const uint k_bufferSize = 1024 * 8;
-static const int k_minTrackDuration = 30;
-
-
-lastfm::Fingerprint::Fingerprint( const Track& t )
-                   : m_track( t )
-                   , m_id( -1 ), m_duration( 0 )
-                   , m_complete( false )
-{
-    QString id = Collection::instance().getFingerprintId( t.url().toLocalFile() );   
-    if (id.size()) {
-        bool b;
-        m_id = id.toInt( &b );
-        if (!b) m_id = -1;
-    }
-}
-
-
-void
-lastfm::Fingerprint::generate( FingerprintableSource* ms ) throw( Error )
-{
-    //TODO throw if we can't get required metadata from the track object
-    
-//TODO    if (!QFileInfo( path ).isReadable())
-//TODO        throw ReadError;
-
-    int sampleRate, bitrate, numChannels;
-
-    if ( !ms )
-        throw ReadError;
-
-    try
-    {
-        ms->init( m_track.url().toLocalFile() );
-        ms->getInfo( m_duration, sampleRate, bitrate, numChannels );
-    }
-    catch (std::exception& e)
-    {
-        qWarning() << e.what();
-        throw HeadersError;
-    }
-    
-
-    if (m_duration < k_minTrackDuration)
-        throw TrackTooShortError;
-    
-    ms->skipSilence();
-    
-    bool fpDone = false;
-    fingerprint::FingerprintExtractor* extractor;
-    try
-    {
-        extractor = new fingerprint::FingerprintExtractor;
-        
-        if (m_complete)
-        {
-            extractor->initForFullSubmit( sampleRate, numChannels );
-        }
-        else 
-        {
-            extractor->initForQuery( sampleRate, numChannels, m_duration );
-            
-            // Skippety skip for as long as the skipper sez (optimisation)
-            ms->skip( extractor->getToSkipMs() );
-            float secsToSkip = extractor->getToSkipMs() / 1000.0f;
-            fpDone = extractor->process( 0,
-                                         (size_t) sampleRate * numChannels * secsToSkip,
-                                         false );
-        }
-    }
-    catch (std::exception& e)
-    {
-        qWarning() << e.what();
-        throw DecodeError;
-    }
-    
-    const size_t PCMBufSize = 131072; 
-    short* pPCMBuffer = new shortPCMBufSize;
-    
-    while (!fpDone)
-    {
-        size_t readData = ms->updateBuffer( pPCMBuffer, PCMBufSize );
-        if (readData == 0)
-            break;
-        
-        try
-        {
-            fpDone = extractor->process( pPCMBuffer, readData, ms->eof() );
-        }
-        catch ( const std::exception& e )
-        {
-            qWarning() << e.what();
-            delete ms;
-            delete pPCMBuffer;
-            throw InternalError;
-        }
-    }
-    
-    delete pPCMBuffer;
-    
-    if (!fpDone)
-        throw InternalError;
-    
-    // We succeeded
-    std::pair<const char*, size_t> fpData = extractor->getFingerprint();
-    
-    if (fpData.first == NULL || fpData.second == 0)
-        throw InternalError;
-    
-    // Make a deep copy before extractor gets deleted
-    m_data = QByteArray( fpData.first, fpData.second );
-    delete extractor;
-}
-
-
-static QString sha256( const QString& path )
-{
-    // no clue why this is static, there was no comment when I refactored it
-    // initially --mxcl
-    static uint8_t pBufferSHA_BUFFER_SIZE+7;
-    
-    unsigned char hashSHA256_HASH_SIZE;
-
-    {
-        QByteArray path8 = QFile::encodeName( path );
-        std::ifstream inFile( path8.data(), std::ios::binary);
-        
-        SHA256Context sha256;
-        SHA256Init( &sha256 );
-        
-        uint8_t* pMovableBuffer = pBuffer;
-        
-        // Ensure it is on a 64-bit boundary. 
-        INTPTR offs;
-        if ((offs = reinterpret_cast<INTPTR>(pBuffer) & 7L))
-            pMovableBuffer += 8 - offs;
-        
-        unsigned int len;
-        
-        for (;;)
-        {
-            inFile.read( reinterpret_cast<char*>(pMovableBuffer), SHA_BUFFER_SIZE );
-            len = inFile.gcount();
-            
-            if (len == 0)
-                break;
-            
-            SHA256Update( &sha256, pMovableBuffer, len );
-        }
-        
-        SHA256Final( &sha256, hash );
-    }
-
-    QString sha;
-    for (int i = 0; i < SHA256_HASH_SIZE; ++i) 
-    {
-        QString hex = QString("%1").arg(uchar(hashi), 2, 16,
-                                        QChar('0'));
-        sha.append(hex);
-    }
-
-    return sha;
-}
-
-
-static QByteArray number( uint n )
-{
-    return n ? QByteArray::number( n ) : "";
-}
-
-QNetworkReply*
-lastfm::Fingerprint::submit() const
-{    
-    if (m_data.isEmpty())
-        return 0;
-    
-    //Parameters understood by the server according to the MIR team: 
-    //{ "trackid", "recordingid", "artist", "album", "track", "duration", 
-    //  "tracknum", "username", "sha256", "ip", "fpversion", "mbid", 
-    //  "filename", "genre", "year", "samplerate", "noupdate", "fulldump" }
-    
-    Track const t = m_track;
-    QString const path = t.url().toLocalFile();
-    QFileInfo const fi( path );
-
-    #define e( x ) QUrl::toPercentEncoding( x )
-    QUrl url( "http://www.last.fm/fingerprint/query/" );
-    url.addEncodedQueryItem( "artist", e(t.artist()) );
-    url.addEncodedQueryItem( "album", e(t.album()) );
-    url.addEncodedQueryItem( "track", e(t.title()) );
-    url.addEncodedQueryItem( "duration", number( m_duration > 0 ? m_duration : t.duration() ) );
-    url.addEncodedQueryItem( "mbid", e(t.mbid()) );
-    url.addEncodedQueryItem( "filename", e(fi.completeBaseName()) );
-    url.addEncodedQueryItem( "fileextension", e(fi.completeSuffix()) );
-    url.addEncodedQueryItem( "tracknum", number( t.trackNumber() ) );
-    url.addEncodedQueryItem( "sha256", sha256( path ).toAscii() );
-    url.addEncodedQueryItem( "time", number(QDateTime::currentDateTime().toTime_t()) );
-    url.addEncodedQueryItem( "fpversion", QByteArray::number((int)fingerprint::FingerprintExtractor::getVersion()) );
-    url.addEncodedQueryItem( "fulldump", m_complete ? "true" : "false" );
-    url.addEncodedQueryItem( "noupdate", "false" );
-    #undef e
-
-    //FIXME: talk to mir about submitting fplibversion
-
-    QNetworkRequest request( url );
-    request.setHeader( QNetworkRequest::ContentTypeHeader, "multipart/form-data; boundary=----------------------------8e61d618ca16" );
-
-    QByteArray bytes;
-    bytes += "------------------------------8e61d618ca16\r\n";
-    bytes += "Content-Disposition: ";
-    bytes += "form-data; name=\"fpdata\"";
-    bytes += "\r\n\r\n";
-    bytes += m_data;
-    bytes += "\r\n";
-    bytes += "------------------------------8e61d618ca16--\r\n";
-
-    qDebug() << url;
-    qDebug() << "Fingerprint size:" << bytes.size() << "bytes";
-
-    return lastfm::nam()->post( request, bytes );
-}
-
-
-void
-lastfm::Fingerprint::decode( QNetworkReply* reply, bool* complete_fingerprint_requested ) throw( Error )
-{
-    // The response data will consist of a number and a string.
-    // The number is the fpid and the string is either FOUND or NEW
-    // (or NOT FOUND when noupdate was used). NEW means we should
-    // schedule a full fingerprint.
-    //
-    // In the case of an error, there will be no initial number, just
-    // an error string.
-    
-    QString const response( reply->readAll() );
-    QStringList const list = response.split( ' ' );
-
-    QString const fpid = list.value( 0 );
-    QString const status = list.value( 1 );
-       
-    if (response.isEmpty() || list.count() < 2 || response == "No response to client error")
-        goto bad_response;
-    if (list.count() != 2)
-        qWarning() << "Response looks bad but continuing anyway:" << response;
-
-    {
-        // so variables go out of scope before jump to label
-        // otherwise compiler error on GCC 4.2
-        bool b;
-        uint fpid_as_uint = fpid.toUInt( &b );
-        if (!b) goto bad_response;
-    
-        Collection::instance().setFingerprintId( m_track.url().toLocalFile(), fpid );
-    
-        if (complete_fingerprint_requested)
-            *complete_fingerprint_requested = (status == "NEW");
-
-        m_id = (int)fpid_as_uint;
-        return;
-    }
-
-bad_response:
-    qWarning() << "Response is bad:" << response;
-    throw BadResponseError;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/Fingerprint.h Deleted

@@ -1,116 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_FINGERPRINT_H
-#define LASTFM_FINGERPRINT_H
-
-#include <lastfm/FingerprintId>
-#include <lastfm/Track>
-
-
-namespace lastfm
-{
-    class LASTFM_FINGERPRINT_DLLEXPORT Fingerprint
-    {
-        lastfm::Track m_track;
-        QByteArray m_data;
-        int m_id;
-        int m_duration;
-
-    protected:
-        bool m_complete;
-
-    public:
-        /** represents a partial fingerprint of 20 seconds of music, this is 
-          * considered 99.9999...9999% unique and so we use it for most stuff as 
-          * it is much quicker than a complete fingerprint, still though, you
-          * should do the generate step in a thread. */
-        Fingerprint( const lastfm::Track& );
-    
-        /** if the id isNull(), then you'll need to do generate, submit and decode */
-        FingerprintId id() const { return m_id; }
-
-        /** The actual data that is the fingerprint, this is about 70kB or so,
-          * there isn't anything in it until you call generate. */
-        QByteArray data() const { return m_data; }
-
-        enum Error
-        {
-            ReadError = 0,
-
-            /** failed to extract samplerate, bitrate, channels, duration etc */
-            HeadersError,
-
-            DecodeError,
-        
-            /** there is a minimum track duration for fingerprinting */
-            TrackTooShortError,
-            
-            /** the fingerprint service went wrong, or we submitted bad data, 
-              * or myabe the request failed, whatever, we couldn't parse the 
-              * result */
-            BadResponseError,
-        
-            /** sorry, liblastfm sucks, report bug with log! */
-            InternalError            
-        };
-
-        /** This is CPU intensive, do it in a thread in your GUI application */
-        void generate( FingerprintableSource* ) throw( Error );
-
-        /** Submits the fingerprint data to Last.fm in order to get a FingerprintId
-          * back. You need to wait for the QNetworkReply to finish before you can
-          * pass it to decode clearly. */
-        QNetworkReply* submit() const;
-
-        /** Pass a finished reply from submit(), if the response is sound, id()
-          * will be valid. Otherwise we will throw. You always get a valid id
-          * or a throw.
-          */
-        void decode( QNetworkReply*, bool* lastfm_needs_a_complete_fingerprint = 0 ) throw( Error );
-    };
-
-
-    class CompleteFingerprint : public Fingerprint
-    {
-    public:
-        CompleteFingerprint( const lastfm::Track& t ) : Fingerprint( t )
-        {
-            m_complete = true;
-        }
-    };
-}
-
-
-inline QDebug operator<<( QDebug d, lastfm::Fingerprint::Error e )
-{
-    #define CASE(x) case lastfm::Fingerprint::x: return d << #x;
-    switch (e)
-    {
-        CASE(ReadError)
-        CASE(HeadersError)
-        CASE(DecodeError)
-        CASE(TrackTooShortError)
-        CASE(BadResponseError)
-        CASE(InternalError)
-    }
-    #undef CASE
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/FingerprintableSource.h Deleted

@@ -1,48 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef LASTFM_FINGERPRINTABLE_SOURCE_H
-#define LASTFM_FINGERPRINTABLE_SOURCE_H
-
-#include <lastfm/global.h>
-#include <QString>
-
-namespace lastfm
-{
-    class LASTFM_FINGERPRINT_DLLEXPORT FingerprintableSource
-    {
-    public:
-        /** do all initialisation here and throw if there is problems */
-        virtual void init( const QString& path ) = 0;
-
-        virtual void getInfo( int& lengthSecs, int& samplerate, int& bitrate, int& nchannels ) = 0;
-
-        /** put a chunk of PCM data in pBuffer, don't exceed size, return the
-          * number of bytes you put in the buffer */
-        virtual int updateBuffer( signed short* buffer, size_t bufferSize ) = 0;
-
-        virtual void skip( const int mSecs ) = 0;
-        virtual void skipSilence( double silenceThreshold = 0.0001 ) = 0;
-
-        virtual bool eof() const = 0;
-    };
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/Sha256.cpp Deleted

@@ -1,480 +0,0 @@
-/*-
- * Copyright (c) 2001-2003 Allan Saddi <allan@saddi.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY ALLAN SADDI AND HIS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL ALLAN SADDI OR HIS CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: sha256.c 680 2003-07-25 21:57:49Z asaddi $
- */
-
-/*
- * Define WORDS_BIGENDIAN if compiling on a big-endian architecture.
- *
- * Define SHA256_TEST to test the implementation using the NIST's
- * sample messages. The output should be:
- *
- *   ba7816bf 8f01cfea 414140de 5dae2223 b00361a3 96177a9c b410ff61 f20015ad
- *   248d6a61 d20638b8 e5c02693 0c3e6039 a33ce459 64ff2167 f6ecedd4 19db06c1
- *   cdc76e5c 9914fb92 81a1c7e2 84d73e67 f1809a48 a497200e 046d39cc c7112cd0
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-
-#include <string.h>
-
-#include "Sha256.h"
-
-#ifndef lint
-static const char rcsid =
-    "$Id: sha256.c 680 2003-07-25 21:57:49Z asaddi $";
-#endif /* !lint */
-
-#define ROTL(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-#define ROTR(x, n) (((x) >> (n)) | ((x) << (32 - (n))))
-
-#define Ch(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
-#define Maj(x, y, z) (((x) & ((y) | (z))) | ((y) & (z)))
-#define SIGMA0(x) (ROTR((x), 2) ^ ROTR((x), 13) ^ ROTR((x), 22))
-#define SIGMA1(x) (ROTR((x), 6) ^ ROTR((x), 11) ^ ROTR((x), 25))
-#define sigma0(x) (ROTR((x), 7) ^ ROTR((x), 18) ^ ((x) >> 3))
-#define sigma1(x) (ROTR((x), 17) ^ ROTR((x), 19) ^ ((x) >> 10))
-
-#define DO_ROUND() { \
-  t1 = h + SIGMA1(e) + Ch(e, f, g) + *(Kp++) + *(W++); \
-  t2 = SIGMA0(a) + Maj(a, b, c); \
-  h = g; \
-  g = f; \
-  f = e; \
-  e = d + t1; \
-  d = c; \
-  c = b; \
-  b = a; \
-  a = t1 + t2; \
-}
-
-static const uint32_t K64 = {
-  0x428a2f98L, 0x71374491L, 0xb5c0fbcfL, 0xe9b5dba5L,
-  0x3956c25bL, 0x59f111f1L, 0x923f82a4L, 0xab1c5ed5L,
-  0xd807aa98L, 0x12835b01L, 0x243185beL, 0x550c7dc3L,
-  0x72be5d74L, 0x80deb1feL, 0x9bdc06a7L, 0xc19bf174L,
-  0xe49b69c1L, 0xefbe4786L, 0x0fc19dc6L, 0x240ca1ccL,
-  0x2de92c6fL, 0x4a7484aaL, 0x5cb0a9dcL, 0x76f988daL,
-  0x983e5152L, 0xa831c66dL, 0xb00327c8L, 0xbf597fc7L,
-  0xc6e00bf3L, 0xd5a79147L, 0x06ca6351L, 0x14292967L,
-  0x27b70a85L, 0x2e1b2138L, 0x4d2c6dfcL, 0x53380d13L,
-  0x650a7354L, 0x766a0abbL, 0x81c2c92eL, 0x92722c85L,
-  0xa2bfe8a1L, 0xa81a664bL, 0xc24b8b70L, 0xc76c51a3L,
-  0xd192e819L, 0xd6990624L, 0xf40e3585L, 0x106aa070L,
-  0x19a4c116L, 0x1e376c08L, 0x2748774cL, 0x34b0bcb5L,
-  0x391c0cb3L, 0x4ed8aa4aL, 0x5b9cca4fL, 0x682e6ff3L,
-  0x748f82eeL, 0x78a5636fL, 0x84c87814L, 0x8cc70208L,
-  0x90befffaL, 0xa4506cebL, 0xbef9a3f7L, 0xc67178f2L
-};
-
-#ifndef RUNTIME_ENDIAN
-
-#ifdef WORDS_BIGENDIAN
-
-#define BYTESWAP(x) (x)
-#define BYTESWAP64(x) (x)
-
-#else /* WORDS_BIGENDIAN */
-
-#define BYTESWAP(x) ((ROTR((x), 8) & 0xff00ff00L) | \
-             (ROTL((x), 8) & 0x00ff00ffL))
-#define BYTESWAP64(x) _byteswap64(x)
-
-static inline uint64_t _byteswap64(uint64_t x)
-{
-  uint32_t a = x >> 32;
-  uint32_t b = (uint32_t) x;
-  return ((uint64_t) BYTESWAP(b) << 32) | (uint64_t) BYTESWAP(a);
-}
-
-#endif /* WORDS_BIGENDIAN */
-
-#else /* !RUNTIME_ENDIAN */
-
-#define BYTESWAP(x) _byteswap(sc->littleEndian, x)
-#define BYTESWAP64(x) _byteswap64(sc->littleEndian, x)
-
-#define _BYTESWAP(x) ((ROTR((x), 8) & 0xff00ff00L) | \
-              (ROTL((x), 8) & 0x00ff00ffL))
-#define _BYTESWAP64(x) __byteswap64(x)
-
-static inline uint64_t __byteswap64(uint64_t x)
-{
-  uint32_t a = x >> 32;
-  uint32_t b = (uint32_t) x;
-  return ((uint64_t) _BYTESWAP(b) << 32) | (uint64_t) _BYTESWAP(a);
-}
-
-static inline uint32_t _byteswap(int littleEndian, uint32_t x)
-{
-  if (!littleEndian)
-    return x;
-  else
-    return _BYTESWAP(x);
-}
-
-static inline uint64_t _byteswap64(int littleEndian, uint64_t x)
-{
-  if (!littleEndian)
-    return x;
-  else
-    return _BYTESWAP64(x);
-}
-
-static inline void setEndian(int *littleEndianp)
-{
-  union {
-    uint32_t w;
-    uint8_t b4;
-  } endian;
-
-  endian.w = 1L;
-  *littleEndianp = endian.b0 != 0;
-}
-
-#endif /* !RUNTIME_ENDIAN */
-
-static const uint8_t padding64 = {
-  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-void
-SHA256Init (SHA256Context *sc)
-{
-#ifdef RUNTIME_ENDIAN
-  setEndian (&sc->littleEndian);
-#endif /* RUNTIME_ENDIAN */
-
-  sc->totalLength = 0LL;
-  sc->hash0 = 0x6a09e667L;
-  sc->hash1 = 0xbb67ae85L;
-  sc->hash2 = 0x3c6ef372L;
-  sc->hash3 = 0xa54ff53aL;
-  sc->hash4 = 0x510e527fL;
-  sc->hash5 = 0x9b05688cL;
-  sc->hash6 = 0x1f83d9abL;
-  sc->hash7 = 0x5be0cd19L;
-  sc->bufferLength = 0L;
-}
-
-static void
-burnStack (int size)
-{
-  char buf128;
-
-  memset (buf, 0, sizeof (buf));
-  size -= sizeof (buf);
-  if (size > 0)
-    burnStack (size);
-}
-
-static void
-SHA256Guts (SHA256Context *sc, const uint32_t *cbuf)
-{
-  uint32_t buf64;
-  uint32_t *W, *W2, *W7, *W15, *W16;
-  uint32_t a, b, c, d, e, f, g, h;
-  uint32_t t1, t2;
-  const uint32_t *Kp;
-  int i;
-
-  W = buf;
-
-  for (i = 15; i >= 0; i--) {
-    *(W++) = BYTESWAP(*cbuf);
-    cbuf++;
-  }
-
-  W16 = &buf0;
-  W15 = &buf1;
-  W7 = &buf9;
-  W2 = &buf14;
-
-  for (i = 47; i >= 0; i--) {
-    *(W++) = sigma1(*W2) + *(W7++) + sigma0(*W15) + *(W16++);
-    W2++;
-    W15++;
-  }
-
-  a = sc->hash0;
-  b = sc->hash1;
-  c = sc->hash2;
-  d = sc->hash3;
-  e = sc->hash4;
-  f = sc->hash5;
-  g = sc->hash6;
-  h = sc->hash7;
-
-  Kp = K;
-  W = buf;
-
-#ifndef SHA256_UNROLL
-#define SHA256_UNROLL 1
-#endif /* !SHA256_UNROLL */
-
-#if SHA256_UNROLL == 1
-  for (i = 63; i >= 0; i--)
-    DO_ROUND();
-#elif SHA256_UNROLL == 2
-  for (i = 31; i >= 0; i--) {
-    DO_ROUND(); DO_ROUND();
-  }
-#elif SHA256_UNROLL == 4
-  for (i = 15; i >= 0; i--) {
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  }
-#elif SHA256_UNROLL == 8
-  for (i = 7; i >= 0; i--) {
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  }
-#elif SHA256_UNROLL == 16
-  for (i = 3; i >= 0; i--) {
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  }
-#elif SHA256_UNROLL == 32
-  for (i = 1; i >= 0; i--) {
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-    DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  }
-#elif SHA256_UNROLL == 64
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-  DO_ROUND(); DO_ROUND(); DO_ROUND(); DO_ROUND();
-#else
-#error "SHA256_UNROLL must be 1, 2, 4, 8, 16, 32, or 64!"
-#endif
-
-  sc->hash0 += a;
-  sc->hash1 += b;
-  sc->hash2 += c;
-  sc->hash3 += d;
-  sc->hash4 += e;
-  sc->hash5 += f;
-  sc->hash6 += g;
-  sc->hash7 += h;
-}
-
-void
-SHA256Update (SHA256Context *sc, const void *vdata, uint32_t len)
-{
-  const uint8_t *data = (const uint8_t*)vdata;
-  uint32_t bufferBytesLeft;
-  uint32_t bytesToCopy;
-  int needBurn = 0;
-
-#ifdef SHA256_FAST_COPY
-  if (sc->bufferLength) {
-    bufferBytesLeft = 64L - sc->bufferLength;
-
-    bytesToCopy = bufferBytesLeft;
-    if (bytesToCopy > len)
-      bytesToCopy = len;
-
-    memcpy (&sc->buffer.bytessc->bufferLength, data, bytesToCopy);
-
-    sc->totalLength += bytesToCopy * 8L;
-
-    sc->bufferLength += bytesToCopy;
-    data += bytesToCopy;
-    len -= bytesToCopy;
-
-    if (sc->bufferLength == 64L) {
-      SHA256Guts (sc, sc->buffer.words);
-      needBurn = 1;
-      sc->bufferLength = 0L;
-    }
-  }
-
-  while (len > 63L) {
-    sc->totalLength += 512L;
-
-    SHA256Guts (sc, data);
-    needBurn = 1;
-
-    data += 64L;
-    len -= 64L;
-  }
-
-  if (len) {
-    memcpy (&sc->buffer.bytessc->bufferLength, data, len);
-
-    sc->totalLength += len * 8L;
-
-    sc->bufferLength += len;
-  }
-#else /* SHA256_FAST_COPY */
-  while (len) {
-    bufferBytesLeft = 64L - sc->bufferLength;
-
-    bytesToCopy = bufferBytesLeft;
-    if (bytesToCopy > len)
-      bytesToCopy = len;
-
-    memcpy (&sc->buffer.bytessc->bufferLength, data, bytesToCopy);
-
-    sc->totalLength += bytesToCopy * 8L;
-
-    sc->bufferLength += bytesToCopy;
-    data += bytesToCopy;
-    len -= bytesToCopy;
-
-    if (sc->bufferLength == 64L) {
-      SHA256Guts (sc, sc->buffer.words);
-      needBurn = 1;
-      sc->bufferLength = 0L;
-    }
-  }
-#endif /* SHA256_FAST_COPY */
-
-  if (needBurn)
-    burnStack (sizeof (uint32_t74) + sizeof (uint32_t *6) + sizeof (int));
-}
-
-void
-SHA256Final (SHA256Context *sc, uint8_t hashSHA256_HASH_SIZE)
-{
-  uint32_t bytesToPad;
-  uint64_t lengthPad;
-  int i;
-
-  bytesToPad = 120L - sc->bufferLength;
-  if (bytesToPad > 64L)
-    bytesToPad -= 64L;
-
-  lengthPad = BYTESWAP64(sc->totalLength);
-
-  SHA256Update (sc, padding, bytesToPad);
-  SHA256Update (sc, &lengthPad, 8L);
-
-  if (hash) {
-    for (i = 0; i < SHA256_HASH_WORDS; i++) {
-#ifdef SHA256_FAST_COPY
-      *((uint32_t *) hash) = BYTESWAP(sc->hashi);
-#else /* SHA256_FAST_COPY */
-      hash0 = (uint8_t) (sc->hashi >> 24);
-      hash1 = (uint8_t) (sc->hashi >> 16);
-      hash2 = (uint8_t) (sc->hashi >> 8);
-      hash3 = (uint8_t) sc->hashi;
-#endif /* SHA256_FAST_COPY */
-      hash += 4;
-    }
-  }
-}
-
-#ifdef SHA256_TEST
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main (int argc, char *argv)
-{
-  SHA256Context foo;
-  uint8_t hashSHA256_HASH_SIZE;
-  char buf1000;
-  int i;
-
-  SHA256Init (&foo);
-  SHA256Update (&foo, "abc", 3);
-  SHA256Final (&foo, hash);
-
-  for (i = 0; i < SHA256_HASH_SIZE;) {
-    printf ("%02x", hashi++);
-    if (!(i % 4))
-      printf (" ");
-  }
-  printf ("\n");
-
-  SHA256Init (&foo);
-  SHA256Update (&foo,
-        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-        56);
-  SHA256Final (&foo, hash);
-
-  for (i = 0; i < SHA256_HASH_SIZE;) {
-    printf ("%02x", hashi++);
-    if (!(i % 4))
-      printf (" ");
-  }
-  printf ("\n");
-
-  SHA256Init (&foo);
-  memset (buf, 'a', sizeof (buf));
-  for (i = 0; i < 1000; i++)
-    SHA256Update (&foo, buf, sizeof (buf));
-  SHA256Final (&foo, hash);
-
-  for (i = 0; i < SHA256_HASH_SIZE;) {
-    printf ("%02x", hashi++);
-    if (!(i % 4))
-      printf (" ");
-  }
-  printf ("\n");
-
-  exit (0);
-}
-
-#endif /* SHA256_TEST */

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/Sha256.h Deleted

@@ -1,180 +0,0 @@
-/*-
- * Copyright (c) 2001-2003 Allan Saddi <allan@saddi.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY ALLAN SADDI AND HIS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL ALLAN SADDI OR HIS CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: sha256.h 348 2003-02-23 22:12:06Z asaddi $
- */
-//
-/////////// EXAMPLE /////////////////////////////////
-//
-// SHA256Context sha256;
-// SHA256Init (&sha256);
-//
-// uint8_t* pBuffer = new uint8_tSHA_BUFFER_SIZE + 7;
-// // Ensure it is on a 64-bit boundary. 
-// INTPTR offs;
-// if ((offs = reinterpret_cast<INTPTR>(pBuffer) & 7L))
-//    pBuffer += 8 - offs;
-//
-// unsigned int len;
-//
-// ifstream inFile("test.txt", ios::binary);
-//
-// for (;;)
-// {
-//    inFile.read( reinterpret_cast<char*>(pBuffer), SHA_BUFFER_SIZE );
-//    len = inFile.gcount();
-//
-//    if ( len == 0)
-//      break;
-//
-//    SHA256Update (&sha256, pBuffer, len);
-// }
-//
-// uint8_t hashSHA256_HASH_SIZE;
-// SHA256Final (&sha256, hash);
-//
-// cout << "Hash: ";
-// for (int i = 0; i < SHA256_HASH_SIZE; ++i)
-//    printf ("%02x", hashi);
-// cout << endl;
-
-
-#ifndef _SHA256_H
-#define _SHA256_H
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#ifndef WIN32
-#define HAVE_INTTYPES_H 1
-#endif
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#ifndef WIN32
-#define HAVE_STDINT_H 1
-#endif
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strerror' function. */
-#ifndef WIN32
-#define HAVE_STRERROR 1
-#endif
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#ifndef WIN32
-#define HAVE_SYS_TYPES_H 1
-#endif
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#ifndef WIN32
-#define HAVE_UNISTD_H 1
-#endif
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
-#ifdef WIN32
-#define inline __inline
-#endif
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-#ifdef WIN32
-#define uint64_t  unsigned __int64
-#define uint32_t  unsigned int 
-#define uint8_t   unsigned char
-#endif // WIN32
-
-#ifdef WIN32
-#define INTPTR intptr_t
-#else
-#define INTPTR long
-#endif
-
-#define SHA_BUFFER_SIZE 65536
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-
-#define SHA256_HASH_SIZE 32
-
-/* Hash size in 32-bit words */
-#define SHA256_HASH_WORDS 8
-
-struct _SHA256Context {
-  uint64_t totalLength;
-  uint32_t hashSHA256_HASH_WORDS;
-  uint32_t bufferLength;
-  union {
-    uint32_t words16;
-    uint8_t bytes64;
-  } buffer;
-#ifdef RUNTIME_ENDIAN
-  int littleEndian;
-#endif /* RUNTIME_ENDIAN */
-};
-
-typedef struct _SHA256Context SHA256Context;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void SHA256Init (SHA256Context *sc);
-void SHA256Update (SHA256Context *sc, const void *data, uint32_t len);
-void SHA256Final (SHA256Context *sc, uint8_t hashSHA256_HASH_SIZE);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_SHA256_H */

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/AacSource.cpp Deleted

@@ -1,953 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-   Portions Copyright 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-      - Adapted from main.c found in the FAAD2 source tarball.
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "AacSource.h"
-#include "AacSource_p.h"
-
-#include <QFile>
-#include <algorithm>
-#include <cassert>
-#include <limits>
-#include <iostream>
-#include <stdexcept>
-#include <errno.h>
-#include <string.h>
-
-
-////////////////////////////////////////////////////////////////////////
-//
-// AAC_File
-//
-////////////////////////////////////////////////////////////////////////
-AAC_File::AAC_File(const QString& fileName, int headerType)
-    : m_fileName(fileName)
-    , m_inBuf(NULL)
-    , m_inBufSize(0)
-    , m_decoder(0)
-    , m_overflow(static_cast<unsigned char*>(malloc( sizeof(unsigned char) * 1024 )))
-    , m_overflowSize(0)
-    , m_header(headerType)
-{
-}
-
-
-AAC_File::~AAC_File()
-{
-    // common
-    if ( m_decoder )
-    {
-        NeAACDecClose( m_decoder );
-        m_decoder = NULL;
-    }
-    if ( m_inBuf )
-    {
-        free( m_inBuf );
-        m_inBufSize = 0;
-        m_inBuf = NULL;
-    }
-    if ( m_overflow )
-    {
-        free( m_overflow );
-        m_overflowSize = 0;
-        m_overflow = NULL;
-    }
-}
-
-
-
-////////////////////////////////////////////////////////////////////////
-//
-// AAC with ADTS or ADIF headers
-//
-////////////////////////////////////////////////////////////////////////
-
-
-#define MAX_CHANNELS 6 // Output will get mixed down to 2 channels
-#define ADTS_HEADER_SIZE 8
-
-static int adts_sample_rates =
-{
-    96000,
-    88200,
-    64000,
-    48000,
-    44100,
-    32000,
-    24000,
-    22050,
-    16000,
-    12000,
-    11025,
-     8000,
-     7350,
-        0,
-        0,
-        0
-};
-
-AAC_ADTS_File::AAC_ADTS_File( const QString& fileName, int headerType ) : AAC_File(fileName, headerType)
-    , m_file( NULL )
-    , m_adifSamplerate( 0 )
-    , m_adifChannels( 0 )
-{
-}
-
-
-AAC_ADTS_File::~AAC_ADTS_File()
-{
-    if ( m_file )
-    {
-        fclose( m_file );
-    }
-}
-
-
-void AAC_ADTS_File::fillBuffer( FILE*& fp, unsigned char*& buf, size_t& bufSize, const size_t bytesConsumed )
-{
-    size_t bread;
-
-    if ( bytesConsumed > 0 )
-    {
-        if ( bufSize )
-            memmove( (void*)buf, (void*)(buf + bytesConsumed), bufSize*sizeof(unsigned char) );
-
-        bread = fread( (void*)(buf + bufSize), 1, bytesConsumed, fp );
-        bufSize += bread;
-
-        if ( bufSize > 3 )
-        {
-            if ( memcmp( buf, "TAG", 3 ) == 0 )
-                bufSize = 0;
-        }
-        if ( bufSize > 11 )
-        {
-            if ( memcmp( buf, "LYRICSBEGIN", 11 ) == 0 )
-                bufSize = 0;
-        }
-        if ( bufSize > 8 )
-        {
-            if ( memcmp( buf, "APETAGEX", 8 ) == 0 )
-                bufSize = 0;
-        }
-    }
-}
-
-
-void AAC_ADTS_File::parse( FILE*& fp, unsigned char*& buf, size_t& bufSize, int &bitrate, double &length )
-{
-    unsigned int frames, frame_length = 0;
-    int t_framelength = 0;
-    int samplerate = 0;
-    double frames_per_sec, bytes_per_frame;
-
-    // Read all frames to ensure correct time and bitrate
-    for ( frames = 0; /* */; frames++ )
-    {
-        fillBuffer( fp, buf, bufSize, frame_length );
-
-        if ( bufSize > 7 )
-        {
-            /* check syncword */
-            if ( !( (buf0 == 0xFF) && ((buf1 & 0xF6) == 0xF0) ) )
-                break;
-
-            if ( frames == 0 )
-                samplerate = adts_sample_rates (buf2 & 0x3c) >> 2 ;
-
-            frame_length = (  ((buf3 & 0x3) << 11)
-                            | ((buf4) << 3)
-                            | (buf5 >> 5) );
-
-            t_framelength += frame_length - ADTS_HEADER_SIZE;
-
-            if ( frame_length > bufSize )
-                break;
-
-            bufSize -= frame_length;
-        }
-        else
-        {
-            break;
-        }
-    }
-
-    frames_per_sec = samplerate / 1024.0;
-
-    if ( frames != 0 )
-        bytes_per_frame = t_framelength / frames;
-    else
-        bytes_per_frame = 0;
-
-    bitrate = static_cast<int>(8 * bytes_per_frame * frames_per_sec + 0.5);
-
-    if ( frames_per_sec != 0 )
-        length = frames / frames_per_sec;
-    else
-        length = 1;
-}
-
-
-int32_t AAC_ADTS_File::commonSetup( FILE*& fp, NeAACDecHandle& decoder, unsigned char*& buf, size_t& bufSize, uint32_t& samplerate, uint8_t& channels )
-{
-    samplerate = 0;
-    channels = 0;
-
-    fp = fopen(QFile::encodeName(m_fileName), "rb" );
-    if( !fp )
-    {
-        std::cerr << "ERROR: Failed to open " << strerror( errno ) << std::endl;
-        return -1;
-    }
-
-    if ( !(buf = static_cast<unsigned char*>( malloc(FAAD_MIN_STREAMSIZE*MAX_CHANNELS)) ) )
-    {
-        std::cerr << "Memory allocation error" << std::endl;
-        fclose ( fp );
-        return -1;
-    }
-
-    memset( buf, 0, FAAD_MIN_STREAMSIZE*MAX_CHANNELS );
-
-    bufSize = fread( buf, 1, FAAD_MIN_STREAMSIZE * MAX_CHANNELS, fp );
-
-    int tagsize = 0;
-    if ( !memcmp( buf, "ID3", 3 ) )
-    {
-        /* high bit is not used */
-        tagsize = (buf6 << 21) | (buf7 << 14) |
-            (buf8 <<  7) | (buf9 <<  0);
-
-        tagsize += 10;
-        bufSize -= tagsize;
-        fillBuffer( fp, buf, bufSize, tagsize );
-    }
-
-    decoder = NeAACDecOpen();
-
-    /* Set configuration */
-    NeAACDecConfigurationPtr config;
-    config = NeAACDecGetCurrentConfiguration(decoder);
-    config->outputFormat = FAAD_FMT_16BIT;
-    config->downMatrix = 1; // Turn 5.1 channels into 2
-    NeAACDecSetConfiguration( decoder, config);
-
-    int32_t initval = 0;
-    if ((initval = NeAACDecInit(decoder, buf,
-        FAAD_MIN_STREAMSIZE*MAX_CHANNELS, &samplerate, &channels)) < 0)
-    {
-        std::cerr << "Error: could not set up AAC decoder" << std::endl;
-        if ( buf )
-            free( buf );
-        buf = NULL;
-        NeAACDecClose( decoder );
-        decoder = NULL;
-        fclose( fp );
-        fp = NULL;
-    }
-    return initval;
-}
-
-
-bool AAC_ADTS_File::init()
-{
-    uint32_t initSamplerate = 0;
-    uint8_t initChannels = 0;
-    int32_t initval = commonSetup( m_file, m_decoder, m_inBuf, m_inBufSize, initSamplerate, initChannels );
-
-     if ( initval >= 0 )
-     {
-        m_inBufSize -= initval;
-        fillBuffer( m_file, m_inBuf, m_inBufSize, initval );
-
-        // These two only needed for skipping AAC ADIF files
-        m_adifSamplerate = initSamplerate;
-        m_adifChannels = initChannels;
-
-        return true;
-     }
-
-     throw std::runtime_error( "ERROR: Could not initialize AAC file reader!" );
-     return false;
-}
-
-
-/*QString AAC_ADTS_File::getMbid()
-{
-    char outMBID_BUFFER_SIZE;
-    int const r = getMP3_MBID(QFile::encodeName(m_fileName), out);
-    if ( r == 0 )
-        return QString::fromLatin1( out );
-    return QString();
-}*/
-
-void AAC_ADTS_File::getInfo( int& lengthSecs, int& samplerate, int& bitrate, int& nchannels )
-{
-    long fileread;
-    uint32_t initSamplerate;
-    uint8_t initChannels;
-    double initLength = 0;
-    unsigned char *tempBuf = NULL;
-    size_t tempBufSize;
-    FILE *fp = NULL;
-    NeAACDecHandle decoder = NULL;
-    commonSetup( fp, decoder, tempBuf, tempBufSize, initSamplerate, initChannels );
-
-    long origpos = ftell( fp );
-    fseek( fp, 0, SEEK_END );
-    fileread = ftell( fp );
-    fseek( fp, origpos, SEEK_SET );
-
-    if ( (tempBuf0 == 0xFF) && ((tempBuf1 & 0xF6) == 0xF0) )
-    {
-        parse( fp, tempBuf, tempBufSize, bitrate, initLength );
-    }
-    else if (memcmp(tempBuf, "ADIF", 4) == 0)
-    {
-        int skip_size = (tempBuf4 & 0x80) ? 9 : 0;
-        bitrate = ((tempBuf4 + skip_size & 0x0F)<<19) |
-            (tempBuf5 + skip_size<<11) |
-            (tempBuf6 + skip_size<<3) |
-            (tempBuf7 + skip_size & 0xE0);
-
-        if ( fileread != 0)
-        {
-            initLength = static_cast<double>(fileread) * 8 / bitrate + 0.5;
-        }
-    }
-
-    lengthSecs = static_cast<int>(initLength);
-    nchannels = initChannels;
-    samplerate = initSamplerate;
-
-    if ( decoder )
-        NeAACDecClose( decoder );
-    if ( fp )
-        fclose( fp );
-    if ( tempBuf )
-        free( tempBuf );
-}
-
-
-void AAC_ADTS_File::skip( const int mSecs )
-{
-    if ( m_header == AAC_ADTS )
-    {
-        // As AAC is VBR we need to check all ADTS headers to enable seeking...
-        // There is no other solution
-        unsigned char header8;
-        unsigned int frameCount, frameLength;
-        double seconds = 0;
-
-        // We need to find the ATDS syncword so rewind to the beginning
-        // of the unprocessed data.
-        if ( m_inBufSize > 0 )
-        {
-            fseek ( m_file, -m_inBufSize, SEEK_CUR );
-            m_inBufSize = 0;
-        }
-
-        for( frameCount = 1; seconds * 1000 < mSecs; frameCount++ )
-        {
-            if ( fread( header, 1, ADTS_HEADER_SIZE, m_file ) != ADTS_HEADER_SIZE )
-            {
-                break;
-            }
-            if ( !strncmp( (char*)header, "ID3", 3 ) )
-            {
-                // high bit is not used
-                unsigned char rest2;
-                fread( rest, 1, 2, m_file );
-                int tagsize = (header6 << 21) | (header7 << 14) |
-                    (rest0 <<  7) | (rest1 <<  0);
-
-                fseek( m_file, tagsize, SEEK_CUR );
-                fread( header, 1, ADTS_HEADER_SIZE, m_file );
-            }
-            if ( !((header0 == 0xFF) && ((header1 & 0xF6) == 0xF0)) )
-            {
-                std::cerr << "Error: Bad frame header; file may be corrupt!" << std::endl;
-                break;
-            }
-
-            int samplerate = adts_sample_rates (header2 & 0x3c) >> 2 ;
-            frameLength = ( ( header3 & 0x3 ) << 11 )
-                          | ( header4 << 3 )
-                          | ( header5 >> 5 );
-
-            if ( samplerate > 0 )
-                seconds += 1024.0 / samplerate;
-            else
-            {
-                std::cerr << "Error: Bad frame header; file may be corrupt!" << std::endl;
-                break;
-            }
-
-            if ( fseek( m_file, frameLength - ADTS_HEADER_SIZE, SEEK_CUR ) == -1 )
-                break;
-        }
-        m_inBufSize = fread( m_inBuf, 1, FAAD_MIN_STREAMSIZE * MAX_CHANNELS, m_file );
-    }
-    else if ( m_header == AAC_ADIF )
-    {
-        // AAC ADIF is even worse.  There's only the one header at the
-        // beginning of the file.  If you want to skip forward, you have to
-        // decode block by block and check how far along you are.  Lovely, eh?
-
-        unsigned long totalSamples = 0;
-        void *sampleBuffer = NULL;
-
-        do
-        {
-            NeAACDecFrameInfo frameInfo;
-            sampleBuffer = NeAACDecDecode(m_decoder, &frameInfo, m_inBuf, static_cast<uint32_t>(m_inBufSize) );
-            totalSamples += frameInfo.samples;
-            if ( frameInfo.bytesconsumed > 0 )
-            {
-                m_inBufSize -= frameInfo.bytesconsumed;
-                fillBuffer( m_file, m_inBuf, m_inBufSize, frameInfo.bytesconsumed );
-            }
-            if ( totalSamples >= ( mSecs * m_adifSamplerate * m_adifChannels / 1000 ) )
-                break;
-        } while ( sampleBuffer != NULL );
-    }
-}
-
-
-void AAC_ADTS_File::postDecode(unsigned long bytesConsumed)
-{
-    m_inBufSize -= bytesConsumed;
-    fillBuffer( m_file, m_inBuf, m_inBufSize, bytesConsumed );
-}
-
-
-////////////////////////////////////////////////////////////////////////
-//
-// AAC in an MP4 wrapper
-//
-////////////////////////////////////////////////////////////////////////
-
-
-uint32_t read_callback( void *user_data, void *buffer, uint32_t length )
-{
-    return static_cast<uint32_t>(fread( buffer, 1, length, static_cast<FILE*>(user_data) ));
-}
-
-
-uint32_t seek_callback( void *user_data, uint64_t position )
-{
-    return fseek( static_cast<FILE*>(user_data), static_cast<long>(position), SEEK_SET );
-}
-
-AAC_MP4_File::AAC_MP4_File( const QString& fileName, int headerType ) : AAC_File(fileName, headerType)
-    , m_mp4AudioTrack( -1 )
-    , m_mp4SampleId( 0 )
-    , m_mp4File ( NULL )
-    , m_mp4cb ( NULL )
-{
-}
-
-int32_t AAC_MP4_File::readSample()
-{
-    unsigned int bsize;
-    int32_t rc = mp4ff_read_sample( m_mp4File, m_mp4AudioTrack, m_mp4SampleId, &m_inBuf,  &bsize );
-    m_inBufSize = bsize;
-    // Not necessarily an error.  Could just mean end of file.
-    //if ( rc == 0 )
-    //    std::cerr << "Reading samples failed." << std::endl;
-    return rc;
-}
-
-
-int32_t AAC_MP4_File::getTrack( const mp4ff_t *f )
-{
-    // find AAC track
-    int32_t numTracks = mp4ff_total_tracks( f );
-
-    for ( int32_t i = 0; i < numTracks; i++ )
-    {
-        unsigned char *buff = NULL;
-        unsigned int buff_size = 0;
-        mp4AudioSpecificConfig mp4ASC;
-
-        mp4ff_get_decoder_config( f, i, &buff, &buff_size );
-
-        if ( buff )
-        {
-            int8_t rc = NeAACDecAudioSpecificConfig( buff, buff_size, &mp4ASC );
-            free( buff );
-
-            if ( rc < 0 )
-                continue;
-            return i;
-        }
-    }
-
-    // can't decode this, probably DRM
-    return -1;
-}
-
-
-bool AAC_MP4_File::commonSetup( NeAACDecHandle& decoder, mp4ff_callback_t*& cb, FILE*& fp, mp4ff_t*& mp4, int32_t& audioTrack )
-{
-    fp = fopen(QFile::encodeName(m_fileName), "rb");
-    if ( !fp )
-    {
-        throw std::runtime_error( "Error: failed to open AAC file!" );
-        return false;
-    }
-
-    decoder = NeAACDecOpen();
-
-    // Set configuration
-    NeAACDecConfigurationPtr config;
-    config = NeAACDecGetCurrentConfiguration( decoder );
-    config->outputFormat = FAAD_FMT_16BIT;
-    config->downMatrix = 1; // Turn 5.1 channels into 2
-    NeAACDecSetConfiguration( decoder, config );
-
-    // initialise the callback structure
-    cb = static_cast<mp4ff_callback_t*>( malloc( sizeof(mp4ff_callback_t) ) );
-
-    cb->read = read_callback;
-    cb->seek = seek_callback;
-    cb->user_data = fp;
-
-    mp4 = mp4ff_open_read( cb );
-
-    if ( !mp4 )
-    {
-        // unable to open file
-        free( cb );
-        cb = NULL;
-        NeAACDecClose( decoder );
-        decoder = NULL;
-        fclose( fp );
-        fp = NULL;
-        throw std::runtime_error( "Error: failed to set up AAC decoder!" );
-        return false;
-    }
-
-    if ( ( audioTrack = getTrack( mp4 )) < 0 )
-    {
-        free( cb );
-        cb = NULL;
-        NeAACDecClose( decoder );
-        decoder = NULL;
-        fclose( fp );
-        fp = NULL;
-        mp4ff_close( mp4 );
-        mp4 = NULL;
-        audioTrack = 0;
-        throw std::runtime_error( "Error: Unable to find an audio track. Is the file DRM protected?" );
-        return false;
-    }
-    return true;
-}
-
-
-/*QString AAC_MP4_File::getMbid()
-{
-    int j = mp4ff_meta_get_num_items( m_mp4File );
-    if ( j > 0 )
-    {
-        int k;
-        for ( k = 0; k < j; k++ )
-        {
-            char *tag = NULL, *item = NULL;
-            if ( mp4ff_meta_get_by_index( m_mp4File, k, &item, &tag ) )
-            {
-                if ( item != NULL && tag != NULL )
-                {
-                    QString key(item);
-                    if ( key.toLower() == "musicbrainz track id" )
-                    {
-                        QString ret(tag);
-                        free( item );
-                        free( tag );
-                        return ret;
-                    }
-                    free( item );
-                    free( tag );
-                }
-            }
-        }
-    }
-    return QString();
-}*/
-
-
-void AAC_MP4_File::getInfo( int& lengthSecs, int& samplerate, int& bitrate, int& nchannels )
-{
-    FILE* fp = NULL;
-    mp4ff_callback_t *cb = NULL;
-    NeAACDecHandle decoder = NULL;
-    mp4ff_t* mp4 = NULL;
-    int32_t audioTrack;
-
-    bool success = commonSetup( decoder, cb, fp, mp4, audioTrack );
-
-    if ( success )
-    {
-        // get basic file info
-        mp4AudioSpecificConfig mp4ASC;
-        unsigned char* buffer = NULL;
-        unsigned int buffer_size = 0;
-        double f = 1024.0;
-        unsigned int framesize = 1024;
-
-        int32_t samples = mp4ff_num_samples( mp4, audioTrack );
-
-        if ( buffer )
-        {
-            if ( NeAACDecAudioSpecificConfig(buffer, buffer_size, &mp4ASC) >= 0 )
-            {
-                if ( mp4ASC.frameLengthFlag == 1 )
-                    framesize = 960;
-                if ( mp4ASC.sbr_present_flag == 1 )
-                    framesize *= 2;
-                if ( mp4ASC.sbr_present_flag == 1 )
-                    f = f * 2.0;
-            }
-            free( buffer );
-        }
-
-        samplerate = mp4ff_get_sample_rate( mp4, audioTrack );
-        if ( samplerate > 0 )
-            lengthSecs = static_cast<int>(samples * f / samplerate + 0.5);
-        bitrate = mp4ff_get_avg_bitrate( mp4, audioTrack );
-        nchannels = mp4ff_get_channel_count( mp4, audioTrack );
-
-        mp4ff_close( mp4 );
-        NeAACDecClose( decoder );
-        free( cb );
-        fclose( fp );
-    }
-}
-
-
-bool AAC_MP4_File::init()
-{
-    FILE* fp = NULL;
-
-    bool success = commonSetup( m_decoder, m_mp4cb, fp, m_mp4File, m_mp4AudioTrack );
-    if ( !success )
-        return false;
-
-    unsigned char* buffer = NULL;
-    unsigned int buffer_size = 0;
-    uint32_t samplerate;
-    uint8_t channels;
-
-    mp4ff_get_decoder_config( m_mp4File, m_mp4AudioTrack, &buffer, &buffer_size );
-
-    if( NeAACDecInit2( m_decoder, buffer, buffer_size, &samplerate, &channels) < 0 )
-    {
-        // If some error initializing occured, skip the file
-        if ( fp )
-            fclose( fp );
-        throw std::runtime_error( "Error: unable to initialize AAC decoder library!" );
-        return false;
-    }
-
-    if ( buffer )
-        free( buffer );
-
-    return true;
-}
-
-
-void AAC_MP4_File::postDecode(unsigned long)
-{
-            free( m_inBuf );
-            m_inBuf = NULL;
-            m_mp4SampleId++;
-}
-
-void AAC_MP4_File::skip( const int mSecs )
-{
-    double dur = 0.0;
-    int f = 1;
-    unsigned char *buff = NULL;
-    unsigned int buff_size = 0;
-    uint32_t totalSamples = mp4ff_num_samples( m_mp4File, m_mp4AudioTrack );
-    mp4AudioSpecificConfig mp4ASC;
-
-    mp4ff_get_decoder_config( m_mp4File, m_mp4AudioTrack, &buff, &buff_size );
-
-    if ( buff )
-    {
-        int8_t rc = NeAACDecAudioSpecificConfig( buff, buff_size, &mp4ASC );
-        free( buff );
-        if ( rc >= 0 && mp4ASC.sbr_present_flag == 1 )
-            f = 2;
-
-        // I think the f multiplier is needed here.
-        while ( dur * 1000.0 * f / static_cast<double>(mp4ASC.samplingFrequency) < mSecs && m_mp4SampleId < totalSamples )
-        {
-            dur += mp4ff_get_sample_duration( m_mp4File, m_mp4AudioTrack, m_mp4SampleId );
-            m_mp4SampleId++;
-        }
-    }
-    else
-        std::cerr << "Error: could not skip " << mSecs << " milliseconds" << std::endl;
-}
-
-
-AAC_MP4_File::~AAC_MP4_File()
-{
-    if ( m_mp4File )
-        mp4ff_close( m_mp4File );
-    if ( m_mp4cb )
-    {
-        free( m_mp4cb );
-    }
-}
-
-
-////////////////////////////////////////////////////////////////////////
-//
-// AacSource
-//
-////////////////////////////////////////////////////////////////////////
-
-AacSource::AacSource()
-    : m_eof( false )
-    , m_aacFile( NULL )
-{}
-
-
-AacSource::~AacSource()
-{
-    delete m_aacFile;
-}
-
-
-int AacSource::checkHeader()
-{
-    FILE *fp = NULL;
-    unsigned char header10;
-
-    // check for mp4 file
-    fp = fopen(QFile::encodeName(m_fileName), "rb");
-    if ( !fp )
-    {
-        std::cerr << "Error: failed to open " << strerror( errno ) << std::endl;
-        return AAC_File::AAC_UNKNOWN;
-    }
-
-    fread( header, 1, 10, fp );
-
-    // MP4 headers
-    if ( !memcmp( &header4, "ftyp", 4 ) )
-    {
-        fclose( fp );
-        return AAC_File::AAC_MP4;
-    }
-
-    // Skip id3 tags
-    int tagsize = 0;
-    if ( !memcmp( header, "ID3", 3 ) )
-    {
-        /* high bit is not used */
-        tagsize = (header6 << 21) | (header7 << 14) |
-            (header8 <<  7) | (header9 <<  0);
-
-        tagsize += 10;
-        fseek( fp, tagsize, SEEK_SET );
-        fread( header, 1, 10, fp );
-    }
-
-    // Check for ADTS OR ADIF headers
-    if ( (header0 == 0xFF) && ((header1 & 0xF6) == 0xF0) )
-    {
-        fclose( fp );
-        return AAC_File::AAC_ADTS;
-    }
-    else if (memcmp(header, "ADIF", 4) == 0)
-    {
-        fclose( fp );
-        return AAC_File::AAC_ADIF;
-    }
-
-    fclose( fp );
-    return AAC_File::AAC_UNKNOWN;
-}
-
-
-void AacSource::getInfo( int& lengthSecs, int& samplerate, int& bitrate, int& nchannels )
-{
-    // get the header plus some other stuff..
-
-    m_aacFile->getInfo( lengthSecs, samplerate, bitrate, nchannels );
-}
-
-
-void AacSource::init(const QString& fileName)
-{
-    m_fileName = fileName;
-    
-    int headerType = checkHeader();
-    if ( headerType != AAC_File::AAC_UNKNOWN )
-    {
-        if ( headerType == AAC_File::AAC_MP4 )
-            m_aacFile = new AAC_MP4_File(m_fileName, headerType);
-        else
-            m_aacFile = new AAC_ADTS_File( m_fileName, headerType );
-    }    
-    
-    if ( m_aacFile )
-        m_aacFile->init();
-    else
-        throw std::runtime_error( "ERROR: No suitable AAC decoder found!" );
-}
-
-
-/*QString AacSource::getMbid()
-{
-    QString mbid = m_aacFile->getMbid();
-    return mbid;
-}*/
-
-
-void AacSource::skip( const int mSecs )
-{
-    if ( mSecs < 0 || !m_aacFile->m_decoder )
-        return;
-
-        m_aacFile->skip( mSecs );
-}
-
-
-void AacSource::skipSilence(double silenceThreshold /* = 0.0001 */)
-{
-    if ( !m_aacFile->m_decoder )
-        return;
-
-    silenceThreshold *= static_cast<double>( std::numeric_limits<short>::max() );
-
-    for (;;)
-    {
-        if ( m_aacFile->m_header == AAC_File::AAC_MP4 )
-        {
-            if ( !static_cast<AAC_MP4_File*>(m_aacFile)->readSample() )
-                break;
-        }
-        NeAACDecFrameInfo frameInfo;
-
-        void* sampleBuffer = NeAACDecDecode(m_aacFile->m_decoder, &frameInfo, m_aacFile->m_inBuf, static_cast<uint32_t>(m_aacFile->m_inBufSize) );
-
-        m_aacFile->postDecode( frameInfo.bytesconsumed );
-
-        if ( frameInfo.error > 0 )
-        {
-            break;
-        }
-        else if ( frameInfo.samples > 0 )
-        {
-            double sum = 0;
-            int16_t *buf = static_cast<int16_t*>(sampleBuffer);
-            switch ( frameInfo.channels )
-            {
-                case 1:
-                    for (size_t j = 0; j < frameInfo.samples; ++j)
-                        sum += abs( bufj );
-                    break;
-                case 2:
-                    for (size_t j = 0; j < frameInfo.samples; j+=2)
-                        sum += abs( (bufj >> 1) + (bufj+1 >> 1) );
-                    break;
-            }
-            if ( (sum >= silenceThreshold * static_cast<short>(frameInfo.samples/frameInfo.channels) ) )
-                break;
-        }
-    }
-}
-
-
-int AacSource::updateBuffer( signed short *pBuffer, size_t bufferSize )
-{
-    size_t nwrit = 0; //number of samples written to the output buffer
-
-    if ( m_aacFile->m_overflowSize > 0 )
-    {
-        size_t samples_to_use = bufferSize < m_aacFile->m_overflowSize ? bufferSize : m_aacFile->m_overflowSize;
-        memcpy( pBuffer, m_aacFile->m_overflow, samples_to_use * sizeof(signed short) );
-        nwrit += samples_to_use;
-        m_aacFile->m_overflowSize -= samples_to_use;
-        memmove( (void*)(m_aacFile->m_overflow), (void*)(m_aacFile->m_overflow + samples_to_use*sizeof(signed short)), samples_to_use*sizeof(signed short) );
-    }
-
-    if ( !m_aacFile->m_decoder )
-        return 0;
-
-    for (;;)
-    {
-        signed short* pBufferIt = pBuffer + nwrit;
-        void* sampleBuffer;
-
-        assert( nwrit <= bufferSize );
-
-        if ( m_aacFile->m_header == AAC_File::AAC_MP4 )
-        {
-            if ( !static_cast<AAC_MP4_File*>(m_aacFile)->readSample() )
-            {
-                m_eof = true;
-                return static_cast<int>(nwrit);
-            }
-        }
-        NeAACDecFrameInfo frameInfo;
-
-        sampleBuffer = NeAACDecDecode(m_aacFile->m_decoder, &frameInfo, m_aacFile->m_inBuf, static_cast<uint32_t>(m_aacFile->m_inBufSize) );
-        size_t samples_to_use = (bufferSize - nwrit) < frameInfo.samples ? bufferSize-nwrit : frameInfo.samples;
-
-        if ( samples_to_use > 0 && sampleBuffer != NULL )
-        {
-            memcpy( pBufferIt, sampleBuffer, samples_to_use * sizeof(signed short) );
-            nwrit += samples_to_use;
-        }
-
-        if ( samples_to_use < frameInfo.samples )
-        {
-            m_aacFile->m_overflow = static_cast<unsigned char*>(realloc( m_aacFile->m_overflow, (frameInfo.samples - samples_to_use) * sizeof(signed short) ) );
-            memcpy( m_aacFile->m_overflow, static_cast<signed short*>(sampleBuffer) + samples_to_use, (frameInfo.samples - samples_to_use) * sizeof(signed short) );
-            m_aacFile->m_overflowSize = frameInfo.samples - samples_to_use;
-        }
-
-        m_aacFile->postDecode( frameInfo.bytesconsumed );
-
-        if ( sampleBuffer == NULL )
-        {
-            m_eof = true;
-            break;
-        }
-
-        if ( frameInfo.error > 0 )
-        {
-            std::cerr << "Error: " << NeAACDecGetErrorMessage(frameInfo.error) << std::endl;
-            break;
-        }
-
-        if ( nwrit == bufferSize )
-            break;
-   }
-
-   return static_cast<int>(nwrit);
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/AacSource.h Deleted

@@ -1,46 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __AAC_SOURCE_H__
-#define __AAC_SOURCE_H__
-
-#include <lastfm/FingerprintableSource>
-
-class AacSource : public lastfm::FingerprintableSource
-{
-public:
-    AacSource();
-    ~AacSource();
-
-    virtual void getInfo(int& lengthSecs, int& samplerate, int& bitrate, int& nchannels);
-    virtual void init(const QString& fileName);
-    virtual int updateBuffer(signed short* pBuffer, size_t bufferSize);
-    virtual void skip(const int mSecs);
-    virtual void skipSilence(double silenceThreshold = 0.0001);
-    virtual bool eof() const { return m_eof; }
-
-private:
-    int checkHeader();
-    QString m_fileName;
-    bool m_eof;
-    class AAC_File *m_aacFile;
-};
-
-#endif
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/AacSource_p.h Deleted

@@ -1,94 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <faad.h>
-#include <mp4ff.h>
-
-class AAC_File
-{
-public:
-    AAC_File(const QString&, int headerType);
-    virtual ~AAC_File();
-    virtual void getInfo( int& lengthSecs, int& samplerate, int& bitrate, int& nchannels ) = 0;
-    virtual bool init() = 0;
-    //virtual QString getMbid() = 0;
-    virtual void skip( const int mSecs ) = 0;
-    virtual void postDecode(unsigned long) = 0;
-
-    enum HeaderType
-    {
-        AAC_UNKNOWN = 0,
-        AAC_ADIF,
-        AAC_ADTS,
-        AAC_MP4
-    };
-
-    QString m_fileName;
-    unsigned char *m_inBuf;
-    size_t m_inBufSize;
-    NeAACDecHandle m_decoder;
-    unsigned char *m_overflow;
-    size_t m_overflowSize;
-    int m_header;
-};
-
-
-class AAC_MP4_File : public AAC_File
-{
-public:
-    AAC_MP4_File(const QString&, int headerType = AAC_MP4 );
-    ~AAC_MP4_File();
-    virtual void getInfo( int& lengthSecs, int& samplerate, int& bitrate, int& nchannels );
-    virtual bool init();
-    //virtual QString getMbid();
-    virtual void skip( const int mSecs );
-    virtual void postDecode(unsigned long);
-    int32_t readSample();
-
-private:
-    bool commonSetup( NeAACDecHandle& handle, mp4ff_callback_t*& cb, FILE*& fp, mp4ff_t*& mp4, int32_t& audioTrack );
-    virtual int32_t getTrack( const mp4ff_t* f );
-    int m_mp4AudioTrack;
-    uint32_t m_mp4SampleId;
-    mp4ff_t *m_mp4File;
-    mp4ff_callback_t *m_mp4cb;
-};
-
-
-class AAC_ADTS_File : public AAC_File
-{
-public:
-    AAC_ADTS_File( const QString& fileName, int headerType );
-    ~AAC_ADTS_File();
-    virtual void getInfo( int& lengthSecs, int& samplerate, int& bitrate, int& nchannels );
-    virtual bool init();
-    //virtual QString getMbid();
-    virtual void skip( const int mSecs );
-    virtual void postDecode(unsigned long bytesconsumed );
-
-private:
-    int32_t commonSetup( FILE*& fp, NeAACDecHandle& decoder, unsigned char*& buf, size_t& bufSize, uint32_t& samplerate, uint8_t& channels );
-    void parse( FILE*& fp, unsigned char*& buf, size_t& bufSize, int &bitrate, double &length );
-    void fillBuffer( FILE*& fp, unsigned char*& buf, size_t& bufSize, const size_t m_bytesConsumed );
-
-    FILE* m_file;
-    // These two only needed for skipping AAC ADIF files
-    uint32_t m_adifSamplerate;
-    int m_adifChannels;
-};

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/FlacSource.cpp Deleted

@@ -1,339 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "FlacSource.h"
-#include <algorithm>
-#include <cassert>
-#include <errno.h>
-#include <iostream>
-#include <limits>
-#include <algorithm>
-#include <stdexcept>
-
-#include <QFile>
-
-
-FLAC__StreamDecoderWriteStatus FlacSource::_write_callback(const FLAC__StreamDecoder *, const FLAC__Frame *frame, const FLAC__int32 * const buffer, void *client_data)
-{
-    assert(client_data != NULL);
-    FlacSource *instance = reinterpret_cast<FlacSource *>(client_data);
-    assert(instance != NULL);
-    return instance->write_callback(frame, buffer);
-}
-
-FLAC__StreamDecoderWriteStatus FlacSource::write_callback(const FLAC__Frame *frame, const FLAC__int32 * const buffer)
-{
-    m_outBufLen = 0;
-
-    if ( m_outBuf )
-    {
-        size_t i;
-        for(i = 0; i < frame->header.blocksize; i++)
-        {
-            switch ( m_channels )
-            {
-                case 1:
-                    m_outBufm_outBufLen = (FLAC__int16)buffer0i; // mono
-                    m_outBufLen++;
-                    break;
-                case 2:
-                    m_outBufm_outBufLen = (FLAC__int16)buffer0i; // left channel
-                    m_outBufm_outBufLen+1 = (FLAC__int16)buffer1i; // right channel
-                    m_outBufLen += 2;
-                    break;
-            }
-        }
-        m_samplePos += frame->header.blocksize;
-    }
-
-    return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-}
-
-// ---------------------------------------------------------------------
-
-void FlacSource::_metadata_callback(const FLAC__StreamDecoder *, const FLAC__StreamMetadata *metadata, void *client_data)
-{
-    assert(client_data != NULL);
-    FlacSource *instance = reinterpret_cast<FlacSource *>(client_data);
-    assert(instance != NULL);
-    instance->metadata_callback(metadata);
-}
-
-void FlacSource::metadata_callback( const FLAC__StreamMetadata *metadata )
-{
-    switch ( metadata->type )
-    {
-        case FLAC__METADATA_TYPE_STREAMINFO:
-            m_channels = metadata->data.stream_info.channels;
-            m_totalSamples = metadata->data.stream_info.total_samples;
-            m_samplerate = metadata->data.stream_info.sample_rate;
-            m_bps = metadata->data.stream_info.bits_per_sample;
-            m_maxFrameSize = metadata->data.stream_info.max_framesize;
-            break;
-        case FLAC__METADATA_TYPE_VORBIS_COMMENT:
-            m_commentData = FLAC__metadata_object_clone(metadata);
-            break;
-        default:
-            break;
-    }
-}
-
-// ---------------------------------------------------------------------
-
-void FlacSource::_error_callback(const FLAC__StreamDecoder *, FLAC__StreamDecoderErrorStatus status, void *client_data)
-{
-    assert(client_data != NULL);
-    FlacSource *instance = reinterpret_cast<FlacSource *>(client_data);
-    assert(instance != NULL);
-    instance->error_callback(status);
-}
-
-void FlacSource::error_callback(FLAC__StreamDecoderErrorStatus status)
-{
-    std::cerr << "Got FLAC error: " << FLAC__StreamDecoderErrorStatusStringstatus << std::endl;
-}
-
-// ---------------------------------------------------------------------
-
-FlacSource::FlacSource()
-    : m_decoder( 0 )
-    , m_fileSize( 0 )
-    , m_outBuf( 0 )
-    , m_outBufLen( 0 )
-    , m_outBufPos( 0 )
-    , m_samplePos( 0 )
-    , m_maxFrameSize( 0 )
-    , m_commentData( 0 )
-    , m_bps( 0 )
-    , m_channels( 0 )
-    , m_samplerate( 0 )
-    , m_totalSamples( 0 )
-    , m_eof( false )
-{
-}
-
-// ---------------------------------------------------------------------
-
-FlacSource::~FlacSource()
-{
-    if ( m_decoder )
-    {
-        FLAC__stream_decoder_finish( m_decoder );
-        FLAC__stream_decoder_delete( m_decoder );
-    }
-    if ( m_commentData )
-        FLAC__metadata_object_delete( m_commentData );
-    if ( m_outBuf )
-        free( m_outBuf );
-}
-
-// ---------------------------------------------------------------------
-
-void FlacSource::init(const QString& fileName)
-{
-    m_fileName = fileName;
-    
-    if ( !m_decoder )
-    {
-        FILE *f = fopen(QFile::encodeName(m_fileName), "rb" );
-        if ( f )
-        {
-            // Need to check which init call to use; flac doesn't do that for us
-            unsigned char header35;
-            bool isOgg = false;
-            fread( header, 1, 35, f );
-            if ( memcmp(header, "OggS", 4) == 0 &&
-                 memcmp(&header29, "FLAC", 4) == 0 )
-                isOgg = true;
-
-            // getInfo() will need this to calculate bitrate
-            fseek( f, 0, SEEK_END );
-            m_fileSize = ftell(f);
-
-            rewind( f );
-
-            m_decoder = FLAC__stream_decoder_new();
-            FLAC__stream_decoder_set_metadata_respond(m_decoder, FLAC__METADATA_TYPE_STREAMINFO);
-            FLAC__stream_decoder_set_metadata_respond(m_decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-
-            int init_status;
-            if ( FLAC_API_SUPPORTS_OGG_FLAC && isOgg )
-                init_status = FLAC__stream_decoder_init_ogg_FILE( m_decoder, f, _write_callback, _metadata_callback, _error_callback, this );
-            else
-                init_status = FLAC__stream_decoder_init_FILE( m_decoder, f, _write_callback, _metadata_callback, _error_callback, this );
-
-            if(init_status != FLAC__STREAM_DECODER_INIT_STATUS_OK)
-                return;
-
-            FLAC__stream_decoder_process_until_end_of_metadata( m_decoder );
-            m_outBuf = static_cast<signed short*>(malloc( sizeof(signed short)*m_maxFrameSize));
-
-            if ( m_bps != 16 )
-            {
-                FLAC__stream_decoder_finish( m_decoder );
-                FLAC__stream_decoder_delete( m_decoder );
-                FLAC__metadata_object_delete( m_commentData );
-                m_decoder = 0;
-                m_commentData = 0;
-                throw std::runtime_error( "ERROR: only 16 bit FLAC files are currently supported!" );
-            }
-        }
-        else
-            throw std::runtime_error( "ERROR: cannot load FLAC file!" );
-    }
-}
-
-// ---------------------------------------------------------------------
-
-/*QString FlacSource::getMbid()
-{
-    if ( m_commentData )
-    {
-        FLAC__StreamMetadata_VorbisComment *vc;
-        vc = &m_commentData->data.vorbis_comment;
-        for ( unsigned int i = 0; i < vc->num_comments; ++i )
-        {
-            QByteArray key( (char*)(vc->commentsi.entry), vc->commentsi.length );
-            if ( key.left(20).toLower() == "musicbrainz_trackid=" )
-            {
-                QString val = key.mid(20);
-                return val;
-            }
-        }
-    }
-
-    return QString();
-}*/
-
-// ---------------------------------------------------------------------
-
-void FlacSource::getInfo(int& lengthSecs, int& samplerate, int& bitrate, int& nchannels)
-{
-    lengthSecs = 0;
-    samplerate = 0;
-    bitrate = 0;
-    nchannels = 0;
-
-    if ( m_decoder )
-    {
-        samplerate = m_samplerate;
-        nchannels = m_channels;
-        if ( samplerate > 0 )
-            lengthSecs = static_cast<int>( static_cast<double>(m_totalSamples)/m_samplerate + 0.5);
-
-        // Calcuate bitrate
-        if ( lengthSecs > 0 )
-        {
-            FLAC__Metadata_SimpleIterator *it = FLAC__metadata_simple_iterator_new();
-            FLAC__metadata_simple_iterator_init( it, QFile::encodeName(m_fileName), true, true );
-            while( !FLAC__metadata_simple_iterator_is_last( it ) )
-            {
-                FLAC__metadata_simple_iterator_next( it );
-            }
-            off_t audioOffset = FLAC__metadata_simple_iterator_get_block_offset( it ) +
-                FLAC__metadata_simple_iterator_get_block_length( it );
-            FLAC__metadata_simple_iterator_delete( it );
-            bitrate = static_cast<int>( static_cast<double>(m_fileSize - audioOffset) * 8 / lengthSecs + 0.5 );
-        }
-    }
-}
-
-// ---------------------------------------------------------------------
-
-void FlacSource::skip( const int mSecs )
-{
-    FLAC__uint64 absSample = mSecs * m_samplerate / 1000 + m_samplePos;
-    if ( !FLAC__stream_decoder_seek_absolute(m_decoder, absSample) )
-        FLAC__stream_decoder_reset( m_decoder );
-    m_outBufLen = 0;
-}
-
-// ---------------------------------------------------------------------
-
-void FlacSource::skipSilence(double silenceThreshold /* = 0.0001 */)
-{
-    silenceThreshold *= static_cast<double>( std::numeric_limits<short>::max() );
-    for ( ;; )
-    {
-        double sum = 0;
-        bool result = FLAC__stream_decoder_process_single( m_decoder );
-        // there was a fatal read
-        if ( !result )
-            break;
-
-        switch ( m_channels )
-        {
-            case 1:
-                for (size_t j = 0; j < m_outBufLen; ++j)
-                    sum += abs( m_outBufj );
-                break;
-            case 2:
-                for ( size_t j = 0; j < m_outBufLen; j+=2 )
-                    sum += abs( (m_outBufj >> 1)
-                                + (m_outBufj+1 >> 1) );
-                break;
-        }
-        if ( (sum >= silenceThreshold * static_cast<double>(m_outBufLen) ) )
-            break;
-    }
-    m_outBufLen = 0;
-}
-
-// ---------------------------------------------------------------------
-
-int FlacSource::updateBuffer( signed short *pBuffer, size_t bufferSize )
-{
-    size_t nwrit = 0;
-
-    for ( ;; )
-    {
-        size_t samples_to_use = std::min (bufferSize - nwrit, m_outBufLen - m_outBufPos);
-        signed short* pBufferIt = pBuffer + nwrit;
-
-        nwrit += samples_to_use;
-        assert( nwrit <= bufferSize );
-        memcpy( pBufferIt, m_outBuf + m_outBufPos, sizeof(signed short)*samples_to_use );
-
-        if ( samples_to_use < m_outBufLen - m_outBufPos )
-            m_outBufPos = samples_to_use;
-        else
-        {
-            m_outBufPos = 0;
-            bool result = FLAC__stream_decoder_process_single( m_decoder );
-            // there was a fatal read
-            if ( !result )
-            {
-                std::cerr << "Fatal error decoding FLAC" << std::endl;
-                return 0;
-            }
-            else if ( FLAC__stream_decoder_get_state( m_decoder ) == FLAC__STREAM_DECODER_END_OF_STREAM )
-            {
-                m_eof = true;
-                break;
-            }
-        }
-
-        if ( nwrit == bufferSize )
-            return static_cast<int>(nwrit);
-    }
-    return static_cast<int>(nwrit);
-}
-
-// -----------------------------------------------------------------------------
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/FlacSource.h Deleted

@@ -1,74 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __FLAC_SOURCE_H__
-#define __FLAC_SOURCE_H__
-
-#include <lastfm/FingerprintableSource>
-#include <FLAC/stream_decoder.h>
-#include <FLAC/metadata.h>
-
-
-class FlacSource : public lastfm::FingerprintableSource
-{
-public:
-    FlacSource();
-    virtual ~FlacSource();
-
-    virtual void getInfo(int& lengthSecs, int& samplerate, int& bitrate, int& nchannels);
-    virtual void init(const QString& fileName);
-
-    // return a chunk of PCM data from the FLAC file
-    virtual int updateBuffer(signed short* pBuffer, size_t bufferSize);
-
-    virtual void skip(const int mSecs);
-    virtual void skipSilence(double silenceThreshold = 0.0001);
-
-    //QString getMbid();
-
-    bool eof() const { return m_eof; }
-
-private:
-    static FLAC__StreamDecoderWriteStatus _write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer, void *client_data);
-    static void _metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-    static void _error_callback(const ::FLAC__StreamDecoder *decoder, ::FLAC__StreamDecoderErrorStatus status, void *client_data);
-
-    FLAC__StreamDecoderWriteStatus write_callback(const FLAC__Frame *frame, const FLAC__int32 * const buffer);
-    void metadata_callback( const FLAC__StreamMetadata *metadata );
-    void error_callback(FLAC__StreamDecoderErrorStatus status);
-
-    FLAC__StreamDecoder *m_decoder;
-    QString m_fileName;
-    size_t m_fileSize;
-    short *m_outBuf;
-    size_t m_outBufLen;
-    size_t m_outBufPos;
-    FLAC__uint64 m_samplePos;
-    unsigned m_maxFrameSize;
-    FLAC__StreamMetadata* m_commentData;
-    unsigned m_bps;
-    unsigned m_channels;
-    unsigned m_samplerate;
-    FLAC__uint64 m_totalSamples;
-
-    bool m_eof;
-};
-
-#endif
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/MadSource.cpp Deleted

@@ -1,514 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <iostream>
-#include <fstream>
-#include <limits>
-#include <climits>
-#include <cstdlib>
-#include <sstream>
-#include <cassert>
-#include <stdexcept>
-#include "MadSource.h"
-
-#undef max // was definded in mad
-
-using namespace std;
-
-
-// -----------------------------------------------------------
-
-MadSource::MadSource()
-          : m_pMP3_Buffer ( new unsigned charm_MP3_BufferSize+MAD_BUFFER_GUARD )
-{}
-
-// -----------------------------------------------------------
-
-MadSource::~MadSource()
-{
-   if ( m_inputFile.isOpen() )
-   {
-      m_inputFile.close();
-      mad_synth_finish(&m_mad_synth);
-      mad_frame_finish(&m_mad_frame);
-      mad_stream_finish(&m_mad_stream);
-   }
-   if (m_pMP3_Buffer) delete m_pMP3_Buffer;
-}
-
-// ---------------------------------------------------------------------
-
-inline short f2s(mad_fixed_t f)
-{
-   /* A fixed point number is formed of the following bit pattern:
-   *
-   * SWWWFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-   * MSB                          LSB
-   * S ==> Sign (0 is positive, 1 is negative)
-   * W ==> Whole part bits
-   * F ==> Fractional part bits
-   *
-   * This pattern contains MAD_F_FRACBITS fractional bits, one
-   * should alway use this macro when working on the bits of a fixed
-   * point number. It is not guaranteed to be constant over the
-   * different platforms supported by libmad.
-   *
-   * The signed short value is formed, after clipping, by the least
-   * significant whole part bit, followed by the 15 most significant
-   * fractional part bits. Warning: this is a quick and dirty way to
-   * compute the 16-bit number, madplay includes much better
-   * algorithms.
-   */
-
-   /* Clipping */
-   if(f >= MAD_F_ONE)
-      return(SHRT_MAX);
-   if(f <= -MAD_F_ONE)
-      return(-SHRT_MAX);
-
-   /* Conversion. */
-   f = f >> (MAD_F_FRACBITS-15);
-   return (signed short)f;
-}
-
-// ---------------------------------------------------------------------
-
-string MadSource::MadErrorString(const mad_error& error)
-{
-   switch(error)
-   {
-      /* Generic unrecoverable errors. */
-   case MAD_ERROR_BUFLEN:
-      return("input buffer too small (or EOF)");
-   case MAD_ERROR_BUFPTR:
-      return("invalid (null) buffer pointer");
-   case MAD_ERROR_NOMEM:
-      return("not enough memory");
-
-      /* Frame header related unrecoverable errors. */
-   case MAD_ERROR_LOSTSYNC:
-      return("lost synchronization");
-   case MAD_ERROR_BADLAYER:
-      return("reserved header layer value");
-   case MAD_ERROR_BADBITRATE:
-      return("forbidden bitrate value");
-   case MAD_ERROR_BADSAMPLERATE:
-      return("reserved sample frequency value");
-   case MAD_ERROR_BADEMPHASIS:
-      return("reserved emphasis value");
-
-      /* Recoverable errors */
-   case MAD_ERROR_BADCRC:
-      return("CRC check failed");
-   case MAD_ERROR_BADBITALLOC:
-      return("forbidden bit allocation value");
-   case MAD_ERROR_BADSCALEFACTOR:
-      return("bad scalefactor index");
-   case MAD_ERROR_BADFRAMELEN:
-      return("bad frame length");
-   case MAD_ERROR_BADBIGVALUES:
-      return("bad big_values count");
-   case MAD_ERROR_BADBLOCKTYPE:
-      return("reserved block_type");
-   case MAD_ERROR_BADSCFSI:
-      return("bad scalefactor selection info");
-   case MAD_ERROR_BADDATAPTR:
-      return("bad main_data_begin pointer");
-   case MAD_ERROR_BADPART3LEN:
-      return("bad audio data length");
-   case MAD_ERROR_BADHUFFTABLE:
-      return("bad Huffman table select");
-   case MAD_ERROR_BADHUFFDATA:
-      return("Huffman data overrun");
-   case MAD_ERROR_BADSTEREO:
-      return("incompatible block_type for JS");
-
-      /* Unknown error. This switch may be out of sync with libmad's
-      * defined error codes.
-      */
-   default:
-      return("Unknown error code");
-   }
-}
-
-
-// -----------------------------------------------------------------------------
-
-bool MadSource::isRecoverable(const mad_error& error, bool log)
-{
-   if (MAD_RECOVERABLE (error))
-   {
-      /* Do not print a message if the error is a loss of
-      * synchronization and this loss is due to the end of
-      * stream guard bytes. (See the comments marked {3}
-      * supra for more informations about guard bytes.)
-      */
-      if (error != MAD_ERROR_LOSTSYNC   /*|| mad_stream.this_frame != pGuard */ && log)
-      {
-         cerr << "Recoverable frame level error: " 
-              << MadErrorString(error) << endl;
-      }
-
-      return true;
-   }
-   else
-   {
-      if (error == MAD_ERROR_BUFLEN)
-         return true;
-      else
-      {
-         stringstream ss;
-
-         ss << "Unrecoverable frame level error: " 
-            << MadErrorString (error) << endl;
-         throw ss.str();
-      }
-   }
-
-   return false;
-}
-
-// -----------------------------------------------------------
-
-void MadSource::init(const QString& fileName)
-{
-   m_inputFile.setFileName( m_fileName = fileName );
-   bool fine = m_inputFile.open( QIODevice::ReadOnly );
-
-   if ( !fine )
-   {
-      throw std::runtime_error ("Cannot load mp3 file!");
-   }
-
-   mad_stream_init(&m_mad_stream);
-   mad_frame_init (&m_mad_frame);
-   mad_synth_init (&m_mad_synth);
-   mad_timer_reset(&m_mad_timer);
-
-   m_pcmpos = m_mad_synth.pcm.length;
-}
-
-// -----------------------------------------------------------------------------
-
-/*QString MadSource::getMbid()
-{
-    char outMBID_BUFFER_SIZE;
-    int const r = getMP3_MBID( QFile::encodeName( m_fileName ), out );
-    if (r == 0)
-        return QString::fromLatin1( out );
-    return QString();
-}*/
-
-void MadSource::getInfo(int& lengthSecs, int& samplerate, int& bitrate, int& nchannels )
-{
-   // get the header plus some other stuff..
-   QFile inputFile(m_fileName);
-   bool fine = inputFile.open( QIODevice::ReadOnly );
-
-   if ( !fine )
-   {
-      throw std::runtime_error ("ERROR: Cannot load file for getInfo!");
-      return;
-   }
-
-   unsigned char* pMP3_Buffer  = new unsigned charm_MP3_BufferSize+MAD_BUFFER_GUARD;
-
-   mad_stream   madStream;
-   mad_header  madHeader;
-   mad_timer_t  madTimer;
-
-   mad_stream_init(&madStream);
-   mad_timer_reset(&madTimer);
-
-   double avgSamplerate = 0;
-   double avgBitrate = 0;
-   double avgNChannels = 0;
-   int nFrames = 0;
-
-   while ( fetchData( inputFile, pMP3_Buffer, m_MP3_BufferSize, madStream) )
-   {
-      if ( mad_header_decode(&madHeader, &madStream) != 0 )
-      {
-         if ( isRecoverable(madStream.error) )
-            continue;
-         else
-            break;
-      }
-
-      mad_timer_add(&madTimer, madHeader.duration);
-
-      avgSamplerate += madHeader.samplerate;
-      avgBitrate += madHeader.bitrate;
-
-      if ( madHeader.mode == MAD_MODE_SINGLE_CHANNEL )
-         ++avgNChannels;
-      else
-         avgNChannels += 2;
-
-      ++nFrames;
-   }
-
-   inputFile.close();
-   mad_stream_finish(&madStream);
-   mad_header_finish(&madHeader);
-   delete pMP3_Buffer;
-
-
-   lengthSecs = static_cast<int>(madTimer.seconds);
-   samplerate = static_cast<int>( (avgSamplerate/nFrames) + 0.5 );
-   bitrate = static_cast<int>( (avgBitrate/nFrames) + 0.5 );
-   nchannels = static_cast<int>( (avgNChannels/nFrames) + 0.5 );
-}
-
-// -----------------------------------------------------------
-
-
-bool MadSource::fetchData( QFile& mp3File,
-                            unsigned char* pMP3_Buffer,
-                            const int MP3_BufferSize,
-                            mad_stream& madStream )
-{
-   unsigned char *pReadStart = NULL;
-   unsigned char *pGuard = NULL;
-
-   if ( madStream.buffer == NULL || 
-        madStream.error == MAD_ERROR_BUFLEN )
-   {
-
-      size_t readSize;
-      size_t remaining;
-
-      /* {2} libmad may not consume all bytes of the input
-      * buffer. If the last frame in the buffer is not wholly
-      * contained by it, then that frame's start is pointed by
-      * the next_frame member of the Stream structure. This
-      * common situation occurs when mad_frame_decode() fails,
-      * sets the stream error code to MAD_ERROR_BUFLEN, and
-      * sets the next_frame pointer to a non NULL value. (See
-      * also the comment marked {4} bellow.)
-      *
-      * When this occurs, the remaining unused bytes must be
-      * put back at the beginning of the buffer and taken in
-      * account before refilling the buffer. This means that
-      * the input buffer must be large enough to hold a whole
-      * frame at the highest observable bit-rate (currently 448
-      * kb/s). XXX=XXX Is 2016 bytes the size of the largest
-      * frame? (448000*(1152/32000))/8
-      */
-      if (madStream.next_frame != NULL)
-      {
-         remaining = madStream.bufend - madStream.next_frame;
-         memmove (pMP3_Buffer, madStream.next_frame, remaining);
-
-         pReadStart = pMP3_Buffer + remaining;
-         readSize = MP3_BufferSize - remaining;
-      }
-      else
-      {
-         readSize = MP3_BufferSize;
-         pReadStart = pMP3_Buffer;
-         remaining = 0;
-      }
-
-      readSize = mp3File.read( reinterpret_cast<char*>(pReadStart), readSize );
-
-      // nothing else to read!
-      if (readSize <= 0) 
-         return false;
-
-      if ( mp3File.atEnd() )
-      {
-         pGuard = pReadStart + readSize;
-
-         memset (pGuard, 0, MAD_BUFFER_GUARD);
-         readSize += MAD_BUFFER_GUARD;
-      }
-
-      // Pipe the new buffer content to libmad's stream decoder facility.
-      mad_stream_buffer( &madStream, pMP3_Buffer,
-                         static_cast<unsigned int>(readSize + remaining));
-
-      madStream.error = MAD_ERROR_NONE;
-   }
-
-   return true;
-}
-
-// -----------------------------------------------------------------------------
-
-void MadSource::skipSilence(double silenceThreshold /* = 0.0001 */)
-{
-   mad_frame  madFrame;
-   mad_synth    madSynth;
-
-   mad_frame_init(&madFrame);
-   mad_synth_init (&madSynth);
-
-   silenceThreshold *= static_cast<double>( numeric_limits<short>::max() );
-
-   for (;;)
-   {
-      if ( !fetchData( m_inputFile, m_pMP3_Buffer, m_MP3_BufferSize, m_mad_stream) )
-         break;
-
-      if ( mad_frame_decode(&madFrame, &m_mad_stream) != 0 )
-      {
-         if ( isRecoverable(m_mad_stream.error) )
-            continue;
-         else
-            break;
-      }
-
-      mad_synth_frame (&madSynth, &madFrame);
-
-      double sum = 0;
-
-      switch (madSynth.pcm.channels)
-      {
-      case 1:
-         for (size_t j = 0; j < madSynth.pcm.length; ++j)
-            sum += abs(f2s(madSynth.pcm.samples0j));
-         break;
-      case 2:
-         for (size_t j = 0; j < madSynth.pcm.length; ++j)
-            sum += abs(f2s(
-                     (madSynth.pcm.samples0j >> 1)
-                   + (madSynth.pcm.samples1j >> 1)));
-         break;
-      }
-
-      if ( (sum >= silenceThreshold * madSynth.pcm.length) )
-         break;
-   }
-
-   mad_frame_finish(&madFrame);
-}
-
-// -----------------------------------------------------------------------------
-
-void MadSource::skip(const int mSecs)
-{
-   if ( mSecs <= 0 )
-      return;
-
-   mad_header  madHeader;
-   mad_header_init(&madHeader);
-
-   for (;;)
-   {
-      if (!fetchData( m_inputFile, m_pMP3_Buffer, m_MP3_BufferSize, m_mad_stream))
-         break;
-
-      if ( mad_header_decode(&madHeader, &m_mad_stream) != 0 )
-      {
-         if ( isRecoverable(m_mad_stream.error) )
-            continue;
-         else
-            break;
-      }
- 
-      mad_timer_add(&m_mad_timer, madHeader.duration);
-
-      if ( mad_timer_count(m_mad_timer, MAD_UNITS_MILLISECONDS) >= mSecs )
-         break;
-   }
-
-   mad_header_finish(&madHeader);
-}
-
-// -----------------------------------------------------------
-
-int MadSource::updateBuffer(signed short* pBuffer, size_t bufferSize)
-{
-   size_t nwrit = 0; //number of samples written to the output buffer
-
-   for (;;)
-   {
-      // get a (valid) frame
-      // m_pcmpos == 0 could mean two things
-      // - we have completely decoded a frame, but the output buffer is still
-      //   not full (it would make more sense for pcmpos == pcm.length(), but
-      //   the loop assigns pcmpos = 0 at the end and does it this way!
-      // - we are starting a stream
-      if ( m_pcmpos == m_mad_synth.pcm.length )
-      {
-         if ( !fetchData( m_inputFile, m_pMP3_Buffer, m_MP3_BufferSize, m_mad_stream) )
-         {
-            break; // nothing else to read
-         }
-
-         // decode the frame
-         if (mad_frame_decode (&m_mad_frame, &m_mad_stream))
-         {
-            if ( isRecoverable(m_mad_stream.error) )
-               continue;
-            else
-               break;
-         } // if (mad_frame_decode (&madFrame, &madStream))
-
-         mad_timer_add (&m_mad_timer, m_mad_frame.header.duration);
-         mad_synth_frame (&m_mad_synth, &m_mad_frame);
-
-         m_pcmpos = 0;
-      }
-
-      size_t samples_for_mp3 = m_mad_synth.pcm.length - m_pcmpos;
-      size_t samples_for_buf = bufferSize - nwrit;
-      signed short* pBufferIt = pBuffer + nwrit;
-      size_t i = 0, j = 0;
-
-      switch( m_mad_synth.pcm.channels )
-      {
-      case 1:
-         {
-            size_t samples_to_use = min (samples_for_mp3, samples_for_buf);
-            for (i = 0; i < samples_to_use; ++i )
-               pBufferIti = f2s( m_mad_synth.pcm.samples0i+m_pcmpos );
-         }
-         j = i;
-         break;
-
-      case 2:
-         for (; i < samples_for_mp3 && j < samples_for_buf ; ++i, j+=2 )
-         {
-            pBufferItj   = f2s( m_mad_synth.pcm.samples0i+m_pcmpos );
-            pBufferItj+1 = f2s( m_mad_synth.pcm.samples1i+m_pcmpos );
-         }
-         break;
-
-      default:
-         cerr << "wtf kind of mp3 has " << m_mad_synth.pcm.channels << " channels??\n";
-         break;
-      }
-
-      m_pcmpos += i;
-      nwrit += j;
-
-      assert( nwrit <= bufferSize );
-
-      if (nwrit == bufferSize) 
-         return static_cast<int>(nwrit);
-   }
-
-   return static_cast<int>(nwrit);
-}
-
-// -----------------------------------------------------------------------------
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/MadSource.h Deleted

@@ -1,69 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __MP3_SOURCE_H__
-#define __MP3_SOURCE_H__
-
-#include <lastfm/FingerprintableSource>
-#include <QFile>
-#include <string>
-#include <vector>
-#include <fstream>
-#include <mad.h>
-
-
-class MadSource : public lastfm::FingerprintableSource
-{
-public:
-    MadSource();
-    ~MadSource();
-
-    virtual void getInfo(int& lengthSecs, int& samplerate, int& bitrate, int& nchannels);
-    virtual void init(const QString& fileName);
-    virtual int updateBuffer(signed short* pBuffer, size_t bufferSize);
-    virtual void skip(const int mSecs);
-    virtual void skipSilence(double silenceThreshold = 0.0001);
-    virtual bool eof() const { return m_inputFile.atEnd(); }
-
-private:
-    static bool fetchData( QFile& mp3File,
-                           unsigned char* pMP3_Buffer,
-                           const int MP3_BufferSize,
-                           mad_stream& madStream );
-
-    static bool isRecoverable(const mad_error& error, bool log = false);
-
-    static std::string MadErrorString(const mad_error& error);
-
-    struct mad_stream    m_mad_stream;
-    struct mad_frame     m_mad_frame;
-    mad_timer_t          m_mad_timer;
-    struct mad_synth     m_mad_synth;
-
-    QFile                m_inputFile;
-
-    unsigned char*       m_pMP3_Buffer;
-    static const int     m_MP3_BufferSize = (5*8192);
-    QString              m_fileName;
-
-    size_t               m_pcmpos;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/VorbisSource.cpp Deleted

@@ -1,204 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "VorbisSource.h"
-#include <QFile>
-#include <cassert>
-#include <cstdlib>
-#include <iostream>
-#include <limits>
-#include <stdexcept>
-#include <errno.h>
-
-// These specify the output format
-static const int wordSize = 2; // 16 bit output
-static const int isSigned = 1;
-#if __BIG_ENDIAN__
-static const int isBigEndian = 1;
-#else
-static const int isBigEndian = 0;
-#endif
-
-
-VorbisSource::VorbisSource()
-    : m_channels( 0 )
-    , m_samplerate( 0 )
-    , m_eof( false )
-{
-    memset( &m_vf, 0, sizeof(m_vf) );
-}
-
-// ---------------------------------------------------------------------
-
-VorbisSource::~VorbisSource()
-{
-    // ov_clear() also closes the file
-    ov_clear( &m_vf );
-}
-
-// ---------------------------------------------------------------------
-
-void VorbisSource::init(const QString& fileName)
-{
-    m_fileName = fileName;
-    
-    if ( m_vf.datasource )
-    {
-        std::cerr << "Warning: file already appears to be open";
-        return;
-    }
-
-    FILE *fp = fopen(QFile::encodeName(m_fileName), "rb" );
-    if( !fp )
-        throw std::runtime_error( "ERROR: Cannot open ogg file!" );
-
-    // See the warning about calling ov_open on Windows
-    if ( ov_test_callbacks( fp, &m_vf, NULL, 0, OV_CALLBACKS_DEFAULT ) < 0 )
-    {
-        fclose( fp );
-        throw std::runtime_error( "ERROR: This is not an ogg vorbis file!" );
-    }
-
-    ov_test_open( &m_vf );
-
-    // Don't fingerprint files with more than one logical bitstream
-    // They most likely contain more than one track
-    if ( ov_streams( &m_vf ) != 1 )
-        throw std::runtime_error( "ERROR: ogg file contains multiple bitstreams" );
-
-    m_channels = ov_info( &m_vf, 0 )->channels;
-    m_samplerate = static_cast<int>(ov_info( &m_vf, 0 )->rate);
-    m_eof = false;
-}
-
-void VorbisSource::getInfo( int& lengthSecs, int& samplerate, int& bitrate, int& nchannels)
-{
-    // stream info
-    nchannels = ov_info( &m_vf, -1 )->channels;
-    samplerate = static_cast<int>(ov_info( &m_vf, -1 )->rate);
-    lengthSecs = static_cast<int>(ov_time_total( &m_vf, -1 ) + 0.5);
-    bitrate = static_cast<int>(ov_bitrate( &m_vf, -1 ));
-}
-
-// ---------------------------------------------------------------------
-
-void VorbisSource::skip( const int mSecs )
-{
-    if ( mSecs < 0 )
-        return;
-
-    double ts = mSecs / 1000.0 + ov_time_tell( &m_vf );
-    ov_time_seek( &m_vf, ts );
-}
-
-// ---------------------------------------------------------------------
-
-void VorbisSource::skipSilence(double silenceThreshold /* = 0.0001 */)
-{
-    silenceThreshold *= static_cast<double>( std::numeric_limits<short>::max() );
-
-    char sampleBuffer4096;
-    int bs = 0;
-    for (;;)
-    {
-        long charReadBytes = ov_read( &m_vf, sampleBuffer, 4096, isBigEndian, wordSize, isSigned, &bs );
-
-        // eof
-        if ( !charReadBytes )
-        {
-            m_eof = true;
-            break;
-        }
-        if ( charReadBytes < 0 )
-        {
-            // a bad bit of data: OV_HOLE || OV_EBADLINK
-            continue;
-        }
-        else if ( charReadBytes > 0 )
-        {
-            double sum = 0;
-            int16_t *buf = reinterpret_cast<int16_t*>(sampleBuffer);
-            switch ( m_channels )
-            {
-                case 1:
-                    for (long j = 0; j < charReadBytes/wordSize; j++)
-                        sum += abs( bufj );
-                    break;
-                case 2:
-                    for (long j = 0; j < charReadBytes/wordSize; j+=2)
-                        sum += abs( (bufj >> 1) + (bufj+1 >> 1) );
-                    break;
-            }
-            if ( sum >= silenceThreshold * static_cast<double>(charReadBytes/wordSize/m_channels) )
-                break;
-        }
-    }
-}
-
-// ---------------------------------------------------------------------
-
-int VorbisSource::updateBuffer( signed short *pBuffer, size_t bufferSize )
-{
-    char buf bufferSize * wordSize ;
-    int bs = 0;
-    size_t charwrit = 0; //number of samples written to the output buffer
-
-    for (;;)
-    {
-        long charReadBytes = ov_read( &m_vf, buf, static_cast<int>(bufferSize * wordSize - charwrit),
-                                      isBigEndian, wordSize, isSigned, &bs );
-        if ( !charReadBytes )
-        {
-            m_eof = true;
-            break; // nothing else to read
-        }
-
-        // Don't really need this though since we're excluding files that have
-        // more than one logical bitstream
-        if ( bs != 0 )
-        {
-            vorbis_info *vi = ov_info( &m_vf, -1 );
-            if ( m_channels != vi->channels || m_samplerate != vi->rate )
-            {
-                std::cerr << "Files that change channel parameters or samplerate are currently not supported" << std::endl;
-                return 0;
-            }
-        }
-
-        if( charReadBytes < 0 )
-        {
-            std::cerr << "Warning: corrupt section of data, attempting to continue..." << std::endl;
-            continue;
-        }
-
-        char* pBufferIt = reinterpret_cast<char*>(pBuffer) + charwrit;
-        charwrit += charReadBytes;
-
-        assert( charwrit <= bufferSize * wordSize );
-        memcpy( pBufferIt, buf, charReadBytes );
-
-      if (charwrit == bufferSize * wordSize)
-         return static_cast<int>(charwrit/wordSize);
-   }
-
-   return static_cast<int>(charwrit/wordSize);
-}
-
-// -----------------------------------------------------------------------------
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/VorbisSource.h Deleted

@@ -1,47 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __VORBIS_SOURCE_H__
-#define __VORBIS_SOURCE_H__
-
-#include <FingerprintableSource.h>
-#include <vorbis/vorbisfile.h>
-
-
-class VorbisSource : public lastfm::FingerprintableSource
-{
-public:
-    VorbisSource();
-    ~VorbisSource();
-    virtual void getInfo(int& lengthSecs, int& samplerate, int& bitrate, int& nchannels);
-    virtual void init(const QString& fileName);
-    virtual int updateBuffer(signed short* pBuffer, size_t bufferSize);
-    virtual void skip(const int mSecs);
-    virtual void skipSilence(double silenceThreshold = 0.0001);
-    virtual bool eof() const { return m_eof; }
-
-private:
-    OggVorbis_File m_vf;
-    QString m_fileName;
-    int m_channels;
-    int m_samplerate;
-    bool m_eof;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/lastfm-fingerprint.pro Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/contrib/main.cpp Deleted

@@ -1,173 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-   Copyright 2009 John Stamp <jstamp@users.sourceforge.net>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// ubuntu 9.04: sudo apt-get install libmad0-dev libvorbis-dev libflac-dev libfaac-dev
-// macports: sudo port install libmad libvorbis libflac
-// Windows: lol
-
-#include "MadSource.h"
-#include "VorbisSource.h"
-#include "FlacSource.h"
-#include "AacSource.h"
-#include <lastfm.h>
-#include <QCoreApplication>
-#include <QFile>
-#include <QStringList>
-#include <iostream>
-int typeOf(const QString& path);
-lastfm::FingerprintableSource* factory(int type);
-enum { MP3, OGG, FLAC, AAC, UNKNOWN };
-namespace lastfm { Track taglib(const QString& path); }
-
-
-int main(int argc, char** argv) try
-{
-    if (argc < 2) {
-        std::cerr << "usage: " << argv0 << " path" << std::endl;
-        return 1;
-    }
- 
-    QCoreApplication app(argc, argv);
-    QEventLoop loop;
-    
-    QString const path = QFile::decodeName(argv1);
-    
-    lastfm::Track t = lastfm::taglib(path); //see contrib //TODO mbid
-    lastfm::Fingerprint fp(t);
-    if (fp.id().isNull()) {
-        lastfm::FingerprintableSource* src = factory(typeOf(path));
-        fp.generate(src);
-        QNetworkReply* reply = fp.submit();
-        loop.connect(reply, SIGNAL(finished()), SLOT(quit()));
-        fp.decode(reply);
-    }
-    
-    QNetworkReply* reply = fp.id().getSuggestions();
-    loop.connect(reply, SIGNAL(finished()), SLOT(quit()));
-    
-    std::cout << reply->readAll().data() << std::endl; //returns XML
-    return 0;
-}
-catch (std::exception& e)
-{
-    std::cerr << e.what() << std::endl;
-}
-
-lastfm::FingerprintableSource* factory(int type)
-{
-    switch (type) {
-        case MP3: return new MadSource;
-        case OGG: return new VorbisSource;
-        case FLAC: return new FlacSource;
-    #ifndef MACPORTS_SUCKS
-        case AAC: return new AacSource;
-    #endif
-        default: throw std::runtime_error("Cannot handle filetype");
-    }
-}
-
-int typeOf(const QString& fileName)
-{
-    QStringList parts = fileName.split( "." );
-    QString extension;
-    if ( parts.size() > 1 )
-        extension = parts.last();
-
-    // Let's be trusting about extensions
-    if ( extension.toLower() == "mp3" )
-        return MP3;
-    else if ( extension.toLower() == "ogg" )
-        return OGG;
-    else if ( extension.toLower() == "oga" )
-        return FLAC;
-    else if ( extension.toLower() == "flac" )
-        return FLAC;
-    else if ( extension.toLower() == "aac" )
-        return AAC;
-    else if ( extension.toLower() == "m4a" )
-        return AAC;
-
-    // So much for relying on extensions.  Let's try file magic instead.
-    FILE *fp = NULL;
-    unsigned char header35;
-
-    fp = fopen(QFile::encodeName(fileName), "rb");
-    if ( !fp )
-    {
-        return UNKNOWN;
-    }
-    int fType = UNKNOWN;
-    fread( header, 1, 35, fp );
-
-    // Some formats can have ID3 tags (or not), so let's just
-    // get them out of the way first before we check what we have.
-    if ( memcmp( header, "ID3", 3) == 0 )
-    {
-        int tagsize = 0;
-        /* high bit is not used */
-        tagsize = (header6 << 21) | (header7 << 14) |
-            (header8 <<  7) | (header9 <<  0);
-
-        tagsize += 10;
-        fseek( fp, tagsize, SEEK_SET );
-        fread( header, 1, 35, fp );
-    }
-
-    if ( (header0 == 0xFF) && ((header1 & 0xFE) == 0xFA ) )
-    {
-        fType = MP3;
-    }
-    else if ( memcmp(header, "OggS", 4) == 0 )
-    {
-        if ( memcmp(&header29, "vorbis", 6) == 0 )
-        {
-            // ogg vorbis (.ogg)
-            fType = OGG;
-        }
-        else if ( memcmp(&header29, "FLAC", 4) == 0 )
-        {
-            // ogg flac (.oga)
-            fType = FLAC;
-        }
-    }
-    else if ( memcmp(header, "fLaC", 4 ) == 0 )
-    {
-        // flac file
-        fType = FLAC;
-    }
-    else if ( (header0 == 0xFF) && ((header1 & 0xF6) == 0xF0) )
-    {
-        // aac adts
-        fType = AAC;
-    }
-    else if (memcmp(header, "ADIF", 4) == 0)
-    {
-        // aac adif
-        fType = AAC;
-    }
-    else if ( memcmp( &header4, "ftyp", 4 ) == 0 )
-    {
-        // mp4 header: aac
-        fType = AAC;
-    }
-
-    fclose(fp);
-    return fType;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fingerprint.pro Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fplib Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fplib/CircularArray.h Deleted

@@ -1,292 +0,0 @@
-/*
-   Copyright 2005-2009 Last.fm Ltd. <mir@last.fm>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __CIRCULAR_ARRAY_H
-#define __CIRCULAR_ARRAY_H
-
-#include <iostream>
-#include <iterator>
-#include <vector>
-#include <algorithm>
-#include <cstdlib> // for memset
-#include <algorithm> // for max
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-template< typename T >
-class CircularArray 
-{
-
-public:
-
-   typedef size_t size_type;
-
-   /////////////////////////////////////////////////////////////
-
-   // IMPORTANT: The distance must be redefined!!
-   // See declaration of iterator from stl_iterator_base_types.h:
-   //   template<typename _Category, typename _Tp, typename _Distance = ptrdiff_t,
-   //            typename _Pointer = _Tp*, typename _Reference = _Tp&>
-   //   struct iterator { ...
-
-   // ---------- Forward declarations
-
-   class iterator : 
-      public std::iterator<std::random_access_iterator_tag, T>
-   {
-      // it should be by default because is an inner class, but I put it just to be sure..
-      friend class CircularArray;
-
-   private:
-      iterator( size_type idx, T* pData, size_type size ) : _idx(idx), _pData(pData), _size(size) {}
-
-   public:
-
-      //typedef random_access_iterator_tag iterator_category;
-
-      iterator() : _idx(0), _pData(NULL) {}
-
-      iterator& operator++()
-      { // preincrement
-         _idx = (_idx + 1) % _size;
-         return (*this);
-      }
-
-      iterator operator++(int)
-      { // postincrement
-         iterator _Tmp = *this;
-         _idx = (_idx + 1) % _size;
-         return (_Tmp);
-      }
-
-      void operator+=(size_type offs)
-      {
-         this->_idx = (_idx + offs) % _size;
-      }
-
-      iterator operator+(size_type offs) const 
-      {
-         size_type newIdx = (_idx + offs) % _size;
-         iterator _Tmp(newIdx, _pData, _size);
-         return _Tmp;
-      }
-
-      // return the distance between this iterator and it
-      size_t operator-(const iterator& it) const
-      {
-         if ( this->_idx > it._idx )
-            return this->_idx - it._idx;
-         else
-            return this->_idx + (_size - it._idx);
-      }
-
-      iterator operator-(size_type offs) const
-      {
-         size_type newIdx;
-
-         if ( offs <= _idx )
-            newIdx = _idx - offs;
-         else
-            newIdx = _size - ((_idx - offs) % _size); // note: should be ok, but to be checked better
-
-         iterator _Tmp(newIdx, _pData, _size);
-         return _Tmp;
-      }
-
-      iterator& operator--()
-      { // predecrement
-         if (_idx == 0)
-            _idx = _size - 1;
-         else
-            --_idx;
-         return (*this);
-      }
-
-      iterator operator--(int)
-      { // postdecrement
-         iterator _Tmp = *this;
-         if (_idx == 0)
-            _idx = _size - 1;
-         else
-            --_idx;
-         return (_Tmp);
-      }
-
-      T& operator*() const
-      { // return designated object
-         return _pData_idx;
-      }
-
-      T* operator->() const
-      { // return pointer to class object
-         return &_pData_idx;
-      }    
-
-      /*    T& operator=(const T& right)
-      { // assign reference right to _val
-      return ( this->_idx = right._idx );
-      }*/    
-
-      bool operator==(const iterator& right) const
-      { // test for iterator equality
-         return ( this->_idx == right._idx );
-      }
-
-      bool operator!=(const iterator& right) const
-      { // test for iterator inequality
-         return ( this->_idx != right._idx );
-      }
-
-   protected:
-      size_type  _idx;
-      T*         _pData;
-      size_type  _size;
-   };
-
-   /////////////////////////////////////////////////////////////
-
-
-   CircularArray()
-      : _headIdx(0), _pData(NULL), _size(0)
-   { }
-
-   CircularArray( size_type size )
-      : _headIdx(0), _pData(NULL)
-   {
-      this->resize(size);
-   }
-
-   CircularArray( size_type size, const T& init )
-      : _headIdx(0), _pData(NULL)
-   {
-      this->resize(size, init);
-   }
-
-   ~CircularArray()
-   {
-      this->clear();
-   }
-
-   // remember: it is not working (yet!) with negative numbers!
-   T& operator(size_type offset)
-   {    
-      return _pData (_headIdx + offset) % _size ;
-   }
-
-   void resize( size_type size )
-   {
-      _headIdx = 0;
-      if ( size == _size )
-         return;
-
-      this->clear();
-      _pData = new Tsize;
-      _size = size;
-   }
-
-   void resize( size_type size, const T& init )
-   {
-      this->resize(size, false);
-      this->fill(init);
-   }
-
-   void fill( const T& val )
-   {
-      for (size_type i=0; i<_size; ++i)
-         _pDatai = val;
-   }
-
-   void zero_fill()
-   {
-      memset( _pData, 0, _size * sizeof(T) );
-   }
-
-   bool empty() const
-   {
-      return ( _pData == NULL );
-   }
-
-   void clear()
-   {
-      if (_pData)
-         delete  _pData;
-      _pData = NULL;
-      _headIdx = 0;
-      _size = 0;
-   }
-
-   iterator head() const
-   {
-      if (_pData == NULL)
-         std::cerr << "WARNING: iterator in CircularArray points to an empty CircularArray" << std::endl;
-      return iterator(_headIdx, _pData, _size);
-   }
-
-   void shift_head( int offset )
-   {
-      if ( offset < 0)
-      {
-         int mod = (-offset) % (int)_size;
-         mod -= (int)_headIdx;
-         _headIdx = _size - mod;
-      }
-      else
-         _headIdx = (_headIdx + offset) % _size;
-   }
-
-   size_type size() const
-   {
-      return _size;
-   }
-
-   //// to be changed to an input forward iterator
-   //template <typename TIterator>
-   //void get_data( TIterator toFillIt, size_type size = 0 )
-   //{
-   //  if ( size == 0 )
-   //    size = _size;
-   //  iterator it = head();
-   //  
-   //  for (size_type i = 0; i < size; ++i)
-   //    *(toFillIt++) = *(it++);
-   //}
-
-   // IMPORTANT! Destination buffer MUST be the same size!
-   void copy_buffer( T* pDest )
-   {
-      memcpy( pDest, _pData, sizeof(T)*_size );
-   }
-
-   // returns the buffer
-   T* get_buffer() const
-   {
-      return _pData;
-   }
-
-
-private:
-
-   size_type  _headIdx; // index
-   T*         _pData;   // array of data
-   size_type  _size;    // size of data
-
-};
-
-#endif // __CIRCULAR_ARRAY_H

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fplib/Filter.cpp Deleted

@@ -1,128 +0,0 @@
-/*
-   Copyright 2005-2009 Last.fm Ltd. <mir@last.fm>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <iostream>
-#include <algorithm> // for max
-#include <vector>
-
-#include "Filter.h"
-#include "fp_helper_fun.h"
-
-using namespace std;
-
-namespace fingerprint
-{
-
-Filter::Filter(unsigned int id, float threshold, float weight) 
-: id(id), threshold(threshold), weight(weight)
-{
-    float time_rate = 1.5;
-        
-    unsigned int t = 1;
-    vector<unsigned int> time_lengths;
-
-    while (t < KEYWIDTH) 
-   {
-        time_lengths.push_back(t);
-      t = max( static_cast<unsigned int>( round__(time_rate*t) ) +
-               static_cast<unsigned int>( round__(time_rate*t) % 2),
-               t+1 );
-    }
-
-    unsigned int filter_count = 0;
-
-    for (wt = 1; wt <= time_lengths.size(); wt++) 
-   {
-        for (wb = 1; wb <= NBANDS; wb++) 
-      {
-            for (first_band = 1; first_band <= NBANDS - wb + 1;
-                 first_band++) 
-         {
-                unsigned int time = time_lengthswt-1;
-                filter_count++;
-
-                if (filter_count == id) 
-            {
-                    wt = time_lengthswt-1;
-                    filter_type = 1;
-                    return;
-                }
-
-                if (time > 1) 
-            {
-                    filter_count++;
-                    if (filter_count == id) 
-               {
-                        wt = time_lengthswt-1;
-                        filter_type = 2;
-                        return;
-                    }
-                }
-                    
-                if (wb > 1) 
-            {
-                    filter_count++;
-                    if (filter_count == id) 
-               {
-                        wt = time_lengthswt-1;
-                        filter_type = 3;
-                        return;
-                    }
-                }
-
-                if (time > 1 && wb > 1) 
-            {
-                    filter_count++;
-                    if (filter_count == id) 
-               {
-                        wt = time_lengthswt-1;
-                        filter_type = 4;
-                        return;
-                    }
-                }
-                
-                if (time > 3) 
-            {
-                    filter_count++;
-                    if (filter_count == id) 
-               {
-                        wt = time_lengthswt-1;
-                        filter_type = 5;
-                        return;
-                    }
-                }
-                
-                if (wb > 3) 
-            {
-                    filter_count++;
-                    if (filter_count == id) 
-               {
-                        wt = time_lengthswt-1;
-                        filter_type = 6;
-                        return;
-                    }
-                }
-
-            } // for first_band
-        } // for wb
-    } // for wt
-}
-
-} // end of namespace fingerprint
-
-// -----------------------------------------------------------------------------

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fplib/Filter.h Deleted

@@ -1,47 +0,0 @@
-/*
-   Copyright 2005-2009 Last.fm Ltd. <mir@last.fm>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __FILTER_H
-#define __FILTER_H
-
-namespace fingerprint
-{
-
-struct Filter 
-{
-    /// Constructs a new filter with id.
-    Filter(unsigned int id, float threshold, float weight);
-   
-   unsigned int id; //< filter id
-    unsigned int wt; //< time width
-    unsigned int first_band; //< first band
-    unsigned int wb; //< band width
-    unsigned int filter_type; //< filter type
-    
-    float threshold; //< threshold for filter
-    float weight; //< filter weight
-
-   // number of frames in time
-   static const unsigned int KEYWIDTH = 100;
-   // number of bands to divide the signal (log step)
-   static const unsigned int NBANDS = 33;
-};
-
-}
-
-#endif // __FILTER_H

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fplib/FingerprintExtractor.cpp Deleted

@@ -1,786 +0,0 @@
-/*
-   Copyright 2005-2009 Last.fm Ltd. <mir@last.fm>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <iostream>
-#include <limits>
-#include <bitset>
-#include <deque>
-#include <vector>
-#include <stdexcept>
-#include <cmath>
-#include <cstring>
-
-#include <samplerate.h> // libsamplerate
-
-#include "FingerprintExtractor.h"
-#include "fp_helper_fun.h" // for GroupData
-#include "Filter.h"
-#include "FloatingAverage.h"
-#include "OptFFT.h"
-
-//////////////////////////////////////////////////////////////////////////
-
-namespace fingerprint
-{
-
-using namespace std;
-static const int NUM_FRAMES_CLIENT = 32; // ~= 10 secs.
-
-enum eProcessType
-{
-   PT_UNKNOWN,
-   PT_FOR_QUERY,
-   PT_FOR_FULLSUBMIT
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-class PimplData
-{
-
-public:
-
-   PimplData()
-   : m_pDownsampledPCM(NULL), m_pDownsampledCurrIt(NULL),
-     m_normalizedWindowMs(static_cast<unsigned int>(NORMALIZATION_SKIP_SECS * 1000 * 2)),
-     m_compensateBufferSize(FRAMESIZE-OVERLAPSAMPLES + Filter::KEYWIDTH * OVERLAPSAMPLES),
-     m_downsampledProcessSize(NUM_FRAMES_CLIENT*FRAMESIZE),
-     // notice that the buffer has extra space on either side for the normalization window  
-     m_fullDownsampledBufferSize( m_downsampledProcessSize + // the actual processed part
-                                  m_compensateBufferSize +  // a compensation buffer for the fft
-                                ((m_normalizedWindowMs * DFREQ / 1000) / 2) ), // a compensation buffer for the normalization
-     m_normWindow(m_normalizedWindowMs * DFREQ / 1000),
-     m_pFFT(NULL), m_pDownsampleState(NULL), m_processType(PT_UNKNOWN)
-   {
-      m_pFFT            = new OptFFT(m_downsampledProcessSize + m_compensateBufferSize);
-      m_pDownsampledPCM = new floatm_fullDownsampledBufferSize;
-
-      // the end of ||-------m_bufferSize-------|-cb-|---norm/2---|| 
-      //                                                           ^-- pEndDownsampledBuf
-      m_pEndDownsampledBuf = m_pDownsampledPCM + m_fullDownsampledBufferSize;
-
-      // loading filters
-      size_t numFilters = sizeof(rFilters) / sizeof(RawFilter) ;
-      for (size_t i = 0; i < numFilters; ++i)
-         m_filters.push_back( Filter( rFiltersi.ftid, rFiltersi.thresh, rFiltersi.weight ) );
-
-   }
-
-   ~PimplData()
-   {
-      if ( m_pFFT )
-         delete m_pFFT;
-      m_pFFT = NULL;
-      if ( m_pDownsampledPCM )
-         delete  m_pDownsampledPCM;
-      m_pDownsampledPCM = NULL;
-
-      if ( m_pDownsampleState )
-         src_delete(m_pDownsampleState) ;
-
-   }
-
-   float*                 m_pDownsampledPCM;
-   float*                 m_pDownsampledCurrIt;
-
-   const unsigned int     m_normalizedWindowMs;
-   const size_t           m_compensateBufferSize;
-   const size_t           m_downsampledProcessSize;
-   const size_t           m_fullDownsampledBufferSize;
-
-   FloatingAverage<double> m_normWindow;
-   OptFFT*                 m_pFFT;
-
-   //////////////////////////////////////////////////////////////////////////
-   
-   // libsamplerate
-   SRC_STATE*              m_pDownsampleState;
-   SRC_DATA                m_downsampleData;
-
-   vector<float>           m_floatInData;
-
-   //////////////////////////////////////////////////////////////////////////
-
-
-   bool                   m_groupsReady;
-   bool                   m_preBufferPassed;
-
-   eProcessType           m_processType;
-
-   size_t                 m_toSkipSize;
-   size_t                 m_toSkipMs;
-
-   size_t                 m_skippedSoFar;
-   bool                   m_skipPassed;
-
-   float*                 m_pEndDownsampledBuf;
-
-   int m_freq;
-   int m_nchannels;
-
-   unsigned int m_lengthMs;
-   int          m_minUniqueKeys;
-   unsigned int m_uniqueKeyWindowMs;
-
-   unsigned int m_toProcessKeys;
-   unsigned int m_totalWindowKeys;
-   
-   vector<Filter>     m_filters;
-
-   deque<GroupData>   m_groupWindow;
-   vector<GroupData>  m_groups;
-   unsigned int       m_processedKeys;
-
-   vector<unsigned int>   m_partialBits; // here just to avoid reallocation
-
-#if __BIG_ENDIAN__
-
-#define reorderbits(X)  ((((unsigned int)(X) & 0xff000000) >> 24) | \
-                        (((unsigned int)(X) & 0x00ff0000) >> 8)  | \
-                        (((unsigned int)(X) & 0x0000ff00) << 8)  | \
-                        (((unsigned int)(X) & 0x000000ff) << 24))
-
-   vector<GroupData>  m_bigEndianGroups;
-#endif
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-void initCustom( PimplData& pd,
-                 int freq, int nchannels,
-                 unsigned int lengthMs, unsigned int skipMs,
-                 int minUniqueKeys, unsigned int uniqueKeyWindowMs, int duration );
-
-inline float getRMS( const FloatingAverage<double>& signal );
-unsigned int processKeys( deque<GroupData>& groups, size_t size, PimplData& pd );
-void         integralImage( float** ppFrames, unsigned int nFrames );
-void         computeBits( vector<unsigned int>& bits,
-                          const vector<Filter>& f, 
-                          float ** frames, unsigned int nframes );
-
-
-void src_short_to_float_and_mono_array(const short *in, float *out, int srclen, int nchannels);
-
-//////////////////////////////////////////////////////////////////////////
-
-// -----------------------------------------------------------------------------
-
-FingerprintExtractor::FingerprintExtractor()
-: m_pPimplData(NULL)
-{
-   m_pPimplData = new PimplData();
-}
-
-// -----------------------------------------------------------------------------
-
-FingerprintExtractor::~FingerprintExtractor()
-{
-   if ( m_pPimplData )
-      delete m_pPimplData;
-}
-
-// -----------------------------------------------------------------------------
-
-size_t FingerprintExtractor::getToSkipMs() 
-{ return m_pPimplData->m_toSkipMs; }
-
-// -----------------------------------------------------------------------------
-
-size_t FingerprintExtractor::getMinimumDurationMs()
-{
-   return static_cast<size_t>( (QUERY_SIZE_SECS + NORMALIZATION_SKIP_SECS * 2 + GUARD_SIZE_SECS) * 1000 );
-}
-
-// -----------------------------------------------------------------------------
-
-size_t FingerprintExtractor::getVersion()
-{ return FINGERPRINT_LIB_VERSION; }
-
-// -----------------------------------------------------------------------------
-
-void FingerprintExtractor::initForQuery(int freq, int nchannels, int duration )
-{
-   m_pPimplData->m_skipPassed = false;
-   m_pPimplData->m_processType = PT_FOR_QUERY;
-
-   if ( !m_pPimplData )
-      throw std::runtime_error("Not enough RAM to allocate the fingerprinter!");
-
-   initCustom( *m_pPimplData,
-               freq, nchannels,
-               static_cast<unsigned int>(QUERY_SIZE_SECS * 1000),
-               static_cast<unsigned int>(QUERY_START_SECS * 1000), 
-               MIN_UNIQUE_KEYS, 
-               static_cast<unsigned int>(UPDATE_SIZE_SECS * 1000), duration );
-}
-
-// -----------------------------------------------------------------------------
-
-void FingerprintExtractor::initForFullSubmit(int freq, int nchannels )
-{
-   m_pPimplData->m_skipPassed = true;
-   m_pPimplData->m_processType = PT_FOR_FULLSUBMIT;
-
-   if ( !m_pPimplData )
-      throw std::runtime_error("Not enough RAM to allocate the fingerprinter!");
-
-   initCustom( *m_pPimplData, 
-               freq, nchannels, 
-               numeric_limits<unsigned int>::max(), 
-               0, MIN_UNIQUE_KEYS, 0, -1 );
-}
-
-// -----------------------------------------------------------------------------
-
-void initCustom( PimplData& pd, 
-                 int freq, int nchannels,
-                 unsigned int lengthMs, 
-                 unsigned int skipMs, 
-                 int minUniqueKeys, 
-                 unsigned int uniqueKeyWindowMs, int duration )
-{
-   //////////////////////////////////////////////////////////////////////////
-   pd.m_freq = freq;
-   pd.m_nchannels = nchannels;
-   pd.m_lengthMs = lengthMs;
-   pd.m_minUniqueKeys = minUniqueKeys;
-   pd.m_uniqueKeyWindowMs = uniqueKeyWindowMs;
-   //////////////////////////////////////////////////////////////////////////
-
-   // ***********************************************************************
-   if ( pd.m_pDownsampleState )
-      pd.m_pDownsampleState = src_delete(pd.m_pDownsampleState) ;
-   pd.m_pDownsampleState = src_new (SRC_SINC_FASTEST, 1, NULL) ;
-   pd.m_downsampleData.src_ratio = FDFREQ / freq;
-   // ***********************************************************************
-
-   //////////////////////////////////////////////////////////////////////////
-   if ( pd.m_processType == PT_FOR_FULLSUBMIT ) 
-      skipMs = 0; // make sure
-   else if ( duration > 0 )
-   {
-      // skip + size + right normalization window + FFT guard
-      // 
-      int stdDurationMs = static_cast<int>((QUERY_START_SECS + QUERY_SIZE_SECS + NORMALIZATION_SKIP_SECS + GUARD_SIZE_SECS) * 1000);
-      int actualDurationMs = duration * 1000;
-      // compute the actual skipMs depending on the duration
-      if ( actualDurationMs < stdDurationMs )
-         skipMs -= max( stdDurationMs - actualDurationMs, 0 );
-   }
-
-   pd.m_toSkipMs = max( static_cast<int>(skipMs) - static_cast<int>((pd.m_normalizedWindowMs/2)), 0 );
-   pd.m_toSkipSize = static_cast<size_t>( freq * nchannels * 
-                                          (pd.m_toSkipMs / 1000.0) ); // half the norm window in secs;
-
-   //if ( pd.m_processType == PT_FOR_QUERY && skipMs > pd.m_normalizedWindowMs/2 )
-   //{
-   //   pd.m_toSkipMs = skipMs - (pd.m_normalizedWindowMs/2);
-   //   pd.m_toSkipSize = static_cast<size_t>( freq * nchannels * 
-   //                                         (pd.m_toSkipMs / 1000.0) ); // half the norm window in secs
-   //}
-   //else
-   //{
-   //   pd.m_toSkipMs = 0;
-   //   pd.m_toSkipSize = 0; // half of the normalization window will be skipped in ANY case
-   //}
-
-   pd.m_skippedSoFar = 0;
-   pd.m_groupsReady = false;
-   pd.m_preBufferPassed = false;
-
-   // prepare the position for pre-buffering
-   pd.m_pDownsampledCurrIt = pd.m_pDownsampledPCM + (pd.m_downsampledProcessSize - (pd.m_normWindow.size() / 2) ); 
-
-   pd.m_toProcessKeys = fingerprint::getTotalKeys(pd.m_lengthMs);//  (m_lengthMs * DFREQ) / (1000 * OVERLAPSAMPLES) + 1;
-   pd.m_totalWindowKeys = fingerprint::getTotalKeys(pd.m_uniqueKeyWindowMs); //(m_uniqueKeyWindowMs * DFREQ) / (1000 * OVERLAPSAMPLES) + 1;
-
-   if (pd.m_toProcessKeys == 1)
-      pd.m_toProcessKeys = 0;
-   if (pd.m_totalWindowKeys == 1)
-      pd.m_totalWindowKeys = 0;
-
-   pd.m_processedKeys = 0;
-
-   pd.m_groupWindow.clear();
-   pd.m_processedKeys = 0;
-}
-
-// -----------------------------------------------------------------------------
-
-
-// * cb = compensate buffer size
-// * norm = floating normalization window size
-//
-// PREBUFFER:
-//     (-------m_bufferSize-------)
-//    ||    EMPTY    |---norm/2---|-cb-|---norm/2---||
-// 1.                {--------read frames-----------}
-// 2.                {--read normalize window--}      
-// 3.                             {----}   normalize
-//
-// 1. read norm + cb frames to m_bufferSize - norm/2
-// 2. read m_buffersize - norm/2...m_buffersize + norm/2 into normalize window
-// 3. normalize m_bufferSize..m_bufferSize+cb
-//
-// PROCESS:
-//
-//     ||-------m_bufferSize-------|-cb-|---norm/2---||
-// 1.   <--------------------------{------copy-------}
-// 2.                    {--------read frames-------}
-// 3.        {---------normalize--------}
-// 4.   {------fft/process/whatevs------}
-//
-// 1. copy m_bufferSize..m_bufferSize + cb + norm/2 to beginning
-// 2. read m_bufferSize frames to cb + norm/2
-// 3. normalize cb..m_bufferSize+cb
-// 4. fft/process/whatevs 0...m_bufferSize+cb
-//
-// repeat until enough blocks processed and enough groups!
-//
-bool FingerprintExtractor::process( const short* pPCM, size_t num_samples, bool end_of_stream )
-{
-   if ( num_samples == 0 )
-      return false;
-
-   // easier read
-   PimplData& pd = *m_pPimplData;
-
-   if ( pd.m_processType == PT_UNKNOWN )
-      throw std::runtime_error("Please call initForQuery() or initForFullSubmit() before process()!");
-
-   const short* pSourcePCMIt = pPCM;
-   const short* pSourcePCMIt_end = pPCM + num_samples;
-
-   if ( !pd.m_skipPassed )
-   {
-      // needs to skip data? (reminder: the query needs to skip QUERY_START_SECS (- half of the normalization window)
-      if ( pd.m_skippedSoFar + num_samples > pd.m_toSkipSize )
-      {
-         pSourcePCMIt = pPCM + (pd.m_toSkipSize - pd.m_skippedSoFar);
-         pd.m_skipPassed = true;
-      }
-      else
-      {
-         // need more data
-         pd.m_skippedSoFar += num_samples;
-         return false;
-      }
-   }
-
-   pair<size_t, size_t> readData(0,0);
-   pd.m_downsampleData.end_of_input = end_of_stream ? 1 : 0;
-
-   //////////////////////////////////////////////////////////////////////////
-   // PREBUFFER:
-   if ( !pd.m_preBufferPassed )
-   {
-      // 1. downsample norm + cb frames to m_bufferSize - norm/2
-      pd.m_floatInData.resize( (pSourcePCMIt_end - pSourcePCMIt) / pd.m_nchannels);
-      src_short_to_float_and_mono_array( pSourcePCMIt, 
-                                         &(pd.m_floatInData0), static_cast<int>(pSourcePCMIt_end - pSourcePCMIt), 
-                                         pd.m_nchannels);
-
-      pd.m_downsampleData.data_in = &(pd.m_floatInData0);
-      pd.m_downsampleData.input_frames = static_cast<long>(pd.m_floatInData.size());
-
-      pd.m_downsampleData.data_out = pd.m_pDownsampledCurrIt;
-      pd.m_downsampleData.output_frames = static_cast<long>(pd.m_pEndDownsampledBuf - pd.m_pDownsampledCurrIt);
-
-      int err = src_process(pd.m_pDownsampleState, &(pd.m_downsampleData));
-      if ( err )
-         throw std::runtime_error( src_strerror(err) );
-
-      pd.m_pDownsampledCurrIt += pd.m_downsampleData.output_frames_gen;
-
-      if ( pd.m_pDownsampledCurrIt != pd.m_pEndDownsampledBuf )
-         return false; // NEED MORE DATA
-
-      pSourcePCMIt += pd.m_downsampleData.input_frames_used * pd.m_nchannels;
-
-      size_t pos = pd.m_downsampledProcessSize;
-      size_t window_pos = pd.m_downsampledProcessSize - pd.m_normWindow.size() / 2;
-      const size_t end_window_pos = window_pos + pd.m_normWindow.size();
-
-      // 2. read m_buffersize - norm/2...m_buffersize + norm/2 into normalize window
-      for (; window_pos < end_window_pos ; ++window_pos)
-         pd.m_normWindow.add(pd.m_pDownsampledPCMwindow_pos * pd.m_pDownsampledPCMwindow_pos);
-
-      // 3. normalize m_bufferSize..m_bufferSize+cb
-      for (; pos < pd.m_downsampledProcessSize + pd.m_compensateBufferSize; ++pos, ++window_pos)
-      {
-         pd.m_pDownsampledPCMpos /= getRMS(pd.m_normWindow);
-         pd.m_normWindow.add(pd.m_pDownsampledPCMwindow_pos * pd.m_pDownsampledPCMwindow_pos);
-      }
-
-      pd.m_preBufferPassed = true;
-   }
-
-   //////////////////////////////////////////////////////////////////////////
-   // PROCESS:
-
-   bool found_enough_unique_keys = false;
-   while (pd.m_toProcessKeys == 0 || pd.m_processedKeys < pd.m_toProcessKeys || !found_enough_unique_keys)
-   {
-
-      // 1. copy m_bufferSize..m_bufferSize + cb + norm/2 to beginning
-      if ( pd.m_pDownsampledCurrIt == pd.m_pEndDownsampledBuf )
-      {
-         memcpy( pd.m_pDownsampledPCM, pd.m_pDownsampledPCM + pd.m_downsampledProcessSize,
-                (pd.m_compensateBufferSize + (pd.m_normWindow.size() / 2)) * sizeof(float));
-         pd.m_pDownsampledCurrIt = pd.m_pDownsampledPCM + (pd.m_compensateBufferSize + (pd.m_normWindow.size() / 2));
-      }
-
-      // 2. read m_bufferSize frames to cb + norm/2
-      pd.m_floatInData.resize( (pSourcePCMIt_end - pSourcePCMIt) / pd.m_nchannels);
-
-      if ( pd.m_floatInData.empty() )
-         return false;
-
-      src_short_to_float_and_mono_array( pSourcePCMIt, 
-                                         &(pd.m_floatInData0), static_cast<int>(pSourcePCMIt_end - pSourcePCMIt), 
-                                         pd.m_nchannels);
-
-      pd.m_downsampleData.data_in = &(pd.m_floatInData0);
-      pd.m_downsampleData.input_frames = static_cast<long>(pd.m_floatInData.size());
-
-      pd.m_downsampleData.data_out = pd.m_pDownsampledCurrIt;
-      pd.m_downsampleData.output_frames = static_cast<long>(pd.m_pEndDownsampledBuf - pd.m_pDownsampledCurrIt);
-
-      int err = src_process(pd.m_pDownsampleState, &(pd.m_downsampleData));
-      if ( err )
-         throw std::runtime_error( src_strerror(err) );
-
-      pd.m_pDownsampledCurrIt += pd.m_downsampleData.output_frames_gen;
-
-      if ( pd.m_pDownsampledCurrIt != pd.m_pEndDownsampledBuf && !end_of_stream )
-         return false; // NEED MORE DATA
-
-      //pSourcePCMIt += readData.second;
-      pSourcePCMIt += pd.m_downsampleData.input_frames_used * pd.m_nchannels;
-
-      // ********************************************************************
-
-      // 3. normalize cb..m_bufferSize+cb
-      size_t pos = static_cast<unsigned int>(pd.m_compensateBufferSize);
-      size_t window_pos = static_cast<unsigned int>(pd.m_compensateBufferSize + (pd.m_normWindow.size() / 2));
-
-      for(; pos < pd.m_downsampledProcessSize + pd.m_compensateBufferSize /* m_fullDownsampledBufferSize*/; ++pos, ++window_pos)
-      {
-         pd.m_pDownsampledPCMpos /= getRMS(pd.m_normWindow);
-         pd.m_normWindow.add(pd.m_pDownsampledPCMwindow_pos * pd.m_pDownsampledPCMwindow_pos);
-      }
-
-      // 4. fft/process/whatevs 0...m_bufferSize+cb
-      pd.m_processedKeys += processKeys(pd.m_groupWindow, pos, pd);
-
-      // we have too many keys, now we have to chop either one end or the other
-      if (pd.m_toProcessKeys != 0 && pd.m_processedKeys > pd.m_toProcessKeys)
-      {
-         // set up window begin and end
-         deque<GroupData>::iterator itBeg = pd.m_groupWindow.begin(), itEnd = pd.m_groupWindow.end();
-         unsigned int offset_left, offset_right;
-
-         found_enough_unique_keys = 
-            fingerprint::findSignificantGroups( itBeg, itEnd, offset_left, offset_right, pd.m_toProcessKeys,
-                                                pd.m_totalWindowKeys, pd.m_minUniqueKeys);
-
-         // if we're happy with this set, snip the beginning and end of the grouped keys
-         if (found_enough_unique_keys)
-         {
-            itBeg->count -= offset_left;
-            if (offset_right > 0 && itEnd != pd.m_groupWindow.end())
-            {
-               itEnd->count = offset_right;
-               ++itEnd;
-            }
-         }
-
-         // chop the deque
-         copy(itBeg, itEnd, pd.m_groupWindow.begin());
-         pd.m_groupWindow.resize(itEnd - itBeg);            
-
-         // recalc keys
-         pd.m_processedKeys = 0;
-         for (deque<GroupData>::const_iterator it = pd.m_groupWindow.begin(); it != pd.m_groupWindow.end(); ++it)
-            pd.m_processedKeys += it->count;
-      }
-
-      if ( end_of_stream )
-         break;
-
-   } // while (totalKeys == 0 || keys < totalKeys || !found_enough_unique_keys)
-
-
-   if (pd.m_toProcessKeys != 0 && pd.m_processedKeys < pd.m_toProcessKeys)
-      throw std::runtime_error("Couldn't deliver the requested number of keys (it's the file too short?)");
-
-   if ((pd.m_toProcessKeys != 0 && !found_enough_unique_keys) || 
-       (pd.m_toProcessKeys == 0 && !enoughUniqueGoodGroups(pd.m_groupWindow.begin(), pd.m_groupWindow.end(), pd.m_minUniqueKeys)))
-   {
-      throw std::runtime_error("Not enough unique keys (it's the file too short?)");
-   }
-
-   // copy to a vector so that they can be returned as contiguous data
-   pd.m_groups.resize(pd.m_groupWindow.size());
-   copy(pd.m_groupWindow.begin(), pd.m_groupWindow.end(), pd.m_groups.begin());
-
-   pd.m_groupsReady = true;
-   pd.m_processType = PT_UNKNOWN;
-   return true;
-}
-
-// -----------------------------------------------------------------------------
-
-pair<const char*, size_t> FingerprintExtractor::getFingerprint()
-{
-   // easier read
-   PimplData& pd = *m_pPimplData;
-
-   if ( pd.m_groupsReady )
-   {
-#if __BIG_ENDIAN__
-      pd.m_bigEndianGroups.resize(pd.m_groups.size());
-      for ( size_t i = 0; i < pd.m_groups.size(); ++i )
-      {
-         pd.m_bigEndianGroupsi.key = reorderbits(pd.m_groupsi.key);
-         pd.m_bigEndianGroupsi.count = reorderbits(pd.m_groupsi.count);
-      }
-
-      return make_pair(reinterpret_cast<const char*>(&pd.m_bigEndianGroups0), pd.m_bigEndianGroups.size() * sizeof(GroupData) );
-
-#else
-      return make_pair(reinterpret_cast<const char*>(&pd.m_groups0), pd.m_groups.size() * sizeof(GroupData) );
-#endif
-   }
-   else
-      return make_pair(reinterpret_cast<const char*>(0), 0); // here's where null_ptr would become useful!
-}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-float getRMS(const FloatingAverage<double>& signal)
-{
-   // we don't want to normalize by the real rms, because excessive clipping will occur
-   float rms = sqrtf(static_cast<float>(signal.getAverage())) * 10.0F;
-
-   if (rms < 0.1F)
-      rms = 0.1F;
-   else if (rms > 3.0F)
-      rms = 3.0F;
-
-   return rms;
-}
-
-// -----------------------------------------------------------------------------
-
-unsigned int processKeys( deque<GroupData>& groups, size_t size, PimplData& pd )
-{
-   size_t read_size = min(size, pd.m_downsampledProcessSize + pd.m_compensateBufferSize);
-
-   unsigned int numFrames = pd.m_pFFT->process(pd.m_pDownsampledPCM, read_size);
-
-   if ( numFrames <= Filter::KEYWIDTH )
-      return 0; // skip it when the number of frames is too small
-
-   float** ppFrames = pd.m_pFFT->getFrames();
-
-   integralImage(ppFrames, numFrames);
-   computeBits(pd.m_partialBits, pd.m_filters, ppFrames, numFrames);
-   fingerprint::keys2GroupData(pd.m_partialBits, groups, false);
-
-   return static_cast<unsigned int>(pd.m_partialBits.size());
-
-}
-
-// -----------------------------------------------------------------------------
-
-void integralImage(float** ppFrames, unsigned int nFrames)
-{
-   for (unsigned int y = 1; y < nFrames; y++) 
-   {
-      ppFramesy0 += ppFramesy-10;
-   }
-
-   for (unsigned int x = 1; x < Filter::NBANDS; x++) 
-   {
-      ppFrames0x += ppFrames0x-1;
-   }
-
-   for (unsigned int y = 1; y < nFrames; y++) 
-   {
-      for (unsigned int x = 1; x < Filter::NBANDS; x++) 
-      {
-         ppFramesyx += static_cast<float>( static_cast<double>(ppFramesy-1x) + 
-                                               static_cast<double>(ppFramesyx-1) - 
-                                               static_cast<double>(ppFramesy-1x-1) );
-      }
-   }
-}
-
-// ---------------------------------------------------------------------
-//
-/// Convert bands to bits, using the supplied filters
-void computeBits( vector<unsigned int>& bits,
-                  const vector<Filter>& f, 
-                  float ** frames, unsigned int nframes ) 
-{
-   unsigned int first_time = Filter::KEYWIDTH / 2 + 1;
-   unsigned int last_time = nframes - Filter::KEYWIDTH / 2;
-
-   unsigned int numBits = last_time - first_time + 1;
-   bits.resize(numBits);
-
-   const unsigned int fSize = static_cast<unsigned int>(f.size());
-   std::bitset<32> bt;
-   double X = 0;
-
-   for (unsigned int t2 = first_time; t2 <= last_time; ++t2) 
-   {
-
-      for (unsigned int i = 0; i < fSize; ++i) 
-      {
-         // we subtract 1 from t1 and b1 because we use integral images
-      
-         unsigned int t1 = (unsigned int) ((float) t2 - fi.wt / 2.0 - 1);
-         unsigned int t3 = (unsigned int) ((float) t2 + fi.wt / 2.0 - 1);
-         unsigned int b1 = fi.first_band;
-         unsigned int b2 = (unsigned int) round__((float) b1 + fi.wb / 2.0) - 1;
-         unsigned int b3 = b1 + fi.wb - 1;
-         --b1;
-
-         unsigned int t_1q = (t1 + t2) / 2; // one quarter time 
-         unsigned int t_3q = t_1q + (t3 - t1 + 1) / 2; // three quarter time
-         unsigned int b_1q = (b1 + b2) / 2; // one quarter band
-         unsigned int b_3q = b_1q + (b3 - b1) / 2; // three quarter band
-         
-         X = 0;
-         
-         // we should check from t1 > 0, but in practice, this doesn't happen
-         // we subtract 1 from everything because this came from matlab where indices start from 1
-         switch (fi.filter_type) {
-         case 1: { // total energy
-            if (b1 > 0)
-               X = static_cast<double>(framest3-1b3-1) - static_cast<double>(framest3-1b1-1)
-                 - static_cast<double>(framest1-1b3-1) + static_cast<double>(framest1-1b1-1);
-            else
-               X = static_cast<double>(framest3-1b3-1) - static_cast<double>(framest1-1b3-1);
-            break;
-         }
-         case 2: { // energy difference over time
-            if (b1 > 0)
-               X = static_cast<double>(framest1-1b1-1) - 2*static_cast<double>(framest2-2b1-1)
-                 + static_cast<double>(framest3-1b1-1) - static_cast<double>(framest1-1b3-1)
-                 + 2*static_cast<double>(framest2-2b3-1) - static_cast<double>(framest3-1b3-1);
-            else
-               X = - static_cast<double>(framest1-1b3-1) + 2*static_cast<double>(framest2-2b3-1)
-                   - static_cast<double>(framest3-1b3-1);
-            break;
-         
-         }
-         case 3: { // energy difference over bands
-            if (b1 > 0)
-               X = static_cast<double>(framest1-1b1-1) - static_cast<double>(framest3-1b1-1)
-                 - 2*static_cast<double>(framest1-1b2-1) + 2*static_cast<double>(framest3-1b2-1)
-                 + static_cast<double>(framest1-1b3-1) - static_cast<double>(framest3-1b3-1);
-            else
-               X = - 2*static_cast<double>(framest1-1b2-1) + 2*static_cast<double>(framest3-1b2-1)
-                   + static_cast<double>(framest1-1b3-1) - static_cast<double>(framest3-1b3-1);
-            break;   
-         }
-         case 4: {
-            // energy difference over time and bands
-            if (b1 > 0)
-               X = static_cast<double>(framest1-1b1-1) - 2*static_cast<double>(framest2-2b1-1)
-                 + static_cast<double>(framest3-1b1-1) - 2*static_cast<double>(framest1-1b2-1)
-                 + 4*static_cast<double>(framest2-2b2-1) - 2*static_cast<double>(framest3-1b2-1)
-                 + static_cast<double>(framest1-1b3-1) - 2*static_cast<double>(framest2-2b3-1)
-                 + static_cast<double>(framest3-1b3-1);
-            else
-               X = - 2*static_cast<double>(framest1-1b2-1) + 4*static_cast<double>(framest2-2b2-1)
-                   - 2*static_cast<double>(framest3-1b2-1) + static_cast<double>(framest1-1b3-1)
-                   - 2*static_cast<double>(framest2-2b3-1) + static_cast<double>(framest3-1b3-1);
-            break;   
-         }
-         case 5: { // time peak
-            if (b1 > 0)
-               X = - static_cast<double>(framest1-1b1-1) + 2*static_cast<double>(framest_1q-1b1-1)
-                   - 2*static_cast<double>(framest_3q-1b1-1) + static_cast<double>(framest3-1b1-1)
-                   + static_cast<double>(framest1-1b3-1) - 2*static_cast<double>(framest_1q-1b3-1)
-                   + 2*static_cast<double>(framest_3q-1b3-1) - static_cast<double>(framest3-1b3-1);
-            else
-               X = static_cast<double>(framest1-1b3-1) - 2*static_cast<double>(framest_1q-1b3-1)
-                 + 2*static_cast<double>(framest_3q-1b3-1) - static_cast<double>(framest3-1b3-1);
-                  
-            break;
-         }
-         case 6: { // band beak
-            if (b1 > 0)
-               X = - static_cast<double>(framest1-1b1-1) + static_cast<double>(framest3-1b1-1)
-                   + 2*static_cast<double>(framest1-1b_1q-1) - 2*static_cast<double>(framest3-1b_1q-1)
-                   - 2*static_cast<double>(framest1-1b_3q-1) + 2*static_cast<double>(framest3-1b_3q-1)
-                   + static_cast<double>(framest1-1b3-1) - static_cast<double>(framest3-1b3-1);
-            else
-               X = + 2*static_cast<double>(framest1-1b_1q-1) - 2*static_cast<double>(framest3-1b_1q-1)
-                   - 2*static_cast<double>(framest1-1b_3q-1) + 2*static_cast<double>(framest3-1b_3q-1)
-                   + static_cast<double>(framest1-1b3-1) - static_cast<double>(framest3-1b3-1);
-
-            break;
-         }
-         }
-
-         bti = X > fi.threshold;
-      }
-
-      bitst2 - first_time = bt.to_ulong();
-   }
-}
-
-// -----------------------------------------------------------------------------
-
-void src_short_to_float_and_mono_array( const short *in, float *out, int srclen, int nchannels )
-{
-   switch ( nchannels )
-   {
-   case 1:
-      src_short_to_float_array(in, out, srclen);
-      break;
-   case 2:
-      {
-         // this can be optimized
-         int j = 0;
-         const double div = numeric_limits<short>::max() * nchannels;
-         for ( int i = 0; i < srclen; i += 2, ++j )
-         {
-            outj = static_cast<float>( static_cast<double>(static_cast<int>(ini) + static_cast<int>(ini+1)) / div );
-         }
-      }
-      break;
-
-   default:
-      throw( std::runtime_error("Unsupported number of channels!") );
-   }
-
-}
-
-// -----------------------------------------------------------------------------
-
-} // end of namespace
-
-// -----------------------------------------------------------------------------

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fplib/FingerprintExtractor.h Deleted

@@ -1,77 +0,0 @@
-/*
-   Copyright 2005-2009 Last.fm Ltd. <mir@last.fm>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __FINGERPRINT_EXTRACTOR_H
-#define __FINGERPRINT_EXTRACTOR_H
-
-#include <utility> // for pair
-#include <cstddef> // for size_t
-
-namespace fingerprint {
-
-// -----------------------------------------------------------------------------
-
-class PimplData;
-
-class FingerprintExtractor
-{
-public:
-
-   FingerprintExtractor(); // ctor
-   ~FingerprintExtractor(); // dtor
-
-   // duration (in seconds!) is optional, but if you want to submit tracks <34 secs
-   // it must be provided. 
-   void initForQuery(int freq, int nchannels, int duration = -1);
-   void initForFullSubmit(int freq, int nchannels);
-
-   // return false if it needs more data, otherwise true
-   // IMPORTANT: num_samples specify the size of the *short* array pPCM, that is
-   //            the number of samples that are in the buffer. This includes
-   //            the stereo samples, i.e.
-   //            LRLRLRLR would be num_samples=8
-   bool process(const short* pPCM, size_t num_samples, bool end_of_stream = false);
-
-   // returns pair<NULL, 0> if the data is not ready
-   std::pair<const char*, size_t> getFingerprint();
-
-   //////////////////////////////////////////////////////////////////////////
-
-   // The FingerprintExtractor assumes that the file start from the beginning
-   // but since the first SkipMs are ignored, it's possible to feed it with NULL.
-   // In order to know how much must be skipped (in milliseconds) call this function.
-   // Remark: this is only for "advanced" users!
-   size_t getToSkipMs();
-
-   // Return the minimum duration of the file (in ms)
-   // Any file with a length smaller than this value will be discarded
-   static size_t getMinimumDurationMs();
-
-   // return the version of the fingerprint
-   static size_t getVersion();
-
-private:
-
-   PimplData* m_pPimplData;
-};
-
-// -----------------------------------------------------------------------------
-
-} // end of namespace fingerprint
-
-#endif // __FINGERPRINT_EXTRACTOR_H

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fplib/FloatingAverage.h Deleted

@@ -1,106 +0,0 @@
-/*
-   Copyright 2005-2009 Last.fm Ltd. <mir@last.fm>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __FLOAT_AVERAGE_H__
-#define __FLOAT_AVERAGE_H__
-
-//#include <deque>
-#include <limits>
-#include "CircularArray.h"
-
-template <typename T>
-class FloatingAverage
-{
-public:
-   FloatingAverage(size_t size)
-   {
-      m_values.resize(size);
-      m_valIt = m_values.head();
-      m_sum = 0;
-      m_bufferFilled = false;
-   }
-
-   void purge()
-   {
-      m_sum = 0;
-      const T* pCircularBuffer = m_values.get_buffer();
-      const int size = m_values.size();
-
-      for ( int i = 0; i < size; ++i )
-         m_sum += pCircularBufferi;
-   }
-
-   void add(const T& value)
-   {
-      m_sum += value;
-
-      if ( m_bufferFilled )
-      {
-         m_sum -= *m_valIt;
-         *m_valIt = value;
-         ++m_valIt;
-      }
-      else
-      {
-         *m_valIt = value;
-         ++m_valIt;
-         if ( m_valIt == m_values.head() )
-            m_bufferFilled = true;
-      }
-   }
-
-   T getAverage() const
-   {
-      if ( !m_bufferFilled )
-         return m_sum / (m_valIt - m_values.head());
-      else
-         return m_sum / m_values.size();
-   }
-
-   T getError() const
-   {
-      T real_sum = 0;
-      const T* pCircularBuffer = m_values.get_buffer();
-      for ( int i = 0; i < size; ++i )
-         real_sum += pCircularBufferi;
-      return abs(real_sum - m_sum) / this->size();
-   }
-
-   size_t size() const
-   {
-      return m_values.size();
-   }
-
-   void clear()
-   {
-      m_bufferFilled = false;
-      m_values.zero_fill();
-      m_valIt = m_values.head();
-      m_sum = 0;
-   }
-
-private:
-   //std::deque<T> m_values;
-   CircularArray<T> m_values;
-   typename CircularArray<T>::iterator m_valIt;
-
-   bool m_bufferFilled;
-   T m_sum;
-};
-
-#endif // __FLOAT_AVERAGE_H__

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fplib/OptFFT.cpp Deleted

@@ -1,411 +0,0 @@
-/*
-   Copyright 2005-2009 Last.fm Ltd. <mir@last.fm>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "OptFFT.h"
-#include "fp_helper_fun.h"
-#include "Filter.h" // for NBANDS
-
-#include <cmath>
-#include <cassert>
-#include <cstdlib>
-#include <iostream>
-#include <sstream>
-#include <cstdlib> 
-#include <stdexcept>
-#include <cstring>
-
-using namespace std;
-// ----------------------------------------------------------------------
-
-namespace fingerprint
-{
-
-   static const float hann = {
-      0.000000f,0.000002f,0.000009f,0.000021f,0.000038f,0.000059f,0.000085f,0.000115f,0.000151f,0.000191f,0.000236f,
-      0.000285f,0.000339f,0.000398f,0.000462f,0.000530f,0.000603f,0.000681f,0.000763f,0.000850f,0.000942f,0.001038f,
-      0.001140f,0.001245f,0.001356f,0.001471f,0.001591f,0.001716f,0.001845f,0.001980f,0.002118f,0.002262f,0.002410f,
-      0.002563f,0.002720f,0.002883f,0.003049f,0.003221f,0.003397f,0.003578f,0.003764f,0.003954f,0.004149f,0.004349f,
-      0.004553f,0.004762f,0.004976f,0.005194f,0.005417f,0.005645f,0.005877f,0.006114f,0.006355f,0.006602f,0.006853f,
-      0.007108f,0.007368f,0.007633f,0.007903f,0.008177f,0.008455f,0.008739f,0.009027f,0.009319f,0.009617f,0.009919f,
-      0.010225f,0.010536f,0.010852f,0.011172f,0.011497f,0.011827f,0.012161f,0.012499f,0.012843f,0.013191f,0.013543f,
-      0.013900f,0.014262f,0.014628f,0.014999f,0.015374f,0.015754f,0.016139f,0.016528f,0.016921f,0.017320f,0.017722f,
-      0.018130f,0.018541f,0.018958f,0.019379f,0.019804f,0.020234f,0.020668f,0.021107f,0.021551f,0.021999f,0.022451f,
-      0.022908f,0.023370f,0.023836f,0.024306f,0.024781f,0.025260f,0.025744f,0.026233f,0.026725f,0.027223f,0.027724f,
-      0.028231f,0.028741f,0.029256f,0.029776f,0.030300f,0.030828f,0.031361f,0.031898f,0.032440f,0.032986f,0.033536f,
-      0.034091f,0.034650f,0.035214f,0.035781f,0.036354f,0.036930f,0.037512f,0.038097f,0.038687f,0.039281f,0.039879f,
-      0.040482f,0.041089f,0.041701f,0.042316f,0.042936f,0.043561f,0.044189f,0.044822f,0.045460f,0.046101f,0.046747f,
-      0.047397f,0.048052f,0.048710f,0.049373f,0.050040f,0.050711f,0.051387f,0.052067f,0.052751f,0.053439f,0.054132f,
-      0.054828f,0.055529f,0.056234f,0.056943f,0.057657f,0.058374f,0.059096f,0.059822f,0.060552f,0.061286f,0.062024f,
-      0.062767f,0.063513f,0.064264f,0.065019f,0.065777f,0.066540f,0.067307f,0.068078f,0.068854f,0.069633f,0.070416f,
-      0.071204f,0.071995f,0.072790f,0.073590f,0.074393f,0.075201f,0.076012f,0.076828f,0.077647f,0.078470f,0.079298f,
-      0.080129f,0.080964f,0.081804f,0.082647f,0.083494f,0.084345f,0.085200f,0.086059f,0.086922f,0.087788f,0.088659f,
-      0.089533f,0.090412f,0.091294f,0.092180f,0.093070f,0.093963f,0.094861f,0.095762f,0.096667f,0.097576f,0.098489f,
-      0.099406f,0.100326f,0.101250f,0.102178f,0.103109f,0.104045f,0.104984f,0.105926f,0.106873f,0.107823f,0.108777f,
-      0.109734f,0.110696f,0.111661f,0.112629f,0.113601f,0.114577f,0.115557f,0.116540f,0.117526f,0.118517f,0.119511f,
-      0.120508f,0.121509f,0.122514f,0.123522f,0.124534f,0.125549f,0.126568f,0.127590f,0.128616f,0.129645f,0.130678f,
-      0.131714f,0.132754f,0.133797f,0.134844f,0.135894f,0.136948f,0.138005f,0.139065f,0.140129f,0.141196f,0.142266f,
-      0.143340f,0.144418f,0.145498f,0.146582f,0.147670f,0.148760f,0.149854f,0.150951f,0.152052f,0.153156f,0.154263f,
-      0.155373f,0.156487f,0.157603f,0.158723f,0.159847f,0.160973f,0.162103f,0.163236f,0.164372f,0.165511f,0.166653f,
-      0.167799f,0.168947f,0.170099f,0.171254f,0.172411f,0.173572f,0.174737f,0.175904f,0.177074f,0.178247f,0.179423f,
-      0.180603f,0.181785f,0.182970f,0.184158f,0.185350f,0.186544f,0.187741f,0.188941f,0.190144f,0.191350f,0.192559f,
-      0.193771f,0.194986f,0.196203f,0.197423f,0.198647f,0.199873f,0.201102f,0.202333f,0.203568f,0.204805f,0.206045f,
-      0.207288f,0.208534f,0.209782f,0.211033f,0.212287f,0.213544f,0.214803f,0.216065f,0.217329f,0.218597f,0.219867f,
-      0.221139f,0.222414f,0.223692f,0.224972f,0.226255f,0.227541f,0.228829f,0.230120f,0.231413f,0.232709f,0.234007f,
-      0.235308f,0.236611f,0.237917f,0.239225f,0.240536f,0.241849f,0.243165f,0.244483f,0.245803f,0.247126f,0.248451f,
-      0.249779f,0.251108f,0.252441f,0.253775f,0.255112f,0.256451f,0.257793f,0.259137f,0.260483f,0.261831f,0.263182f,
-      0.264534f,0.265889f,0.267247f,0.268606f,0.269967f,0.271331f,0.272697f,0.274065f,0.275435f,0.276808f,0.278182f,
-      0.279558f,0.280937f,0.282318f,0.283700f,0.285085f,0.286472f,0.287861f,0.289251f,0.290644f,0.292039f,0.293435f,
-      0.294834f,0.296235f,0.297637f,0.299041f,0.300448f,0.301856f,0.303266f,0.304678f,0.306091f,0.307507f,0.308924f,
-      0.310343f,0.311764f,0.313187f,0.314611f,0.316038f,0.317466f,0.318895f,0.320327f,0.321760f,0.323194f,0.324631f,
-      0.326069f,0.327509f,0.328950f,0.330393f,0.331837f,0.333283f,0.334731f,0.336180f,0.337631f,0.339083f,0.340537f,
-      0.341993f,0.343449f,0.344908f,0.346368f,0.347829f,0.349291f,0.350755f,0.352221f,0.353688f,0.355156f,0.356626f,
-      0.358097f,0.359569f,0.361042f,0.362517f,0.363994f,0.365471f,0.366950f,0.368430f,0.369911f,0.371394f,0.372877f,
-      0.374362f,0.375848f,0.377336f,0.378824f,0.380314f,0.381804f,0.383296f,0.384789f,0.386283f,0.387778f,0.389274f,
-      0.390771f,0.392269f,0.393768f,0.395269f,0.396770f,0.398272f,0.399775f,0.401279f,0.402784f,0.404290f,0.405797f,
-      0.407305f,0.408813f,0.410322f,0.411833f,0.413344f,0.414856f,0.416368f,0.417882f,0.419396f,0.420911f,0.422427f,
-      0.423944f,0.425461f,0.426979f,0.428497f,0.430017f,0.431537f,0.433057f,0.434578f,0.436100f,0.437623f,0.439146f,
-      0.440669f,0.442193f,0.443718f,0.445243f,0.446769f,0.448295f,0.449822f,0.451349f,0.452877f,0.454405f,0.455934f,
-      0.457463f,0.458992f,0.460522f,0.462052f,0.463582f,0.465113f,0.466644f,0.468176f,0.469708f,0.471240f,0.472772f,
-      0.474305f,0.475837f,0.477370f,0.478904f,0.480437f,0.481971f,0.483505f,0.485039f,0.486573f,0.488107f,0.489641f,
-      0.491176f,0.492710f,0.494245f,0.495780f,0.497314f,0.498849f,0.500384f,0.501918f,0.503453f,0.504988f,0.506522f,
-      0.508057f,0.509591f,0.511126f,0.512660f,0.514194f,0.515728f,0.517262f,0.518796f,0.520330f,0.521863f,0.523396f,
-      0.524929f,0.526462f,0.527994f,0.529526f,0.531058f,0.532590f,0.534121f,0.535652f,0.537183f,0.538713f,0.540243f,
-      0.541773f,0.543302f,0.544831f,0.546359f,0.547887f,0.549414f,0.550941f,0.552468f,0.553994f,0.555519f,0.557044f,
-      0.558569f,0.560093f,0.561616f,0.563139f,0.564661f,0.566182f,0.567703f,0.569223f,0.570743f,0.572262f,0.573780f,
-      0.575298f,0.576815f,0.578331f,0.579846f,0.581361f,0.582875f,0.584388f,0.585900f,0.587412f,0.588922f,0.590432f,
-      0.591941f,0.593449f,0.594957f,0.596463f,0.597968f,0.599473f,0.600977f,0.602479f,0.603981f,0.605482f,0.606981f,
-      0.608480f,0.609978f,0.611474f,0.612970f,0.614464f,0.615958f,0.617450f,0.618941f,0.620431f,0.621920f,0.623408f,
-      0.624895f,0.626380f,0.627865f,0.629348f,0.630830f,0.632310f,0.633790f,0.635268f,0.636745f,0.638220f,0.639695f,
-      0.641167f,0.642639f,0.644109f,0.645578f,0.647046f,0.648512f,0.649977f,0.651440f,0.652902f,0.654363f,0.655822f,
-      0.657279f,0.658735f,0.660190f,0.661643f,0.663094f,0.664544f,0.665993f,0.667440f,0.668885f,0.670329f,0.671771f,
-      0.673212f,0.674650f,0.676088f,0.677523f,0.678957f,0.680389f,0.681820f,0.683249f,0.684676f,0.686101f,0.687525f,
-      0.688946f,0.690366f,0.691785f,0.693201f,0.694616f,0.696029f,0.697439f,0.698849f,0.700256f,0.701661f,0.703065f,
-      0.704466f,0.705866f,0.707263f,0.708659f,0.710053f,0.711444f,0.712834f,0.714222f,0.715608f,0.716991f,0.718373f,
-      0.719752f,0.721130f,0.722505f,0.723879f,0.725250f,0.726619f,0.727986f,0.729351f,0.730714f,0.732074f,0.733432f,
-      0.734788f,0.736142f,0.737494f,0.738843f,0.740191f,0.741536f,0.742878f,0.744219f,0.745557f,0.746892f,0.748226f,
-      0.749557f,0.750886f,0.752212f,0.753536f,0.754857f,0.756177f,0.757493f,0.758808f,0.760120f,0.761429f,0.762736f,
-      0.764041f,0.765343f,0.766642f,0.767939f,0.769234f,0.770526f,0.771815f,0.773102f,0.774386f,0.775668f,0.776947f,
-      0.778224f,0.779497f,0.780769f,0.782037f,0.783303f,0.784567f,0.785827f,0.787085f,0.788340f,0.789593f,0.790842f,
-      0.792089f,0.793334f,0.794575f,0.795814f,0.797050f,0.798283f,0.799513f,0.800741f,0.801965f,0.803187f,0.804406f,
-      0.805622f,0.806835f,0.808046f,0.809253f,0.810458f,0.811659f,0.812858f,0.814054f,0.815246f,0.816436f,0.817623f,
-      0.818807f,0.819987f,0.821165f,0.822340f,0.823512f,0.824680f,0.825846f,0.827008f,0.828168f,0.829324f,0.830477f,
-      0.831628f,0.832775f,0.833918f,0.835059f,0.836197f,0.837331f,0.838462f,0.839591f,0.840715f,0.841837f,0.842955f,
-      0.844071f,0.845183f,0.846291f,0.847397f,0.848499f,0.849598f,0.850693f,0.851786f,0.852874f,0.853960f,0.855042f,
-      0.856121f,0.857197f,0.858269f,0.859338f,0.860404f,0.861466f,0.862524f,0.863580f,0.864631f,0.865680f,0.866725f,
-      0.867766f,0.868804f,0.869839f,0.870870f,0.871897f,0.872922f,0.873942f,0.874959f,0.875973f,0.876983f,0.877989f,
-      0.878992f,0.879991f,0.880987f,0.881979f,0.882967f,0.883952f,0.884934f,0.885911f,0.886885f,0.887856f,0.888822f,
-      0.889785f,0.890745f,0.891701f,0.892653f,0.893601f,0.894545f,0.895486f,0.896423f,0.897357f,0.898287f,0.899213f,
-      0.900135f,0.901053f,0.901968f,0.902879f,0.903786f,0.904689f,0.905588f,0.906484f,0.907376f,0.908264f,0.909148f,
-      0.910028f,0.910904f,0.911777f,0.912645f,0.913510f,0.914371f,0.915228f,0.916081f,0.916930f,0.917775f,0.918616f,
-      0.919454f,0.920287f,0.921116f,0.921942f,0.922763f,0.923581f,0.924394f,0.925204f,0.926009f,0.926810f,0.927608f,
-      0.928401f,0.929191f,0.929976f,0.930757f,0.931534f,0.932308f,0.933077f,0.933842f,0.934603f,0.935359f,0.936112f,
-      0.936861f,0.937605f,0.938345f,0.939082f,0.939814f,0.940542f,0.941265f,0.941985f,0.942701f,0.943412f,0.944119f,
-      0.944822f,0.945521f,0.946215f,0.946906f,0.947592f,0.948274f,0.948951f,0.949625f,0.950294f,0.950959f,0.951620f,
-      0.952276f,0.952928f,0.953576f,0.954220f,0.954859f,0.955495f,0.956125f,0.956752f,0.957374f,0.957992f,0.958606f,
-      0.959215f,0.959820f,0.960420f,0.961017f,0.961609f,0.962196f,0.962780f,0.963358f,0.963933f,0.964503f,0.965069f,
-      0.965630f,0.966187f,0.966740f,0.967288f,0.967832f,0.968371f,0.968906f,0.969437f,0.969963f,0.970485f,0.971002f,
-      0.971515f,0.972023f,0.972527f,0.973027f,0.973522f,0.974012f,0.974498f,0.974980f,0.975457f,0.975930f,0.976398f,
-      0.976862f,0.977321f,0.977776f,0.978226f,0.978672f,0.979113f,0.979549f,0.979982f,0.980409f,0.980832f,0.981251f,
-      0.981665f,0.982075f,0.982480f,0.982880f,0.983276f,0.983667f,0.984054f,0.984436f,0.984814f,0.985187f,0.985556f,
-      0.985919f,0.986279f,0.986634f,0.986984f,0.987329f,0.987670f,0.988007f,0.988339f,0.988666f,0.988989f,0.989307f,
-      0.989620f,0.989929f,0.990233f,0.990532f,0.990827f,0.991118f,0.991403f,0.991684f,0.991961f,0.992233f,0.992500f,
-      0.992762f,0.993020f,0.993273f,0.993522f,0.993766f,0.994005f,0.994240f,0.994470f,0.994695f,0.994916f,0.995132f,
-      0.995343f,0.995550f,0.995752f,0.995949f,0.996142f,0.996329f,0.996513f,0.996691f,0.996865f,0.997035f,0.997199f,
-      0.997359f,0.997514f,0.997665f,0.997810f,0.997952f,0.998088f,0.998220f,0.998347f,0.998469f,0.998587f,0.998700f,
-      0.998808f,0.998912f,0.999010f,0.999105f,0.999194f,0.999279f,0.999359f,0.999434f,0.999505f,0.999571f,0.999632f,
-      0.999689f,0.999740f,0.999787f,0.999830f,0.999868f,0.999900f,0.999929f,0.999952f,0.999971f,0.999985f,0.999995f,
-      0.999999f,0.999999f,0.999995f,0.999985f,0.999971f,0.999952f,0.999929f,0.999900f,0.999868f,0.999830f,0.999787f,
-      0.999740f,0.999689f,0.999632f,0.999571f,0.999505f,0.999434f,0.999359f,0.999279f,0.999194f,0.999105f,0.999010f,
-      0.998912f,0.998808f,0.998700f,0.998587f,0.998469f,0.998347f,0.998220f,0.998088f,0.997952f,0.997810f,0.997665f,
-      0.997514f,0.997359f,0.997199f,0.997035f,0.996865f,0.996691f,0.996513f,0.996329f,0.996142f,0.995949f,0.995752f,
-      0.995550f,0.995343f,0.995132f,0.994916f,0.994695f,0.994470f,0.994240f,0.994005f,0.993766f,0.993522f,0.993273f,
-      0.993020f,0.992762f,0.992500f,0.992233f,0.991961f,0.991684f,0.991403f,0.991118f,0.990827f,0.990532f,0.990233f,
-      0.989929f,0.989620f,0.989307f,0.988989f,0.988666f,0.988339f,0.988007f,0.987670f,0.987329f,0.986984f,0.986634f,
-      0.986279f,0.985919f,0.985556f,0.985187f,0.984814f,0.984436f,0.984054f,0.983667f,0.983276f,0.982880f,0.982480f,
-      0.982075f,0.981665f,0.981251f,0.980832f,0.980409f,0.979982f,0.979549f,0.979113f,0.978672f,0.978226f,0.977776f,
-      0.977321f,0.976862f,0.976398f,0.975930f,0.975457f,0.974980f,0.974498f,0.974012f,0.973522f,0.973027f,0.972527f,
-      0.972023f,0.971515f,0.971002f,0.970485f,0.969963f,0.969437f,0.968906f,0.968371f,0.967832f,0.967288f,0.966740f,
-      0.966187f,0.965630f,0.965069f,0.964503f,0.963933f,0.963358f,0.962780f,0.962196f,0.961609f,0.961017f,0.960420f,
-      0.959820f,0.959215f,0.958606f,0.957992f,0.957374f,0.956752f,0.956125f,0.955495f,0.954859f,0.954220f,0.953576f,
-      0.952928f,0.952276f,0.951620f,0.950959f,0.950294f,0.949625f,0.948951f,0.948274f,0.947592f,0.946906f,0.946215f,
-      0.945521f,0.944822f,0.944119f,0.943412f,0.942701f,0.941985f,0.941265f,0.940542f,0.939814f,0.939082f,0.938345f,
-      0.937605f,0.936861f,0.936112f,0.935359f,0.934603f,0.933842f,0.933077f,0.932308f,0.931534f,0.930757f,0.929976f,
-      0.929191f,0.928401f,0.927608f,0.926810f,0.926009f,0.925204f,0.924394f,0.923581f,0.922763f,0.921942f,0.921116f,
-      0.920287f,0.919454f,0.918616f,0.917775f,0.916930f,0.916081f,0.915228f,0.914371f,0.913510f,0.912645f,0.911777f,
-      0.910904f,0.910028f,0.909148f,0.908264f,0.907376f,0.906484f,0.905588f,0.904689f,0.903786f,0.902879f,0.901968f,
-      0.901053f,0.900135f,0.899213f,0.898287f,0.897357f,0.896423f,0.895486f,0.894545f,0.893601f,0.892653f,0.891701f,
-      0.890745f,0.889785f,0.888822f,0.887856f,0.886885f,0.885911f,0.884934f,0.883952f,0.882967f,0.881979f,0.880987f,
-      0.879991f,0.878992f,0.877989f,0.876983f,0.875973f,0.874959f,0.873942f,0.872922f,0.871897f,0.870870f,0.869839f,
-      0.868804f,0.867766f,0.866725f,0.865680f,0.864631f,0.863580f,0.862524f,0.861466f,0.860404f,0.859338f,0.858269f,
-      0.857197f,0.856121f,0.855042f,0.853960f,0.852874f,0.851786f,0.850693f,0.849598f,0.848499f,0.847397f,0.846291f,
-      0.845183f,0.844071f,0.842955f,0.841837f,0.840715f,0.839591f,0.838462f,0.837331f,0.836197f,0.835059f,0.833918f,
-      0.832775f,0.831628f,0.830477f,0.829324f,0.828168f,0.827008f,0.825846f,0.824680f,0.823512f,0.822340f,0.821165f,
-      0.819987f,0.818807f,0.817623f,0.816436f,0.815246f,0.814054f,0.812858f,0.811659f,0.810458f,0.809253f,0.808046f,
-      0.806835f,0.805622f,0.804406f,0.803187f,0.801965f,0.800741f,0.799513f,0.798283f,0.797050f,0.795814f,0.794575f,
-      0.793334f,0.792089f,0.790842f,0.789593f,0.788340f,0.787085f,0.785827f,0.784567f,0.783303f,0.782037f,0.780769f,
-      0.779497f,0.778224f,0.776947f,0.775668f,0.774386f,0.773102f,0.771815f,0.770526f,0.769234f,0.767939f,0.766642f,
-      0.765343f,0.764041f,0.762736f,0.761429f,0.760120f,0.758808f,0.757493f,0.756177f,0.754857f,0.753536f,0.752212f,
-      0.750886f,0.749557f,0.748226f,0.746892f,0.745557f,0.744219f,0.742878f,0.741536f,0.740191f,0.738843f,0.737494f,
-      0.736142f,0.734788f,0.733432f,0.732074f,0.730714f,0.729351f,0.727986f,0.726619f,0.725250f,0.723879f,0.722505f,
-      0.721130f,0.719752f,0.718373f,0.716991f,0.715608f,0.714222f,0.712834f,0.711444f,0.710053f,0.708659f,0.707263f,
-      0.705866f,0.704466f,0.703065f,0.701661f,0.700256f,0.698849f,0.697439f,0.696029f,0.694616f,0.693201f,0.691785f,
-      0.690366f,0.688946f,0.687525f,0.686101f,0.684676f,0.683249f,0.681820f,0.680389f,0.678957f,0.677523f,0.676088f,
-      0.674650f,0.673212f,0.671771f,0.670329f,0.668885f,0.667440f,0.665993f,0.664544f,0.663094f,0.661643f,0.660190f,
-      0.658735f,0.657279f,0.655822f,0.654363f,0.652902f,0.651440f,0.649977f,0.648512f,0.647046f,0.645578f,0.644109f,
-      0.642639f,0.641167f,0.639695f,0.638220f,0.636745f,0.635268f,0.633790f,0.632310f,0.630830f,0.629348f,0.627865f,
-      0.626380f,0.624895f,0.623408f,0.621920f,0.620431f,0.618941f,0.617450f,0.615958f,0.614464f,0.612970f,0.611474f,
-      0.609978f,0.608480f,0.606981f,0.605482f,0.603981f,0.602479f,0.600977f,0.599473f,0.597968f,0.596463f,0.594957f,
-      0.593449f,0.591941f,0.590432f,0.588922f,0.587412f,0.585900f,0.584388f,0.582875f,0.581361f,0.579846f,0.578331f,
-      0.576815f,0.575298f,0.573780f,0.572262f,0.570743f,0.569223f,0.567703f,0.566182f,0.564661f,0.563139f,0.561616f,
-      0.560093f,0.558569f,0.557044f,0.555519f,0.553994f,0.552468f,0.550941f,0.549414f,0.547887f,0.546359f,0.544831f,
-      0.543302f,0.541773f,0.540243f,0.538713f,0.537183f,0.535652f,0.534121f,0.532590f,0.531058f,0.529526f,0.527994f,
-      0.526462f,0.524929f,0.523396f,0.521863f,0.520330f,0.518796f,0.517262f,0.515728f,0.514194f,0.512660f,0.511126f,
-      0.509591f,0.508057f,0.506522f,0.504988f,0.503453f,0.501918f,0.500384f,0.498849f,0.497314f,0.495780f,0.494245f,
-      0.492710f,0.491176f,0.489641f,0.488107f,0.486573f,0.485039f,0.483505f,0.481971f,0.480437f,0.478904f,0.477370f,
-      0.475837f,0.474305f,0.472772f,0.471240f,0.469708f,0.468176f,0.466644f,0.465113f,0.463582f,0.462052f,0.460522f,
-      0.458992f,0.457463f,0.455934f,0.454405f,0.452877f,0.451349f,0.449822f,0.448295f,0.446769f,0.445243f,0.443718f,
-      0.442193f,0.440669f,0.439146f,0.437623f,0.436100f,0.434578f,0.433057f,0.431537f,0.430017f,0.428497f,0.426979f,
-      0.425461f,0.423944f,0.422427f,0.420911f,0.419396f,0.417882f,0.416368f,0.414856f,0.413344f,0.411833f,0.410322f,
-      0.408813f,0.407305f,0.405797f,0.404290f,0.402784f,0.401279f,0.399775f,0.398272f,0.396770f,0.395269f,0.393768f,
-      0.392269f,0.390771f,0.389274f,0.387778f,0.386283f,0.384789f,0.383296f,0.381804f,0.380314f,0.378824f,0.377336f,
-      0.375848f,0.374362f,0.372877f,0.371394f,0.369911f,0.368430f,0.366950f,0.365471f,0.363994f,0.362517f,0.361042f,
-      0.359569f,0.358097f,0.356626f,0.355156f,0.353688f,0.352221f,0.350755f,0.349291f,0.347829f,0.346368f,0.344908f,
-      0.343449f,0.341993f,0.340537f,0.339083f,0.337631f,0.336180f,0.334731f,0.333283f,0.331837f,0.330393f,0.328950f,
-      0.327509f,0.326069f,0.324631f,0.323194f,0.321760f,0.320327f,0.318895f,0.317466f,0.316038f,0.314611f,0.313187f,
-      0.311764f,0.310343f,0.308924f,0.307507f,0.306091f,0.304678f,0.303266f,0.301856f,0.300448f,0.299041f,0.297637f,
-      0.296235f,0.294834f,0.293435f,0.292039f,0.290644f,0.289251f,0.287861f,0.286472f,0.285085f,0.283700f,0.282318f,
-      0.280937f,0.279558f,0.278182f,0.276808f,0.275435f,0.274065f,0.272697f,0.271331f,0.269967f,0.268606f,0.267247f,
-      0.265889f,0.264534f,0.263182f,0.261831f,0.260483f,0.259137f,0.257793f,0.256451f,0.255112f,0.253775f,0.252441f,
-      0.251108f,0.249779f,0.248451f,0.247126f,0.245803f,0.244483f,0.243165f,0.241849f,0.240536f,0.239225f,0.237917f,
-      0.236611f,0.235308f,0.234007f,0.232709f,0.231413f,0.230120f,0.228829f,0.227541f,0.226255f,0.224972f,0.223692f,
-      0.222414f,0.221139f,0.219867f,0.218597f,0.217329f,0.216065f,0.214803f,0.213544f,0.212287f,0.211033f,0.209782f,
-      0.208534f,0.207288f,0.206045f,0.204805f,0.203568f,0.202333f,0.201102f,0.199873f,0.198647f,0.197423f,0.196203f,
-      0.194986f,0.193771f,0.192559f,0.191350f,0.190144f,0.188941f,0.187741f,0.186544f,0.185350f,0.184158f,0.182970f,
-      0.181785f,0.180603f,0.179423f,0.178247f,0.177074f,0.175904f,0.174737f,0.173572f,0.172411f,0.171254f,0.170099f,
-      0.168947f,0.167799f,0.166653f,0.165511f,0.164372f,0.163236f,0.162103f,0.160973f,0.159847f,0.158723f,0.157603f,
-      0.156487f,0.155373f,0.154263f,0.153156f,0.152052f,0.150951f,0.149854f,0.148760f,0.147670f,0.146582f,0.145498f,
-      0.144418f,0.143340f,0.142266f,0.141196f,0.140129f,0.139065f,0.138005f,0.136948f,0.135894f,0.134844f,0.133797f,
-      0.132754f,0.131714f,0.130678f,0.129645f,0.128616f,0.127590f,0.126568f,0.125549f,0.124534f,0.123522f,0.122514f,
-      0.121509f,0.120508f,0.119511f,0.118517f,0.117526f,0.116540f,0.115557f,0.114577f,0.113601f,0.112629f,0.111661f,
-      0.110696f,0.109734f,0.108777f,0.107823f,0.106873f,0.105926f,0.104984f,0.104045f,0.103109f,0.102178f,0.101250f,
-      0.100326f,0.099406f,0.098489f,0.097576f,0.096667f,0.095762f,0.094861f,0.093963f,0.093070f,0.092180f,0.091294f,
-      0.090412f,0.089533f,0.088659f,0.087788f,0.086922f,0.086059f,0.085200f,0.084345f,0.083494f,0.082647f,0.081804f,
-      0.080964f,0.080129f,0.079298f,0.078470f,0.077647f,0.076828f,0.076012f,0.075201f,0.074393f,0.073590f,0.072790f,
-      0.071995f,0.071204f,0.070416f,0.069633f,0.068854f,0.068078f,0.067307f,0.066540f,0.065777f,0.065019f,0.064264f,
-      0.063513f,0.062767f,0.062024f,0.061286f,0.060552f,0.059822f,0.059096f,0.058374f,0.057657f,0.056943f,0.056234f,
-      0.055529f,0.054828f,0.054132f,0.053439f,0.052751f,0.052067f,0.051387f,0.050711f,0.050040f,0.049373f,0.048710f,
-      0.048052f,0.047397f,0.046747f,0.046101f,0.045460f,0.044822f,0.044189f,0.043561f,0.042936f,0.042316f,0.041701f,
-      0.041089f,0.040482f,0.039879f,0.039281f,0.038687f,0.038097f,0.037512f,0.036930f,0.036354f,0.035781f,0.035214f,
-      0.034650f,0.034091f,0.033536f,0.032986f,0.032440f,0.031898f,0.031361f,0.030828f,0.030300f,0.029776f,0.029256f,
-      0.028741f,0.028231f,0.027724f,0.027223f,0.026725f,0.026233f,0.025744f,0.025260f,0.024781f,0.024306f,0.023836f,
-      0.023370f,0.022908f,0.022451f,0.021999f,0.021551f,0.021107f,0.020668f,0.020234f,0.019804f,0.019379f,0.018958f,
-      0.018541f,0.018130f,0.017722f,0.017320f,0.016921f,0.016528f,0.016139f,0.015754f,0.015374f,0.014999f,0.014628f,
-      0.014262f,0.013900f,0.013543f,0.013191f,0.012843f,0.012499f,0.012161f,0.011827f,0.011497f,0.011172f,0.010852f,
-      0.010536f,0.010225f,0.009919f,0.009617f,0.009319f,0.009027f,0.008739f,0.008455f,0.008177f,0.007903f,0.007633f,
-      0.007368f,0.007108f,0.006853f,0.006602f,0.006355f,0.006114f,0.005877f,0.005645f,0.005417f,0.005194f,0.004976f,
-      0.004762f,0.004553f,0.004349f,0.004149f,0.003954f,0.003764f,0.003578f,0.003397f,0.003221f,0.003049f,0.002883f,
-      0.002720f,0.002563f,0.002410f,0.002262f,0.002118f,0.001980f,0.001845f,0.001716f,0.001591f,0.001471f,0.001356f,
-      0.001245f,0.001140f,0.001038f,0.000942f,0.000850f,0.000763f,0.000681f,0.000603f,0.000530f,0.000462f,0.000398f,
-      0.000339f,0.000285f,0.000236f,0.000191f,0.000151f,0.000115f,0.000085f,0.000059f,0.000038f,0.000021f,0.000009f,
-      0.000002f,0.000000f };
-
-// -----------------------------------------------------------------------------
-
-OptFFT::OptFFT(const size_t maxDataSize)
-{
-   assert( maxDataSize % OVERLAPSAMPLES == 0 );
-
-   // DOUBLE
-   //m_pIn = static_cast<double*>( fftw_malloc(sizeof(double) * FRAMESIZE) );
-   //m_pOut = static_cast<fftw_complex*>( fftw_malloc(sizeof(fftw_complex) * (FRAMESIZE/2 + 1)) );
-    //m_p = fftw_plan_dft_r2c_1f(FRAMESIZE, m_pIn, m_pOut, FFTW_ESTIMATE); // FFTW_ESTIMATE or FFTW_MEASURE
-
-   // FLOAT
- //  m_pIn = static_cast<float*>( fftwf_malloc(sizeof(float) * FRAMESIZE) );
- //  m_pOut = static_cast<fftwf_complex*>( fftwf_malloc(sizeof(fftwf_complex) * (FRAMESIZE/2 + 1)) );
-
-    //// in destroyed when line executed
-    //m_p = fftwf_plan_dft_r2c_1d(FRAMESIZE, m_pIn, m_pOut, FFTW_ESTIMATE); // FFTW_ESTIMATE or FFTW_MEASURE
-
-   //-----------------------------------------------------------------
-
-   int numSamplesPerFrame    = FRAMESIZE;
-   int numSamplesPerFrameOut = FRAMESIZE/2+1;
-
-    m_maxFrames = static_cast<int> ( (maxDataSize - FRAMESIZE) / OVERLAPSAMPLES + 1 );
-
-   m_pIn  = static_cast<float*> ( fftwf_malloc(sizeof(float) * (numSamplesPerFrame * m_maxFrames) ) );
-   if ( !m_pIn )
-   {
-      ostringstream oss;
-      oss << "fftwf_malloc failed on m_pIn. Trying to allocate <" 
-          << sizeof(float) * (numSamplesPerFrame * m_maxFrames)
-          << "> bytes";
-      throw std::runtime_error(oss.str());
-   }
-
-   m_pOut = static_cast<fftwf_complex*>( fftwf_malloc(sizeof(fftwf_complex) * (numSamplesPerFrameOut* m_maxFrames) ) );
-   if ( !m_pOut )
-   {
-      ostringstream oss;
-      oss << "fftwf_malloc failed on m_pOut. Trying to allocate <" 
-          << sizeof(fftwf_complex) * (numSamplesPerFrameOut* m_maxFrames)
-          << "> bytes";
-
-      throw std::runtime_error(oss.str());
-   }
-
-    // in destroyed when line executed
-   m_p = fftwf_plan_many_dft_r2c(1, &numSamplesPerFrame, m_maxFrames,
-                                 m_pIn, &numSamplesPerFrame, 1, numSamplesPerFrame,
-                                 m_pOut, &numSamplesPerFrameOut,
-                                 1, numSamplesPerFrameOut,
-                                 FFTW_ESTIMATE | FFTW_DESTROY_INPUT);
-
-   if ( !m_p )
-      throw std::runtime_error ("fftwf_plan_many_dft_r2c failed");
-
-    double base = exp( log( static_cast<double>(MAXFREQ) / static_cast<double>(MINFREQ) ) / 
-                      static_cast<double>(Filter::NBANDS) 
-                     );
-
-   m_powTable.resize( Filter::NBANDS+1 );
-   for ( unsigned int i = 0; i < Filter::NBANDS + 1; ++i )
-      m_powTablei = static_cast<unsigned int>( (pow(base, static_cast<double>(i)) - 1.0) * MINCOEF );
-
-   m_pFrames = new float*m_maxFrames;
-
-   if ( !m_pFrames )
-   {
-      ostringstream oss;
-      oss << "Allocation failed on m_pFrames. Trying to allocate <" 
-         << sizeof(float*) * m_maxFrames
-         << "> bytes";
-
-      throw std::runtime_error(oss.str());
-   }
-
-
-   for (int i = 0; i < m_maxFrames; ++i) 
-   {
-      m_pFramesi = new floatFilter::NBANDS;
-      if ( !m_pFramesi )
-         throw std::runtime_error("Allocation failed on m_pFrames");
-   }
-
-}
-
-// ----------------------------------------------------------------------
-
-OptFFT::~OptFFT()
-{
-    fftwf_destroy_plan(m_p);
-    
-    fftwf_free(m_pIn);
-    fftwf_free(m_pOut);
-
-   for (int i = 0; i < m_maxFrames; ++i)
-      delete  m_pFramesi;
-
-   delete  m_pFrames;
-}
-
-// ----------------------------------------------------------------------
-
-int OptFFT::process(float* pInData, const size_t dataSize)
-{
-   // generally is the same of the one we used in the constructor (m_maxFrames) but
-   // might be less at the end of the stream
-   int nFrames = static_cast<int>( (dataSize - FRAMESIZE) / OVERLAPSAMPLES + 1 );
-
-   float* pIn_It = m_pIn;
-
-   for (int i = 0; i < nFrames; ++i)
-   {
-      memcpy( pIn_It, &pInDatai*OVERLAPSAMPLES, sizeof(float) * FRAMESIZE);
-      // apply hanning window
-      applyHann(pIn_It, FRAMESIZE);
-
-      pIn_It += FRAMESIZE;
-   }
-
-   // fill the rest with zeroes
-   if ( nFrames < m_maxFrames )
-      memset( pIn_It, 0, sizeof(float) * (m_maxFrames-nFrames) * FRAMESIZE );
-
-   fftwf_execute(m_p);
-
-   int totSamples = (FRAMESIZE/2+1) * // numSamplesPerFrameOut
-                    nFrames; // the frames actually in the input
-
-   // scaling (?)
-   float scalingFactor = static_cast<float>(FRAMESIZE) / 2.0f;
-   for (int k = 0; k < totSamples; ++k)
-   {
-      m_pOutk0 /= scalingFactor;
-      m_pOutk1 /= scalingFactor;
-   }
-
-   int frameStart;
-   unsigned int outBlocStart;
-   unsigned int outBlocEnd;
-
-    for (int i = 0; i < nFrames; ++i) 
-   {
-      frameStart = i * (FRAMESIZE/2+1);
-
-       // compute bands
-       for (unsigned int j = 0; j < Filter::NBANDS; j++) 
-      {
-         outBlocStart = m_powTablej + frameStart;
-         outBlocEnd   = m_powTablej+1 + frameStart;
-
-           m_pFramesij = 0;
-
-           // WARNING: We're double counting the last one here.
-           // this bug is to match matlab's implementation bug in power2band.m
-         unsigned int end_k = outBlocEnd + static_cast<unsigned int>(MINCOEF);
-           for (unsigned int k = outBlocStart + static_cast<unsigned int>(MINCOEF); k <= end_k; k++) 
-         {
-               m_pFramesij += m_pOutk0 * m_pOutk0 + 
-                               m_pOutk1 * m_pOutk1;
-           }
-
-           // WARNING: if we change the k<=end to k<end above, we need to change the following line
-           m_pFramesij /= static_cast<float>(outBlocEnd - outBlocStart + 1);        
-       }   
-   }
-
-   return nFrames;
-}
-
-// -----------------------------------------------------------------------------
-
-void OptFFT::applyHann( float* pInData, const size_t dataSize )
-{
-   assert (dataSize == 2048);
-
-   for ( size_t i = 0; i < dataSize; ++i )
-      pInDatai *= hanni;
-}
-
-// -----------------------------------------------------------------------------
-
-} // end of namespace
-
-// ----------------------------------------------------------------------

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fplib/OptFFT.h Deleted

@@ -1,63 +0,0 @@
-/*
-   Copyright 2005-2009 Last.fm Ltd. <mir@last.fm>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __OPT_FFT_H
-#define __OPT_FFT_H
-
-#include <fftw3.h>
-#include <vector>
-
-namespace fingerprint
-{
-
-class OptFFT
-{
-public:
-
-   OptFFT(const size_t maxDataSize);
-   ~OptFFT();
-
-   int 
-   process(float* pInData, const size_t dataSize);
-   
-   float** 
-   getFrames()    { return m_pFrames; }
-
-private:
-
-   void applyHann(float* pInData, const size_t dataSize);
-
-    fftwf_plan        m_p;
-    fftwf_complex *   m_pOut;
-    float*            m_pIn;
-
-   //float   m_base;
-
-   int     m_numSamples;
-   int     m_numOutSamples;
-
-   float** m_pFrames;
-   int     m_maxFrames;
-
-   std::vector<int> m_powTable;
-
-};
-
-} // end of namespace
-
-#endif // OPT_FFT

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/fingerprint/fplib/fp_helper_fun.h Deleted

@@ -1,443 +0,0 @@
-/*
-   Copyright 2005-2009 Last.fm Ltd. <mir@last.fm>
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef __FINGERPRINT_HELPER_FUNCTIONS_H
-#define __FINGERPRINT_HELPER_FUNCTIONS_H
-
-#include <vector>
-#include <deque>
-#include <set>
-
-namespace fingerprint
-{
-
-// -----------------------------------------------------------------------------
-
-static const size_t FINGERPRINT_LIB_VERSION = 1;
-static const float  QUERY_START_SECS = 20;
-static const float  QUERY_SIZE_SECS = 14;
-static const float  UPDATE_SIZE_SECS = 10;
-//FFT needs also a buffer that depends on the input freq. 3 secs should be enough up to 48Khz 
-static const float  GUARD_SIZE_SECS = 3; 
-static const float  NORMALIZATION_SKIP_SECS = 2.5;
-static const int    MIN_UNIQUE_KEYS = 75;
-static const unsigned int MAX_GOOD_GROUP_SIZE = 200;
-static const int    SHA_SIZE = 32;
-
-/////////////////////////////////////////////////////
-// For FFT. DO NOT TOUCH THEM!
-// number of samples in a frame
-static const int FRAMESIZE = 2048;
-static const int OVERLAP = 32;
-static const int OVERLAPSAMPLES = (FRAMESIZE/OVERLAP); // 64
-
-// down-sampled frequency
-static const int DFREQ = 5512;
-static const float FDFREQ = 5512.5f;
-
-// -----------------------------------------------------------------------------
-
-struct GroupData
-{
-   unsigned int key;    // the key (or local descriptor)
-   unsigned int count;  // the number of frames sharing this key
-};
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-
-inline 
-unsigned int getTotalKeys( 
-   int mSecs )
-{
-   return static_cast<unsigned int>((static_cast<double>(mSecs) / (1000.0 * OVERLAPSAMPLES) ) * DFREQ ) + 1;
-}
-
-// -----------------------------------------------------------------------------
-
-template <typename GroupDataIt>
-void simpleSkip( 
-   GroupDataIt& begIt, const GroupDataIt& endIt,
-   unsigned int numSkipKeys )
-{
-   if ( numSkipKeys <= 0 )
-      return;
-
-   unsigned int nKeys;
-   for ( nKeys = 0; nKeys < numSkipKeys && begIt != endIt; ++begIt )
-      nKeys += begIt->count;
-
-   // clear crop at the end
-   if ( nKeys > numSkipKeys )
-   {
-      --begIt;
-      begIt->count = nKeys - numSkipKeys;
-   }
-
-}
-
-// -----------------------------------------------------------------------------
-
-template <typename TGroupData>
-void cutGroups( 
-   std::vector<TGroupData>& groups, 
-   const unsigned int startMS, 
-   const unsigned int lengthMS )
-{
-   typename  std::vector<TGroupData>::iterator itBeg = groups.begin(), itEnd = groups.begin();
-
-   unsigned int keys_begin, keys_end;
-
-   for (keys_begin = getTotalKeys(startMS);
-                  itBeg != groups.end() && keys_begin > itBeg->count; ++itBeg)
-      keys_begin -= itBeg->count;
-
-   for (keys_end = getTotalKeys(startMS + lengthMS);
-        itEnd != groups.end() && keys_end > itEnd->count; ++itEnd)
-      keys_end -= itEnd->count;
-
-   if (itBeg == groups.end())  // in the umpossible scenario that you try to cut past the size of the groups
-   {
-      groups.clear();
-      return;
-   }
-
-   itBeg->count -= keys_begin;
-   if (keys_end > 0 && itEnd != groups.end())
-   {
-      itEnd->count = keys_end;
-      ++itEnd;
-   }
-
-   copy(itBeg, itEnd, groups.begin());
-   groups.resize(itEnd - itBeg);
-
-   keys_begin = getTotalKeys(lengthMS);
-   for (typename std::vector<TGroupData>::iterator it = groups.begin(); it != groups.end(); ++it)
-      keys_begin -= it->count;
-}
-
-// -------------------------------------------------------------------------
-
-template <typename TGroupData>
-void keys2GroupData( 
-   const std::vector<unsigned int>& keys, // in
-   std::vector<TGroupData>& groupData,
-   bool clearDst = true ) // out
-{
-   if (clearDst)
-      groupData.clear();
-
-   if (keys.empty())
-      return;
-
-   TGroupData tmpGroup;
-   std::vector<unsigned int>::const_iterator it = keys.begin();
-
-   if ( !groupData.empty() )
-   {
-      // get the last group 
-      tmpGroup = groupData.back();
-      groupData.pop_back();
-   }
-   else
-   {
-      // new group!
-      tmpGroup.key = *it;
-      tmpGroup.count = 1;
-      ++it; // move to the next key
-   }
-
-   for (; it != keys.end(); ++it)
-   {
-      if ( *it != tmpGroup.key )
-      {
-         // new group ready!
-         groupData.push_back( tmpGroup );
-         tmpGroup.key = *it;
-         tmpGroup.count = 0;
-      }
-
-      ++tmpGroup.count;
-   }
-
-   // last group
-   groupData.push_back( tmpGroup );
-}
-
-// -------------------------------------------------------------------------
-
-template <typename TGroupData>
-void keys2GroupData( 
-   const std::vector<unsigned int>& keys, // in
-   std::deque<TGroupData>& groupData,
-   bool clearDst = true ) // out
-{
-   if (clearDst)
-      groupData.clear();
-
-   if (keys.empty())
-      return;
-
-   TGroupData tmpGroup;
-   std::vector<unsigned int>::const_iterator it = keys.begin();
-
-   if ( !groupData.empty() )
-   {
-      // get the last group 
-      tmpGroup = groupData.back();
-      groupData.pop_back();
-   }
-   else
-   {
-      // new group!
-      tmpGroup.key = *it;
-      tmpGroup.count = 1;
-      ++it; // move to the next key
-   }
-
-   for (; it != keys.end(); ++it)
-   {
-      if ( *it != tmpGroup.key )
-      {
-         // new group ready!
-         groupData.push_back( tmpGroup );
-         tmpGroup.key = *it;
-         tmpGroup.count = 0;
-      }
-
-      ++tmpGroup.count;
-   }
-
-   // last group
-   groupData.push_back( tmpGroup );
-}
-
-// -------------------------------------------------------------------------
-
-template <typename TGroupData>
-inline 
-void groupData2Keys( 
-   const std::vector<TGroupData>& groupData, // in
-   std::vector<unsigned int>& keys ) // out
-{
-   keys.clear();
-
-   typename std::vector<TGroupData>::const_iterator it;
-   
-   for (it = groupData.begin(); it != groupData.end(); ++it)
-   {
-      for (unsigned int j = 0; j < it->count; ++j)
-         keys.push_back(it->key);
-   }
-}
-
-// -------------------------------------------------------------------------
-
-template <typename GroupDataIt>
-bool findSignificantGroups(
-   GroupDataIt& beg, GroupDataIt& end, unsigned int& offset_left, unsigned int& offset_right,
-   unsigned int windowKeySize, unsigned int subWindowKeySize, unsigned int minUniqueKeys)
-{
-   GroupDataIt itBeg = beg, itEnd = beg, itWindowBeg = beg, itWindowEnd = beg;
-
-   offset_left = 0;
-   unsigned int window_offset_left;
-   unsigned int window_offset_right;
-
-   // this amounts to around a 500 ms hop for, say, a 20 second sub-window
-   unsigned int key_hop_size = subWindowKeySize / 40;  
-
-   // trail out itEnd
-   for (offset_right = windowKeySize; itEnd != end && offset_right > itEnd->count; ++itEnd)
-      offset_right -= itEnd->count;
-
-   // dang man, we don't even have enough groups to span the window size
-   if (itEnd == end && offset_right > 0)
-      return false;
-
-   // 0 window size means just scan the whole range
-   if (windowKeySize == 0)
-      itEnd = end;
-
-   // trail out itWindowBeg
-   for (window_offset_left = (windowKeySize - subWindowKeySize) / 2;
-        window_offset_left > itWindowBeg->count; ++itWindowBeg)
-      window_offset_left -= itWindowBeg->count;
-
-   // trail out itWindowEnd
-   for (window_offset_right = (windowKeySize + subWindowKeySize) / 2;
-      window_offset_right > itWindowEnd->count; ++itWindowEnd)
-      window_offset_right -= itWindowEnd->count;
-
-   while (itEnd != end)
-   {
-      if (enoughUniqueGoodGroups(itWindowBeg, itWindowEnd, minUniqueKeys))
-      {
-         beg = itBeg;
-         end = itEnd;
-         return true;
-      }
-
-      // okay, jump key_hop_size on end iterator
-      for (offset_right += key_hop_size; itEnd != end && offset_right > itEnd->count; ++itEnd)
-         offset_right -= itEnd->count;
-
-      // if we didn't hop the full hop size, modify the hop size to only hop as far as we hopped
-      if (itEnd == end)
-         key_hop_size -= offset_right;
-
-      for (offset_left += key_hop_size; offset_left > itBeg->count; ++itBeg)
-         offset_left -= itBeg->count;
-      for (window_offset_right += key_hop_size; window_offset_right > itWindowEnd->count; ++itWindowEnd)
-         window_offset_right -= itWindowEnd->count;
-      for (window_offset_left += key_hop_size; window_offset_left > itWindowBeg->count; ++itWindowBeg)
-         window_offset_left -= itWindowBeg->count;
-   }
-
-   beg = itBeg;
-   end = itEnd;
-
-   return enoughUniqueGoodGroups(itWindowBeg, itWindowEnd, minUniqueKeys);
-}
-
-// -----------------------------------------------------------------------------
-
-template <typename TGroupData>
-bool
-reduceGroups( 
-  std::vector<TGroupData>& groups, unsigned int startKeySize,
-  unsigned int windowKeySize, unsigned int subWindowKeySize, unsigned int minUniqueKeys )
-{
-   unsigned int offset_left = 0;
-   unsigned int offset_right = 0;
-
-   typename std::vector<TGroupData>::iterator begIt = groups.begin();
-   typename std::vector<TGroupData>::iterator endIt = groups.end();
-
-   simpleSkip(begIt, endIt, startKeySize);
-   bool result = findSignificantGroups( begIt, endIt, 
-      offset_left, offset_right, 
-      windowKeySize, subWindowKeySize, minUniqueKeys );
-
-   if ( !result )
-   {
-      groups.clear();
-      return false;
-   }
-
-   begIt->count -= offset_left;
-   if (offset_right > 0 && endIt != groups.end())
-   {
-      endIt->count = offset_right;
-      ++endIt;
-   }
-
-   std::vector<TGroupData> resGrups(begIt, endIt);
-   groups.swap(resGrups);
-
-   return true;
-}
-
-
-// -------------------------------------------------------------------------
-
-template <typename GroupDataIt>
-inline bool enoughUniqueGoodGroups(
-   const GroupDataIt& beg, 
-   const GroupDataIt& end, 
-   unsigned int minUniqueKeys)
-{
-   std::set<unsigned int> groupKeys;
-
-   for (GroupDataIt it = beg; it != end && static_cast<unsigned int>(groupKeys.size()) < minUniqueKeys; ++it)
-   {
-      if (it->count > MAX_GOOD_GROUP_SIZE)
-         return false;
-
-      groupKeys.insert(it->key);
-   }
-   
-   return static_cast<unsigned int>(groupKeys.size()) >= minUniqueKeys;
-}
-
-// -----------------------------------------------------------------------------
-//////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////
-// Used by the fingerprint keys operation
-
-// minimum and maximum frequency to consider
-#define MINFREQ 300
-#define MAXFREQ 2000
-
-// amount of time in a frame
-#define FRAME_TLEN ((float) FRAMESIZE / (float) DFREQ)
-#define MINCOEF (FRAME_TLEN * MINFREQ)
-
-#define round__(x)  ((int)(x + .5))
-
-struct RawFilter
-{
-   unsigned int ftid;
-   float thresh;
-    float weight;
-};
-
-const RawFilter rFilters = {
-   { 26752, -4.37515e-07f, 0.260836f }, // filterID, threshold, alpha (weight)
-   { 23871, -2.44615e-05f, 0.263986f },
-   { 26777, -3.69244e-08f, 0.267763f },
-   { 4635,  -1.13672e-05f, 0.269428f },
-   { 2937,   5.28804e-09f, 0.271896f },
-   { 27405, -0.000126494f, 0.272362f },
-   { 10782,  4.27478e-08f, 0.272609f },
-   { 21033, -6.7912e-07f,  0.276099f },
-   { 27117,  8.07178e-06f, 0.277762f },
-   { 27072,  2.46044e-05f, 0.27883f  },
-   { 24228,  4.11255e-07f, 0.281743f },
-   { 23838,  0.000228396f, 0.284479f },
-   { 17165, -1.19495e-07f, 0.286304f },
-   { 25263,  0.000398279f, 0.287066f },
-   { 20721,  7.15095e-07f, 0.288913f },
-   { 8502,  -2.78361e-07f, 0.290424f },
-   { 17175, -1.08429e-08f, 0.292219f },
-   { 17811, -3.29527e-08f, 0.292554f },
-   { 27495, -4.47575e-07f, 0.290119f },
-   { 23538, -3.04273e-09f, 0.294539f },
-   { 8205,   4.02691e-07f, 0.293525f },
-   { 12177,  1.16873e-06f, 0.293832f },
-   { 27051, -0.000902544f, 0.296453f },
-   { 27111, -2.38425e-05f, 0.297428f },
-   { 21779, -1.0669e-07f,  0.297302f },
-   { 14817, -9.52849e-09f, 0.299f    },
-   { 27087,  1.22163e-05f, 0.296502f },
-   { 27081, -2.8758e-09f,  0.300112f },
-   { 20394,  1.28237e-06f, 0.298693f },
-   { 28209,  0.000624447f, 0.29812f  },
-   { 23533, -2.19406e-06f, 0.299773f },
-   { 23865, -1.28037e-08f, 0.300777f } // this is iteration 1
-};
-
-// -----------------------------------------------------------------------------
-
-}
-
-// -----------------------------------------------------------------------------
-
-#endif // __FINGERPRINT_HELPER_FUNCTIONS_H
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/global.h Deleted

@@ -1,132 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef LASTFM_GLOBAL_H
-#define LASTFM_GLOBAL_H
-
-#define LASTFM_VERSION 0x00000400
-#define LASTFM_VERSION_STRING "0.4.0"
-#define LASTFM_MAJOR_VERSION 0
-#define LASTFM_MINOR_VERSION 4
-#define LASTFM_PATCH_VERSION 0
-
-
-#include <QtGlobal>
-
-#ifndef LASTFM_LIB_STATIC
-#ifdef LASTFM_LIB
-    #define LASTFM_DLLEXPORT Q_DECL_EXPORT
-#else
-    #define LASTFM_DLLEXPORT Q_DECL_IMPORT
-#endif
-#ifdef LASTFM_FINGERPRINT_LIB
-    #define LASTFM_FINGERPRINT_DLLEXPORT Q_DECL_EXPORT
-#else
-    #define LASTFM_FINGERPRINT_DLLEXPORT Q_DECL_IMPORT
-#endif
-#else // LASTFM_LIB_STATIC
-    #define LASTFM_DLLEXPORT
-    #define LASTFM_FINGERPRINT_DLLEXPORT
-#endif // LASTFM_LIB_STATIC
-
-
-#include <QMetaEnum>
-#include <QString>
-
-namespace lastfm
-{
-    /** http://labs.trolltech.com/blogs/2008/10/09/coding-tip-pretty-printing-enum-values
-      * Tips for making this take a single parameter welcome! :)
-      * 
-      * eg. lastfm::qMetaEnumString<QNetworkReply>( error, "NetworkError" );
-      */
-    template <typename T> static inline QString qMetaEnumString( int enum_value, const char* enum_name )
-    {
-        QMetaObject meta = T::staticMetaObject;
-        for (int i=0; i < meta.enumeratorCount(); ++i)
-        {
-            QMetaEnum m = meta.enumerator(i);
-            if (m.name() == QLatin1String(enum_name))
-                return QLatin1String(m.valueToKey(enum_value));
-        }
-        return QString("Unknown enum value for \"%1\": %2").arg( enum_name ).arg( enum_value );
-    }
-
-
-    enum ImageSize
-    {
-        Small,
-        Medium,
-        Large, /** seemingly 174x174 */
-        ExtraLarge,
-        Mega
-    };
-    
-    
-    //convenience
-    class Album;
-    class Artist;
-    class Audioscrobbler;
-    class AuthenticatedUser;
-    class Fingerprint;
-    class FingerprintableSource;
-    class FingerprintId;
-    class Mbid;
-    class MutableTrack;
-    class NetworkAccessManager;
-    class Playlist;
-    class User;
-    class RadioStation;
-    class Tag;
-    class Track;
-    class XmlQuery;
-    class Xspf;
-}
-
-
-#ifdef LASTFM_COLLAPSE_NAMESPACE
-using lastfm::Album;
-using lastfm::Artist;
-using lastfm::Audioscrobbler;
-using lastfm::AuthenticatedUser;
-using lastfm::Fingerprint;
-using lastfm::FingerprintId;
-using lastfm::Mbid;
-using lastfm::MutableTrack;
-using lastfm::Playlist;
-using lastfm::User;
-using lastfm::RadioStation;
-using lastfm::Tag;
-using lastfm::Track;
-using lastfm::XmlQuery;
-using lastfm::Xspf;
-#endif
-
-
-//convenience
-class QDomDocument;
-class QNetworkAccessManager;
-class QNetworkReply;
-
-
-//convenience for development
-#include <QDebug>
-
-#endif //LASTFM_GLOBAL_H

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/lastfm.pro Deleted

@@ -1,87 +0,0 @@
-TEMPLATE = lib
-QT = core network xml
-
-INSTALLS = target
-target.path = /lib
-
-win32{
-    DEFINES += LASTFM_LIB _ATL_DLL 
-    LIBS += winhttp.lib wbemuuid.lib # ws configuration
-}
-mac{
-    LIBS += -framework SystemConfiguration # ws configuration
-    #TODO we should only use these with the carbon version of Qt!
-    LIBS += -framework Carbon -framework CoreFoundation # various
-}
-
-linux*{
-    QT += dbus
-}
-
-SOURCES += \
-	ws/ws.cpp \
-	ws/NetworkConnectionMonitor.cpp \
-	ws/NetworkAccessManager.cpp \
-	ws/InternetConnectionMonitor.cpp \
-	types/Xspf.cpp \
-	types/User.cpp \
-	types/Track.cpp \
-	types/Tasteometer.cpp \
-	types/Tag.cpp \
-	types/Playlist.cpp \
-	types/Mbid.cpp \
-	types/FingerprintId.cpp \
-	types/Artist.cpp \
-	types/Album.cpp \
-	scrobble/ScrobbleCache.cpp \
-	scrobble/Audioscrobbler.cpp \
-	radio/RadioTuner.cpp \
-	radio/RadioStation.cpp \
-	core/XmlQuery.cpp \
-	core/UrlBuilder.cpp \
-	core/misc.cpp
-	
-HEADERS += \
-	ws/ws.h \
-	ws/NetworkConnectionMonitor.h \
-	ws/NetworkAccessManager.h \ 
-	ws/InternetConnectionMonitor.h \
-	types/Xspf.h \
-	types/User.h \
-	types/Track.h \
-	types/Tasteometer.h \
-	types/Tag.h \
-	types/Playlist.h \
-	types/Mbid.h \
-	types/FingerprintId.h \
-	types/Artist.h \
-	types/Album.h \
-	types/AbstractType.h \
-	scrobble/ScrobblePoint.h \
-	scrobble/ScrobbleCache.h \
-	scrobble/Audioscrobbler.h \
-	radio/RadioTuner.h \
-	radio/RadioStation.h \
-	global.h \
-	core/XmlQuery.h \
-	core/UrlBuilder.h \
-	core/misc.h
-	
-win32:SOURCES += ws/win/WNetworkConnectionMonitor_win.cpp \
-	ws/win/WmiSink.cpp \
-	ws/win/Pac.cpp \
-	ws/win/NdisEvents.cpp
-	
-win32:HEADERS += ws/win/WNetworkConnectionMonitor.h \
-	ws/win/WmiSink.h \
-	ws/win/Pac.h \
-	ws/win/NdisEvents.h \
-	ws/win/IeSettings.h \
-	ws/win/ComSetup.h
-
-mac:SOURCES += 	ws/mac/MNetworkConnectionMonitor_mac.cpp
-
-mac:HEADERS += ws/mac/ProxyDict.h \
-               ws/mac/MNetworkConnectionMonitor.h
-
-!win32:VERSION = 0.4.0

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/radio Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/radio/RadioStation.cpp Deleted

@@ -1,337 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <QRegExp>
-#include <QStringList>
-
-#include "RadioStation.h"
-#include "../core/XmlQuery.h"
-
-
-const float k_defaultRep(0.5);
-const float k_defaultMainstr(0.5);
-const bool k_defaultDisco(false);
-
-lastfm::RadioStation
-lastfm::RadioStation::library( const lastfm::User& user )
-{
-    QList<lastfm::User> users;
-    users << user;
-    return library( users );
-}
-
-lastfm::RadioStation
-lastfm::RadioStation::library( QList<lastfm::User>& users )
-{
-    RadioStation s( libraryStr( users ) );
-    if( users.count() == 1 ) 
-        s.setTitle( QObject::tr( "%1%2s Library Radio").arg( lastfm::ws::Username, QChar(0x2019) ));
-
-    else {
-        QString title;
-        for( QList<lastfm::User>::const_iterator i = users.begin(); i != users.end(); i++ ) {
-            if( i == users.end() - 1 )
-                title += " and " + *i;
-            else
-                title += ", " + *i;
-        }
-
-        s.setTitle( title );
-    }
-
-    return s;
-}
-
-
-lastfm::RadioStation
-lastfm::RadioStation::recommendations( const lastfm::User& user )
-{
-    RadioStation s( recommendationsStr( user ) );
-    
-    s.setTitle( QObject::tr( "%1%2s Recommended Radio").arg( lastfm::ws::Username, QChar(0x2019) ));
-
-    return s;
-}
-
-lastfm::RadioStation
-lastfm::RadioStation::friends( const lastfm::User& user )
-{
-    RadioStation s( friendsStr( user ) );
-
-    s.setTitle( QObject::tr( "%1%2s Friends Radio").arg( lastfm::ws::Username, QChar(0x2019) ));
-
-    return s; 
-}
-
-lastfm::RadioStation
-lastfm::RadioStation::neighbourhood( const lastfm::User& user )
-{
-    RadioStation s( neighbourhoodStr( user ) );
-    s.setTitle( QObject::tr( "%1%2s Neighbours%2 Radio").arg( lastfm::ws::Username, QChar(0x2019) ));
-    return s;
-}
-
-
-lastfm::RadioStation
-lastfm::RadioStation::tag( const lastfm::Tag& tag )
-{
-    QList<lastfm::Tag> tags;
-    tags << tag;
-    return lastfm::RadioStation::tag( tags );
-}
-
-
-lastfm::RadioStation
-lastfm::RadioStation::tag( QList<lastfm::Tag>& tag )
-{
-    return RadioStation( tagStr( tag ) );
-}
-
-
-lastfm::RadioStation
-lastfm::RadioStation::similar( const lastfm::Artist& artist )
-{
-    QList<lastfm::Artist> artists;
-    artists << artist;
-    return similar( artists );
-}
-
-
-lastfm::RadioStation
-lastfm::RadioStation::similar( QList<lastfm::Artist>& artists )
-{
-    return RadioStation( similarStr( artists ) );
-}
-
-
-lastfm::RadioStation
-lastfm::RadioStation::mix( const lastfm::User& user )
-{
-    RadioStation s( mixStr( user ) );
-    s.setTitle( QObject::tr( "%1%2s Mix Radio").arg( lastfm::ws::Username, QChar(0x2019) ) );
-    return s;
-}
-
-
-QString
-lastfm::RadioStation::url() const
-{
-    return m_url.toString() + (m_tagFilter.isEmpty() ? "" : "/tag/" + m_tagFilter);
-}
-
-
-void
-lastfm::RadioStation::setTitle( const QString& s )
-{
-    // Stop the radio station getting renamed when the web services don't know what it's called
-    if ( !m_title.isEmpty() && s.compare( "a radio station", Qt::CaseInsensitive ) == 0 )
-        return;
-
-    QString title = s.trimmed();
-
-    if ( title.compare( QObject::tr("%1%2s Library Radio").arg( lastfm::ws::Username, QChar(0x2019) ), Qt::CaseInsensitive ) == 0 )
-        title = QObject::tr("My Library Radio");
-    else if ( title.compare( QObject::tr("%1%2s Mix Radio").arg( lastfm::ws::Username, QChar(0x2019) ), Qt::CaseInsensitive ) == 0  )
-        title = QObject::tr("My Mix Radio");
-    else if ( title.compare( QObject::tr("%1%2s Recommended Radio").arg( lastfm::ws::Username, QChar(0x2019) ), Qt::CaseInsensitive ) == 0  )
-        title = QObject::tr("My Recommended Radio");
-    else if ( title.compare( QObject::tr("%1%2s Friends%2 Radio").arg( lastfm::ws::Username, QChar(0x2019) ), Qt::CaseInsensitive ) == 0  )
-        title = QObject::tr("My Friends%1 Radio").arg( QChar( 0x2019 ) );
-    else if ( title.compare( QObject::tr("%1%2s Friends Radio").arg( lastfm::ws::Username, QChar(0x2019) ), Qt::CaseInsensitive ) == 0  )
-        title = QObject::tr("My Friends%1 Radio").arg( QChar( 0x2019 ) );
-    else if ( title.compare( QObject::tr("%1%2s Neighbours%2 Radio").arg( lastfm::ws::Username, QChar(0x2019) ), Qt::CaseInsensitive ) == 0  )
-        title = QObject::tr("My Neighbours%1 Radio").arg( QChar( 0x2019 ) );
-    else if ( title.compare( QObject::tr("%1%2s Neighbours Radio").arg( lastfm::ws::Username ), Qt::CaseInsensitive ) == 0  )
-        title = QObject::tr("My Neighbours%1 Radio").arg( QChar( 0x2019 ) );
-
-    m_title = title;
-}
-
-
-QString
-lastfm::RadioStation::title() const
-{
-    return m_title; // + (m_tagFilter.isEmpty() ? "" : ": " + m_tagFilter);
-}
-
-
-void
-lastfm::RadioStation::setTagFilter( const QString& tag )
-{
-    m_tagFilter = tag;
-}
-
-
-QNetworkReply*
-lastfm::RadioStation::getSampleArtists( int limit ) const
-{
-    QMap<QString, QString> map;
-    map"method" = "radio.getSampleArtists";
-    map"station" = m_url.toString();
-    map"limit" = QString::number( limit );
-    return ws::get( map );
-}
-
-
-QNetworkReply*
-lastfm::RadioStation::getTagSuggestions( int limit ) const
-{
-    QMap<QString, QString> map;
-    map"method" = "radio.getTagSuggestions";
-    map"station" = m_url.toString();
-    map"limit" = QString::number( limit );
-    return ws::get( map );
-}
-
-
-//static 
-QList<lastfm::RadioStation> 
-lastfm::RadioStation::list( QNetworkReply* r )
-{
-    QList<lastfm::RadioStation> result;
-    try {
-        foreach (XmlQuery xq, XmlQuery( r->readAll() ).children("station")) {
-            lastfm::RadioStation rs( QUrl::fromPercentEncoding( xq"url".text().toUtf8() ) );
-            rs.setTitle(xq"name".text());
-            result.append(rs);
-        }
-    }
-    catch (ws::ParseError& e)
-    {
-        qWarning() << e.what();
-    }
-    return result;
-}
-
-
-bool
-lastfm::RadioStation::operator==( const RadioStation& that ) const
-{
-    return this->m_url == that.m_url && this->m_tagFilter == that.m_tagFilter;
-}
-
-
-void
-lastfm::RadioStation::setString( const QString& string )
-{
-    // If it's a tag filtered station then extract that part
-    QString tempString = string;
-
-    if ( !tempString.startsWith("lastfm://tag/") )
-    {
-        int index = tempString.indexOf("/tag/");
-
-        if ( index != -1 )
-        {
-            m_tagFilter = tempString.mid( index + 5, tempString.count() - (index + 5) );
-            tempString = tempString.mid( 0, index );
-        }
-    }
-
-    m_url = tempString;
-}
-
-
-void
-lastfm::RadioStation::setRep(float rep)
-{
-    m_rep = rep;
-}
-
-
-void
-lastfm::RadioStation::setMainstr(float mainstr)
-{
-    m_mainstr = mainstr;
-}
-
-
-void
-lastfm::RadioStation::setDisco(bool disco)
-{
-    m_disco = disco;
-}
-
-
-float lastfm::RadioStation::rep() const
-{
-    return m_rep;
-}
-
-
-float lastfm::RadioStation::mainstr() const
-{
-    return m_mainstr;
-}
-
-
-bool lastfm::RadioStation::disco() const
-{
-    return m_disco;
-}
-
-
-QString lastfm::RadioStation::libraryStr( QList<lastfm::User>& users )
-{
-    qSort(users.begin(), users.end());
-
-    QString url = (users.count() > 1) ? "lastfm://users/" : "lastfm://user/";
-
-    url.append( users0.name() );
-
-    for ( int i = 1 ; i < users.count() ; ++i )
-        url.append( "," + usersi.name() );
-
-    url.append("/personal");
-
-    return url;
-}
-
-
-QString lastfm::RadioStation::tagStr( QList<lastfm::Tag>& tags )
-{
-    qSort(tags.begin(), tags.end());
-
-    QString url = (tags.count() > 1) ? "lastfm://tag/" : "lastfm://globaltags/";
-
-    url.append( tags0.name() );
-
-    for ( int i = 1 ; i < tags.count() ; ++i )
-        url.append( "*" + tagsi.name() );
-
-    return url;
-}
-
-
-QString lastfm::RadioStation::similarStr( QList<lastfm::Artist>& artists )
-{
-    qSort(artists.begin(), artists.end());
-
-    QString url = (artists.count() > 1) ? "lastfm://artistnames/" : "lastfm://artist/";
-
-    url.append( artists0.name() );
-
-    for ( int i = 1 ; i < artists.count() ; ++i )
-        url.append( "," + artistsi.name() );
-
-    if (artists.count() == 1)
-        url.append( "/similarartists" );
-
-    return url;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/radio/RadioStation.h Deleted

@@ -1,123 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_RADIO_STATION_H
-#define LASTFM_RADIO_STATION_H
-
-#include <lastfm/User>
-#include <lastfm/Tag>
-#include <lastfm/Artist>
-
-namespace lastfm
-{
-    /** @author <jono@last.fm> 
-      */
-    class LASTFM_DLLEXPORT RadioStation
-    {
-    public:
-        RadioStation()
-        {}
-        RadioStation( const QString& s )
-        {
-        setString( s );
-        }
-    
-        static RadioStation library( const lastfm::User& user );
-        static RadioStation library( QList<lastfm::User>& users );
-
-        static RadioStation similar( const lastfm::Artist& artist );
-        static RadioStation similar( QList<lastfm::Artist>& artist );
-
-        static RadioStation tag( const lastfm::Tag& tag );
-        static RadioStation tag( QList<lastfm::Tag>& tag );
-
-        static RadioStation recommendations( const lastfm::User& user );
-        static RadioStation friends( const lastfm::User& user );
-        static RadioStation neighbourhood( const lastfm::User& user );
-
-        static RadioStation mix( const lastfm::User& user );
-
-        QNetworkReply* getSampleArtists( int limit = 50 ) const;
-        QNetworkReply* getTagSuggestions( int limit = 50 ) const;
-
-        /** eg. "mxcl's Loved Tracks"
-          * It is worth noting that the Radio doesn't set the title of RadioStation 
-          * object until we have tuned to it, and then we only set the one we give 
-          * you back.
-          */    
-        QString title() const;
-        /** the Last.fm url, eg. lastfm://user/mxcl/loved */
-        QString url() const;
-
-        void setTitle( const QString& title );
-
-        void setTagFilter( const QString& tag );
-
-        void setRep(float rep);
-        void setMainstr(float mainstr);
-        void setDisco(bool disco);
-
-        float rep() const;
-        float mainstr() const;
-        bool disco() const;
-
-        bool isLegacyPlaylist() const
-        {
-            return m_url.toString().startsWith( "lastfm://play/" ) ||
-                   m_url.toString().startsWith( "lastfm://preview/" ) ||
-                   m_url.toString().startsWith( "lastfm://track/" ) ||
-                   m_url.toString().startsWith( "lastfm://playlist/" );
-        }
-
-        // good for getRecentStations:
-        static QList<RadioStation> list( QNetworkReply* );
-
-        bool operator==( const RadioStation& that ) const;
-
-    private:
-        void setString( const QString& s );
-
-        static QString libraryStr( QList<lastfm::User>& user );
-        static QString recommendationsStr( const lastfm::User& user ) { return "lastfm://user/" + user + "/recommended"; }
-        static QString friendsStr( const lastfm::User& user )         { return "lastfm://user/" + user + "/friends"; }
-        static QString neighbourhoodStr( const lastfm::User& user )   { return "lastfm://user/" + user + "/neighbours"; }
-        static QString tagStr( QList<lastfm::Tag>& tag );
-        static QString similarStr( QList<lastfm::Artist>& artist );
-        static QString mixStr( const lastfm::User& user )             { return "lastfm://user/" + user + "/mix"; }
-    private:
-        QUrl m_url;
-        QString m_title;
-        QString m_tagFilter;
-
-        float m_rep;
-        float m_mainstr;
-        bool m_disco;
-    };
-}
-
-
-Q_DECLARE_METATYPE( lastfm::RadioStation )
-
-
-inline QDebug operator<<( QDebug d, const lastfm::RadioStation& station )
-{
-    return d << station.url();
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/radio/RadioTuner.cpp Deleted

@@ -1,219 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <QTimer>
-
-#include "RadioTuner.h"
-#include "../core/XmlQuery.h"
-#include "../types/Xspf.h"
-#include "../ws/ws.h"
-
-using namespace lastfm;
-
-//TODO skips left
-//TODO multiple locations for the same track
-//TODO set rtp flag in getPlaylist (whether user is scrobbling this radio session or not)
-
-// limit the number of retries following empty playlists:
-#define MAX_TUNING_ATTEMPTS 3
-
-
-RadioTuner::RadioTuner( const RadioStation& station )
-     : m_retry_counter( 0 ), m_fetchingPlaylist( false ), m_requestedPlaylist(false)
-{
-    m_twoSecondTimer = new QTimer( this );
-    m_twoSecondTimer->setSingleShot( true );
-    connect( m_twoSecondTimer, SIGNAL(timeout()), SLOT(onTwoSecondTimeout()));
-
-    qDebug() << station.url();
-
-    //Empty RadioStation implies that the radio
-    //should tune to the previous station.
-    if( station.url().isEmpty() )
-    {
-        fetchFiveMoreTracks();
-    }
-    else
-    {
-        QMap<QString, QString> map;
-        map"method" = "radio.tune";
-        map"station" = station.url();
-        map"additional_info" = "1";
-        connect( ws::post(map), SIGNAL(finished()), SLOT(onTuneReturn()) );
-    }
-}
-
-void
-RadioTuner::retune( const RadioStation& station )
-{
-    m_playlistQueue.clear();
-    m_retuneStation = station;
-
-    qDebug() << station.url();
-}
-
-
-void
-RadioTuner::onTuneReturn()
-{
-    try {
-        XmlQuery lfm = qobject_cast<QNetworkReply*>(sender())->readAll();
-        emit title( lfm"station""name".text() );
-
-        qDebug() << lfm;
-
-        emit supportsDisco( lfm"station""supportsdiscovery".text() == "1" );
-        fetchFiveMoreTracks();
-    }
-    catch (ws::ParseError& e)
-    {
-        emit error( e.enumValue(), e.message() );
-    }
-}
-
-
-void
-RadioTuner::fetchFiveMoreTracks()
-{
-    if ( !m_retuneStation.url().isEmpty() )
-    {
-        // We have been asked to retune so do it now
-        QMap<QString, QString> map;
-        map"method" = "radio.tune";
-        map"station" = m_retuneStation.url();
-        map"additional_info" = "1";
-
-        QNetworkReply* reply = ws::post(map);
-        connect( reply, SIGNAL(finished()), SLOT(onTuneReturn()) );
-
-        m_retuneStation = RadioStation();
-        m_twoSecondTimer->stop();
-    }
-    else
-    {
-        if ( !m_twoSecondTimer->isActive() )
-        {
-            //TODO check documentation, I figure this needs a session key
-            QMap<QString, QString> map;
-            map"method" = "radio.getPlaylist";
-            map"additional_info" = "1";
-            map"rtp" = "1"; // see above
-            connect( ws::post( map ), SIGNAL(finished()), SLOT(onGetPlaylistReturn()) );
-            m_fetchingPlaylist = true;
-        }
-        else
-            m_requestedPlaylist = true;
-    }
-}
-
-
-bool
-RadioTuner::tryAgain()
-{
-    qDebug() << "Bad response count" << m_retry_counter;
-    
-    if (++m_retry_counter > MAX_TUNING_ATTEMPTS)
-        return false;
-    fetchFiveMoreTracks();
-    return true;
-}
-
-
-void
-RadioTuner::onGetPlaylistReturn()
-{   
-    // We shouldn't request another playlist for 2 seconds because we'll get the same one
-    // in a different order. This QTimer will block until it has finished. If one or more
-    // playlists have been requested in the meantime, it will fetch one on timeout
-    m_twoSecondTimer->start( 2000 );
-
-    // This will block us fetching two playlists at once
-    m_fetchingPlaylist = false;
-
-    try {
-        XmlQuery lfm = qobject_cast<QNetworkReply*>(sender())->readAll();
-        emit title( lfm"playlist""title".text() );
-
-        qDebug() << lfm;
-
-        Xspf* xspf = new Xspf( lfm"playlist", this );
-        connect( xspf, SIGNAL(expired()), SLOT(onXspfExpired()) );
-
-        if ( xspf->isEmpty() )
-        {
-            // give up after too many empty playlists  :(
-            if (!tryAgain())
-                emit error( ws::NotEnoughContent, tr("Not enough content") );
-        }
-        else
-        {
-            m_retry_counter = 0;
-            m_playlistQueue << xspf;
-            emit trackAvailable();
-        }
-    }
-    catch (ws::ParseError& e) 
-    {
-        qWarning() << e.what();
-        emit error( e.enumValue(), e.message() );
-    }
-}
-
-void
-RadioTuner::onTwoSecondTimeout()
-{
-    if (m_requestedPlaylist)
-    {
-        m_requestedPlaylist = false;
-        fetchFiveMoreTracks();
-    }
-}
-
-void
-RadioTuner::onXspfExpired()
-{
-    int index = m_playlistQueue.indexOf( static_cast<Xspf*>(sender()) );
-    if ( index != -1 )
-        m_playlistQueue.takeAt( index )->deleteLater();
-}
-
-Track
-RadioTuner::takeNextTrack()
-{
-    if ( m_playlistQueue.isEmpty() )
-    {
-        // If there are no tracks here and we're not fetching tracks
-        // it's probably because the playlist expired so fetch more now
-        if ( !m_fetchingPlaylist )
-            fetchFiveMoreTracks();
-
-        return Track();
-    }
-
-    Track result = m_playlistQueue0->takeFirst();
-
-    if ( m_playlistQueue0->isEmpty() )
-        m_playlistQueue.removeFirst();
-
-    if ( m_playlistQueue.isEmpty() )
-        fetchFiveMoreTracks();
-
-    return result;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/radio/RadioTuner.h Deleted

@@ -1,85 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_TUNER_H
-#define LASTFM_TUNER_H
-
-#include <lastfm/RadioStation>
-#include <lastfm/Track>
-#include <lastfm/Xspf>
-#include <lastfm/ws.h>
-#include <QList>
-
-namespace lastfm
-{
-    /** With regard to error handling. We handle Ws::TryAgain up to 5 times,
-      * don't try again after that! Just tell the user to try again later. 
-      */
-    class LASTFM_DLLEXPORT RadioTuner : public QObject
-    {
-        Q_OBJECT
-    
-    public:
-        /** You need to have assigned Ws::* for this to work, creating the tuner
-          * automatically fetches the first 5 tracks for the station */
-        explicit RadioTuner( const RadioStation& );
-
-        Track takeNextTrack();
-
-        void retune( const RadioStation& );
-
-    signals:
-        void title( const QString& );
-        void supportsDisco( bool supportsDisco );
-        void trackAvailable();
-        void error( lastfm::ws::Error, const QString& message );
-
-    private slots:
-        void onTuneReturn();
-        void onGetPlaylistReturn();
-        void onXspfExpired();
-
-        void onTwoSecondTimeout();
-
-    private:
-        /** Tries again up to 5 times 
-          * @returns true if we tried again, otherwise you should emit error */
-        bool tryAgain();
-        /** Will emit 5 tracks from tracks(), they have to played within an hour
-          * or the streamer will refuse to stream them. Also the previous five are
-          * invalidated apart from the one that is currently playing, so sorry, you
-          * can't build up big lists of tracks.
-          *
-          * I feel I must point out that asking the user which one they want to play
-          * is also not allowed according to our terms and conditions, which you
-          * already agreed to in order to get your API key. Sorry about that dude. 
-          */
-        void fetchFiveMoreTracks();
-
-    private:
-        QList<Xspf*> m_playlistQueue;
-        uint m_retry_counter;
-        bool m_fetchingPlaylist;
-        bool m_requestedPlaylist;
-        class QTimer* m_twoSecondTimer;
-        RadioStation m_retuneStation;
-    };
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/scrobble Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/scrobble/Audioscrobbler.cpp Deleted

@@ -1,246 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <QPointer>
-
-#include "Audioscrobbler.h"
-#include "ScrobbleCache.h"
-
-#include "../types/User.h"
-#include "../types/Track.h"
-#include "../ws/ws.h"
-#include "../core/XmlQuery.h"
-
-
-namespace lastfm
-{
-    class AudioscrobblerPrivate
-    {
-    public:
-        AudioscrobblerPrivate(const QString& id)
-                : m_id( id )
-                , m_cache( ws::Username )
-        {}
-        
-        ~AudioscrobblerPrivate()
-        {
-        }
-
-        const QString m_id;
-        ScrobbleCache m_cache;
-        QList<Track> m_batch;
-        QPointer<QNetworkReply> m_nowPlayingReply;
-        QPointer<QNetworkReply> m_scrobbleReply;
-        Track m_nowPlayingTrack;
-    };
-}
-
-
-lastfm::Audioscrobbler::Audioscrobbler( const QString& id )
-        : d( new AudioscrobblerPrivate(id) )
-{
-    submit();
-}
-
-
-lastfm::Audioscrobbler::~Audioscrobbler()
-{
-    delete d;
-}
-
-
-void
-lastfm::Audioscrobbler::nowPlaying( const Track& track )
-{
-    if ( d->m_nowPlayingReply.isNull())
-    {
-        d->m_nowPlayingTrack = track;
-        d->m_nowPlayingReply = track.updateNowPlaying();
-        connect( d->m_nowPlayingReply, SIGNAL(finished()), SLOT(onNowPlayingReturn()));
-    }
-}
-
-
-void
-lastfm::Audioscrobbler::cache( const Track& track )
-{
-    QList<Track> tracks;
-    tracks.append( track );
-    cacheBatch( tracks );
-}
-
-
-void
-lastfm::Audioscrobbler::cacheBatch( const QList<lastfm::Track>& tracks )
-{
-    d->m_cache.add( tracks );
-
-    foreach ( const Track& track, d->m_cache.tracks() )
-        MutableTrack( track ).setScrobbleStatus( Track::Cached );
-
-    emit scrobblesCached( tracks );
-    submit();
-}
-
-
-void
-lastfm::Audioscrobbler::submit()
-{
-    if (d->m_cache.tracks().isEmpty() // there are no tracks to submit
-            || !d->m_scrobbleReply.isNull() ) // we are already submitting scrobbles
-        return;
-
-    // copy tracks to be submitted to a temporary list
-    d->m_batch = d->m_cache.tracks().mid( 0, 50 );
-
-    // if there is only one track use track.scrobble, otherwise use track.scrobbleBatch
-    if (d->m_batch.count() == 1)
-        d->m_scrobbleReply = d->m_batch0.scrobble();
-    else
-        d->m_scrobbleReply = lastfm::Track::scrobble( d->m_batch );
-
-    connect( d->m_scrobbleReply, SIGNAL(finished()), SLOT(onTrackScrobbleReturn()));
-}
-
-void
-lastfm::Audioscrobbler::parseTrack( const XmlQuery& trackXml, const Track& track )
-{
-    MutableTrack mTrack = MutableTrack( track );
-    bool isScrobble = QDomElement(trackXml).tagName() == "scrobble";
-
-    if ( trackXml"ignoredMessage".attribute("code") == "0" )
-    {
-        if ( isScrobble ) mTrack.setScrobbleStatus( Track::Submitted );
-
-        // corrections!
-        if ( trackXml"track".attribute("corrected") == "1"
-             || trackXml"artist".attribute("corrected") == "1"
-             || trackXml"album".attribute("corrected") == "1"
-             || trackXml"albumArtist".attribute("corrected") == "1")
-        {
-            mTrack.setCorrections(trackXml"track".text(),
-                                           trackXml"album".text(),
-                                           trackXml"artist".text(),
-                                           trackXml"albumArtist".text());
-        }
-    }
-    else if ( isScrobble )
-    {
-        mTrack.setScrobbleError( static_cast<Track::ScrobbleError>(trackXml"ignoredMessage".attribute("code").toInt()) );
-        mTrack.setScrobbleStatus( Track::Error );
-    }
-}
-
-void
-lastfm::Audioscrobbler::onNowPlayingReturn()
-{
-    try
-    {
-        lastfm::XmlQuery lfm = static_cast<QNetworkReply*>(sender())->readAll();
-
-        qDebug() << lfm;
-
-        if ( lfm.attribute("status") == "ok" )
-            parseTrack( lfm"nowplaying", d->m_nowPlayingTrack );
-        else
-            emit nowPlayingError( lfm"error".attribute("code").toInt(), lfm"error".text() );
-
-        d->m_nowPlayingTrack = Track();
-        d->m_nowPlayingReply = 0;
-    }
-    catch ( lastfm::ws::ParseError p )
-    {
-        qDebug() << p.message() << p.enumValue();
-    }
-    catch ( lastfm::ws::Error p )
-    {
-        qDebug() << p;
-    }
-
-    d->m_nowPlayingTrack = Track();
-    d->m_nowPlayingReply = 0;
-}
-
-
-void
-lastfm::Audioscrobbler::onTrackScrobbleReturn()
-{
-    try
-    {
-        lastfm::XmlQuery lfm = d->m_scrobbleReply->readAll();
-
-        qDebug() << lfm;
-
-        if (lfm.attribute("status") == "ok")
-        {
-            int index = 0;
-
-            foreach ( const XmlQuery& scrobble, lfm"scrobbles".children("scrobble") )
-                parseTrack( scrobble, d->m_batch.at( index++ ) );
-
-            emit scrobblesSubmitted( d->m_batch );
-
-            d->m_cache.remove( d->m_batch );
-            d->m_batch.clear();
-        }
-        else if ( d->m_scrobbleReply->error() == QNetworkReply::NoError )
-        {
-            // The scrobble submission failed, but the http request was sucessful
-
-            if ( !(lfm"error".attribute("code") == "9" // Bad session
-                || lfm"error".attribute("code") == "11" // Service offline
-                || lfm"error".attribute("code") == "16") ) // Service temporarily unavailable
-            {
-                foreach ( const Track& track, d->m_batch )
-                {
-                    MutableTrack mTrack = MutableTrack( track );
-                    mTrack.setScrobbleError( static_cast<Track::ScrobbleError>(lfm"error".attribute("code").toInt()) );
-                    mTrack.setScrobbleErrorText( lfm"error".text() );
-                    mTrack.setScrobbleStatus( Track::Error );
-                }
-
-                emit scrobblesSubmitted( d->m_batch );
-
-                // clear the cache if it was not one of these error codes
-                d->m_cache.remove( d->m_batch );
-                d->m_batch.clear();
-            }
-            else
-            {
-                Q_ASSERT(false);
-            }
-        }
-
-        d->m_scrobbleReply = 0;
-
-        // check is there are anymore scrobbles to submit
-        submit();
-    }
-    catch ( lastfm::ws::ParseError p )
-    {
-        qDebug() << p.message() << p.enumValue();
-        d->m_scrobbleReply = 0;
-    }
-    catch ( lastfm::ws::Error p )
-    {
-        qDebug() << p;
-        d->m_scrobbleReply = 0;
-    }
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/scrobble/Audioscrobbler.h Deleted

@@ -1,78 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_AUDIOSCROBBLER_H
-#define LASTFM_AUDIOSCROBBLER_H
-
-#include <lastfm/global.h>
-#include <QByteArray>
-#include <QList>
-#include <QString>
-#include <QObject>
-#include <QVariant>
-
-namespace lastfm
-{
-    /** @author Max Howell <max@last.fm>
-      * An implementation of the Audioscrobbler Realtime Submissions Protocol 
-      * version 1.2.1 for a single Last.fm user
-      * http://www.audioscrobbler.net/development/protocol/
-      */
-    class LASTFM_DLLEXPORT Audioscrobbler : public QObject
-    {
-        Q_OBJECT
-
-    public:
-        /** You will need to do QCoreApplication::setVersion and 
-          * QCoreApplication::setApplicationName for this to work, also you will 
-          * need to have set all the keys in the Ws namespace in WsKeys.h */
-        Audioscrobbler( const QString& clientId );
-        ~Audioscrobbler();
-
-    signals:
-        void scrobblesCached( const QList<lastfm::Track>& tracks );
-        /* Note that this is emitted after we tried to submit the scrobbles
-        It could just be that they have an error code */
-        void scrobblesSubmitted( const QList<lastfm::Track>& tracks );
-        void nowPlayingError( int code, QString message );
-
-    public slots:
-        /** will ask Last.fm to update the now playing information for the 
-          * authenticated user */
-        void nowPlaying( const Track& );
-        /** will cache the track and call submit() */
-        void cache( const Track& );
-        void cacheBatch( const QList<lastfm::Track>& );
-
-        /** will submit the submission cache for this user */
-        void submit();
-
-    private slots:
-        void onNowPlayingReturn();
-        void onTrackScrobbleReturn();
-
-    private:
-        void parseTrack( const XmlQuery& trackXml, const Track& track );
-
-    private:
-        class AudioscrobblerPrivate* d;
-    };
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/scrobble/ScrobbleCache.cpp Deleted

@@ -1,163 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "ScrobbleCache.h"
-#include "ScrobblePoint.h"
-#include <lastfm/misc.h>
-#include <QCoreApplication>
-#include <QFile>
-#include <QDomElement>
-#include <QDomDocument>
-
-#if LASTFM_VERSION >= 0x00010000
-using lastfm::ScrobbleCache;
-#endif
-
-ScrobbleCache::ScrobbleCache( const QString& username )
-{
-    Q_ASSERT( username.length() );
-
-    m_path = lastfm::dir::runtimeData().filePath( username + "_subs_cache.xml" );
-    m_username = username;
-
-    QDomDocument xml;
-    read( xml );
-}
-
-
-bool
-ScrobbleCache::isValid( const Track& track, Invalidity* v )
-{
-    #define TEST( test, x ) \
-        if (test) { \
-            if (v) *v = x; \
-            return false; \
-        }
-
-    TEST( track.duration() < ScrobblePoint::kScrobbleMinLength, TooShort );
-
-    TEST( !track.timestamp().isValid(), NoTimestamp );
-
-    // actual spam prevention is something like 12 hours, but we are only
-    // trying to weed out obviously bad data, server side criteria for
-    // "the future" may change, so we should let the server decide, not us
-    TEST( track.timestamp() > QDateTime::currentDateTime().addMonths( 1 ), FromTheFuture );
-
-    TEST( track.timestamp() < QDateTime::fromString( "2003-01-01", Qt::ISODate ), FromTheDistantPast );
-
-    // Check if any required fields are empty
-    TEST( track.artist().isNull(), ArtistNameMissing );
-    TEST( track.title().isEmpty(), TrackNameMissing );
-
-    TEST( (QStringList() << "unknown artist"
-                         << "unknown"
-                         << "unknown"
-                         << "unknown artist").contains( track.artist().name().toLower() ),
-           ArtistInvalid );
-
-    return true;
-}
-
-
-void
-ScrobbleCache::read( QDomDocument& xml )
-{
-    m_tracks.clear();
-
-    QFile file( m_path );
-    file.open( QFile::Text | QFile::ReadOnly );
-    QTextStream stream( &file );
-    stream.setCodec( "UTF-8" );
-
-    xml.setContent( stream.readAll() );
-
-    for (QDomNode n = xml.documentElement().firstChild(); !n.isNull(); n = n.nextSibling())
-        if (n.nodeName() == "track")
-            m_tracks += Track( n.toElement() );
-}
-
-
-void
-ScrobbleCache::write()
-{
-    if (m_tracks.isEmpty())
-    {
-        QFile::remove( m_path );
-    }
-    else {
-        QDomDocument xml;
-        QDomElement e = xml.createElement( "submissions" );
-        e.setAttribute( "product", QCoreApplication::applicationName() );
-        e.setAttribute( "version", "2" );
-
-        foreach (Track i, m_tracks)
-            e.appendChild( i.toDomElement( xml ) );
-
-        xml.appendChild( e );
-
-        QFile file( m_path );
-        file.open( QIODevice::WriteOnly | QIODevice::Text );
-
-        QTextStream stream( &file );
-        stream.setCodec( "UTF-8" );
-        stream << "<?xml version='1.0' encoding='utf-8'?>\n";
-        stream << xml.toString( 2 );
-        file.close();
-    }
-}
-
-
-void
-ScrobbleCache::add( const QList<Track>& tracks )
-{
-    foreach (const Track& track, tracks)
-    {
-        ScrobbleCache::Invalidity invalidity;
-        
-        if ( !isValid( track, &invalidity ) )
-        {
-            qWarning() << invalidity;
-        }
-        else if (track.isNull()) 
-            qDebug() << "Will not cache an empty track";
-        else 
-            m_tracks += track;
-    }
-
-    write();
-}
-
-
-int
-ScrobbleCache::remove( const QList<Track>& toremove )
-{
-    QMutableListIterator<Track> i( m_tracks );
-    while (i.hasNext()) {
-        Track t = i.next();
-        for (int x = 0; x < toremove.count(); ++x)
-            if (toremovex == t)
-                i.remove();
-    }
-
-    write();
-
-    // yes we return # remaining, rather # removed, but this is an internal 
-    // function and the behaviour is documented so it's alright imo --mxcl
-    return m_tracks.count();
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/scrobble/ScrobbleCache.h Deleted

@@ -1,84 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_SCROBBLE_CACHE_H
-#define LASTFM_SCROBBLE_CACHE_H
-
-#include "lastfm/Track"
-#include <QList>
-#include <QString>
-
-#if LASTFM_VERSION >= 0x00010000
-namespace lastfm {
-#else
-using lastfm::Track;
-#endif
-
-/** absolutely not thread-safe */
-class LASTFM_DLLEXPORT ScrobbleCache
-{
-    QString m_username;
-
-    void write(); /// writes m_tracks to m_path
-
-protected:
-    ScrobbleCache()
-    {}
-
-    QString m_path;
-    QList<Track> m_tracks;
-    
-    void read( QDomDocument& xml );  /// reads from m_path into m_tracks   
-    
-public:
-    explicit ScrobbleCache( const QString& username );
-
-    /** note this is unique for Track::sameAs() and equal timestamps 
-      * obviously playcounts will not be increased for the same timestamp */
-    void add( const QList<Track>& );
-
-    /** returns the number of tracks left in the queue */
-    int remove( const QList<Track>& );
-
-    QList<Track> tracks() const { return m_tracks; }
-    QString path() const { return m_path; }
-    QString username() const { return m_username; }
-
-private:
-    bool operator==( const ScrobbleCache& ); //undefined
-
-    enum Invalidity
-    {
-        TooShort,
-        ArtistNameMissing,
-        TrackNameMissing,
-        ArtistInvalid,
-        NoTimestamp,
-        FromTheFuture,
-        FromTheDistantPast
-    };
-
-    bool isValid( const Track& track, Invalidity* = 0 );
-};
-
-#if LASTFM_VERSION >= 0x00010000
-}
-#endif
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/scrobble/ScrobblePoint.h Deleted

@@ -1,59 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_SCROBBLE_POINT_H
-#define LASTFM_SCROBBLE_POINT_H
-
-#include <lastfm/global.h>
-#include <QtAlgorithms>
-
-
-class LASTFM_DLLEXPORT ScrobblePoint
-{
-    uint i;
-
-public:
-    ScrobblePoint() : i( kScrobbleTimeMax )
-    {}
-    
-    /** j is in seconds, and should be 50% the duration of a track */
-    explicit ScrobblePoint( uint j )
-    {
-        // we special case 0, returning kScrobbleTimeMax because we are
-        // cruel and callous people
-        if (j == 0) --j;
-
-        i = qBound( uint(kScrobbleMinLength),
-                    j,
-                    uint(kScrobbleTimeMax) );
-    }
-    operator uint() const { return i; }
-
-    // scrobbles can occur between these two percentages of track duration
-    static const uint kScrobblePointMin = 50;
-    static const uint kScrobblePointMax = 100;
-    static const uint kDefaultScrobblePoint = 50;
-
-    // Shortest track length allowed to scrobble in seconds
-    static const uint kScrobbleMinLength = 31;
-    // Upper limit for scrobble time in seconds
-    static const uint kScrobbleTimeMax = 240;
-};
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/AbstractType.h Deleted

@@ -1,43 +0,0 @@
-/*
-   Copyright 2010 Last.fm Ltd.
-      - Primarily authored by Micahel Coffey and Jono Cole
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef ABSTRACTTYPE_H
-#define ABSTRACTTYPE_H
-
-#include <QDomElement>
-#include <QString>
-#include <QUrl>
-
-#include <lastfm/global.h>
-
-namespace lastfm
-{
-    class LASTFM_DLLEXPORT AbstractType
-    {
-    public:
-        virtual QString toString() const = 0;
-        virtual QDomElement toDomElement( QDomDocument& ) const = 0;
-        virtual QUrl www() const = 0;
-        virtual QUrl imageUrl( ImageSize size, bool square ) const = 0;
-        virtual ~AbstractType() {;}
-    };
-};
-
-#endif // ABSTRACTTYPE_H

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Album.cpp Deleted

@@ -1,87 +0,0 @@
-/*
-   Copyright 2009-2010 Last.fm Ltd.
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "Album.h"
-#include "Artist.h"
-#include "User.h"
-#include "../core/UrlBuilder.h"
-#include "../core/XmlQuery.h"
-#include "../ws/ws.h"
-#include <QFile>
-#include <QStringList>
-#include <QTimer>
-
-QNetworkReply*
-lastfm::Album::getInfo() const
-{
-    QMap<QString, QString> map;
-    map"method" = "album.getInfo";
-    map"artist" = m_artist;
-    map"album" = m_title;
-    if (!lastfm::ws::Username.isEmpty()) map"username" = lastfm::ws::Username;
-    if (!lastfm::ws::SessionKey.isEmpty()) map"sk" = lastfm::ws::SessionKey;
-    return lastfm::ws::get(map);
-}
-
-
-QNetworkReply*
-lastfm::Album::getTags() const
-{
-    QMap<QString, QString> map;
-    map"method" = "album.getTags";
-    map"artist" = m_artist;
-    map"album" = m_title;
-    return lastfm::ws::get(map);
-}
-
-
-QNetworkReply*
-lastfm::Album::share( const QStringList& recipients, const QString& message, bool isPublic ) const
-{
-    QMap<QString, QString> map;
-    map"method" = "album.share";
-    map"artist" = m_artist;
-    map"album" = m_title;
-    map"recipient" = recipients.join(",");
-    map"public" = isPublic ? "1" : "0";
-    if (message.size()) map"message" = message;
-    return lastfm::ws::post(map);
-}
-
-
-QUrl
-lastfm::Album::www() const
-{
-    return lastfm::UrlBuilder( "music" ).slash( m_artist ).slash( m_title ).url();
-}
-
-
-QNetworkReply*
-lastfm::Album::addTags( const QStringList& tags ) const
-{
-    if (tags.isEmpty())
-        return 0;
-
-    QMap<QString, QString> map;
-    map"method" = "album.addTags";
-    map"artist" = m_artist;
-    map"album" = m_title;
-    map"tags" = tags.join( QChar(',') );
-    return lastfm::ws::post(map);
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Album.h Deleted

@@ -1,73 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_ALBUM_H
-#define LASTFM_ALBUM_H
-
-#include <lastfm/Artist>
-#include <lastfm/Mbid>
-#include <QString>
-#include <QUrl>
-
-namespace lastfm
-{
-    class LASTFM_DLLEXPORT Album
-    {
-        Mbid m_mbid;
-        Artist m_artist;
-        QString m_title;
-
-    public:
-        Album()
-        {}
-
-        explicit Album( Mbid mbid ) : m_mbid( mbid )
-        {}
-
-        Album( Artist artist, QString title ) : m_artist( artist ), m_title( title )
-        {}
-
-        bool operator==( const Album& that ) const { return m_title == that.m_title && m_artist == that.m_artist; }
-        bool operator!=( const Album& that ) const { return m_title != that.m_title || m_artist != that.m_artist; }
-    
-        operator QString() const { return title(); }
-        QString title() const { return m_title.isEmpty() ? "unknown" : m_title; }
-        Artist artist() const { return m_artist; }
-        Mbid mbid() const { return m_mbid; }
-
-        /** artist may have been set, since we allow that in the ctor, but should we handle untitled albums? */
-        bool isNull() const { return m_title.isEmpty() && m_mbid.isNull(); }
-    
-        /** Album.getInfo WebService */
-        QNetworkReply* getInfo() const;
-        QNetworkReply* share( const QStringList& recipients, const QString& message = "", bool isPublic = true ) const;
-
-        /** use Tag::list to get the tag list out of the finished reply */
-        QNetworkReply* getTags() const;
-        QNetworkReply* getTopTags() const;
-        
-        /** Last.fm dictates that you may submit at most 10 of these */
-        QNetworkReply* addTags( const QStringList& ) const;
-    
-        /** the Last.fm website url for this album */
-        QUrl www() const;
-    };
-}
-
-#endif //LASTFM_ALBUM_H

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Artist.cpp Deleted

@@ -1,230 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "Artist.h"
-#include "User.h"
-#include "../core/UrlBuilder.h"
-#include "../core/XmlQuery.h"
-#include "../ws/ws.h"
-#include <QRegExp>
-#include <QStringList>
-
-using lastfm::Artist;
-using lastfm::User;
-using lastfm::ImageSize;
-using lastfm::XmlQuery;
-
-QUrl
-Artist::imageUrl( ImageSize size, bool square ) const
-{
-    if( !square ) return m_images.value( size ); 
-
-    QUrl url = m_images.value( size );
-    QRegExp re( "/serve/(\\d*)s?/" );
-    return QUrl( url.toString().replace( re, "/serve/\\1s/" ));
-}
-
-static inline QList<QUrl> images( const lastfm::XmlQuery& e )
-{
-    QList<QUrl> images;
-    images += e"image size=small".text();
-    images += e"image size=medium".text();
-    images += e"image size=large".text();
-    return images;
-}
-
-
-Artist::Artist( const XmlQuery& xml )
-    :AbstractType()
-{
-    m_name = xml"name".text();
-    m_images = images( xml );
-}
-
-
-QMap<QString, QString> //private
-Artist::params( const QString& method ) const
-{
-    QMap<QString, QString> map;
-    map"method" = "artist."+method;
-    map"artist" = m_name;
-    return map;
-}
-
-
-QNetworkReply*
-Artist::share( const QStringList& recipients, const QString& message, bool isPublic ) const
-{
-    QMap<QString, QString> map = params("share");
-    map"recipient" = recipients.join(",");
-    map"public" = isPublic ? "1" : "0";
-    if (message.size()) map"message" = message;
-    return lastfm::ws::post(map);
-}
-
-
-QUrl 
-Artist::www() const
-{
-    return UrlBuilder( "music" ).slash( Artist::name() ).url();
-}
-
-QNetworkReply*
-Artist::getEvents(int limit) const
-{
-    QMap<QString, QString> map = params("getEvents");
-    if (limit) map"limit" = QString::number(limit);
-    return ws::get( map );
-}
-
-QNetworkReply* 
-Artist::getInfo() const
-{
-    QMap<QString, QString> map = params("getInfo");
-    if (!lastfm::ws::Username.isEmpty()) map"username" = lastfm::ws::Username;
-    if (!lastfm::ws::SessionKey.isEmpty()) map"sk" = lastfm::ws::SessionKey;
-    return ws::get( map );
-}
-
-
-QNetworkReply* 
-Artist::getTags() const
-{
-    return ws::get( params("getTags") );
-}
-
-QNetworkReply* 
-Artist::getTopTags() const
-{
-    return ws::get( params("getTopTags") );
-}
-
-
-QNetworkReply* 
-Artist::getTopTracks() const
-{
-    return ws::get( params("getTopTracks") );
-}
-
-
-QNetworkReply* 
-Artist::getSimilar( int limit ) const
-{
-    QMap<QString, QString> map = params("getSimilar");
-    if ( limit != -1 ) map"limit" = QString::number( limit );
-    return ws::get( map );
-}
-
-
-QNetworkReply* 
-Artist::search( int limit ) const
-{
-    QMap<QString, QString> map = params("search");
-    if (limit > 0) map"limit" = QString::number(limit);
-    return ws::get(map);
-}
-
-
-QMap<int, QString> /* static */
-Artist::getSimilar( QNetworkReply* r )
-{
-    QMap<int, QString> artists;
-    try
-    {
-        XmlQuery lfm = r->readAll();
-        foreach (XmlQuery e, lfm.children( "artist" ))
-        {
-            // convert floating percentage to int in range 0 to 10,000
-            int const match = e"match".text().toFloat() * 100;
-            artists.insertMulti( match, e"name".text() );
-        }
-    }
-    catch (ws::ParseError& e)
-    {
-        qWarning() << e.what();
-    }
-    return artists;
-}
-
-
-QStringList /* static */
-Artist::getTopTracks( QNetworkReply* r )
-{
-    QStringList tracks;
-    try
-    {
-        XmlQuery lfm = r->readAll();
-        foreach (XmlQuery e, lfm.children( "track" ))
-        {
-            tracks << e"name".text();
-        }
-    }
-    catch (ws::ParseError& e)
-    {
-        qWarning() << e.what();
-    }
-    return tracks;
-}
-
-
-QList<Artist> /* static */
-Artist::list( QNetworkReply* r )
-{
-    QList<Artist> artists;
-    try {
-        XmlQuery lfm = r->readAll();
-        foreach (XmlQuery xq, lfm.children( "artist" )) {
-            Artist artist( xq );
-            artists += artist;
-        }
-    }
-    catch (ws::ParseError& e)
-    {
-        qWarning() << e.what();
-    }
-    return artists;
-}
-
-
-Artist
-Artist::getInfo( QNetworkReply* r )
-{
-    try {
-        XmlQuery lfm = r->readAll();
-        Artist artist = lfm"artist""name".text();
-        artist.m_images = images( lfm"artist" );
-        return artist;
-    }
-    catch (ws::ParseError& e)
-    {
-        qWarning() << e.what();
-        return Artist();
-    }
-}
-
-
-QNetworkReply*
-Artist::addTags( const QStringList& tags ) const
-{
-    if (tags.isEmpty())
-        return 0;
-    QMap<QString, QString> map = params("addTags");
-    map"tags" = tags.join( QChar(',') );
-    return ws::post(map);
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Artist.h Deleted

@@ -1,105 +0,0 @@
-/*
-   Copyright 2009-2010 Last.fm Ltd.
-      - Primarily authored by Max Howell, Jono Cole, Doug Mansell and Michael Coffey
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_ARTIST_H
-#define LASTFM_ARTIST_H
-
-#include <QMap>
-#include <QString>
-#include <QUrl>
-
-#include <lastfm/AbstractType>
-#include <lastfm/global.h>
-
-
-namespace lastfm
-{
-    class LASTFM_DLLEXPORT Artist : public AbstractType
-    {
-    private:
-        QString m_name;
-        QList<QUrl> m_images;
-
-    public:
-        Artist() : AbstractType()
-        {}
-
-        Artist( const QString& name ) : AbstractType(), m_name( name )
-        {}
-
-        Artist( const class XmlQuery& xml );
-
-        /** will be QUrl() unless you got this back from a getInfo or something call */
-        QUrl imageUrl( ImageSize size = Large, bool square = false ) const;
-
-        bool isNull() const { return m_name.isEmpty(); }
-
-        /** the url for this artist's page at www.last.fm */
-        QUrl www() const;
-
-        Artist& operator=( const Artist& that ) { m_name = that.name(); m_images = that.m_images; return *this; }
-        bool operator==( const Artist& that ) const { return m_name == that.m_name; }
-        bool operator!=( const Artist& that ) const { return m_name != that.m_name; }
-        bool operator<( const Artist& that ) const { return m_name < that.m_name; }
-
-        operator QString() const
-        {
-            /** if no artist name is set, return the musicbrainz unknown identifier
-              * in case some part of the GUI tries to display it anyway. Note isNull
-              * returns false still. So you should have queried that! */
-            return m_name.isEmpty() ? "unknown" : m_name;
-        }
-
-        QString toString() const { return name(); }
-        QString name() const { return QString(*this); }
-
-        QDomElement toDomElement( QDomDocument& ) const { return QDomElement(); }
-
-        QNetworkReply* share( const QStringList& recipients, const QString& message = "", bool isPublic = true ) const;
-
-        QNetworkReply* getEvents(int limit = 0) const;
-        QNetworkReply* getInfo() const;
-        static Artist getInfo( QNetworkReply* );
-
-        QNetworkReply* getSimilar( int limit = -1 ) const;
-        /** The match percentage is returned from last.fm as a 4 significant
-          * figure floating point value. So we multply it by 100 to make an
-          * integer in the range of 0 to 10,000. This is possible confusing
-          * for you, but I felt it best not to lose any precision, and floats
-          * aren't much fun. */
-        static QMap<int, QString> getSimilar( QNetworkReply* );
-
-        /** use Tag::list to get the tag list out of the finished reply */
-        QNetworkReply* getTags() const;
-        QNetworkReply* getTopTags() const;
-
-        QNetworkReply* getTopTracks() const;
-        static QStringList getTopTracks( QNetworkReply* );
-
-        /** Last.fm dictates that you may submit at most 10 of these */
-        QNetworkReply* addTags( const QStringList& ) const;
-
-        QNetworkReply* search( int limit = -1 ) const;
-        static QList<Artist> list( QNetworkReply* );
-
-        QMap<QString, QString> params( const QString& method ) const;
-    };
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/FingerprintId.cpp Deleted

@@ -1,55 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "FingerprintId.h"
-#include "../ws/ws.h"
-#include <QtNetwork>
-#include <QtXml>
- 
-
-QNetworkReply*
-lastfm::FingerprintId::getSuggestions() const
-{
-    if (isNull()) return 0;
-    
-    QUrl const url( "http://ws.audioscrobbler.com/fingerprint/" + QString(*this) + ".xml" );
-    QNetworkRequest const request( url );
-    return lastfm::nam()->get( request );
-}
-
-
-QMap<float, lastfm::Track> //static
-lastfm::FingerprintId::getSuggestions( QNetworkReply* reply )
-{
-    QDomDocument xml;
-    xml.setContent( reply->readAll() );
-    QDomNodeList nodes = xml.documentElement().elementsByTagName( "track" );
-    
-    QMap<float, Track> tracks;
-    for (int x = 0; x < nodes.count(); ++x)
-    {
-        QDomElement const e = nodes.at(x).toElement();
-
-        MutableTrack t;
-        t.setTitle( e.firstChildElement( "title" ).text() );
-        t.setArtist( e.firstChildElement( "artist" ).text() );
-        tracks.insert( e.attribute( "confidence", "0.0" ).toFloat(), t );
-    }
-    return tracks;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/FingerprintId.h Deleted

@@ -1,62 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_FINGERPRINT_ID_H
-#define LASTFM_FINGERPRINT_ID_H
-
-#include <lastfm/Track>
-#include <QMap>
- 
-namespace lastfm
-{
-    class LASTFM_DLLEXPORT FingerprintId
-    {
-        int id;
-
-    public:
-        FingerprintId() : id( -1 )
-        {}
-
-        FingerprintId( uint i ) : id( i )
-        {}
-
-        bool isNull() const { return id == -1; }
-
-        /** we query Last.fm for suggested metadata, how awesome is that? 
-          * @returns null if isNull() */
-        QNetworkReply* getSuggestions() const;
-        static QMap<float,Track> getSuggestions( QNetworkReply* );
-
-        /** -1 if you need to generate it */
-        operator int() const { return id; }
-        /** isEmpty() if you need to generate it */
-        operator QString() const { return id == -1 ? "" : QString::number( id ); }
-    };
-}
-
-
-inline QDebug operator<<( QDebug d, lastfm::FingerprintId id)
-{
-    if (id.isNull())
-        return d << "(null)";
-    else
-        return d << int(id);
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Mbid.cpp Deleted

@@ -1,36 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "Mbid.h"
-#include "mbid_mp3.c"
-#include <QFile>
-
-namespace lastfm
-{
-    Mbid //static
-    Mbid::fromLocalFile( const QString& path )
-    {   
-        char outMBID_BUFFER_SIZE;
-        QByteArray const bytes = QFile::encodeName( path );
-        int const r = getMP3_MBID( bytes.data(), out );
-        Mbid mbid;
-        if (r == 0) mbid.id = QString::fromLatin1( out );
-        return mbid;
-    }
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Mbid.h Deleted

@@ -1,45 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_MBID_H
-#define LASTFM_MBID_H
-
-#include <lastfm/global.h>
-#include <QString>
-
-namespace lastfm
-{
-    class LASTFM_DLLEXPORT Mbid
-    {
-        QString id;
-    
-    public:
-        explicit Mbid( const QString& p = "" ) : id( p )
-        {}
-    
-        bool isNull() const { return id.isNull() || id.isEmpty(); }
-        operator QString() const { return id; }
-
-        /** if this is not an mp3 file you will be wasting time, as it won't work
-          * but we will do what you say anyway because you are the boss */ 
-        static Mbid fromLocalFile( const QString& path );
-    };
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Playlist.cpp Deleted

@@ -1,63 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "Playlist.h"
-#include "Track.h"
-#include "../ws/ws.h"
-
-
-QNetworkReply*
-lastfm::Playlist::addTrack( const Track& t ) const
-{
-    QMap<QString, QString> map;
-    map"method" = "playlist.addTrack";
-    map"playlistID" = m_id;
-    map"artist" = t.artist();
-    map"track" = t.title();
-    return lastfm::ws::post(map);
-}
-
-
-QNetworkReply*
-lastfm::Playlist::fetch() const
-{
-    return fetch( QUrl("lastfm://playlist/" + QString::number( m_id )) );
-}
-
-
-QNetworkReply* //static
-lastfm::Playlist::fetch( const QUrl& url )
-{
-    QMap<QString, QString> map;
-    map"method" = "playlist.fetch";
-    map"playlistURL" = url.toString();
-    return lastfm::ws::get(map);
-}
-
-
-QNetworkReply* //static
-lastfm::Playlist::create( const QString& title, const QString& description /*=""*/ )
-{
-    QMap<QString, QString> map;
-    map"method" = "playlist.create";
-    map"title" = title;
-    if (description.size()) 
-        map"description" = description;
-    return lastfm::ws::post(map);
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Playlist.h Deleted

@@ -1,51 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_PLAYLIST_H
-#define LASTFM_PLAYLIST_H
-
-#include <lastfm/global.h>
-#include <lastfm/Xspf>
-#include <QString>
-#include <QUrl>
-
-namespace lastfm
-{
-    class LASTFM_DLLEXPORT Playlist
-    {
-        int m_id;
-    
-        Playlist() : m_id( -1 )
-        {}
-
-    public:
-        Playlist( int id ) : m_id( id )
-        {}
-    
-        int id() const { return m_id; }
-
-        QNetworkReply* addTrack( const Track& ) const;
-        QNetworkReply* fetch() const;
-
-        static QNetworkReply* create( const QString& title, const QString& description = "" );
-        static QNetworkReply* fetch( const QUrl& url );
-    };
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Tag.cpp Deleted

@@ -1,77 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "Tag.h"
-#include "User.h"
-#include "../core/UrlBuilder.h"
-#include "../core/XmlQuery.h"
-#include "../ws/ws.h"
-using lastfm::Tag;
-using lastfm::User;
-
-
-QUrl
-Tag::www() const
-{
-    return UrlBuilder( "tag" ).slash( m_name ).url();
-}
-
-
-QUrl
-Tag::www( const User& user ) const
-{
-    return UrlBuilder( "user" ).slash( user.name() ).slash( "tags" ).slash( Tag::name() ).url();
-}
-
-
-QNetworkReply*
-Tag::search() const
-{
-    QMap<QString, QString> map;
-    map"method" = "tag.search";
-    map"tag" = m_name;
-    return ws::get(map);
-}
-
-//static
-QNetworkReply* 
-Tag::getTopTags()
-{
-    QMap<QString, QString> map;
-    map"method" = "tag.getTopTags";
-    return ws::get(map);
-}
-
-QMap<int, QString> //static
-Tag::list( QNetworkReply* r )
-{
-    QMap<int, QString> tags;
-    try {
-        foreach (XmlQuery xq, XmlQuery( r->readAll() ).children("tag"))
-            // we toLower always as otherwise it is ugly mixed case, as first
-            // ever tag decides case, and Last.fm is case insensitive about it 
-            // anyway
-            tags.insertMulti( xq"count".text().toInt(), xq"name".text().toLower() );
-    }
-    catch (ws::ParseError& e)
-    {
-        qWarning() << e.what();
-    }
-    return tags;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Tag.h Deleted

@@ -1,63 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_TAG_H
-#define LASTFM_TAG_H
-
-#include <lastfm/global.h>
-#include <QMap>
-#include <QString>
-#include <QUrl>
-
-namespace lastfm
-{
-    class LASTFM_DLLEXPORT Tag
-    {
-        QString m_name;
-    
-    public:
-        Tag( const QString& name ) : m_name( name )
-        {}
-    
-        operator QString() const { return m_name; }
-        QString name() const { return m_name; }
-
-        lastfm::Tag operator=( const Tag& that ) const { return Tag( that.name() ); }
-        bool operator<( const Tag& that ) const { return this->m_name < that.m_name; }
-    
-        /** the global tag page at www.last.fm */
-        QUrl www() const;
-        /** the tag page for user @p user at www.last.fm */
-        QUrl www( const class User& user ) const;
-        /** pass the finished QNetworkReply to Tag::list() */
-        class QNetworkReply* search() const;
-
-        /** the top global tags on Last.fm, sorted by popularity (number of times used) */
-        static class QNetworkReply* getTopTags();
-    
-        /** the integer is the weighting, not all list type return requests
-          * have a weighting, so the int may just be zero, if you don't care
-          * about the weight just do this: 
-          * QStringList tags = Tag::list( reply ).values();
-          */
-        static QMap<int, QString> list( QNetworkReply* );
-    };
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Tasteometer.cpp Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Tasteometer.h Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Track.cpp Deleted

@@ -1,613 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <QFileInfo>
-#include <QStringList>
-#include <QAbstractNetworkCache>
-
-#include "Track.h"
-#include "User.h"
-#include "../core/UrlBuilder.h"
-#include "../core/XmlQuery.h"
-#include "../ws/ws.h"
-
-
-lastfm::TrackContext::TrackContext()
-    :m_type( Unknown )
-{
-
-}
-
-lastfm::TrackContext::TrackContext( const QString& type, const QList<QString>& values )
-    :m_type( getType( type ) ), m_values( values )
-{
-}
-
-lastfm::TrackContext::Type
-lastfm::TrackContext::getType( const QString& typeString )
-{
-    Type type = Unknown;
-
-    if ( typeString == "artist" )
-        type = Artist;
-    else if ( typeString == "user" )
-        type = User;
-    else if ( typeString == "neighbour" )
-        type = Neighbour;
-    else if ( typeString == "friend" )
-        type = Friend;
-
-    return type;
-}
-
-lastfm::TrackContext::Type
-lastfm::TrackContext::type() const
-{
-    return m_type;
-}
-
-
-QList<QString>
-lastfm::TrackContext::values() const
-{
-    return m_values;
-}
-
-
-lastfm::TrackData::TrackData()
-             : trackNumber( 0 ),
-               duration( 0 ),
-               source( Track::Unknown ),
-               rating( 0 ),
-               fpid( -1 ),
-               loved( false ),
-               null( false ),
-               scrobbleStatus( Track::Null ),
-               scrobbleError( Track::None )
-{}
-
-lastfm::Track::Track()
-    :AbstractType()
-{
-    d = new TrackData;
-    d->null = true;
-}
-
-lastfm::Track::Track( const QDomElement& e )
-    :AbstractType()
-{
-    d = new TrackData;
-
-    if (e.isNull()) { d->null = true; return; }
-    
-    // XML response may have changed
-    QDomNode artistName = e.namedItem( "artist" ).namedItem( "name" );
-    if( artistName.isNull() ) {
-          d->artist = e.namedItem( "artist" ).toElement().text();
-    } else {
-        d->artist = artistName.toElement().text();
-
-    }
-    // XML response may have changed
-    QDomNode trackTitle = e.namedItem( "name" );
-    if( trackTitle.isNull() )
-        d->title = e.namedItem( "track" ).toElement().text();
-    else
-        d->title = trackTitle.toElement().text();
-
-
-    d->albumArtist = e.namedItem( "albumArtist" ).toElement().text();
-    d->album =  e.namedItem( "album" ).toElement().text();
-    d->correctedArtist = e.namedItem( "correctedArtist" ).toElement().text();
-    d->correctedAlbumArtist = e.namedItem( "correctedAlbumArtist" ).toElement().text();
-    d->correctedAlbum =  e.namedItem( "correctedAlbum" ).toElement().text();
-    d->correctedTitle = e.namedItem( "correctedTrack" ).toElement().text();
-    d->trackNumber = 0;
-    d->duration = e.namedItem( "duration" ).toElement().text().toInt();
-    d->url = e.namedItem( "url" ).toElement().text();
-    d->rating = e.namedItem( "rating" ).toElement().text().toUInt();
-    d->source = e.namedItem( "source" ).toElement().text().toInt(); //defaults to 0, or lastfm::Track::Unknown
-    d->time = QDateTime::fromTime_t( e.namedItem( "timestamp" ).toElement().text().toUInt() );
-    d->loved = e.namedItem( "loved" ).toElement().text().toInt();
-    d->scrobbleStatus = e.namedItem( "scrobbleStatus" ).toElement().text().toInt();
-    d->scrobbleError = e.namedItem( "scrobbleError" ).toElement().text().toInt();
-
-    for (QDomElement image(e.firstChildElement("image")) ; !image.isNull() ; image = e.nextSiblingElement("image"))
-    {
-        d->m_imagesstatic_cast<lastfm::ImageSize>(image.attribute("size").toInt()) = image.text();
-    }
-
-    QDomNodeList nodes = e.namedItem( "extras" ).childNodes();
-    for (int i = 0; i < nodes.count(); ++i)
-    {
-        QDomNode n = nodes.at(i);
-        QString key = n.nodeName();
-        d->extraskey = n.toElement().text();
-    }
-}
-
-void
-lastfm::TrackData::onLoveFinished()
-{
-    try
-    {
-        XmlQuery lfm = static_cast<QNetworkReply*>(sender())->readAll();
-        if ( lfm.attribute( "status" ) == "ok")
-            loved = true;
-
-    }
-    catch (...)
-    {
-    }
-    emit loveToggled( loved );
-}
-
-
-void
-lastfm::TrackData::onUnloveFinished()
-{
-    try
-    {
-        XmlQuery lfm = static_cast<QNetworkReply*>(sender())->readAll();
-        if ( lfm.attribute( "status" ) == "ok")
-            loved = false;
-    }
-    catch (...)
-    {
-    }
-
-    emit loveToggled( loved );
-}
-
-void
-lastfm::TrackData::onGotInfo()
-{
-    const QByteArray data = static_cast<QNetworkReply*>(sender())->readAll();
-
-    try
-    {
-        lastfm::XmlQuery lfm( data );
-
-        QString imageUrl = lfm"track""image size=small".text();
-        if ( !imageUrl.isEmpty() ) m_imageslastfm::Small = imageUrl;
-        imageUrl = lfm"track""image size=medium".text();
-        if ( !imageUrl.isEmpty() ) m_imageslastfm::Medium = imageUrl;
-        imageUrl = lfm"track""image size=large".text();
-        if ( !imageUrl.isEmpty() ) m_imageslastfm::Large = imageUrl;
-        imageUrl = lfm"track""image size=extralarge".text();
-        if ( !imageUrl.isEmpty() ) m_imageslastfm::ExtraLarge = imageUrl;
-        imageUrl = lfm"track""image size=mega".text();
-        if ( !imageUrl.isEmpty() ) m_imageslastfm::Mega = imageUrl;
-
-        loved = lfm"track""userloved".text().toInt();
-
-        emit gotInfo( data );
-        emit loveToggled( loved );
-    }
-    catch (...)
-    {
-        emit gotInfo( data );
-    }
-
-    // you should connect everytime you call getInfo
-    disconnect( this, SIGNAL(gotInfo(const QByteArray&)), 0, 0);
-}
-
-
-QDomElement
-lastfm::Track::toDomElement( QDomDocument& xml ) const
-{
-    QDomElement item = xml.createElement( "track" );
-    
-    #define makeElement( tagname, getter ) { \
-        QString v = getter; \
-        if (!v.isEmpty()) \
-        { \
-            QDomElement e = xml.createElement( tagname ); \
-            e.appendChild( xml.createTextNode( v ) ); \
-            item.appendChild( e ); \
-        } \
-    }
-
-    makeElement( "artist", d->artist );
-    makeElement( "albumArtist", d->albumArtist );
-    makeElement( "album", d->album );
-    makeElement( "track", d->title );
-    makeElement( "correctedArtist", d->correctedArtist );
-    makeElement( "correctedAlbumArtist", d->correctedAlbumArtist );
-    makeElement( "correctedAlbum", d->correctedAlbum );
-    makeElement( "correctedTrack", d->correctedTitle );
-    makeElement( "duration", QString::number( d->duration ) );
-    makeElement( "timestamp", QString::number( d->time.toTime_t() ) );
-    makeElement( "url", d->url.toString() );
-    makeElement( "source", QString::number( d->source ) );
-    makeElement( "rating", QString::number(d->rating) );
-    makeElement( "fpId", QString::number(d->fpid) );
-    makeElement( "mbId", mbid() );
-    makeElement( "loved", QString::number( isLoved() ) );
-    makeElement( "scrobbleStatus", QString::number( scrobbleStatus() ) );
-    makeElement( "scrobbleError", QString::number( scrobbleError() ) );
-
-    // put the images urls in the dom
-    QMapIterator<lastfm::ImageSize, QUrl> imageIter( d->m_images );
-    while (imageIter.hasNext()) {
-        QDomElement e = xml.createElement( "image" );
-        e.appendChild( xml.createTextNode( imageIter.next().value().toString() ) );
-        e.setAttribute( "size", imageIter.key() );
-        item.appendChild( e );
-    }
-
-    // add the extras to the dom
-    QDomElement extras = xml.createElement( "extras" );
-    QMapIterator<QString, QString> extrasIter( d->extras );
-    while (extrasIter.hasNext()) {
-        QDomElement e = xml.createElement( extrasIter.next().key() );
-        e.appendChild( xml.createTextNode( extrasIter.value() ) );
-        extras.appendChild( e );
-    }
-    item.appendChild( extras );
-
-    return item;
-}
-
-
-bool
-lastfm::Track::corrected() const
-{
-    // If any of the corrected string have been set and they are different
-    // from the initial strings then this track has been corrected.
-    return ( (!d->correctedTitle.isEmpty() && (d->correctedTitle != d->title))
-            || (!d->correctedAlbum.isEmpty() && (d->correctedAlbum != d->album))
-            || (!d->correctedArtist.isEmpty() && (d->correctedArtist != d->artist))
-            || (!d->correctedAlbumArtist.isEmpty() && (d->correctedAlbumArtist != d->albumArtist)));
-}
-
-lastfm::Artist
-lastfm::Track::artist( Corrections corrected ) const
-{
-    if ( corrected == Corrected && !d->correctedArtist.isEmpty() )
-        return Artist( d->correctedArtist );
-
-    return Artist( d->artist );
-}
-
-lastfm::Artist
-lastfm::Track::albumArtist( Corrections corrected ) const
-{
-    if ( corrected == Corrected && !d->correctedAlbumArtist.isEmpty() )
-        return Artist( d->correctedAlbumArtist );
-
-    return Artist( d->albumArtist );
-}
-
-lastfm::Album
-lastfm::Track::album( Corrections corrected ) const
-{
-    if ( corrected == Corrected && !d->correctedAlbum.isEmpty() )
-        return Album( artist( corrected ), d->correctedAlbum );
-
-    return Album( artist( corrected ), d->album );
-}
-
-QString
-lastfm::Track::title( Corrections corrected ) const
-{
-    /** if no title is set, return the musicbrainz unknown identifier
-      * in case some part of the GUI tries to display it anyway. Note isNull
-      * returns false still. So you should have queried this! */
-
-    if ( corrected == Corrected && !d->correctedTitle.isEmpty() )
-        return d->correctedTitle;
-
-    return d->title.isEmpty() ? "unknown" : d->title;
-}
-
-
-QUrl
-lastfm::Track::imageUrl( lastfm::ImageSize size, bool square ) const
-{
-    if( !square ) return d->m_images.value( size );
-
-    QUrl url = d->m_images.value( size );
-    QRegExp re( "/serve/(\\d*)s?/" );
-    return QUrl( url.toString().replace( re, "/serve/\\1s/" ));
-}
-
-
-QString
-lastfm::Track::toString( const QChar& separator, Corrections corrections ) const
-{
-    if ( d->artist.isEmpty() )
-    {
-        if ( d->title.isEmpty() )
-            return QFileInfo( d->url.path() ).fileName();
-        else
-            return title( corrections );
-    }
-
-    if ( d->title.isEmpty() )
-        return artist( corrections );
-
-    return artist( corrections ) + ' ' + separator + ' ' + title( corrections );
-}
-
-
-QString //static
-lastfm::Track::durationString( int const duration )
-{
-    QTime t = QTime().addSecs( duration );
-    if (duration < 60*60)
-        return t.toString( "m:ss" );
-    else
-        return t.toString( "hh:mm:ss" );
-}
-
-
-QNetworkReply*
-lastfm::Track::share( const QStringList& recipients, const QString& message, bool isPublic ) const
-{
-    QMap<QString, QString> map = params("share");
-    map"recipient" = recipients.join(",");
-    map"public" = isPublic ? "1" : "0";
-    if (message.size()) map"message" = message;
-    return ws::post(map);
-}
-
-
-void
-lastfm::Track::invalidateGetInfo()
-{
-    // invalidate the track.getInfo cache
-    QAbstractNetworkCache* cache = lastfm::nam()->cache();
-    if ( cache )
-    {
-        QMap<QString, QString> map = params("getInfo", true);
-        if (!lastfm::ws::Username.isEmpty()) map"username" = lastfm::ws::Username;
-        if (!lastfm::ws::SessionKey.isEmpty()) map"sk" = lastfm::ws::SessionKey;
-        cache->remove( lastfm::ws::url( map ) );
-    }
-}
-
-
-void
-lastfm::MutableTrack::setFromLfm( const XmlQuery& lfm )
-{
-    QString imageUrl = lfm"track""image size=small".text();
-    if ( !imageUrl.isEmpty() ) d->m_imageslastfm::Small = imageUrl;
-    imageUrl = lfm"track""image size=medium".text();
-    if ( !imageUrl.isEmpty() ) d->m_imageslastfm::Medium = imageUrl;
-    imageUrl = lfm"track""image size=large".text();
-    if ( !imageUrl.isEmpty() ) d->m_imageslastfm::Large = imageUrl;
-    imageUrl = lfm"track""image size=extralarge".text();
-    if ( !imageUrl.isEmpty() ) d->m_imageslastfm::ExtraLarge = imageUrl;
-    imageUrl = lfm"track""image size=mega".text();
-    if ( !imageUrl.isEmpty() ) d->m_imageslastfm::Mega = imageUrl;
-
-    d->loved = lfm"track""userloved".text().toInt();
-
-    d->forceLoveToggled( d->loved );
-}
-
-void
-lastfm::MutableTrack::setImageUrl( lastfm::ImageSize size, const QString& url )
-{
-    d->m_imagessize = url;
-}
-
-
-void
-lastfm::MutableTrack::love()
-{
-    QNetworkReply* reply = ws::post(params("love"));
-    QObject::connect( reply, SIGNAL(finished()), signalProxy(), SLOT(onLoveFinished()));
-
-    invalidateGetInfo();
-}
-
-
-void
-lastfm::MutableTrack::unlove()
-{
-    QNetworkReply* reply = ws::post(params("unlove"));
-    QObject::connect( reply, SIGNAL(finished()), signalProxy(), SLOT(onUnloveFinished()));
-
-    invalidateGetInfo();
-}
-
-QNetworkReply*
-lastfm::MutableTrack::ban()
-{
-    d->extras"rating" = "B";
-    return ws::post(params("ban"));
-}
-
-
-QMap<QString, QString>
-lastfm::Track::params( const QString& method, bool use_mbid ) const
-{
-    QMap<QString, QString> map;
-    map"method" = "Track."+method;
-    if (d->mbid.size() && use_mbid)
-        map"mbid" = d->mbid;
-    else {
-        map"artist" = d->artist;
-        map"track" = d->title;
-    }
-    return map;
-}
-
-
-QNetworkReply*
-lastfm::Track::getTopTags() const
-{
-    return ws::get( params("getTopTags", true) );
-}
-
-
-QNetworkReply*
-lastfm::Track::getTopFans() const
-{
-    return ws::get( params("getTopFans", true) );
-}
-
-
-QNetworkReply*
-lastfm::Track::getTags() const
-{
-    return ws::get( params("getTags", true) );
-}
-
-void
-lastfm::Track::getInfo() const
-{
-    QMap<QString, QString> map = params("getInfo", true);
-    if (!lastfm::ws::Username.isEmpty()) map"username" = lastfm::ws::Username;
-    if (!lastfm::ws::SessionKey.isEmpty()) map"sk" = lastfm::ws::SessionKey;
-    QObject::connect( ws::get( map ), SIGNAL(finished()), d.data(), SLOT(onGotInfo()));
-}
-
-
-QNetworkReply*
-lastfm::Track::getBuyLinks( const QString& country ) const
-{
-    QMap<QString, QString> map = params( "getBuyLinks", true );
-    map"country" = country;
-    return ws::get( map );
-}
-
-
-QNetworkReply*
-lastfm::Track::addTags( const QStringList& tags ) const
-{
-    if (tags.isEmpty())
-        return 0;
-    QMap<QString, QString> map = params("addTags");
-    map"tags" = tags.join( QChar(',') );
-    return ws::post(map);
-}
-
-
-QNetworkReply*
-lastfm::Track::removeTag( const QString& tag ) const
-{
-    if (tag.isEmpty())
-        return 0;
-    QMap<QString, QString> map = params( "removeTag" );
-    map"tags" = tag;
-    return ws::post(map);
-}
-
-
-QNetworkReply*
-lastfm::Track::updateNowPlaying() const
-{
-    return updateNowPlaying(duration());
-}
-
-QNetworkReply* 
-lastfm::Track::updateNowPlaying( int duration ) const
-{
-    QMap<QString, QString> map = params("updateNowPlaying");
-    map"duration" = QString::number( duration );
-    if ( !album().isNull() ) map"album" = album();
-    map"context" = extra("playerId");
-
-    qDebug() << map;
-
-    return ws::post(map);
-}
-
-QNetworkReply* 
-lastfm::Track::removeNowPlaying() const
-{
-    QMap<QString, QString> map;
-    map"method" = "track.removeNowPlaying";
-
-    qDebug() << map;
-
-    return ws::post(map);
-}
-
-
-QNetworkReply*
-lastfm::Track::scrobble() const
-{
-    QMap<QString, QString> map = params("scrobble");
-    map"duration" = QString::number( d->duration );
-    map"timestamp" = QString::number( d->time.toTime_t() );
-    map"context" = extra("playerId");
-    map"albumArtist" = d->albumArtist;
-    if ( !d->album.isEmpty() ) map"album" = d->album;
-
-    qDebug() << map;
-
-    return ws::post(map);
-}
-
-QNetworkReply*
-lastfm::Track::scrobble(const QList<lastfm::Track>& tracks)
-{
-    QMap<QString, QString> map;
-    map"method" = "track.scrobble";
-
-    for ( int i(0) ; i < tracks.count() ; ++i )
-    {
-        map"duration" + QString::number(i) + "" = QString::number( tracksi.duration() );
-        map"timestamp" + QString::number(i)  + "" = QString::number( tracksi.timestamp().toTime_t() );
-        map"track" + QString::number(i)  + "" = tracksi.title();
-        map"context" + QString::number(i)  + "" = tracksi.extra("playerId");
-        if ( !tracksi.album().isNull() ) map"album" + QString::number(i)  + "" = tracksi.album();
-        map"artist" + QString::number(i) + "" = tracksi.artist();
-        map"albumArtist" + QString::number(i) + "" = tracksi.albumArtist();
-        if ( !tracksi.mbid().isNull() ) map"mbid" + QString::number(i)  + "" = tracksi.mbid();
-    }
-
-    qDebug() << map;
-
-    return ws::post(map);
-}
-
-
-QUrl
-lastfm::Track::www() const
-{
-    return UrlBuilder( "music" ).slash( artist( Corrected ) ).slash( album(  Corrected  ).isNull() ? QString("_") : album( Corrected )).slash( title( Corrected ) ).url();
-}
-
-
-bool
-lastfm::Track::isMp3() const
-{
-    //FIXME really we should check the file header?
-    return d->url.scheme() == "file" &&
-           d->url.path().endsWith( ".mp3", Qt::CaseInsensitive );
-}
-
-void
-lastfm::MutableTrack::setCorrections( QString title, QString album, QString artist, QString albumArtist )
-{
-    d->correctedTitle = title;
-    d->correctedAlbum = album;
-    d->correctedArtist = artist;
-    d->correctedAlbumArtist = albumArtist;
-
-    d->forceCorrected( toString() );
-}
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Track.h Deleted

@@ -1,359 +0,0 @@
-/*
-   Copyright 2009-2010 Last.fm Ltd.
-      - Primarily authored by Max Howell, Jono Cole, Doug Mansell and Michael Coffey
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_TRACK_H
-#define LASTFM_TRACK_H
-
-#include <lastfm/AbstractType>
-#include <lastfm/Album>
-#include <lastfm/Mbid>
-#include <QDateTime>
-#include <QDomElement>
-#include <QExplicitlySharedDataPointer>
-#include <QString>
-#include <QMap>
-#include <QUrl>
-
-
-namespace lastfm {
-
-class LASTFM_DLLEXPORT TrackContext
-{
-public:
-    enum Type
-    {
-        Unknown,
-        User,
-        Friend,
-        Neighbour,
-        Artist
-    };
-
-    TrackContext();
-    TrackContext( const QString& type, const QList<QString>& values );
-
-    Type type() const;
-    QList<QString> values() const;
-private:
-    static Type getType( const QString& type );
-
-private:
-    Type m_type;
-    QList<QString> m_values;
-};
-
-class TrackData : public QObject, public QSharedData
-{
-    Q_OBJECT
-
-    friend class Track;
-    friend class MutableTrack;
-public:
-    TrackData();
-
-public:
-    QString artist;
-    QString albumArtist;
-    QString album;
-    QString title;
-    QString correctedArtist;
-    QString correctedAlbumArtist;
-    QString correctedAlbum;
-    QString correctedTitle;
-    TrackContext context;
-    uint trackNumber;
-    uint duration;
-    short source;
-    short rating;
-    QString mbid; /// musicbrainz id
-    uint fpid;
-    QUrl url;
-    QDateTime time; /// the time the track was started at
-    bool loved;
-    QMap<lastfm::ImageSize, QUrl> m_images;
-    short scrobbleStatus;
-    short scrobbleError;
-    QString scrobbleErrorText;
-
-    //FIXME I hate this, but is used for radio trackauth etc.
-    QMap<QString,QString> extras;
-    
-    bool null;
-
-private:
-    void forceLoveToggled( bool love ) { emit loveToggled( love );}
-    void forceScrobbleStatusChanged() { emit scrobbleStatusChanged(); }
-    void forceCorrected( QString correction ) { emit corrected( correction ); }
-
-private slots:
-    void onLoveFinished();
-    void onUnloveFinished();
-    void onGotInfo();
-
-signals:
-    void loveToggled( bool love );
-    void loveFinished();
-    void unlovedFinished();
-    void gotInfo( const QByteArray& );
-    void scrobbleStatusChanged();
-    void corrected( QString correction );
-};
-
-
-/** Our track type. It's quite good, you may want to use it as your track type
-  * in general. It is explicitly shared. Which means when you make a copy, they
-  * both point to the same data still. This is like Qt's implicitly shared
-  * classes, eg. QString, however if you mod a copy of a QString, the copy
-  * detaches first, so then you have two copies. Our Track object doesn't
-  * detach, which is very handy for our usage in the client, but perhaps not
-  * what you want. If you need a deep copy for eg. work in a thread, call 
-  * clone(). */
-class LASTFM_DLLEXPORT Track : public AbstractType
-{
-public:
-    friend class TrackSignalProxy;
-
-    enum Source
-    {
-        // DO NOT UNDER ANY CIRCUMSTANCES CHANGE THE ORDER OR VALUES OF THIS ENUM!
-        // you will cause broken settings and b0rked scrobbler cache submissions
-
-        Unknown = 0,
-        LastFmRadio,
-        Player,
-        MediaDevice,
-        NonPersonalisedBroadcast, // eg Shoutcast, BBC Radio 1, etc.
-        PersonalisedRecommendation, // eg Pandora, but not Last.fm
-    };
-
-    enum ScrobbleStatus
-    {
-        Null = 0,
-        Cached,
-        Submitted,
-        Error
-    };
-
-    enum Corrections
-    {
-        Original = 0,
-        Corrected
-    };
-
-    enum ScrobbleError
-    {
-        None = 0,
-        FilteredArtistName = 113,
-        FilteredTrackName = 114,
-        FilteredAlbumName = 115,
-        FilteredTimestamp = 116,
-        ExceededMaxDailyScrobbles = 118,
-        InvalidStreamAuth = 119
-    };
-
-    Track();
-    explicit Track( const QDomElement& );
-
-    /** this track and that track point to the same object, so they are the same
-      * in fact. This doesn't do a deep data comparison. So even if all the 
-      * fields are the same it will return false if they aren't in fact spawned
-      * from the same initial Track object */
-    bool sameObject( const Track& that )
-    {
-        return (this->d == that.d);
-    }
-
-    bool operator==( const Track& that ) const
-    {
-        return ( this->title() == that.title() &&
-                 this->album() == that.album() &&
-                 this->artist() == that.artist());
-    }
-    bool operator!=( const Track& that ) const
-    {
-        return !operator==( that );
-    }
-
-    QObject* signalProxy() const { return d.data(); }
-
-    /** only a Track() is null */
-    bool isNull() const { return d->null; }
-
-    bool corrected() const;
-
-    Artist artist( Corrections corrected = Original ) const;
-    Artist albumArtist( Corrections corrected = Original ) const;
-    Album album( Corrections corrected = Original ) const;
-    QString title( Corrections corrected = Original ) const;
-
-    uint trackNumber() const { return d->trackNumber; }
-    uint duration() const { return d->duration; } /// in seconds
-    Mbid mbid() const { return Mbid(d->mbid); }
-    QUrl url() const { return d->url; }
-    QDateTime timestamp() const { return d->time; }
-    Source source() const { return static_cast<Source>(d->source); }
-    uint fingerprintId() const { return d->fpid; }
-    bool isLoved() const { return d->loved; }
-    QUrl imageUrl( lastfm::ImageSize size, bool square ) const;
-
-    QString durationString() const { return durationString( d->duration ); }
-    static QString durationString( int seconds );
-
-    ScrobbleStatus scrobbleStatus() const { return static_cast<ScrobbleStatus>(d->scrobbleStatus); }
-    ScrobbleError scrobbleError() const { return static_cast<ScrobbleError>(d->scrobbleError); }
-    QString scrobbleErrorText() const { return d->scrobbleErrorText; }
-
-    /** default separator is an en-dash */
-    QString toString() const { return toString( Corrected ); }
-    QString toString( Corrections corrections ) const { return toString( QChar(8211), corrections );}
-    QString toString( const QChar& separator, Corrections corrections = Original ) const;
-    /** the standard representation of this object as an XML node */
-    QDomElement toDomElement( class QDomDocument& ) const;
-
-    TrackContext context() const { return d->context; }
-    
-    QString extra( const QString& key ) const{ return d->extras key ; }
-
-    bool operator<( const Track &that ) const
-    {
-        return this->d->time < that.d->time;
-    }
-    
-    bool isMp3() const;
-    
-    operator QVariant() const { return QVariant::fromValue( *this ); }
-    
-//////////// lastfm::Ws
-    
-    /** See last.fm/api Track section */
-    QNetworkReply* share( const QStringList& recipients, const QString& message = "", bool isPublic = true ) const;
-
-    /** you can get any QNetworkReply TagList using Tag::list( QNetworkReply* ) */
-    QNetworkReply* getTags() const; // for the logged in user
-    QNetworkReply* getTopTags() const;
-    QNetworkReply* getTopFans() const;
-    void getInfo() const;
-    QNetworkReply* getBuyLinks( const QString& country ) const;
-
-    /** you can only add 10 tags, we submit everything you give us, but the
-      * docs state 10 only. Will return 0 if the list is empty. */
-    QNetworkReply* addTags( const QStringList& ) const;
-    /** will return 0 if the string is "" */
-    QNetworkReply* removeTag( const QString& ) const;
-
-    /** scrobble the track */
-    QNetworkReply* updateNowPlaying() const;
-    QNetworkReply* updateNowPlaying( int duration ) const;
-    QNetworkReply* removeNowPlaying() const;
-    QNetworkReply* scrobble() const;
-    static QNetworkReply* scrobble(const QList<lastfm::Track>& tracks);
-
-    /** the url for this track's page at last.fm */
-    QUrl www() const;
-
-protected:
-    QExplicitlySharedDataPointer<TrackData> d;
-    QMap<QString, QString> params( const QString& method, bool use_mbid = false ) const;
-    void invalidateGetInfo();
-private:
-    Track( TrackData* that_d ) : d( that_d )
-    {}
-};
-
-
-
-/** This class allows you to change Track objects, it is easy to use:
-  * MutableTrack( some_track_object ).setTitle( "Arse" );
-  *
-  * We have a separate MutableTrack class because in our usage, tracks
-  * only get mutated once, and then after that, very rarely. This pattern
-  * encourages such usage, which is generally sensible. You can feel more
-  * comfortable that the data hasn't accidently changed behind your back.
-  */
-class LASTFM_DLLEXPORT MutableTrack : public Track
-{
-public:
-    MutableTrack()
-    {
-        d->null = false;
-    }
-
-    /** NOTE that passing a Track() to this ctor will automatically make it non
-      * null. Which may not be what you want. So be careful
-      * Rationale: this is the most maintainable way to do it 
-      */
-    MutableTrack( const Track& that ) : Track( that )
-    {
-        d->null = false;
-    }
-
-    void setFromLfm( const XmlQuery& lfm );
-    void setImageUrl( lastfm::ImageSize size, const QString& url );
-    
-    void setArtist( QString artist ) { d->artist = artist.trimmed(); }
-    void setAlbumArtist( QString albumArtist ) { d->albumArtist = albumArtist.trimmed(); }
-    void setAlbum( QString album ) { d->album = album.trimmed(); }
-    void setTitle( QString title ) { d->title = title.trimmed(); }
-    void setCorrections( QString title, QString album, QString artist, QString albumArtist );
-    void setTrackNumber( uint n ) { d->trackNumber = n; }
-    void setDuration( uint duration ) { d->duration = duration; }
-    void setUrl( QUrl url ) { d->url = url; }
-    void setSource( Source s ) { d->source = s; }
-    void setLoved( bool loved ) { d->loved = loved; }
-    
-    void setMbid( Mbid id ) { d->mbid = id; }
-    void setFingerprintId( uint id ) { d->fpid = id; }
-
-    void setScrobbleStatus( ScrobbleStatus scrobbleStatus )
-    {
-        d->scrobbleStatus = scrobbleStatus;
-        d->forceScrobbleStatusChanged();
-    }
-    void setScrobbleError( ScrobbleError scrobbleError ) { d->scrobbleError = scrobbleError; }
-    void setScrobbleErrorText( const QString& scrobbleErrorText ) { d->scrobbleErrorText = scrobbleErrorText; }
-    
-    /** you also must scrobble this track for the love to become permenant */
-    void love();
-    void unlove();
-    QNetworkReply* ban();
-    
-    void stamp() { d->time = QDateTime::currentDateTime(); }
-
-    void setExtra( const QString& key, const QString& value ) { d->extraskey = value; }
-    void removeExtra( QString key ) { d->extras.remove( key ); }
-    void setTimeStamp( const QDateTime& dt ) { d->time = dt; }
-
-    void setContext( TrackContext context ) { d->context = context;}
-};
-
-
-} //namespace lastfm
-
-
-inline QDebug operator<<( QDebug d, const lastfm::Track& t )
-{
-    return !t.isNull() 
-            ? d << t.toString( '-' ) << t.url()
-            : d << "Null Track object";
-}
-
-
-Q_DECLARE_METATYPE( lastfm::Track );
-
-#endif //LASTFM_TRACK_H

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/User.cpp Deleted

@@ -1,317 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "User.h"
-#include "Track.h"
-#include "../core/UrlBuilder.h"
-#include "../core/XmlQuery.h"
-#include <QStringList>
-#include <lastfm/UserList>
-#include <QAbstractNetworkCache>
-
-using lastfm::User;
-using lastfm::UserList;
-using lastfm::UserDetails;
-using lastfm::XmlQuery;
-using lastfm::ImageSize;
-
-User::User( const XmlQuery& xml ) 
-     :AbstractType(), m_match( -1.0f )
-{
-    m_name = xml"name".text();
-    m_images << xml"image size=small".text()
-             << xml"image size=medium".text()
-             << xml"image size=large".text();
-    m_realName = xml"realname".text();
-}
-
-
-QUrl 
-User::imageUrl( ImageSize size, bool square ) const
-{
-    if( !square ) return m_images.value( size ); 
-
-    QUrl url = m_images.value( size );
-    QRegExp re( "/serve/(\\d*)s?/" );
-    return QUrl( url.toString().replace( re, "/serve/\\1s/" ));
-}
-
-
-QMap<QString, QString>
-User::params(const QString& method) const
-{
-    QMap<QString, QString> map;
-    map"method" = "user."+method;
-    map"user" = m_name;
-    return map;
-}
-
-
-QNetworkReply*
-User::getFriends( bool recentTracks, int limit, int page ) const
-{
-    QMap<QString, QString> map = params( "getFriends" );
-    map"limit" = QString::number( limit );
-    map"page" = QString::number( page );
-    if ( recentTracks ) map"recenttracks" = "1";
-    return ws::get( map );
-}
-
-
-QNetworkReply*
-User::getFriendsListeningNow( int limit, int page ) const
-{
-    QMap<QString, QString> map = params( "getFriendsListeningNow" );
-    map"limit" = QString::number( limit );
-    map"page" = QString::number( page );
-    return ws::get( map );
-}
-
-
-QNetworkReply*
-User::getTopTags() const
-{
-    return ws::get( params( "getTopTags" ) );
-}
-
-
-QNetworkReply*
-User::getTopArtists( QString period, int limit, int page ) const
-{
-    QMap<QString, QString> map = params( "getTopArtists" );
-    map"period" = period;
-    map"limit" = QString::number( limit );
-    map"page" = QString::number( page );
-    return ws::get( map );
-}
-
-
-QNetworkReply*
-User::getRecentArtists() const
-{
-    return ws::get( params( "getRecentArtists" ) );
-}
-
-
-QNetworkReply*
-User::getRecentTracks( int limit , int page ) const
-{
-    QMap<QString, QString> map = params( "getRecentTracks" );
-    map"limit" = QString::number( limit );
-    map"page" = QString::number( page );
-
-    QAbstractNetworkCache* cache = lastfm::nam()->cache();
-    if ( cache )
-        cache->remove( lastfm::ws::url( map ) );
-
-    return ws::get( map );
-}
-
-QNetworkReply*
-User::getRecentStations( int limit, int page ) const
-{
-    QMap<QString, QString> map = params( "getRecentStations" );
-    map"limit" = QString::number( limit );
-    map"page" = QString::number( page );
-    return ws::get( map );
-}
-
-
-QNetworkReply*
-User::getRecommendedArtists( int limit, int page ) const
-{
-    QMap<QString, QString> map = params( "getRecommendedArtists" );
-    map"limit" = QString::number( limit );
-    map"page" = QString::number( page );
-    return ws::get( map );
-}
-
-
-QNetworkReply*
-User::getNeighbours( int limit, int page ) const
-{
-    QMap<QString, QString> map = params( "getNeighbours" );
-    map"limit" = QString::number( limit );
-    map"page" = QString::number( page );
-    return ws::get( map );
-}
-
-
-QNetworkReply*
-User::getPlaylists() const
-{
-    return ws::get( params( "getPlaylists" ) );
-}
-
-
-UserList //static
-User::list( QNetworkReply* r )
-{
-    UserList users;
-    try {
-        XmlQuery lfm = r->readAll();
-        foreach (XmlQuery e, lfm.children( "user" ))
-        {
-            User u( e );
-            users += u;
-        }
-
-        users.total = lfm"friends".attribute("total").toInt();
-        users.page = lfm"friends".attribute("page").toInt();
-        users.perPage = lfm"friends".attribute("perPage").toInt();
-        users.totalPages = lfm"friends".attribute("totalPages").toInt();
-    }
-    catch (ws::ParseError& e)
-    {
-        qWarning() << e.what();
-    }    
-    return users;
-}
-
-
-QNetworkReply* //static
-UserDetails::getInfo( const QString& username )
-{
-    QMap<QString, QString> map;
-    map"method" = "user.getInfo";
-    map"user" = username;
-    return ws::post( map );
-}
-
-
-
-
-/*
-QNetworkReply* //static
-UserDetails::getRecommendedArtists()
-{
-    QMap<QString, QString> map;
-    map"method" = "user.getRecommendedArtists";
-    return ws::post( map );
-}
-*/
-
-QUrl
-User::www() const
-{ 
-    return UrlBuilder( "user" ).slash( m_name ).url();
-}
-
-UserDetails::UserDetails()
-    : User()
-    , m_age( 0 )
-    , m_scrobbles( 0 )
-    , m_registered( QDateTime() )
-    , m_isSubscriber( false )
-    , m_canBootstrap( false )
-{}
-
-UserDetails::UserDetails( QNetworkReply* reply )
-{
-    try
-    {
-        XmlQuery user = XmlQuery( reply->readAll() )"user";
-        m_age = user"age".text().toUInt();
-        m_scrobbles = user"playcount".text().toUInt();
-        m_registered = QDateTime::fromTime_t(user"registered".attribute("unixtime").toUInt());
-        m_country = user"country".text();
-        m_isSubscriber = ( user"subscriber".text() == "1" );
-        m_canBootstrap = ( user"bootstrap".text() == "1" );
-        m_gender = user"gender".text();
-        m_realName = user"realname".text();
-        m_name = user"name".text();
-        m_images << user"image size=small".text()
-                 << user"image size=medium".text()
-                 << user"image size=large".text();
-    }
-    catch (ws::ParseError& e)
-    {
-        qWarning() << e.what();
-    }
-}
-
-
-QString
-UserDetails::getInfoString() const
-{
-    QString text;
-
-    text = QObject::tr("%1").arg( m_realName.isEmpty() ? m_name : m_realName );
-    if ( m_age ) text.append( QObject::tr(", %1").arg( m_age ) );
-    if ( m_gender.known() ) text.append( QObject::tr(", %1").arg( m_gender.toString() ) );
-    if ( !m_country.isEmpty() ) text.append( QObject::tr(", %1").arg( m_country ) );
-    if ( m_scrobbles ) text.append( QObject::tr(", %L1 scrobbles").arg( m_scrobbles ) );
-
-    return text;
-}
-
-void 
-UserDetails::setScrobbleCount( quint32 scrobbleCount )
-{
-    m_scrobbles = scrobbleCount;
-}
-
-
-void
-UserDetails::setDateRegistered( const QDateTime& date )
-{
-    m_registered = date;
-}
-
-void 
-UserDetails::setImages( const QList<QUrl>& images )
-{
-    m_images = images;
-}
-
-void 
-UserDetails::setRealName( const QString& realName )
-{
-    m_realName = realName;
-}
-void 
-UserDetails::setAge( unsigned short age )
-{
-    m_age = age;
-}
-
-void 
-UserDetails::setIsSubscriber( bool subscriber )
-{
-    m_isSubscriber = subscriber;
-}
-
-void 
-UserDetails::setCanBootstrap( bool canBootstrap )
-{
-    m_canBootstrap = canBootstrap;
-}
-
-void 
-UserDetails::setGender( const QString& s )
-{
-    m_gender = Gender( s );
-}
-
-void 
-UserDetails::setCountry( const QString& country )
-{
-    m_country = country;
-}
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/User.h Deleted

@@ -1,184 +0,0 @@
-/*
-   Copyright 2009-2010 Last.fm Ltd.
-      - Primarily authored by Max Howell, Jono Cole, Doug Mansell and Michael Coffey
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_USER_H
-#define LASTFM_USER_H
-
-#include <QString>
-#include <QStringList>
-#include <QUrl>
-
-#include <lastfm/AbstractType>
-#include <lastfm/ws.h>
-
-namespace lastfm
-{
-    class UserList;
-
-    class LASTFM_DLLEXPORT User : public AbstractType
-    {
-    public:
-        User() : AbstractType(), m_name( lastfm::ws::Username ), m_match( -1.0f )
-        {}
-
-        User( const QString& name ) : AbstractType(), m_name( name ), m_match( -1.0f )
-        {}
-
-        User( const class XmlQuery& xml );
-
-        lastfm::User& operator=( const lastfm::User& that ) { m_name = that.name(); m_images = that.m_images; m_realName = that.m_realName; m_match = that.m_match; return *this; }
-        bool operator==(const lastfm::User& that) const { return m_name == that.m_name; }
-        bool operator<(const lastfm::User& that) const { return m_name < that.m_name; }
-
-        operator QString() const { return m_name; }
-        QString name() const { return m_name; }
-        void setName( const QString& name ){ m_name = name; }
-    
-        /** use Tag::list() on the response to get a WeightedStringList */
-        QNetworkReply* getTopTags() const;
-
-        /** use User::list() on the response to get a QList<User> */
-        QNetworkReply* getFriends(  bool recentTracks = false, int limit = 50, int page = 1 ) const;
-        QNetworkReply* getFriendsListeningNow( int limit = 50, int page = 1 ) const;
-        QNetworkReply* getNeighbours( int limit = 50, int page = 1 ) const;
-    
-        QNetworkReply* getPlaylists() const;
-        QNetworkReply* getTopArtists( QString period = "overall", int limit = 50, int page = 1 ) const;
-        QNetworkReply* getRecentTracks( int limit = 50, int page = 1 ) const;
-        QNetworkReply* getRecentArtists() const;
-        QNetworkReply* getRecentStations(  int limit = 10, int page = 1  ) const;
-        QNetworkReply* getRecommendedArtists( int limit = 50, int page = 1 ) const;
-    
-        static UserList list( QNetworkReply* );
-
-        QString toString() const { return name(); }
-        QDomElement toDomElement( QDomDocument& ) const { return QDomElement(); }
-    
-    //////
-        QUrl imageUrl( ImageSize size = Large, bool square = false ) const;
-        
-        QString realName() const { return m_realName; }
-    
-        /** the user's profile page at www.last.fm */
-        QUrl www() const;
-    
-        /** Returns the match between the logged in user and the user which this
-          * object represents (if < 0.0f then not set) */
-        float match() const { return m_match; }
-    
-    protected:
-        QString m_name;
-
-        QList<QUrl> m_images;
-    
-        float m_match;
-    
-        QString m_realName;
-        
-        QMap<QString, QString> params( const QString& method ) const;
-    };
-
-    class LASTFM_DLLEXPORT Gender
-    {
-        QString s;
-
-    public:
-        Gender() :s(/*confused!*/){}
-
-        Gender( const QString& ss ) :s( ss.toLower() )
-        {}
-
-        bool known() const { return male() || female(); }
-        bool male() const { return s == "m"; }
-        bool female() const { return s == "f"; }
-
-        QString toString() const
-        {
-            QString result;
-
-            if (male())
-                result = QObject::tr( "m" );
-            else if (female())
-                result = QObject::tr( "f" );
-            else
-                result = QObject::tr( "n" ); // as in neuter
-
-            return result;
-        }
-    };
-
-
-    /** The Extended User contains extra information about a user's account */
-    class LASTFM_DLLEXPORT UserDetails : public User
-    {
-    public:
-        UserDetails();
-        /** User details */
-        UserDetails( QNetworkReply* );
-    
-        /** you can only get information about the any user */
-        static QNetworkReply* getInfo( const QString& username = lastfm::ws::Username );
-
-        /** a verbose string, eg. "A man with 36,153 scrobbles" */
-        QString getInfoString() const;
-
-        bool isSubscriber() const{ return m_isSubscriber; }
-        bool canBootstrap() const{ return m_canBootstrap; }
-        quint32 scrobbleCount() const{ return m_scrobbles; }
-        QDateTime dateRegistered() const { return m_registered; }
-        Gender gender() const { return m_gender; }
-        QString country() const { return m_country; }
-
-        void setScrobbleCount( quint32 scrobblesCount );
-        void setDateRegistered( const QDateTime& date );
-        void setImages( const QList<QUrl>& images );
-        void setRealName( const QString& realName );
-        void setAge( unsigned short age );
-        void setIsSubscriber( bool subscriber );
-        void setCanBootstrap( bool canBootstrap );
-        void setGender( const QString& s );
-        void setCountry( const QString& country );
-
-    
-        // pass the result to Artist::list(), if you want the other data 
-        // you have to parse the lfm() yourself members
-        // http://www.last.fm/api/show?service=388
-        // static QNetworkReply* getRecommendedArtists();
-
-    protected:
-        Gender m_gender;
-        unsigned short m_age;
-        unsigned int m_scrobbles;
-        QDateTime m_registered;
-        QString m_country;
-        bool m_isSubscriber;
-        bool m_canBootstrap;
-    };
-
-    class LASTFM_DLLEXPORT UserList : public QList<User>
-    {
-    public:
-        int total;
-        int page;
-        int perPage;
-        int totalPages;
-    };
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Xspf.cpp Deleted

@@ -1,75 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <QTimer>
-#include <QUrl>
-
-#include "../core/XmlQuery.h"
-
-#include "Xspf.h"
-
-
-lastfm::Xspf::Xspf( const QDomElement& playlist_node, QObject* parent )
-    :QObject( parent )
-{
-    XmlQuery e( playlist_node );
-
-    int expirySeconds = e"link rel=http://www.last.fm/expiry".text().toInt();
-    QTimer::singleShot( expirySeconds * 1000, this, SLOT(onExpired()));
-    
-    m_title = e"title".text();
-        
-    //FIXME should we use UnicornUtils::urlDecode()?
-    //The title is url encoded, has + instead of space characters 
-    //and has a + at the begining. So it needs cleaning up:
-    m_title.replace( '+', ' ' );
-    m_title = QUrl::fromPercentEncoding( m_title.toAscii());
-    m_title = m_title.trimmed();
-    
-    foreach (XmlQuery e, e"trackList".children( "track" ))
-    {
-        MutableTrack t;
-        t.setUrl( e"location".text() );
-        t.setExtra( "trackauth", e"extension""trackauth".text() );
-        t.setTitle( e"title".text() );
-        t.setArtist( e"creator".text() );
-        t.setAlbum( e"album".text() );
-        t.setDuration( e"duration".text().toInt() / 1000 );
-        t.setLoved( e"extension""loved".text() == "1" );
-        t.setSource( Track::LastFmRadio );
-
-        QList<QString> contexts;
-        QDomNodeList contextsNodeList = QDomElement(e"extension""context").childNodes();
-
-        for ( int i = 0 ; i < contextsNodeList.count() ; ++i )
-            contexts.append( contextsNodeList.item(i).toElement().text() );
-
-        if ( contexts.count() > 0 )
-            t.setContext( TrackContext( contextsNodeList.item(0).toElement().tagName(), contexts ) );
-
-        m_tracks << t; // outside try block since location is enough basically
-    }
-}
-
-void
-lastfm::Xspf::onExpired()
-{
-    emit expired();
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/Xspf.h Deleted

@@ -1,52 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_XSPF_H
-#define LASTFM_XSPF_H
-
-#include <lastfm/Track>
-#include <QList>
-
-namespace lastfm
-{
-    class LASTFM_DLLEXPORT Xspf : public QObject
-    {
-        Q_OBJECT
-    public:
-        /** pass in the playlist node! */
-        Xspf( const class QDomElement& playlist_node, QObject* parent );
-
-        QString title() const{ return m_title; }
-
-        bool isEmpty() const { return m_tracks.isEmpty(); }
-        Track takeFirst() { return m_tracks.takeFirst(); }
-
-    signals:
-        void expired();
-
-    private slots:
-        void onExpired();
-
-    private:
-        QList<Track> m_tracks;
-        QString m_title;
-    };
-}
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/types/mbid_mp3.c Deleted

@@ -1,181 +0,0 @@
-/*
-*  LICENSE
-*  
-*  Copyright (c) 2006, David Nicolson
-*  All rights reserved.
-*  
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*  
-*    1. Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*    2. Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*    3. Neither the name of the author nor the names of its contributors
-*       may be used to endorse or promote products derived from this software
-*       without specific prior written permission.
-*  
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT UNLESS REQUIRED BY
-*  LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER OR CONTRIBUTOR
-*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-*  OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-*  OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, PROFITS; OR
-*  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-*  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-*  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-*  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef __MBID_MP3_H
-#define __MBID_MP3_H
-
-#define MBID_BUFFER_SIZE 37
-
-// -----------------------------------------------------------------------------
-
-void mfile(size_t length, char ret, FILE *fp, int *s) {
-   size_t bytes = fread(ret,1,length,fp);
-
-   if (bytes != length) {
-      *s = 0;
-   }
-}
-
-// -----------------------------------------------------------------------------
-
-int to_synch_safe(char bytes) {
-   return ((int)bytes0 << 21) + ((int)bytes1 << 14) + ((int)bytes2 << 7) + (int)bytes3;
-}
-
-int to_integer(char bytes) {
-   size_t size = 0;
-   uint i;
-   for (i=0; i < sizeof(bytes); i++) {
-      size = size * 256 + ((int)bytesi & 0x000000FF);
-   }
-   return static_cast<int>(size);
-}
-
-// -----------------------------------------------------------------------------
-
-int getMP3_MBID(const char *path, char mbidMBID_BUFFER_SIZE) 
-{
-   FILE *fp;
-   static int s = 1;
-   char head3;
-   char version2;
-   char flag1;
-   char size4;
-   char size_extended4;
-   int tag_size = 0;
-   int extended_size = 0;
-   char frame4;
-   char frame_header4;
-   int frame_size;
-   int version_major, version_minor;
-
-   if (path == NULL) {
-      //debug("Received null path\n");
-      return -1;
-   }
-
-   fp = fopen(path,"rb");
-   if (fp == NULL) {
-      //debug("Failed to open music file: %s\n",path);
-      return -1;
-   }
-
-   while (s) {
-      mfile(3,head,fp,&s);
-      if (!strncmp(head,"ID3",3) == 0) {
-         //debug("No ID3v2 tag found: %s\n",path);
-         break;
-      }
-
-      mfile(2,version,fp,&s);
-      version_major = (int)version0;
-      version_minor = (int)version1;
-      if (version_major == 2) {
-         //debug("ID3v2.2.0 does not support MBIDs: %s\n",path);
-         break;
-      }
-      if (version_major != 3 && version_major != 4) {
-         //debug("Unsupported ID3 version: v2.%d.%d\n",version_major,version_minor);
-         break;
-      }
-
-      mfile(1,flag,fp,&s);
-      if ((unsigned int)flag0 & 0x00000040) {
-         //debug("Extended header found\n");
-         if (version0 == 4) {
-            mfile(4,size_extended,fp,&s);
-            extended_size = to_synch_safe(size_extended);
-         } else {
-            mfile(4,size_extended,fp,&s);
-            extended_size = to_integer(size_extended);
-         }
-         //debug("Extended header size: %d\n",extended_size);
-         fseek(fp,extended_size,SEEK_CUR);
-      }
-
-      mfile(4,size,fp,&s);
-      tag_size = to_synch_safe(size);
-      //debug("Tag size: %d\n",tag_size);
-
-      while (s) {
-         if (ftell(fp) > tag_size || ftell(fp) > 1048576) {
-            break;
-         }
-
-         mfile(4,frame,fp,&s);
-         if (frame0 == 0x00) {
-            break;
-         }
-         if (version_major == 4) {
-            mfile(4,frame_header,fp,&s);
-            frame_size = to_synch_safe(frame_header);
-         } else {
-            mfile(4,frame_header,fp,&s);
-            frame_size = to_integer(frame_header);
-         }
-
-         fseek(fp,2,SEEK_CUR);
-         //debug("Reading %d bytes from frame %s\n",frame_size,frame);
-
-         if (strncmp(frame,"UFID",4) == 0) {
-            //char frame_dataframe_size;
-            char frame_data59;
-            mfile(59,frame_data,fp,&s);
-            if (frame_size >= 59 && strncmp(frame_data,"http://musicbrainz.org",22) == 0) {
-               char *tmbid = frame_data;
-               tmbid = frame_data + 23;
-               strncpy(mbid,tmbid,MBID_BUFFER_SIZE-1);
-               mbidMBID_BUFFER_SIZE-1 = 0x00;
-               fclose(fp);
-               return 0;
-            }
-         } else {
-            fseek(fp,frame_size,SEEK_CUR);
-         }
-      }
-      break;
-   }
-
-   if (fp) {
-      fclose(fp);
-   }
-   //if (!s) {
-   //   debug("Failed to read music file: %s\n",path);
-   //}                
-   return -1;
-
-}
-
-#endif
-
-// -----------------------------------------------------------------------------

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/InternetConnectionMonitor.cpp Deleted

@@ -1,117 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "InternetConnectionMonitor.h"
-#include "linux/LNetworkConnectionMonitor.h"
-#include "mac/MNetworkConnectionMonitor.h"
-#include "win/WNetworkConnectionMonitor.h"
-#include "NetworkConnectionMonitor.h"
-#include "ws.h"
-
-lastfm::InternetConnectionMonitor::InternetConnectionMonitor( QObject *parent )
-                                 : QObject( parent )
-                                 , m_up( true )
-{
-    m_networkMonitor = createNetworkConnectionMonitor();
-
-    if ( m_networkMonitor )
-    {
-        connect( m_networkMonitor, SIGNAL( networkUp() ), this, SLOT( onNetworkUp() ) );
-        connect( m_networkMonitor, SIGNAL( networkDown() ), this, SLOT( onNetworkDown() ) );
-    }
-
-    connect( lastfm::nam(), SIGNAL( finished( QNetworkReply* ) ), this, SLOT( onFinished( QNetworkReply* ) ) );
-}
-
-void
-lastfm::InternetConnectionMonitor::onFinished( QNetworkReply* reply )
-{
-    if( reply->attribute( QNetworkRequest::SourceIsFromCacheAttribute).toBool() ) return;
-
-    switch( reply->error() )
-    {
-        case QNetworkReply::NoError:
-            if ( !m_up )
-            {
-                m_up = true;
-                emit up();
-                emit connectivityChanged( m_up );
-                qDebug() << "Internet connection is reachable :)";
-            }
-            break;
-        case QNetworkReply::HostNotFoundError:
-        case QNetworkReply::TimeoutError:
-        case QNetworkReply::ProxyConnectionRefusedError:
-        case QNetworkReply::ProxyConnectionClosedError:
-        case QNetworkReply::ProxyNotFoundError:
-        case QNetworkReply::ProxyTimeoutError:
-        case QNetworkReply::ProxyAuthenticationRequiredError:
-            if ( m_up )
-            {
-                m_up = false;
-                emit down();
-                emit connectivityChanged( m_up );
-            }
-            break;
-        default:
-            break;
-    }
-}
-
-void
-lastfm::InternetConnectionMonitor::onNetworkUp()
-{
-#ifdef Q_OS_MAC
-    // We don't need to check on mac as the
-    // check is done as part of the reach api
-        m_up = true;
-    emit up();
-    emit connectivityChanged( m_up );
-    qDebug() << "Internet connection is reachable :)";
-#else
-    qDebug() << "Network seems to be up again. Let's try if there's internet connection!";
-    lastfm::nam()->head( QNetworkRequest( QUrl( tr( "http://www.last.fm/" ) ) ) );
-#endif
-}
-
-void
-lastfm::InternetConnectionMonitor::onNetworkDown()
-{
-    qDebug() << "Internet is unreachable :(";
-    m_up = false;
-    emit down();
-    emit connectivityChanged( m_up );
-}
-
-NetworkConnectionMonitor*
-lastfm::InternetConnectionMonitor::createNetworkConnectionMonitor()
-{
-    NetworkConnectionMonitor* ncm = 0;
-
-#ifdef Q_WS_X11
-    ncm = new LNetworkConnectionMonitor( this );
-#elif defined(Q_WS_WIN)
-    ncm = new WNetworkConnectionMonitor( this );
-#elif defined(Q_WS_MAC)
-    ncm = new MNetworkConnectionMonitor( this );
-#endif
-
-    return ncm;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/InternetConnectionMonitor.h Deleted

@@ -1,80 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef LASTFM_CONNECTION_MONITOR_H
-#define LASTFM_CONNECTION_MONITOR_H
-
-#include <lastfm/global.h>
-#include <QObject>
-
-class NetworkConnectionMonitor;
-
-#ifdef Q_WS_X11
-class LNetworkConnectionMonitor;
-#endif
-
-namespace lastfm {
-
-class LASTFM_DLLEXPORT InternetConnectionMonitor : public QObject
-{
-    Q_OBJECT
-    enum NMState
-    {
-        Unknown,
-        Asleep,
-        Connecting,
-        Connected,
-        Disconnected
-    };
-
-public:
-    /** if internet is unavailable you will get a down() signal soon, otherwise
-      * you won't get a signal until the net goes down */
-    InternetConnectionMonitor( QObject *parent = 0 );
-
-    bool isDown() const { return !m_up; }
-    bool isUp() const { return m_up; }
-
-    NetworkConnectionMonitor* createNetworkConnectionMonitor();
-
-signals:
-    /** yay! internet has returned */
-    void up( const QString& connectionName = "" );
-    
-    /** we think the internet is unavailable, but well, still try, but show
-      * an unhappy face in the statusbar or something */
-    void down( const QString& connectionName = "" );
-    
-    /** emitted after the above */
-    void connectivityChanged( bool );
-
-private slots:
-    void onFinished( QNetworkReply* reply );
-    void onNetworkUp();
-    void onNetworkDown();
-
-private:
-    bool m_up;
-    NetworkConnectionMonitor* m_networkMonitor;
-};
-
-} //namespace lastfm
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/NetworkAccessManager.cpp Deleted

@@ -1,159 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "NetworkAccessManager.h"
-#include "InternetConnectionMonitor.h"
-#include <lastfm/ws.h>
-#include <lastfm/misc.h>
-#include <QCoreApplication>
-#include <QNetworkRequest>
-#ifdef WIN32
-#include "win/IeSettings.h"
-#include "win/Pac.h"
-#endif
-#ifdef __APPLE__
-#include "mac/ProxyDict.h"
-#endif
-
-
-static struct NetworkAccessManagerInit
-{
-    // We do this upfront because then our Firehose QTcpSocket will have a proxy 
-    // set by default. As well as any plain QNetworkAcessManager stuff, and the
-    // scrobbler
-    // In theory we should do this every request in case the configuration 
-    // changes but that is fairly unlikely use case, init? Maybe we should 
-    // anyway..
-
-    NetworkAccessManagerInit()
-    {
-    #ifdef WIN32
-        IeSettings s;
-        // if it's autodetect, we determine the proxy everytime in proxy()
-        // we don't really want to do a PAC lookup here, as it times out
-        // at two seconds, so that hangs startup
-        if (!s.fAutoDetect && s.lpszProxy)
-        {
-            QUrl url( QString::fromUtf16((const unsigned short*)s.lpszProxy) );
-            QNetworkProxy proxy( QNetworkProxy::HttpProxy );
-            proxy.setHostName( url.host() );
-            proxy.setPort( url.port() );
-            QNetworkProxy::setApplicationProxy( proxy );
-        }
-    #endif
-    #ifdef __APPLE__
-        ProxyDict dict;
-        if (dict.isProxyEnabled())
-        {
-            QNetworkProxy proxy( QNetworkProxy::HttpProxy );
-            proxy.setHostName( dict.host );
-            proxy.setPort( dict.port );
-
-            QNetworkProxy::setApplicationProxy( proxy );
-        }
-    #endif
-    }
-} init;    
-
-
-namespace lastfm 
-{
-    LASTFM_DLLEXPORT QByteArray UserAgent;
-}
-
-
-lastfm::NetworkAccessManager::NetworkAccessManager( QObject* parent )
-               : QNetworkAccessManager( parent )
-            #ifdef WIN32
-               , m_pac( 0 )
-               , m_monitor( 0 )
-            #endif
-{
-    // can't be done in above init, as applicationName() won't be set
-    if (lastfm::UserAgent.isEmpty())
-    {
-        QByteArray name = QCoreApplication::applicationName().toUtf8();
-        QByteArray version = QCoreApplication::applicationVersion().toUtf8();
-        if (version.size()) version.prepend( ' ' );
-        lastfm::UserAgent = name + version + " (" + lastfm::platform() + ")";
-    }
-}
-
-
-lastfm::NetworkAccessManager::~NetworkAccessManager()
-{
-#ifdef WIN32
-    delete m_pac;
-#endif
-}
-
-
-QNetworkProxy
-lastfm::NetworkAccessManager::proxy( const QNetworkRequest& request )
-{   
-    Q_UNUSED( request );
-    
-#ifdef WIN32
-    IeSettings s;
-    if (s.fAutoDetect) 
-    {
-        if (!m_pac) {
-            m_pac = new Pac;
-            if ( !m_monitor )
-            {
-                m_monitor = new InternetConnectionMonitor( this );
-                connect( m_monitor, SIGNAL( connectivityChanged( bool ) ), SLOT( onConnectivityChanged( bool ) ) );
-            }
-        }
-        return m_pac->resolve( request, s.lpszAutoConfigUrl );
-    } 
-#endif
-    
-    return QNetworkProxy::applicationProxy();
-}
-
-
-QNetworkReply*
-lastfm::NetworkAccessManager::createRequest( Operation op, const QNetworkRequest& request_, QIODevice* outgoingData )
-{
-    QNetworkRequest request = request_;
-
-    request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache );
-    request.setRawHeader( "User-Agent", lastfm::UserAgent );
-    
-#ifdef WIN32
-    // PAC proxies can vary by domain, so we have to check everytime :(
-    QNetworkProxy proxy = this->proxy( request );
-    if (proxy.type() != QNetworkProxy::NoProxy)
-        QNetworkAccessManager::setProxy( proxy );
-#endif
-
-    return QNetworkAccessManager::createRequest( op, request, outgoingData );
-}
-
-
-void
-lastfm::NetworkAccessManager::onConnectivityChanged( bool up )
-{
-    Q_UNUSED( up );
-    
-#ifdef WIN32
-    if (up && m_pac) m_pac->resetFailedState();
-#endif
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/NetworkAccessManager.h Deleted

@@ -1,66 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_WS_ACCESS_MANAGER_H
-#define LASTFM_WS_ACCESS_MANAGER_H
-
-#include <lastfm/global.h>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkProxy>
-
-
-namespace lastfm {
-
-/** Sets useragent and proxy. Auto detecting the proxy where possible. */
-class LASTFM_DLLEXPORT NetworkAccessManager : public QNetworkAccessManager
-{
-    Q_OBJECT
-
-#ifdef Q_WS_WIN
-    class Pac *m_pac;
-    class InternetConnectionMonitor* m_monitor;
-#endif
-
-public:
-    NetworkAccessManager( QObject *parent = 0 );
-    ~NetworkAccessManager();
-
-    /** PAC allows different proxy configurations depending on the request
-      * URL and even UserAgent! Thus we allow you to pass that in, we
-      * automatically configure the proxy for every request through 
-      * WsAccessManager */
-    QNetworkProxy proxy( const QNetworkRequest& = QNetworkRequest() );
-
-protected:
-    virtual QNetworkReply* createRequest( Operation, const QNetworkRequest&, QIODevice* outgoingdata = 0 );
-
-private slots:
-    void onConnectivityChanged( bool );
-
-private:
-    /** this function calls QNetworkAccessManager::setProxy, and thus 
-      * configures the proxy correctly for the next request created by
-      * createRequest. This is necessary due */
-    void applyProxy( const QNetworkRequest& );
-};
-
-} //namespace lastfm
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/NetworkConnectionMonitor.cpp Deleted

@@ -1,51 +0,0 @@
-/*
-   Copyright 2010 Last.fm Ltd.
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "NetworkConnectionMonitor.h"
-
-NetworkConnectionMonitor::NetworkConnectionMonitor( QObject* /*parent*/ )
-    : m_connected( true )
-{
-}
-
-NetworkConnectionMonitor::~NetworkConnectionMonitor()
-{
-}
-
-bool
-NetworkConnectionMonitor::isConnected() const
-{
-    return m_connected;
-}
-
-void
-NetworkConnectionMonitor::setConnected( bool connected )
-{
-    if ( m_connected != connected )
-    {
-        m_connected = connected;
-
-        if ( connected )
-            emit networkUp();
-        else
-            emit networkDown();
-    }
-}
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/NetworkConnectionMonitor.h Deleted

@@ -1,46 +0,0 @@
-/*
-   Copyright 2010 Last.fm Ltd.
-      - Primarily authored by Jono Cole, Michael Coffey, and William Viana
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef NETWORK_CONNECTION_MONITOR_H
-#define NETWORK_CONNECTION_MONITOR_H
-
-#include <lastfm/global.h>
-#include <QObject>
-
-class LASTFM_DLLEXPORT NetworkConnectionMonitor : public QObject
-{
-    Q_OBJECT
-public:
-    NetworkConnectionMonitor( QObject *parent = 0 );
-    ~NetworkConnectionMonitor();
-    bool isConnected() const;
-
-signals:
-    void networkUp();
-    void networkDown();
-
-protected:
-    void setConnected( bool connected );
-
-private:
-    bool m_connected;
-};
-
-#endif // NETWORK_CONNECTION_MONITOR_H

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/linux Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/linux/LNetworkConnectionMonitor.h Deleted

@@ -1,54 +0,0 @@
-/*
-   Copyright 2010 Last.fm Ltd.
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef LNETWORK_CONNECTION_MONITOR_H
-#define LNETWORK_CONNECTION_MONITOR_H
-
-#include "../NetworkConnectionMonitor.h"
-#include <lastfm/global.h>
-#include <QObject>
-
-class QDBusConnection;
-class QDBusInterface;
-
-class LNetworkConnectionMonitor : public NetworkConnectionMonitor
-{
-    Q_OBJECT
-
-    enum NMState
-    {
-        Unknown=1,
-        Asleep,
-        Connected,
-        Disconnected
-    };
-
-public:
-    LNetworkConnectionMonitor( QObject* parent = 0 );
-    ~LNetworkConnectionMonitor();
-private slots:
-    void onStateChange( uint newState );
-private:
-    QDBusInterface* m_nmInterface;
-};
-
-#endif // LNETWORK_CONNECTION_MONITOR_H
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/linux/LNetworkConnectionMonitor_linux.cpp Deleted

@@ -1,86 +0,0 @@
-/*
-   Copyright 2010 Last.fm Ltd.
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "LNetworkConnectionMonitor.h"
-
-#include <QDBusConnection>
-#include <QDBusInterface>
-#include <QDBusReply>
-
-LNetworkConnectionMonitor::LNetworkConnectionMonitor( QObject* parent ) :
-    NetworkConnectionMonitor( parent )
-{
-    m_nmInterface = new QDBusInterface( QString( "org.freedesktop.NetworkManager" ),
-                                        QString( "/org/freedesktop/NetworkManager" ),
-                                        QString( "org.freedesktop.NetworkManager" ),
-                                        QDBusConnection::systemBus(),
-                                        this );
-
-    //get current connection state
-    QDBusInterface* dbusInterface = new QDBusInterface( QString( "org.freedesktop.NetworkManager" ),
-                                                        QString( "/org/freedesktop/NetworkManager" ),
-                                                        QString( "org.freedesktop.DBus.Properties" ),
-                                                        QDBusConnection::systemBus(),
-                                                        this );
-
-    QDBusReply<QVariant> reply = dbusInterface->call( "Get", "org.freedesktop.NetworkManager", "state" );
-    if ( reply.isValid() )
-    {
-        if ( reply.value() == Connected )
-        {
-            setConnected( true );
-        }
-        else if ( reply.value() == Disconnected )
-        {
-            setConnected( false );
-        }
-    }
-    else
-    {
-        qDebug() << "Error: " << reply.error();
-    }
-    delete dbusInterface;
-
-    //connect network manager signals
-   connect( m_nmInterface, SIGNAL( StateChange( uint ) ), this, SLOT( onStateChange( uint ) ) );
-
-}
-
-LNetworkConnectionMonitor::~LNetworkConnectionMonitor()
-{
-    delete m_nmInterface;
-}
-
-
-void
-LNetworkConnectionMonitor::onStateChange( uint newState )
-{
-    qDebug() << "Networkmanager state change!";
-    
-    if ( newState == Disconnected )
-    {
-       setConnected( false );
-    }
-    else if ( newState == Connected )
-    {
-       setConnected( true );
-    }
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/mac Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/mac/MNetworkConnectionMonitor.h Deleted

@@ -1,52 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd.
-      - Primarily authored by Jono Cole and Michael Coffey
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef MNETWORK_CONNECTION_MONITOR_H
-#define MNETWORK_CONNECTION_MONITOR_H
-
-#include "../NetworkConnectionMonitor.h"
-#include <lastfm/global.h>
-#include <QObject>
-
-#ifdef Q_WS_MAC
-#include <SystemConfiguration/SCNetwork.h> //TODO remove
-#include <SystemConfiguration/SCNetworkReachability.h>
-#endif
-
-class __SCNetworkReachability;
-
-class MNetworkConnectionMonitor : public NetworkConnectionMonitor
-{
-    Q_OBJECT
-public:
-    MNetworkConnectionMonitor( QObject* parent = 0 );
-    ~MNetworkConnectionMonitor();
-private slots:
-
-private:
-#ifdef Q_WS_MAC
-    static void callback( SCNetworkReachabilityRef target,
-                          SCNetworkConnectionFlags flags,
-                          void *info );
-#endif
-};
-
-#endif // MNETWORK_CONNECTION_MONITOR_H
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/mac/MNetworkConnectionMonitor_mac.cpp Deleted

@@ -1,70 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd.
-      - Primarily authored by Jono Cole and Michael Coffey
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "MNetworkConnectionMonitor.h"
-
-#include <QPointer>
-#include <SystemConfiguration/SCNetworkReachability.h>
-
-#include "../ws.h"
-
-MNetworkConnectionMonitor* context = 0;
-
-MNetworkConnectionMonitor::MNetworkConnectionMonitor( QObject* parent ) :
-    NetworkConnectionMonitor( parent )
-{
-    context = this;
-
-    SCNetworkReachabilityRef ref = SCNetworkReachabilityCreateWithName( NULL, LASTFM_WS_HOSTNAME );
-    SCNetworkReachabilityScheduleWithRunLoop( ref, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode );
-    SCNetworkReachabilitySetCallback( ref, callback, NULL );
-    CFRelease( ref );
-}
-
-MNetworkConnectionMonitor::~MNetworkConnectionMonitor()
-{
-}
-
-
-void
-MNetworkConnectionMonitor::callback( SCNetworkReachabilityRef target,
-                                     SCNetworkConnectionFlags flags,
-                                     void * )
-{
-    static bool up = true;
-
-    // I couldn't find any diffinitive usage examples for these flags
-    // so I had to guess, since I can't test, eg. dial up :(
-
-    bool b;
-    if (flags & kSCNetworkFlagsConnectionRequired)
-        b = false;
-    else
-        b = flags & (kSCNetworkFlagsReachable | kSCNetworkFlagsTransientConnection | kSCNetworkFlagsConnectionAutomatic);
-
-    // basically, avoids telling everyone that we're up already on startup
-    if (up == b)
-        return;
-
-    up = b;
-
-    context->setConnected(b);
-}
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/mac/ProxyDict.h Deleted

@@ -1,75 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <SystemConfiguration/SystemConfiguration.h>
-
-
-struct ProxyDict
-{
-    ProxyDict();
-
-    int port;
-    QString host;
-    
-    bool isProxyEnabled() const { return port > 0 && host.size(); }
-};
-
-
-inline ProxyDict::ProxyDict() : port( 0 )
-{
-    // Get the dictionary.
-    CFDictionaryRef proxyDict = SCDynamicStoreCopyProxies( NULL );
-    bool result = (proxyDict != NULL);
-
-    // Get the enable flag.  This isn't a CFBoolean, but a CFNumber.
-    CFNumberRef enableNum;
-    int enable;
-    if (result) {
-        enableNum = (CFNumberRef) CFDictionaryGetValue( proxyDict, kSCPropNetProxiesHTTPEnable );
-        result = (enableNum != NULL) && (CFGetTypeID(enableNum) == CFNumberGetTypeID());
-    }
-    if (result)
-        result = CFNumberGetValue( enableNum, kCFNumberIntType, &enable ) && (enable != 0);
-
-    // Get the proxy host.  DNS names must be in ASCII.  If you 
-    // put a non-ASCII character  in the "Secure Web Proxy"
-    // field in the Network preferences panel, the CFStringGetCString
-    // function will fail and this function will return false.
-    CFStringRef hostStr;
-    if (result) {
-        hostStr = (CFStringRef) CFDictionaryGetValue( proxyDict, kSCPropNetProxiesHTTPProxy );
-        result = (hostStr != NULL) && (CFGetTypeID(hostStr) == CFStringGetTypeID());
-    }
-    if (result)
-        host = lastfm::CFStringToQString( hostStr );
-
-    // get the proxy port
-    CFNumberRef portNum;
-
-    if (result) {
-        portNum = (CFNumberRef) CFDictionaryGetValue( proxyDict, kSCPropNetProxiesHTTPPort );
-        result = (portNum != NULL) && (CFGetTypeID(portNum) == CFNumberGetTypeID());
-    }
-    if (result)
-        result = CFNumberGetValue( portNum, kCFNumberIntType, &port );
-
-    // clean up.
-    if (proxyDict != NULL)
-        CFRelease( proxyDict );
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win/ComSetup.h Deleted

@@ -1,64 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef _WIN32_WINNT
-// bring in CoInitializeSecurity from objbase.h
-#define _WIN32_WINNT 0x0400
-#endif
-
-#include <objbase.h>
-#include "winable.h"
-//#include <atlbase.h>
-//#include <atlcom.h>
-
-
-/** @brief WsConnectionMonitor needs Com to work as early as possible so we do this
-  * @author <doug@last.fm> 
-  */
-class ComSetup
-{
-public:
-    ComSetup()
-    {
-        HRESULT hr = CoInitialize(0);
-        m_bComInitialised = SUCCEEDED(hr);
-        //_ASSERT(m_bComInitialised);
-        if (m_bComInitialised) {
-            setupSecurity();
-        }
-    }
-    
-    void setupSecurity()
-    {
-        //CSecurityDescriptor sd;
-        //sd.InitializeFromThreadToken();
-        //HRESULT hr = CoInitializeSecurity(sd, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_PKT, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL); 
-        //_ASSERT(SUCCEEDED(hr));
-    }
-    
-    ~ComSetup()
-    {
-        if (m_bComInitialised) {
-            CoUninitialize();
-        }
-    }
-    
-private:
-    bool m_bComInitialised;
-};

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win/IeSettings.h Deleted

@@ -1,43 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <windows.h>
-#include <winhttp.h>
-
-
-/** @brief memory managing wrapper for WINHTTP_CURRENT_USER_IE_PROXY_CONFIG
-  * @author <doug@last.fm>
-  */
-struct IeSettings : WINHTTP_CURRENT_USER_IE_PROXY_CONFIG
-{
-/*    IeSettings()
-    {
-        if (!WinHttpGetIEProxyConfigForCurrentUser(this)) {
-            fAutoDetect = FALSE;
-            lpszAutoConfigUrl = lpszProxy = lpszProxyBypass = 0;
-        }
-    }
-    
-    ~IeSettings()
-    {
-        if (lpszAutoConfigUrl) GlobalFree(lpszAutoConfigUrl);
-        if (lpszProxy) GlobalFree(lpszProxy);
-        if (lpszProxyBypass) GlobalFree(lpszProxyBypass);
-    }*/
-};

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win/NdisEvents.cpp Deleted

@@ -1,87 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "NdisEvents.h"
-#include "WmiSink.h"
-
-// see http://msdn.microsoft.com/en-us/magazine/cc301850.aspx for
-// more about Ndis and wmi and getting these events
-
-// Link to wbemuuid.lib to resolve IWbemObjectSink and IWbemClassObject
-// interface definitions.
-
-NdisEvents::NdisEvents()
-    : m_pSink(0)
-{}
-
-NdisEvents::~NdisEvents()
-{
-//    if (m_pSink)
-//        m_pSink->disconnect();
-//    if (m_pServices && m_pSink)
-//        m_pServices->CancelAsyncCall(m_pSink);
-    // and reference counting will take care of the WmiSink object
-}
-
-HRESULT
-NdisEvents::registerForNdisEvents()
-{
-    HRESULT hr = 0; // m_pLocator.CoCreateInstance(CLSID_WbemLocator);
-    if (FAILED(hr))
-        return hr;
-
-    // Connect to the root\wmi namespace with the current user.
-    hr = 0; /*m_pLocator->ConnectServer(CComBSTR("ROOT\\WMI"),       // strNetworkResource
-                                    NULL,               // strUser
-                                    NULL,               // strPassword
-                                    NULL,               // strLocale  
-                                    0,                  // lSecurityFlags
-                                    CComBSTR(""),       // strAuthority               
-                                    NULL,               // pCtx
-                                    &m_pServices
-                                    );*/
-    if (FAILED(hr))
-        return hr;
-
-//    m_pSink = new WmiSink(this);
-
-    //////////////////////////
-
-    // other notifications we're not interested in right now include...
-    // MSNdis_NotifyAdapterArrival  \DEVICE\<guid>
-    // MSNdis_NotifyAdapterRemoval
-    // MSNdis_StatusLinkSpeedChange
-    // MSNdis_NotifyVcArrival
-    // MSNdis_NotifyVcRemoval
-    // MSNdis_StatusResetStart
-    // MSNdis_StatusResetEnd
-    // MSNdis_StatusProtocolBind
-    // MSNdis_StatusProtocolUnbind
-    // MSNdis_StatusMediaSpecificIndication
-
-/*    CComBSTR wql("WQL");
-    CComBSTR query("SELECT * FROM MSNdis_StatusMediaDisconnect");
-    hr = m_pServices->ExecNotificationQueryAsync(wql, query, 0, 0, m_pSink);
-
-    query = "SELECT * FROM MSNdis_StatusMediaConnect";
-    hr = m_pServices->ExecNotificationQueryAsync(wql, query, 0, 0, m_pSink);*/
-
-    return S_OK;
-}
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win/NdisEvents.h Deleted

@@ -1,44 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef NDIS_EVENTS_H
-#define NDIS_EVENTS_H
-
-#include <windows.h>
-//#include <atlbase.h>
-//#include <WbemCli.h>
-
-class NdisEvents
-{
-public:
-    NdisEvents();
-    ~NdisEvents();
-    HRESULT registerForNdisEvents();
-
-    virtual void onConnectionUp(BSTR name) = 0;
-    virtual void onConnectionDown(BSTR name) = 0;
-
-private:
-//    CComPtr<IWbemLocator> m_pLocator;
-//    CComPtr<IWbemServices> m_pServices;
-    class WmiSink *m_pSink;
-};
-
-#endif
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win/Pac.cpp Deleted

@@ -1,129 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "Pac.h"
-#include <QNetworkRequest>
-#include <QStringList>
-#include <QUrl>
-#include <winhttp.h>
-//#include <atlbase.h>
-//#include <atlconv.h>
-
-
-static bool
-parsePacServer(const QString &s, QNetworkProxy &p)
-{
-    // remove optional leading "scheme=" portion
-    int start = s.indexOf('=');
-    QUrl url(s.mid(start+1), QUrl::TolerantMode);
-
-    if (url.isValid())
-    {
-        p.setHostName(url.host());
-        p.setPort(url.port());
-        return true;
-    }
-    return false;
-}
-
-
-static QList<QNetworkProxy>
-parsePacResult(const QString &pacResult)
-{
-    // msdn says: "The proxy server list contains one or more of the 
-    // following strings separated by semicolons or whitespace."
-    // (<scheme>=<scheme>"://"<server>":"<port>)
-
-    QList<QNetworkProxy> result;
-    QStringList proxies = pacResult.split(QRegExp("\\s;"), QString::SkipEmptyParts);
-    foreach(const QString &s, proxies)
-    {
-        QNetworkProxy proxy( QNetworkProxy::HttpProxy );
-        if (parsePacServer(s, proxy))
-        {
-            result << proxy;
-        }
-    }
-    return result;
-}
-
-
-////////////////
-
-
-lastfm::Pac::Pac()
-    : m_bFailed( false )
-    , m_hSession( 0 )
-{}
-
-lastfm::Pac::~Pac()
-{
-/*    if (m_hSession)
-        WinHttpCloseHandle(m_hSession);*/
-}
-
-QNetworkProxy
-lastfm::Pac::resolve(const QNetworkRequest &request, const wchar_t* pacUrl)
-{
-    QNetworkProxy out;
-    if (m_bFailed) return out;
-
-    if (!m_hSession)
-    {
-        QByteArray user_agent = request.rawHeader("user-agent");
-        //m_hSession = WinHttpOpen(CA2W(user_agent), WINHTTP_ACCESS_TYPE_NO_PROXY, 0, 0, WINHTTP_FLAG_ASYNC);
-    }
-    if (m_hSession)
-    {
-        WINHTTP_PROXY_INFO info;
-        WINHTTP_AUTOPROXY_OPTIONS opts;
-        memset(&opts, 0, sizeof(opts));
-        if (pacUrl) 
-        {
-            // opts.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL;
-            // opts.lpszAutoConfigUrl = pacUrl;
-        } 
-        else
-        {
-            // opts.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT;
-            // opts.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DHCP | WINHTTP_AUTO_DETECT_TYPE_DNS_A;
-        }
-        opts.fAutoLogonIfChallenged = TRUE;
-        
-/*        if (WinHttpGetProxyForUrl(m_hSession, (const WCHAR*)request.url().toString().utf16(), &opts, &info)) {
-            if (info.lpszProxy) 
-            {
-                QList<QNetworkProxy> proxies = parsePacResult(QString::fromUtf16((const ushort*)info.lpszProxy));
-                if (!proxies.empty())
-                {
-                    out = proxies.at(0);
-                }
-                GlobalFree((void*)info.lpszProxy);
-            }
-            if (info.lpszProxyBypass)
-            {
-                GlobalFree((void*)info.lpszProxyBypass);
-            }
-        } else {
-            m_bFailed = true;
-        }*/
-    }
-
-    return out;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win/Pac.h Deleted

@@ -1,52 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef WS_AUTOPROXY_H
-#define WS_AUTOPROXY_H
-
-#include <QNetworkProxy>
-#include <windows.h>
-#include <winhttp.h>
-class QNetworkRequest;
- 
-namespace lastfm
-{
-    /** @brief simple wrapper to do per url automatic proxy detection 
-      * @author <doug@last.fm>
-      */
-    class Pac
-    {    
-        HINTERNET m_hSession;
-        bool m_bFailed;
-
-    public:
-        Pac();
-        ~Pac();
-
-        QNetworkProxy resolve( const QNetworkRequest& url, const wchar_t* pacUrl );
-
-        void resetFailedState() { m_bFailed = false; }
-
-    private:
-        Pac( const Pac& ); //undefined
-        Pac operator=( const Pac& ); //undefined
-    };
-}
-
-#endif 
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win/WNetworkConnectionMonitor.h Deleted

@@ -1,44 +0,0 @@
-/*
-   Copyright 2010 Last.fm Ltd.
-      - Primarily authored by Jono Cole, Michael Coffey, and William Viana
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef WNETWORK_CONNECTION_MONITOR_H
-#define WNETWORK_CONNECTION_MONITOR_H
-
-#include "../NetworkConnectionMonitor.h"
-#include <lastfm/global.h>
-#include <QObject>
-
-namespace lastfm { class NdisEventsProxy; }
-
-class WNetworkConnectionMonitor : public NetworkConnectionMonitor
-{
-    Q_OBJECT
-public:
-    friend class lastfm::NdisEventsProxy;
-
-    WNetworkConnectionMonitor( QObject* parent = 0 );
-    ~WNetworkConnectionMonitor();
-
-private:
-    lastfm::NdisEventsProxy* m_ndisEventsProxy;
-};
-
-#endif // WNETWORK_CONNECTION_MONITOR_H
-

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win/WNetworkConnectionMonitor_win.cpp Deleted

@@ -1,67 +0,0 @@
-/*
-   Copyright 2010 Last.fm Ltd.
-      - Primarily authored by Jono Cole, Michael Coffey, and William Viana
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "WNetworkConnectionMonitor.h"
-
-// WsAccessManager needs special init (on Windows), and it needs to be done
-// early, so be careful about moving this
-#include "../win/ComSetup.h" //must be first header or compile fail results!
-#include "../win/NdisEvents.h"
-static ComSetup com_setup;
-
-namespace lastfm {
-
-// bounce NdisEvents signals through here so we don't have to expose the
-// NdisEvents interface in InternetConnectionMonitor  :)
-class NdisEventsProxy : public NdisEvents
-{
-public:
-    NdisEventsProxy(WNetworkConnectionMonitor* icm)
-        :m_icm(icm)
-    {
-    }
-
-    // WmiSink callbacks:
-    void onConnectionUp( BSTR /*name*/ )
-    {
-        m_icm->setConnected( true );
-    }
-
-    void onConnectionDown( BSTR /*name*/ )
-    {
-        m_icm->setConnected( false );
-    }
-
-    WNetworkConnectionMonitor* m_icm;
-};
-
-}
-
-WNetworkConnectionMonitor::WNetworkConnectionMonitor( QObject* parent ) :
-    NetworkConnectionMonitor( parent )
-{
-    m_ndisEventsProxy = new lastfm::NdisEventsProxy( this );
-    m_ndisEventsProxy->registerForNdisEvents();
-}
-
-WNetworkConnectionMonitor::~WNetworkConnectionMonitor()
-{
-    delete m_ndisEventsProxy;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win/WmiSink.cpp Deleted

@@ -1,202 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "WmiSink.h"
-#include "NdisEvents.h"
-
-
-WmiSink::WmiSink(NdisEvents *callback) 
-    : m_cRef(1)
-    , m_callback(callback)
-{}
-
-WmiSink::~WmiSink() 
-{}
-
-void
-WmiSink::disconnect()
-{
-    m_callback = 0;
-}
-
-STDMETHODIMP
-WmiSink::QueryInterface(REFIID riid, LPVOID * ppv)
-{
-    *ppv = 0;
-
-    if (IID_IUnknown==riid || IID_IWbemObjectSink == riid)
-    {
-        *ppv = (IWbemObjectSink *) this;
-        AddRef();
-        return NOERROR;
-    }
-
-    return E_NOINTERFACE;
-}
-
-
-ULONG
-WmiSink::AddRef()
-{
-    return ++m_cRef;
-}
-
-ULONG
-WmiSink::Release()
-{
-    if (0 != --m_cRef)
-        return m_cRef;
-
-    delete this;
-    return 0;
-}
-
-// This method receives notification objects.
-HRESULT 
-WmiSink::Indicate(long lObjectCount, IWbemClassObject** ppObjArray)
-{
-    // For each object in the array, extract the object and display the
-    // information in the object.
-    for (long i=0; i<lObjectCount; i++)
-    {
-        CComVariant vt, vtClass;
-        ppObjArrayi->Get(L"InstanceName", 0, &vt, NULL, NULL);
-        ppObjArrayi->Get(L"__Class", 0, &vtClass, NULL, NULL);
-
-        if (!wcscmp (vtClass.bstrVal, L"MSNdis_StatusMediaDisconnect"))
-        {
-            if (m_callback) m_callback->onConnectionDown(vt.bstrVal);
-        }
-        else if (!wcscmp (vtClass.bstrVal, L"MSNdis_StatusMediaConnect"))
-        {
-            if (m_callback) m_callback->onConnectionUp(vt.bstrVal);
-        }
-        // notifications we aren't interested in right now:
-        //
-        //else if (!wcscmp (vtClass.bstrVal, L"MSNdis_NotifyAdapterRemoval"))
-        //{
-        //    bstrLog = (_bstr_t) vt.bstrVal;
-        //    VariantClear (&vt);
-        //    ppObjArrayi->Get (L"DeviceName", 0, &vt, NULL, NULL);
-        //    bstrLog += (_bstr_t) _T(": ") + (_bstr_t) vt.bstrVal + (_bstr_t) _T(" has been removed");
-        //    displayDlg.LogEvent (bstrLog);
-        //}
-        //else if (!wcscmp (vtClass.bstrVal, L"MSNdis_NotifyAdapterArrival"))
-        //{
-        //    bstrLog = (_bstr_t) vt.bstrVal;
-        //    VariantClear (&vt);
-        //    ppObjArrayi->Get(L"DeviceName", 0, &vt, NULL, NULL);
-        //    bstrLog += (_bstr_t) _T(": ") + (_bstr_t) vt.bstrVal + (_bstr_t) _T(" has been added");
-        //    displayDlg.LogEvent (bstrLog);
-        //}
-        //else if (!wcscmp (vtClass.bstrVal, L"MSNdis_StatusResetStart"))
-        //{
-        //    bstrLog = (_bstr_t) vt.bstrVal + (_bstr_t) _T(" has begun a reset");
-        //    displayDlg.LogEvent (bstrLog);
-        //}
-        //else if (!wcscmp (vtClass.bstrVal, L"MSNdis_StatusResetEnd"))
-        //{
-        //    bstrLog = (_bstr_t) vt.bstrVal + (_bstr_t) _T(" has finished a reset");
-        //    displayDlg.LogEvent (bstrLog);
-        //}
-        //else if (!wcscmp (vtClass.bstrVal, L"MSNdis_NotifyVcArrival"))
-        //{
-        //    bstrLog = (_bstr_t) _T("VC arrival: ") + (_bstr_t) vt.bstrVal;
-        //    displayDlg.LogEvent (bstrLog);
-        //}
-        //else if (!wcscmp (vtClass.bstrVal, L"MSNdis_NotifyVcRemoval"))
-        //{
-        //    bstrLog = (_bstr_t) _T("VC removal: ") + (_bstr_t) vt.bstrVal;
-        //    displayDlg.LogEvent (bstrLog);
-        //}
-        //else if (!wcscmp (vtClass.bstrVal, L"MSNdis_StatusMediaSpecificIndication"))
-        //{
-        //    ATLTRACE (_T("Media specific indication: %s\n"), (TCHAR *) (_bstr_t) vt.bstrVal);
-        //    VariantClear (&vt);
-        //    ppObjArrayi->Get (L"NdisStatusMediaSpecificIndication", 0, &vt, NULL, NULL);
-        //    LONG lLowerBound, lUpperBound, j;
-        //    UCHAR ch;
-        //    SafeArrayGetLBound (V_ARRAY (&vt), 1, &lLowerBound);
-        //    SafeArrayGetUBound (V_ARRAY (&vt), 1, &lUpperBound);
-        //    ATLTRACE (" ");
-        //    for (j = lLowerBound; j<= lUpperBound; j++ )
-        //    {
-        //        SafeArrayGetElement (V_ARRAY (&vt), &j, &ch);
-        //        ATLTRACE (_T("%4i"), ch);
-
-        //        if (((j - lLowerBound) % 8 == 7) && (j <= lUpperBound))
-        //            ATLTRACE (_T("\n"));         
-        //    }                          
-        //}
-        //else if (!wcscmp (vtClass.bstrVal, L"MSNdis_StatusProtocolBind"))
-        //{
-        //    bstrLog = (_bstr_t) vt.bstrVal;
-        //    VariantClear (&vt);
-        //    ppObjArrayi->Get (L"Transport", 0, &vt, NULL, NULL);
-        //    bstrLog += (_bstr_t) _T(" is now bound to ") + (_bstr_t) vt.bstrVal;
-        //    displayDlg.LogEvent (bstrLog);
-        //}
-        //else if (!wcscmp (vtClass.bstrVal, L"MSNdis_StatusProtocolBind"))
-        //{
-        //    bstrLog = (_bstr_t) vt.bstrVal;
-        //    VariantClear (&vt);
-        //    ppObjArrayi->Get(L"Transport", 0, &vt, NULL, NULL);
-        //    bstrLog += (_bstr_t) _T(" was unbound from ") + (_bstr_t) vt.bstrVal;
-        //    displayDlg.LogEvent (bstrLog);
-        //}
-        //else if (!wcscmp (vtClass.bstrVal, L"MSNdis_StatusLinkSpeedChange"))
-        //{
-        //    IWbemClassObject* pWMIObj=NULL;
-        //    bstrLog = (_bstr_t) _T("Link speed change ") + (_bstr_t) vt.bstrVal;
-        //    VariantClear (&vt);
-        //    ppObjArrayi->Get (L"NdisStatusLinkSpeedChange", 0, &vt, NULL, NULL);
-        //    if SUCCEEDED (vt.punkVal->QueryInterface (IID_IWbemClassObject, (void**)&pWMIObj))
-        //    {
-        //        TCHAR szNum50;
-        //        pWMIObj->Get (L"Inbound", 0, &vt2, NULL, NULL);
-        //        _stprintf (szNum, _T(" Inbound = %u "), vt2.lVal);
-        //        bstrLog += (_bstr_t) szNum;
-        //        VariantClear (&vt2);
-        //        pWMIObj->Get (L"Outbound", 0, &vt2, NULL, NULL);
-        //        _stprintf (szNum, _T(" Outbound = %u "), vt2.lVal);
-        //        bstrLog += (_bstr_t) szNum;
-        //        VariantClear (&vt2);
-        //        pWMIObj->Release ();
-        //        pWMIObj = NULL;
-        //    }
-        //    displayDlg.LogEvent (bstrLog);
-        //}
-
-        VariantClear (&vtClass);
-        VariantClear (&vt);
-    }
-    return WBEM_NO_ERROR;
-}
-
-
-// Misc. status codes sent by sink.
-HRESULT 
-WmiSink::SetStatus(long lFlags, HRESULT hResult, BSTR strParam, IWbemClassObject __RPC_FAR *pObjParam)
-{
-    lFlags;
-    hResult;
-    strParam;
-    pObjParam;
-    return WBEM_NO_ERROR;
-}

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/win/WmiSink.h Deleted

@@ -1,49 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef WMISINK_WIN_H
-#define WMISINK_WIN_H
-
-#include "wbemcli.h"
-
-// Sink object for WMI NDIS notifications
-class WmiSink : public IWbemObjectSink
-{
-    UINT m_cRef;
-
-public:
-    WmiSink(class NdisEvents *callback);
-    ~WmiSink();
-
-    // IUnknown members
-    STDMETHODIMP         QueryInterface(REFIID, LPVOID *);
-    STDMETHODIMP_(ULONG) AddRef(void);
-    STDMETHODIMP_(ULONG) Release(void);
-
-    // IWbemObjectSink
-    STDMETHODIMP Indicate(long, IWbemClassObject**);
-    STDMETHODIMP SetStatus(long, HRESULT, BSTR, IWbemClassObject *);
-
-    void disconnect();
-
-private:
-    class NdisEvents *m_callback;
-};
-
-#endif
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/ws.cpp Deleted

@@ -1,237 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd.
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "ws.h"
-#include "../core/misc.h"
-#include "NetworkAccessManager.h"
-#include <QCoreApplication>
-#include <QDomDocument>
-#include <QDomElement>
-#include <QLocale>
-#include <QStringList>
-#include <QUrl>
-#include <QThread>
-#include <QMutex>
-
-static QMap< QThread*, QNetworkAccessManager* > threadNamHash;
-static QSet< QThread* > ourNamSet;
-static QMutex namAccessMutex;
-
-QString
-lastfm::ws::host()
-{
-    QStringList const args = QCoreApplication::arguments();
-    if (args.contains( "--debug"))
-        return "ws.staging.audioscrobbler.com";
-
-    int const n = args.indexOf( "--host" );
-    if (n != -1 && args.count() > n+1)
-        return argsn+1;
-
-    return LASTFM_WS_HOSTNAME;
-}
-
-static QUrl baseUrl()
-{
-    QUrl url;
-    url.setScheme( "http" );
-    url.setHost( lastfm::ws::host() );
-    url.setEncodedPath( "/2.0/" );
-    return url;
-}
-
-static QString iso639()
-{
-    return QLocale().name().left( 2 ).toLower();
-}
-
-void autograph( QMap<QString, QString>& params )
-{
-    params"api_key" = lastfm::ws::ApiKey;
-    params"lang" = iso639();
-}
-
-static void sign( QMap<QString, QString>& params, bool sk = true )
-{
-    autograph( params );
-    // it's allowed for sk to be null if we this is an auth call for instance
-    if (sk && lastfm::ws::SessionKey.size())
-        params"sk" = lastfm::ws::SessionKey;
-
-    QString s;
-    QMapIterator<QString, QString> i( params );
-    while (i.hasNext()) {
-        i.next();
-        s += i.key() + i.value();
-    }
-    s += lastfm::ws::SharedSecret;
-
-    params"api_sig" = lastfm::md5( s.toUtf8() );
-}
-
-
-QUrl
-lastfm::ws::url( QMap<QString, QString> params )
-{
-    sign( params );
-    QUrl url = ::baseUrl();
-    // Qt setQueryItems doesn't encode a bunch of stuff, so we do it manually
-    QMapIterator<QString, QString> i( params );
-    while (i.hasNext()) {
-        i.next();
-        QByteArray const key = QUrl::toPercentEncoding( i.key() );
-        QByteArray const value = QUrl::toPercentEncoding( i.value() );
-        url.addEncodedQueryItem( key, value );
-    }
-
-    return url;
-}
-
-
-QNetworkReply*
-lastfm::ws::get( QMap<QString, QString> params )
-{
-    return nam()->get( QNetworkRequest( url( params ) ) );
-}
-
-
-QNetworkReply*
-lastfm::ws::post( QMap<QString, QString> params, bool sk )
-{
-    sign( params, sk );
-    QByteArray query;
-    QMapIterator<QString, QString> i( params );
-    while (i.hasNext()) {
-        i.next();
-        query += QUrl::toPercentEncoding( i.key() )
-               + '='
-               + QUrl::toPercentEncoding( i.value() )
-               + '&';
-    }
-
-    QNetworkRequest req( baseUrl() );
-    req.setHeader( QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded" );
-    return nam()->post( req, query );
-}
-
-
-QNetworkAccessManager*
-lastfm::nam()
-{
-    QMutexLocker l( &namAccessMutex );
-    QThread* thread = QThread::currentThread();
-    if ( !threadNamHash.contains( thread ) )
-    {
-        NetworkAccessManager* newNam = new NetworkAccessManager();
-        threadNamHashthread = newNam;
-        ourNamSet.insert( thread );
-        return newNam;
-    }
-    return threadNamHashthread;
-}
-
-
-void
-lastfm::setNetworkAccessManager( QNetworkAccessManager* nam )
-{
-    if ( !nam )
-        return;
-
-    QMutexLocker l( &namAccessMutex );
-    QThread* thread = QThread::currentThread();
-    QNetworkAccessManager* oldNam = 0;
-    if ( threadNamHash.contains( thread ) && ourNamSet.contains( thread ) )
-        oldNam = threadNamHashthread;
-
-    if ( oldNam == nam )
-    {
-        // If we're being passed back our own NAM, assume they want to
-        // ensure that we don't delete it out from under them 
-        ourNamSet.remove( thread );
-        return;
-    }
-
-    threadNamHashthread = nam;
-    ourNamSet.remove( thread );
-
-    if ( oldNam )
-        delete oldNam;
-}
-
-
-/** This useful function, fromHttpDate, comes from QNetworkHeadersPrivate
-  * in qnetworkrequest.cpp.  Qt copyright and license apply. */
-static QDateTime QByteArrayToHttpDate(const QByteArray &value)
-{
-    // HTTP dates have three possible formats:
-    //  RFC 1123/822      -   ddd, dd MMM yyyy hh:mm:ss "GMT"
-    //  RFC 850           -   dddd, dd-MMM-yy hh:mm:ss "GMT"
-    //  ANSI C's asctime  -   ddd MMM d hh:mm:ss yyyy
-    // We only handle them exactly. If they deviate, we bail out.
-
-    int pos = value.indexOf(',');
-    QDateTime dt;
-    if (pos == -1) {
-        // no comma -> asctime(3) format
-        dt = QDateTime::fromString(QString::fromLatin1(value), Qt::TextDate);
-    } else {
-        // eat the weekday, the comma and the space following it
-        QString sansWeekday = QString::fromLatin1(value.constData() + pos + 2);
-
-        QLocale c = QLocale::c();
-        if (pos == 3)
-            // must be RFC 1123 date
-            dt = c.toDateTime(sansWeekday, QLatin1String("dd MMM yyyy hh:mm:ss 'GMT"));
-        else
-            // must be RFC 850 date
-            dt = c.toDateTime(sansWeekday, QLatin1String("dd-MMM-yy hh:mm:ss 'GMT'"));
-    }
-
-    if (dt.isValid())
-        dt.setTimeSpec(Qt::UTC);
-    return dt;
-}
-
-
-QDateTime
-lastfm::ws::expires( QNetworkReply* reply )
-{
-    return QByteArrayToHttpDate( reply->rawHeader( "Expires" ) );
-}
-
-
-namespace lastfm
-{
-    namespace ws
-    {
-        QString SessionKey;
-        QString Username;
-
-        /** we leave these unset as you can't use the webservices without them
-          * so lets make the programmer aware of it during testing by crashing */
-        const char* SharedSecret;
-        const char* ApiKey;
-
-        /** if this is found set to "" we conjure ourselves a suitable one */
-        const char* UserAgent = 0;
-    }
-}
-
-
-QDebug operator<<( QDebug, lastfm::ws::Error );

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/src/ws/ws.h Deleted

@@ -1,149 +0,0 @@
-/*
-   Copyright 2009 Last.fm Ltd. 
-      - Primarily authored by Max Howell, Jono Cole and Doug Mansell
-
-   This file is part of liblastfm.
-
-   liblastfm 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.
-
-   liblastfm 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 liblastfm.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef LASTFM_WS_H
-#define LASTFM_WS_H
-
-#include <lastfm/global.h>
-#include <QDateTime>
-#include <QMap>
-#include <QNetworkReply>
-#include <stdexcept>
-
-#ifdef Q_CC_MSVC
-// ms admits its lousy compiler doesn't care about throw declarations
-#pragma warning( disable : 4290 )
-#endif
-
-
-namespace lastfm
-{
-    /** if you don't set one, we create our own, our own is pretty good
-      * for instance, it auto detects proxy settings on windows and mac
-      * We take ownership of the NAM, do not delete it out from underneath us!
-      * So don't keep any other pointers to this around in case you accidently
-      * call delete on them :P */
-    LASTFM_DLLEXPORT void setNetworkAccessManager( QNetworkAccessManager* nam );
-    LASTFM_DLLEXPORT QNetworkAccessManager* nam();
-
-    namespace ws
-    {
-        /** both of these are provided when you register at http://last.fm/api */
-        LASTFM_DLLEXPORT extern const char* SharedSecret;
-        LASTFM_DLLEXPORT extern const char* ApiKey;
-    
-        /** you need to set this for scrobbling to work (for now)
-          * Also the AuthenticatedUser class uses it */
-        LASTFM_DLLEXPORT extern QString Username;
-
-        /** Some webservices require authentication. See the following
-          * documentation:
-          * http://www.last.fm/api/authentication
-          * http://www.last.fm/api/desktopauth
-          * You have to authenticate and then assign to SessionKey, liblastfm does
-          * not do that for you. Also we do not store this. You should store this!
-          * You only need to authenticate once, and that key lasts forever!
-          */
-        LASTFM_DLLEXPORT extern QString SessionKey;      
-        
-        enum Error
-        {
-            NoError = 1, // because last.fm error numbers start at 2
-
-            /** numbers follow those at http://last.fm/api/ */
-            InvalidService = 2,
-            InvalidMethod,
-            AuthenticationFailed,
-            InvalidFormat,
-            InvalidParameters,
-            InvalidResourceSpecified,
-            OperationFailed,
-            InvalidSessionKey,
-            InvalidApiKey,
-            ServiceOffline,
-            SubscribersOnly,
-
-            Reserved13,
-            Reserved14,
-            Reserved15,
-
-            /** Last.fm sucks. 
-              * There may be an error in networkError(), or this may just be some
-              * internal error completing your request.
-              * Advise the user to try again in a _few_minutes_.
-              * For some cases, you may want to try again yourself, at this point
-              * in the API you will have to. Eventually we will discourage this and
-              * do it for you, as we don't want to strain Last.fm's servers
-              */
-            TryAgainLater = 16,
-
-            Reserved17,
-            Reserved18,
-            Reserved19,
-       
-            NotEnoughContent = 20,
-            NotEnoughMembers,
-            NotEnoughFans,
-            NotEnoughNeighbours,
-
-            /** Last.fm fucked up, or something mangled the response on its way */
-            MalformedResponse = 100,
-
-            /** call QNetworkReply::error() as it's nothing to do with us */
-            UnknownError
-        };
-        
-        LASTFM_DLLEXPORT QString host();
-
-        /** the map needs a method entry, as per http://last.fm/api */
-        LASTFM_DLLEXPORT QUrl url( QMap<QString, QString> );
-        LASTFM_DLLEXPORT QNetworkReply* get( QMap<QString, QString> );
-        /** generates api sig, includes api key, and posts, don't add the api
-          * key yourself as well--it'll break */
-        LASTFM_DLLEXPORT QNetworkReply* post( QMap<QString, QString>, bool sessionKey = true );
-
-
-        class ParseError : public std::runtime_error
-        {
-            Error e;
-            QString m_message;
-        public:
-            explicit ParseError( Error e, QString message )
-                :std::runtime_error("lastfm::ws::Error"), e(e), m_message(message)
-            {}
-            Error enumValue() const { return e; }
-            QString message() const { return m_message; }
-
-            ~ParseError() throw() {;}
-        };
-        
-        /** returns the expiry date of this HTTP response */
-        LASTFM_DLLEXPORT QDateTime expires( QNetworkReply* );
-    }
-}
-
-
-inline QDebug operator<<( QDebug d, QNetworkReply::NetworkError e )
-{
-    return d << lastfm::qMetaEnumString<QNetworkReply>( e, "NetworkError" );
-}
-
-#define LASTFM_WS_HOSTNAME "ws.audioscrobbler.com"
-
-#endif

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/tests Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/tests/TestTrack.h Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/tests/TestUrlBuilder.h Deleted

@@ -1,80 +0,0 @@
-/*
-   This software is in the public domain, furnished "as is", without technical 
-   support, and with no warranty, express or implied, as to its usefulness for 
-   any purpose.
-*/
-#include <QtTest>
-#include <QtNetwork>
-#include <QEventLoop>
-#include <lastfm/UrlBuilder>
-#include <lastfm/global.h>
-
-static inline int getResponseCode( const QUrl& url )
-{
-    QNetworkAccessManager nam;
-    QNetworkReply* reply = nam.head( QNetworkRequest(url) );
-    
-    QEventLoop loop;
-    loop.connect( reply, SIGNAL(finished()), SLOT(quit()) );
-    loop.exec();
-
-    int const code = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute ).toInt();
-
-    if (reply->error() != QNetworkReply::NoError)
-        qDebug() << url << lastfm::qMetaEnumString<QNetworkReply>( reply->error(), "NetworkError" ) << code;
-
-    return code;
-}
-
-
-class TestUrlBuilder : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void encode() /** @author <jono@last.fm> */
-    {
-        QFETCH( QString, input );
-        QFETCH( QString, output );    
-        QCOMPARE( lastfm::UrlBuilder::encode( input ), output.toAscii() );
-    }
-    
-    void encode_data() /** @author <jono@last.fm> */
-    {
-        QTest::addColumn<QString>("input");
-        QTest::addColumn<QString>("output");
-
-        QTest::newRow( "ascii" ) << "Metallica" << "Metallica";
-        QTest::newRow( "ascii alphanumeric" ) << "Apollo 440" << "Apollo+440";
-        QTest::newRow( "ascii with symbols" ) << "some track original version" << "some+track+%5Boriginal+version%5D";
-        QTest::newRow( "ascii with last.fm-special symbols" ) << "Survivalism Revision #1" << "Survivalism%2B%255BRevision%2B%25231%255D";
-    }
-    
-    void no404() /** @author <max@last.fm> */
-    {
-        QFETCH( QString, artist );
-        QFETCH( QString, track );
-
-        QUrl url = lastfm::UrlBuilder( "music" ).slash( artist ).slash( "_" ).slash( track ).url();
-
-        QCOMPARE( getResponseCode( url ), 200 );
-    }
-    
-    void no404_data() /** @author <max@last.fm> */
-    {
-        QTest::addColumn<QString>("artist");
-        QTest::addColumn<QString>("track");
-
-        #define NEW_ROW( x, y ) QTest::newRow( x " - " y ) << x << y;
-        NEW_ROW( "Air", "Radio #1" );
-        NEW_ROW( "Pink Floyd", "Speak to Me / Breathe" );
-        NEW_ROW( "Radiohead", "2 + 2 = 5" );
-        NEW_ROW( "Above & Beyond", "World On Fire (Maor Levi Remix)" );
-        #undef NEW_ROW
-    }
-    
-    void test404() /** @author <max@last.fm> */
-    {
-        QCOMPARE( getResponseCode( QUrl("http://www.last.fm/404") ), 404 );
-    }
-};

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/tests/main.cpp Deleted

tomahawk-0.4.2.tar.bz2/thirdparty/liblastfm2/tests/tests.pro Deleted

tomahawk-0.5.5.tar.bz2/.tx Added

tomahawk-0.5.5.tar.bz2/.tx/config Added

tomahawk-0.4.2.tar.bz2/CMakeLists.txt -> tomahawk-0.5.5.tar.bz2/CMakeLists.txt Changed

@@ -1,10 +1,7 @@
 PROJECT( tomahawk )
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.6 )
 SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
-
-IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
-  CMAKE_POLICY(SET CMP0017 NEW)
-ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
+CMAKE_POLICY(SET CMP0017 NEW)
 
 ###
 ### Tomahawk application info
@@ -15,8 +12,8 @@
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
 
 SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 4 )
-SET( TOMAHAWK_VERSION_PATCH 2 )
+SET( TOMAHAWK_VERSION_MINOR 5 )
+SET( TOMAHAWK_VERSION_PATCH 5 )
 
 #SET( TOMAHAWK_VERSION_RC 0 )
 
@@ -26,8 +23,25 @@
 # build options
 option(BUILD_GUI "Build Tomahawk with GUI" ON)
 option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
+option(WITH_BREAKPAD "Build with breakpad integration" ON)
+option(WITH_CRASHREPORTER "Build with CrashReporter" ON)
+option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON)
 option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
 
+IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )
+    message(STATUS "Build of breakpad library disabled on this platform.")
+    SET(WITH_BREAKPAD OFF)
+    SET(WITH_CRASHREPORTER OFF)
+ENDIF()
+
+# add definitions based on build options
+IF( WITH_BREAKPAD )
+    message(STATUS "Build with support for breakpad.")
+    IF( CMAKE_COMPILER_IS_GNUCXX )
+        ADD_DEFINITIONS( -DSTDC_HEADERS -std=gnu++98 )
+    ENDIF()
+ENDIF()
+
 # generate version string
 
 # base string used in release and unstable builds
@@ -40,7 +54,7 @@
 IF( NOT BUILD_RELEASE )
     INCLUDE( CMakeDateStamp )
     SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" )
-    IF( ${TOMAHAWK_VERSION_DATE} GREATER 0)
+    IF( TOMAHAWK_VERSION_DATE GREATER 0)
         SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} )
     ENDIF()
 
@@ -58,7 +72,7 @@
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 
 # make predefined install dirs available everywhere
-INCLUDE(GNUInstallDirs)
+INCLUDE( GNUInstallDirs )
 
 # installer creation
 INCLUDE( TomahawkCPack.cmake )
@@ -90,8 +104,8 @@
     message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
 endif()
 
-macro_optional_find_package(LibEchonest 1.1.10)
-macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.1.10 is needed for dynamic playlists and the infosystem")
+macro_optional_find_package(Echonest 2.0.0)
+macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.0.0 is needed for dynamic playlists and the infosystem")
 
 macro_optional_find_package(CLucene 0.9.23)
 macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
@@ -110,36 +124,20 @@
 macro_optional_find_package(QCA2)
 macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions required for Grooveshark resolver" "http://delta.affinix.com/qca/" FALSE "" "")
 
-macro_optional_find_package(LibAttica)
-macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" FALSE "" "")
+macro_optional_find_package(LibAttica 0.4.0)
+macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" TRUE "" "")
 
 macro_optional_find_package(QuaZip)
-macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" FALSE "" "")
+macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" TRUE "" "")
 
-macro_optional_find_package(Jreen)
-macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
+macro_optional_find_package(Jreen 1.0.5)
+macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP Library" "http://qutim.org/jreen / https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
 
 macro_optional_find_package(QTweetLib)
 macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin.\n")
 
-
-IF( NOT QuaZip_FOUND )
-    add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
-    SET( QuaZip_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk/thirdparty/quazip )
-    SET( QuaZip_LIBRARY quazip )
-    SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
-    SET( QuaZip_FOUND true )
-    macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically. Building internal copy" "http://quazip.sourceforge.net/" FALSE "" "")
-
-    # copy headers to build/quazip so we can use proper includes inside the code
-    FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
-ENDIF()
-
-# required
-#While we distribute our own liblastfm2, don't need to look for it
-#macro_optional_find_package(LibLastFm 0.3.3)
-#macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
-set(LIBLASTFM_FOUND true)
+macro_optional_find_package(LibLastFm 1.0.0)
+macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/eartle/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
 
 #### submodules start
 # automatically init submodules here, don't delete this code we may add submodules again
@@ -162,8 +160,8 @@
 ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )
 
 # we need pthreads too
-#macro_optional_find_package(Threads)
-#macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
+macro_optional_find_package(Threads)
+macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
 
 macro_optional_find_package(KDE4)
 macro_optional_find_package(KDE4Installed)
@@ -213,9 +211,3 @@
 SET( TOMAHAWK_LIBRARIES tomahawklib )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( admin )
-
-IF( BUILD_GUI )
-    IF( NOT DISABLE_CRASHREPORTER )
-        ADD_SUBDIRECTORY( src/breakpad/CrashReporter )
-    ENDIF()
-ENDIF()

tomahawk-0.5.5.tar.bz2/CMakeModules/AddTomahawkPlugin.cmake Added

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

tomahawk-0.5.5.tar.bz2/CMakeModules/FindEchonest.cmake Added

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

tomahawk-0.4.2.tar.bz2/CMakeModules/FindJreen.cmake -> tomahawk-0.5.5.tar.bz2/CMakeModules/FindJreen.cmake Changed

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

tomahawk-0.4.2.tar.bz2/CMakeModules/FindLibLastFm.cmake -> tomahawk-0.5.5.tar.bz2/CMakeModules/FindLibLastFm.cmake Changed

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

tomahawk-0.4.2.tar.bz2/CMakeModules/FindQCA2.cmake -> tomahawk-0.5.5.tar.bz2/CMakeModules/FindQCA2.cmake Changed

tomahawk-0.4.2.tar.bz2/CMakeModules/NSIS.template.in -> tomahawk-0.5.5.tar.bz2/CMakeModules/NSIS.template.in Changed

@@ -278,9 +278,9 @@
 
         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"
+        ; plugins
+        File "${INSTALL_PATH}\lib\libtomahawk_*_*.dll"
    !endif
    !ifndef INSTALL_PATH
         ;Main executable.
@@ -292,8 +292,8 @@
         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"
+        ; plugins
+        File "${BUILD_PATH}\libtomahawk_*_*.dll"
    !endif
 
    ;License & release notes.
@@ -349,6 +349,7 @@
    File "${MING_BIN}\zlib1.dll"
 
    File "${MING_BIN}\libechonest.dll"
+   File "${MING_BIN}\liblastfm.dll"
    File "${MING_BIN}\libQTweetLib.dll"
    File "${MING_BIN}\libquazip.dll"

tomahawk-0.4.2.tar.bz2/ChangeLog -> tomahawk-0.5.5.tar.bz2/ChangeLog Changed

@@ -1,4 +1,68 @@
+Version 0.5.5:
+    * Changed the Spotify config dialog to indicate when the user
+      is logged in.
+    * Fixed bug where the wrong avatar could be shown for a user.
+    * Fixed shortcuts not working in the global search field on OS X.
+    * Fixed The Echo Nest stations.
+    * Code-signed executable on OS X for GateKeeper.
+    * Fixed logging in to Spotify when pressing return in the config dialog.
+    * Fixed queue not auto-collapsing when playing the last track.
+    * Fixed bug where album listings would fail to show up.
+    * Improved stability.
+    * Fixed bug where it was not possible to drop a mixture of resolved
+      and unresolved tracks onto a playlist.
+
+Version 0.5.4:
+    * Improved stability.
+    * Added support for Spotify album lookups.
+    * Fixed not always updating the database index after scanning.
+    * Fixed connection issue between Tomahawk peers.
+
+Version 0.5.3:
+    * Fixed broken artist names when importing Last.fm playback history.
+    * Fixed crash when filtering collections.
+
+Version 0.5.2:
+    * Fixed a crash when invalid results are coming back from a resolver or
+      are found in a playlist.
+
+Version 0.5.1:
+    * Fixed a few issues with automatic downloading and launching
+      of the Spotify account.
+    * Show an error message when not able to resolve a requested song.
+    * Fixed a few crash and freeze issues.
+    * Better detection of local networks for the Local Network connector.
+    * Don't prompt for access permission for your own accounts.
+    * (OS X) Fixed not being able to connect to Last.fm.
+
+Version 0.5.0:
+    * SOCKS5 proxy support improvements for resolvers and more.
+    * Initial Access Control support, allowing users to define who is able to
+      access and stream from their collection.
+    * Priortize resolution of a track on double-click.
+    * Spotify Resolver can now be easily installed on-demand from the settings.
+    * You can now sync selected playlists (and updates) with Spotify.
+    * Support .aiff (AIFF mimetype) files.
+    * Cleaned up Diagnostics window.
+    * You can tell Tomahawk to stop playback after a certain track finished.
+    * Double-clicking a playlist name (in the sidebar) will start the playlist.
+    * You can now import your entire Last.fm playback history into Tomahawk.
+    * Fixed sorting of related artists.
+    * Support for multimedia keys (Play, Pause, Next etc.) on Windows & Linux.
+    * When listening privately scrobbling to Last.fm and Adium is now disabled.
+    * Added a toolbar with page back / forward buttons and the global search.
+    * New grid-like view with direct playback controls.
+    * You can now browse new releases (by genre).
+    * Added social sharing widget, which allows you to tweet about a song.
+    * Added a track page showing a song's similar tracks and statistics.
+    * Separate Loved Tracks and Recently Played views per source.
+    * Combine an artist's albums into a single aggregated view.
+    * Added translations for Arabic, French, Bulgarian, Spanish and more.
+    * Fixed XSPF auto-updating.
+    * New Tomahawk logo and icon.
+
 Version 0.4.2:
+    * Fix ZeroConf protocol showing IP addresses instead of host names.
     * Updated translations for various languages.
     * Resuming playback restores correct volume settings.
     * Reduced CPU usage during playback.
@@ -20,12 +84,12 @@
     * Fixed icons not appearing in resolvers list.
     * Fixed various UI glitches and stray error messages in stations.
     * Fixed bug where album page would resolve bottom-to-top.
-    * Fixed bug where Footnotes would not update when changing selected album in Album View.
+    * Fixed bug where Footnotes would not update when changing selected album.
     * Fixed dragging albums and artists from charts, album, and artist views.
     * Fixed bug where filter text would be one step behind filter value.
     * Fixed bug where resolvers would enable themselves after auto-updating.
     * Fixed occasional crash when dropping tracks onto New Station item.
-    * Added jump-to-current-track support for search results page. 
+    * Added jump-to-current-track support for search results page.
     * Fixed non-resolving tracks when dragging from album view.
     * Fixed fetching album covers for albums with special characters.
     * Show errors and continue gracefully when resolved audio is not available.
@@ -50,7 +114,7 @@
     * Fixed out of sync Show/Hide menu items on OS X when hidden with cmd-h.
     * Fixed /Volumes directory not showing up on OS X.
     * Fixed startup crash on OS X.
- 
+
 Version 0.3.3:
     * Automatically load Super Collection tracks when no official release
       information is available.
@@ -62,7 +126,7 @@
     * Fixed dupe menu entry appearing on OS X.
     * Fixed invisible sidebar items on Linux.
 
-Version 0.3.2: 
+Version 0.3.2:
     * Improved syncing process, it's faster and more reliable now.
     * Fixed UPnP issues.
     * Fixed not updating collections and views after a collection changes.
@@ -116,7 +180,7 @@
     * Added YouTube resolver.
     * Fixed bug where going offline then online would not re-connect to many
       peers.
-    * Added support for auto-updating live XSPF playlists. 
+    * Added support for auto-updating live XSPF playlists.
     * Don't show an age of 41 years for tracks that have no age information.
     * Show config UI for resolvers that have them as soon as you add them.
     * Add support for Echo Nest Personal Catalogs and User Radio. Synchronize

tomahawk-0.4.2.tar.bz2/README -> tomahawk-0.5.5.tar.bz2/README Changed

@@ -13,11 +13,11 @@
 
 Detailed building instructions for Ubuntu
 -----------------------------------------
- See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_Ubuntu_Binary_on_Maverick_(10.10)
+ See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_Ubuntu_Binary_on_Precise_(12.04)
 
 Detailed building instructions for OS X
 ---------------------------------------
- See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_OS_X_Application_Bundle_on_Snow_Leopard_(10.6)
+ See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_OS_X_Application_Bundle_on_Snow_Leopard_(10.6)_and_Lion_(10.7)
 
 Doxygen Documentation
 ---------------------
@@ -27,25 +27,25 @@
 Dependencies
 ------------
 
-  CMake 2.8.0 - http://www.cmake.org/
+  CMake 2.8.6 - http://www.cmake.org/
   Qt 4.7.0 - http://qt.nokia.com/
   QJson 0.7.1 - http://qjson.sourceforge.net/
   SQLite 3.6.22 - http://www.sqlite.org/
   TagLib 1.6.2 - http://developer.kde.org/~wheeler/taglib.html
   Boost 1.3 - http://www.boost.org/
   CLucene 0.9.23 (0.9.21 will fail) - http://clucene.sourceforge.net/download.shtml
-  libechonest 1.2.0 - http://projects.kde.org/projects/playground/libs/libechonest/
+  libechonest 2.0.0 - http://projects.kde.org/projects/playground/libs/libechonest/
+  Attica 0.4.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
+  QuaZip 0.4.3 - http://quazip.sourceforge.net/
 
  The following dependencies are optional, but recommended:
 
-  Attica 0.2.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
-  QuaZip 0.4.3 - http://quazip.sourceforge.net/
-  Jreen 1.0.3 - https://github.com/euroelessar/jreen
+  Jreen 1.0.5 - http://qutim.org/jreen / https://github.com/euroelessar/jreen
   QTweetLib 0.5.0 - https://github.com/minimoog/QTweetLib
+  liblastfm 1.0.1 - http://github.com/eartle/liblastfm/
 
  Third party libraries that we ship with our source:
 
   MiniUPnP 1.6 - http://miniupnp.free.fr/
-  liblastfm 0.4.0 - http://github.com/jonocole/liblastfm/
 
 Enjoy!

tomahawk-0.4.2.tar.bz2/admin/mac/build-release-osx.sh -> tomahawk-0.5.5.tar.bz2/admin/mac/build-release-osx.sh Changed

tomahawk-0.4.2.tar.bz2/admin/mac/macdeploy.py -> tomahawk-0.5.5.tar.bz2/admin/mac/macdeploy.py Changed

@@ -1,6 +1,6 @@
 #!/usr/bin/python
-
-#  This file is part of Clementine.
+#  This file is part of Tomahawk. 
+#  It was inspired in large part by the macdeploy script in Clementine.
 #
 #  Clementine is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 import os
 import re
 import subprocess
+import commands
 import sys
 
 FRAMEWORK_SEARCH_PATH=
@@ -27,161 +28,160 @@
 
 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',
+  'libaccess_attachment_plugin.dylib',
+  #'libaccess_avio_plugin.dylib',
+  #'libaccess_fake_plugin.dylib',
+  'libaccess_ftp_plugin.dylib',
+  'libaccess_http_plugin.dylib',
+  'libaccess_imem_plugin.dylib',
+  #'libaccess_mmap_plugin.dylib',
+  'libaccess_mms_plugin.dylib',
+  'libaccess_realrtsp_plugin.dylib',
+  'libaccess_tcp_plugin.dylib',
+  'libaccess_udp_plugin.dylib',
+  'libcdda_plugin.dylib',
+  'libfilesystem_plugin.dylib',
+  'libqtcapture_plugin.dylib',
+  'librtp_plugin.dylib',
+  'libzip_plugin.dylib',
+  'libaccess_output_dummy_plugin.dylib',
+  'libaccess_output_file_plugin.dylib',
+  'libaccess_output_http_plugin.dylib',
+  'libaccess_output_shout_plugin.dylib',
+  'libaccess_output_udp_plugin.dylib',
+  'liba52tofloat32_plugin.dylib',
+  'liba52tospdif_plugin.dylib',
+  'libaudio_format_plugin.dylib',
+  'libaudiobargraph_a_plugin.dylib',
+  'libchorus_flanger_plugin.dylib',
+  'libconverter_fixed_plugin.dylib',
+  'libdolby_surround_decoder_plugin.dylib',
+  'libdtstofloat32_plugin.dylib',
+  'libdtstospdif_plugin.dylib',
+  'libequalizer_plugin.dylib',
+  'libheadphone_channel_mixer_plugin.dylib',
+  'libmono_plugin.dylib',
+  'libmpgatofixed32_plugin.dylib',
+  'libnormvol_plugin.dylib',
+  'libparam_eq_plugin.dylib',
+  'libscaletempo_plugin.dylib',
+  'libsimple_channel_mixer_plugin.dylib',
+  'libspatializer_plugin.dylib',
+  'libtrivial_channel_mixer_plugin.dylib',
+  'libugly_resampler_plugin.dylib',
+  'libfloat32_mixer_plugin.dylib',
+  #'libspdif_mixer_plugin.dylib',
+  #'libtrivial_mixer_plugin.dylib',
+  'libaout_file_plugin.dylib',
+  'libauhal_plugin.dylib',
+  'liba52_plugin.dylib',
+  'libadpcm_plugin.dylib',
+  'libaes3_plugin.dylib',
+  'libaraw_plugin.dylib',
+  'libavcodec_plugin.dylib',
+  'libcc_plugin.dylib',
+  'libcdg_plugin.dylib',
+  'libdts_plugin.dylib',
+  'libfaad_plugin.dylib',
+  #'libfake_plugin.dylib',
+  'libflac_plugin.dylib',
+  'libfluidsynth_plugin.dylib',
+  #'libinvmem_plugin.dylib',
+  'liblpcm_plugin.dylib',
+  'libmpeg_audio_plugin.dylib',
+  'libpng_plugin.dylib',
+  'librawvideo_plugin.dylib',
+  'libspeex_plugin.dylib',
+  'libspudec_plugin.dylib',
+  'libtheora_plugin.dylib',
+  'libtwolame_plugin.dylib',
+  'libvorbis_plugin.dylib',
+  'libgestures_plugin.dylib',
+  'libhotkeys_plugin.dylib',
+  'libmotion_plugin.dylib',
+  'libnetsync_plugin.dylib',
+  #'libsignals_plugin.dylib',
+  'libaiff_plugin.dylib',
+  'libasf_plugin.dylib',
+  'libau_plugin.dylib',
+  #'libavformat_plugin.dylib',
+  'libavi_plugin.dylib',
+  'libdemux_cdg_plugin.dylib',
+  'libdemuxdump_plugin.dylib',
+  'libdirac_plugin.dylib',
+  'libes_plugin.dylib',
+  'libflacsys_plugin.dylib',
+  'liblive555_plugin.dylib',
+  'libmkv_plugin.dylib',
+  'libmod_plugin.dylib',
+  'libmp4_plugin.dylib',
+  'libmpc_plugin.dylib',
+  'libmpgv_plugin.dylib',
+  'libnsc_plugin.dylib',
+  'libnsv_plugin.dylib',
+  'libnuv_plugin.dylib',
+  'libogg_plugin.dylib',
+  'libplaylist_plugin.dylib',
+  'libps_plugin.dylib',
+  'libpva_plugin.dylib',
+  'librawaud_plugin.dylib',
+  'librawdv_plugin.dylib',
+  'librawvid_plugin.dylib',
+  'libreal_plugin.dylib',
+  'libsmf_plugin.dylib',
+  'libts_plugin.dylib',
+  'libtta_plugin.dylib',
+  'libty_plugin.dylib',
+  'libvc1_plugin.dylib',
+  'libvoc_plugin.dylib',
+  'libwav_plugin.dylib',
+  'libxa_plugin.dylib',
+  'libfolder_plugin.dylib',
+  'libtaglib_plugin.dylib',
+  'libaudioscrobbler_plugin.dylib',
+  'libdummy_plugin.dylib',
+  'libexport_plugin.dylib',
+  'libfreetype_plugin.dylib',
+  'libgnutls_plugin.dylib',
+  'liblogger_plugin.dylib',
+  'liblua_plugin.dylib',
+  'libosd_parser_plugin.dylib',
+  'libquartztext_plugin.dylib',
+  'libstats_plugin.dylib',
+  'libvod_rtsp_plugin.dylib',
+  'libxml_plugin.dylib',
+  #'libxtag_plugin.dylib',
+  'libi420_rgb_mmx_plugin.dylib',
+  'libi420_yuy2_mmx_plugin.dylib',
+  'libi422_yuy2_mmx_plugin.dylib',
+  'libmemcpymmx_plugin.dylib',
+  'libmemcpymmxext_plugin.dylib',
+  'libmux_asf_plugin.dylib',
+  'libmux_avi_plugin.dylib',
+  'libmux_dummy_plugin.dylib',
+  'libmux_mp4_plugin.dylib',
+  'libmux_mpjpeg_plugin.dylib',
+  'libmux_ogg_plugin.dylib',
+  'libmux_ps_plugin.dylib',
+  'libmux_ts_plugin.dylib',
+  'libmux_wav_plugin.dylib',
+  'libpacketizer_copy_plugin.dylib',
+  'libpacketizer_dirac_plugin.dylib',
+  'libpacketizer_flac_plugin.dylib',
+  'libpacketizer_h264_plugin.dylib',
+  'libpacketizer_mlp_plugin.dylib',
+  'libpacketizer_mpeg4audio_plugin.dylib',
+  'libpacketizer_mpeg4video_plugin.dylib',
+  'libpacketizer_mpegvideo_plugin.dylib',
+  'libpacketizer_vc1_plugin.dylib',
+  'libi420_rgb_sse2_plugin.dylib',
+  'libi420_yuy2_sse2_plugin.dylib',
+  'libi422_yuy2_sse2_plugin.dylib',
+  'libdecomp_plugin.dylib',
+  'libstream_filter_rar_plugin.dylib',
+  'libstream_filter_record_plugin.dylib',
+  'libvisual_plugin.dylib',
 
 
 VLC_SEARCH_PATH=
@@ -199,15 +199,24 @@
 
 
 TOMAHAWK_PLUGINS = 
-  'libtomahawk_sipjabber.dylib',
-  'libtomahawk_sipgoogle.dylib',
-  'libtomahawk_siptwitter.dylib',
-  'libtomahawk_sipzeroconf.dylib',
-  'libtomahawk_qtweetlib.dylib',
+  'libtomahawk_account_xmpp.so',
+  'libtomahawk_account_google.so',
+  'libtomahawk_account_twitter.so',
+  'libtomahawk_account_zeroconf.so',
+  'libtomahawk_infoplugin_adium.so',
+  'libtomahawk_infoplugin_charts.so',
+  'libtomahawk_infoplugin_discogs.so',
+  'libtomahawk_infoplugin_echonest.so',
+  'libtomahawk_infoplugin_hypem.so',
+  'libtomahawk_infoplugin_musicbrainz.so',
+  'libtomahawk_infoplugin_musixmatch.so',
+  'libtomahawk_infoplugin_newreleases.so',
+  'libtomahawk_infoplugin_rovi.so',
+  'libtomahawk_infoplugin_spotify.so',
 
 
 QT_PLUGINS_SEARCH_PATH=
-    '/usr/local/Cellar/qt/4.7.4/plugins',
+    '/usr/local/Cellar/qt/4.8.2/plugins',
 
 
 
@@ -250,7 +259,7 @@
 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')
+plugins_dir = os.path.join(bundle_dir, 'Contents', 'qt-plugins')
 binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name)
 
 fixed_libraries = 
@@ -364,8 +373,7 @@
   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))
+  new_path = os.path.join(plugins_dir, subdir, os.path.basename(abs_path))
   args = 'mkdir', '-p', os.path.dirname(new_path)
   commands.append(args)
   args = 'ditto', '--arch=i386', '--arch=x86_64', abs_path, new_path
@@ -491,17 +499,12 @@
 FixBinary(binary)
 
 for plugin in VLC_PLUGINS:
-  FixVLCPlugin(FindVLCPlugin(plugin), '../Frameworks/vlc/plugins')
+  FixVLCPlugin(FindVLCPlugin(plugin), '../plugins')
 
 for plugin in TOMAHAWK_PLUGINS:
   FixPlugin(plugin, '../MacOS')
 
 try:
-  FixPlugin('spotify_tomahawkresolver', '../MacOS')
-except:
-  print 'Failed to find spotify resolver'
-  
-try:
   FixPlugin('tomahawk_crash_reporter', '../MacOS')
 except:
   print 'Failed to find tomahawk_crash_reporter'

tomahawk-0.4.2.tar.bz2/admin/mac/qt.conf -> tomahawk-0.5.5.tar.bz2/admin/mac/qt.conf Changed

tomahawk-0.4.2.tar.bz2/admin/win/nsi/page_header.bmp -> tomahawk-0.5.5.tar.bz2/admin/win/nsi/page_header.bmp Changed

tomahawk-0.4.2.tar.bz2/admin/win/nsi/welcome.bmp -> tomahawk-0.5.5.tar.bz2/admin/win/nsi/welcome.bmp Changed

tomahawk-0.5.5.tar.bz2/data/icons/tomahawk-icon-128x128-grayscale.png Added

tomahawk-0.4.2.tar.bz2/data/icons/tomahawk-icon-128x128.png -> tomahawk-0.5.5.tar.bz2/data/icons/tomahawk-icon-128x128.png Changed

tomahawk-0.4.2.tar.bz2/data/icons/tomahawk-icon-16x16.png -> tomahawk-0.5.5.tar.bz2/data/icons/tomahawk-icon-16x16.png Changed

tomahawk-0.4.2.tar.bz2/data/icons/tomahawk-icon-256x256.png -> tomahawk-0.5.5.tar.bz2/data/icons/tomahawk-icon-256x256.png Changed

tomahawk-0.4.2.tar.bz2/data/icons/tomahawk-icon-32x32.png -> tomahawk-0.5.5.tar.bz2/data/icons/tomahawk-icon-32x32.png Changed

tomahawk-0.4.2.tar.bz2/data/icons/tomahawk-icon-512x512.png -> tomahawk-0.5.5.tar.bz2/data/icons/tomahawk-icon-512x512.png Changed

tomahawk-0.4.2.tar.bz2/data/icons/tomahawk-icon-64x64.png -> tomahawk-0.5.5.tar.bz2/data/icons/tomahawk-icon-64x64.png Changed

tomahawk-0.4.2.tar.bz2/data/icons/tomahawk-icon.svg -> tomahawk-0.5.5.tar.bz2/data/icons/tomahawk-icon.svg Changed

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

tomahawk-0.4.2.tar.bz2/data/images/account-settings.png -> tomahawk-0.5.5.tar.bz2/data/images/account-settings.png Changed

tomahawk-0.4.2.tar.bz2/data/images/add.png -> tomahawk-0.5.5.tar.bz2/data/images/add.png Changed

tomahawk-0.4.2.tar.bz2/data/images/advanced-settings.png -> tomahawk-0.5.5.tar.bz2/data/images/advanced-settings.png Changed

tomahawk-0.4.2.tar.bz2/data/images/album-icon.png -> tomahawk-0.5.5.tar.bz2/data/images/album-icon.png Changed

tomahawk-0.5.5.tar.bz2/data/images/album-placeholder-grid.png Added

tomahawk-0.4.2.tar.bz2/data/images/apply-check.png -> tomahawk-0.5.5.tar.bz2/data/images/apply-check.png Changed

tomahawk-0.4.2.tar.bz2/data/images/artist-icon.png -> tomahawk-0.5.5.tar.bz2/data/images/artist-icon.png Changed

tomahawk-0.5.5.tar.bz2/data/images/artist-placeholder-grid.png Added

tomahawk-0.4.2.tar.bz2/data/images/automatic-playlist.png -> tomahawk-0.5.5.tar.bz2/data/images/automatic-playlist.png Changed

tomahawk-0.4.2.tar.bz2/data/images/charts.png -> tomahawk-0.5.5.tar.bz2/data/images/charts.png Changed

tomahawk-0.5.5.tar.bz2/data/images/collection.png Added

tomahawk-0.4.2.tar.bz2/data/images/dashboard.png -> tomahawk-0.5.5.tar.bz2/data/images/dashboard.png Changed

tomahawk-0.4.2.tar.bz2/data/images/itunes.png -> tomahawk-0.5.5.tar.bz2/data/images/itunes.png Changed

tomahawk-0.5.5.tar.bz2/data/images/jump-link.png Added

tomahawk-0.5.5.tar.bz2/data/images/lastfm-icon.png Added

tomahawk-0.4.2.tar.bz2/data/images/loved_playlist.png -> tomahawk-0.5.5.tar.bz2/data/images/loved_playlist.png Changed

tomahawk-0.4.2.tar.bz2/data/images/music-icon.png -> tomahawk-0.5.5.tar.bz2/data/images/music-icon.png Changed

tomahawk-0.4.2.tar.bz2/data/images/music-settings.png -> tomahawk-0.5.5.tar.bz2/data/images/music-settings.png Changed

tomahawk-0.4.2.tar.bz2/data/images/new-additions.png -> tomahawk-0.5.5.tar.bz2/data/images/new-additions.png Changed

tomahawk-0.5.5.tar.bz2/data/images/new-releases.png Added

tomahawk-0.5.5.tar.bz2/data/images/playlist-header-tiled.png Added

tomahawk-0.4.2.tar.bz2/data/images/playlist-icon.png -> tomahawk-0.5.5.tar.bz2/data/images/playlist-icon.png Changed

tomahawk-0.4.2.tar.bz2/data/images/recently-played.png -> tomahawk-0.5.5.tar.bz2/data/images/recently-played.png Changed

tomahawk-0.5.5.tar.bz2/data/images/scrollbar-horizontal-handle.png Added

tomahawk-0.5.5.tar.bz2/data/images/scrollbar-vertical-handle.png Added

tomahawk-0.4.2.tar.bz2/data/images/search-icon.png -> tomahawk-0.5.5.tar.bz2/data/images/search-icon.png Changed

tomahawk-0.4.2.tar.bz2/data/images/share.png -> tomahawk-0.5.5.tar.bz2/data/images/share.png Changed

tomahawk-0.5.5.tar.bz2/data/images/spotifycore-logo.png Added

tomahawk-0.4.2.tar.bz2/data/images/station.png -> tomahawk-0.5.5.tar.bz2/data/images/station.png Changed

tomahawk-0.4.2.tar.bz2/data/images/supercollection.png -> tomahawk-0.5.5.tar.bz2/data/images/supercollection.png Changed

tomahawk-0.5.5.tar.bz2/data/images/track-icon-sidebar.png Added

tomahawk-0.5.5.tar.bz2/data/images/track-icon.png Added

tomahawk-0.4.2.tar.bz2/data/images/track-placeholder.png -> tomahawk-0.5.5.tar.bz2/data/images/track-placeholder.png Changed

tomahawk-0.4.2.tar.bz2/data/images/user-avatar.png -> tomahawk-0.5.5.tar.bz2/data/images/user-avatar.png Changed

tomahawk-0.5.5.tar.bz2/data/misc Added

tomahawk-0.5.5.tar.bz2/data/misc/tomahawk_pubkey.pem Added

@@ -0,0 +1,20 @@
+-----BEGIN PUBLIC KEY-----
+MIIDOzCCAi0GByqGSM44BAEwggIgAoIBAQDRltnNbKWFroVCsG1nTSdlTDmo7fjl
+tgOuQ0YB2s0a1bcqgQ5YJRE59pFvF/z2pkHEHdyBA6USd9N7/T9lolwNcJoByJpO
+MobUNs04elqZXliriaAdoSb2g6ZpxiedppbbyNP/BlK6o+zpyn0LVYXDI/OwJFzS
+xjGXM+rBEWdUJnogZxV31gF9W3yD1Quz6icBulT9V/Soo6me9Mc60ooKSYj4Zgqd
+3ln8tG90RFnWfbb0nbrITvR3ll6XXLfn081tjhymcXqHcgvaaqcmpKWL6ZWwX1mH
+3t1pImnif/tSSZPG21KGE3FtuQ/+YFo19apQ6U6l8kaSFxqcDLAYzBy9AhUA/QfN
+8WEIvzOEZ9uSWT7lYy64mUkCggEABsUmcs3kwjrmszIAAmPIowA0DBrxWZL03JBV
+bDKT6tNHZaFFlCufVSjiL1EFZjRARC16OWYaDcElUsZYFMcsNIIa8LyDQaq6+SSm
+quhMO5heeJiYPrutDiJzbJr0+HoY77Ll+Q4/cEkl0UAN4Ovp18WKwaq6GpHAvBnv
+71LunLGAKsVb5joXBQ8In6zQkibJhgiBJwzLK90/j0OTiDaaOwM3PsAegORBVlVE
+TAk4AQmawmF8nBGLzTyKXl83J571ku1Mm2JTl16jMYziKARKXYBmkcP1at0YddVK
+WWpAwRKSxOucVJYfV58JqmjZqst8BBeH6esQKr5dklUvvDMaEwOCAQYAAoIBAQCw
+5mo+8/R3S9cNYg9o8JNJGdSbMhSkurILHh9WNElsIC3RNtPcpijmAnWtXTVDhe6w
+77wLj37tUuFGbsu2qPXtZoup35emf9DDshZ5w5UOclPaZ9HYjlC1H64c6d66Rllk
+fY6FRDv9qVfjT84APbvMDrk6csJ5YHxFPDaqeQaFB0nxFiCMVwjEx+ZSvQNK1jJ2
+o2gtuOvSPVSphsMeJ72DDNxO+SRRVnOmWaxg9rlmFuGle6Z+UJ2FItfmPEvhSBMY
+hzndUbC7Wi4sIpBzbm9O5MiPYMv0VmN+0t1156EiC9uR4f7AKH2S94dnQob/YeY0
+jMH+XxU/wzGUCmsOx1lx
+-----END PUBLIC KEY-----

tomahawk-0.4.2.tar.bz2/data/www/auth.html -> tomahawk-0.5.5.tar.bz2/data/www/auth.html Changed

tomahawk-0.4.2.tar.bz2/data/www/auth.na.html -> tomahawk-0.5.5.tar.bz2/data/www/auth.na.html Changed

tomahawk-0.4.2.tar.bz2/data/www/tomahawk_banner_small.png -> tomahawk-0.5.5.tar.bz2/data/www/tomahawk_banner_small.png Changed

tomahawk-0.5.5.tar.bz2/lang/tomahawk_ar.ts Added

@@ -0,0 +1,4052 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.0">
+<context>
+    <name>ACLJobDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation>هل تريد السماح ل%1
+بالربط و التحميل منك؟</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation>السماح بالتحميل</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation>رفض الوصول</translation>
+    </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation>توماهوك يريد منك ان تقرر ان كنت تريد السماح ل%1 بالربط بك.</translation>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>حوار</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
+        <source>Description goes here</source>
+        <translation>أضف الوصف هنا</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
+        <source>Add Account</source>
+        <translation>أضف حساب</translation>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapperDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
+        <source>Online</source>
+        <translation>متصل</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
+        <source>Connecting...</source>
+        <translation>جاري الاتصال...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
+        <source>Offline</source>
+        <translation>غير متصل</translation>
+    </message>
+</context>
+<context>
+    <name>ActionCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
+        <source>&amp;Listen Along</source>
+        <translation>&amp;استمع مع</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
+        <source>Stop &amp;Listening Along</source>
+        <translation>توقيف &amp;الاستماع مع</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
+        <source>&amp;Follow in real-time</source>
+        <translation>&amp;تابع بنفس الوقت</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Privately</source>
+        <translation>&amp;إستمع بخصوصية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Publicly</source>
+        <translation>&amp;إستمع علنا</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
+        <source>&amp;Load Playlist</source>
+        <translation>&amp;تحميل قائمة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
+        <source>&amp;Rename Playlist</source>
+        <translation>&amp;إعادة تسمية قائمة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
+        <source>&amp;Copy Playlist Link</source>
+        <translation>&amp;نسخ رابط قائمة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
+        <source>&amp;Play</source>
+        <translation>&amp;إستمع</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
+        <source>&amp;Stop</source>
+        <translation>&amp;أوقف الإستماع</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
+        <source>&amp;Previous Track</source>
+        <translation>&amp;الأغنية السابقة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
+        <source>&amp;Next Track</source>
+        <translation>&amp;الأغنية التالية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;أخرج</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="31"/>
+        <source>Other Albums by Artist</source>
+        <translation>ألبومات أخرى للفنان</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation>نعتذر, لم نستطيع إيجاد ألبومات أخرى لهذا الفنان!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation>نعتذر، لم نستطيع إيجاد أغاني أخرى لهذا الألبوم!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
+        <source>Other Albums by %1</source>
+        <translation>ألبومات أخرى ل%1</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
+        <source>All albums from %1</source>
+        <translation>جميع الألبومات من %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
+        <source>All albums</source>
+        <translation>جميع الألبومات</translation>
+    </message>
+</context>
+<context>
+    <name>ArtistInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
+        <source>Top Hits</source>
+        <translation>الأكثر شهرة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
+        <source>Related Artists</source>
+        <translation>الفنانين ذات الذوق القريب</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation>فنان</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>ألبومات</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation>غلاف</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation>نعتذر, لم نستطيع إيجاد ألبومات أخرى لهذا الفنان!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation>نعتذر، لم نستطيع إيجاد فنانين!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation>نعتذر، لم نستطيع إيجاد أغاني مشهورة جدا لهذا الفنان!</translation>
+    </message>
+</context>
+<context>
+    <name>AudioControls</name>
+    <message>
+        <location filename="../src/AudioControls.ui" line="75"/>
+        <source>Prev</source>
+        <translation>سابق</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="87"/>
+        <source>Play</source>
+        <translation>إستمع</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="94"/>
+        <source>Pause</source>
+        <translation>تعليق</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="103"/>
+        <source>Next</source>
+        <translation>التالي</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="229"/>
+        <source>Artist</source>
+        <translation>فنان</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="248"/>
+        <source>Album</source>
+        <translation>البوم</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="277"/>
+        <source>Owner</source>
+        <translation>المالك</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation>اجتماعي</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
+        <source>love</source>
+        <translation>أحب</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="383"/>
+        <source>Time</source>
+        <translation>الوقت</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="412"/>
+        <source>Time Left</source>
+        <translation>الوقت المتبقي</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="493"/>
+        <source>Shuffle</source>
+        <translation>خلط</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="506"/>
+        <source>Repeat</source>
+        <translation>إعادة</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="544"/>
+        <source>Low</source>
+        <translation>منخفض</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="576"/>
+        <source>High</source>
+        <translation>مرتفع</translation>
+    </message>
+</context>
+<context>
+    <name>AudioEngine</name>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation>نعتذر، لم نستطيع إيجاد الأغنية &apos;%1&apos; ل%2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation>نعتذر، لم نستطيع إيجاد الفنان &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation>نعتذر، لم نستطيع إيجاد الألبوم &apos;%1&apos; ل%2</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryAddItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation>إنشاء قائمة أغاني جديدة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation>إنشاء إذاعة جديدة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>New Station</source>
+        <translation>إنشاء إذاعة جديدة </translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>%1 Station</source>
+        <translation>إذاعة %1</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
+        <source>Playlists</source>
+        <translation>قائمات الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
+        <source>Stations</source>
+        <translation>الإذاعات</translation>
+    </message>
+</context>
+<context>
+    <name>ClearButton</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
+        <source>Clear</source>
+        <translation>مسح</translation>
+    </message>
+</context>
+<context>
+    <name>ContextWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>InfoBar</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
+        <source>Show Footnotes</source>
+        <translation>أظهر الحاشية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
+        <source>Hide Footnotes</source>
+        <translation>إخفي الحاشية</translation>
+    </message>
+</context>
+<context>
+    <name>CrashReporter</name>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="23"/>
+        <source>Tomahawk Crash Reporter</source>
+        <translation>مراسل توماهوك للانهيار</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;نتأسف!&lt;/span&gt;&amp;nbsp;توماهوك تحطم. يرجى أن تخبرنا عن ذلك! لقد أنشئ توماهوك تقرير عن الخطأ نيابة عنك لمساعدتنا في تحسين استقرار البرنامج في المستقبل. يمكنك إرسال هذا التقرير الأن مباشرة لمطوري توماهوك.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation>أرسل هذا التقرير</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation>لا ترسل</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
+        <source>Abort</source>
+        <translation>الغاء</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
+        <source>You can disable sending crash reports in the configuration dialog.</source>
+        <translation>يمكنك إلغاء إرسال تقارير الانهيار في خيارات الضبط.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
+        <source>Uploaded %L1 of %L2 KB.</source>
+        <translation>تحميل %L1 من أصل %L2 كيلو بايت.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <source>Close</source>
+        <translation>اغلاق</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
+        <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
+        <translation>تم الإرسال! &lt;b&gt;شكرا&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
+        <source>Failed to send crash info.</source>
+        <translation>فشل في إرسال معلومات الانهيار.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseCommand_AllAlbums</name>
+    <message>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
+        <source>Unknown</source>
+        <translation>مجهول</translation>
+    </message>
+</context>
+<context>
+    <name>DelegateConfigWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation>عن</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
+        <source>Delete Account</source>
+        <translation>حذف الحساب</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>عن هذا الحساب</translation>
+    </message>
+</context>
+<context>
+    <name>DiagnosticsDialog</name>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
+        <source>Tomahawk Diagnostics</source>
+        <translation>تشخيص توماهوك</translation>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobalSearchWidget</name>
+    <message>
+        <location filename="../src/SearchBox.ui" line="14"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+</context>
+<context>
+    <name>IndexingJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
+        <source>Indexing database</source>
+        <translation>فهرسة قاعدة البيانات</translation>
+    </message>
+</context>
+<context>
+    <name>InfoBar</name>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>InfoBar</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
+        <source>Filter...</source>
+        <translation>مرشح...</translation>
+    </message>
+</context>
+<context>
+    <name>LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <source>Scrobble tracks to Last.fm</source>
+        <translation>نقل الأغاني إلى Last.fm </translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <source>Username:</source>
+        <translation>اسم المستخدم:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <source>Password:</source>
+        <translation>كلمة السر:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <source>Test Login</source>
+        <translation>اختبار الدخول</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation>استيراد تاريخ إعادة الإستماع</translation>
+    </message>
+</context>
+<context>
+    <name>LastfmContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="67"/>
+        <source>Last.fm</source>
+        <translation>Last.fm</translation>
+    </message>
+</context>
+<context>
+    <name>LatchedStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoadXSPF</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="14"/>
+        <source>Load XSPF</source>
+        <translation>تحميل XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="22"/>
+        <source>Playlist URL</source>
+        <translation>رابط قائمة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="29"/>
+        <source>Enter URL...</source>
+        <translation>أدخل الرابط...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="42"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="51"/>
+        <source>Automatically update</source>
+        <translation>التحديث التلقائي</translation>
+    </message>
+</context>
+<context>
+    <name>LoadXSPFDialog</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>Load XSPF File</source>
+        <translation>تحميل ملف XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>XSPF Files (*.xspf)</source>
+        <translation>XSPF (*.xspf) ملف</translation>
+    </message>
+</context>
+<context>
+    <name>LocalCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Bookmarks</source>
+        <translation>العلامات</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Saved tracks</source>
+        <translation>الأغاني المحفوظة</translation>
+    </message>
+</context>
+<context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation>نعتذر، لم نستطيع إيجاد اي من الأغاني المحبوبة!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation>الأغاني المحبوبة</translation>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation>بطاقات</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation>عنوان:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation>عنوان...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation>فنان:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation>فنان...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation>البوم:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation>البوم...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation>رقم القرص:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation>مدة:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation>00:00</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation>سنة:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation>معدل البت:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation>ملف</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation>إسم الملف:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation>إسم الملف...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation>حجم الملف...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation>حجم الملف...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation>حجم الملف:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation>إلى الوراء</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation>تقدم</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation> - خصائص</translation>
+    </message>
+</context>
+<context>
+    <name>NewPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
+        <source>Enter a title for the new playlist:</source>
+        <translation>أدخل عنوان لقائمة الأغاني الجديدة:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
+        <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
+        <translation>توماهوك يقدم مجموعة متنوعة من الطرق اللتي تساعدك على إنشاء قوائم أغاني و إيجاد الموسيقى اللتي تستمتع إليها!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
+        <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> فقط أدخل النمط أو الإسم و تاماهاوك سيقترح بعض الأغاني لتبدأ بقائمة أغاني جديدة:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
+        <source>&amp;Create Playlist</source>
+        <translation>&amp;إنشاء قائمة أغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
+        <source>Create a new playlist</source>
+        <translation>إنشاء قائمة أغاني جديدة</translation>
+    </message>
+</context>
+<context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>جديد الاصدارات</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation>فنان</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation>عنوان</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation>مؤلف</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation>البوم</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation>اغنية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation>مدة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation>معدل البت</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation>عمر</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation>سنة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>حجم</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation>أصل</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation>علامة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation>إسم</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
+        <source>played %1 by you</source>
+        <translation>سمعت %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
+        <source>played %1 by %2</source>
+        <translation>%2 سمع %1</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistLargeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <source>played %1 by you</source>
+        <translation>سمعت %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
+        <source>played %1 by %2</source>
+        <translation>%2 سمع %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
+        <source>added %1</source>
+        <translation>إضافة %1</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
+        <source>A playlist by %1, created %2</source>
+        <translation>قائمة أغاني من قبل %1, أنشئت %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
+        <source>you</source>
+        <translation>أنت</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
+        <source>All tracks by %1 on album %2</source>
+        <translation>جميع أغاني %1 في البوم %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
+        <source>All tracks by %1</source>
+        <translation>جميع أغاني %1</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistTypeSelectorDlg</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
+        <source>New Playlist</source>
+        <translation>قائمة أغاني جديدة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
+        <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
+        <translation>قائمة أغاني إعتيادية قديمة...سمها ما شئت، أضف بعض الأغاني وانطلق!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
+        <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
+        <translation>لا تعرف تماما ماذا تريد؟ أعط توماهوك بعض الإشارات و دعه يبني لك قائمة أغاني!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
+        <source>Name:</source>
+        <translation>إسم:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
+        <source>New Playlist...</source>
+        <translation>قائمة أغاني جديدة...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
+        <source>Create Manual Playlist</source>
+        <translation>إنشاء قائمة أغاني جديدة يدويا</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
+        <source>Create Automatic Playlist</source>
+        <translation>إنشاء قائمة أغاني جديدة أوتوماتيكية</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation>هذه المجموعة فارغة حاليا.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
+        <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
+        <translation>هذه القائمة فارغة حاليا. أضف لها بعض الأغاني واستمتع للموسيقى!</translation>
+    </message>
+</context>
+<context>
+    <name>ProxyDialog</name>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
+        <source>Proxy Settings</source>
+        <translation>إعدادات الوكيل</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
+        <source>Hostname of proxy server</source>
+        <translation>إسم المضيف لخادم الوسيط</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
+        <source>Host</source>
+        <translation>مضيف
+</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
+        <source>Port</source>
+        <translation>بوابة</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
+        <source>Proxy login</source>
+        <translation>تسجيل دخول الوسيط</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
+        <source>User</source>
+        <translation>المستخدم</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
+        <source>Password</source>
+        <translation>كلمة السر</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
+        <source>Proxy password</source>
+        <translation>كلمة السر للوكيل</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
+        <source>No Proxy Hosts:
+(Overrides system proxy)</source>
+        <translation>لا مضيف للوكيل:
+(تجاوز وكيل النظام)</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
+        <source>localhost *.example.com (space separated)</source>
+        <translation>localhost *.example.com (مفصولة بفراغ)</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
+        <source>Use proxy for DNS lookups?</source>
+        <translation>استخدام ألوكيل لعمليات البحث عن ألدي أن أس (DNS ) ؟</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
+        <source>%n year(s) ago</source>
+        <translation><numerusform>منذ %n سنة</numerusform><numerusform>منذ سنة %n</numerusform><numerusform>منذ سنتين %n</numerusform><numerusform>منذ %n سنوات</numerusform><numerusform>منذ %n سنوات</numerusform><numerusform>منذ %n سنوات</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
+        <source>%n year(s)</source>
+        <translation><numerusform>منذ %n سنة</numerusform><numerusform>منذ سنة %n</numerusform><numerusform>منذ سنتين %n</numerusform><numerusform>منذ %n سنوات</numerusform><numerusform>منذ %n سنوات</numerusform><numerusform>منذ %n سنوات</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
+        <source>%n month(s) ago</source>
+        <translation><numerusform>منذ %n شهر</numerusform><numerusform>منذ شهر %n</numerusform><numerusform>منذ شهرين %n</numerusform><numerusform>منذ %n أشهر</numerusform><numerusform>منذ %n أشهر</numerusform><numerusform>منذ %n أشهر</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
+        <source>%n month(s)</source>
+        <translation><numerusform>منذ %n شهر</numerusform><numerusform>منذ شهر %n</numerusform><numerusform>منذ شهرين %n</numerusform><numerusform>منذ %n أشهر</numerusform><numerusform>منذ %n أشهر</numerusform><numerusform>منذ %n أشهر</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
+        <source>%n week(s) ago</source>
+        <translation><numerusform>منذ %n أسبوع</numerusform><numerusform>منذ أسبوع %n</numerusform><numerusform>منذ أسبوعين %n</numerusform><numerusform>منذ %n أسابيع</numerusform><numerusform>منذ %n أسابيع</numerusform><numerusform>منذ %n أسابيع</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
+        <source>%n week(s)</source>
+        <translation><numerusform>منذ %n أسبوع</numerusform><numerusform>منذ أسبوع %n</numerusform><numerusform>منذ أسبوعين %n</numerusform><numerusform>منذ %n أسابيع</numerusform><numerusform>منذ %n أسابيع</numerusform><numerusform>منذ %n أسابيع</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
+        <source>%n day(s) ago</source>
+        <translation><numerusform>منذ %n يوم</numerusform><numerusform>منذ يوم %n</numerusform><numerusform>منذ يومين %n</numerusform><numerusform>منذ %n أيام</numerusform><numerusform>منذ %n أيام</numerusform><numerusform>منذ %n أيام</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
+        <source>%n day(s)</source>
+        <translation><numerusform>منذ %n يوم</numerusform><numerusform>منذ يوم %n</numerusform><numerusform>منذ يومين %n</numerusform><numerusform>منذ %n أيام</numerusform><numerusform>منذ %n أيام</numerusform><numerusform>منذ %n أيام</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
+        <source>%n hour(s) ago</source>
+        <translation><numerusform>منذ %n ساعة</numerusform><numerusform>منذ ساعة %n</numerusform><numerusform>منذ ساعتين %n</numerusform><numerusform>منذ %n ساعات</numerusform><numerusform>منذ %n ساعات</numerusform><numerusform>منذ %n ساعات</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
+        <source>%n hour(s)</source>
+        <translation><numerusform>منذ %n ساعة</numerusform><numerusform>منذ ساعة %n</numerusform><numerusform>منذ ساعتين %n</numerusform><numerusform>منذ %n ساعات</numerusform><numerusform>منذ %n ساعات</numerusform><numerusform>منذ %n ساعات</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
+        <source>%1 minutes ago</source>
+        <translation>منذ %1 دقائق</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
+        <source>%1 minutes</source>
+        <translation>%1 دقائق</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
+        <source>just now</source>
+        <translation>الآن</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <source>Friend Finders</source>
+        <translation>محرك البحث عن الأصدقاء</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
+        <source>Music Finders</source>
+        <translation>مكتشفي الاغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
+        <source>Status Updaters</source>
+        <translation>أنظمة تحديث حالتك</translation>
+    </message>
+</context>
+<context>
+    <name>QuaZipFilePrivate</name>
+    <message>
+        <location filename="../src/libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation>مشكلة %1 في &quot;ZIP/UNZIP API&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>QueueView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>InfoBar</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation>إفتح قائمة الإنتظار</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation><numerusform>إفتح قائمة الإنتظار - %n بند</numerusform><numerusform>إفتح قائمة الإنتظار - بند %n</numerusform><numerusform>إفتح قائمة الإنتظار - بندين %n</numerusform><numerusform>إفتح قائمة الإنتظار - %n بنود</numerusform><numerusform>إفتح قائمة الإنتظار - %n بنود</numerusform><numerusform>إفتح قائمة الإنتظار - %n بنود</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation>أغلق قائمة الإنتظار</translation>
+    </message>
+</context>
+<context>
+    <name>RelatedArtistsContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
+        <source>Related Artists</source>
+        <translation>الفنانين ذات الذوق القريب</translation>
+    </message>
+</context>
+<context>
+    <name>ResolverConfigDelegate</name>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
+        <source>Not found: %1</source>
+        <translation>لم يوجد: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
+        <source>Failed to load: %1</source>
+        <translation>فشل في تحميل: %1</translation>
+    </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
+        <source>Search</source>
+        <translation>بحث</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
+        <source>Search: %1</source>
+        <translation>بحث: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
+        <source>Results for &apos;%1&apos;</source>
+        <translation>نتائج البحث عن &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
+        <source>Collection</source>
+        <translation>مجموعة</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
+        <source>Advanced</source>
+        <translation>متقدمة</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
+        <source>All</source>
+        <translation>الكل</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation>بعض الإعدادات التي تم تغييرها لن تصبح نافذة المفعول حتى يتم إعادة تشغيل توماهوك</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
+        <source>Services</source>
+        <translation>خدمات</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
+        <source>Install resolver from file</source>
+        <translation>تثبيت محلل من ملف</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation>حذف كافة بيانات التحكم بالوصول؟</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation>هل فعلا تريد حذف جميع بيانات التحكم بالوصول؟ سوف يطلب منك اتخاذ القرار مجددا لكل ند على اتصال به.</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>معلومات</translation>
+    </message>
+</context>
+<context>
+    <name>SocialPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="34"/>
+        <source>Popular New Albums From Your Friends</source>
+        <translation>ألبومات جديدة مشهورة من أصدقائك</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="48"/>
+        <source>Most Played Playlists</source>
+        <translation>قوائم الأغاني التي سمعت كثيرا</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="63"/>
+        <source>Most Played Tracks You Don&apos;t Have</source>
+        <translation>الأغاني التي سمعت كثيرا و التي ليست موجودة لديك</translation>
+    </message>
+</context>
+<context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>فيسبوك (Facebook)</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>تويتر (Twitter)</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>غلاف</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation>تويت (Tweet)</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation>إنني أستمع إلى &quot;%1&quot; من قبل %2. %3</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation>إنني أستمع إلى &quot;%1&quot; من قبل %2 على &quot;%3&quot;. %4</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation>تبقى %1 حروف</translation>
+    </message>
+</context>
+<context>
+    <name>SourceDelegate</name>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
+        <source>Track</source>
+        <translation>اغنية</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
+        <source>Album</source>
+        <translation>البوم</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
+        <source>Artist</source>
+        <translation>فنان</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
+        <source>Local</source>
+        <translation>محلية</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
+        <source>Top 10</source>
+        <translation>توب ١٠</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
+        <source>All available tracks</source>
+        <translation>جميع الأغاني المتاحة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
+        <source>Show</source>
+        <translation>أظهر</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
+        <source>Hide</source>
+        <translation>إخفي</translation>
+    </message>
+</context>
+<context>
+    <name>SourceInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
+        <source>Recent Albums</source>
+        <translation>ألبومات جديدة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
+        <source>Latest Additions</source>
+        <translation>الإضافة الأخيرة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
+        <source>Recently Played Tracks</source>
+        <translation>الأغاني التي إستمعت إليها مؤخرا</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
+        <source>New Additions</source>
+        <translation>الإضافة الجديدة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
+        <source>My recent activity</source>
+        <translation>نشاطاتي الأخيرة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
+        <source>Recent activity from %1</source>
+        <translation>النشاطات المؤخرة ل %1</translation>
+    </message>
+</context>
+<context>
+    <name>SourceItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
+        <source>Collection</source>
+        <translation>مجموعة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
+        <source>Latest Additions</source>
+        <translation>أحدث الإضافات</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
+        <source>Recently Played</source>
+        <translation>تم الاستماع لها مؤخرا</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation>سوبر كولكشن</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation>آخر إضافات على مجموعتك</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation>آخر إضافات على مجموعة %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation>نعتذر، لم نستطيع إيجاد إضافة جديدة!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation>الأغاني التي إستمعت إليها مؤخرا</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation>الأغاني التي إستمعت إليها مؤخرا</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation>الأغاني التي سمعها مؤخرا %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation>نعتذر، لم نستطيع إيجاد أغاني مسموعة مؤخرا!</translation>
+    </message>
+</context>
+<context>
+    <name>SourceTreeView</name>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
+        <source>&amp;Copy Link</source>
+        <translation>&amp;نسخ الرابط</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
+        <source>&amp;Delete %1</source>
+        <translation>&amp;أحذف  %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation>أضف إلى لوائحي للأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation>أضف إلى لوائحي الأوتوماتيكية للأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation>أضف إلى إذاعاتي</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
+        <source>&amp;Export Playlist</source>
+        <translation>&amp;تصدير قائمة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation>قائمة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation>قائمة أغاني أوتوماتيكية</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation>إذاعة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation>أحذف  %1؟</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation>هل ترغب في حذف %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;؟</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
+        <source>Save XSPF</source>
+        <translation>حفظ XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
+        <source>Playlists (*.xspf)</source>
+        <translation>قوائم أغاني (*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>SourcesModel</name>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
+        <source>Group</source>
+        <translation>فئة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
+        <source>Collection</source>
+        <translation>مجموعة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
+        <source>Playlist</source>
+        <translation>قائمة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
+        <source>Automatic Playlist</source>
+        <translation>قائمة أغاني أوتوماتيكية</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
+        <source>Station</source>
+        <translation>إذاعة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
+        <source>Browse</source>
+        <translation>تصفح</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
+        <source>Search History</source>
+        <translation>تاريخ البحث</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
+        <source>My Music</source>
+        <translation>موسيقتي الخاصة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
+        <source>SuperCollection</source>
+        <translation>سوبر كولكشن</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
+        <source>Top Loved Tracks</source>
+        <translation>الأغاني المحبوبة الأكثر شهرة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
+        <source>Dashboard</source>
+        <translation>لوحة القيادة</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
+        <source>Recently Played</source>
+        <translation>تم الاستماع لها مؤخرا</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
+        <source>Charts</source>
+        <translation>الرسوم البيانية</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>جديد الاصدارات</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
+        <source>Friends</source>
+        <translation>الأصدقاء</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation>تكوين حساب &quot;Spotify&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation>إسم المستخدم أو الايميل على فيسبوك (Facebook Email)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>تسجيل الدخول</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation>أنقر يمينا على أية قائمة أغاني في توماهوك للمزامنة مع سبوتيفي (Spotify).</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation>جودة عالية في الأغاني المحملة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation>قوائم أغاني سبوتيفي (Spotify) التي يجب إبقائها بتزامن:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation>حذف قوائم أغاني توماهوك عند إزالة التزام</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>اسم المستخدم:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>كلمة السر:</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation>أحذف في سبوتيفي (Spotify)؟</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation>هل ترغب في حذف قائمة التشغيل المطابقة على سبوتيفي (Spotify)؟</translation>
+    </message>
+</context>
+<context>
+    <name>StackedSettingsDialog</name>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
+        <source>Tomahawk Settings</source>
+        <translation>إعدادات توماهوك</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
+        <source>Local Music Information</source>
+        <translation>معلومات الأغاني المحلية</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
+        <source>Path to scan for music files:</source>
+        <translation>ماسار لتفحص ملفات الموسيقى:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
+        <source>The Echo Nest supports keeping track of your catalog metadata
+ and using it to craft personalized radios. Enabling this option
+ will allow you (and all your friends) to create automatic playlists
+ and stations based on your personal taste profile.</source>
+        <translation>&quot;The Echo Nest&quot; يدعم إبقاء مسار فوقية فهرسك واستخدامه
+ لصياغة إذاعات شخصية. تمكين هذا الخيار يسمح لك (و لأصدقائك)
+إنشاء قوائم أغاني أوتوماتيكيا و إذاعات حسب ذوقك الشخصي.</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
+        <source>Upload collection list to The Echo Nest to enable user radio</source>
+        <translation>تحميل قائمة المجموعة إلى &quot;The Echo&quot; لتمكين راديو المستخدم</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
+        <source>Watch for changes</source>
+        <translation>إنتبه للتغييرات</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
+        <source>Time between scans, in seconds:</source>
+        <translation>الوقت بين المسوحات، بالثواني:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation>إعدادات متقدمة</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation>طريقة الاتصال بالند البعيد</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation>لا شيء (الاتصالات الصادرة فقط)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation>استخدم عمل UPnP لإنشاء بوابة إعادة التوجيه (موصى به)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation>استخدم عنوان/مضيف ايب (IP) و بوابة ثابتين</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation>عين هذا إلى عنوان الايب الخارجي (External IP) الخاص بك أو اسم المضيف. تأكد من إحالة البوابة إلى هذا المضيف!</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation>سوكس الوكيل</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation>استخدم سوكس الوكيل</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation>حذف كافة بيانات التحكم بالوصول</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation>خدمات الانترنت</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation>تثبيت من ملف...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation>ترشيح حسب القدرة:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
+        <source>Static Host Name:</source>
+        <translation>اسم مضيف ثابت:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
+        <source>Static Port:</source>
+        <translation>بوابة ثابتة:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
+        <source>Proxy Settings...</source>
+        <translation>إعدادات الوسيط...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation>إعدادات أخرى</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
+        <source>Send reports after Tomahawk crashed</source>
+        <translation>أرسل تقارير بعد فشل توماهوك</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation>السماح لمحرك البحث بالتفاعل مع توماهوك (موصى به)</translation>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation>نسخ رابط الفنان</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation>نسخ رابط الالبوم</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation>نسخ رابط الأغنية</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
+        <source>Add Account</source>
+        <translation>أضف حساب</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation>إزالة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
+        <source>%1 downloads</source>
+        <translation>تحميل %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
+        <source>Online</source>
+        <translation>متصل</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
+        <source>Connecting...</source>
+        <translation>جاري الاتصال...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
+        <source>Offline</source>
+        <translation>غير متصل</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation>مطلوب تثبيت يدوي</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation>لسوء الحظ، التثبيت التلقائي لهذا المحلل لم يتوفر بعد على منصتك. &lt;br /&gt;&lt;br /&gt; الرجاء إستخدام &quot; التثبيت من الملف&quot; أعلاه، بواسطة جلبه من توزيعتك أو تجميعه بنفسك. ويمكن الاطلاع على مزيد من التعليمات هنا: &lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapper</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
+        <source>Configure this Google Account</source>
+        <translation>تكوين حساب &quot;Google&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
+        <source>Google Address</source>
+        <translation>الحساب الخاص بجوجل (Google)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
+        <source>Enter your Google login to connect with your friends using Tomahawk!</source>
+        <translation>أدخل معلوماتك على &quot;Google&quot; ليتم الربط مع أصدقائك من خلال توماهوك!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
+        <source>username@gmail.com</source>
+        <translation>username@gmail.com</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
+        <source>Connect to Google Talk to find your friends</source>
+        <translation>تواصل مع جوجل توك (Google Talk) لإيجاد أصدقائك</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperSip</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
+        <source>Add Friend</source>
+        <translation>أضف صديق</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
+        <source>Enter Google Address:</source>
+        <translation>أدخل الحساب الخاص بجوجل (Google):</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
+        <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
+        <translation>إبعث أغانيك الخاصة إلى last .fm و جد أغاني جديدة مجانا للاستماع إليها</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation>اختبار...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation>اختبار الدخول</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation>استيراد %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation>نقل التاريخ...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation>تاريخ ناقص. استأنف</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation>تم استيراد تاريخ إعادة الإستماع</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
+        <source>Failed</source>
+        <translation>فشلت</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
+        <source>Success</source>
+        <translation>نجاح</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
+        <source>Could not contact server</source>
+        <translation>لم أستطيع الإتصال بالخادم</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation>مزامنة مع سبوتيفي (Spotify)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation>إعادة تمكين المزامنة مع سبوتيفي (Spotify)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation>أوقف المزامنة مع سبوتيفي (Spotify)</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>جاري تسجيل الدخول...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation>فشل: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>تسجيل الدخول</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
+        <source>Play music from and sync your playlists with Spotify Premium</source>
+        <translation>إسمع موسيقى و زامن قوائم تشغيلك مع سبوتيفي بريميوم (Spotify Premium)</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
+        <source>Connect to your Twitter followers.</source>
+        <translation>تواصل مع أصدقائك على تويتر (Twitter).</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
+        <source>Tweet!</source>
+        <translation>تويت (Tweet)!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
+        <source>Status: No saved credentials</source>
+        <translation>الحالة: بيانات غير محفوظة</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
+        <source>Authenticate</source>
+        <translation>صادق</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
+        <source>Status: Credentials saved for %1</source>
+        <translation>الحالة: بيانات %1 حفظت</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
+        <source>De-authenticate</source>
+        <translation>قطع المصادقة</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>Tweetin&apos; Error</source>
+        <translation>خطأ توتينغ (&apos;Tweetin)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <source>The credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation>لم نستطيع التحقق من صحة البيانات.
+قد ترغب بإعادة المصادقة.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
+        <source>Status: Error validating credentials</source>
+        <translation>الحالة: خطأ في التحقق من صحة البيانات</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
+        <source>Global Tweet</source>
+        <translation>تويت شامل (Global Tweet)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
+        <source>Direct Message</source>
+        <translation>رسالة مباشرة</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
+        <source>Send Message!</source>
+        <translation>إرسل رسالة!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
+        <source>@Mention</source>
+        <translation>@ذكر</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
+        <source>Send Mention!</source>
+        <translation>إرسال ذكر!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <source>You must enter a user name for this type of tweet.</source>
+        <translation>يجب إدخال اسم المستخدم لهذا النوع من التويت (tweet).</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <source>Your saved credentials could not be loaded.
+You may wish to try re-authenticating.</source>
+        <translation>لم نستطيع تحميل بياناتك المحفوظة.
+قد ترغب بمعاودة التصديق.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <source>Your saved credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation>لم نستطيع التحقق من بياناتك المحفوظة.
+قد ترغب بمعاودة التصديق.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>There was an error posting your status -- sorry!</source>
+        <translation>عذراً... حصل خطأ في تسجيل رسالتك!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Tweeted!</source>
+        <translation>ثبت التويت! (!Tweeted)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <source>Your tweet has been posted!</source>
+        <translation>رسالتك على تويتر قد نشرت!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <source>There was an error posting your direct message -- sorry!</source>
+        <translation>نعتذر، حصل خطأ في نشر رسالتك المباشرة !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Your message has been posted!</source>
+        <translation>رسالتك قد نشرت!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::XmppAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
+        <source>Log on to your Jabber/XMPP account to connect to your friends</source>
+        <translation>أدخل إلى حسابك على Jabber/XMPP للربط بأصدقائك</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::ZeroconfFactory</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
+        <source>Automatically connect to Tomahawks on the local network</source>
+        <translation>أربط نفسك بتوماهاوك على الشبكة المحلية بطريقة مباشرة أوتوماتيكيا</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ContextMenu</name>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
+        <source>&amp;Play</source>
+        <translation>&amp;إستمع</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
+        <source>Add to &amp;Queue</source>
+        <translation>أضف إلى &amp;قائمة الانتظار</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation>أكمل الاستماع بعد هذه &amp;الأغنية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation>أوقف الاستماع بعد هذه &amp;الأغنية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
+        <source>&amp;Love</source>
+        <translation>&amp;أحب</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
+        <source>&amp;Copy Track Link</source>
+        <translation>&amp;نسخ رابط الأغنية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation>نسخ &amp;رابط الالبوم</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation>نسخ &amp;رابط قائمة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
+        <source>Un-&amp;Love</source>
+        <translation>لا &amp;أحب</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Items</source>
+        <translation>&amp;أحذف البنود</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation>&amp;أظهر صفحة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Item</source>
+        <translation>&amp;أحذف البند</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation>&amp;أظهر صفحة الألبومات</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation>&amp;أظهر صفحة الفنان</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::CustomPlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
+        <source>Top Loved Tracks</source>
+        <translation>الأغاني المحبوبة الأكثر شهرة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
+        <source>Your loved tracks</source>
+        <translation>الأغاني التي أحببتها</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
+        <source>%1&apos;s loved tracks</source>
+        <translation>الأغاني المحبوبة ل%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
+        <source>The most loved tracks from all your friends</source>
+        <translation>الأغاني المحبوبة كثيرا بين أصدقائك</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
+        <source>All of your loved tracks</source>
+        <translation>جميع الأغاني التي أحببتها</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
+        <source>All of %1&apos;s loved tracks</source>
+        <translation>جميع الأغاني المحبوبة ل%1</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DropJobNotifier</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation>قائمة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation>فنان</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation>اغنية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation>البوم</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
+        <source>Fetching %1 from database</source>
+        <translation>جلب %1 من قاعدة البيانات</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
+        <source>Parsing %1 %2</source>
+        <translation>تحليل %1 %2 </translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicControlList</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
+        <source>Click to collapse</source>
+        <translation>إضغط للتقليص</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="172"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="301"/>
+        <source>Could not find a playable track.
+
+Please change the filters or try again.</source>
+        <translation>لم يوجد أغنية للاستماع إليها.
+
+غير كلمة الترشيح وأعد الكرة.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="230"/>
+        <source>Failed to generate preview with the desired filters</source>
+        <translation>فشل في إيجاد عرض مسبق للبحث المطلوب</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicSetupWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="53"/>
+        <source>Type:</source>
+        <translation>نوع:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="67"/>
+        <source>Generate</source>
+        <translation>توليد</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
+        <source>Add some filters above to seed this station!</source>
+        <translation>أدخل بعض الترشيحات أعلاه لتوزيع هذه الإذاعة!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <source>Press Generate to get started!</source>
+        <translation>إضغط &quot;توليد&quot; لتبدأ!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
+        <source>Add some filters above, and press Generate to get started!</source>
+        <translation>أدخل بعض الترشيحات أعلاه ثم  iضغط &quot;توليد&quot; لتبدأ!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp" line="472"/>
+        <source>Station ran out of tracks!
+
+Try tweaking the filters for a new set of songs to play.</source>
+        <translation>الإذاعة فرغت من الأغاني!
+
+عدل في كلمة الترشيح لإيجاد مجموعة جديدة من الأغاني.</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestControl</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="188"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="255"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="276"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="341"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="360"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="425"/>
+        <source>is</source>
+        <translation>هو</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="207"/>
+        <source>from user</source>
+        <translation>من المستخدم</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="216"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="584"/>
+        <source>No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings</source>
+        <translation>لا يوجد مستخدمين مع فهرس &quot;Echo Nest&quot; ممكن. تجربة تمكين خيار المجموعة في الإعدادات يمكن أن يساعد</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="235"/>
+        <source>similar to</source>
+        <translation>مشابهة ل</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>Less</source>
+        <translation>أقل</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>More</source>
+        <translation>أكثر</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>0 BPM</source>
+        <translation>٠ نبضة في الدقيقة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>500 BPM</source>
+        <translation>٥٠٠ نبضة في الدقيقة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>0 secs</source>
+        <translation>٠ ثانية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>3600 secs</source>
+        <translation>٣٦٠٠ ثانية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>-100 dB</source>
+        <translation>-١٠٠ د.ب.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>100 dB</source>
+        <translation>١٠٠ د.ب.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="343"/>
+        <source>Major</source>
+        <translation>رئيسي</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="344"/>
+        <source>Minor</source>
+        <translation>ثانوي</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
+        <source>C</source>
+        <translation>C</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
+        <source>C Sharp</source>
+        <translation>C Sharp</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
+        <source>D</source>
+        <translation>D</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
+        <source>E Flat</source>
+        <translation>E Flat</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
+        <source>F</source>
+        <translation>F</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
+        <source>F Sharp</source>
+        <translation>F Sharp</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="369"/>
+        <source>G</source>
+        <translation>G</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="370"/>
+        <source>A Flat</source>
+        <translation>A Flat</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="371"/>
+        <source>A</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="372"/>
+        <source>B Flat</source>
+        <translation>B Flat</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="373"/>
+        <source>B</source>
+        <translation>B</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
+        <source>Ascending</source>
+        <translation>تصاعدي</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="391"/>
+        <source>Descending</source>
+        <translation>تنازلي</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="394"/>
+        <source>Tempo</source>
+        <translation>سرعة إيقاع</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="395"/>
+        <source>Duration</source>
+        <translation>مدة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="396"/>
+        <source>Loudness</source>
+        <translation>قوة الصوت</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="397"/>
+        <source>Artist Familiarity</source>
+        <translation>ألفة الفنان</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
+        <source>Artist Hotttnesss</source>
+        <translation>شعبية الفنان</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
+        <source>Song Hotttnesss</source>
+        <translation>شعبية الأغنية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
+        <source>Latitude</source>
+        <translation>مدى</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="401"/>
+        <source>Longitude</source>
+        <translation>طول</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="402"/>
+        <source>Mode</source>
+        <translation>أسلوب </translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="403"/>
+        <source>Key</source>
+        <translation>مفتاح</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="404"/>
+        <source>Energy</source>
+        <translation>حيوية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="405"/>
+        <source>Danceability</source>
+        <translation>القابلية للرقص</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="744"/>
+        <source>only by ~%1</source>
+        <translation>فقط من جانب ~%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="746"/>
+        <source>similar to ~%1</source>
+        <translation>مشابهة ل%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="748"/>
+        <source>with genre ~%1</source>
+        <translation>مع النوع ~%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="754"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="766"/>
+        <source>from no one</source>
+        <translation>من لا أحد</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="758"/>
+        <source>My Collection</source>
+        <translation>مجموعتي الخاصة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="762"/>
+        <source>from %1 radio</source>
+        <translation>من إذاعة %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="785"/>
+        <source>with %1 %2</source>
+        <translation>مع %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="787"/>
+        <source>about %1 BPM</source>
+        <translation>حوالي %1 نبضة في الدقيقة</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
+        <source>about %n minute(s) long</source>
+        <translation><numerusform>بطول حوالي %n دقائق</numerusform><numerusform>بطول حوالي دقيقة %n</numerusform><numerusform>بطول حوالي دقيقتين %n</numerusform><numerusform>بطول حوالي %n دقائق</numerusform><numerusform>بطول حوالي %n دقائق</numerusform><numerusform>بطول حوالي %n دقائق</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
+        <source>about %1 dB</source>
+        <translation>حوالي %1 د.ب.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="793"/>
+        <source>at around %1%2 %3</source>
+        <translation>في حوالي %1%2 %3</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="798"/>
+        <source>in %1</source>
+        <translation>في %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="803"/>
+        <source>in a %1 key</source>
+        <translation>في المفتاح %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="813"/>
+        <source>sorted in %1 %2 order</source>
+        <translation>تم فرزها بالترتيب %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="818"/>
+        <source>with a %1 mood</source>
+        <translation>في مزاج %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="823"/>
+        <source>in a %1 style</source>
+        <translation>في أسلوب %1</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestSteerer</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
+        <source>Steer this station:</source>
+        <translation>قد هذه الإذاعة:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <source>Much less</source>
+        <translation>أقل بكثير</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <source>Less</source>
+        <translation>أقل</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <source>A bit less</source>
+        <translation>أقل بقليل</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <source>Keep at current</source>
+        <translation>أبقه على حاله</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <source>A bit more</source>
+        <translation>أكثر قليلا</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <source>More</source>
+        <translation>أكثر</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <source>Much more</source>
+        <translation>أكثر من ذلك بكثير</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
+        <source>Tempo</source>
+        <translation>سرعة إيقاع</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
+        <source>Loudness</source>
+        <translation>قوة الصوت</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
+        <source>Danceability</source>
+        <translation>درجة الرقص</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
+        <source>Energy</source>
+        <translation>حيوية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
+        <source>Song Hotttnesss</source>
+        <translation>شعبية الأغنية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <source>Artist Hotttnesss</source>
+        <translation>شعبية الفنان</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
+        <source>Artist Familiarity</source>
+        <translation>ألفة الفنان</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
+        <source>By Description</source>
+        <translation>من خلال الوصف</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
+        <source>Enter a description</source>
+        <translation>أدخل الوصف</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
+        <source>Apply steering command</source>
+        <translation>طبق أوامر القيادة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
+        <source>Reset all steering commands</source>
+        <translation>إعادة ضبط جميع أوامر القيادة</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::GroovesharkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
+        <source>Error fetching Grooveshark information from the network!</source>
+        <translation>مشكلة في جلب معلومات &quot;Grooveshark&quot; من الشبكة!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::ChartsPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
+        <source>Top Overall</source>
+        <translation>الأكثر شهرة بالإجمال</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
+        <source>Artists</source>
+        <translation>فنانين</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
+        <source>Albums</source>
+        <translation>ألبومات</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
+        <source>Tracks</source>
+        <translation>أغاني</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation>توماهوك يلعب &quot;%1&quot; ل%2%3.</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation>على &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
+        <source>Top Tracks</source>
+        <translation>أفضل الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
+        <source>Loved Tracks</source>
+        <translation>الأغاني المحبوبة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
+        <source>Hyped Tracks</source>
+        <translation>فقت الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
+        <source>Top Artists</source>
+        <translation>أفضل الفنانين</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
+        <source>Hyped Artists</source>
+        <translation>فقت الفنانين</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>ألبومات</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation>إنني أستمع إلى &quot;%1&quot; من قبل %2 وقد أحببتها! %3</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ItunesParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
+        <source>Error fetching iTunes information from the network!</source>
+        <translation>مشكلة في جلب معلومات &quot;iTunes&quot; من الشبكة!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::JSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
+        <source>New Playlist</source>
+        <translation>قائمة أغاني جديدة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Failed to save tracks</source>
+        <translation>فشل في حفظ الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation>بعض الأغاني في قائمة التشغيل لا تحتوي على إسم الفنان أو إسم الأغنية. هذه الأغاني سوف تتجاهل.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>XSPF Error</source>
+        <translation>خطأ XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation>قائمة الأغاني XSPF هذه ليست صالحة.</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::LatchManager</name>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="86"/>
+        <source>&amp;Catch Up</source>
+        <translation>&amp;إلحق</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="123"/>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="144"/>
+        <source>&amp;Listen Along</source>
+        <translation>&amp;استمع مع</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Query</name>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
+        <source> and </source>
+        <translation> و </translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
+        <source>You</source>
+        <translation>أنت</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
+        <source>you</source>
+        <translation>أنت</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>and</source>
+        <translation>و</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>%n other(s)</source>
+        <translation><numerusform>%n أخرين</numerusform><numerusform>%n أخر</numerusform><numerusform>%n أخرين</numerusform><numerusform>%n أخرين</numerusform><numerusform>%n أخرين</numerusform><numerusform>%n أخرين</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
+        <source>%1 people</source>
+        <translation>%1 أشخاص</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
+        <source>loved this track</source>
+        <translation>أحببت هذه الأغنية</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::RdioParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
+        <source>Error fetching Rdio information from the network!</source>
+        <translation>مشكلة في جلب معلومات &quot;Rdio&quot; من الشبكة!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ShortenedLinkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
+        <source>Network error parsing shortened link!</source>
+        <translation>خطأ شبكة في تحليل تقصير الرابط!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Source</name>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
+        <source>Scanning (%L1 tracks)</source>
+        <translation>يجري مسح (%L1 أغنية)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
+        <source>Scanning</source>
+        <translation>مسح</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
+        <source>Checking</source>
+        <translation>فحص</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation>مزامنة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation>استيراد</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
+        <source>Saving (%1%)</source>
+        <translation>تحفيظ(%1%)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation>متصل</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation>غير متصل</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::SpotifyParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
+        <source>Error fetching Spotify information from the network!</source>
+        <translation>مشكلة في جلب معلومات &quot;Spotify&quot; من الشبكة!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation>تحديث تلقائي (أوتوماتيكيا) من XSPF</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkApp</name>
+    <message>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
+        <source>My Collection</source>
+        <translation>مجموعتي الخاصة</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkOAuthTwitter</name>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>Twitter PIN</source>
+        <translation>رقم البن لتويتر (Twitter Pin)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>After authenticating on Twitter's web site,
+enter the displayed PIN number here:</source>
+        <translation>بعد المصادقة على موقع تويتر (Twitter)،
+أدخل رقم البين (PIN) الموجود أمامك على الشاشة هنا:</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkTrayIcon</name>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation>&amp;أوقف الاستماع بعد الأغنية الحالية</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
+        <source>Hide Tomahawk Window</source>
+        <translation>إخفي نافذة توماهوك</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
+        <source>Show Tomahawk Window</source>
+        <translation>أظهر نافذة توماهوك</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
+        <source>Currently not playing.</source>
+        <translation>لا يتم الاستماع حاليا.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
+        <source>Play</source>
+        <translation>إستمع</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
+        <source>Pause</source>
+        <translation>تعليق</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation>&amp;أحب</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation>لا &amp;أحب</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation>&amp;أكمل الاستماع بعد الأغنية الحالية</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkWindow</name>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
+        <source>Tomahawk</source>
+        <translation>توماهوك</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
+        <source>&amp;Settings</source>
+        <translation>&amp;إعدادات</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
+        <source>&amp;Controls</source>
+        <translation>&amp;ضوابط</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
+        <source>&amp;Network</source>
+        <translation>&amp;شبكة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
+        <source>&amp;Window</source>
+        <translation>&amp;نافذة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
+        <source>&amp;Help</source>
+        <translation>&amp;مساعدة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;إنهاء</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
+        <source>Go &amp;Online</source>
+        <translation>اصبح &amp;متصل</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
+        <source>Add &amp;Friend...</source>
+        <translation>أضف &amp;صديق...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
+        <source>U&amp;pdate Collection</source>
+        <translation>&amp;تحديث المجموعة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
+        <source>Update Collection</source>
+        <translation>تحديث المجموعة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
+        <source>&amp;Configure Tomahawk...</source>
+        <translation>&amp;تكوين توماهوك...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
+        <source>Load &amp;XSPF...</source>
+        <translation>تحميل XSPF&amp;...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
+        <source>Create &amp;New Playlist...</source>
+        <translation>إنشاء &amp;قائمة أغاني جديدة...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
+        <source>About &amp;Tomahawk...</source>
+        <translation>عن &amp;توماهوك...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
+        <source>Create New &amp;Automatic Playlist</source>
+        <translation>إنشاء قائمة أغاني جديدة أ&amp;وتوماتيكيا</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
+        <source>Create New &amp;Station</source>
+        <translation>إنشاء &amp;قائمة أغاني جديدة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
+        <source>Show Offline Sources</source>
+        <translation>أظهر المصادر الغير متصلة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
+        <source>Hide Offline Sources</source>
+        <translation>إخفي المصادر الغير متصلة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
+        <source>Minimize</source>
+        <translation>خفض</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
+        <source>Zoom</source>
+        <translation>زوم</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
+        <source>Meta+Ctrl+Z</source>
+        <translation>Meta+Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation>معلومات &amp;قانونية...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
+        <source>Diagnostics...</source>
+        <translation>تشخيص...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
+        <source>Fully &amp;Rescan Collection</source>
+        <translation>إعادة &amp;مسح المجموعة كاملة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
+        <source>Fully Rescan Collection</source>
+        <translation>إعادة مسح المجموعة كاملة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
+        <source>Play</source>
+        <translation>إستمع</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
+        <source>Space</source>
+        <translation>مساحة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
+        <source>Previous</source>
+        <translation>سابق</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
+        <source>Next</source>
+        <translation>التالي</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation>إلى الوراء</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation>العودة صفحة واحدة إلى الوراء</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation>تقدم</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation>تقدم صفحة واحدة </translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
+        <source>Global Search...</source>
+        <translation>بحث شامل...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
+        <source>Check For Updates...</source>
+        <translation>التحقق من التحديثات...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
+        <source>Connect To Peer</source>
+        <translation>ربط بالند</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
+        <source>Enter peer address:</source>
+        <translation>أدخل عنوان الند:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
+        <source>Enter peer port:</source>
+        <translation>أدخل بوابة الند:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
+        <source>Enter peer key:</source>
+        <translation>أدخل مفتاح الند:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>XSPF Error</source>
+        <translation>خطأ XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation>قائمة الأغاني XSPF هذه ليست صالحة.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Failed to save tracks</source>
+        <translation>فشل في حفظ الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation>بعض الأغاني في قائمة الأغاني لا تحتوي على إسم الفنان أو إسم الأغنية. هذه الأغاني سوف تتجاهل.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
+        <translation>عذرا، هناك مشكلة في الوصول إلى جهاز الصوت أو الأغنية المطلوب، سوف يتم تخطي الأغنية الحالية. تأكد أن لديك خلفية فونون المناسبة والإضافات المطلوبة مثبتة.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
+        <translation>عذرا، هناك مشكلة في الوصول إلى جهاز الصوت أو الأغنية المطلوب، سوف يتم تخطي الأغنية الحالية.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation>إذاعة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Create New Station</source>
+        <translation>إنشاء قائمة أغاني جديدة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Name:</source>
+        <translation>الاسم:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation>قائمة الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation>قائمة أغاني أوتوماتيكية</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
+        <source>Pause</source>
+        <translation>تعليق</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
+        <source>Go &amp;offline</source>
+        <translation>أصبح &amp;غير متصل</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
+        <source>Go &amp;online</source>
+        <translation>اصبح &amp;متصل</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
+        <source>Authentication Error</source>
+        <translation>خطأ في المصادقة</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation>خطأ في الاتصال بسيب (SIP): فشلت المصادقة!</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
+        <source>%1 by %2</source>
+        <comment>track, artist name</comment>
+        <translation>%1 من قبل %2</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
+        <source>%1 - %2</source>
+        <comment>current track, some window title</comment>
+        <translation>%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation>حقوق الطبع والنشر ٢٠١٠ - ٢٠١٢</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation>شكر لكل من:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation>عن توماهوك</translation>
+    </message>
+</context>
+<context>
+    <name>TopTracksContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
+        <source>Top Hits</source>
+        <translation>الأكثر شهرة</translation>
+    </message>
+</context>
+<context>
+    <name>TrackInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation>غلاف</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
+        <source>Track</source>
+        <translation>اغنية</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation>فنان</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation>البوم</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation>إحصائيات</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation>أغاني قريبة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation>نعتذر، لم نستطيع إيجاد أغاني قريبة من هذه الأغنية!</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation><numerusform>لقد استمعت إلى هذه الأغنية %n مرة.</numerusform><numerusform>لقد استمعت إلى هذه الأغنية مرة %n.</numerusform><numerusform>لقد استمعت إلى هذه الأغنية مرتين %n.</numerusform><numerusform>لقد استمعت إلى هذه الأغنية %n مرات.</numerusform><numerusform>لقد استمعت إلى هذه الأغنية %n مرات.</numerusform><numerusform>لقد استمعت إلى هذه الأغنية %n مرات.</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation>لم تستمع لهذه الأغنية من قبل.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation>استمعت إليها أولاً في %1.</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation><numerusform>لقد استمعت إلى %1 %n مرة.</numerusform><numerusform>لقد استمعت إلى %1 مرة %n.</numerusform><numerusform>لقد استمعت إلى %1 مرتين %n.</numerusform><numerusform>لقد استمعت إلى %1 %n مرات.</numerusform><numerusform>لقد استمعت إلى %1 %n مرات.</numerusform><numerusform>لقد استمعت إلى %1 %n مرات.</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation>لم تستمع إلى %1 من قبل.</translation>
+    </message>
+</context>
+<context>
+    <name>TrackView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>عذراً، ترشيحك &quot;%1&quot; لم يطابق أي نتائج.</translation>
+    </message>
+</context>
+<context>
+    <name>TransferStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>from</source>
+        <translation>من</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>to</source>
+        <translation>إلى</translation>
+    </message>
+</context>
+<context>
+    <name>TreeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
+        <source>Unknown</source>
+        <translation>مجهول</translation>
+    </message>
+</context>
+<context>
+    <name>TreeModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
+        <source>All Artists</source>
+        <translation>جميع الفنانين</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
+        <source>My Collection</source>
+        <translation>مجموعتي الخاصة</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
+        <source>Collection of %1</source>
+        <translation>مجموعة %1</translation>
+    </message>
+</context>
+<context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>نتأسف، نظام الترشيح لم يجد شيئا تحت عنوان &apos;%1&apos;.</translation>
+    </message>
+</context>
+<context>
+    <name>TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
+        <source>Configure this Twitter account</source>
+        <translation>تكوين حساب &quot;Twitter&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
+        <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
+        <translation>مساعد تويتر (Twitter) يسمح لك بإكتشاف والإستماع إلى الموسيقى من أصدقائك على تويتر المستخدمين لتوماهوك بالإضافة إلى نشر الرسائل إلى حسابك.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
+        <source>Status: No saved credentials</source>
+        <translation>الحالة: بيانات غير محفوظة</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
+        <source>Authenticate with Twitter</source>
+        <translation>صادق مع تويتر (Twitter)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
+        <source>Twitter Connections</source>
+        <translation>إتصالات بتويتر (Twitter)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
+        <source>
+If you only want to post tweets, you're done.
+
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.</source>
+        <translation>
+إن كنت تريد نشر التويت (Tweet) فقط، لقد انتهيت!
+
+إن كنت تريد لتوماهوك الاتصال بأصدقائك من خلال تويتر (Twitter)، حدد نوع التويت (Tweet) و إضغط على الزر أدناه لإرسال رسالة مزامنة. يجب أن تكونا تابعين لبعضكما البعض على حد سواء لأن الرسائل المباشرة تستخدم. ثم يجب الإنتظار بصبر (كبير) - يمكن أن تستغرق العملية عدة دقائق!
+
+يمكنك إعادة إرسال رسالة المزامنة في أي وقت عن طريق إرسال تويت (Tweet) آخر بضغط هذا الزر من جديد.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
+        <source>Select the kind of tweet you would like, then press the button to post it:</source>
+        <translation>حدد نوع التويت (Tweet) اللذي ترغب به، ثم إضغط على الزر لنشره:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
+        <source>Global Tweet</source>
+        <translation>تويت شامل (Global Tweet)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
+        <source>@Mention</source>
+        <translation>@ذكر</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
+        <source>Direct Message</source>
+        <translation>رسالة مباشرة</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
+        <source>e.g. @tomahawk</source>
+        <translation>مثل: @tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
+        <source>Send Message</source>
+        <translation>إرسل رسالة</translation>
+    </message>
+</context>
+<context>
+    <name>ViewManager</name>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation>بعد إجراء مسح مجموعة أغانيك الخاصة ستجد أغانيك هنا.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation>هذه المجموعة فارغة.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
+        <source>SuperCollection</source>
+        <translation>سوبر كولكشن</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
+        <source>Combined libraries of all your online friends</source>
+        <translation>مكتبات مجمعة لكل اصحابك المتصلين</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation>الأغاني التي إستمعت إليها مؤخرا</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation>جميع الأغاني التي استمع إليها أصدقائك مؤخرا</translation>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
+        <source>Recent Additions</source>
+        <translation>آخر الإضافات</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
+        <source>Newest Stations &amp; Playlists</source>
+        <translation>أجدد الإذاعات و قوائم الأغاني</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
+        <source>Recently Played Tracks</source>
+        <translation>الأغاني التي إستمعت إليها مؤخرا</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
+        <source>No recently created playlists in your network.</source>
+        <translation>لا قوائم أغاني جديدة أنشئت مؤخرا على شبكتك.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
+        <source>Welcome to Tomahawk</source>
+        <translation>مرحبا بكم في توماهوك</translation>
+    </message>
+</context>
+<context>
+    <name>WhatsHotWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
+        <source>Charts</source>
+        <translation>الرسوم البيانية</translation>
+    </message>
+</context>
+<context>
+    <name>WikipediaContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="42"/>
+        <source>Wikipedia</source>
+        <translation>ويكيبيديا</translation>
+    </message>
+</context>
+<context>
+    <name>XMPPBot</name>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
+        <source>
+Terms for %1:
+</source>
+        <translation>شروط %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
+        <source>No terms found, sorry.</source>
+        <translation>لا شروط موجودة، نتأسف.</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
+        <source>
+Hotttness for %1: %2
+</source>
+        <translation>
+شعبية %1:%2
+</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
+        <source>
+Familiarity for %1: %2
+</source>
+        <translation>
+ألفت %1:%2
+</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
+        <source>
+Lyrics for &quot;%1&quot; by %2:
+
+%3
+</source>
+        <translation>
+كلمات أغاني &quot;%1&quot; من قبل %2&quot;
+
+%3
+</translation>
+    </message>
+</context>
+<context>
+    <name>XSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
+        <source>Failed to parse contents of XSPF playlist</source>
+        <translation>فشل في تحليل محتويات قائمة الأغاني XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
+        <source>Some playlist entries were found without artist and track name, they will be omitted</source>
+        <translation>تم العثور على مداخل في قوائم الأغاني لا تحتوي على إسم فنان أو إسم أغنية، هذه المداخل سوف تحذف</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
+        <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
+        <translation>فشل في جلب قائمة الأغاني المطلوبة من الشبكة، أو الملف المطلوب غير موجود</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
+        <source>New Playlist</source>
+        <translation>قائمة أغاني جديدة</translation>
+    </message>
+</context>
+<context>
+    <name>XmlConsole</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
+        <source>Xml stream console</source>
+        <translation>Xml stream console</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
+        <source>Filter</source>
+        <translation>مرشح</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
+        <source>Save log</source>
+        <translation>حفظ تسجيل الدخول</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
+        <source>Disabled</source>
+        <translation>تعطيل</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
+        <source>By JID</source>
+        <translation>By JID</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
+        <source>By namespace uri</source>
+        <translation>By namespace uri</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
+        <source>By all attributes</source>
+        <translation>By all attributes</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
+        <source>Visible stanzas</source>
+        <translation>Visible stanzas</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
+        <source>Information query</source>
+        <translation>معلومات الإستعلام</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
+        <source>Message</source>
+        <translation>رسالة</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
+        <source>Presence</source>
+        <translation>Presence</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
+        <source>Custom</source>
+        <translation>تعديل</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
+        <source>Close</source>
+        <translation>اغلاق</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
+        <source>Save XMPP log to file</source>
+        <translation>Save XMPP log to file</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
+        <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
+        <translation>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</translation>
+    </message>
+</context>
+<context>
+    <name>XmppConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
+        <source>Xmpp Configuration</source>
+        <translation>تكوينات أكسمبب (XMPP)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
+        <source>Configure this Xmpp account</source>
+        <translation>تكوين حساب &quot;XMPP&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
+        <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
+        <translation>أدخل معلوماتك على &quot;XMPP&quot; ليتم الربط مع أصدقائك من خلال توماهوك!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
+        <source>Login Information</source>
+        <translation>معلومات الدخول</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
+        <source>Xmpp ID:</source>
+        <translation>تعريف أكسمبب (XMPP ID):</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
+        <source>e.g. user@example.com</source>
+        <translation>مثل: user@example.com</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
+        <source>Password:</source>
+        <translation>كلمة السر:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
+        <source>An account with this name already exists!</source>
+        <translation>حساب بهذا الإسم موجود أصلا!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
+        <source>Advanced Xmpp Settings</source>
+        <translation>إعدادات أكسمبب (XMPP) المتقدمة</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
+        <source>Server:</source>
+        <translation>خادم:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
+        <source>Port:</source>
+        <translation>بوابة:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
+        <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
+        <translation>الكثير من الخوادم لا تدعم هذا (e.g. GTalk, jabber.org)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
+        <source>Publish currently playing track</source>
+        <translation>أنشر الأغنية التي تسمع الآن</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
+        <source>Enforce secure connection</source>
+        <translation>أفرض إتصال أمن</translation>
+    </message>
+</context>
+<context>
+    <name>XmppSipPlugin</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
+        <source>User Interaction</source>
+        <translation>تفاعل المستخدم</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
+        <source>Host is unknown</source>
+        <translation>المضيف مجهول</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
+        <source>Item not found</source>
+        <translation>البند غير موجودة</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
+        <source>Authorization Error</source>
+        <translation>خطا في الترخيص</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
+        <source>Remote Stream Error</source>
+        <translation>خطأ في التحميل (المجرى) البعيد</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
+        <source>Remote Connection failed</source>
+        <translation>فشل في الاتصال البعيد</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
+        <source>Internal Server Error</source>
+        <translation>خطأ داخلي في الخادم</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
+        <source>System shutdown</source>
+        <translation>إغلاق النظام</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
+        <source>Conflict</source>
+        <translation>تضارب</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
+        <source>Unknown</source>
+        <translation>مجهول</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation>هل تريد اضافة &lt;b&gt;%1&lt;/b&gt; الى قائمة اصدقائك؟</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
+        <source>No Compression Support</source>
+        <translation>لا دعم للضغط</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
+        <source>No Encryption Support</source>
+        <translation>لا دعم للتشفير</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
+        <source>No Authorization Support</source>
+        <translation>لا دعم للترخيص</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
+        <source>No Supported Feature</source>
+        <translation>لا ميزة معتمدة</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
+        <source>Add Friend</source>
+        <translation>أضف صديق</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
+        <source>Enter Xmpp ID:</source>
+        <translation>أدخل تعريف أكسمبب (XMPP ID):</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
+        <source>Add Friend...</source>
+        <translation>أضف صديق...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
+        <source>XML Console...</source>
+        <translation>وحدة التحكم XML...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
+        <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
+        <translation>أنا أسف... أنا مجرد وجود ألي مستخدم من قبل توماهوك (http://gettomahawk.com). في حال الحصول على هذه الرسالة، فإن الشخص اللذي تحاول الوصول إليه خارج الخدمة، فنرجو المحاولة لاحقاً!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
+        <source>Authorize User</source>
+        <translation>أعطي الإذن للمستخدم</translation>
+    </message>
+</context>
+<context>
+    <name>ZeroconfConfig</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
+        <source>Local Network configuration</source>
+        <translation>تكوين الشبكة المحلية</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
+        <source>This plugin will automatically find other users running Tomahawk on your local network</source>
+        <translation>هذا المساعد سيجد مستخدمين أخرين لتوماهاوك على الشبكة المحلية أوتوماتيكيا</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
+        <source>Connect automatically when Tomahawk starts</source>
+        <translation>أربط مباشرتا عند بدء توماهوك</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/lang/tomahawk_bg.ts -> tomahawk-0.5.5.tar.bz2/lang/tomahawk_bg.ts Changed

@@ -1,44 +1,45 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="bg" version="2.0">
 <context>
-    <name>ACLRegistry</name>
+    <name>ACLJobDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="140"/>
-        <source>Connect to Peer?</source>
-        <translation>Свързване към друг потребител?</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="141"/>
-        <source>Another Tomahawk instance that claims to be owned by %1 is attempting to connect to you. Select whether to allow or deny this connection.
-
-Remember: Only allow peers to connect if you trust who they are and if you have the legal right for them to stream music from you.</source>
-        <translation>Tomahawk, стартиран от %1 се опитва да се свърже с теб. Избери дали да приемеш или откажеш свързването.
-Внимание! Позволявайте връзки само от потребители, които познавате и на които имате доверие и ако имате право да разпространявате музиката, която съхранявате.</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="142"/>
-        <source>Deny</source>
-        <translation>Откажи</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="143"/>
-        <source>Allow</source>
-        <translation>Позволи</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AccountFactoryWrapper</name>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
         <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="30"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
         <source>Description goes here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.cpp" line="41"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
         <source>Add Account</source>
         <translation>Добави регистрация</translation>
     </message>
@@ -46,17 +47,17 @@
 <context>
     <name>AccountFactoryWrapperDelegate</name>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="105"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
         <source>Online</source>
         <translation>На линия</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="110"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
         <source>Connecting...</source>
         <translation>Свързване...</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="115"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
         <source>Offline</source>
         <translation>Извън линия</translation>
     </message>
@@ -64,69 +65,69 @@
 <context>
     <name>ActionCollection</name>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="43"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
         <source>&amp;Listen Along</source>
-        <translation>&amp;Слушай заедно</translation>
+        <translation>&amp;Слушай заедно с</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="46"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
         <source>Stop &amp;Listening Along</source>
-        <translation>Спри &amp; да слушаш заедно</translation>
+        <translation>Спри &amp;да слушаш заедно с</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="50"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
         <source>&amp;Follow in real-time</source>
-        <translation>&amp;Последвай </translation>
+        <translation>&amp;Следвай в реално време </translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Privately</source>
         <translation>&amp;Слушай самостоятелно</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Publicly</source>
         <translation>&amp;Слушай публично</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="61"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
         <source>&amp;Load Playlist</source>
         <translation>&amp;Зареди списък</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="62"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
         <source>&amp;Rename Playlist</source>
         <translation>&amp;Преименувай списък</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="63"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
         <source>&amp;Copy Playlist Link</source>
         <translation>&amp;Копирай връзка към списък</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="64"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
         <source>&amp;Play</source>
         <translation>&amp;Изпълни</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="65"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
         <source>&amp;Stop</source>
         <translation>&amp;Спри</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
         <source>&amp;Previous Track</source>
         <translation>&amp;Предходна песен</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="67"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
         <source>&amp;Next Track</source>
         <translation>&amp;Следваща песен</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="68"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
         <source>&amp;Quit</source>
         <translation>&amp;Изключи приложението</translation>
     </message>
@@ -144,30 +145,17 @@
         <translation>Други албуми на този артист</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="74"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="120"/>
-        <source>Click to show Official Tracks</source>
-        <translation>Покажи само официалните песни</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="72"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="118"/>
-        <source>Click to show SuperCollection Tracks</source>
-        <translation>Покажи песните от супер колекцията</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation>Съжалявам, но не откривам нито един албум от този артист!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="79"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="136"/>
-        <source>Click to show SuperCollection Albums</source>
-        <translation>Покажи албумите от супер колекцията</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation>Съжалявам, но не откривам нито една песен за този артист!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="138"/>
-        <source>Click to show Official Albums</source>
-        <translation>Покажи само официалните албуми</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="205"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
         <source>Other Albums by %1</source>
         <translation>Други албуми от %1</translation>
     </message>
@@ -175,36 +163,18 @@
 <context>
     <name>AlbumModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="145"/>
-        <source>Album</source>
-        <translation>Албум</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="260"/>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="302"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
         <source>All albums from %1</source>
         <translation>Всички албуми на %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="304"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
         <source>All albums</source>
         <translation>Всички албуми</translation>
     </message>
 </context>
 <context>
-    <name>AlbumView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="155"/>
-        <source>After you have scanned your music collection you will find your latest album additions right here.</source>
-        <translation>След като сканирате музикалната ви колекция, ще откриете най-скоро добавените албуми тук.</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="157"/>
-        <source>This collection doesn&apos;t have any recent albums.</source>
-        <translation>В тази колекция все още няма добавени наскоро албуми</translation>
-    </message>
-</context>
-<context>
     <name>ArtistInfoWidget</name>
     <message>
         <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
@@ -212,120 +182,120 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
         <source>Top Hits</source>
         <translation>Най-големи хитове</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
         <source>Related Artists</source>
         <translation>Свързани артисти</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="77"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
         <source>Albums</source>
         <translation>Албуми</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="86"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="125"/>
-        <source>Click to show SuperCollection Albums</source>
-        <translation>Покажи албумите от супер колекцията</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="127"/>
-        <source>Click to show Official Albums</source>
-        <translation>Покажи само официалните албуми</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation>Съжалявам, но не откривам нито един албум за този артист!</translation>
     </message>
-</context>
-<context>
-    <name>ArtistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="272"/>
-        <source>After you have scanned your music collection you will find your tracks right here.</source>
-        <translation>След като приключи сканирането на музикалната ти колекция, ще откриеш твоята музика тук.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation>Съжалявам, но не откривам нито един подобен на този артист!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="274"/>
-        <source>This collection is currently empty.</source>
-        <translation>Базата данни с песни е празна.</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="291"/>
-        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
-        <translation>Съжалявам.
-Твоят филтър &apos;%1&apos; не върна никакъв резултат.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation>Съжалявам, но не откривам нито една хитова песен на този артист!</translation>
     </message>
 </context>
 <context>
     <name>AudioControls</name>
     <message>
-        <location filename="../src/audiocontrols.ui" line="75"/>
+        <location filename="../src/AudioControls.ui" line="75"/>
         <source>Prev</source>
         <translation>Предходна</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="87"/>
+        <location filename="../src/AudioControls.ui" line="87"/>
         <source>Play</source>
         <translation>Изпълни</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="94"/>
+        <location filename="../src/AudioControls.ui" line="94"/>
         <source>Pause</source>
         <translation>Пауза</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="103"/>
+        <location filename="../src/AudioControls.ui" line="103"/>
         <source>Next</source>
         <translation>Следваща</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="214"/>
+        <location filename="../src/AudioControls.ui" line="229"/>
         <source>Artist</source>
         <translation>Артист</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="236"/>
+        <location filename="../src/AudioControls.ui" line="248"/>
         <source>Album</source>
         <translation>Албум</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="265"/>
+        <location filename="../src/AudioControls.ui" line="277"/>
         <source>Owner</source>
         <translation>Притежател</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="302"/>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation>социален</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
         <source>love</source>
         <translation>Харесай</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="346"/>
+        <location filename="../src/AudioControls.ui" line="383"/>
         <source>Time</source>
         <translation>Продължителност</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="375"/>
+        <location filename="../src/AudioControls.ui" line="412"/>
         <source>Time Left</source>
         <translation>Оставащо време</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="453"/>
+        <location filename="../src/AudioControls.ui" line="493"/>
         <source>Shuffle</source>
         <translation>Разбъркано</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="466"/>
+        <location filename="../src/AudioControls.ui" line="506"/>
         <source>Repeat</source>
         <translation>Повтори</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="504"/>
+        <location filename="../src/AudioControls.ui" line="544"/>
         <source>Low</source>
         <translation>0</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="536"/>
+        <location filename="../src/AudioControls.ui" line="576"/>
         <source>High</source>
         <translation>100%</translation>
     </message>
@@ -333,41 +303,42 @@
 <context>
     <name>AudioEngine</name>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="199"/>
-        <source>Tomahawk is stopped.</source>
-        <translation>Tomahawk е спрян</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="369"/>
-        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
-        <translation>Tomahawk изпълнява &quot;%1&quot; от %2%3.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="372"/>
-        <source>on album %1</source>
-        <translation>от албум %1</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CategoryAddItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="61"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="100"/>
-        <source>New Playlist</source>
-        <translation>Нов списък</translation>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation>Създай нов списък</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation>Създай нова станция</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="63"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>New Station</source>
         <translation>Нова станция</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>%1 Station</source>
         <translation>%1 Станция</translation>
     </message>
@@ -375,12 +346,12 @@
 <context>
     <name>CategoryItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="63"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
         <source>Playlists</source>
         <translation>Списъци</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="65"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
         <source>Stations</source>
         <translation>Станции</translation>
     </message>
@@ -388,33 +359,12 @@
 <context>
     <name>ClearButton</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/clearbutton.cpp" line="38"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
         <source>Clear</source>
         <translation>Изчисти</translation>
     </message>
 </context>
 <context>
-    <name>CollectionFlatModel</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="72"/>
-        <source>My Collection</source>
-        <translation>Моята колекция</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="74"/>
-        <source>Collection of %1</source>
-        <translation>Колекцията на %1</translation>
-    </message>
-</context>
-<context>
-    <name>CollectionView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionview.cpp" line="85"/>
-        <source>This collection is empty.</source>
-        <translation>Тази колекция е празна.</translation>
-    </message>
-</context>
-<context>
     <name>ContextWidget</name>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
@@ -423,12 +373,12 @@
     </message>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="344"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
         <source>Show Footnotes</source>
         <translation>Покажи подробности</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="338"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
         <source>Hide Footnotes</source>
         <translation>Скрий подробности</translation>
     </message>
@@ -440,40 +390,52 @@
         <source>Tomahawk Crash Reporter</source>
         <translation>Автоматично докладване на грешки на Tomahawk</translation>
     </message>
-    <message>
+    <message utf8="true">
         <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
-        <source>&lt;p&gt;&lt;b&gt;Sorry!&lt;/b&gt;&amp;nbsp;Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;b&gt;Извинявай&lt;/b&gt;!
- Tomahawk спря да работи. Информация относно проблемът се изпраща към нашата централа, за да можем да го отстраним.</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Извинявай!&lt;/span&gt; Tomahawk заби. 
+Моля уведоми ни  за този слуай! 
+Tomahaw създаде доклад относно това и изпращайки го, ще помогнеш за по-добрата работа на приложението за в бъдеще.
+Изпрати директно до разработчиците на Tomahawk&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="172"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation>Изпрати докладът</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation>Не изпращай</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
         <source>Abort</source>
         <translation>Откажи</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="192"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
         <source>You can disable sending crash reports in the configuration dialog.</source>
         <translation>Можете да спрете изпращането на информация относно проблеми в панелът с настройки.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="153"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
         <source>Uploaded %L1 of %L2 KB.</source>
-        <translation>Качени %L1 от %В2 КБ</translation>
+        <translation>Качени %L1 от %В2 КБ.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="167"/>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="183"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="176"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
         <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
-        <translation>Изпращането приключи. Благодарим ви за отзивчивостта! :)</translation>
+        <translation>Изпращането приключи. &lt;b&gt;Благодарим ви за отзивчивостта!&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
         <source>Failed to send crash info.</source>
         <translation>Изпращането на краш-данни е неуспешно.</translation>
     </message>
@@ -481,7 +443,7 @@
 <context>
     <name>DatabaseCommand_AllAlbums</name>
     <message>
-        <location filename="../src/libtomahawk/database/databasecommand_allalbums.cpp" line="109"/>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
@@ -489,41 +451,43 @@
 <context>
     <name>DelegateConfigWrapper</name>
     <message>
-        <location filename="../src/delegateconfigwrapper.cpp" line="61"/>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation>Относно</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
         <source>Delete Account</source>
         <translation>Изтрий регистрация</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>Относно тази регистрация</translation>
+    </message>
 </context>
 <context>
     <name>DiagnosticsDialog</name>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="20"/>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
         <source>Tomahawk Diagnostics</source>
         <translation>Диагностична информация относно Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="38"/>
-        <source>Update</source>
-        <translation>Обнови</translation>
-    </message>
-    <message>
-        <location filename="../src/diagnosticsdialog.ui" line="45"/>
-        <source>Copy to Clipboard</source>
-        <translation>Копирай в буферът</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DropJob</name>
     <message>
-        <location filename="../src/libtomahawk/dropjob.cpp" line="832"/>
-        <source>No tracks found for given %1</source>
-        <translation>Няма открити изпълнения на %1</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GlobalSearchWidget</name>
     <message>
-        <location filename="../src/searchbox.ui" line="14"/>
+        <location filename="../src/SearchBox.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
@@ -539,66 +503,48 @@
 <context>
     <name>InfoBar</name>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.ui" line="26"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Информационно поле</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="87"/>
-        <source>Automatically update</source>
-        <translation>Автоматично обновление</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="95"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
         <source>Filter...</source>
         <translation>Филтър...</translation>
     </message>
 </context>
 <context>
-    <name>JobStatusView</name>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Searching For</source>
-        <translation>Търсене за</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Pending</source>
-        <translation>Изчакващо</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="94"/>
-        <source>Idle</source>
-        <translation>Бездействам</translation>
-    </message>
-</context>
-<context>
     <name>LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
         <source>Scrobble tracks to Last.fm</source>
         <translation>Изпращане на изпълнени песни към Last.fm</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
         <source>Username:</source>
         <translation>Потребителско име:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
         <source>Password:</source>
         <translation>Парола:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
         <source>Test Login</source>
         <translation>Пробна връзка</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation>Импортирай история на просвирените песни</translation>
+    </message>
 </context>
 <context>
     <name>LastfmContext</name>
@@ -612,8 +558,8 @@
     <name>LatchedStatusItem</name>
     <message>
         <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
-        <source>%1 is listening along to you!</source>
-        <translation>%1 слуша заедно с теб!</translation>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -647,12 +593,12 @@
 <context>
     <name>LoadXSPFDialog</name>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>Load XSPF File</source>
         <translation>Зареди XSPF файл</translation>
     </message>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>XSPF Files (*.xspf)</source>
         <translation>XSPF файлове (*.xspf)</translation>
     </message>
@@ -660,53 +606,256 @@
 <context>
     <name>LocalCollection</name>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Bookmarks</source>
         <translation>Отметки</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Saved tracks</source>
         <translation>Запаметени изпълнения</translation>
     </message>
 </context>
 <context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>NewPlaylistWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="20"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
         <source>Enter a title for the new playlist:</source>
-        <translation>Въведи име за новият списък</translation>
+        <translation>Въведи име за новият списък:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
         <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
         <translation>Tomahawk предлага множесто начини за създаване на списъци за изпълнение и откриване на любимата ти музика!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="47"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
         <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>Просто въведи стил или име и Tomahawk ще ти предложи няколко песни с които да стартира новият ти списък:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.cpp" line="43"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
         <source>&amp;Create Playlist</source>
-        <translation>Създай списък</translation>
+        <translation>&amp;Създай списък</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.h" line="50"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
         <source>Create a new playlist</source>
         <translation>Създай нов списък</translation>
     </message>
 </context>
 <context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>Нови албуми</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation>Артист</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation>Композитор</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation>Албум</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation>Песен</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation>Продължителност</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation>Качество</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation>Възраст</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation>Година</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Големина</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation>Източник</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation>Резултат</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation>Име</translation>
+    </message>
+</context>
+<context>
     <name>PlaylistItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="162"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
         <source>played %1 by you</source>
         <translation>изпълнена %1 от мен</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="164"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
         <source>played %1 by %2</source>
         <translation>изпълнена %1 от %2</translation>
     </message>
@@ -714,17 +863,17 @@
 <context>
     <name>PlaylistLargeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="156"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
         <source>played %1 by you</source>
         <translation>изпълнена %1 от мен</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
         <source>played %1 by %2</source>
         <translation>изпълнена %1 от %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="165"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
         <source>added %1</source>
         <translation>добавен %1</translation>
     </message>
@@ -732,22 +881,22 @@
 <context>
     <name>PlaylistModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
         <source>A playlist by %1, created %2</source>
-        <translation>Списък за изпълнение от %1, създаден %2</translation>
+        <translation>Списък  - създател %1, от %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="78"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
         <source>you</source>
         <translation>ти</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
         <source>All tracks by %1 on album %2</source>
         <translation>Всички песни от %1, от албум %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="152"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
         <source>All tracks by %1</source>
         <translation>Всички песни от %1</translation>
     </message>
@@ -755,37 +904,37 @@
 <context>
     <name>PlaylistTypeSelectorDlg</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="32"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
         <source>New Playlist</source>
         <translation>Нов списък</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="49"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
         <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
-        <translation>Обикновен списък. Име, няколко песни и си ти на ход! ;)</translation>
+        <translation>Обикновен списък. Име, няколко песни и си ти на ход! ;-)</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="75"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
         <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
         <translation>Не знаеш точно какво искаш? Дай на Tomahawk няколко начални идеи и му позволи да създаде списък с песни за теб!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="92"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="102"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
         <source>New Playlist...</source>
-        <translation>Нов списък</translation>
+        <translation>Нов списък...</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="113"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
         <source>Create Manual Playlist</source>
         <translation>Създай ръчно създаден списък</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="123"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
         <source>Create Automatic Playlist</source>
         <translation>Създай автоматично генериран списък</translation>
     </message>
@@ -793,7 +942,12 @@
 <context>
     <name>PlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistview.cpp" line="145"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation>Този списък е празен в момента.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
         <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
         <translation>Този списък в момента е празен. Добави няколко изпълнения и се наслади на музиката!</translation>
     </message>
@@ -801,63 +955,58 @@
 <context>
     <name>ProxyDialog</name>
     <message>
-        <location filename="../src/proxydialog.ui" line="17"/>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
         <source>Proxy Settings</source>
         <translation>Proxy настройки</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="70"/>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
         <source>Hostname of proxy server</source>
         <translation>Адрес на proxy сървър</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="77"/>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
         <source>Host</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="84"/>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="104"/>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
         <source>Proxy login</source>
         <translation>Настройка на влизане</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="111"/>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
         <source>User</source>
         <translation>Потребител</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="118"/>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
         <source>Password</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="128"/>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
         <source>Proxy password</source>
         <translation>Парола за proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="135"/>
-        <source>Type</source>
-        <translation>Тип</translation>
-    </message>
-    <message>
-        <location filename="../src/proxydialog.ui" line="142"/>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
         <source>No Proxy Hosts:
 (Overrides system proxy)</source>
         <translation>Без адреси за Proxy  (Отменя системните настройки)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="150"/>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
         <source>localhost *.example.com (space separated)</source>
         <translation>localhost *.example.com (отделени с интервал)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="167"/>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
         <source>Use proxy for DNS lookups?</source>
         <translation>Използване на Proxy за DNS заявки?</translation>
     </message>
@@ -865,82 +1014,82 @@
 <context>
     <name>QObject</name>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="214"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
         <source>%n year(s) ago</source>
         <translation><numerusform>преди %n година</numerusform><numerusform>преди %n години</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="216"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
         <source>%n year(s)</source>
         <translation><numerusform>%n година</numerusform><numerusform>%n години</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="222"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
         <source>%n month(s) ago</source>
         <translation><numerusform>преди %n месец</numerusform><numerusform>преди %n месеца</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
         <source>%n month(s)</source>
         <translation><numerusform>%n месец</numerusform><numerusform>%n месеца</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="230"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
         <source>%n week(s) ago</source>
         <translation><numerusform>преди %n седмица</numerusform><numerusform>преди %n седмици</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="232"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
         <source>%n week(s)</source>
         <translation><numerusform>%n седмица</numerusform><numerusform>%n седмици</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="238"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>преди %n ден</numerusform><numerusform>преди %n дена</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="240"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
         <source>%n day(s)</source>
         <translation><numerusform>%n ден</numerusform><numerusform>%n дена</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="246"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>преди  %n час</numerusform><numerusform>преди  %n часа</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="248"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
         <source>%n hour(s)</source>
         <translation><numerusform> %n час</numerusform><numerusform> %n часа</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="254"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
         <source>%1 minutes ago</source>
         <translation>преди %1 минути</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="256"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
         <source>%1 minutes</source>
         <translation>%1 минути</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="260"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
         <source>just now</source>
         <translation>току-що</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="34"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
         <source>Friend Finders</source>
         <translation>Търсене на приятели</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
         <source>Music Finders</source>
         <translation>Търсене на музика</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="39"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
         <source>Status Updaters</source>
         <translation>Обновяване на статуси</translation>
     </message>
@@ -956,26 +1105,31 @@
 <context>
     <name>QueueView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="26"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Информационно поле</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="41"/>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="120"/>
-        <source>Show Queue</source>
-        <translation>Покажи опашката</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation>Отвори опашката</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="130"/>
-        <source>Hide Queue</source>
-        <translation>Скрий опашката</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation>Затвори опашката</translation>
     </message>
 </context>
 <context>
     <name>RelatedArtistsContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
         <source>Related Artists</source>
         <translation>Подобни артисти</translation>
     </message>
@@ -983,20 +1137,20 @@
 <context>
     <name>ResolverConfigDelegate</name>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="110"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
         <source>Not found: %1</source>
         <translation>Не откривам : %1</translation>
     </message>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="113"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
         <source>Failed to load: %1</source>
-        <translation>Неуспех при зареждане на  %1</translation>
+        <translation>Не мога да заредя %1</translation>
     </message>
 </context>
 <context>
     <name>SearchLineEdit</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/searchlineedit.cpp" line="58"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
         <source>Search</source>
         <translation>Търси</translation>
     </message>
@@ -1004,12 +1158,12 @@
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="54"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
         <source>Search: %1</source>
         <translation>Търси %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="55"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
         <source>Results for &apos;%1&apos;</source>
         <translation>Резултати за &apos;%1&apos;</translation>
     </message>
@@ -1017,39 +1171,49 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="245"/>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
         <source>Collection</source>
         <translation>Колекция</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="252"/>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
         <source>Advanced</source>
         <translation>Разширени</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="124"/>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
         <source>All</source>
         <translation>Всички</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="238"/>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation>Някои промени няма да имат ефект, докато програмата не бъде рестартирана.</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
         <source>Services</source>
         <translation>Услуги</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="396"/>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
         <source>Install resolver from file</source>
         <translation>Инсталирай услиги за търсене от файл</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Information</source>
-        <translation>Информация</translation>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Changing this setting requires a restart of Tomahawk!</source>
-        <translation>Промяната на тази настройка(и) изисква рестартиране на програмата!</translation>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>Информация</translation>
     </message>
 </context>
 <context>
@@ -1071,56 +1235,94 @@
     </message>
 </context>
 <context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Бланка</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>Обложка</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation>Етикет</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation>Остават още %1 символа</translation>
+    </message>
+</context>
+<context>
     <name>SourceDelegate</name>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="55"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
         <source>Track</source>
         <translation>Песен</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="56"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
         <source>Album</source>
         <translation>Албум</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="57"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
         <source>Artist</source>
         <translation>Артист</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="58"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
         <source>Local</source>
         <translation>Локално</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="59"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
         <source>Top 10</source>
         <translation>Първите 10</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="187"/>
-        <source>Offline</source>
-        <translation>Извън линия</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
         <source>All available tracks</source>
         <translation>Всички налични изпълнения</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="196"/>
-        <source>Online</source>
-        <translation>На линия</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="289"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="330"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
         <source>Show</source>
         <translation>Покажи</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="291"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="332"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
         <source>Hide</source>
         <translation>Скрий</translation>
     </message>
@@ -1128,32 +1330,32 @@
 <context>
     <name>SourceInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="30"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
         <source>Recent Albums</source>
         <translation>Скорошни албуми</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="74"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
         <source>Latest Additions</source>
         <translation>Последно добавени</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="88"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
         <source>Recently Played Tracks</source>
         <translation>Наскоро изпълнени песни</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="80"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
         <source>New Additions</source>
         <translation>Нови попълнения</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="83"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
         <source>My recent activity</source>
         <translation>Скорошна активност</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="87"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
         <source>Recent activity from %1</source>
         <translation>Скорошна активност на %1</translation>
     </message>
@@ -1161,55 +1363,129 @@
 <context>
     <name>SourceItem</name>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="65"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
         <source>Collection</source>
         <translation>Колекция</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="73"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
         <source>Latest Additions</source>
         <translation>Последно добавени</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="77"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
         <source>Recently Played</source>
         <translation>Наскоро изпълнени песни</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="81"/>
-        <source>Loved Tracks</source>
-        <translation>Харесани песни</translation>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation>Супер колекция
+/Сборен излед от локалните и наличните в колекциите на приятелите ти/</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="146"/>
-        <source>SuperCollection</source>
-        <translation>Супер колекция</translation>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation>Последно добавени към колекцията</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation>Последно добавени в колекцията на %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation>Съжалявам, но не откривам нито една ново-добавена позиция!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation>Наскоро изпълнени песни</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation>Наскоро изпълнени песни от теб</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation>Наскоро изпълнените песни от %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation>Съжалявам, но не откривам нито една наскоро изпълнена песен!</translation>
     </message>
 </context>
 <context>
     <name>SourceTreeView</name>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="188"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
         <source>&amp;Copy Link</source>
         <translation>&amp;Копирай адресът</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
         <source>&amp;Delete %1</source>
         <translation>&amp;Изтрий %1</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="207"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation>Добави към моите списъци</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation>Добави към моите автоматично-генерирани списъци</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation>Добави към станциите ми</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
         <source>&amp;Export Playlist</source>
         <translation>&amp;Изнеси списък</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="341"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation>списък</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation>автоматично-генериран списък</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation>станция</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation>Изтрий %1?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation>Наистина ли желаеш да изтриеш %1 &lt;b&gt;&apos;&apos;%2&quot; &lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
         <source>Save XSPF</source>
         <translation>Запази XSPF</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="342"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
         <source>Playlists (*.xspf)</source>
         <translation>Списъци (*.xspf)</translation>
     </message>
@@ -1217,72 +1493,78 @@
 <context>
     <name>SourcesModel</name>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="78"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
         <source>Group</source>
         <translation>Гпупирай</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="81"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
         <source>Collection</source>
         <translation>Колекция</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="84"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
         <source>Playlist</source>
         <translation>Списък за изпълнение</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="87"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
         <source>Automatic Playlist</source>
         <translation>Автоматичен списък</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="90"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
         <source>Station</source>
         <translation>Станция</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="268"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
         <source>Browse</source>
         <translation>Разгледай</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="269"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
         <source>Search History</source>
         <translation>Търси в историята</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="271"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
         <source>My Music</source>
         <translation>Моята музика</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="279"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
         <source>SuperCollection</source>
-        <translation>Супер колекция</translation>
+        <translation>Супер колекция
+/Сборен излед от локалните и наличните в колекциите на приятелите ти/</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="285"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
         <source>Top Loved Tracks</source>
         <translation>Най-харесвани песни</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="273"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
         <source>Dashboard</source>
         <translation>Табло</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="290"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
         <source>Recently Played</source>
         <translation>Наскоро изпълнени песни</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
         <source>Charts</source>
         <translation>Класации</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="300"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>Нови албуми</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
         <source>Friends</source>
         <translation>Приятели</translation>
     </message>
@@ -1290,66 +1572,88 @@
 <context>
     <name>SpotifyConfig</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="48"/>
-        <source>Configure your Spotify credentials</source>
-        <translation>Настрой данните за вход в Spotify:</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation>Настрой своята регистрация в Spotify</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="65"/>
-        <source>Username:</source>
-        <translation>Потребителско име</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation>Потребителско име или електронна поща във Facebook</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="72"/>
-        <source>placeholderUsername</source>
-        <translation>потребителско име</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>Влез</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
-        <source>Password:</source>
-        <translation>Парола:</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation>Щракни с десен бутон върху, който и да е списък в Tomahawk, за да го добавиш и в Spotify.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation>Високо качество</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="86"/>
-        <source>placeholderPw</source>
-        <translation>парола</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation>Spotify списъци, които да бъдат поддържани обновени:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="116"/>
-        <source>High Quality Streaming</source>
-        <translation>Висококачествен поток</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation>Изтрий запазените списъци, когато бъде премахната синхронизацията</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="186"/>
-        <source>This product uses SPOTIFY(R) CORE but is not endorsed, certified or otherwise approved in any way by Spotify. Spotify is the registered trade mark of the Spotify Group.</source>
-        <translation>Този продукт ползва ядрото на  SPOTIFY(R), но не е поддържан, сертифицират или одобрен по какъвто и да е начин от Spotify. 
-Spotify e TM на Spotify Group.</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>Потребителско име:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>Парола:</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation>Изтривам и в Spotify?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation>Желаеш ли да изтриеш и съответните Spotify списъци?</translation>
     </message>
 </context>
 <context>
     <name>StackedSettingsDialog</name>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="14"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
         <source>Tomahawk Settings</source>
         <translation>Настройки на Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="158"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
         <source>Local Music Information</source>
         <translation>Информация за локалната музика</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="166"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
         <source>Path to scan for music files:</source>
         <translation>Път за сканиране за музика:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="180"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
         <source>The Echo Nest supports keeping track of your catalog metadata
  and using it to craft personalized radios. Enabling this option
  will allow you (and all your friends) to create automatic playlists
@@ -1360,133 +1664,197 @@
 базирани на вашият персонален вкус.</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="186"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
         <source>Upload collection list to The Echo Nest to enable user radio</source>
         <translation>Качи списък на колекцията ти в The Echo Nest за да се създаде потребителско радио</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="199"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
         <source>Watch for changes</source>
         <translation>Наблюдавай за промени</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="208"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
         <source>Time between scans, in seconds:</source>
         <translation>Време между две сканирания, в секунди</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="98"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation>Разширени настройки</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation>Начин за свързване</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation>Без. (само изходящи връзки)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation>Ползвай UPnP (препоръчително)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation>Ползвай статичен IP адрес/име и порт</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation>Настрой тук, своят външен IP адрес или име. Моля увери се, че си настроил прехвърляне на избраният порт, към адресът ти от локалната мрежа.</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation>SOCKS Proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation>Ползвай SOCKS Proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
         <source>Internet Services</source>
         <translation>Интернет услуги</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="109"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
         <source>Install from file...</source>
         <translation>Инсталирай от файл...</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="129"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
         <source>Filter by capability:</source>
         <translation>Филтрирай по възможности:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="245"/>
-        <source>Advanced Network Settings</source>
-        <translation>Разширени мрежови настройки</translation>
-    </message>
-    <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="265"/>
-        <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>Ако изпитваш затруднения при свързването, пробвай да настроиш тук твоят външен IP адрес или име на хост.</translation>
-    </message>
-    <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="283"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
         <source>Static Host Name:</source>
         <translation>Статичен адрес:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="299"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
         <source>Static Port:</source>
         <translation>Статичен порт:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="321"/>
-        <source>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</source>
-        <translation>Винаги ползвай статичен порт. (Това ще премахне настройките зададени от UPnP)</translation>
-    </message>
-    <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="345"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
         <source>Proxy Settings...</source>
         <translation>Настройка на Proxy:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="383"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation>Други настройки</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
         <source>Send reports after Tomahawk crashed</source>
         <translation>Изпрати сервизна информация след забиване.</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="396"/>
-        <source>Allow web browsers to interact with Tomahawk</source>
-        <translation>Позволи на web браузъри да работят заедно с Tomahawk.</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation>Позволи на браузърите да работят съвместно с Tomahawk (препоръчително)</translation>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="409"/>
-        <source>Use UPnP to establish port forward</source>
-        <translation>Ползвай UPnP за настройка на прехвърляне на портове.</translation>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::AccountDelegate</name>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="200"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
         <source>Add Account</source>
         <translation>Добави регистрация</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="250"/>
-        <source>Remove Account</source>
-        <translation>Премахни регистрация</translation>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="360"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
         <source>%1 downloads</source>
         <translation>%1 сваляния</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="585"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
         <source>Online</source>
         <translation>На линия</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="590"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
         <source>Connecting...</source>
         <translation>Свързване...</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="595"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
         <source>Offline</source>
         <translation>Извън линия</translation>
     </message>
 </context>
 <context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation>Изисква се ръчно инсталиране</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation>За съжаление, автоматичното инсталиране на този компонен е деактивирано за твоята платформа.
+&lt;br /&gt;&lt;br /&gt;
+Моля използвай опцията &apos;Инсталирай от файл&apos;, намираща се по-горе. За целта е необходимо предварително да изтеглиш необходимите файлове за твоята платформа и да ги компилираш самостоятелно. 
+Допълнителни инструкции могат да бъдат открити на &lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</translation>
+    </message>
+</context>
+<context>
     <name>Tomahawk::Accounts::GoogleWrapper</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="82"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
         <source>Configure this Google Account</source>
         <translation>Настрой регистрацията в Google</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
         <source>Google Address</source>
         <translation>Google адрес</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="84"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
         <source>Enter your Google login to connect with your friends using Tomahawk!</source>
-        <translation>Въведи твоята Google регистрация за да можеш да се свържеш с твоите приятели, ползващи Tomahawk</translation>
+        <translation>Въведи твоята Google регистрация за да можеш да се свържеш с твоите приятели, ползващи Tomahawk!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="85"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
         <source>username@gmail.com</source>
         <translation>потребителско_име@gmail.com</translation>
     </message>
@@ -1494,7 +1862,7 @@
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.h" line="42"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
         <source>Connect to Google Talk to find your friends</source>
         <translation>Свържи се с Google Talk да можеш да търсиш твоите приятели</translation>
     </message>
@@ -1502,12 +1870,12 @@
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperSip</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="61"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
         <source>Add Friend</source>
         <translation>Добави приятел</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
         <source>Enter Google Address:</source>
         <translation>Въведи Google регистрация:</translation>
     </message>
@@ -1515,7 +1883,7 @@
 <context>
     <name>Tomahawk::Accounts::LastFmAccountFactory</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmAccount.h" line="47"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
         <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
         <translation>Качи информация за изпълнените песни в Last.fm и открий свободно разпространявани.</translation>
     </message>
@@ -1523,26 +1891,104 @@
 <context>
     <name>Tomahawk::Accounts::LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="108"/>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="123"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation>Тествам...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation>Тествай връзката</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation>Импортирам %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation>Импортирам...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation>Непълна информация. Продължи.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation>Историята на просвирените песни е импортирана</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
         <source>Failed</source>
         <translation>Неуспешно</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="113"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
         <source>Success</source>
-        <translation>Успех!</translation>
+        <translation>Ура!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="129"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
         <source>Could not contact server</source>
         <translation>Не мога да се свържа със сървъра</translation>
     </message>
 </context>
 <context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation>Синхронизирай със Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation>Включи отново синхронизирането със Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation>Спри синхронизацията със Spotify</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>Влизам...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation>Неуспех: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>Влез</translation>
+    </message>
+</context>
+<context>
     <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccount.h" line="44"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
         <source>Play music from and sync your playlists with Spotify Premium</source>
         <translation>Слушай музика и синхронизирай твоите списъци със  Spotify Premium</translation>
     </message>
@@ -1550,7 +1996,7 @@
 <context>
     <name>Tomahawk::Accounts::TwitterAccountFactory</name>
     <message>
-        <location filename="../src/accounts/twitter/twitteraccount.h" line="50"/>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
         <source>Connect to your Twitter followers.</source>
         <translation>Свържи се с твоите приятели в Twitter</translation>
     </message>
@@ -1558,137 +2004,137 @@
 <context>
     <name>Tomahawk::Accounts::TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="58"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="141"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="189"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
         <source>Tweet!</source>
         <translation>Чурулик!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="66"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="167"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
         <source>Status: No saved credentials</source>
         <translation>Няма запазени данни за вход</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="67"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="92"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="168"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
         <source>Authenticate</source>
         <translation>Удостовери</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="74"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="136"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
         <source>Status: Credentials saved for %1</source>
-        <translation>Няма запазени данни за вход</translation>
+        <translation>Статус: данните са запаметени за %1</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="75"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
         <source>De-authenticate</source>
         <translation>Премахни удостоверяване</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>Tweetin&apos; Error</source>
         <translation>Грешка при изпращане на съобщение</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
         <source>The credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation>Данните за вход не могат да бъдат потвърдени.
 Моля, опитай отново.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="152"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
         <source>Status: Error validating credentials</source>
         <translation>Грешка при валидиране на данни за вход</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="179"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
         <source>Global Tweet</source>
         <translation>Общо съобщение</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="184"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
         <source>Direct Message</source>
         <translation>Лично съобщение</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="185"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
         <source>Send Message!</source>
-        <translation>Чурулик!</translation>
+        <translation>Изпрати съобщението!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="186"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
         <source>@Mention</source>
         <translation>@Споменаване</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="187"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
         <source>Send Mention!</source>
-        <translation>Чурулик!</translation>
+        <translation>Изпрати споменаването!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
         <source>You must enter a user name for this type of tweet.</source>
         <translation>Въведи име на потребител, за този вид съобщение.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
         <source>Your saved credentials could not be loaded.
 You may wish to try re-authenticating.</source>
         <translation>Данните ти за вход не могат да бъдат заредени.
 Моля, оторизирай програмата отново.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
         <source>Your saved credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation>Запаметените данни за вход не могат да бъдат потвърдени.
 Моля, оторизирай програмата отново.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>There was an error posting your status -- sorry!</source>
         <translation>Грешка при побликуване. Опитай отново.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Tweeted!</source>
         <translation>Изчуруликано!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
         <source>Your tweet has been posted!</source>
         <translation>Съобщението ти беше побликувано.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
         <source>There was an error posting your direct message -- sorry!</source>
         <translation>Грешка при изпращане на лично съобщение.
 Опитай отново.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Your message has been posted!</source>
-        <translation>Съобщението беще побликувано.</translation>
+        <translation>Съобщението беще побликувано!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::XmppAccountFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppaccount.h" line="51"/>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
         <source>Log on to your Jabber/XMPP account to connect to your friends</source>
         <translation>Свържи се с твоята Jabber/XMPP регистрация, за да откриеш твоите приятели</translation>
     </message>
@@ -1696,7 +2142,7 @@
 <context>
     <name>Tomahawk::Accounts::ZeroconfFactory</name>
     <message>
-        <location filename="../src/accounts/zeroconf/zeroconfaccount.h" line="42"/>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
         <source>Automatically connect to Tomahawks on the local network</source>
         <translation>Автоматично свързва Tomahawk с останалите копия на програмата,
  работещи в локалната мрежа.</translation>
@@ -1705,93 +2151,113 @@
 <context>
     <name>Tomahawk::ContextMenu</name>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="79"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
         <source>&amp;Play</source>
         <translation>&amp;Изпълни</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="82"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="142"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="181"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
         <source>Add to &amp;Queue</source>
         <translation>Добави към &amp;опашката</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="87"/>
-        <source>&amp;Continue playback after this track</source>
-        <translation>&amp;Продължи възпроизвеждането след тази песен</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="89"/>
-        <source>&amp;Stop playback after this track</source>
-        <translation>&amp;Спри възпроизвеждането след тази песен</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="96"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="277"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
         <source>&amp;Love</source>
         <translation>&amp;Харесай</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
         <source>&amp;Copy Track Link</source>
         <translation>&amp;Копирай адресът на изпълнението</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="139"/>
-        <source>Show &amp;Album page</source>
-        <translation>Покажи &amp;страницата на албума</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="178"/>
-        <source>Show &amp;Artist page</source>
-        <translation>Покажи страницата на &amp;артиста</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="272"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
         <source>Un-&amp;Love</source>
         <translation>Не-&amp;харесай</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Items</source>
         <translation>&amp;Изтрий позициите</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation>&amp;Покажи страницата на песента</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Item</source>
         <translation>&amp;Изтрий позицията</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation>&amp;Покажи страницата на албума</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation>&amp;Покажи страницата на артистът</translation>
+    </message>
 </context>
 <context>
     <name>Tomahawk::CustomPlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="123"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
         <source>Top Loved Tracks</source>
         <translation>Най-харесвани песни</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="127"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
         <source>Your loved tracks</source>
         <translation>Песните, които харесам.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="129"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
         <source>%1&apos;s loved tracks</source>
         <translation>Песните, каресвани от %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="138"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
         <source>The most loved tracks from all your friends</source>
         <translation>Най-харесваните песни от всички твои приятели.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="142"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
         <source>All of your loved tracks</source>
         <translation>Всички песни, които харесвам.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
         <source>All of %1&apos;s loved tracks</source>
         <translation>Всички песни, харесвани от %1</translation>
     </message>
@@ -1799,12 +2265,32 @@
 <context>
     <name>Tomahawk::DropJobNotifier</name>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="102"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation>списък</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation>артист</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation>песен</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation>албум</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
         <source>Fetching %1 from database</source>
         <translation>Извличане на %1 от БД</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="106"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
         <source>Parsing %1 %2</source>
         <translation>Обединяване на %1 %2</translation>
     </message>
@@ -1812,7 +2298,7 @@
 <context>
     <name>Tomahawk::DynamicControlList</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
         <source>Click to collapse</source>
         <translation>Свий</translation>
     </message>
@@ -1831,7 +2317,7 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="230"/>
         <source>Failed to generate preview with the desired filters</source>
-        <translation>Неуспех при генериране на предварителен преглед на избраните филтри.</translation>
+        <translation>Не мога да генерирам предварителен преглед на избраните филтри.</translation>
     </message>
 </context>
 <context>
@@ -1850,17 +2336,17 @@
 <context>
     <name>Tomahawk::DynamicView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
         <source>Add some filters above to seed this station!</source>
         <translation>Добави няколко критерия, за да разпространиш тази станция</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="149"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
         <source>Press Generate to get started!</source>
         <translation>Натисни &quot;Генерирай&quot; за да почне просвирване.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="151"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
         <source>Add some filters above, and press Generate to get started!</source>
         <translation>Добави няколко критерия и натисни &quot;Генерирай&quot; за да почне просвирване.</translation>
     </message>
@@ -1960,72 +2446,72 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="343"/>
         <source>Major</source>
-        <translation>Major</translation>
+        <translation>Мажор</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="344"/>
         <source>Minor</source>
-        <translation>Minor</translation>
+        <translation>Минор</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
         <source>C</source>
-        <translation>C</translation>
+        <translation>до</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
         <source>C Sharp</source>
-        <translation>C#</translation>
+        <translation>до#</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
         <source>D</source>
-        <translation type="unfinished"/>
+        <translation>ре</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
         <source>E Flat</source>
-        <translation type="unfinished"/>
+        <translation>ре \flat </translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
         <source>E</source>
-        <translation type="unfinished"/>
+        <translation>ми</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
         <source>F</source>
-        <translation type="unfinished"/>
+        <translation>фа</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
         <source>F Sharp</source>
-        <translation type="unfinished"/>
+        <translation>фа#</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="369"/>
         <source>G</source>
-        <translation type="unfinished"/>
+        <translation>сол</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="370"/>
         <source>A Flat</source>
-        <translation type="unfinished"/>
+        <translation>ла \flat </translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="371"/>
         <source>A</source>
-        <translation type="unfinished"/>
+        <translation>ла</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="372"/>
         <source>B Flat</source>
-        <translation type="unfinished"/>
+        <translation>си \flat </translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="373"/>
         <source>B</source>
-        <translation type="unfinished"/>
+        <translation>си</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
@@ -2085,7 +2571,7 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="403"/>
         <source>Key</source>
-        <translation type="unfinished"/>
+        <translation>Ключ</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="404"/>
@@ -2141,7 +2627,7 @@
     <message numerus="yes">
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
         <source>about %n minute(s) long</source>
-        <translation type="unfinished"><numerusform>около %n минути</numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>около %n минута</numerusform><numerusform>около %n минути</numerusform></translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
@@ -2182,97 +2668,97 @@
 <context>
     <name>Tomahawk::EchonestSteerer</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="57"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
         <source>Steer this station:</source>
-        <translation>Задръж тази станция:</translation>
+        <translation>Настройки:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="71"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
         <source>Much less</source>
         <translation>Много по-малко</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="72"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
         <source>Less</source>
         <translation>По-малко</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="73"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
         <source>A bit less</source>
         <translation>Малко по-малко</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="74"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
         <source>Keep at current</source>
-        <translation>Задръж</translation>
+        <translation>Запази</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="75"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
         <source>A bit more</source>
         <translation>Малко повече</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="76"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
         <source>More</source>
         <translation>Повече</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
         <source>Much more</source>
         <translation>Много повече</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="80"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
         <source>Tempo</source>
         <translation>Темпо</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
         <source>Loudness</source>
         <translation>Сила</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
         <source>Danceability</source>
         <translation>Танцувалност</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
         <source>Energy</source>
         <translation>Енергия</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
         <source>Song Hotttnesss</source>
         <translation>Популярност на изпълненията</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
         <source>Artist Hotttnesss</source>
         <translation>Популярност на изпълнителя</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
         <source>Artist Familiarity</source>
         <translation>Близост на изпълнителите</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
         <source>By Description</source>
         <translation>По описание</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
         <source>Enter a description</source>
         <translation>Въведи описание</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="102"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
         <source>Apply steering command</source>
         <translation>Приложи избраната команда</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="108"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
         <source>Reset all steering commands</source>
         <translation>Нулирай всички предишни настройки</translation>
     </message>
@@ -2280,7 +2766,7 @@
 <context>
     <name>Tomahawk::GroovesharkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/groovesharkparser.cpp" line="255"/>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
         <source>Error fetching Grooveshark information from the network!</source>
         <translation>Грешка при извличане на информацията от Grooveshark</translation>
     </message>
@@ -2288,58 +2774,87 @@
 <context>
     <name>Tomahawk::InfoSystem::ChartsPlugin</name>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="307"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
         <source>Top Overall</source>
         <translation>Най-известни</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="396"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
         <source>Artists</source>
         <translation>Артисти</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="398"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
         <source>Albums</source>
         <translation>Албуми</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="400"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
         <source>Tracks</source>
         <translation>Песни</translation>
     </message>
 </context>
 <context>
-    <name>Tomahawk::InfoSystem::LastFmPlugin</name>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation>Tomahawk възпроизвежда &quot;%1&quot; от %2%3</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation>от &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
         <source>Top Tracks</source>
-        <translation>Най-актуални песни</translation>
+        <translation>Най-слушани песни</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
         <source>Loved Tracks</source>
-        <translation>Харесвани песни</translation>
+        <translation>Харесани песни</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
         <source>Hyped Tracks</source>
-        <translation>Песни слушани най-често</translation>
+        <translation>Песни, изпъкващи сред останалите</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
         <source>Top Artists</source>
         <translation>Най-слушани артисти</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
         <source>Hyped Artists</source>
-        <translation>Артисти слушани най-често</translation>
+        <translation>Изпълнители, изпъкващи сред останалите</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>Албуми</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation>#fb ♥  &quot;%1&quot; от %2  %3</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::ItunesParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/itunesparser.cpp" line="170"/>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
         <source>Error fetching iTunes information from the network!</source>
         <translation>Грешка при извличане на информация от iTunes</translation>
     </message>
@@ -2347,27 +2862,27 @@
 <context>
     <name>Tomahawk::JSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="137"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
         <source>New Playlist</source>
         <translation>Нов списък</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Failed to save tracks</source>
-        <translation>Неуспех при запаметяване на песни</translation>
+        <translation>Не мога да запазя избраните песни</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation>Някои песни в списъкът за изпълнение нямат артист и заглавие. Те ще бъдат игнорирани.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>XSPF Error</source>
         <translation>XSPF грешка</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>Това не е валиден XSPF списък</translation>
     </message>
@@ -2389,37 +2904,37 @@
 <context>
     <name>Tomahawk::Query</name>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="637"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="645"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
         <source>You</source>
         <translation>Ти</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="647"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
         <source>you</source>
         <translation>ти</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>and</source>
         <translation>и</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>%n other(s)</source>
         <translation><numerusform>%n друг</numerusform><numerusform>%n други</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="659"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
         <source>%1 people</source>
         <translation>%1 хора</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="661"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
         <source>loved this track</source>
         <translation>хареса тази песен</translation>
     </message>
@@ -2427,7 +2942,7 @@
 <context>
     <name>Tomahawk::RdioParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/rdioparser.cpp" line="193"/>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
         <source>Error fetching Rdio information from the network!</source>
         <translation>Грешка при извличане на информация от Rdio</translation>
     </message>
@@ -2435,7 +2950,7 @@
 <context>
     <name>Tomahawk::ShortenedLinkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/shortenedlinkparser.cpp" line="96"/>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
         <source>Network error parsing shortened link!</source>
         <translation>Мрежова грешка при извличане на съкратеният адрес.</translation>
     </message>
@@ -2443,49 +2958,67 @@
 <context>
     <name>Tomahawk::Source</name>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="242"/>
-        <location filename="../src/libtomahawk/source.cpp" line="293"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
         <source>Scanning (%L1 tracks)</source>
         <translation>Сканиране (%L1 песни)</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="244"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
         <source>Scanning</source>
         <translation>Сканирам</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="278"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
         <source>Checking</source>
         <translation>Проверявам</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="283"/>
-        <source>Fetching</source>
-        <translation>Извличам</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="288"/>
-        <source>Parsing</source>
-        <translation>Сортирам</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="417"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
         <source>Saving (%1%)</source>
         <translation>Запазвам (%1%)</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation>На линия</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation>Извън линия</translation>
+    </message>
 </context>
 <context>
     <name>Tomahawk::SpotifyParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/spotifyparser.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
         <source>Error fetching Spotify information from the network!</source>
         <translation>Грешка при извличане на информация от Spotify</translation>
     </message>
 </context>
 <context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation>Автоматично обнови от XSPF</translation>
+    </message>
+</context>
+<context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/tomahawkapp.cpp" line="534"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Моята колекция</translation>
     </message>
@@ -2493,12 +3026,12 @@
 <context>
     <name>TomahawkOAuthTwitter</name>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>Twitter PIN</source>
         <translation>Twitter код</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>After authenticating on Twitter's web site,
 enter the displayed PIN number here:</source>
         <translation>След удостоверяване в Twitter,
@@ -2508,466 +3041,469 @@
 <context>
     <name>TomahawkTrayIcon</name>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="59"/>
-        <location filename="../src/tomahawktrayicon.cpp" line="93"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation>&amp;Спри възпроизвеждането след текущата песен</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
         <source>Hide Tomahawk Window</source>
         <translation>Скрий главният прозорец</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="98"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
         <source>Show Tomahawk Window</source>
         <translation>Покажи главният прозорец</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="158"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
         <source>Currently not playing.</source>
         <translation>В момента не се изпълнява нищо</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="219"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
         <source>Play</source>
-        <translation type="unfinished"/>
+        <translation>Изпълни</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="226"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
         <source>Pause</source>
-        <translation type="unfinished"/>
+        <translation>Пауза</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation>&amp;Харесай</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation>Не-&amp;Харесай</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation>&amp;Продължи възпроизвеждането след текущата песен</translation>
     </message>
 </context>
 <context>
     <name>TomahawkWindow</name>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="14"/>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
         <source>Tomahawk</source>
-        <translation type="unfinished"/>
+        <translation>Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="75"/>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="81"/>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
         <source>&amp;Controls</source>
         <translation>&amp;Контроли</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="100"/>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
         <source>&amp;Network</source>
         <translation>&amp;Мрежа</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="107"/>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
         <source>&amp;Window</source>
         <translation>&amp;Прозорец</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="114"/>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощ</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="128"/>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
         <source>&amp;Quit</source>
         <translation>&amp;Изход</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="131"/>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="139"/>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
         <source>Go &amp;Online</source>
         <translation>&amp;Свържи се</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="144"/>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
         <source>Add &amp;Friend...</source>
         <translation>Добави &amp;приятел</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="149"/>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
         <source>U&amp;pdate Collection</source>
         <translation>О&amp;бнови колекцията</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="152"/>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
         <source>Update Collection</source>
         <translation>Обнови колекцията</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="157"/>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
         <source>&amp;Configure Tomahawk...</source>
         <translation>&amp;Настройки на Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="165"/>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
         <source>Load &amp;XSPF...</source>
         <translation>Зареди &amp;XSPF...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="170"/>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
         <source>Create &amp;New Playlist...</source>
         <translation>Зареди &amp;Нов списък</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="175"/>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
         <source>About &amp;Tomahawk...</source>
         <translation>За &amp;Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="183"/>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
         <source>Create New &amp;Automatic Playlist</source>
         <translation>Създай нов &amp;Автоматичен списък</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="188"/>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
         <source>Create New &amp;Station</source>
-        <translation>Създай нова станция</translation>
+        <translation>Създай нова &amp;Станция</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="196"/>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
         <source>Show Offline Sources</source>
         <translation>Покажи източници извън линия</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="201"/>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
         <source>Hide Offline Sources</source>
         <translation>Скрий източници извън линия</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="206"/>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
         <source>Minimize</source>
         <translation>Смали</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="209"/>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
         <source>Ctrl+M</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="214"/>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
         <source>Zoom</source>
         <translation>Увеличи</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="217"/>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
         <source>Meta+Ctrl+Z</source>
+        <translation>Mod+Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="222"/>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
         <source>Diagnostics...</source>
         <translation>Диагностика...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="230"/>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
         <source>Fully &amp;Rescan Collection</source>
         <translation>Пълно &amp;сканиране на колекцията</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="233"/>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
         <source>Fully Rescan Collection</source>
         <translation>Пълно сканиране на колекцията</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="238"/>
-        <location filename="../src/tomahawkwindow.cpp" line="676"/>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
         <source>Play</source>
         <translation>Изпълни</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="241"/>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
         <source>Space</source>
-        <translation type="unfinished"/>
+        <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="246"/>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
         <source>Previous</source>
         <translation>Предишна</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="251"/>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
         <source>Next</source>
         <translation>Следваща</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="219"/>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation>Една страница назад</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation>Напред</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation>Една страница напред</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
         <source>Global Search...</source>
         <translation>Глобално търсене...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="270"/>
-        <location filename="../src/tomahawkwindow.cpp" line="287"/>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
         <source>Check For Updates...</source>
         <translation>Провери за обновления...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="449"/>
-        <location filename="../src/tomahawkwindow.cpp" line="456"/>
-        <location filename="../src/tomahawkwindow.cpp" line="464"/>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
         <source>Connect To Peer</source>
         <translation>Свържи се с друг потребител</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="450"/>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
         <source>Enter peer address:</source>
-        <translation>Въведи адресът на отдалеченият потребител</translation>
+        <translation>Въведи адресът на отдалеченият потребител:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="457"/>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
         <source>Enter peer port:</source>
         <translation>Въведи порт:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="465"/>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
         <source>Enter peer key:</source>
         <translation>Въведи ключът за удостоверяване:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>XSPF Error</source>
         <translation>XSPF Грешка</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>Това не е валиден XSPF списък</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Failed to save tracks</source>
-        <translation>Неуспех при запазване на списък с песни</translation>
+        <translation>Не мога да запазя списъкът с песни</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
-        <translation>Някои от песните в този списък нямат артист и заглавие. Те ще бъдат игнорирани.</translation>
+        <translation>Някои от песните в този списък нямат артист и заглавие. 
+Те ще бъдат игнорирани.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="579"/>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
         <translation>Съжалявам. Има проблем с достъпа до твоето аудио-устройство или до избраната песен - тя ще бъде прескочена.
 Моля, увери се, че са инсталирани подходящ Phonon и приставки.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="581"/>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
         <translation>Съжалявам. 
 Има проблем с достъпа до твоето аудио устройство или избраната песен. Тя ще бъде пропусната.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation>Станция</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Create New Station</source>
         <translation>Създай нова станция</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
-        <source>New Station</source>
-        <translation>Нова станция</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation>Списък</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="650"/>
-        <source>New Playlist</source>
-        <translation>Нов списък</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation>Автоматично-генериран списък</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="668"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
         <source>Pause</source>
         <translation>Пауза</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="691"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
         <source>Go &amp;offline</source>
         <translation>Излез &amp;извън линия</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="698"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
         <source>Go &amp;online</source>
         <translation>Свържи &amp;се</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="720"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
         <source>Authentication Error</source>
         <translation>Грешка при удостоверяване</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="735"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation>Грешка при свързване: Неуспешно удостоверяване!</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
         <source>%1 by %2</source>
         <comment>track, artist name</comment>
         <translation>%1 от %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="736"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
         <source>%1 - %2</source>
         <comment>current track, some window title</comment>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="747"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
         <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="751"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
         <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="755"/>
-        <source>Copyright 2010 - 2012&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson</source>
-        <translation>Всички права запазени 2010 - 2012&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Благодарности на: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation>Всички права - запазени. 2010 - 2012</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="758"/>
-        <source>About Tomahawk</source>
-        <translation>За Tomahawk</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation>Благодарности на:</translation>
     </message>
-</context>
-<context>
-    <name>TopBar</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="26"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="66"/>
-        <source>0 Sources</source>
-        <translation>0 източника</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="89"/>
-        <source>0 Tracks</source>
-        <translation>0 песни</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="112"/>
-        <source>0 Artists</source>
-        <translation>0 артиста</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="135"/>
-        <source>0 Shown</source>
-        <translation>0 показани</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="49"/>
-        <source>Tracks</source>
-        <translation>Песни</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="50"/>
-        <source>Artists</source>
-        <translation>Артисти</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="54"/>
-        <source>Filter</source>
-        <translation>Филтър</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="84"/>
-        <source>Artist View</source>
-        <translation>Преглед на артист</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="85"/>
-        <source>Flat View</source>
-        <translation>Плосък изглед</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="195"/>
-        <source>Sources</source>
-        <translation>Източници</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="247"/>
-        <source>Shown</source>
-        <translation>Показани</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation>Относно Tomahawk</translation>
     </message>
 </context>
 <context>
     <name>TopTracksContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
         <source>Top Hits</source>
         <translation>Най-слушани</translation>
     </message>
 </context>
 <context>
-    <name>TrackModel</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Artist</source>
-        <translation>Артист</translation>
-    </message>
+    <name>TrackInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Title</source>
-        <translation>Заглавие</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Album</source>
-        <translation>Албум</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation>Обложка</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
         <source>Track</source>
-        <translation>Номер</translation>
+        <translation>Песен</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Duration</source>
-        <translation>Продължителност</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation>Изпълнител</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Bitrate</source>
-        <translation>Качество</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation>Албум</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Age</source>
-        <translation>Възраст</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Year</source>
-        <translation>Година</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation>Подобни песни</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Size</source>
-        <translation>Размер</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation>Съжалявам, но не откривам нито една подобна на тази песен!</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation><numerusform>Ти си слушал тази песен %n път(и)</numerusform><numerusform>Ти си слушал тази песен %n път(и)</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Origin</source>
-        <translation>Произход</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation>Никога не си слушал тази песен преди</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Score</source>
-        <translation>Популярност</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation>Първоначално си я слушал на %1</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation><numerusform>Слушал си %1 път(и)</numerusform><numerusform>Слушал си %1 %n път(и)</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Composer</source>
-        <translation>Композитор</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation>Никога не си слушал %1 преди</translation>
     </message>
 </context>
 <context>
     <name>TrackView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackview.cpp" line="493"/>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
         <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
         <translation>Съжалявам, твоят филтър %1 не върна никакъв резултат.</translation>
     </message>
@@ -2988,100 +3524,68 @@
 <context>
     <name>TreeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treeitemdelegate.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
         <source>Unknown</source>
-        <translation type="unfinished"/>
+        <translation>Неизвестно</translation>
     </message>
 </context>
 <context>
     <name>TreeModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Name</source>
-        <translation>Име</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Duration</source>
-        <translation>Продължителност</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Bitrate</source>
-        <translation>Качество</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Age</source>
-        <translation>Възраст</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Year</source>
-        <translation>Година</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Size</source>
-        <translation>Размер</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Origin</source>
-        <translation>Произход</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Composer</source>
-        <translation>Композитор</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="585"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
         <source>All Artists</source>
         <translation>Всички артисти</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="699"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="724"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
         <source>My Collection</source>
         <translation>Моята колекция</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="701"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="726"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
         <source>Collection of %1</source>
         <translation>Колекцията на %1</translation>
     </message>
 </context>
 <context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>Съжалявам, но филтърът &apos;%1&apos; не върна никакви резултати.</translation>
+    </message>
+</context>
+<context>
     <name>TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="73"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
         <source>Configure this Twitter account</source>
         <translation>Настрой Twitter профил</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="119"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
         <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
         <translation>Приставката за Twitter ще ти позволи да откриваш и изпълняваш музика, от твоите приятели ползващи Tomahawk и побликуващи съобщения в твоят профил.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
         <source>Status: No saved credentials</source>
-        <translation type="unfinished"/>
+        <translation>Статус: Няма запазени данни за вход</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="166"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
         <source>Authenticate with Twitter</source>
         <translation>Удостовери към Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="196"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
         <source>Twitter Connections</source>
         <translation>Twitter връзки</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
         <source>
 If you only want to post tweets, you're done.
 
@@ -3097,32 +3601,32 @@
 Можеш да изпращаш съобщения за повторно свързване по всяко време, само като натиснеш бутонът по-долу.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="244"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
         <source>Select the kind of tweet you would like, then press the button to post it:</source>
         <translation>Избери тип на съобщението и след това натисни бутонът, за да го побликуваш.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="276"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
         <source>Global Tweet</source>
         <translation>Общо съобщение</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="281"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
         <source>@Mention</source>
         <translation>@Споменаване</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="286"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
         <source>Direct Message</source>
         <translation>Лично съобщение</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="322"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
         <source>e.g. @tomahawk</source>
         <translation>напр. @tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="351"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
         <source>Send Message</source>
         <translation>Изпрати съобщение</translation>
     </message>
@@ -3130,45 +3634,61 @@
 <context>
     <name>ViewManager</name>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="383"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation>След като бъде сканирана колекцията ти, ще откриеш твоите песни точно тук.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation>Празна колекция.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
         <source>SuperCollection</source>
-        <translation>Супер колекция</translation>
+        <translation>Супер колекция
+/Сборен излед от локалните и наличните в колекциите на приятелите ти/</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="384"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
         <source>Combined libraries of all your online friends</source>
-        <translation>Комбинирани библиотеки от всичките ти приятели на линия</translation>
+        <translation>Обща колекция с всичките ми приятели на линия</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation>Наскоро изпълени песни</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="385"/>
-        <source>All available albums</source>
-        <translation>Всички налични албуми</translation>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation>Наскоро изпълнени песни от всичките ти приятели</translation>
     </message>
 </context>
 <context>
     <name>WelcomeWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="34"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
         <source>Recent Additions</source>
         <translation>Нови попълнения</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
         <source>Newest Stations &amp; Playlists</source>
         <translation>Най-нови станции и списъци</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="70"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
         <source>Recently Played Tracks</source>
         <translation>Наскоро изпълнени</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.cpp" line="152"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
         <source>No recently created playlists in your network.</source>
-        <translation>Няма наскоро създавани списъзи в твоята мрежа</translation>
+        <translation>Не откривам наскоро създадени списъци в твоята мрежа</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.h" line="90"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
         <source>Welcome to Tomahawk</source>
         <translation>Здравей!</translation>
     </message>
@@ -3176,7 +3696,7 @@
 <context>
     <name>WhatsHotWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/whatshotwidget.h" line="72"/>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
         <source>Charts</source>
         <translation>Класации</translation>
     </message>
@@ -3192,33 +3712,33 @@
 <context>
     <name>XMPPBot</name>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="312"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
         <source>
 Terms for %1:
 </source>
-        <translation>Условия за %1</translation>
+        <translation>Условия за %1:</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="314"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
         <source>No terms found, sorry.</source>
         <translation>Няма открити условия, съжалявам.</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="347"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
         <source>
 Hotttness for %1: %2
 </source>
         <translation>Популарност на %1:%2</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="363"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
         <source>
 Familiarity for %1: %2
 </source>
         <translation>Еднаквост за %1: %2</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="381"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
         <source>
 Lyrics for &quot;%1&quot; by %2:
 
@@ -3233,23 +3753,23 @@
 <context>
     <name>XSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="49"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
         <source>Failed to parse contents of XSPF playlist</source>
         <translation>Неуспешно извличане на данни от XSPF списък</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="51"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
         <source>Some playlist entries were found without artist and track name, they will be omitted</source>
         <translation>За някои от позициите не открих артист или име на песента.
 Те ще бъдат пропуснати.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="53"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
         <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
         <translation>Неуспех при извличане на избраният списък през мрежата или избраният файл не съществува.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="188"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
         <source>New Playlist</source>
         <translation>Нов списък</translation>
     </message>
@@ -3257,151 +3777,151 @@
 <context>
     <name>XmlConsole</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
         <source>Xml stream console</source>
         <translation>Конзола за Xml поток </translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="33"/>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="60"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
         <source>Filter</source>
         <translation>Филтър</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="43"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
         <source>Save log</source>
         <translation>Запази диагностичните съобщения</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
         <source>Disabled</source>
         <translation>Деактивиран</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="65"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
         <source>By JID</source>
         <translation>По Jabber ID</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="68"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
         <source>By namespace uri</source>
         <translation>По namespace uri</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="71"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
         <source>By all attributes</source>
         <translation>По всички атрибути</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="76"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
         <source>Visible stanzas</source>
-        <translation type="unfinished"/>
+        <translation>Видими строфи</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="79"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
         <source>Information query</source>
         <translation>Извличане на информация</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
         <source>Message</source>
         <translation>Съобщение</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="87"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
         <source>Presence</source>
         <translation>Наличие</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="91"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
         <source>Custom</source>
         <translation>Специфично създаден</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="107"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
         <source>Close</source>
         <translation>Затвори</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="358"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
         <source>Save XMPP log to file</source>
         <translation>Запази XMPP диагностичните съобщения във файл.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
         <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
-        <translation type="unfinished"/>
+        <translation>OpenDocument формат (*.odf);;HTML файл (*.html);;Чист текст (*.txt)</translation>
     </message>
 </context>
 <context>
     <name>XmppConfigWidget</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
         <source>Xmpp Configuration</source>
         <translation>Настройка на Xmpp</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="52"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
         <source>Configure this Xmpp account</source>
         <translation>Настрой тази Xmpp регистрация</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="89"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
         <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
         <translation>Въведи Xmpp потребителско име и парола за да се свържеш с приятелите ти, ползващи Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="111"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
         <source>Login Information</source>
         <translation>Информация за влизане</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="131"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
         <source>Xmpp ID:</source>
         <translation>Xmpp потребителско име:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="147"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
         <source>e.g. user@example.com</source>
         <translation>т.е. user@example.com</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="160"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
         <source>Password:</source>
         <translation>Парола:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="188"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
         <source>An account with this name already exists!</source>
         <translation>Вече съществува регистрация с такова име!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="210"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
         <source>Advanced Xmpp Settings</source>
         <translation>Разширени настройки:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="230"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
         <source>Server:</source>
         <translation>Сървър:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="253"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="299"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
         <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
-        <translation type="unfinished"/>
+        <translation>Много сървъри не го поддържат (като: Gtalk, jabber.org)</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="302"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
         <source>Publish currently playing track</source>
         <translation>Побликувай текущо изпълняваната песен</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="309"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
         <source>Enforce secure connection</source>
         <translation>Изискай криптирана връзка</translation>
     </message>
@@ -3409,131 +3929,131 @@
 <context>
     <name>XmppSipPlugin</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
         <source>User Interaction</source>
         <translation>Действие от потребителя</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="362"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
         <source>Host is unknown</source>
         <translation>Непознат адрес</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="365"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
         <source>Item not found</source>
         <translation>Обектът не е открит</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="368"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
         <source>Authorization Error</source>
         <translation>Грешка при даване на достъп</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="371"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
         <source>Remote Stream Error</source>
         <translation>Грешка в стриймът от отдалечената машина</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="374"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
         <source>Remote Connection failed</source>
         <translation>Отдалечената връзка е неуспешна</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="377"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
         <source>Internal Server Error</source>
         <translation>Вътрешна грешка на сървъра</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="380"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
         <source>System shutdown</source>
         <translation>Изключване на системата</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="383"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
         <source>Conflict</source>
         <translation>Конфликт</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="387"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
         <source>Unknown</source>
+        <translation>Неизвестно</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="391"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
         <source>No Compression Support</source>
         <translation>Няма поддръжка на компресия</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="395"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
         <source>No Encryption Support</source>
         <translation>Няма поддръжка на криптиране</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="399"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
         <source>No Authorization Support</source>
         <translation>Няма поддръжка на удостоверяване</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="403"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
         <source>No Supported Feature</source>
-        <translation type="unfinished"/>
+        <translation>Неподдържана функция</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="500"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
         <source>Add Friend</source>
         <translation>Добави приятел</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="501"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
         <source>Enter Xmpp ID:</source>
         <translation>Въведи  Xmpp ID:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="617"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
         <source>Add Friend...</source>
         <translation>Добави приятел...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="622"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
         <source>XML Console...</source>
         <translation>XML Конзола...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="670"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
         <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
-        <translation>Извинявай.. Аз съм режимът за автоматични отговори изпълзван от Tomahawk. (http://gettomahawk.com) Щом получаваш това съобщение, този с който се опитваш да се свържеш вероятно не е на линия. Моля, потай отново по-късно.</translation>
+        <translation>Извинявай.. Аз съм режимът за автоматични отговори изпълзван от Tomahawk. ( http://gettomahawk.com ) Щом получаваш това съобщение, този с който се опитваш да се свържеш вероятно не е на линия. Моля, опитай отново по-късно.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="768"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
         <source>Authorize User</source>
         <translation>Оправомощяване на потребител</translation>
     </message>
-    <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="769"/>
-        <source>Do you want to grant &lt;b&gt;%1&lt;/b&gt; access to your Collection?</source>
-        <translation>Искате ли да позволите на &lt;b&gt;%1&lt;/b&gt; достъп до вашата колекция?</translation>
-    </message>
 </context>
 <context>
     <name>ZeroconfConfig</name>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="14"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="55"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
         <source>Local Network configuration</source>
         <translation>Настройка на локалната мрежа</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="77"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
         <source>This plugin will automatically find other users running Tomahawk on your local network</source>
         <translation>Тази приставка, автоматично ще открие другите потребители 
 ползващи Tomahawk в локалната мрежа</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="84"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
         <source>Connect automatically when Tomahawk starts</source>
         <translation>Свържи се автоматично при стартиране</translation>
     </message>

tomahawk-0.5.5.tar.bz2/lang/tomahawk_ca.ts Added

@@ -0,0 +1,4049 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.0">
+<context>
+    <name>ACLJobDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Diàleg</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
+        <source>Description goes here</source>
+        <translation>Aquí va la descripció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
+        <source>Add Account</source>
+        <translation>Afegiu un compte</translation>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapperDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
+        <source>Online</source>
+        <translation>En línia</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
+        <source>Connecting...</source>
+        <translation>Connectant-se...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
+        <source>Offline</source>
+        <translation>Fora de línia</translation>
+    </message>
+</context>
+<context>
+    <name>ActionCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
+        <source>&amp;Listen Along</source>
+        <translation>&amp;Escolta a la vegada</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
+        <source>Stop &amp;Listening Along</source>
+        <translation>Deixa d&apos;&amp;escoltar a la vegada</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
+        <source>&amp;Follow in real-time</source>
+        <translation>&amp;Segueix en temps real</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Privately</source>
+        <translation>&amp;Escolta privada</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Publicly</source>
+        <translation>&amp;Escolta Pública</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
+        <source>&amp;Load Playlist</source>
+        <translation>&amp;Carrega la llista de reproducció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
+        <source>&amp;Rename Playlist</source>
+        <translation>&amp;Reanomena la llista de reproducció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
+        <source>&amp;Copy Playlist Link</source>
+        <translation>&amp;Copia l&apos;enllaç a la llista de reproducció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Reprodueix</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
+        <source>&amp;Stop</source>
+        <translation>&amp;Atura</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
+        <source>&amp;Previous Track</source>
+        <translation>Cançó &amp;Anterior</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
+        <source>&amp;Next Track</source>
+        <translation>Cançó &amp;Següent</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Surt</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="31"/>
+        <source>Other Albums by Artist</source>
+        <translation>Altres Àlbums de l&apos;Artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
+        <source>Other Albums by %1</source>
+        <translation>Altres Àlbums de %1</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
+        <source>All albums from %1</source>
+        <translation>Tots els Àlbums de %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
+        <source>All albums</source>
+        <translation>Tots els Àlbums</translation>
+    </message>
+</context>
+<context>
+    <name>ArtistInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
+        <source>Top Hits</source>
+        <translation>Grans Èxits</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
+        <source>Related Artists</source>
+        <translation>Artistes Relacionats</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation>Artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>Àlbums</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AudioControls</name>
+    <message>
+        <location filename="../src/AudioControls.ui" line="75"/>
+        <source>Prev</source>
+        <translation>Anterior</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="87"/>
+        <source>Play</source>
+        <translation>Reprodueix</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="94"/>
+        <source>Pause</source>
+        <translation>Pausa</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="103"/>
+        <source>Next</source>
+        <translation>Següent</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="229"/>
+        <source>Artist</source>
+        <translation>Artista</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="248"/>
+        <source>Album</source>
+        <translation>Àlbum</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="277"/>
+        <source>Owner</source>
+        <translation>Propietari</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation>social</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
+        <source>love</source>
+        <translation>M&apos;encanta</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="383"/>
+        <source>Time</source>
+        <translation>Temps</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="412"/>
+        <source>Time Left</source>
+        <translation>Temps Restant</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="493"/>
+        <source>Shuffle</source>
+        <translation>Mescla</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="506"/>
+        <source>Repeat</source>
+        <translation>Repeteix</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="544"/>
+        <source>Low</source>
+        <translation>Baix</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="576"/>
+        <source>High</source>
+        <translation>Alt</translation>
+    </message>
+</context>
+<context>
+    <name>AudioEngine</name>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CategoryAddItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation>Crea una nova Llista</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation>Crea una nova Emissora</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>New Station</source>
+        <translation>Nova Emissora</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>%1 Station</source>
+        <translation>Emissora %1</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
+        <source>Playlists</source>
+        <translation>Llistes de reproducció</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
+        <source>Stations</source>
+        <translation>Emissores</translation>
+    </message>
+</context>
+<context>
+    <name>ClearButton</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
+        <source>Clear</source>
+        <translation>Suprimeix</translation>
+    </message>
+</context>
+<context>
+    <name>ContextWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>Barra d&apos;Informació</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
+        <source>Show Footnotes</source>
+        <translation>Mostra les Notes al peu</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
+        <source>Hide Footnotes</source>
+        <translation>Amaga les Notes al peu</translation>
+    </message>
+</context>
+<context>
+    <name>CrashReporter</name>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="23"/>
+        <source>Tomahawk Crash Reporter</source>
+        <translation>Enviament de Fallades de Tomahawk</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation>Envia aquest informe</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation>No l&apos;enviïs</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
+        <source>Abort</source>
+        <translation>Interromp</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
+        <source>You can disable sending crash reports in the configuration dialog.</source>
+        <translation>Podeu deshabilitar l&apos;enviament d&apos;informació sobre les fallades des del diàleg de configuració.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
+        <source>Uploaded %L1 of %L2 KB.</source>
+        <translation>%L1 de %L2 KB carregats.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <source>Close</source>
+        <translation>Tanca</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
+        <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
+        <translation>Enviat! &lt;b&gt;Moltes gràcies&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
+        <source>Failed to send crash info.</source>
+        <translation>S&apos;ha produït un error en enviar la informació sobre la fallada.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseCommand_AllAlbums</name>
+    <message>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
+        <source>Unknown</source>
+        <translation>Desconegut</translation>
+    </message>
+</context>
+<context>
+    <name>DelegateConfigWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation>Quant a</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
+        <source>Delete Account</source>
+        <translation>Esborra el Compte</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>Quant a aquest compte</translation>
+    </message>
+</context>
+<context>
+    <name>DiagnosticsDialog</name>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
+        <source>Tomahawk Diagnostics</source>
+        <translation>Diagnòstics de Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobalSearchWidget</name>
+    <message>
+        <location filename="../src/SearchBox.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+</context>
+<context>
+    <name>IndexingJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
+        <source>Indexing database</source>
+        <translation>S&apos;està indexant la base de dades</translation>
+    </message>
+</context>
+<context>
+    <name>InfoBar</name>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>Barra d&apos;Informació</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
+        <source>Filter...</source>
+        <translation>Filtra...</translation>
+    </message>
+</context>
+<context>
+    <name>LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <source>Scrobble tracks to Last.fm</source>
+        <translation>Fes scrobbling de les cançons a Last.fm</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <source>Username:</source>
+        <translation>Nom d&apos;usuari:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <source>Password:</source>
+        <translation>Contrasenya:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <source>Test Login</source>
+        <translation>Comprova l&apos;autenticació</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation>Importa l&apos;historial de reproducció</translation>
+    </message>
+</context>
+<context>
+    <name>LastfmContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="67"/>
+        <source>Last.fm</source>
+        <translation>Last.fm</translation>
+    </message>
+</context>
+<context>
+    <name>LatchedStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoadXSPF</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="14"/>
+        <source>Load XSPF</source>
+        <translation>Carrega una XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="22"/>
+        <source>Playlist URL</source>
+        <translation>URL de la llista de reproduccó</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="29"/>
+        <source>Enter URL...</source>
+        <translation>Introduïu l&apos;URL...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="42"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="51"/>
+        <source>Automatically update</source>
+        <translation>Actualitza automàticament</translation>
+    </message>
+</context>
+<context>
+    <name>LoadXSPFDialog</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>Load XSPF File</source>
+        <translation>Carrega un fitxer XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>XSPF Files (*.xspf)</source>
+        <translation>Fitxers XSPF (*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>LocalCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Bookmarks</source>
+        <translation>Preferits</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Saved tracks</source>
+        <translation>Cançons desades</translation>
+    </message>
+</context>
+<context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
+        <source>Enter a title for the new playlist:</source>
+        <translation>Introduïu un títol per la nova llista de reproducció:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
+        <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
+        <translation>Tomahawk us ofereix diverses formes per ajudar-vos a crear llistes de reproducció i trobar la música que us agrada!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
+        <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>Introduïu el nom d&apos;un gènere o una etiqueta i Tomahawk us suggerirà unes quantes cançons per començar la nova llista:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
+        <source>&amp;Create Playlist</source>
+        <translation>&amp;Crea la Llista de Reproducció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
+        <source>Create a new playlist</source>
+        <translation>Crea una nova llista de reproducció</translation>
+    </message>
+</context>
+<context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>Nous llançaments</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation>Artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation>Cançó</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation>Compositor</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation>Àlbum</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation>Número</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation>Durada</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation>Bitrate</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation>Edat</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation>Any</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Mida</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation>Origen</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation>Puntuació</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
+        <source>played %1 by you</source>
+        <translation>reproduït %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
+        <source>played %1 by %2</source>
+        <translation>reproduït %1 per %2</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistLargeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <source>played %1 by you</source>
+        <translation>reproduït %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
+        <source>played %1 by %2</source>
+        <translation>reproduït %1 per %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
+        <source>added %1</source>
+        <translation>afegit %1</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
+        <source>A playlist by %1, created %2</source>
+        <translation>Una llista de reproduccó de %1, creada %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
+        <source>you</source>
+        <translation> </translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
+        <source>All tracks by %1 on album %2</source>
+        <translation>Totes les cançons de %1 a l&apos;àlbum %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
+        <source>All tracks by %1</source>
+        <translation>Totes les cançons de %1</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistTypeSelectorDlg</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
+        <source>New Playlist</source>
+        <translation>Nova Llista de Reproducció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
+        <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
+        <translation>Una llista vella i regular... Poseu-li un nom, arrossegueu-hi algunes cançons i llestos!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
+        <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
+        <translation>No sabeu exactament què voleu? Doneu-li unes indicacions a Tomahawk i deixeu que us faci la llista!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
+        <source>Name:</source>
+        <translation>Nom:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
+        <source>New Playlist...</source>
+        <translation>Nova Llista de Reproducció...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
+        <source>Create Manual Playlist</source>
+        <translation>Crea una Llista de Reproducció Manual</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
+        <source>Create Automatic Playlist</source>
+        <translation>Crea una Llista de Reproducció Automàtica</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
+        <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
+        <translation>Aquesta llista es troba buida. Afegiu-hi algunes cançons i gaudiu de la música!</translation>
+    </message>
+</context>
+<context>
+    <name>ProxyDialog</name>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
+        <source>Proxy Settings</source>
+        <translation>Paràmetres del proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
+        <source>Hostname of proxy server</source>
+        <translation>Nom del proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
+        <source>Host</source>
+        <translation>Ordinador central</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
+        <source>Proxy login</source>
+        <translation>Dades d&apos;inici de sessió del proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
+        <source>User</source>
+        <translation>Usuari</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
+        <source>Password</source>
+        <translation>Contrasenya</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
+        <source>Proxy password</source>
+        <translation>Contrasenya del proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
+        <source>No Proxy Hosts:
+(Overrides system proxy)</source>
+        <translation>Cap proxy:
+(Sobreescriu el proxy del sistema)</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
+        <source>localhost *.example.com (space separated)</source>
+        <translation>localhost *.exemple.com (separats per espais)</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
+        <source>Use proxy for DNS lookups?</source>
+        <translation>Voleu emprar un proxy per cercar les DNS?</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
+        <source>%n year(s) ago</source>
+        <translation><numerusform>fa %n any</numerusform><numerusform>fa %n anys</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
+        <source>%n year(s)</source>
+        <translation><numerusform>%n any</numerusform><numerusform>%n anys</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
+        <source>%n month(s) ago</source>
+        <translation><numerusform>fa %n mes</numerusform><numerusform>fa %n mesos</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
+        <source>%n month(s)</source>
+        <translation><numerusform>%n mes</numerusform><numerusform>%n mesos</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
+        <source>%n week(s) ago</source>
+        <translation><numerusform>fa %n setmana</numerusform><numerusform>fa %n setmanes</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
+        <source>%n week(s)</source>
+        <translation><numerusform>%n setmana</numerusform><numerusform>%n setmanes</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
+        <source>%n day(s) ago</source>
+        <translation><numerusform>fa %n dia</numerusform><numerusform>fa %n dies</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
+        <source>%n day(s)</source>
+        <translation><numerusform>%n dia</numerusform><numerusform>%n dies</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
+        <source>%n hour(s) ago</source>
+        <translation><numerusform>fa %n hora</numerusform><numerusform>fa %n hores</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
+        <source>%1 minutes ago</source>
+        <translation>fa %1 minut</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
+        <source>%1 minutes</source>
+        <translation>%1 minuts</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
+        <source>just now</source>
+        <translation>ara mateix</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <source>Friend Finders</source>
+        <translation>Cercadors d&apos;Amics</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
+        <source>Music Finders</source>
+        <translation>Cercadors de Música</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
+        <source>Status Updaters</source>
+        <translation>Actualitzadors d&apos;Estat</translation>
+    </message>
+</context>
+<context>
+    <name>QuaZipFilePrivate</name>
+    <message>
+        <location filename="../src/libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation>Error %1 de l&apos;API ZIP/UNZIP</translation>
+    </message>
+</context>
+<context>
+    <name>QueueView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>Barra d&apos;Informació</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation>Obre la cua</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation><numerusform>Obre la cua - %n element</numerusform><numerusform>Obre la cua - %n elements</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation>Tanca la cua</translation>
+    </message>
+</context>
+<context>
+    <name>RelatedArtistsContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
+        <source>Related Artists</source>
+        <translation>Artistes Relacionats</translation>
+    </message>
+</context>
+<context>
+    <name>ResolverConfigDelegate</name>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
+        <source>Not found: %1</source>
+        <translation>No trobades: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
+        <source>Failed to load: %1</source>
+        <translation>Fallades a carregar: %1</translation>
+    </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
+        <source>Search</source>
+        <translation>Cerca</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
+        <source>Search: %1</source>
+        <translation>Cerca: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
+        <source>Results for &apos;%1&apos;</source>
+        <translation>Resultats per &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
+        <source>Collection</source>
+        <translation>Col·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
+        <source>Advanced</source>
+        <translation>Avançat</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
+        <source>All</source>
+        <translation>Tot</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation>Alguns paràmetres no tindran efecte fins que no reinicieu Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
+        <source>Services</source>
+        <translation>Serveis</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
+        <source>Install resolver from file</source>
+        <translation>Instal·la un Resolver des d&apos;un fitxer</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>Informació</translation>
+    </message>
+</context>
+<context>
+    <name>SocialPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="34"/>
+        <source>Popular New Albums From Your Friends</source>
+        <translation>Àlbums Populars dels Vostres Amics</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="48"/>
+        <source>Most Played Playlists</source>
+        <translation>Llistes de Reproducció Més Escoltades</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="63"/>
+        <source>Most Played Tracks You Don&apos;t Have</source>
+        <translation>Cançons Més Escoltades que encara no heu Reproduït</translation>
+    </message>
+</context>
+<context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>Cover</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation>Escoltant &quot;%1&quot; de %2. %3</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation>Escoltant &quot;%1&quot; de %2 de &quot;%3&quot;. %4</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation>%1 caràcters restants</translation>
+    </message>
+</context>
+<context>
+    <name>SourceDelegate</name>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
+        <source>Track</source>
+        <translation>Cançó</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
+        <source>Album</source>
+        <translation>Àlbum</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
+        <source>Artist</source>
+        <translation>Artista</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
+        <source>Local</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
+        <source>Top 10</source>
+        <translation>Top 10</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
+        <source>All available tracks</source>
+        <translation>Totes les cançons disponibles</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
+        <source>Show</source>
+        <translation>Mostra</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
+        <source>Hide</source>
+        <translation>Amaga</translation>
+    </message>
+</context>
+<context>
+    <name>SourceInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
+        <source>Recent Albums</source>
+        <translation>Àlbums Recents</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
+        <source>Latest Additions</source>
+        <translation>Cançons Recents</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
+        <source>Recently Played Tracks</source>
+        <translation>Cançons Escoltades Recentment</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
+        <source>New Additions</source>
+        <translation>Novetats</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
+        <source>My recent activity</source>
+        <translation>La meva activitat recent</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
+        <source>Recent activity from %1</source>
+        <translation>Activitat recent de %1</translation>
+    </message>
+</context>
+<context>
+    <name>SourceItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
+        <source>Collection</source>
+        <translation>Col·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
+        <source>Latest Additions</source>
+        <translation>Darreres Novetats</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
+        <source>Recently Played</source>
+        <translation>Escoltades Recentment</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation>SuperCol·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation>Darreres novetats a la vostra col·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation>Darreres novetats a la col·lecció de %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation>Cançons Escoltades Recentment</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation>Cançons Escoltades Recentment</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation>Cançons Escoltades Recentment per %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceTreeView</name>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
+        <source>&amp;Copy Link</source>
+        <translation>&amp;Copia l&apos;Enllaç</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
+        <source>&amp;Delete %1</source>
+        <translation>&amp;Esborra %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation>Afegeix a les meves Llistes</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation>Afegeix a les meves Llistes Automàtiques</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation>Afegeix a les meves Emissores</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
+        <source>&amp;Export Playlist</source>
+        <translation>E&amp;xporta la Llista de Reproducció</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation>llista</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation>llista automàtica</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation>emissora</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation>Voleu esborrar %1?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation>Voleu esborrar %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
+        <source>Save XSPF</source>
+        <translation>Desa com XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
+        <source>Playlists (*.xspf)</source>
+        <translation>Llistes de reproducció (*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>SourcesModel</name>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
+        <source>Group</source>
+        <translation>Grup</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
+        <source>Collection</source>
+        <translation>Col·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
+        <source>Playlist</source>
+        <translation>Llista de Reproducció</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
+        <source>Automatic Playlist</source>
+        <translation>Llista de Reproducció Automàtica</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
+        <source>Station</source>
+        <translation>Emissora</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
+        <source>Browse</source>
+        <translation>Cerca</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
+        <source>Search History</source>
+        <translation>Historial de Cerca</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
+        <source>My Music</source>
+        <translation>La Meva Música</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
+        <source>SuperCollection</source>
+        <translation>SuperCol·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
+        <source>Top Loved Tracks</source>
+        <translation>Top de Cançons Preferides</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
+        <source>Dashboard</source>
+        <translation>Presentació</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
+        <source>Recently Played</source>
+        <translation>Escoltades Recentment</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
+        <source>Charts</source>
+        <translation>Llistes</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>Nous Llançaments</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
+        <source>Friends</source>
+        <translation>Amics</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation>Configureu el compte Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation>Nom d&apos;usuari o adreça de Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>Inicia Sessió</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation>Feu click dret a qualsevol llista de reproducció de Tomahawk per sincronitzar-la amb Spotify.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation>Fluxos d&apos;Alta Qualitat</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation>Llistes de reproducció de Spotify per mantenir sincronitzades:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation>Esborra les llistes de Tomahawk quan es tregui la sincronització</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>Usuari:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>Contrasenya:</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation>Voleu esborrar-ho de Spotify?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation>Voleu esborrar les llistes de Spotify, també?</translation>
+    </message>
+</context>
+<context>
+    <name>StackedSettingsDialog</name>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
+        <source>Tomahawk Settings</source>
+        <translation>Paràmetres de Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
+        <source>Local Music Information</source>
+        <translation>Informació de la Música Local</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
+        <source>Path to scan for music files:</source>
+        <translation>Camí als fitxers de música:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
+        <source>The Echo Nest supports keeping track of your catalog metadata
+ and using it to craft personalized radios. Enabling this option
+ will allow you (and all your friends) to create automatic playlists
+ and stations based on your personal taste profile.</source>
+        <translation>L&apos;ajuda The Echo Nest llegeix les metadades de la vostra col·lecció
+i les utilitza per fer emissores de ràdio personalitzades. Si activeu
+aquesta opció podreu crear llistes de reproducció automàtiques
+i emissores de ràdio basades en el vostre gust musical.</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
+        <source>Upload collection list to The Echo Nest to enable user radio</source>
+        <translation>Carrega la llista de la col·lecció a The Echo Nest per activar la radio d&apos;usuari</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
+        <source>Watch for changes</source>
+        <translation>Monitoritza els canvis</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
+        <source>Time between scans, in seconds:</source>
+        <translation>Temps entre escanejos, en segons:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation>Paràmetres Avançats</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation>Mètode de connexió remota entre iguals</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation>Cap (només connexions cap a l&apos;exterior)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation>Utiliza UPnP per establir el redireccionament de ports (recomanat)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation>Utilitza l&apos;adreça IP estàtica externa/nom de l&apos;ordinador i el port</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation>Ajusteu aquest paràmetre amb la vostra adreça IP o el nom de l&apos;ordinador. Assegure-vos que redireccioneu el port a aquest ordinador!</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation>Proxys SOCKS</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation>Utilitza un proxy SOCKS</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation>Serveis d&apos;Internet</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation>Instal·la des d&apos;un fitxer...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation>Filtra per capacitats:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
+        <source>Static Host Name:</source>
+        <translation>Nom de l&apos;ordinador estàtic:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
+        <source>Static Port:</source>
+        <translation>Port estàtic:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
+        <source>Proxy Settings...</source>
+        <translation>Paràmetres del proxy...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation>Altres Paràmetres</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
+        <source>Send reports after Tomahawk crashed</source>
+        <translation>Envia informació de les fallades de Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation>Permet que els navegadors web interactuin amb Tomahawk (recomanat)</translation>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation>Copia l&apos;enllaç de l&apos;artista</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation>Copia l&apos;enllaç de l&apos;àlbum</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation>Copia l&apos;enllaç de la cançó</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
+        <source>Add Account</source>
+        <translation>Afegeix un compte</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation>Esborra</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
+        <source>%1 downloads</source>
+        <translation>%1 descàrregues</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
+        <source>Online</source>
+        <translation>En Línia</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
+        <source>Connecting...</source>
+        <translation>Connectant-se...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
+        <source>Offline</source>
+        <translation>Fora de Línia</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation>Es requereix una instal·lació manual</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapper</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
+        <source>Configure this Google Account</source>
+        <translation>Configura el Compte de Google</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
+        <source>Google Address</source>
+        <translation>Adreça de correu de Google</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
+        <source>Enter your Google login to connect with your friends using Tomahawk!</source>
+        <translation>Introduïu les dades d&apos;inici de sessió de Google i conecteu-vos amb els amics mitjançant Tomahawk!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
+        <source>username@gmail.com</source>
+        <translation>usuari@gmail.com</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
+        <source>Connect to Google Talk to find your friends</source>
+        <translation>Connecteu-vos a Google Talsk per trobar els amics</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperSip</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
+        <source>Add Friend</source>
+        <translation>Afegeix un Amic</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
+        <source>Enter Google Address:</source>
+        <translation>Introduïu l&apos;adreça de Google:</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
+        <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
+        <translation>Fes scrobbling de les cançons a last.fm, i cerca cançons descarregables gratuïtament per escoltar-les</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation>S&apos;està comprovant...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation>Comprova l&apos;inici de sessió</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation>S&apos;està important %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation>S&apos;està important l&apos;historial...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation>Historial incomplet... Reprèn</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation>S&apos;ha importat l&apos;historial de reproducció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
+        <source>Failed</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
+        <source>Success</source>
+        <translation>Èxit</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
+        <source>Could not contact server</source>
+        <translation>No s&apos;ha pogut contactar amb el servidor</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation>Sincronitza amb Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation>Atura la sincronització amb Spotify</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>Iniciant sessió...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation>Error: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>Incia Sessió</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
+        <source>Play music from and sync your playlists with Spotify Premium</source>
+        <translation>Reprodueix música i sincronitza les llistes de reproducció amb Spotify Premium</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
+        <source>Connect to your Twitter followers.</source>
+        <translation>Connecteu-vos als seguidors de Twitter.</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
+        <source>Tweet!</source>
+        <translation>Twitteja!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
+        <source>Status: No saved credentials</source>
+        <translation>Estat: no hi ha credencials desades</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
+        <source>Authenticate</source>
+        <translation>Autentifica</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
+        <source>Status: Credentials saved for %1</source>
+        <translation>Estat: Credencials desades per %1</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
+        <source>De-authenticate</source>
+        <translation>Des-autentifica</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>Tweetin&apos; Error</source>
+        <translation>Error en Twittejar</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <source>The credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation>Les crendencials no s&apos;han pogut verificar
+Torneu a autenticar-vos.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
+        <source>Status: Error validating credentials</source>
+        <translation>Estat: Error en validar les credencials</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
+        <source>Global Tweet</source>
+        <translation>Tweet Global</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
+        <source>Direct Message</source>
+        <translation>Missatge Directe</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
+        <source>Send Message!</source>
+        <translation>Envia el Missatge!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
+        <source>@Mention</source>
+        <translation>@Menció</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
+        <source>Send Mention!</source>
+        <translation>Envia la Menció!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <source>You must enter a user name for this type of tweet.</source>
+        <translation>Heu d&apos;introduir un nom d&apos;usuari per aquest tipus de tweet.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <source>Your saved credentials could not be loaded.
+You may wish to try re-authenticating.</source>
+        <translation>Les credencials desades no s&apos;han pogut carregar.
+Torneu a autenticar-vos.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <source>Your saved credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation>Les credencials desades no s&apos;han pogut verificar.
+Torneu a autenticar-vos.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>There was an error posting your status -- sorry!</source>
+        <translation>S&apos;ha produït un error publicant l&apos;estat!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Tweeted!</source>
+        <translation>Twitejat!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <source>Your tweet has been posted!</source>
+        <translation>El tweet s&apos;ha publicat!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <source>There was an error posting your direct message -- sorry!</source>
+        <translation>S&apos;ha produït un error publicant el missatge directe!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Your message has been posted!</source>
+        <translation>El missatge s&apos;ha publicat!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::XmppAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
+        <source>Log on to your Jabber/XMPP account to connect to your friends</source>
+        <translation>Inicieu sessió al vostre compte Jabber/XMPP per conectar-vos amb els amics</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::ZeroconfFactory</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
+        <source>Automatically connect to Tomahawks on the local network</source>
+        <translation>Connecta&apos;t automàticament a altres Tomahawks de la xarxa local</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ContextMenu</name>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Reprodueix</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
+        <source>Add to &amp;Queue</source>
+        <translation>&amp;Afegeix a la Cua</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
+        <source>&amp;Love</source>
+        <translation>&amp;M&apos;encanta</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
+        <source>&amp;Copy Track Link</source>
+        <translation>&amp;Copia l&apos;Enllaç de la Cançó</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
+        <source>Un-&amp;Love</source>
+        <translation>&amp;Treu de les preferides</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Items</source>
+        <translation>&amp;Elimina els Ítems</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation>&amp;Mostra la pàgina de la cançó</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Item</source>
+        <translation>&amp;Elimina l&apos;Ítem</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation>&amp;Mostra la pàgina de l&apos;àlbum</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation>&amp;Mostra la pàgina de l&apos;artista</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::CustomPlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
+        <source>Top Loved Tracks</source>
+        <translation>Top de Cançons Preferides</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
+        <source>Your loved tracks</source>
+        <translation>Les meves cançons preferides</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
+        <source>%1&apos;s loved tracks</source>
+        <translation>Les cançons preferides de %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
+        <source>The most loved tracks from all your friends</source>
+        <translation>Les cançons preferides de tots els amics</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
+        <source>All of your loved tracks</source>
+        <translation>Totes les meves cançons preferides</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
+        <source>All of %1&apos;s loved tracks</source>
+        <translation>Totes les cançons preferides de %1</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DropJobNotifier</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation>llista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation>artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation>número</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation>àlbum</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
+        <source>Fetching %1 from database</source>
+        <translation>Cercant %1 a la base de dades</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
+        <source>Parsing %1 %2</source>
+        <translation>Analitzant %1 %2</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicControlList</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
+        <source>Click to collapse</source>
+        <translation>Cliqueu per reduir</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="172"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="301"/>
+        <source>Could not find a playable track.
+
+Please change the filters or try again.</source>
+        <translation>No s&apos;ha trobat cap cançó reproduïble
+
+Canvieu els filtres o intenteu-ho de nou.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="230"/>
+        <source>Failed to generate preview with the desired filters</source>
+        <translation>S&apos;ha produït un error en generar la previsualització amb els filtres</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicSetupWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="53"/>
+        <source>Type:</source>
+        <translation>Tipus:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="67"/>
+        <source>Generate</source>
+        <translation>Genera</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
+        <source>Add some filters above to seed this station!</source>
+        <translation>Afegeiu slguns filtres per omplir aquesta emissora!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <source>Press Generate to get started!</source>
+        <translation>Premeu Genera per començar!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
+        <source>Add some filters above, and press Generate to get started!</source>
+        <translation>Afegeiu alguns filtres i premeu Genera per començar!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp" line="472"/>
+        <source>Station ran out of tracks!
+
+Try tweaking the filters for a new set of songs to play.</source>
+        <translation>L&apos;emissora s&apos;ha quedat sense cançons!
+
+Intenteu ajustar els filtres per reproduir noves cançons.</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestControl</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="188"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="255"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="276"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="341"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="360"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="425"/>
+        <source>is</source>
+        <translation>és</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="207"/>
+        <source>from user</source>
+        <translation>de l&apos;usuari</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="216"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="584"/>
+        <source>No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings</source>
+        <translation>No hi ha usuaris amb els catàlegs de Echo Nest activats. Activeu l&apos;opció en els paràmetres de la Col·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="235"/>
+        <source>similar to</source>
+        <translation>semblant a</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>Less</source>
+        <translation>Menys</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>More</source>
+        <translation>Més</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>0 BPM</source>
+        <translation>0 BPM</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>500 BPM</source>
+        <translation>500 BPM</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>0 secs</source>
+        <translation>0 segs</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>3600 secs</source>
+        <translation>3600 segs</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>-100 dB</source>
+        <translation>-100 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>100 dB</source>
+        <translation>100 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="343"/>
+        <source>Major</source>
+        <translation>Major</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="344"/>
+        <source>Minor</source>
+        <translation>Menor</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
+        <source>C</source>
+        <translation>Do</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
+        <source>C Sharp</source>
+        <translation>DO Sostingut</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
+        <source>D</source>
+        <translation>Re</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
+        <source>E Flat</source>
+        <translation>Mi Bemoll</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
+        <source>E</source>
+        <translation>Mi</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
+        <source>F</source>
+        <translation>Fa</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
+        <source>F Sharp</source>
+        <translation>Fa Sostingut</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="369"/>
+        <source>G</source>
+        <translation>Sol</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="370"/>
+        <source>A Flat</source>
+        <translation>La Bemoll</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="371"/>
+        <source>A</source>
+        <translation>La</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="372"/>
+        <source>B Flat</source>
+        <translation>Si Bemoll</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="373"/>
+        <source>B</source>
+        <translation>Si</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
+        <source>Ascending</source>
+        <translation>Ascendent</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="391"/>
+        <source>Descending</source>
+        <translation>Descendent</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="394"/>
+        <source>Tempo</source>
+        <translation>Temps</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="395"/>
+        <source>Duration</source>
+        <translation>Durada</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="396"/>
+        <source>Loudness</source>
+        <translation>Volum</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="397"/>
+        <source>Artist Familiarity</source>
+        <translation>Semblança amb l&apos;artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
+        <source>Artist Hotttnesss</source>
+        <translation>Rellevància d&apos;Artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
+        <source>Song Hotttnesss</source>
+        <translation>Rellevància de Cançó</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
+        <source>Latitude</source>
+        <translation>Latitut</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="401"/>
+        <source>Longitude</source>
+        <translation>Longitud</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="402"/>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="403"/>
+        <source>Key</source>
+        <translation>Clau</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="404"/>
+        <source>Energy</source>
+        <translation>Energia</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="405"/>
+        <source>Danceability</source>
+        <translation>Ballabilitat</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="744"/>
+        <source>only by ~%1</source>
+        <translation>només per ~%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="746"/>
+        <source>similar to ~%1</source>
+        <translation>semblant a ~%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="748"/>
+        <source>with genre ~%1</source>
+        <translation>amb el gènere ~%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="754"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="766"/>
+        <source>from no one</source>
+        <translation>de ningú</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="758"/>
+        <source>My Collection</source>
+        <translation>La Meva Col·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="762"/>
+        <source>from %1 radio</source>
+        <translation>de la ràdio %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="785"/>
+        <source>with %1 %2</source>
+        <translation>amb %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="787"/>
+        <source>about %1 BPM</source>
+        <translation>sobre %1 BPM</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
+        <source>about %n minute(s) long</source>
+        <translation><numerusform>sobre %n minut de durada</numerusform><numerusform>sobre %n minuts de durada</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
+        <source>about %1 dB</source>
+        <translation>sobre %1 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="793"/>
+        <source>at around %1%2 %3</source>
+        <translation>sobre %1%2 %3</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="798"/>
+        <source>in %1</source>
+        <translation>en %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="803"/>
+        <source>in a %1 key</source>
+        <translation>en clau de %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="813"/>
+        <source>sorted in %1 %2 order</source>
+        <translation>ordenades en %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="818"/>
+        <source>with a %1 mood</source>
+        <translation>amb l&apos;humor %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="823"/>
+        <source>in a %1 style</source>
+        <translation>amb l&apos;estil %1</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestSteerer</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
+        <source>Steer this station:</source>
+        <translation>Dirigeix aquesta emissora:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <source>Much less</source>
+        <translation>Molt més</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <source>Less</source>
+        <translation>Menys</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <source>A bit less</source>
+        <translation>Una mica menys</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <source>Keep at current</source>
+        <translation>Mantingues a l&apos;actual</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <source>A bit more</source>
+        <translation>Una mica més</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <source>More</source>
+        <translation>Més</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <source>Much more</source>
+        <translation>Molt més</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
+        <source>Tempo</source>
+        <translation>Temps</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
+        <source>Loudness</source>
+        <translation>Volum</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
+        <source>Danceability</source>
+        <translation>Ballabilitat</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
+        <source>Energy</source>
+        <translation>Energia</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
+        <source>Song Hotttnesss</source>
+        <translation>Rellevància de Cançó</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <source>Artist Hotttnesss</source>
+        <translation>Rellevància d&apos;Artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
+        <source>Artist Familiarity</source>
+        <translation>Semblança amb l&apos;artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
+        <source>By Description</source>
+        <translation>Per Descripció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
+        <source>Enter a description</source>
+        <translation>Introduïu una descripció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
+        <source>Apply steering command</source>
+        <translation>Aplica la comanda de control</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
+        <source>Reset all steering commands</source>
+        <translation>Restaura totes les comandes de control</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::GroovesharkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
+        <source>Error fetching Grooveshark information from the network!</source>
+        <translation>Error en cercar la informació de Grooveshark a través de la xarxa!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::ChartsPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
+        <source>Top Overall</source>
+        <translation>Top General</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
+        <source>Artists</source>
+        <translation>Artistes</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
+        <source>Albums</source>
+        <translation>Àlbums</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
+        <source>Tracks</source>
+        <translation>Cançons</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation>Tomahawk està reproduint &quot;%1&quot; de %2%3.</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation>a &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
+        <source>Top Tracks</source>
+        <translation>Top Cançons Musicals</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
+        <source>Loved Tracks</source>
+        <translation>Cançons Preferides</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
+        <source>Hyped Tracks</source>
+        <translation>Cançons en alça</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
+        <source>Top Artists</source>
+        <translation>Top Artistes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
+        <source>Hyped Artists</source>
+        <translation>Artistes en alça</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>Àlbums</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation>Estic escoltant &quot;%1&quot; de &quot;%2&quot; i m&apos;encanta! %3</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ItunesParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
+        <source>Error fetching iTunes information from the network!</source>
+        <translation>Error en cercar la informació d&apos;iTunes a través de la xarxa!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::JSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
+        <source>New Playlist</source>
+        <translation>Nova llista de reproducció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Failed to save tracks</source>
+        <translation>Error en desar les cançons</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation>Algunes cançons de la llista no contenen ni artista ni titol i s&apos;han ignorat.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>XSPF Error</source>
+        <translation>Error XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation>No és una llista XSPF vàlida.</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::LatchManager</name>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="86"/>
+        <source>&amp;Catch Up</source>
+        <translation>&amp;Atrapa</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="123"/>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="144"/>
+        <source>&amp;Listen Along</source>
+        <translation>&amp;Escolta a la vegada</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Query</name>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
+        <source> and </source>
+        <translation>i</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
+        <source>You</source>
+        <translation>Jo</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
+        <source>you</source>
+        <translation>jo</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>and</source>
+        <translation>i</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>%n other(s)</source>
+        <translation><numerusform>%n més</numerusform><numerusform>%n més</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
+        <source>%1 people</source>
+        <translation>%1 persones</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
+        <source>loved this track</source>
+        <translation>els ha encantat aquesta cançó</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::RdioParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
+        <source>Error fetching Rdio information from the network!</source>
+        <translation>Error en cercar la informació de Rdio a través de la xarxa!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ShortenedLinkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
+        <source>Network error parsing shortened link!</source>
+        <translation>Error de la xarxa en analitzar l&apos;enllaç escurçat!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Source</name>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
+        <source>Scanning (%L1 tracks)</source>
+        <translation>Escanejant (%L1 cançons)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
+        <source>Scanning</source>
+        <translation>Escanejant</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
+        <source>Checking</source>
+        <translation>Comprovant</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation>S&apos;està sincronitzant</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation>S&apos;està important</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
+        <source>Saving (%1%)</source>
+        <translation>Desant (%1%)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation>En línia</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation>Fora de línia</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::SpotifyParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
+        <source>Error fetching Spotify information from the network!</source>
+        <translation>Error en cercar la informació de Spotify a través de la xarxa!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation>Actualitza automàticament des de XSPF</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkApp</name>
+    <message>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
+        <source>My Collection</source>
+        <translation>La meva Col·lecció</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkOAuthTwitter</name>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>Twitter PIN</source>
+        <translation>PIN de Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>After authenticating on Twitter's web site,
+enter the displayed PIN number here:</source>
+        <translation>Després d&apos;autenticar-vos a la pàgina de Twitter,
+introduïu el PIN aquí:</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkTrayIcon</name>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation>&amp;Atura la Reproducció després d&apos;aquesta Cançó</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
+        <source>Hide Tomahawk Window</source>
+        <translation>Amaga la finestra de Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
+        <source>Show Tomahawk Window</source>
+        <translation>Mostra la finestra de Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
+        <source>Currently not playing.</source>
+        <translation>No s&apos;està reproduint res.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
+        <source>Play</source>
+        <translation>Reprodueix</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
+        <source>Pause</source>
+        <translation>Pausa</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation>&amp;M&apos;encanta</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation>&amp;Continua la reproducció després d&apos;aquesta Cançó</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkWindow</name>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
+        <source>Tomahawk</source>
+        <translation>Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
+        <source>&amp;Settings</source>
+        <translation>&amp;Paràmetres</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
+        <source>&amp;Controls</source>
+        <translation>&amp;Controls</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
+        <source>&amp;Network</source>
+        <translation>&amp;Xarxa</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
+        <source>&amp;Window</source>
+        <translation>&amp;Finestra</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Ajuda</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Surt</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
+        <source>Go &amp;Online</source>
+        <translation>&amp;Connecta&apos;t</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
+        <source>Add &amp;Friend...</source>
+        <translation>Afegeix un &amp;Amic...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
+        <source>U&amp;pdate Collection</source>
+        <translation>Act&amp;ualitza la Col·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
+        <source>Update Collection</source>
+        <translation>Actualitza la Col·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
+        <source>&amp;Configure Tomahawk...</source>
+        <translation>&amp;Configura Tomahawk...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
+        <source>Load &amp;XSPF...</source>
+        <translation>Carrega una llista &amp;XSPF...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
+        <source>Create &amp;New Playlist...</source>
+        <translation>Crea una &amp;nova llista de reproducció...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
+        <source>About &amp;Tomahawk...</source>
+        <translation>Quant a &amp;Tomahawk...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
+        <source>Create New &amp;Automatic Playlist</source>
+        <translation>Crea una Llista de Reproducció &amp;Automàtica</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
+        <source>Create New &amp;Station</source>
+        <translation>Crea una Nova &amp;Emissora</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
+        <source>Show Offline Sources</source>
+        <translation>Mostra les fonts fora de línia</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
+        <source>Hide Offline Sources</source>
+        <translation>Amaga les fonts fora de línia</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
+        <source>Minimize</source>
+        <translation>Minimitza</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
+        <source>Zoom</source>
+        <translation>Zoom</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
+        <source>Meta+Ctrl+Z</source>
+        <translation>Meta+Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation>Informació &amp;legal</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
+        <source>Diagnostics...</source>
+        <translation>Diagnòstics...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
+        <source>Fully &amp;Rescan Collection</source>
+        <translation>&amp;Reescaneja la Col·lecció completament</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
+        <source>Fully Rescan Collection</source>
+        <translation>Reescaneja la Col·lecció completament</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
+        <source>Play</source>
+        <translation>Reprodueix</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
+        <source>Space</source>
+        <translation>Espai</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
+        <source>Previous</source>
+        <translation>Anterior</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
+        <source>Next</source>
+        <translation>Següent</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation>Enrere</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation>Retrocedeix una pàgina</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation>Endavant</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation>Avança una pàgina</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
+        <source>Global Search...</source>
+        <translation>Cerca Global...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
+        <source>Check For Updates...</source>
+        <translation>Comprova les actualitzacions...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
+        <source>Connect To Peer</source>
+        <translation>Connexió Remota</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
+        <source>Enter peer address:</source>
+        <translation>Introduïu l&apos;adreça remota:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
+        <source>Enter peer port:</source>
+        <translation>Introduïu el port remot:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
+        <source>Enter peer key:</source>
+        <translation>Introduïu la clau remota:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>XSPF Error</source>
+        <translation>Error XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation>No és una llista XSPF vàlida.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Failed to save tracks</source>
+        <translation>Error en desar les cançons</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation>Algunes cançons de la llista no contenen ni artista ni titol i s&apos;han ignorat.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
+        <translation>Hi ha un problema per accedir al dispositiu de so o a la cançó. La cançó actual s&apos;ha saltat. Assegureu-vos que teniu un back.end de Phonon adequant i els plugins necessaris instal·lats.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
+        <translation>Hi ha un problema per accedir al dispositiu de so o a la cançó, la cançó actual s&apos;ha saltat.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation>Emissora</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Create New Station</source>
+        <translation>Crea una Nova Emissora</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Name:</source>
+        <translation>Nom:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation>Llista</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation>Llista Automàtica</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
+        <source>Pause</source>
+        <translation>Pausa</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
+        <source>Go &amp;offline</source>
+        <translation>&amp;Desconnecta&apos;t</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
+        <source>Go &amp;online</source>
+        <translation>&amp;Connecta&apos;t</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
+        <source>Authentication Error</source>
+        <translation>Error d&apos;autentificació</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation>S&apos;ha produït un error connectant-se a SIP: Ha fallat autentificant! </translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
+        <source>%1 by %2</source>
+        <comment>track, artist name</comment>
+        <translation>%1 de %2</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
+        <source>%1 - %2</source>
+        <comment>current track, some window title</comment>
+        <translation>%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation>Copyright 2010 - 2012</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation>Gràcies a:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation>Quant a Tomahawk</translation>
+    </message>
+</context>
+<context>
+    <name>TopTracksContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
+        <source>Top Hits</source>
+        <translation>Grans Èxits</translation>
+    </message>
+</context>
+<context>
+    <name>TrackInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation>Cover</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
+        <source>Track</source>
+        <translation>Cançó</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation>Artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation>Àlbum</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation>Estadístiques</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation>Cançons Semblants</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation><numerusform>Heu escoltat aquesta cançó %n cop.</numerusform><numerusform>Heu escoltat aquesta cançó %n cops.</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation>No heu escoltat mai aquesta cançó abans.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation>Vau escoltar aquesta cançó per primer cop el %1.</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation><numerusform>Heu escoltat %1 %n cop.</numerusform><numerusform>Heu escoltat %1 %n cops.</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation>No heu escoltat mai %1 abans.</translation>
+    </message>
+</context>
+<context>
+    <name>TrackView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>El filtre &apos;%1&apos; no ha obtingut cap resultat.</translation>
+    </message>
+</context>
+<context>
+    <name>TransferStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>from</source>
+        <translation>de</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>to</source>
+        <translation>a</translation>
+    </message>
+</context>
+<context>
+    <name>TreeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
+        <source>Unknown</source>
+        <translation>Desconegut</translation>
+    </message>
+</context>
+<context>
+    <name>TreeModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
+        <source>All Artists</source>
+        <translation>Tots els Artistes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
+        <source>My Collection</source>
+        <translation>La meva Col·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
+        <source>Collection of %1</source>
+        <translation>Col·lecció de %1</translation>
+    </message>
+</context>
+<context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
+        <source>Configure this Twitter account</source>
+        <translation>Configura el Compte de Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
+        <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
+        <translation>El plugin de Twitter permet descobrir i reproduir música dels seguidors de Twitter que utilitzen Tomahawk i publicar missatges al vostre compte.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
+        <source>Status: No saved credentials</source>
+        <translation>Estat: no hi ha credencials desades</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
+        <source>Authenticate with Twitter</source>
+        <translation>Autentifica amb Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
+        <source>Twitter Connections</source>
+        <translation>Connexions de Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
+        <source>
+If you only want to post tweets, you're done.
+
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.</source>
+        <translation>
+Si només voleu publicar tweets, ja esteu llestos.
+
+SI voleu connectar Tomahawk als vostres seguidors de Twitter, escolliu el tipus de Tweet i premeu el botó de sota per enviar un missatge de sincronisme. Tots dos us heu d&apos;estar seguint atès que s&apos;empren Missatges Directes. Aleshores, tingueu (molta) paciència -- pot trigar diversos minuts!
+
+Podeu reenviar un missatge de sincronisme en qualsevol moment simplement enviant un altre tweet fent servir el botó.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
+        <source>Select the kind of tweet you would like, then press the button to post it:</source>
+        <translation>Escolliu el tipus de tweet que us agradaria, després premeu el botó per publicar-lo:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
+        <source>Global Tweet</source>
+        <translation>Tweet Global</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
+        <source>@Mention</source>
+        <translation>@Menció</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
+        <source>Direct Message</source>
+        <translation>Missatge Directe</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
+        <source>e.g. @tomahawk</source>
+        <translation>e.g. @tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
+        <source>Send Message</source>
+        <translation>Envia el Missatge</translation>
+    </message>
+</context>
+<context>
+    <name>ViewManager</name>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
+        <source>SuperCollection</source>
+        <translation>SuperCol·lecció</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
+        <source>Combined libraries of all your online friends</source>
+        <translation>Biblioteques combinades de tots els amis en línia</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation>Cançons Escoltades Recentment</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation>Cançons escoltades recentment pels amics</translation>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
+        <source>Recent Additions</source>
+        <translation>Darreres Novetats</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
+        <source>Newest Stations &amp; Playlists</source>
+        <translation>Darreres Emissores i Llistes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
+        <source>Recently Played Tracks</source>
+        <translation>Cançons Escoltades Recentment</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
+        <source>No recently created playlists in your network.</source>
+        <translation>No hi ha cançons escoltades recentment a la xarxa.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
+        <source>Welcome to Tomahawk</source>
+        <translation>Us donem la benvinguda a Tomahawk</translation>
+    </message>
+</context>
+<context>
+    <name>WhatsHotWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
+        <source>Charts</source>
+        <translation>Llistes</translation>
+    </message>
+</context>
+<context>
+    <name>WikipediaContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="42"/>
+        <source>Wikipedia</source>
+        <translation>Viquipèdia</translation>
+    </message>
+</context>
+<context>
+    <name>XMPPBot</name>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
+        <source>
+Terms for %1:
+</source>
+        <translation>
+Termes per %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
+        <source>No terms found, sorry.</source>
+        <translation>No s&apos;han trobat termes.</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
+        <source>
+Hotttness for %1: %2
+</source>
+        <translation>
+Rellevància per %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
+        <source>
+Familiarity for %1: %2
+</source>
+        <translation>Semblança per %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
+        <source>
+Lyrics for &quot;%1&quot; by %2:
+
+%3
+</source>
+        <translation>
+Lletres de la cancó &quot;%1&quot; de %2:
+
+%3
+</translation>
+    </message>
+</context>
+<context>
+    <name>XSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
+        <source>Failed to parse contents of XSPF playlist</source>
+        <translation>Error en analitzar els continguts de la llista XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
+        <source>Some playlist entries were found without artist and track name, they will be omitted</source>
+        <translation>Algunes entrades de la llista no disposaven d&apos;informació d&apos;artista ni de nom de cançó, s&apos;han omès</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
+        <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
+        <translation>Error en cercar la llista a la xarxa. Pot ser no existeix el fitxer</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
+        <source>New Playlist</source>
+        <translation>Nova llista de reproducció</translation>
+    </message>
+</context>
+<context>
+    <name>XmlConsole</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
+        <source>Xml stream console</source>
+        <translation>Consola de flux XML</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
+        <source>Filter</source>
+        <translation>Filtra</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
+        <source>Save log</source>
+        <translation>Desa el log</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
+        <source>Disabled</source>
+        <translation>Desactivat</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
+        <source>By JID</source>
+        <translation>Per JID</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
+        <source>By namespace uri</source>
+        <translation>Per namespace uri</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
+        <source>By all attributes</source>
+        <translation>Per atributs</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
+        <source>Visible stanzas</source>
+        <translation>Instàncies visibles</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
+        <source>Information query</source>
+        <translation>Petició d&apos;informació</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
+        <source>Message</source>
+        <translation>Missatge</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
+        <source>Presence</source>
+        <translation>Presència</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
+        <source>Custom</source>
+        <translation>Personalitzat</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
+        <source>Close</source>
+        <translation>Tanca</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
+        <source>Save XMPP log to file</source>
+        <translation>Desa el log XMPP en un fitxer</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
+        <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
+        <translation>Format OpenDocument (*.odf);;fitxer HTML (*.html);;Text Pla (*.txt)</translation>
+    </message>
+</context>
+<context>
+    <name>XmppConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
+        <source>Xmpp Configuration</source>
+        <translation>Configuració XMPP</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
+        <source>Configure this Xmpp account</source>
+        <translation>Configura aquest compte XMPP</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
+        <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
+        <translation>Introduiu les dades d&apos;inici de sessió de XMPP per connectar-vos amb els amics que fan servir Tomahawk!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
+        <source>Login Information</source>
+        <translation>Informació d&apos;inici de sessió</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
+        <source>Xmpp ID:</source>
+        <translation>ID XMPP:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
+        <source>e.g. user@example.com</source>
+        <translation>e.g. usuari@exemple.com</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
+        <source>Password:</source>
+        <translation>Contrasenya:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
+        <source>An account with this name already exists!</source>
+        <translation>Ja existeix un compte amb aquest nom!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
+        <source>Advanced Xmpp Settings</source>
+        <translation>Paràmetres avançats de XMPP</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
+        <source>Server:</source>
+        <translation>Servidor:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
+        <source>Port:</source>
+        <translation>Port:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
+        <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
+        <translation>Molts servidors no suporten aquesta opció (e.g. GTalk, jabber.org)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
+        <source>Publish currently playing track</source>
+        <translation>Publica la cançó que s&apos;estigui reproduint al moment</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
+        <source>Enforce secure connection</source>
+        <translation>Força una connexió segura</translation>
+    </message>
+</context>
+<context>
+    <name>XmppSipPlugin</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
+        <source>User Interaction</source>
+        <translation>Interacció d&apos;usuari</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
+        <source>Host is unknown</source>
+        <translation>El nom de l&apos;ordinador és desconegut</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
+        <source>Item not found</source>
+        <translation>No s&apos;ha trobat l&apos;element</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
+        <source>Authorization Error</source>
+        <translation>Error d&apos;autorització</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
+        <source>Remote Stream Error</source>
+        <translation>Error de flux remot</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
+        <source>Remote Connection failed</source>
+        <translation>Ha fallat la connexió remota</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
+        <source>Internal Server Error</source>
+        <translation>Error del servidor intern</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
+        <source>System shutdown</source>
+        <translation>Sistema apagat</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
+        <source>Conflict</source>
+        <translation>Conflicte</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
+        <source>Unknown</source>
+        <translation>Desconegut</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
+        <source>No Compression Support</source>
+        <translation>Compressió no suportada</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
+        <source>No Encryption Support</source>
+        <translation>Encriptació no suportada</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
+        <source>No Authorization Support</source>
+        <translation>Autorització no suportada</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
+        <source>No Supported Feature</source>
+        <translation>Característica no suportada</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
+        <source>Add Friend</source>
+        <translation>Afegeix un Amic</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
+        <source>Enter Xmpp ID:</source>
+        <translation>Introduiu la ID XMPP:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
+        <source>Add Friend...</source>
+        <translation>Afegeix un Amic...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
+        <source>XML Console...</source>
+        <translation>Consola XML...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
+        <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
+        <translation>Sóc una presència automàtica emprada pel Reproductor Tomahawk. (http://gettomahawk.com. Si rebeu aquest missatge, la persona amb qui intenteu contactar probablement no està en línia, intenteu-ho més tard!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
+        <source>Authorize User</source>
+        <translation>Autorització d&apos;Usuari</translation>
+    </message>
+</context>
+<context>
+    <name>ZeroconfConfig</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulari</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
+        <source>Local Network configuration</source>
+        <translation>Configuració de la Xarxa Local</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
+        <source>This plugin will automatically find other users running Tomahawk on your local network</source>
+        <translation>Aquest plugin troba automàticament altres usuaris que fan servir Tomahawk a la vostra Xarxa Local</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
+        <source>Connect automatically when Tomahawk starts</source>
+        <translation>Connecta-t&apos;hi automàticament quan Tomahawk arrenqui</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/lang/tomahawk_de.ts -> tomahawk-0.5.5.tar.bz2/lang/tomahawk_de.ts Changed

@@ -1,45 +1,46 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.0">
 <context>
-    <name>ACLRegistry</name>
+    <name>ACLJobDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="140"/>
-        <source>Connect to Peer?</source>
-        <translation>Mit anderem Tomahawk verbinden?</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation>Willst du %1
+erlauben sich mit dir zu verbinden?</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="141"/>
-        <source>Another Tomahawk instance that claims to be owned by %1 is attempting to connect to you. Select whether to allow or deny this connection.
-
-Remember: Only allow peers to connect if you trust who they are and if you have the legal right for them to stream music from you.</source>
-        <translation>Ein anderes Tomahawk, das behauptet &lt;b&gt;%1&lt;/b&gt; zu gehören, versucht, sich mit deinem Tomahawk zu verbinden. Möchtestest du das erlauben?
-
-Denk dran: Erlaube das nur, wenn du dem Anderen vertraust und du die Rechte zum Streamen deiner Musik hast!</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation>Zugriff erlauben</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="142"/>
-        <source>Deny</source>
-        <translation>Verbieten</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation>Zugriff verweigern</translation>
     </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="143"/>
-        <source>Allow</source>
-        <translation>Erlauben</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation>Tomahawk will wissen, ob du dich mit %1 verbinden möchtest.</translation>
     </message>
 </context>
 <context>
     <name>AccountFactoryWrapper</name>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="30"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
         <source>Description goes here</source>
-        <translation type="unfinished"/>
+        <translation>Beschreibung hier</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.cpp" line="41"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
         <source>Add Account</source>
         <translation>Konto hinzufügen</translation>
     </message>
@@ -47,17 +48,17 @@
 <context>
     <name>AccountFactoryWrapperDelegate</name>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="105"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
         <source>Online</source>
         <translation>Verbunden</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="110"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
         <source>Connecting...</source>
         <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="115"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
         <source>Offline</source>
         <translation>Nicht Verbunden</translation>
     </message>
@@ -65,69 +66,69 @@
 <context>
     <name>ActionCollection</name>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="43"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
         <source>&amp;Listen Along</source>
         <translation>&amp;Mithören</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="46"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
         <source>Stop &amp;Listening Along</source>
         <translation>Mithören b&amp;eenden</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="50"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
         <source>&amp;Follow in real-time</source>
         <translation>In Echtzeit &amp;folgen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Privately</source>
         <translation>&amp;Privat Modus aktivieren</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Publicly</source>
         <translation>&amp;Privat Modus verlassen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="61"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
         <source>&amp;Load Playlist</source>
-        <translation>&amp;Lade Playliste</translation>
+        <translation>&amp;Lade Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="62"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
         <source>&amp;Rename Playlist</source>
-        <translation>Playliste &amp;umbenennen</translation>
+        <translation>Playlist &amp;umbenennen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="63"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
         <source>&amp;Copy Playlist Link</source>
-        <translation>&amp;Kopiere Link zu dieser Playliste</translation>
+        <translation>&amp;Kopiere Link zu dieser Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="64"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
         <source>&amp;Play</source>
         <translation>&amp;Abspielen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="65"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stop</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
         <source>&amp;Previous Track</source>
         <translation>&amp;Vorheriges Lied</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="67"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
         <source>&amp;Next Track</source>
         <translation>&amp;Nächstes Lied</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="68"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
         <source>&amp;Quit</source>
         <translation>&amp;Verlassen</translation>
     </message>
@@ -145,30 +146,17 @@
         <translation>Andere Alben des Künstlers</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="74"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="120"/>
-        <source>Click to show Official Tracks</source>
-        <translation>Hier klicken um die offizielle Trackliste zu sehen</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation>Sorry, wir konnten keine anderen Alben für diesen Künstler finden!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="72"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="118"/>
-        <source>Click to show SuperCollection Tracks</source>
-        <translation>Lieder in der Supersammlung anzeigen</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation>Sorry, wir konnten keine anderen Lieder für dieses Album finden!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="79"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="136"/>
-        <source>Click to show SuperCollection Albums</source>
-        <translation>Alben in der Supersammlung anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="138"/>
-        <source>Click to show Official Albums</source>
-        <translation>Hier klicken um die offiziellen Alben zu sehen</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="205"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
         <source>Other Albums by %1</source>
         <translation>Andere Alben von %1</translation>
     </message>
@@ -176,36 +164,18 @@
 <context>
     <name>AlbumModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="145"/>
-        <source>Album</source>
-        <translation>Album</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="260"/>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="302"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
         <source>All albums from %1</source>
         <translation>Alle Alben von %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="304"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
         <source>All albums</source>
         <translation>Alle Alben</translation>
     </message>
 </context>
 <context>
-    <name>AlbumView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="155"/>
-        <source>After you have scanned your music collection you will find your latest album additions right here.</source>
-        <translation>Nachdem Tomahawk deine Sammlung durchsucht hast siehst du hier deine neuesten Alben.</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="157"/>
-        <source>This collection doesn&apos;t have any recent albums.</source>
-        <translation>Diese Sammlung ist leer.</translation>
-    </message>
-</context>
-<context>
     <name>ArtistInfoWidget</name>
     <message>
         <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
@@ -213,119 +183,120 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
         <source>Top Hits</source>
         <translation>Top Hits</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
         <source>Related Artists</source>
         <translation>Ähnliche Künstler</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="77"/>
-        <source>Albums</source>
-        <translation>Alben</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation>Künstler</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="86"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="125"/>
-        <source>Click to show SuperCollection Albums</source>
-        <translation>Alben in der Supersammlung anzeigen</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>Alben</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="127"/>
-        <source>Click to show Official Albums</source>
-        <translation>Hier klicken um die offiziellen Alben zu sehen</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation>Cover</translation>
     </message>
-</context>
-<context>
-    <name>ArtistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="272"/>
-        <source>After you have scanned your music collection you will find your tracks right here.</source>
-        <translation>Nachdem Tomahawk deine Sammlung durchsucht hat siehst du deine Lieder hier.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation>Sorry, wir konnten keine Alben für diesen Künstler finden!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="274"/>
-        <source>This collection is currently empty.</source>
-        <translation>Diese Sammlung is momentan leer.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation>Sorry, wir konnten keine ähnlichen Künstler finden!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="291"/>
-        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
-        <translation>Entschuldige, dein Filter &apos;%1&apos; erzeugte keine Ergebnisse.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation>Sorry, wir konnten keine Lieder für diesen Künstler finden!</translation>
     </message>
 </context>
 <context>
     <name>AudioControls</name>
     <message>
-        <location filename="../src/audiocontrols.ui" line="75"/>
+        <location filename="../src/AudioControls.ui" line="75"/>
         <source>Prev</source>
         <translation>Zurück</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="87"/>
+        <location filename="../src/AudioControls.ui" line="87"/>
         <source>Play</source>
         <translation>Abspielen</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="94"/>
+        <location filename="../src/AudioControls.ui" line="94"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="103"/>
+        <location filename="../src/AudioControls.ui" line="103"/>
         <source>Next</source>
         <translation>Weiter</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="214"/>
+        <location filename="../src/AudioControls.ui" line="229"/>
         <source>Artist</source>
         <translation>Künstler</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="236"/>
+        <location filename="../src/AudioControls.ui" line="248"/>
         <source>Album</source>
         <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="265"/>
+        <location filename="../src/AudioControls.ui" line="277"/>
         <source>Owner</source>
         <translation>Eigentümer</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="302"/>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation>Sozial</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
         <source>love</source>
         <translation>Lieben</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="346"/>
+        <location filename="../src/AudioControls.ui" line="383"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="375"/>
+        <location filename="../src/AudioControls.ui" line="412"/>
         <source>Time Left</source>
         <translation>Zeit verbleibend</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="453"/>
+        <location filename="../src/AudioControls.ui" line="493"/>
         <source>Shuffle</source>
         <translation>Zufall</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="466"/>
+        <location filename="../src/AudioControls.ui" line="506"/>
         <source>Repeat</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="504"/>
+        <location filename="../src/AudioControls.ui" line="544"/>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="536"/>
+        <location filename="../src/AudioControls.ui" line="576"/>
         <source>High</source>
         <translation>Hoch</translation>
     </message>
@@ -333,41 +304,42 @@
 <context>
     <name>AudioEngine</name>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="199"/>
-        <source>Tomahawk is stopped.</source>
-        <translation>Tomahawk ist gestoppt.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation>Sorry, Tomahawk konnte &apos;%1&apos; von %2 nicht finden</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="369"/>
-        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
-        <translation>Tomahawk spielt &quot;%1&quot; von %2%3.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation>Sorry, Tomahawk konnte den Künstler &apos;%1&apos; nicht finden</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="372"/>
-        <source>on album %1</source>
-        <translation>auf dem Album %1</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation>Sorry, Tomahawk konnte das Album &apos;%1&apos; von %2 nicht finden</translation>
     </message>
 </context>
 <context>
     <name>CategoryAddItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="61"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="100"/>
-        <source>New Playlist</source>
-        <translation>Neue Playliste</translation>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation>Neue Playlist erstellen</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation>Neue Station erstellen</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="63"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>New Station</source>
         <translation>Neue Station</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>%1 Station</source>
         <translation>%1 Station</translation>
     </message>
@@ -375,12 +347,12 @@
 <context>
     <name>CategoryItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="63"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
         <source>Playlists</source>
         <translation>Playlisten</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="65"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
         <source>Stations</source>
         <translation>Stationen</translation>
     </message>
@@ -388,33 +360,12 @@
 <context>
     <name>ClearButton</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/clearbutton.cpp" line="38"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
         <source>Clear</source>
         <translation>Leeren</translation>
     </message>
 </context>
 <context>
-    <name>CollectionFlatModel</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="72"/>
-        <source>My Collection</source>
-        <translation>Meine Sammlung</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="74"/>
-        <source>Collection of %1</source>
-        <translation>Sammlung von %1</translation>
-    </message>
-</context>
-<context>
-    <name>CollectionView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionview.cpp" line="85"/>
-        <source>This collection is empty.</source>
-        <translation>Diese Sammlung ist leer.</translation>
-    </message>
-</context>
-<context>
     <name>ContextWidget</name>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
@@ -423,12 +374,12 @@
     </message>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="344"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
         <source>Show Footnotes</source>
         <translation>Footnotes einblenden</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="338"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
         <source>Hide Footnotes</source>
         <translation>Footnotes ausblenden</translation>
     </message>
@@ -440,39 +391,49 @@
         <source>Tomahawk Crash Reporter</source>
         <translation>Tomahawk Fehlermelder</translation>
     </message>
-    <message>
+    <message utf8="true">
         <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
-        <source>&lt;p&gt;&lt;b&gt;Sorry!&lt;/b&gt;&amp;nbsp;Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;b&gt;Das tut uns leid!&lt;/b&gt; Tomahawk ist abgestürzt!  Informationen darüber werden nun in die Tomahawk-Einsatzzentrale weitergeleitet, so dass der Fehler behoben werden kann.&lt;/p&gt;</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation>Report abschicken</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation>Nicht abschicken</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="172"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
         <source>Abort</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="192"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
         <source>You can disable sending crash reports in the configuration dialog.</source>
         <translation>Du kannst das Übermitteln der Fehlerberichte in den Einstellungen abschalten.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="153"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
         <source>Uploaded %L1 of %L2 KB.</source>
         <translation>%L1 von %L2 hochgeladen.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="167"/>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="183"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="176"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
         <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
         <translation>Gesendet! &lt;b&gt;Vielen Dank!&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
         <source>Failed to send crash info.</source>
         <translation>Übertragung des Fehlerberichts fehlgeschlagen.</translation>
     </message>
@@ -480,7 +441,7 @@
 <context>
     <name>DatabaseCommand_AllAlbums</name>
     <message>
-        <location filename="../src/libtomahawk/database/databasecommand_allalbums.cpp" line="109"/>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
@@ -488,41 +449,43 @@
 <context>
     <name>DelegateConfigWrapper</name>
     <message>
-        <location filename="../src/delegateconfigwrapper.cpp" line="61"/>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation>Über</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
         <source>Delete Account</source>
         <translation>Konto entfernen</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>Über dieses Konto</translation>
+    </message>
 </context>
 <context>
     <name>DiagnosticsDialog</name>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="20"/>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
         <source>Tomahawk Diagnostics</source>
         <translation>Tomahawk Diagnose Tool</translation>
     </message>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="38"/>
-        <source>Update</source>
-        <translation>Aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../src/diagnosticsdialog.ui" line="45"/>
-        <source>Copy to Clipboard</source>
-        <translation>In die Zwischenablage kopieren</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DropJob</name>
     <message>
-        <location filename="../src/libtomahawk/dropjob.cpp" line="832"/>
-        <source>No tracks found for given %1</source>
-        <translation>Keine Stücke gefunden für %1</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GlobalSearchWidget</name>
     <message>
-        <location filename="../src/searchbox.ui" line="14"/>
+        <location filename="../src/SearchBox.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
@@ -538,66 +501,48 @@
 <context>
     <name>InfoBar</name>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.ui" line="26"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Infoleiste</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="87"/>
-        <source>Automatically update</source>
-        <translation>Automatisch aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="95"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
         <source>Filter...</source>
         <translation>Filter...</translation>
     </message>
 </context>
 <context>
-    <name>JobStatusView</name>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Searching For</source>
-        <translation>Suche nach</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Pending</source>
-        <translation>Verbleibend</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="94"/>
-        <source>Idle</source>
-        <translation>Warte</translation>
-    </message>
-</context>
-<context>
     <name>LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
         <source>Scrobble tracks to Last.fm</source>
         <translation>Scrobbel Stücke zu Last.fm</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
         <source>Username:</source>
         <translation>Benutzer:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
         <source>Test Login</source>
         <translation>Login testen</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation>Lieder-Historie importieren</translation>
+    </message>
 </context>
 <context>
     <name>LastfmContext</name>
@@ -611,7 +556,7 @@
     <name>LatchedStatusItem</name>
     <message>
         <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
-        <source>%1 is listening along to you!</source>
+        <source>%1 is listening along with you!</source>
         <translation>%1 hört mit dir mit!</translation>
     </message>
 </context>
@@ -625,7 +570,7 @@
     <message>
         <location filename="../src/LoadXSPFDialog.ui" line="22"/>
         <source>Playlist URL</source>
-        <translation type="unfinished"/>
+        <translation>Url der Playlist</translation>
     </message>
     <message>
         <location filename="../src/LoadXSPFDialog.ui" line="29"/>
@@ -646,12 +591,12 @@
 <context>
     <name>LoadXSPFDialog</name>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>Load XSPF File</source>
         <translation>Lade XSPF Datei</translation>
     </message>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>XSPF Files (*.xspf)</source>
         <translation>XSPF Dateien (*.xspf)</translation>
     </message>
@@ -659,53 +604,256 @@
 <context>
     <name>LocalCollection</name>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Bookmarks</source>
         <translation>Lesezeichen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Saved tracks</source>
         <translation>Gespeicherte Lieder</translation>
     </message>
 </context>
 <context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation>Sorry, wir konnten keine Lieblingslieder finden!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation>Lieblingslieder</translation>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation>Titel:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation>Titel...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation>Künstler:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation>Künstler...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation>Album:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation>Album...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation>Disc Nummer:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation>Dauer:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation>00.00</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation>Jahr:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation>Bitrate:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation>Datei</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation>Dateiname:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation>Dateiname...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation>Dateigröße...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation>Dateigröße...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation>Dateigröße:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation>Zurück</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation>Vorwärts</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation> - Eigenschaften</translation>
+    </message>
+</context>
+<context>
     <name>NewPlaylistWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="20"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
         <source>Enter a title for the new playlist:</source>
-        <translation>Gib einen Titel für die neue Playliste ein:</translation>
+        <translation>Gib einen Titel für die neue Playlist ein:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
         <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
         <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="47"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
         <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>Gib einfach ein Genre oder einen Tagnamen ein, und Tomahawk wird dir einige Lieder vorschlagen und dir 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 Playlist zu erstellen:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.cpp" line="43"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
         <source>&amp;Create Playlist</source>
-        <translation>Playliste &amp;erstellen</translation>
+        <translation>Playlist &amp;erstellen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.h" line="50"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
         <source>Create a new playlist</source>
-        <translation>Erstelle eine neue Playliste</translation>
+        <translation>Erstelle eine neue Playlist</translation>
+    </message>
+</context>
+<context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>Neuerscheinungen</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation>Künstler</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation>Titel</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation>Komponist</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation>Album</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation>Lied</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation>Bitrate</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation>Alter</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation>Jahr</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Größe</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation>Quelle</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation>Wertung</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>PlaylistItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="162"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
         <source>played %1 by you</source>
         <translation>angehört %1 von dir</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="164"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
         <source>played %1 by %2</source>
         <translation>angehört %1 von %2</translation>
     </message>
@@ -713,40 +861,40 @@
 <context>
     <name>PlaylistLargeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="156"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
         <source>played %1 by you</source>
         <translation>angehört %1 von dir</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
         <source>played %1 by %2</source>
-        <translation type="unfinished"/>
+        <translation>hörte %1 von %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="165"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
         <source>added %1</source>
-        <translation type="unfinished"/>
+        <translation>fügte %1 hinzu</translation>
     </message>
 </context>
 <context>
     <name>PlaylistModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
         <source>A playlist by %1, created %2</source>
-        <translation>Eine Playliste von %1, erstellt %2</translation>
+        <translation>Eine Playlist von %1, erstellt %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="78"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
         <source>you</source>
         <translation>dir</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
         <source>All tracks by %1 on album %2</source>
         <translation>Alle Lieder von %1 auf dem Album %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="152"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
         <source>All tracks by %1</source>
         <translation>Alle Lieder von %1</translation>
     </message>
@@ -754,109 +902,110 @@
 <context>
     <name>PlaylistTypeSelectorDlg</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="32"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
         <source>New Playlist</source>
-        <translation>Neue Playliste</translation>
+        <translation>Neue Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="49"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
         <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
-        <translation>Eine ganze normale Playliste... Gib ihr einen Namen, füg ein paar Lieder hinzu, und los geht&apos;s!</translation>
+        <translation>Eine ganze normale Playlist... Gib ihr einen Namen, füg ein paar Lieder hinzu, und los geht&apos;s!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="75"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
         <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
-        <translation>Du weisst noch nicht genau was du willst? Mit etwas Hilfe kann Tomahawk eine Playliste nach deinem Geschmack erstellen!</translation>
+        <translation>Du weisst noch nicht genau was du willst? Mit etwas Hilfe kann Tomahawk eine Playlist nach deinem Geschmack erstellen!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="92"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="102"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
         <source>New Playlist...</source>
-        <translation>Neue Playliste...</translation>
+        <translation>Neue Playlist...</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="113"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
         <source>Create Manual Playlist</source>
-        <translation>Manuelle Playliste erstellen</translation>
+        <translation>Manuelle Playlist erstellen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="123"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
         <source>Create Automatic Playlist</source>
-        <translation>Automatische Playliste erstellen</translation>
+        <translation>Automatische Playlist erstellen</translation>
     </message>
 </context>
 <context>
     <name>PlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistview.cpp" line="145"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation>Diese Playlist ist momentan leer.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
         <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
-        <translation>Diese Playliste ist derzeit leer. Füge einige Stücke hinzu und genieße die Musik!</translation>
+        <translation>Diese Playlist ist derzeit leer. Füge einige Stücke hinzu und genieße die Musik!</translation>
     </message>
 </context>
 <context>
     <name>ProxyDialog</name>
     <message>
-        <location filename="../src/proxydialog.ui" line="17"/>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
         <source>Proxy Settings</source>
         <translation>Proxy-Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="70"/>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
         <source>Hostname of proxy server</source>
         <translation>Rechnername des Proxy Servers</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="77"/>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
         <source>Host</source>
         <translation>Rechnername</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="84"/>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="104"/>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
         <source>Proxy login</source>
         <translation>Proxy Nutzername</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="111"/>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="118"/>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="128"/>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
         <source>Proxy password</source>
         <translation>Proxy Passwort</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="135"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../src/proxydialog.ui" line="142"/>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
         <source>No Proxy Hosts:
 (Overrides system proxy)</source>
-        <translation type="unfinished"/>
+        <translation>Proxy Ausnahmen:
+(Hat Vorrang vor System Proxy)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="150"/>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
         <source>localhost *.example.com (space separated)</source>
         <translation>localhost *.beispiel.de (Getrennt durch Leerzeichen)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="167"/>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
         <source>Use proxy for DNS lookups?</source>
         <translation>Proxy für DNS Anfragen verwenden?</translation>
     </message>
@@ -864,82 +1013,82 @@
 <context>
     <name>QObject</name>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="214"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
         <source>%n year(s) ago</source>
         <translation><numerusform>vor %n Jahr</numerusform><numerusform>vor %n Jahren</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="216"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
         <source>%n year(s)</source>
         <translation><numerusform>%n Jahr</numerusform><numerusform>%n Jahre</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="222"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
         <source>%n month(s) ago</source>
         <translation><numerusform>vor %n Monat</numerusform><numerusform>vor %n Monaten</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
         <source>%n month(s)</source>
         <translation><numerusform>%n Monat</numerusform><numerusform>%n Monate</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="230"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
         <source>%n week(s) ago</source>
         <translation><numerusform>vor %n Woche</numerusform><numerusform>vor %n Wochen</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="232"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
         <source>%n week(s)</source>
         <translation><numerusform>%n Woche</numerusform><numerusform>%n Wochen</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="238"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>vor %n Tag</numerusform><numerusform>vor %n Tagen</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="240"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
         <source>%n day(s)</source>
         <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="246"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>vor %n Stunde</numerusform><numerusform>vor %n Stunden</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="248"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
         <source>%n hour(s)</source>
         <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="254"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
         <source>%1 minutes ago</source>
-        <translation>vor %1 Minute</translation>
+        <translation>vor %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="256"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
         <source>%1 minutes</source>
         <translation>%1 Minuten</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="260"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
         <source>just now</source>
         <translation>gerade eben</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="34"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
         <source>Friend Finders</source>
         <translation>Freundefinder</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
         <source>Music Finders</source>
         <translation>Musikfinder</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="39"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
         <source>Status Updaters</source>
         <translation>Status-Updater</translation>
     </message>
@@ -949,32 +1098,37 @@
     <message>
         <location filename="../src/libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
         <source>ZIP/UNZIP API error %1</source>
-        <translation type="unfinished"/>
+        <translation>ZIP/UNZIP API Fehler %1</translation>
     </message>
 </context>
 <context>
     <name>QueueView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="26"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Infoleiste</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="41"/>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="120"/>
-        <source>Show Queue</source>
-        <translation>Warteschlange einblenden</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation>Warteschlange öffnen</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation><numerusform>Warteschlange öffnen - Ein Lied</numerusform><numerusform>Warteschlange öffnen - %n Lieder</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="130"/>
-        <source>Hide Queue</source>
-        <translation>Warteschlange ausblenden</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation>Warteschlange schliessen</translation>
     </message>
 </context>
 <context>
     <name>RelatedArtistsContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
         <source>Related Artists</source>
         <translation>Ähnliche Künstler</translation>
     </message>
@@ -982,12 +1136,12 @@
 <context>
     <name>ResolverConfigDelegate</name>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="110"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
         <source>Not found: %1</source>
         <translation>Nicht gefunden: %1</translation>
     </message>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="113"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
         <source>Failed to load: %1</source>
         <translation>Fehler beim Laden: %1</translation>
     </message>
@@ -995,7 +1149,7 @@
 <context>
     <name>SearchLineEdit</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/searchlineedit.cpp" line="58"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
@@ -1003,12 +1157,12 @@
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="54"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
         <source>Search: %1</source>
         <translation>Suche nach: %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="55"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
         <source>Results for &apos;%1&apos;</source>
         <translation>Ergebnisse für &apos;%1&apos;</translation>
     </message>
@@ -1016,39 +1170,49 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="245"/>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
         <source>Collection</source>
         <translation>Sammlung</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="252"/>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
         <source>Advanced</source>
         <translation>Erweitert</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="124"/>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="238"/>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation>Einige geänderte Einstellungen haben keinen Effekt bis zum nächsten Neustart</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
         <source>Services</source>
         <translation>Dienste</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="396"/>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
         <source>Install resolver from file</source>
-        <translation type="unfinished"/>
+        <translation>Installiere Resolver Datei</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Information</source>
-        <translation type="unfinished"/>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation>Alle erteilten Zugriffsrechte löschen?</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Changing this setting requires a restart of Tomahawk!</source>
-        <translation>Diese Einstellung benötigt einen Neustart von Tomahawk um aktiv zu werden!</translation>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation>Willst du wirklich alle Zugriffseinstellungen zurücksetzen? Du wirst für alle Verbindungen erneut nach Zugriffseinstellungen gefragt werden.</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>Information</translation>
     </message>
 </context>
 <context>
@@ -1070,56 +1234,94 @@
     </message>
 </context>
 <context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>Cover</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation>Tweet</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation>Hört &quot;%1&quot; von %2, %3</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation>Hört &quot;%1&quot; von %2 auf &quot;%3&quot;, %4</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation>%1 Zeichen übrig</translation>
+    </message>
+</context>
+<context>
     <name>SourceDelegate</name>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="55"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
         <source>Track</source>
         <translation>Lied</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="56"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
         <source>Album</source>
         <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="57"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
         <source>Artist</source>
         <translation>Künstler</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="58"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
         <source>Local</source>
         <translation>Lokal</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="59"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
         <source>Top 10</source>
         <translation>Top 10</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="187"/>
-        <source>Offline</source>
-        <translation>Nicht Verbunden</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
         <source>All available tracks</source>
         <translation>Alle verfügbaren Stücke</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="196"/>
-        <source>Online</source>
-        <translation>Verbunden</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="289"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="330"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
         <source>Show</source>
         <translation>Einblenden</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="291"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="332"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
         <source>Hide</source>
         <translation>Verstecken</translation>
     </message>
@@ -1127,32 +1329,32 @@
 <context>
     <name>SourceInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="30"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
         <source>Recent Albums</source>
         <translation>Aktuelle Alben</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="74"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
         <source>Latest Additions</source>
         <translation>Kürzlich hinzugekommen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="88"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
         <source>Recently Played Tracks</source>
         <translation>Kürzlich gehörte Lieder</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="80"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
         <source>New Additions</source>
         <translation>Kürzlich hinzugekommen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="83"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
         <source>My recent activity</source>
         <translation>Meine letzten Aktivitäten</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="87"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
         <source>Recent activity from %1</source>
         <translation>Die letzten Aktivitäten von %1</translation>
     </message>
@@ -1160,55 +1362,128 @@
 <context>
     <name>SourceItem</name>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="65"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
         <source>Collection</source>
         <translation>Sammlung</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="73"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
         <source>Latest Additions</source>
         <translation>Kürzlich hinzugekommen</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="77"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
         <source>Recently Played</source>
         <translation>Kürzlich gehörte Lieder</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="81"/>
-        <source>Loved Tracks</source>
-        <translation>Lieblingslieder</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="146"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
         <source>SuperCollection</source>
         <translation>Supersammlung</translation>
     </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation>Neueste Lieder in deiner Sammlung</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation>Neueste Lieder in %1&apos;s Sammlung</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation>Sorry, wir konnten keine Lieder finden die kürzlich hinzugefügt wurden!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation>Zuletzt gehörte Lieder</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation>Deine zuletzt gehörten Lieder</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation>%1&apos;s zuletzt gehörte Lieder</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation>Sorry, wir konnten keine kürzlich gespielten Lieder finden!</translation>
+    </message>
 </context>
 <context>
     <name>SourceTreeView</name>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="188"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
         <source>&amp;Copy Link</source>
         <translation>&amp;Kopiere Link</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
         <source>&amp;Delete %1</source>
         <translation>&amp;Lösche %1</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="207"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation>Zu meinen Playlisten hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation>Zu meinen Automatischen Playlisten hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation>Zu meinen Stationen hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
         <source>&amp;Export Playlist</source>
-        <translation>Playliste &amp;exportieren</translation>
+        <translation>Playlist &amp;exportieren</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="341"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation>Playlist</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation>Automatische Playlist</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation>%1 löschen?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation>Möchtest du die %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt; löschen?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
         <source>Save XSPF</source>
         <translation>XSPF speichern</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="342"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
         <source>Playlists (*.xspf)</source>
         <translation>Playlisten (*.xspf)</translation>
     </message>
@@ -1216,72 +1491,77 @@
 <context>
     <name>SourcesModel</name>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="78"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="81"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
         <source>Collection</source>
         <translation>Sammlung</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="84"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
         <source>Playlist</source>
-        <translation>Playliste</translation>
+        <translation>Playlist</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="87"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
         <source>Automatic Playlist</source>
-        <translation>Automatische Playliste</translation>
+        <translation>Automatische Playlist</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="90"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
         <source>Station</source>
         <translation>Station</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="268"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
         <source>Browse</source>
         <translation>Stöbern</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="269"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
         <source>Search History</source>
         <translation>Suchverlauf</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="271"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
         <source>My Music</source>
         <translation>Meine Musik</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="279"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
         <source>SuperCollection</source>
         <translation>Supersammlung</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="285"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
         <source>Top Loved Tracks</source>
         <translation>Gemeinsame Lieblingslieder</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="273"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
         <source>Dashboard</source>
-        <translation type="unfinished"/>
+        <translation>Dashboard</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="290"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
         <source>Recently Played</source>
-        <translation type="unfinished"/>
+        <translation>Kürzlich gehörte Lieder</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
         <source>Charts</source>
         <translation>Charts</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="300"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>Neuerscheinungen</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
         <source>Friends</source>
         <translation>Freunde</translation>
     </message>
@@ -1289,65 +1569,88 @@
 <context>
     <name>SpotifyConfig</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="48"/>
-        <source>Configure your Spotify credentials</source>
-        <translation>Spotify-Konto einrichten</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation>Konfiguriere dein Spotify Konto</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="65"/>
-        <source>Username:</source>
-        <translation>Benutzer:</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation>Nutzername oder Facebook Email</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="72"/>
-        <source>placeholderUsername</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>Anmeldung</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
-        <source>Password:</source>
-        <translation>Passwort:</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation>Rechts-clicke eine Tomahawk Playlist um sie mit Spotify zu synchronisieren.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="86"/>
-        <source>placeholderPw</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation>Hohe Stream Qualität</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="116"/>
-        <source>High Quality Streaming</source>
-        <translation>Hohe Audioqualität</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation>Spotify Listen die du synchronisieren willst:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="186"/>
-        <source>This product uses SPOTIFY(R) CORE but is not endorsed, certified or otherwise approved in any way by Spotify. Spotify is the registered trade mark of the Spotify Group.</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation>Playlist in Tomahawk löschen wenn Synchronisierung entfernt wird</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>Benutzer:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>Passwort:</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation>Auf Spotify löschen</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation>Möchtest du die entsprechende Spotify Playlist auch löschen?</translation>
     </message>
 </context>
 <context>
     <name>StackedSettingsDialog</name>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="14"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
         <source>Tomahawk Settings</source>
         <translation>Tomahawk Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="158"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
         <source>Local Music Information</source>
         <translation>Information über lokale Musik</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="166"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
         <source>Path to scan for music files:</source>
         <translation>Pfad zu den Musikdateien:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="180"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
         <source>The Echo Nest supports keeping track of your catalog metadata
  and using it to craft personalized radios. Enabling this option
  will allow you (and all your friends) to create automatic playlists
@@ -1355,162 +1658,223 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="186"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
         <source>Upload collection list to The Echo Nest to enable user radio</source>
         <translation>Liste der aktuellen Sammlung an Echo Nest übermitteln, um User Radio zu aktivieren</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="199"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
         <source>Watch for changes</source>
         <translation>Automatisch aktualisieren</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="208"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
         <source>Time between scans, in seconds:</source>
         <translation>Zeitinterval (in Sekunden) zwischen zwei Scans:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="98"/>
-        <source>Internet Services</source>
-        <translation type="unfinished"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation>Erweiterte Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="109"/>
-        <source>Install from file...</source>
-        <translation type="unfinished"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation>Verbindung zu anderen Tomahawks</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="129"/>
-        <source>Filter by capability:</source>
-        <translation type="unfinished"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation>Keine (nur ausgehende Verbindungen möglich)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation>UPnP für Port-Weiterleitung verwenden (empfohlen)</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="245"/>
-        <source>Advanced Network Settings</source>
-        <translation>Erweiterte Netzwerkeinstellungen</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation>Statische externe IP Adresse / Hostnamen und Port verwenden</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="265"/>
-        <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>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>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation>Stelle hier deine externe IP Adresse oder Hostnamen ein. Du musst den Port selbst an diesen Rechner weiterleiten!</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="283"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation>SOCKS Proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation>SOCKS Proxy verwenden</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation>Alle erteilten Zugriffsrechte löschen</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation>Internet Dienste</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation>Installiere Datei...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation>Nach Fähigkeiten filtern:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
         <source>Static Host Name:</source>
         <translation>Statischer Rechnername:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="299"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
         <source>Static Port:</source>
         <translation>Statischer Port:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="321"/>
-        <source>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</source>
-        <translation>Statischen Rechnernamen/Port immer benutzen? (Überschreibt UPnP-discovery/Portweiterleitung)</translation>
-    </message>
-    <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="345"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
         <source>Proxy Settings...</source>
         <translation>Proxy-Einstellungen…</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="383"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation>Andere Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
         <source>Send reports after Tomahawk crashed</source>
         <translation>Übermittlung von Fehlerberichten nach Tomahawk Absturz</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="396"/>
-        <source>Allow web browsers to interact with Tomahawk</source>
-        <translation>Erlaube Webbrowsern mit Tomahawk zu interagieren</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation>Erlaube Web Browser mit Tomahawk zu interagieren (empfohlen)</translation>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation>Kopiere Link für diesen Künstler</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation>Kopiere Link für dieses Album</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="409"/>
-        <source>Use UPnP to establish port forward</source>
-        <translation>Benutze UPnP um die Portweiterleitung einzurichten</translation>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation>Kopiere Link für diesen Lied</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::AccountDelegate</name>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="200"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
         <source>Add Account</source>
         <translation>Konto hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="250"/>
-        <source>Remove Account</source>
-        <translation>Konto entfernen</translation>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="360"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
         <source>%1 downloads</source>
         <translation>%1 Downloads</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="585"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
         <source>Online</source>
         <translation>Verbunden</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="590"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
         <source>Connecting...</source>
         <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="595"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
         <source>Offline</source>
         <translation>Nicht Verbunden</translation>
     </message>
 </context>
 <context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation>Manuelle Installation benötigt</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation>Leider ist die automatische Installation dieses Resolvers nicht auf deinem System möglich.&lt;br/&gt;&lt;br/&gt;Bitte benutze &quot;Installiere Datei&quot; und installiere ihn manuell. Weitere Informationen findest du hier:&lt;br/&gt;&lt;br/&gt;http://www.tomahawk-player.org/resolvers/%1</translation>
+    </message>
+</context>
+<context>
     <name>Tomahawk::Accounts::GoogleWrapper</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="82"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
         <source>Configure this Google Account</source>
         <translation>Google-Konto einrichten</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
         <source>Google Address</source>
         <translation>Google-Adresse</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="84"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
         <source>Enter your Google login to connect with your friends using Tomahawk!</source>
-        <translation type="unfinished"/>
+        <translation>Gib deinen Google Login an und verbinde Tomahawk mit deinen Freunden!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="85"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
         <source>username@gmail.com</source>
-        <translation type="unfinished"/>
+        <translation>nutzer@gmail.com</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.h" line="42"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
         <source>Connect to Google Talk to find your friends</source>
-        <translation type="unfinished"/>
+        <translation>Mit Google Talk verbinden um Freund zu finden</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperSip</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="61"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
         <source>Add Friend</source>
-        <translation type="unfinished"/>
+        <translation>Freund hinzufügen</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
         <source>Enter Google Address:</source>
-        <translation type="unfinished"/>
+        <translation>Google Adresse:</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::LastFmAccountFactory</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmAccount.h" line="47"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
         <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
         <translation>Gehörte Stücke zu last.fm scrobbeln und frei-verfügbare Stücke anhören</translation>
     </message>
@@ -1518,26 +1882,104 @@
 <context>
     <name>Tomahawk::Accounts::LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="108"/>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="123"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation>Teste...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation>Login testen</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation>Importiere %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation>Importiere Historie...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation>Historie unvollständig. Fortfahren</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation>Lieder-Historie importiert</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
         <source>Failed</source>
         <translation>Fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="113"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
         <source>Success</source>
         <translation>Erfolgreich</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="129"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
         <source>Could not contact server</source>
         <translation>Konnte den Server nicht erreichen!</translation>
     </message>
 </context>
 <context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation>Mit Spotify synchronisieren</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation>Synchronisierung mit Spotify re-aktivieren</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation>Synchronisation beenden</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>Anmelden...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation>Fehler: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>Anmelden</translation>
+    </message>
+</context>
+<context>
     <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccount.h" line="44"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
         <source>Play music from and sync your playlists with Spotify Premium</source>
         <translation>Musik abspielen und Playlisten synchronisieren mit Spotify Premium</translation>
     </message>
@@ -1545,7 +1987,7 @@
 <context>
     <name>Tomahawk::Accounts::TwitterAccountFactory</name>
     <message>
-        <location filename="../src/accounts/twitter/twitteraccount.h" line="50"/>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
         <source>Connect to your Twitter followers.</source>
         <translation>Verbinde dich zu deinen Twitter-Followern</translation>
     </message>
@@ -1553,125 +1995,126 @@
 <context>
     <name>Tomahawk::Accounts::TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="58"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="141"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="189"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
         <source>Tweet!</source>
-        <translation type="unfinished"/>
+        <translation>Tweet!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="66"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="167"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
         <source>Status: No saved credentials</source>
-        <translation type="unfinished"/>
+        <translation>Status: Keine Anmeldedaten</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="67"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="92"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="168"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
         <source>Authenticate</source>
-        <translation type="unfinished"/>
+        <translation>Authentifizieren</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="74"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="136"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
         <source>Status: Credentials saved for %1</source>
-        <translation type="unfinished"/>
+        <translation>Status: Anmeldedaten gespeichert für %1</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="75"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
         <source>De-authenticate</source>
-        <translation type="unfinished"/>
+        <translation>Deauthentifizieren</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>Tweetin&apos; Error</source>
-        <translation type="unfinished"/>
+        <translation>Twitter Fehler</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
         <source>The credentials could not be verified.
 You may wish to try re-authenticating.</source>
-        <translation type="unfinished"/>
+        <translation>Die Kontodaten konnten nicht verifiziert werden.
+Du solltest versuchen dich nochmals zu authentifizieren.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="152"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
         <source>Status: Error validating credentials</source>
         <translation>Status: Keine gespeicherten Zugangsdaten</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="179"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
         <source>Global Tweet</source>
         <translation>Globaler Tweet</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="184"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
         <source>Direct Message</source>
         <translation>Private Nachricht</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="185"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
         <source>Send Message!</source>
         <translation>Abschicken</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="186"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
         <source>@Mention</source>
-        <translation type="unfinished"/>
+        <translation>@Erwähnung</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="187"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
         <source>Send Mention!</source>
-        <translation type="unfinished"/>
+        <translation>Sende Erwähnung!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
         <source>You must enter a user name for this type of tweet.</source>
         <translation>Für diese Art von Tweet musst du einen Benutzernamen angeben.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
         <source>Your saved credentials could not be loaded.
 You may wish to try re-authenticating.</source>
         <translation>Deine gespeicherten Zugangsdaten konnten nicht geladen werden. Du solltest dich nochmal authentifizieren.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
         <source>Your saved credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation>Deine gespeicherten Zugangsdaten konnten nicht bestätigt werden. Du solltest dich nochmal authentifizieren.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>There was an error posting your status -- sorry!</source>
         <translation>Es tut uns leid, bei der Veröffentlichung deines Status&apos; ist ein Fehler aufgetreten!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Tweeted!</source>
         <translation>Getweetet!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
         <source>Your tweet has been posted!</source>
         <translation>Dein Tweet wurde veröffentlicht!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
         <source>There was an error posting your direct message -- sorry!</source>
         <translation>Es tut uns leid, beim Verschicken der Nachricht ist ein Fehler aufgetreten!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Your message has been posted!</source>
         <translation>Deine Nachricht wurde verschickt!</translation>
     </message>
@@ -1679,7 +2122,7 @@
 <context>
     <name>Tomahawk::Accounts::XmppAccountFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppaccount.h" line="51"/>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
         <source>Log on to your Jabber/XMPP account to connect to your friends</source>
         <translation>Benutze dein Jabber/XMPP-Konto, um dich mit Freunden zu verbinden</translation>
     </message>
@@ -1687,7 +2130,7 @@
 <context>
     <name>Tomahawk::Accounts::ZeroconfFactory</name>
     <message>
-        <location filename="../src/accounts/zeroconf/zeroconfaccount.h" line="42"/>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
         <source>Automatically connect to Tomahawks on the local network</source>
         <translation>Automatisch mit anderen Tomahawks im Netzwerk verbinden</translation>
     </message>
@@ -1695,93 +2138,113 @@
 <context>
     <name>Tomahawk::ContextMenu</name>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="79"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
         <source>&amp;Play</source>
         <translation>&amp;Abspielen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="82"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="142"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="181"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
         <source>Add to &amp;Queue</source>
         <translation>In &amp;Warteschlange einreihen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="87"/>
-        <source>&amp;Continue playback after this track</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation>Nach diesem Lied &amp;weiterspielen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="89"/>
-        <source>&amp;Stop playback after this track</source>
-        <translation>&amp;Beende Wiedergabe nach diesem Stück</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation>Wiedergabe nach diesem Lied &amp;stoppen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="96"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="277"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
         <source>&amp;Love</source>
         <translation>&amp;Lieblingslied</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
         <source>&amp;Copy Track Link</source>
         <translation>&amp;Kopiere Link zu diesem Stück</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="139"/>
-        <source>Show &amp;Album page</source>
-        <translation>&amp;Album-Seite anzeigen</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation>Album-&amp;Link kopieren</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="178"/>
-        <source>Show &amp;Artist page</source>
-        <translation>&amp;Künstler-Seite anzeigen</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation>Künstler-&amp;Link kopieren</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="272"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
         <source>Un-&amp;Love</source>
         <translation>Kein &amp;Lieblingslied</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Items</source>
         <translation>Elemente &amp;entfernen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation>&amp;Gehe zur Song Seite</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Item</source>
         <translation>Element &amp;entfernen</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation>&amp;Gehe zur Album Seite</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation>&amp;Gehe zur Künstler Seite</translation>
+    </message>
 </context>
 <context>
     <name>Tomahawk::CustomPlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="123"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
         <source>Top Loved Tracks</source>
         <translation>Meist geliebte Lieder</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="127"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
         <source>Your loved tracks</source>
         <translation>Deine Lieblingslieder</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="129"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
         <source>%1&apos;s loved tracks</source>
         <translation>Die Lieblingslieder von %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="138"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
         <source>The most loved tracks from all your friends</source>
         <translation>Die Lieblingslieder deiner Freunde</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="142"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
         <source>All of your loved tracks</source>
         <translation>All deine Lieblingslieder</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
         <source>All of %1&apos;s loved tracks</source>
         <translation>Alle Lieblingslieder von %1</translation>
     </message>
@@ -1789,12 +2252,32 @@
 <context>
     <name>Tomahawk::DropJobNotifier</name>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="102"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation>Playlist</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation>Künstler</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation>Lied</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation>Album</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
         <source>Fetching %1 from database</source>
         <translation>Lade %1 aus der Datenbank</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="106"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
         <source>Parsing %1 %2</source>
         <translation>Parse %1 %2</translation>
     </message>
@@ -1802,7 +2285,7 @@
 <context>
     <name>Tomahawk::DynamicControlList</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
         <source>Click to collapse</source>
         <translation>Klicken um einzuklappen</translation>
     </message>
@@ -1841,17 +2324,17 @@
 <context>
     <name>Tomahawk::DynamicView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
         <source>Add some filters above to seed this station!</source>
         <translation>Füge einige Filter hinzu, um diese Station zu starten!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="149"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
         <source>Press Generate to get started!</source>
         <translation>Drücke Erzeugen, und los geht&apos;s!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="151"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
         <source>Add some filters above, and press Generate to get started!</source>
         <translation>Füge oben einige Filter hinzu und drücke Erzeugen um loszulegen!</translation>
     </message>
@@ -2051,12 +2534,12 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
         <source>Artist Hotttnesss</source>
-        <translation type="unfinished"/>
+        <translation>Popularität des Künstlers</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
         <source>Song Hotttnesss</source>
-        <translation type="unfinished"/>
+        <translation>Popularität des Liedes</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
@@ -2132,7 +2615,7 @@
     <message numerus="yes">
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
         <source>about %n minute(s) long</source>
-        <translation><numerusform>ungefähr %n Minute lang</numerusform><numerusform>ungefähr %n Minuten lang</numerusform></translation>
+        <translation><numerusform>ungefähr eine Minute lang</numerusform><numerusform>ungefähr %n Minuten lang</numerusform></translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
@@ -2147,7 +2630,7 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="798"/>
         <source>in %1</source>
-        <translation type="unfinished"/>
+        <translation>in %1</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="803"/>
@@ -2173,97 +2656,97 @@
 <context>
     <name>Tomahawk::EchonestSteerer</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="57"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
         <source>Steer this station:</source>
         <translation>Steuere diese Station:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="71"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
         <source>Much less</source>
         <translation>Viel weniger</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="72"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
         <source>Less</source>
         <translation>Weniger</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="73"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
         <source>A bit less</source>
         <translation>Etwas weniger</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="74"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
         <source>Keep at current</source>
         <translation>So belassen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="75"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
         <source>A bit more</source>
         <translation>Etwas mehr</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="76"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
         <source>More</source>
         <translation>Mehr</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
         <source>Much more</source>
         <translation>Viel mehr</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="80"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
         <source>Loudness</source>
         <translation>Lautstärke</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
         <source>Danceability</source>
         <translation>Tanzbarkeit</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
         <source>Energy</source>
         <translation>Energie</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
         <source>Song Hotttnesss</source>
-        <translation type="unfinished"/>
+        <translation>Popularität des Liedes</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
         <source>Artist Hotttnesss</source>
-        <translation type="unfinished"/>
+        <translation>Popularität des Künstlers</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
         <source>Artist Familiarity</source>
         <translation>Ähnlichkeit Künstler</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
         <source>By Description</source>
         <translation>Von der Beschreibung</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
         <source>Enter a description</source>
         <translation>Gib eine Beschreibung ein</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="102"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
         <source>Apply steering command</source>
         <translation>Steuerkommando anwenden</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="108"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
         <source>Reset all steering commands</source>
         <translation>Setze alle Steuerkommandos zurück</translation>
     </message>
@@ -2271,7 +2754,7 @@
 <context>
     <name>Tomahawk::GroovesharkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/groovesharkparser.cpp" line="255"/>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
         <source>Error fetching Grooveshark information from the network!</source>
         <translation>Konnte Grooveshark-Daten nicht laden!</translation>
     </message>
@@ -2279,58 +2762,87 @@
 <context>
     <name>Tomahawk::InfoSystem::ChartsPlugin</name>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="307"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
         <source>Top Overall</source>
         <translation>Top Allgemein</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="396"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
         <source>Artists</source>
         <translation>Künstler</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="398"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
         <source>Albums</source>
         <translation>Alben</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="400"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
         <source>Tracks</source>
         <translation>Stücke</translation>
     </message>
 </context>
 <context>
-    <name>Tomahawk::InfoSystem::LastFmPlugin</name>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation>Tomahawk spielt &quot;%1&quot; von %2%3.</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation>auf &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
         <source>Top Tracks</source>
-        <translation>Größte Hits</translation>
+        <translation>Meistgeh</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
         <source>Loved Tracks</source>
-        <translation>Lieblings Lieder</translation>
+        <translation>Lieblingslieder</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
         <source>Hyped Tracks</source>
-        <translation>Angesagte Stücke</translation>
+        <translation>Gehypte Lieder</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
         <source>Top Artists</source>
-        <translation type="unfinished"/>
+        <translation>Lieblingskünstler</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
         <source>Hyped Artists</source>
-        <translation type="unfinished"/>
+        <translation>Gehypte Künstler</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>Alben</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation>Höre &quot;%1&quot; von %2 und liebe es! %3</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::ItunesParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/itunesparser.cpp" line="170"/>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
         <source>Error fetching iTunes information from the network!</source>
         <translation>Konnte iTunes-Daten nicht laden!</translation>
     </message>
@@ -2338,29 +2850,29 @@
 <context>
     <name>Tomahawk::JSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="137"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
         <source>New Playlist</source>
-        <translation>Neue Playliste</translation>
+        <translation>Neue Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Failed to save tracks</source>
         <translation>Konnte Stücke nicht abspeichern</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
-        <translation>Einige Stücke in der Playliste enthalten weder Künstler noch Titel. Diese werden ignoriert.</translation>
+        <translation>Einige Stücke in der Playlist enthalten weder Künstler noch Titel. Diese werden ignoriert.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>XSPF Error</source>
         <translation>XSPF-Fehler</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>This is not a valid XSPF playlist.</source>
-        <translation>Dies ist keine gültige XSPF-Playliste.</translation>
+        <translation>Dies ist keine gültige XSPF-Playlist.</translation>
     </message>
 </context>
 <context>
@@ -2380,45 +2892,45 @@
 <context>
     <name>Tomahawk::Query</name>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="637"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
         <source> and </source>
-        <translation type="unfinished"/>
+        <translation> und </translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="645"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
         <source>You</source>
-        <translation type="unfinished"/>
+        <translation>Du</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="647"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
         <source>you</source>
-        <translation type="unfinished"/>
+        <translation>du</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>and</source>
-        <translation type="unfinished"/>
+        <translation>und</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>%n other(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n anderer</numerusform><numerusform>%n andere</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="659"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
         <source>%1 people</source>
-        <translation type="unfinished"/>
+        <translation>%1 Leute</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="661"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
         <source>loved this track</source>
-        <translation type="unfinished"/>
+        <translation>liebte dieses Lied</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::RdioParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/rdioparser.cpp" line="193"/>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
         <source>Error fetching Rdio information from the network!</source>
         <translation>Konnte Rdio-Daten nicht laden!</translation>
     </message>
@@ -2426,7 +2938,7 @@
 <context>
     <name>Tomahawk::ShortenedLinkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/shortenedlinkparser.cpp" line="96"/>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
         <source>Network error parsing shortened link!</source>
         <translation>Konnte den Kurzlink nicht auflösen!</translation>
     </message>
@@ -2434,49 +2946,67 @@
 <context>
     <name>Tomahawk::Source</name>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="242"/>
-        <location filename="../src/libtomahawk/source.cpp" line="293"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
         <source>Scanning (%L1 tracks)</source>
         <translation>Scanne (%L1 Stücke)</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="244"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
         <source>Scanning</source>
         <translation>Scanne</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="278"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
         <source>Checking</source>
         <translation>Überprüfe</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="283"/>
-        <source>Fetching</source>
-        <translation>Sammle</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation>Synchronisiere</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="288"/>
-        <source>Parsing</source>
-        <translation>Parse</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation>Importiere</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="417"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
         <source>Saving (%1%)</source>
         <translation>Speichere (%1%)</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation>Online</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation>Offline</translation>
+    </message>
 </context>
 <context>
     <name>Tomahawk::SpotifyParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/spotifyparser.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
         <source>Error fetching Spotify information from the network!</source>
         <translation>Konnte Spotify-Daten nicht laden!</translation>
     </message>
 </context>
 <context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation>XSPF automatisch updaten</translation>
+    </message>
+</context>
+<context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/tomahawkapp.cpp" line="534"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Meine Sammlung</translation>
     </message>
@@ -2484,12 +3014,12 @@
 <context>
     <name>TomahawkOAuthTwitter</name>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>Twitter PIN</source>
         <translation>Twitter PIN</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>After authenticating on Twitter's web site,
 enter the displayed PIN number here:</source>
         <translation>Gib die dort angezeigte PIN Nummer ein, nachdem du
@@ -2499,464 +3029,466 @@
 <context>
     <name>TomahawkTrayIcon</name>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="59"/>
-        <location filename="../src/tomahawktrayicon.cpp" line="93"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation>Wiedergabe nach diesem Lied &amp;stoppen</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
         <source>Hide Tomahawk Window</source>
         <translation>Tomahawk verbergen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="98"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
         <source>Show Tomahawk Window</source>
         <translation>Tomahawk anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="158"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
         <source>Currently not playing.</source>
         <translation>Derzeit wird nichts gespielt.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="219"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
         <source>Play</source>
         <translation>Abspielen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="226"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation>Als &amp;Lieblingslied merken</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation>Als &amp;Lieblingslied entfernen</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation>Wiedergabe nach diesem Lied &amp;fortsetzen</translation>
+    </message>
 </context>
 <context>
     <name>TomahawkWindow</name>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="14"/>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
         <source>Tomahawk</source>
         <translation>Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="75"/>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
         <source>&amp;Settings</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="81"/>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
         <source>&amp;Controls</source>
         <translation>S&amp;teuerung</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="100"/>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
         <source>&amp;Network</source>
         <translation>&amp;Netzwerk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="107"/>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
         <source>&amp;Window</source>
         <translation>&amp;Fenster</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="114"/>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="128"/>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
         <source>&amp;Quit</source>
         <translation>&amp;Verlassen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="131"/>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="139"/>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
         <source>Go &amp;Online</source>
         <translation>&amp;Verbinden</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="144"/>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
         <source>Add &amp;Friend...</source>
         <translation>Freund &amp;hinzufügen…</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="149"/>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
         <source>U&amp;pdate Collection</source>
         <translation>Sammlung &amp;aktualisieren</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="152"/>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
         <source>Update Collection</source>
         <translation>Sammlung aktualisieren</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="157"/>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
         <source>&amp;Configure Tomahawk...</source>
         <translation>Tomahawk &amp;einrichten…</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="165"/>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
         <source>Load &amp;XSPF...</source>
         <translation>&amp;XSPF laden…</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="170"/>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
         <source>Create &amp;New Playlist...</source>
-        <translation>Neue &amp;Playliste erstellen…</translation>
+        <translation>Neue &amp;Playlist erstellen…</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="175"/>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
         <source>About &amp;Tomahawk...</source>
         <translation>Über &amp;Tomahawk…</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="183"/>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
         <source>Create New &amp;Automatic Playlist</source>
-        <translation>Neue &amp;automatische Playliste erstellen</translation>
+        <translation>Neue &amp;automatische Playlist erstellen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="188"/>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
         <source>Create New &amp;Station</source>
         <translation>Neue &amp;Station erstellen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="196"/>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
         <source>Show Offline Sources</source>
         <translation>Nicht-Verfügbare Quellen anzeigen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="201"/>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
         <source>Hide Offline Sources</source>
         <translation>Nicht-Verfügbare Quellen ausblenden</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="206"/>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
         <source>Minimize</source>
         <translation>Minimieren</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="209"/>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
         <source>Ctrl+M</source>
         <translation>Strg+M</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="214"/>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
         <source>Zoom</source>
         <translation>Vergrößern</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="217"/>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
         <source>Meta+Ctrl+Z</source>
         <translation>Strg+Meta+Z</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="222"/>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation>Rechtliche Informationen...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
         <source>Diagnostics...</source>
         <translation>Diagnose Tool...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="230"/>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
         <source>Fully &amp;Rescan Collection</source>
         <translation>Sammlung neu du&amp;rchsuchen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="233"/>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
         <source>Fully Rescan Collection</source>
         <translation>Sammlung neu durchsuchen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="238"/>
-        <location filename="../src/tomahawkwindow.cpp" line="676"/>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
         <source>Play</source>
         <translation>Abspielen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="241"/>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
         <source>Space</source>
         <translation>Leertaste</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="246"/>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
         <source>Previous</source>
         <translation>Zurück</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="251"/>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
         <source>Next</source>
         <translation>Weiter</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="219"/>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation>Zurück</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation>Gehe eine Seite zurück</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation>Vorwärts</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation>Gehe eine Seite vorwärts</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
         <source>Global Search...</source>
         <translation>Globale Suche...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="270"/>
-        <location filename="../src/tomahawkwindow.cpp" line="287"/>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
         <source>Check For Updates...</source>
         <translation>Nach Updates suchen...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="449"/>
-        <location filename="../src/tomahawkwindow.cpp" line="456"/>
-        <location filename="../src/tomahawkwindow.cpp" line="464"/>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
         <source>Connect To Peer</source>
         <translation>Mit anderem Tomahawk verbinden</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="450"/>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
         <source>Enter peer address:</source>
         <translation>Gib die Adresse der Gegenstelle ein:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="457"/>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
         <source>Enter peer port:</source>
         <translation>Gib den Port der Gegenstelle ein:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="465"/>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
         <source>Enter peer key:</source>
         <translation>Gib den Schlüssel der Gegenstelle ein:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>XSPF Error</source>
         <translation>XSPF-Fehler</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>This is not a valid XSPF playlist.</source>
-        <translation>Dies ist keine gültige XSPF-Playliste.</translation>
+        <translation>Dies ist keine gültige XSPF-Playlist.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Failed to save tracks</source>
         <translation>Konnte Stücke nicht abspeichern</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
-        <translation>Einige Stücke in der Playliste enthalten weder Künstler noch Titel. Diese werden ignoriert.</translation>
+        <translation>Einige Stücke in der Playlist enthalten weder Künstler noch Titel. Diese werden ignoriert.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="579"/>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
         <translation>Es tut uns leid, Tomahawk kann auf dein Audio-Gerät oder das gewünschte Stück nicht zugreifen und überspringt es deshalb. Vergewisser dich, dass ein geignetes Phonon-Backend mitsamt benötigten Plugins installiert ist.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="581"/>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
         <translation>Es tut uns leid, Tomahawk kann auf dein Audio-Gerät oder das gewünschte Stück nicht zugreifen und überspringt es deshalb.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Create New Station</source>
         <translation>Neue Station erstellen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Name:</source>
-        <translation type="unfinished"/>
+        <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
-        <source>New Station</source>
-        <translation>Neue Station</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation>Playlist</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="650"/>
-        <source>New Playlist</source>
-        <translation>Neue Playliste</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation>Automatische Playlist</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="668"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="691"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
         <source>Go &amp;offline</source>
         <translation>Verbindung &amp;trennen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="698"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
         <source>Go &amp;online</source>
         <translation>&amp;Verbindung herstellen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="720"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
         <source>Authentication Error</source>
         <translation>Authentifizierungsfehler</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="735"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation>Verbindungsfehler mit SIP: Authentifizierung fehlgeschlagen!</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
         <source>%1 by %2</source>
         <comment>track, artist name</comment>
         <translation>%1 von %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="736"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
         <source>%1 - %2</source>
         <comment>current track, some window title</comment>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="747"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
         <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="751"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
         <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="755"/>
-        <source>Copyright 2010 - 2012&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson</source>
-        <translation>Copyright 2010 - 2012&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Dank an: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter und Steve Robertson</translation>
-    </message>
-    <message>
-        <location filename="../src/tomahawkwindow.cpp" line="758"/>
-        <source>About Tomahawk</source>
-        <translation>Über Tomahawk</translation>
-    </message>
-</context>
-<context>
-    <name>TopBar</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="26"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="66"/>
-        <source>0 Sources</source>
-        <translation>0 Quellen</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="89"/>
-        <source>0 Tracks</source>
-        <translation>0 Titel</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="112"/>
-        <source>0 Artists</source>
-        <translation>0 Künstler</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="135"/>
-        <source>0 Shown</source>
-        <translation>0 angezeigt</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="49"/>
-        <source>Tracks</source>
-        <translation>Stücke</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="50"/>
-        <source>Artists</source>
-        <translation>Künstler</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="54"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="84"/>
-        <source>Artist View</source>
-        <translation>Künstler Ansicht</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="85"/>
-        <source>Flat View</source>
-        <translation>Flache Ansicht</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation>Copright 2010 - 2012</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="195"/>
-        <source>Sources</source>
-        <translation>Quellen</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation>Danke an:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="247"/>
-        <source>Shown</source>
-        <translation>Angezeigt</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation>Über Tomahawk</translation>
     </message>
 </context>
 <context>
     <name>TopTracksContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
         <source>Top Hits</source>
         <translation>Top Hits</translation>
     </message>
 </context>
 <context>
-    <name>TrackModel</name>
+    <name>TrackInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Artist</source>
-        <translation>Künstler</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Title</source>
-        <translation>Titel</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Album</source>
-        <translation>Album</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation>Cover</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
         <source>Track</source>
-        <translation>Titel</translation>
+        <translation>Lied</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Duration</source>
-        <translation>Spieldauer</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation>Künstler</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Bitrate</source>
-        <translation>Bitrate</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Age</source>
-        <translation>Alter</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Year</source>
-        <translation>Jahr</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation>Ähnliche Lieder</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Size</source>
-        <translation>Größe</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation>Sorry, wir konnten keine ähnlichen Lieder finden!</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation><numerusform>Du hast dieses Lied einmal gehört.</numerusform><numerusform>Du hast dieses Lied %n mal gehört.</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Origin</source>
-        <translation>Quelle</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation>Du hast dieses Lied noch nie angehört.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Score</source>
-        <translation>Wertung</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation>Du hast dieses Lied zum ersten mal am %1 gehört.</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation><numerusform>Du hast %1 einmal angehört.</numerusform><numerusform>Du hast %1 %n mal angehört.</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Composer</source>
-        <translation>Komponist</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation>Du hast %1 vorher noch nie gehört.</translation>
     </message>
 </context>
 <context>
     <name>TrackView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackview.cpp" line="493"/>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
         <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
         <translation>Entschuldige, dein Filter &apos;%1&apos; erzeugte keine Ergebnisse.</translation>
     </message>
@@ -2977,7 +3509,7 @@
 <context>
     <name>TreeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treeitemdelegate.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
@@ -2985,92 +3517,60 @@
 <context>
     <name>TreeModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Bitrate</source>
-        <translation>Bitrate</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Age</source>
-        <translation>Alter</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Year</source>
-        <translation>Jahr</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Size</source>
-        <translation>Größe</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Origin</source>
-        <translation>Quelle</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Composer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="585"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
         <source>All Artists</source>
         <translation>Alle Künstler</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="699"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="724"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
         <source>My Collection</source>
         <translation>Meine Sammlung</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="701"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="726"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
         <source>Collection of %1</source>
         <translation>Sammlung von %1</translation>
     </message>
 </context>
 <context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>Sorry, dein Filter &apos;%1&apos; konnte keine Ergebnisse finden.</translation>
+    </message>
+</context>
+<context>
     <name>TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="73"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
         <source>Configure this Twitter account</source>
         <translation>Konfiguriere dieses Twitter Konto</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="119"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
         <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
         <translation>Die Twitter Erweiterung erlaubt es dir dich mit anderen Twitter Freunden zu verbinden und ihre Musik abzuspielen.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
         <source>Status: No saved credentials</source>
         <translation>Status: Keine gespeicherten Zugangsdaten</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="166"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
         <source>Authenticate with Twitter</source>
         <translation>Mit Twitter authentifizieren</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="196"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
         <source>Twitter Connections</source>
         <translation>Twitter Verbindungen</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
         <source>
 If you only want to post tweets, you're done.
 
@@ -3080,32 +3580,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="244"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
         <source>Select the kind of tweet you would like, then press the button to post it:</source>
         <translation>Wähle die gewünschte Tweet-Form aus und klicke auf den Button um ihn zu senden:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="276"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
         <source>Global Tweet</source>
         <translation>Globaler Tweet</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="281"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
         <source>@Mention</source>
         <translation>@Erwähnung</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="286"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
         <source>Direct Message</source>
         <translation>Direktnachricht</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="322"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
         <source>e.g. @tomahawk</source>
         <translation>z.B. @tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="351"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
         <source>Send Message</source>
         <translation>Abschicken</translation>
     </message>
@@ -3113,45 +3613,60 @@
 <context>
     <name>ViewManager</name>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="383"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation>Nachdem du deine Musik Sammlung gescannt hast, findest du all deine Lieder genau hier.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation>Diese Sammlung ist leer.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
         <source>SuperCollection</source>
-        <translation type="unfinished"/>
+        <translation>SuperCollection</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="384"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
         <source>Combined libraries of all your online friends</source>
-        <translation type="unfinished"/>
+        <translation>Kombinierte Sammlung all deiner Freunde</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="385"/>
-        <source>All available albums</source>
-        <translation>Alle verfügbaren Alben</translation>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation>Zuletzt gehörte Lieder</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation>Zuletzt gehörte Lieder all deiner Freunde</translation>
     </message>
 </context>
 <context>
     <name>WelcomeWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="34"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
         <source>Recent Additions</source>
         <translation>Kürzlich hinzugekommen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
         <source>Newest Stations &amp; Playlists</source>
         <translation>Neueste Stationen &amp; Playlisten</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="70"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
         <source>Recently Played Tracks</source>
         <translation>Kürzlich gehörte Lieder</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.cpp" line="152"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
         <source>No recently created playlists in your network.</source>
         <translation>Es gibt keine kürzlich erstellten Playlisten in deinem Netzwerk.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.h" line="90"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
         <source>Welcome to Tomahawk</source>
         <translation>Willkommen bei Tomahawk</translation>
     </message>
@@ -3159,9 +3674,9 @@
 <context>
     <name>WhatsHotWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/whatshotwidget.h" line="72"/>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
         <source>Charts</source>
-        <translation type="unfinished"/>
+        <translation>Charts</translation>
     </message>
 </context>
 <context>
@@ -3169,218 +3684,223 @@
     <message>
         <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="42"/>
         <source>Wikipedia</source>
-        <translation type="unfinished"/>
+        <translation>Wikipedia</translation>
     </message>
 </context>
 <context>
     <name>XMPPBot</name>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="312"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
         <source>
 Terms for %1:
 </source>
-        <translation type="unfinished"/>
+        <translation>
+Begriffe für %1:
+</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="314"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
         <source>No terms found, sorry.</source>
-        <translation type="unfinished"/>
+        <translation>Kein Begriff gefunden, Sorry.</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="347"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
         <source>
 Hotttness for %1: %2
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="363"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
         <source>
 Familiarity for %1: %2
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="381"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
         <source>
 Lyrics for &quot;%1&quot; by %2:
 
 %3
 </source>
-        <translation type="unfinished"/>
+        <translation>Liedtext für &quot;%1&quot; von %2:
+
+%3
+</translation>
     </message>
 </context>
 <context>
     <name>XSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="49"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
         <source>Failed to parse contents of XSPF playlist</source>
-        <translation type="unfinished"/>
+        <translation>Fehler beim lesen der XSPF Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="51"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
         <source>Some playlist entries were found without artist and track name, they will be omitted</source>
-        <translation type="unfinished"/>
+        <translation>Einige Playlist Titel wurden ohne Künstler- oder Liedname gefunden und daher ignoriert</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="53"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
         <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
-        <translation type="unfinished"/>
+        <translation>Fehler beim Laden der Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="188"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
         <source>New Playlist</source>
-        <translation>Neue Playliste</translation>
+        <translation>Neue Playlist</translation>
     </message>
 </context>
 <context>
     <name>XmlConsole</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
         <source>Xml stream console</source>
-        <translation type="unfinished"/>
+        <translation>Xml stream console</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="33"/>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="60"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
         <source>Filter</source>
-        <translation type="unfinished"/>
+        <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="43"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
         <source>Save log</source>
-        <translation type="unfinished"/>
+        <translation>Log speichern</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
         <source>Disabled</source>
-        <translation type="unfinished"/>
+        <translation>Deaktiviert</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="65"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
         <source>By JID</source>
-        <translation type="unfinished"/>
+        <translation>Nach JID</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="68"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
         <source>By namespace uri</source>
-        <translation type="unfinished"/>
+        <translation>Nach Namensraum URI</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="71"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
         <source>By all attributes</source>
-        <translation type="unfinished"/>
+        <translation>Nach allen Attributen</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="76"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
         <source>Visible stanzas</source>
-        <translation type="unfinished"/>
+        <translation>Sichtbare Stanzas</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="79"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
         <source>Information query</source>
-        <translation type="unfinished"/>
+        <translation>Information Query</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
         <source>Message</source>
-        <translation type="unfinished"/>
+        <translation>Nachricht</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="87"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
         <source>Presence</source>
-        <translation type="unfinished"/>
+        <translation>Anwesenheit</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="91"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
         <source>Custom</source>
-        <translation type="unfinished"/>
+        <translation>Benutzerdefiniert</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="107"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
         <source>Close</source>
-        <translation type="unfinished"/>
+        <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="358"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
         <source>Save XMPP log to file</source>
-        <translation type="unfinished"/>
+        <translation>XMPP Log speichern</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
         <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
-        <translation type="unfinished"/>
+        <translation>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</translation>
     </message>
 </context>
 <context>
     <name>XmppConfigWidget</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
         <source>Xmpp Configuration</source>
-        <translation type="unfinished"/>
+        <translation>Xmpp Konfiguration</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="52"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
         <source>Configure this Xmpp account</source>
-        <translation type="unfinished"/>
+        <translation>Konfiguriere dieses Xmpp Konto</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="89"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
         <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
-        <translation type="unfinished"/>
+        <translation>Gib deine Xmpp Daten ein um verbinde dich mit Freunden, die Tomahawk nutzen!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="111"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
         <source>Login Information</source>
-        <translation type="unfinished"/>
+        <translation>Login Information</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="131"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
         <source>Xmpp ID:</source>
         <translation>XMPP-Benutzer:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="147"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
         <source>e.g. user@example.com</source>
         <translation>z.B. benutzer@beispiel.de</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="160"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="188"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
         <source>An account with this name already exists!</source>
         <translation>Ein Konto mit dem gleichen Namen besteht schon!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="210"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
         <source>Advanced Xmpp Settings</source>
         <translation>Erweiterte XMPP-Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="230"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="253"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="299"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
         <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
         <translation>Viele Server unterstützen dies leider nicht (z.B. GTalk, jabber.org)</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="302"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
         <source>Publish currently playing track</source>
         <translation>Das aktuell gespielte Stück veröffentlichen</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="309"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
         <source>Enforce secure connection</source>
         <translation>Sichere Verbindung erzwingen</translation>
     </message>
@@ -3388,130 +3908,130 @@
 <context>
     <name>XmppSipPlugin</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
         <source>User Interaction</source>
-        <translation type="unfinished"/>
+        <translation>Nutzer Interaktion</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="362"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
         <source>Host is unknown</source>
-        <translation type="unfinished"/>
+        <translation>Host ist unbekannt</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="365"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
         <source>Item not found</source>
-        <translation type="unfinished"/>
+        <translation>Eintrag nicht gefunden</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="368"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
         <source>Authorization Error</source>
-        <translation type="unfinished"/>
+        <translation>Authentifizierungs Fehler</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="371"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
         <source>Remote Stream Error</source>
-        <translation type="unfinished"/>
+        <translation>Verbindungsfehler</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="374"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
         <source>Remote Connection failed</source>
-        <translation type="unfinished"/>
+        <translation>Verbindungsfehler</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="377"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
         <source>Internal Server Error</source>
-        <translation type="unfinished"/>
+        <translation>Interner Server Fehler</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="380"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
         <source>System shutdown</source>
-        <translation type="unfinished"/>
+        <translation>System Shutdown</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="383"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
         <source>Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Konflikt</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="387"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
         <source>Unknown</source>
-        <translation type="unfinished"/>
+        <translation>Unbekannt</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation>Willst du &lt;b&gt;%1&lt;/b&gt; zu deinen Freunden hinzufügen?</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="391"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
         <source>No Compression Support</source>
-        <translation type="unfinished"/>
+        <translation>Keine Kompressions Option</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="395"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
         <source>No Encryption Support</source>
-        <translation type="unfinished"/>
+        <translation>Keine Verschluesselungs Option</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="399"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
         <source>No Authorization Support</source>
-        <translation type="unfinished"/>
+        <translation>Keine Authorisierungs Option</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="403"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
         <source>No Supported Feature</source>
-        <translation type="unfinished"/>
+        <translation>Keine unterstuetzte Faehigkeit</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="500"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
         <source>Add Friend</source>
         <translation>Freund hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="501"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
         <source>Enter Xmpp ID:</source>
         <translation>XMPP-Benutzer:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="617"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
         <source>Add Friend...</source>
         <translation>Freund hinzufügen...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="622"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
         <source>XML Console...</source>
         <translation>XML-Konsole...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="670"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
         <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="768"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
         <source>Authorize User</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="769"/>
-        <source>Do you want to grant &lt;b&gt;%1&lt;/b&gt; access to your Collection?</source>
-        <translation>Willst du &lt;b&gt;%1&lt;/b&gt; Zugriff auf deine Sammlung gewähren?</translation>
+        <translation>Authorisiere Nutzer</translation>
     </message>
 </context>
 <context>
     <name>ZeroconfConfig</name>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="14"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="55"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
         <source>Local Network configuration</source>
         <translation>Lokales Netzwerk konfigurieren</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="77"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
         <source>This plugin will automatically find other users running Tomahawk on your local network</source>
         <translation>Diese Erweiterung findet automatisch andere Tomahawk Nutzer in deinem lokalen Netzwerk</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="84"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
         <source>Connect automatically when Tomahawk starts</source>
         <translation>Automatisch beim Start von Tomahawk verbinden</translation>
     </message>

tomahawk-0.4.2.tar.bz2/lang/tomahawk_en.ts -> tomahawk-0.5.5.tar.bz2/lang/tomahawk_en.ts Changed

@@ -1,45 +1,46 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="en" version="2.0">
 <context>
-    <name>ACLRegistry</name>
+    <name>ACLJobDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="140"/>
-        <source>Connect to Peer?</source>
-        <translation>Connect to Peer?</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation>Allow %1 to
+connect and stream from you?</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="141"/>
-        <source>Another Tomahawk instance that claims to be owned by %1 is attempting to connect to you. Select whether to allow or deny this connection.
-
-Remember: Only allow peers to connect if you trust who they are and if you have the legal right for them to stream music from you.</source>
-        <translation>Another Tomahawk instance that claims to be owned by %1 is attempting to connect to you. Select whether to allow or deny this connection.
-
-Remember: Only allow peers to connect if you trust who they are and if you have the legal right for them to stream music from you.</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation>Allow Streaming</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="142"/>
-        <source>Deny</source>
-        <translation>Deny</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation>Deny Access</translation>
     </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="143"/>
-        <source>Allow</source>
-        <translation>Allow</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation>Tomahawk needs you to decide whether %1 is allowed to connect.</translation>
     </message>
 </context>
 <context>
     <name>AccountFactoryWrapper</name>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="30"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
         <source>Description goes here</source>
         <translation>Description goes here</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.cpp" line="41"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
         <source>Add Account</source>
         <translation>Add Account</translation>
     </message>
@@ -47,17 +48,17 @@
 <context>
     <name>AccountFactoryWrapperDelegate</name>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="105"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
         <source>Online</source>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="110"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
         <source>Connecting...</source>
         <translation>Connecting...</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="115"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
@@ -65,69 +66,69 @@
 <context>
     <name>ActionCollection</name>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="43"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
         <source>&amp;Listen Along</source>
         <translation>&amp;Listen Along</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="46"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
         <source>Stop &amp;Listening Along</source>
         <translation>Stop &amp;Listening Along</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="50"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
         <source>&amp;Follow in real-time</source>
         <translation>&amp;Follow in real-time</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Privately</source>
         <translation>&amp;Listen Privately</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Publicly</source>
         <translation>&amp;Listen Publicly</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="61"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
         <source>&amp;Load Playlist</source>
         <translation>&amp;Load Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="62"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
         <source>&amp;Rename Playlist</source>
         <translation>&amp;Rename Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="63"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
         <source>&amp;Copy Playlist Link</source>
         <translation>&amp;Copy Playlist Link</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="64"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
         <source>&amp;Play</source>
         <translation>&amp;Play</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="65"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stop</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
         <source>&amp;Previous Track</source>
         <translation>&amp;Previous Track</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="67"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
         <source>&amp;Next Track</source>
         <translation>&amp;Next Track</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="68"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quit</translation>
     </message>
@@ -145,30 +146,17 @@
         <translation>Other Albums by Artist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="74"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="120"/>
-        <source>Click to show Official Tracks</source>
-        <translation>Click to show Official Tracks</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="72"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="118"/>
-        <source>Click to show SuperCollection Tracks</source>
-        <translation>Click to show SuperCollection Tracks</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="79"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="136"/>
-        <source>Click to show SuperCollection Albums</source>
-        <translation>Click to show SuperCollection Albums</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation>Sorry, we could not find any other albums for this artist!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="138"/>
-        <source>Click to show Official Albums</source>
-        <translation>Click to show Official Albums</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation>Sorry, we could not find any tracks for this album!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="205"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
         <source>Other Albums by %1</source>
         <translation>Other Albums by %1</translation>
     </message>
@@ -176,36 +164,18 @@
 <context>
     <name>AlbumModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="145"/>
-        <source>Album</source>
-        <translation>Album</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="260"/>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="302"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
         <source>All albums from %1</source>
         <translation>All albums from %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="304"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
         <source>All albums</source>
         <translation>All albums</translation>
     </message>
 </context>
 <context>
-    <name>AlbumView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="155"/>
-        <source>After you have scanned your music collection you will find your latest album additions right here.</source>
-        <translation>After you have scanned your music collection you will find your latest album additions right here.</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="157"/>
-        <source>This collection doesn&apos;t have any recent albums.</source>
-        <translation>This collection doesn&apos;t have any recent albums.</translation>
-    </message>
-</context>
-<context>
     <name>ArtistInfoWidget</name>
     <message>
         <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
@@ -213,119 +183,120 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
         <source>Top Hits</source>
         <translation>Top Hits</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
         <source>Related Artists</source>
         <translation>Related Artists</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="77"/>
-        <source>Albums</source>
-        <translation>Albums</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation>Artist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="86"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="125"/>
-        <source>Click to show SuperCollection Albums</source>
-        <translation>Click to show SuperCollection Albums</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>Albums</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="127"/>
-        <source>Click to show Official Albums</source>
-        <translation>Click to show Official Albums</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation>Cover</translation>
     </message>
-</context>
-<context>
-    <name>ArtistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="272"/>
-        <source>After you have scanned your music collection you will find your tracks right here.</source>
-        <translation>After you have scanned your music collection you will find your tracks right here.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation>Sorry, we could not find any albums for this artist!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="274"/>
-        <source>This collection is currently empty.</source>
-        <translation>This collection is currently empty.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation>Sorry, we could not find any related artists!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="291"/>
-        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
-        <translation>Sorry, your filter &apos;%1&apos; did not match any results.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation>Sorry, we could not find any top hits for this artist!</translation>
     </message>
 </context>
 <context>
     <name>AudioControls</name>
     <message>
-        <location filename="../src/audiocontrols.ui" line="75"/>
+        <location filename="../src/AudioControls.ui" line="75"/>
         <source>Prev</source>
         <translation>Prev</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="87"/>
+        <location filename="../src/AudioControls.ui" line="87"/>
         <source>Play</source>
         <translation>Play</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="94"/>
+        <location filename="../src/AudioControls.ui" line="94"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="103"/>
+        <location filename="../src/AudioControls.ui" line="103"/>
         <source>Next</source>
         <translation>Next</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="214"/>
+        <location filename="../src/AudioControls.ui" line="229"/>
         <source>Artist</source>
         <translation>Artist</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="236"/>
+        <location filename="../src/AudioControls.ui" line="248"/>
         <source>Album</source>
         <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="265"/>
+        <location filename="../src/AudioControls.ui" line="277"/>
         <source>Owner</source>
         <translation>Owner</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="302"/>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation>social</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
         <source>love</source>
         <translation>love</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="346"/>
+        <location filename="../src/AudioControls.ui" line="383"/>
         <source>Time</source>
         <translation>Time</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="375"/>
+        <location filename="../src/AudioControls.ui" line="412"/>
         <source>Time Left</source>
         <translation>Time Left</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="453"/>
+        <location filename="../src/AudioControls.ui" line="493"/>
         <source>Shuffle</source>
         <translation>Shuffle</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="466"/>
+        <location filename="../src/AudioControls.ui" line="506"/>
         <source>Repeat</source>
         <translation>Repeat</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="504"/>
+        <location filename="../src/AudioControls.ui" line="544"/>
         <source>Low</source>
         <translation>Low</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="536"/>
+        <location filename="../src/AudioControls.ui" line="576"/>
         <source>High</source>
         <translation>High</translation>
     </message>
@@ -333,41 +304,42 @@
 <context>
     <name>AudioEngine</name>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="199"/>
-        <source>Tomahawk is stopped.</source>
-        <translation>Tomahawk is stopped.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="369"/>
-        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
-        <translation>Tomahawk is playing &quot;%1&quot; by %2%3.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="372"/>
-        <source>on album %1</source>
-        <translation>on album %1</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</translation>
     </message>
 </context>
 <context>
     <name>CategoryAddItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="61"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="100"/>
-        <source>New Playlist</source>
-        <translation>New Playlist</translation>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation>Create new Playlist</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation>Create new Station</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="63"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>New Station</source>
         <translation>New Station</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>%1 Station</source>
         <translation>%1 Station</translation>
     </message>
@@ -375,12 +347,12 @@
 <context>
     <name>CategoryItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="63"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
         <source>Playlists</source>
         <translation>Playlists</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="65"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
         <source>Stations</source>
         <translation>Stations</translation>
     </message>
@@ -388,33 +360,12 @@
 <context>
     <name>ClearButton</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/clearbutton.cpp" line="38"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
         <source>Clear</source>
         <translation>Clear</translation>
     </message>
 </context>
 <context>
-    <name>CollectionFlatModel</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="72"/>
-        <source>My Collection</source>
-        <translation>My Collection</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="74"/>
-        <source>Collection of %1</source>
-        <translation>Collection of %1</translation>
-    </message>
-</context>
-<context>
-    <name>CollectionView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionview.cpp" line="85"/>
-        <source>This collection is empty.</source>
-        <translation>This collection is empty.</translation>
-    </message>
-</context>
-<context>
     <name>ContextWidget</name>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
@@ -423,12 +374,12 @@
     </message>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="344"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
         <source>Show Footnotes</source>
         <translation>Show Footnotes</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="338"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
         <source>Hide Footnotes</source>
         <translation>Hide Footnotes</translation>
     </message>
@@ -440,39 +391,49 @@
         <source>Tomahawk Crash Reporter</source>
         <translation>Tomahawk Crash Reporter</translation>
     </message>
-    <message>
+    <message utf8="true">
         <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
-        <source>&lt;p&gt;&lt;b&gt;Sorry!&lt;/b&gt;&amp;nbsp;Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;b&gt;Sorry!&lt;/b&gt;&amp;nbsp;Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.&lt;/p&gt;</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation>Send this report</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="172"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation>Don&apos;t send</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
         <source>Abort</source>
         <translation>Abort</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="192"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
         <source>You can disable sending crash reports in the configuration dialog.</source>
         <translation>You can disable sending crash reports in the configuration dialog.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="153"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
         <source>Uploaded %L1 of %L2 KB.</source>
         <translation>Uploaded %L1 of %L2 KB.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="167"/>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="183"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="176"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
         <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
         <translation>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
         <source>Failed to send crash info.</source>
         <translation>Failed to send crash info.</translation>
     </message>
@@ -480,7 +441,7 @@
 <context>
     <name>DatabaseCommand_AllAlbums</name>
     <message>
-        <location filename="../src/libtomahawk/database/databasecommand_allalbums.cpp" line="109"/>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
         <source>Unknown</source>
         <translation>Unknown</translation>
     </message>
@@ -488,41 +449,43 @@
 <context>
     <name>DelegateConfigWrapper</name>
     <message>
-        <location filename="../src/delegateconfigwrapper.cpp" line="61"/>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation>About</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
         <source>Delete Account</source>
         <translation>Delete Account</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>About this Account</translation>
+    </message>
 </context>
 <context>
     <name>DiagnosticsDialog</name>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="20"/>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
         <source>Tomahawk Diagnostics</source>
         <translation>Tomahawk Diagnostics</translation>
     </message>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="38"/>
-        <source>Update</source>
-        <translation>Update</translation>
-    </message>
-    <message>
-        <location filename="../src/diagnosticsdialog.ui" line="45"/>
-        <source>Copy to Clipboard</source>
-        <translation>Copy to Clipboard</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation>&amp;Copy to Clipboard</translation>
     </message>
-</context>
-<context>
-    <name>DropJob</name>
     <message>
-        <location filename="../src/libtomahawk/dropjob.cpp" line="832"/>
-        <source>No tracks found for given %1</source>
-        <translation>No tracks found for given %1</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation>Open &amp;Log-file</translation>
     </message>
 </context>
 <context>
     <name>GlobalSearchWidget</name>
     <message>
-        <location filename="../src/searchbox.ui" line="14"/>
+        <location filename="../src/SearchBox.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
@@ -538,66 +501,48 @@
 <context>
     <name>InfoBar</name>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.ui" line="26"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
         <source>InfoBar</source>
         <translation>InfoBar</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="87"/>
-        <source>Automatically update</source>
-        <translation>Automatically update</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="95"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
         <source>Filter...</source>
         <translation>Filter...</translation>
     </message>
 </context>
 <context>
-    <name>JobStatusView</name>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Searching For</source>
-        <translation>Searching For</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Pending</source>
-        <translation>Pending</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="94"/>
-        <source>Idle</source>
-        <translation>Idle</translation>
-    </message>
-</context>
-<context>
     <name>LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
         <source>Scrobble tracks to Last.fm</source>
         <translation>Scrobble tracks to Last.fm</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
         <source>Username:</source>
         <translation>Username:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
         <source>Test Login</source>
         <translation>Test Login</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation>Import Playback History</translation>
+    </message>
 </context>
 <context>
     <name>LastfmContext</name>
@@ -611,8 +556,8 @@
     <name>LatchedStatusItem</name>
     <message>
         <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
-        <source>%1 is listening along to you!</source>
-        <translation>%1 is listening along to you!</translation>
+        <source>%1 is listening along with you!</source>
+        <translation>%1 is listening along with you!</translation>
     </message>
 </context>
 <context>
@@ -646,12 +591,12 @@
 <context>
     <name>LoadXSPFDialog</name>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>Load XSPF File</source>
         <translation>Load XSPF File</translation>
     </message>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>XSPF Files (*.xspf)</source>
         <translation>XSPF Files (*.xspf)</translation>
     </message>
@@ -659,53 +604,256 @@
 <context>
     <name>LocalCollection</name>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Bookmarks</source>
         <translation>Bookmarks</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Saved tracks</source>
         <translation>Saved tracks</translation>
     </message>
 </context>
 <context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation>Sorry, we could not find any loved tracks!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation>Loved Tracks</translation>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation>Title:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation>Title...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation>Artist:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation>Artist...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation>Album:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation>Album...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation>Disc Number:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation>Duration:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation>00.00</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation>Year:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation>Bitrate:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation>File</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation>File Name:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation>File Name...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation>File Size...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation>File size...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation>File Size:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation>Back</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation>Forward</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation> - Properties</translation>
+    </message>
+</context>
+<context>
     <name>NewPlaylistWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="20"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
         <source>Enter a title for the new playlist:</source>
         <translation>Enter a title for the new playlist:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
         <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
         <translation>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="47"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
         <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>Just enter a genre or tag name and Tomahawk will suggest a few songs to get you started with your new playlist:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.cpp" line="43"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
         <source>&amp;Create Playlist</source>
         <translation>&amp;Create Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.h" line="50"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
         <source>Create a new playlist</source>
         <translation>Create a new playlist</translation>
     </message>
 </context>
 <context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>New Releases</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation>Artist</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation>Title</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation>Composer</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation>Album</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation>Track</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation>Duration</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation>Bitrate</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation>Age</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation>Year</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Size</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation>Origin</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation>Score</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+</context>
+<context>
     <name>PlaylistItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="162"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
         <source>played %1 by you</source>
         <translation>played %1 by you</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="164"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
         <source>played %1 by %2</source>
         <translation>played %1 by %2</translation>
     </message>
@@ -713,17 +861,17 @@
 <context>
     <name>PlaylistLargeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="156"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
         <source>played %1 by you</source>
         <translation>played %1 by you</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
         <source>played %1 by %2</source>
         <translation>played %1 by %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="165"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
         <source>added %1</source>
         <translation>added %1</translation>
     </message>
@@ -731,22 +879,22 @@
 <context>
     <name>PlaylistModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
         <source>A playlist by %1, created %2</source>
         <translation>A playlist by %1, created %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="78"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
         <source>you</source>
         <translation>you</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
         <source>All tracks by %1 on album %2</source>
         <translation>All tracks by %1 on album %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="152"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
         <source>All tracks by %1</source>
         <translation>All tracks by %1</translation>
     </message>
@@ -754,37 +902,37 @@
 <context>
     <name>PlaylistTypeSelectorDlg</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="32"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
         <source>New Playlist</source>
         <translation>New Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="49"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
         <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
         <translation>Just a regular old playlist... Give it a name, drag in some tracks, and go!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="75"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
         <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
         <translation>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="92"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="102"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
         <source>New Playlist...</source>
         <translation>New Playlist...</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="113"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
         <source>Create Manual Playlist</source>
         <translation>Create Manual Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="123"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
         <source>Create Automatic Playlist</source>
         <translation>Create Automatic Playlist</translation>
     </message>
@@ -792,7 +940,12 @@
 <context>
     <name>PlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistview.cpp" line="145"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation>This playlist is currently empty.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
         <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
         <translation>This playlist is currently empty. Add some tracks to it and enjoy the music!</translation>
     </message>
@@ -800,64 +953,59 @@
 <context>
     <name>ProxyDialog</name>
     <message>
-        <location filename="../src/proxydialog.ui" line="17"/>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
         <source>Proxy Settings</source>
         <translation>Proxy Settings</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="70"/>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
         <source>Hostname of proxy server</source>
         <translation>Hostname of proxy server</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="77"/>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="84"/>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="104"/>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
         <source>Proxy login</source>
         <translation>Proxy login</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="111"/>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
         <source>User</source>
         <translation>User</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="118"/>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="128"/>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
         <source>Proxy password</source>
         <translation>Proxy password</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="135"/>
-        <source>Type</source>
-        <translation>Type</translation>
-    </message>
-    <message>
-        <location filename="../src/proxydialog.ui" line="142"/>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
         <source>No Proxy Hosts:
 (Overrides system proxy)</source>
         <translation>No Proxy Hosts:
 (Overrides system proxy)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="150"/>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
         <source>localhost *.example.com (space separated)</source>
         <translation>localhost *.example.com (space separated)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="167"/>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
         <source>Use proxy for DNS lookups?</source>
         <translation>Use proxy for DNS lookups?</translation>
     </message>
@@ -865,82 +1013,82 @@
 <context>
     <name>QObject</name>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="214"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
         <source>%n year(s) ago</source>
         <translation><numerusform>%n year ago</numerusform><numerusform>%n years ago</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="216"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
         <source>%n year(s)</source>
         <translation><numerusform>%n year</numerusform><numerusform>%n years</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="222"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
         <source>%n month(s) ago</source>
         <translation><numerusform>%n month ago</numerusform><numerusform>%n months ago</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
         <source>%n month(s)</source>
         <translation><numerusform>%n month</numerusform><numerusform>%n months</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="230"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
         <source>%n week(s) ago</source>
         <translation><numerusform>%n week ago</numerusform><numerusform>%n weeks ago</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="232"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
         <source>%n week(s)</source>
         <translation><numerusform>%n week</numerusform><numerusform>%n weeks</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="238"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>%n day ago</numerusform><numerusform>%n days ago</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="240"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
         <source>%n day(s)</source>
         <translation><numerusform>%n day</numerusform><numerusform>%n days</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="246"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>%n hour ago</numerusform><numerusform>%n hours ago</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="248"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
         <source>%n hour(s)</source>
         <translation><numerusform>%n hour</numerusform><numerusform>%n hours</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="254"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
         <source>%1 minutes ago</source>
         <translation>%1 minutes ago</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="256"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
         <source>%1 minutes</source>
         <translation>%1 minutes</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="260"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
         <source>just now</source>
         <translation>just now</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="34"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
         <source>Friend Finders</source>
         <translation>Friend Finders</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
         <source>Music Finders</source>
         <translation>Music Finders</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="39"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
         <source>Status Updaters</source>
         <translation>Status Updaters</translation>
     </message>
@@ -956,26 +1104,31 @@
 <context>
     <name>QueueView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="26"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
         <source>InfoBar</source>
         <translation>InfoBar</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="41"/>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="120"/>
-        <source>Show Queue</source>
-        <translation>Show Queue</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation>Open Queue</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation><numerusform>Open Queue - %n item</numerusform><numerusform>Open Queue - %n items</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="130"/>
-        <source>Hide Queue</source>
-        <translation>Hide Queue</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation>Close Queue</translation>
     </message>
 </context>
 <context>
     <name>RelatedArtistsContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
         <source>Related Artists</source>
         <translation>Related Artists</translation>
     </message>
@@ -983,12 +1136,12 @@
 <context>
     <name>ResolverConfigDelegate</name>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="110"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
         <source>Not found: %1</source>
         <translation>Not found: %1</translation>
     </message>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="113"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
         <source>Failed to load: %1</source>
         <translation>Failed to load: %1</translation>
     </message>
@@ -996,7 +1149,7 @@
 <context>
     <name>SearchLineEdit</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/searchlineedit.cpp" line="58"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
         <source>Search</source>
         <translation>Search</translation>
     </message>
@@ -1004,12 +1157,12 @@
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="54"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
         <source>Search: %1</source>
         <translation>Search: %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="55"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
         <source>Results for &apos;%1&apos;</source>
         <translation>Results for &apos;%1&apos;</translation>
     </message>
@@ -1017,39 +1170,49 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="245"/>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
         <source>Collection</source>
         <translation>Collection</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="252"/>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
         <source>Advanced</source>
         <translation>Advanced</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="124"/>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
         <source>All</source>
         <translation>All</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="238"/>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation>Some changed settings will not take effect until Tomahawk is restarted</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
         <source>Services</source>
         <translation>Services</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="396"/>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
         <source>Install resolver from file</source>
         <translation>Install resolver from file</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Information</source>
-        <translation>Information</translation>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation>Delete all Access Control entries?</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Changing this setting requires a restart of Tomahawk!</source>
-        <translation>Changing this setting requires a restart of Tomahawk!</translation>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>Information</translation>
     </message>
 </context>
 <context>
@@ -1071,56 +1234,94 @@
     </message>
 </context>
 <context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>Cover</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation>Tweet</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation>Listening to &quot;%1&quot; by %2. %3</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation>%1 characters left</translation>
+    </message>
+</context>
+<context>
     <name>SourceDelegate</name>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="55"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
         <source>Track</source>
         <translation>Track</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="56"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
         <source>Album</source>
         <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="57"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
         <source>Artist</source>
         <translation>Artist</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="58"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="59"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
         <source>Top 10</source>
         <translation>Top 10</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="187"/>
-        <source>Offline</source>
-        <translation>Offline</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
         <source>All available tracks</source>
         <translation>All available tracks</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="196"/>
-        <source>Online</source>
-        <translation>Online</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="289"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="330"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
         <source>Show</source>
         <translation>Show</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="291"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="332"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
         <source>Hide</source>
         <translation>Hide</translation>
     </message>
@@ -1128,32 +1329,32 @@
 <context>
     <name>SourceInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="30"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
         <source>Recent Albums</source>
         <translation>Recent Albums</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="74"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
         <source>Latest Additions</source>
         <translation>Latest Additions</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="88"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
         <source>Recently Played Tracks</source>
         <translation>Recently Played Tracks</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="80"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
         <source>New Additions</source>
         <translation>New Additions</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="83"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
         <source>My recent activity</source>
         <translation>My recent activity</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="87"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
         <source>Recent activity from %1</source>
         <translation>Recent activity from %1</translation>
     </message>
@@ -1161,55 +1362,128 @@
 <context>
     <name>SourceItem</name>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="65"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
         <source>Collection</source>
         <translation>Collection</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="73"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
         <source>Latest Additions</source>
         <translation>Latest Additions</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="77"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
         <source>Recently Played</source>
         <translation>Recently Played</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="81"/>
-        <source>Loved Tracks</source>
-        <translation>Loved Tracks</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="146"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
         <source>SuperCollection</source>
         <translation>SuperCollection</translation>
     </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation>Latest additions to your collection</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation>Latest additions to %1&apos;s collection</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation>Sorry, we could not find any recent additions!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation>Recently Played Tracks</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation>Your recently played tracks</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation>%1&apos;s recently played tracks</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation>Sorry, we could not find any recent plays!</translation>
+    </message>
 </context>
 <context>
     <name>SourceTreeView</name>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="188"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
         <source>&amp;Copy Link</source>
         <translation>&amp;Copy Link</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
         <source>&amp;Delete %1</source>
         <translation>&amp;Delete %1</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="207"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation>Add to my Playlists</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation>Add to my Automatic Playlists</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation>Add to my Stations</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
         <source>&amp;Export Playlist</source>
         <translation>&amp;Export Playlist</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="341"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation>playlist</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation>automatic playlist</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation>station</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation>Delete %1?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
         <source>Save XSPF</source>
         <translation>Save XSPF</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="342"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
         <source>Playlists (*.xspf)</source>
         <translation>Playlists (*.xspf)</translation>
     </message>
@@ -1217,72 +1491,77 @@
 <context>
     <name>SourcesModel</name>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="78"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
         <source>Group</source>
         <translation>Group</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="81"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
         <source>Collection</source>
         <translation>Collection</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="84"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
         <source>Playlist</source>
         <translation>Playlist</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="87"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
         <source>Automatic Playlist</source>
         <translation>Automatic Playlist</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="90"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
         <source>Station</source>
         <translation>Station</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="268"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
         <source>Browse</source>
         <translation>Browse</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="269"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
         <source>Search History</source>
         <translation>Search History</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="271"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
         <source>My Music</source>
         <translation>My Music</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="279"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
         <source>SuperCollection</source>
         <translation>SuperCollection</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="285"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
         <source>Top Loved Tracks</source>
         <translation>Top Loved Tracks</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="273"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
         <source>Dashboard</source>
         <translation>Dashboard</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="290"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
         <source>Recently Played</source>
         <translation>Recently Played</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
         <source>Charts</source>
         <translation>Charts</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="300"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>New Releases</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
         <source>Friends</source>
         <translation>Friends</translation>
     </message>
@@ -1290,65 +1569,88 @@
 <context>
     <name>SpotifyConfig</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="48"/>
-        <source>Configure your Spotify credentials</source>
-        <translation>Configure your Spotify credentials</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation>Configure your Spotify account</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="65"/>
-        <source>Username:</source>
-        <translation>Username:</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation>Username or Facebook Email</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="72"/>
-        <source>placeholderUsername</source>
-        <translation>placeholderUsername</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>Log In</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
-        <source>Password:</source>
-        <translation>Password:</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation>Right click on any Tomahawk playlist to sync it to Spotify.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation>High Quality Streams</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation>Spotify playlists to keep in sync:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="86"/>
-        <source>placeholderPw</source>
-        <translation>placeholderPw</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation>Delete Tomahawk playlist when removing synchronization</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="116"/>
-        <source>High Quality Streaming</source>
-        <translation>High Quality Streaming</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>Username:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="186"/>
-        <source>This product uses SPOTIFY(R) CORE but is not endorsed, certified or otherwise approved in any way by Spotify. Spotify is the registered trade mark of the Spotify Group.</source>
-        <translation>This product uses SPOTIFY(R) CORE but is not endorsed, certified or otherwise approved in any way by Spotify. Spotify is the registered trade mark of the Spotify Group.</translation>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>Password:</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation>Delete in Spotify?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation>Would you like to delete the corresponding Spotify playlist as well?</translation>
     </message>
 </context>
 <context>
     <name>StackedSettingsDialog</name>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="14"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
         <source>Tomahawk Settings</source>
         <translation>Tomahawk Settings</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="158"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
         <source>Local Music Information</source>
         <translation>Local Music Information</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="166"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
         <source>Path to scan for music files:</source>
         <translation>Path to scan for music files:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="180"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
         <source>The Echo Nest supports keeping track of your catalog metadata
  and using it to craft personalized radios. Enabling this option
  will allow you (and all your friends) to create automatic playlists
@@ -1359,133 +1661,194 @@
  and stations based on your personal taste profile.</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="186"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
         <source>Upload collection list to The Echo Nest to enable user radio</source>
         <translation>Upload collection list to The Echo Nest to enable user radio</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="199"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
         <source>Watch for changes</source>
         <translation>Watch for changes</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="208"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
         <source>Time between scans, in seconds:</source>
         <translation>Time between scans, in seconds:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="98"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation>Advanced Settings</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation>Remote Peer Connection Method</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation>None (outgoing connections only)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation>Use UPnP to establish port forward (recommended)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation>Use static external IP address/host name and port</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation>Set this to your external IP address or host name. Make sure to forward the port to this host!</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation>SOCKS Proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation>Use SOCKS Proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation>Clear All Access Control Entries</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
         <source>Internet Services</source>
         <translation>Internet Services</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="109"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
         <source>Install from file...</source>
         <translation>Install from file...</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="129"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
         <source>Filter by capability:</source>
         <translation>Filter by capability:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="245"/>
-        <source>Advanced Network Settings</source>
-        <translation>Advanced Network Settings</translation>
-    </message>
-    <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="265"/>
-        <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>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!</translation>
-    </message>
-    <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="283"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
         <source>Static Host Name:</source>
         <translation>Static Host Name:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="299"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
         <source>Static Port:</source>
         <translation>Static Port:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="321"/>
-        <source>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</source>
-        <translation>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</translation>
-    </message>
-    <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="345"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
         <source>Proxy Settings...</source>
         <translation>Proxy Settings...</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="383"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation>Other Settings</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
         <source>Send reports after Tomahawk crashed</source>
         <translation>Send reports after Tomahawk crashed</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="396"/>
-        <source>Allow web browsers to interact with Tomahawk</source>
-        <translation>Allow web browsers to interact with Tomahawk</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation>Allow web browsers to interact with Tomahawk (recommended)</translation>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation>Copy Artist Link</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation>Copy Album Link</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="409"/>
-        <source>Use UPnP to establish port forward</source>
-        <translation>Use UPnP to establish port forward</translation>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation>Copy Track Link</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::AccountDelegate</name>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="200"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
         <source>Add Account</source>
         <translation>Add Account</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="250"/>
-        <source>Remove Account</source>
-        <translation>Remove Account</translation>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation>Remove</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="360"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
         <source>%1 downloads</source>
         <translation>%1 downloads</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="585"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
         <source>Online</source>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="590"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
         <source>Connecting...</source>
         <translation>Connecting...</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="595"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
 </context>
 <context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation>Manual Install Required</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</translation>
+    </message>
+</context>
+<context>
     <name>Tomahawk::Accounts::GoogleWrapper</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="82"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
         <source>Configure this Google Account</source>
         <translation>Configure this Google Account</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
         <source>Google Address</source>
         <translation>Google Address</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="84"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
         <source>Enter your Google login to connect with your friends using Tomahawk!</source>
         <translation>Enter your Google login to connect with your friends using Tomahawk!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="85"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
         <source>username@gmail.com</source>
         <translation>username@gmail.com</translation>
     </message>
@@ -1493,7 +1856,7 @@
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.h" line="42"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
         <source>Connect to Google Talk to find your friends</source>
         <translation>Connect to Google Talk to find your friends</translation>
     </message>
@@ -1501,12 +1864,12 @@
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperSip</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="61"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
         <source>Add Friend</source>
         <translation>Add Friend</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
         <source>Enter Google Address:</source>
         <translation>Enter Google Address:</translation>
     </message>
@@ -1514,7 +1877,7 @@
 <context>
     <name>Tomahawk::Accounts::LastFmAccountFactory</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmAccount.h" line="47"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
         <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
         <translation>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</translation>
     </message>
@@ -1522,26 +1885,104 @@
 <context>
     <name>Tomahawk::Accounts::LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="108"/>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="123"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation>Testing...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation>Test Login</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation>Importing %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation>Importing History...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation>History Incomplete. Resume</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation>Playback History Imported</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
         <source>Failed</source>
         <translation>Failed</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="113"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
         <source>Success</source>
         <translation>Success</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="129"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
         <source>Could not contact server</source>
         <translation>Could not contact server</translation>
     </message>
 </context>
 <context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation>Sync with Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation>Re-enable syncing with Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation>Stop syncing with Spotify</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>Logging in...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation>Failed: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation>Logged in as %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation>Log Out</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>Log In</translation>
+    </message>
+</context>
+<context>
     <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccount.h" line="44"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
         <source>Play music from and sync your playlists with Spotify Premium</source>
         <translation>Play music from and sync your playlists with Spotify Premium</translation>
     </message>
@@ -1549,7 +1990,7 @@
 <context>
     <name>Tomahawk::Accounts::TwitterAccountFactory</name>
     <message>
-        <location filename="../src/accounts/twitter/twitteraccount.h" line="50"/>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
         <source>Connect to your Twitter followers.</source>
         <translation>Connect to your Twitter followers.</translation>
     </message>
@@ -1557,128 +1998,128 @@
 <context>
     <name>Tomahawk::Accounts::TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="58"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="141"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="189"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
         <source>Tweet!</source>
         <translation>Tweet!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="66"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="167"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
         <source>Status: No saved credentials</source>
         <translation>Status: No saved credentials</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="67"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="92"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="168"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
         <source>Authenticate</source>
         <translation>Authenticate</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="74"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="136"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
         <source>Status: Credentials saved for %1</source>
         <translation>Status: Credentials saved for %1</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="75"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
         <source>De-authenticate</source>
         <translation>De-authenticate</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>Tweetin&apos; Error</source>
         <translation>Tweetin&apos; Error</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
         <source>The credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation>The credentials could not be verified.
 You may wish to try re-authenticating.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="152"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
         <source>Status: Error validating credentials</source>
         <translation>Status: Error validating credentials</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="179"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
         <source>Global Tweet</source>
         <translation>Global Tweet</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="184"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
         <source>Direct Message</source>
         <translation>Direct Message</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="185"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
         <source>Send Message!</source>
         <translation>Send Message!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="186"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
         <source>@Mention</source>
         <translation>@Mention</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="187"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
         <source>Send Mention!</source>
         <translation>Send Mention!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
         <source>You must enter a user name for this type of tweet.</source>
         <translation>You must enter a user name for this type of tweet.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
         <source>Your saved credentials could not be loaded.
 You may wish to try re-authenticating.</source>
         <translation>Your saved credentials could not be loaded.
 You may wish to try re-authenticating.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
         <source>Your saved credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation>Your saved credentials could not be verified.
 You may wish to try re-authenticating.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>There was an error posting your status -- sorry!</source>
         <translation>There was an error posting your status -- sorry!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Tweeted!</source>
         <translation>Tweeted!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
         <source>Your tweet has been posted!</source>
         <translation>Your tweet has been posted!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
         <source>There was an error posting your direct message -- sorry!</source>
         <translation>There was an error posting your direct message -- sorry!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Your message has been posted!</source>
         <translation>Your message has been posted!</translation>
     </message>
@@ -1686,7 +2127,7 @@
 <context>
     <name>Tomahawk::Accounts::XmppAccountFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppaccount.h" line="51"/>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
         <source>Log on to your Jabber/XMPP account to connect to your friends</source>
         <translation>Log on to your Jabber/XMPP account to connect to your friends</translation>
     </message>
@@ -1694,7 +2135,7 @@
 <context>
     <name>Tomahawk::Accounts::ZeroconfFactory</name>
     <message>
-        <location filename="../src/accounts/zeroconf/zeroconfaccount.h" line="42"/>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
         <source>Automatically connect to Tomahawks on the local network</source>
         <translation>Automatically connect to Tomahawks on the local network</translation>
     </message>
@@ -1702,93 +2143,113 @@
 <context>
     <name>Tomahawk::ContextMenu</name>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="79"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
         <source>&amp;Play</source>
         <translation>&amp;Play</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="82"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="142"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="181"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
         <source>Add to &amp;Queue</source>
         <translation>Add to &amp;Queue</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="87"/>
-        <source>&amp;Continue playback after this track</source>
-        <translation>&amp;Continue playback after this track</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation>Continue Playback after this &amp;Track</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="89"/>
-        <source>&amp;Stop playback after this track</source>
-        <translation>&amp;Stop playback after this track</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation>Stop Playback after this &amp;Track</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="96"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="277"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
         <source>&amp;Love</source>
         <translation>&amp;Love</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
         <source>&amp;Copy Track Link</source>
         <translation>&amp;Copy Track Link</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="139"/>
-        <source>Show &amp;Album page</source>
-        <translation>Show &amp;Album page</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation>Copy Album &amp;Link</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="178"/>
-        <source>Show &amp;Artist page</source>
-        <translation>Show &amp;Artist page</translation>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation>Copy Artist &amp;Link</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="272"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
         <source>Un-&amp;Love</source>
         <translation>Un-&amp;Love</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Items</source>
         <translation>&amp;Delete Items</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation>&amp;Show Track Page</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation>Properties...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Item</source>
         <translation>&amp;Delete Item</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation>&amp;Show Album Page</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation>&amp;Show Artist Page</translation>
+    </message>
 </context>
 <context>
     <name>Tomahawk::CustomPlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="123"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
         <source>Top Loved Tracks</source>
         <translation>Top Loved Tracks</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="127"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
         <source>Your loved tracks</source>
         <translation>Your loved tracks</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="129"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
         <source>%1&apos;s loved tracks</source>
         <translation>%1&apos;s loved tracks</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="138"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
         <source>The most loved tracks from all your friends</source>
         <translation>The most loved tracks from all your friends</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="142"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
         <source>All of your loved tracks</source>
         <translation>All of your loved tracks</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
         <source>All of %1&apos;s loved tracks</source>
         <translation>All of %1&apos;s loved tracks</translation>
     </message>
@@ -1796,12 +2257,32 @@
 <context>
     <name>Tomahawk::DropJobNotifier</name>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="102"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation>playlist</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation>artist</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation>track</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation>album</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
         <source>Fetching %1 from database</source>
         <translation>Fetching %1 from database</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="106"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
         <source>Parsing %1 %2</source>
         <translation>Parsing %1 %2</translation>
     </message>
@@ -1809,7 +2290,7 @@
 <context>
     <name>Tomahawk::DynamicControlList</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
         <source>Click to collapse</source>
         <translation>Click to collapse</translation>
     </message>
@@ -1848,17 +2329,17 @@
 <context>
     <name>Tomahawk::DynamicView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
         <source>Add some filters above to seed this station!</source>
         <translation>Add some filters above to seed this station!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="149"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
         <source>Press Generate to get started!</source>
         <translation>Press Generate to get started!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="151"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
         <source>Add some filters above, and press Generate to get started!</source>
         <translation>Add some filters above, and press Generate to get started!</translation>
     </message>
@@ -2180,97 +2661,97 @@
 <context>
     <name>Tomahawk::EchonestSteerer</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="57"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
         <source>Steer this station:</source>
         <translation>Steer this station:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="71"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
         <source>Much less</source>
         <translation>Much less</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="72"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
         <source>Less</source>
         <translation>Less</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="73"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
         <source>A bit less</source>
         <translation>A bit less</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="74"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
         <source>Keep at current</source>
         <translation>Keep at current</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="75"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
         <source>A bit more</source>
         <translation>A bit more</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="76"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
         <source>More</source>
         <translation>More</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
         <source>Much more</source>
         <translation>Much more</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="80"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
         <source>Loudness</source>
         <translation>Loudness</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
         <source>Danceability</source>
         <translation>Danceability</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
         <source>Energy</source>
         <translation>Energy</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
         <source>Song Hotttnesss</source>
         <translation>Song Hotttnesss</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
         <source>Artist Hotttnesss</source>
         <translation>Artist Hotttnesss</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
         <source>Artist Familiarity</source>
         <translation>Artist Familiarity</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
         <source>By Description</source>
         <translation>By Description</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
         <source>Enter a description</source>
         <translation>Enter a description</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="102"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
         <source>Apply steering command</source>
         <translation>Apply steering command</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="108"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
         <source>Reset all steering commands</source>
         <translation>Reset all steering commands</translation>
     </message>
@@ -2278,7 +2759,7 @@
 <context>
     <name>Tomahawk::GroovesharkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/groovesharkparser.cpp" line="255"/>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
         <source>Error fetching Grooveshark information from the network!</source>
         <translation>Error fetching Grooveshark information from the network!</translation>
     </message>
@@ -2286,58 +2767,87 @@
 <context>
     <name>Tomahawk::InfoSystem::ChartsPlugin</name>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="307"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
         <source>Top Overall</source>
         <translation>Top Overall</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="396"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
         <source>Artists</source>
         <translation>Artists</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="398"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
         <source>Albums</source>
         <translation>Albums</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="400"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
         <source>Tracks</source>
         <translation>Tracks</translation>
     </message>
 </context>
 <context>
-    <name>Tomahawk::InfoSystem::LastFmPlugin</name>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation>Tomahawk is playing &quot;%1&quot; by %2%3.</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation>on &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
         <source>Top Tracks</source>
         <translation>Top Tracks</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
         <source>Loved Tracks</source>
         <translation>Loved Tracks</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
         <source>Hyped Tracks</source>
         <translation>Hyped Tracks</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
         <source>Top Artists</source>
         <translation>Top Artists</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
         <source>Hyped Artists</source>
         <translation>Hyped Artists</translation>
     </message>
 </context>
 <context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>Albums</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation>Listening to &quot;%1&quot; by %2 and loving it! %3</translation>
+    </message>
+</context>
+<context>
     <name>Tomahawk::ItunesParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/itunesparser.cpp" line="170"/>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
         <source>Error fetching iTunes information from the network!</source>
         <translation>Error fetching iTunes information from the network!</translation>
     </message>
@@ -2345,27 +2855,27 @@
 <context>
     <name>Tomahawk::JSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="137"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
         <source>New Playlist</source>
         <translation>New Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Failed to save tracks</source>
         <translation>Failed to save tracks</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>XSPF Error</source>
         <translation>XSPF Error</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>This is not a valid XSPF playlist.</translation>
     </message>
@@ -2387,37 +2897,37 @@
 <context>
     <name>Tomahawk::Query</name>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="637"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
         <source> and </source>
         <translation> and </translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="645"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
         <source>You</source>
         <translation>You</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="647"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
         <source>you</source>
         <translation>you</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>and</source>
         <translation>and</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>%n other(s)</source>
         <translation><numerusform>%n other</numerusform><numerusform>%n others</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="659"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
         <source>%1 people</source>
         <translation>%1 people</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="661"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
         <source>loved this track</source>
         <translation>loved this track</translation>
     </message>
@@ -2425,7 +2935,7 @@
 <context>
     <name>Tomahawk::RdioParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/rdioparser.cpp" line="193"/>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
         <source>Error fetching Rdio information from the network!</source>
         <translation>Error fetching Rdio information from the network!</translation>
     </message>
@@ -2433,7 +2943,7 @@
 <context>
     <name>Tomahawk::ShortenedLinkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/shortenedlinkparser.cpp" line="96"/>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
         <source>Network error parsing shortened link!</source>
         <translation>Network error parsing shortened link!</translation>
     </message>
@@ -2441,49 +2951,67 @@
 <context>
     <name>Tomahawk::Source</name>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="242"/>
-        <location filename="../src/libtomahawk/source.cpp" line="293"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
         <source>Scanning (%L1 tracks)</source>
         <translation>Scanning (%L1 tracks)</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="244"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
         <source>Scanning</source>
         <translation>Scanning</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="278"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
         <source>Checking</source>
         <translation>Checking</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="283"/>
-        <source>Fetching</source>
-        <translation>Fetching</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation>Syncing</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="288"/>
-        <source>Parsing</source>
-        <translation>Parsing</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation>Importing</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="417"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
         <source>Saving (%1%)</source>
         <translation>Saving (%1%)</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation>Online</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation>Offline</translation>
+    </message>
 </context>
 <context>
     <name>Tomahawk::SpotifyParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/spotifyparser.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
         <source>Error fetching Spotify information from the network!</source>
         <translation>Error fetching Spotify information from the network!</translation>
     </message>
 </context>
 <context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation>Automatically update from XSPF</translation>
+    </message>
+</context>
+<context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/tomahawkapp.cpp" line="534"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>My Collection</translation>
     </message>
@@ -2491,12 +3019,12 @@
 <context>
     <name>TomahawkOAuthTwitter</name>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>Twitter PIN</source>
         <translation>Twitter PIN</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>After authenticating on Twitter's web site,
 enter the displayed PIN number here:</source>
         <translation>After authenticating on Twitter&apos;s web site,
@@ -2506,464 +3034,466 @@
 <context>
     <name>TomahawkTrayIcon</name>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="59"/>
-        <location filename="../src/tomahawktrayicon.cpp" line="93"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation>&amp;Stop Playback after current Track</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
         <source>Hide Tomahawk Window</source>
         <translation>Hide Tomahawk Window</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="98"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
         <source>Show Tomahawk Window</source>
         <translation>Show Tomahawk Window</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="158"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
         <source>Currently not playing.</source>
         <translation>Currently not playing.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="219"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
         <source>Play</source>
         <translation>Play</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="226"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation>&amp;Love</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation>Un-&amp;Love</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation>&amp;Continue Playback after current Track</translation>
+    </message>
 </context>
 <context>
     <name>TomahawkWindow</name>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="14"/>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
         <source>Tomahawk</source>
         <translation>Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="75"/>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
         <source>&amp;Settings</source>
         <translation>&amp;Settings</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="81"/>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
         <source>&amp;Controls</source>
         <translation>&amp;Controls</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="100"/>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
         <source>&amp;Network</source>
         <translation>&amp;Network</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="107"/>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
         <source>&amp;Window</source>
         <translation>&amp;Window</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="114"/>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="128"/>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
         <source>&amp;Quit</source>
         <translation>&amp;Quit</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="131"/>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="139"/>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
         <source>Go &amp;Online</source>
         <translation>Go &amp;Online</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="144"/>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
         <source>Add &amp;Friend...</source>
         <translation>Add &amp;Friend...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="149"/>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
         <source>U&amp;pdate Collection</source>
         <translation>U&amp;pdate Collection</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="152"/>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
         <source>Update Collection</source>
         <translation>Update Collection</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="157"/>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
         <source>&amp;Configure Tomahawk...</source>
         <translation>&amp;Configure Tomahawk...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="165"/>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
         <source>Load &amp;XSPF...</source>
         <translation>Load &amp;XSPF...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="170"/>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
         <source>Create &amp;New Playlist...</source>
         <translation>Create &amp;New Playlist...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="175"/>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
         <source>About &amp;Tomahawk...</source>
         <translation>About &amp;Tomahawk...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="183"/>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
         <source>Create New &amp;Automatic Playlist</source>
         <translation>Create New &amp;Automatic Playlist</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="188"/>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
         <source>Create New &amp;Station</source>
         <translation>Create New &amp;Station</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="196"/>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
         <source>Show Offline Sources</source>
         <translation>Show Offline Sources</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="201"/>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
         <source>Hide Offline Sources</source>
         <translation>Hide Offline Sources</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="206"/>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
         <source>Minimize</source>
         <translation>Minimize</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="209"/>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="214"/>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="217"/>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
         <source>Meta+Ctrl+Z</source>
         <translation>Meta+Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="222"/>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation>&amp;Legal Info...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
         <source>Diagnostics...</source>
         <translation>Diagnostics...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="230"/>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
         <source>Fully &amp;Rescan Collection</source>
         <translation>Fully &amp;Rescan Collection</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="233"/>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
         <source>Fully Rescan Collection</source>
         <translation>Fully Rescan Collection</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="238"/>
-        <location filename="../src/tomahawkwindow.cpp" line="676"/>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
         <source>Play</source>
         <translation>Play</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="241"/>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
         <source>Space</source>
         <translation>Space</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="246"/>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
         <source>Previous</source>
         <translation>Previous</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="251"/>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
         <source>Next</source>
         <translation>Next</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="219"/>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation>Back</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation>Go back one page</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation>Forward</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation>Go forward one page</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
         <source>Global Search...</source>
         <translation>Global Search...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="270"/>
-        <location filename="../src/tomahawkwindow.cpp" line="287"/>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
         <source>Check For Updates...</source>
         <translation>Check For Updates...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="449"/>
-        <location filename="../src/tomahawkwindow.cpp" line="456"/>
-        <location filename="../src/tomahawkwindow.cpp" line="464"/>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
         <source>Connect To Peer</source>
         <translation>Connect To Peer</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="450"/>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
         <source>Enter peer address:</source>
         <translation>Enter peer address:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="457"/>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
         <source>Enter peer port:</source>
         <translation>Enter peer port:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="465"/>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
         <source>Enter peer key:</source>
         <translation>Enter peer key:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>XSPF Error</source>
         <translation>XSPF Error</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>This is not a valid XSPF playlist.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Failed to save tracks</source>
         <translation>Failed to save tracks</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="579"/>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
         <translation>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="581"/>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
         <translation>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Create New Station</source>
         <translation>Create New Station</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
-        <source>New Station</source>
-        <translation>New Station</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation>Playlist</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="650"/>
-        <source>New Playlist</source>
-        <translation>New Playlist</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation>Automatic Playlist</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="668"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="691"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
         <source>Go &amp;offline</source>
         <translation>Go &amp;offline</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="698"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
         <source>Go &amp;online</source>
         <translation>Go &amp;online</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="720"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
         <source>Authentication Error</source>
         <translation>Authentication Error</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="735"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation>Error connecting to SIP: Authentication failed!</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
         <source>%1 by %2</source>
         <comment>track, artist name</comment>
         <translation>%1 by %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="736"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
         <source>%1 - %2</source>
         <comment>current track, some window title</comment>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="747"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
         <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="751"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
         <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="755"/>
-        <source>Copyright 2010 - 2012&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson</source>
-        <translation>Copyright 2010 - 2012&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation>Copyright 2010 - 2012</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="758"/>
-        <source>About Tomahawk</source>
-        <translation>About Tomahawk</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation>Thanks to:</translation>
     </message>
-</context>
-<context>
-    <name>TopBar</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="26"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="66"/>
-        <source>0 Sources</source>
-        <translation>0 Sources</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="89"/>
-        <source>0 Tracks</source>
-        <translation>0 Tracks</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="112"/>
-        <source>0 Artists</source>
-        <translation>0 Artists</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="135"/>
-        <source>0 Shown</source>
-        <translation>0 Shown</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="49"/>
-        <source>Tracks</source>
-        <translation>Tracks</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="50"/>
-        <source>Artists</source>
-        <translation>Artists</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="54"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="84"/>
-        <source>Artist View</source>
-        <translation>Artist View</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="85"/>
-        <source>Flat View</source>
-        <translation>Flat View</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="195"/>
-        <source>Sources</source>
-        <translation>Sources</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="247"/>
-        <source>Shown</source>
-        <translation>Shown</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation>About Tomahawk</translation>
     </message>
 </context>
 <context>
     <name>TopTracksContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
         <source>Top Hits</source>
         <translation>Top Hits</translation>
     </message>
 </context>
 <context>
-    <name>TrackModel</name>
+    <name>TrackInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Artist</source>
-        <translation>Artist</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Title</source>
-        <translation>Title</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Album</source>
-        <translation>Album</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation>Cover</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
         <source>Track</source>
         <translation>Track</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Duration</source>
-        <translation>Duration</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation>Artist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Bitrate</source>
-        <translation>Bitrate</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Age</source>
-        <translation>Age</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation>Statistics</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Year</source>
-        <translation>Year</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation>Similar Tracks</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Size</source>
-        <translation>Size</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation>Sorry, but we could not find similar tracks for this song!</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation><numerusform>You&apos;ve listened to this track %n time.</numerusform><numerusform>You&apos;ve listened to this track %n times.</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Origin</source>
-        <translation>Origin</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation>You&apos;ve never listened to this track before.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Score</source>
-        <translation>Score</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation>You first listened to it on %1.</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation><numerusform>You&apos;ve listened to %1 %n time.</numerusform><numerusform>You&apos;ve listened to %1 %n times.</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Composer</source>
-        <translation>Composer</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation>You&apos;ve never listened to %1 before.</translation>
     </message>
 </context>
 <context>
     <name>TrackView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackview.cpp" line="493"/>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
         <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
         <translation>Sorry, your filter &apos;%1&apos; did not match any results.</translation>
     </message>
@@ -2984,7 +3514,7 @@
 <context>
     <name>TreeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treeitemdelegate.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Unknown</translation>
     </message>
@@ -2992,92 +3522,60 @@
 <context>
     <name>TreeModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Duration</source>
-        <translation>Duration</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Bitrate</source>
-        <translation>Bitrate</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Age</source>
-        <translation>Age</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Year</source>
-        <translation>Year</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Size</source>
-        <translation>Size</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Origin</source>
-        <translation>Origin</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Composer</source>
-        <translation>Composer</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="585"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
         <source>All Artists</source>
         <translation>All Artists</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="699"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="724"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
         <source>My Collection</source>
         <translation>My Collection</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="701"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="726"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
         <source>Collection of %1</source>
         <translation>Collection of %1</translation>
     </message>
 </context>
 <context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>Sorry, your filter &apos;%1&apos; did not match any results.</translation>
+    </message>
+</context>
+<context>
     <name>TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="73"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
         <source>Configure this Twitter account</source>
         <translation>Configure this Twitter account</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="119"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
         <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
         <translation>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
         <source>Status: No saved credentials</source>
         <translation>Status: No saved credentials</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="166"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
         <source>Authenticate with Twitter</source>
         <translation>Authenticate with Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="196"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
         <source>Twitter Connections</source>
         <translation>Twitter Connections</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
         <source>
 If you only want to post tweets, you're done.
 
@@ -3092,32 +3590,32 @@
 You can re-send a sync message at any time simply by sending another tweet using the button.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="244"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
         <source>Select the kind of tweet you would like, then press the button to post it:</source>
         <translation>Select the kind of tweet you would like, then press the button to post it:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="276"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
         <source>Global Tweet</source>
         <translation>Global Tweet</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="281"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
         <source>@Mention</source>
         <translation>@Mention</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="286"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
         <source>Direct Message</source>
         <translation>Direct Message</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="322"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
         <source>e.g. @tomahawk</source>
         <translation>e.g. @tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="351"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
         <source>Send Message</source>
         <translation>Send Message</translation>
     </message>
@@ -3125,45 +3623,60 @@
 <context>
     <name>ViewManager</name>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="383"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation>After you have scanned your music collection you will find your tracks right here.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation>This collection is empty.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
         <source>SuperCollection</source>
         <translation>SuperCollection</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="384"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
         <source>Combined libraries of all your online friends</source>
         <translation>Combined libraries of all your online friends</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="385"/>
-        <source>All available albums</source>
-        <translation>All available albums</translation>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation>Recently Played Tracks</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation>Recently played tracks from all your friends</translation>
     </message>
 </context>
 <context>
     <name>WelcomeWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="34"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
         <source>Recent Additions</source>
         <translation>Recent Additions</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
         <source>Newest Stations &amp; Playlists</source>
         <translation>Newest Stations &amp; Playlists</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="70"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
         <source>Recently Played Tracks</source>
         <translation>Recently Played Tracks</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.cpp" line="152"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
         <source>No recently created playlists in your network.</source>
         <translation>No recently created playlists in your network.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.h" line="90"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
         <source>Welcome to Tomahawk</source>
         <translation>Welcome to Tomahawk</translation>
     </message>
@@ -3171,7 +3684,7 @@
 <context>
     <name>WhatsHotWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/whatshotwidget.h" line="72"/>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
         <source>Charts</source>
         <translation>Charts</translation>
     </message>
@@ -3187,7 +3700,7 @@
 <context>
     <name>XMPPBot</name>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="312"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
         <source>
 Terms for %1:
 </source>
@@ -3196,12 +3709,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="314"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
         <source>No terms found, sorry.</source>
         <translation>No terms found, sorry.</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="347"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
         <source>
 Hotttness for %1: %2
 </source>
@@ -3210,7 +3723,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="363"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
         <source>
 Familiarity for %1: %2
 </source>
@@ -3219,7 +3732,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="381"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
         <source>
 Lyrics for &quot;%1&quot; by %2:
 
@@ -3235,22 +3748,22 @@
 <context>
     <name>XSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="49"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
         <source>Failed to parse contents of XSPF playlist</source>
         <translation>Failed to parse contents of XSPF playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="51"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
         <source>Some playlist entries were found without artist and track name, they will be omitted</source>
         <translation>Some playlist entries were found without artist and track name, they will be omitted</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="53"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
         <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
         <translation>Failed to fetch the desired playlist from the network, or the desired file does not exist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="188"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
         <source>New Playlist</source>
         <translation>New Playlist</translation>
     </message>
@@ -3258,78 +3771,78 @@
 <context>
     <name>XmlConsole</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
         <source>Xml stream console</source>
         <translation>Xml stream console</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="33"/>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="60"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="43"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
         <source>Save log</source>
         <translation>Save log</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
         <source>Disabled</source>
         <translation>Disabled</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="65"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
         <source>By JID</source>
         <translation>By JID</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="68"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
         <source>By namespace uri</source>
         <translation>By namespace uri</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="71"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
         <source>By all attributes</source>
         <translation>By all attributes</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="76"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
         <source>Visible stanzas</source>
         <translation>Visible stanzas</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="79"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
         <source>Information query</source>
         <translation>Information query</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
         <source>Message</source>
         <translation>Message</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="87"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
         <source>Presence</source>
         <translation>Presence</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="91"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
         <source>Custom</source>
         <translation>Custom</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="107"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="358"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
         <source>Save XMPP log to file</source>
         <translation>Save XMPP log to file</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
         <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
         <translation>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</translation>
     </message>
@@ -3337,72 +3850,72 @@
 <context>
     <name>XmppConfigWidget</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
         <source>Xmpp Configuration</source>
         <translation>Xmpp Configuration</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="52"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
         <source>Configure this Xmpp account</source>
         <translation>Configure this Xmpp account</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="89"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
         <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
         <translation>Enter your Xmpp login to connect with your friends using Tomahawk!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="111"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
         <source>Login Information</source>
         <translation>Login Information</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="131"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
         <source>Xmpp ID:</source>
         <translation>Xmpp ID:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="147"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
         <source>e.g. user@example.com</source>
         <translation>e.g. user@example.com</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="160"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="188"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
         <source>An account with this name already exists!</source>
         <translation>An account with this name already exists!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="210"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
         <source>Advanced Xmpp Settings</source>
         <translation>Advanced Xmpp Settings</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="230"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="253"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="299"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
         <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
         <translation>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="302"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
         <source>Publish currently playing track</source>
         <translation>Publish currently playing track</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="309"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
         <source>Enforce secure connection</source>
         <translation>Enforce secure connection</translation>
     </message>
@@ -3410,130 +3923,130 @@
 <context>
     <name>XmppSipPlugin</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
         <source>User Interaction</source>
         <translation>User Interaction</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="362"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
         <source>Host is unknown</source>
         <translation>Host is unknown</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="365"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
         <source>Item not found</source>
         <translation>Item not found</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="368"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
         <source>Authorization Error</source>
         <translation>Authorization Error</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="371"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
         <source>Remote Stream Error</source>
         <translation>Remote Stream Error</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="374"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
         <source>Remote Connection failed</source>
         <translation>Remote Connection failed</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="377"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
         <source>Internal Server Error</source>
         <translation>Internal Server Error</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="380"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
         <source>System shutdown</source>
         <translation>System shutdown</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="383"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
         <source>Conflict</source>
         <translation>Conflict</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="387"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
         <source>Unknown</source>
         <translation>Unknown</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="391"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
         <source>No Compression Support</source>
         <translation>No Compression Support</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="395"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
         <source>No Encryption Support</source>
         <translation>No Encryption Support</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="399"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
         <source>No Authorization Support</source>
         <translation>No Authorization Support</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="403"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
         <source>No Supported Feature</source>
         <translation>No Supported Feature</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="500"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
         <source>Add Friend</source>
         <translation>Add Friend</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="501"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
         <source>Enter Xmpp ID:</source>
         <translation>Enter Xmpp ID:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="617"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
         <source>Add Friend...</source>
         <translation>Add Friend...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="622"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
         <source>XML Console...</source>
         <translation>XML Console...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="670"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
         <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
         <translation>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="768"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
         <source>Authorize User</source>
         <translation>Authorize User</translation>
     </message>
-    <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="769"/>
-        <source>Do you want to grant &lt;b&gt;%1&lt;/b&gt; access to your Collection?</source>
-        <translation>Do you want to grant &lt;b&gt;%1&lt;/b&gt; access to your Collection?</translation>
-    </message>
 </context>
 <context>
     <name>ZeroconfConfig</name>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="14"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="55"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
         <source>Local Network configuration</source>
         <translation>Local Network configuration</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="77"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
         <source>This plugin will automatically find other users running Tomahawk on your local network</source>
         <translation>This plugin will automatically find other users running Tomahawk on your local network</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="84"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
         <source>Connect automatically when Tomahawk starts</source>
         <translation>Connect automatically when Tomahawk starts</translation>
     </message>

tomahawk-0.4.2.tar.bz2/lang/tomahawk_es.ts -> tomahawk-0.5.5.tar.bz2/lang/tomahawk_es.ts Changed

@@ -1,131 +1,133 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0">
 <context>
-    <name>ACLRegistry</name>
+    <name>ACLJobDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="140"/>
-        <source>Connect to Peer?</source>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="141"/>
-        <source>Another Tomahawk instance that claims to be owned by %1 is attempting to connect to you. Select whether to allow or deny this connection.
-
-Remember: Only allow peers to connect if you trust who they are and if you have the legal right for them to stream music from you.</source>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="142"/>
-        <source>Deny</source>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="143"/>
-        <source>Allow</source>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AccountFactoryWrapper</name>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"/>
+        <translation>Diálogo</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="30"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
         <source>Description goes here</source>
-        <translation type="unfinished"/>
+        <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.cpp" line="41"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
         <source>Add Account</source>
-        <translation type="unfinished"/>
+        <translation>Añadir Cuenta</translation>
     </message>
 </context>
 <context>
     <name>AccountFactoryWrapperDelegate</name>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="105"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
         <source>Online</source>
-        <translation type="unfinished"/>
+        <translation>Conectado</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="110"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
         <source>Connecting...</source>
-        <translation type="unfinished"/>
+        <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="115"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
         <source>Offline</source>
-        <translation type="unfinished"/>
+        <translation>Desconectado</translation>
     </message>
 </context>
 <context>
     <name>ActionCollection</name>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="43"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
         <source>&amp;Listen Along</source>
         <translation>&amp;Escuchar juntos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="46"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
         <source>Stop &amp;Listening Along</source>
         <translation>Detener la &amp;reproducción conjunta</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="50"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
         <source>&amp;Follow in real-time</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Seguir en tiempo real</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Privately</source>
         <translation>&amp;Escuchar en privado</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Publicly</source>
         <translation>&amp;Escuchar públicamente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="61"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
         <source>&amp;Load Playlist</source>
         <translation>&amp;Cargar lista de reproducción</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="62"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
         <source>&amp;Rename Playlist</source>
         <translation>&amp;Renombrar lista de reproducción</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="63"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
         <source>&amp;Copy Playlist Link</source>
         <translation>&amp;Copiar enlace de lista de reproducción</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="64"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
         <source>&amp;Play</source>
         <translation>&amp;Reproducir</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="65"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
         <source>&amp;Stop</source>
         <translation>&amp;Detener</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
         <source>&amp;Previous Track</source>
         <translation>&amp;Pista anterior</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="67"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
         <source>&amp;Next Track</source>
         <translation>&amp;Pista siguiente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="68"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
@@ -135,7 +137,7 @@
     <message>
         <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation>Formulario</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="31"/>
@@ -143,30 +145,17 @@
         <translation>Otros álbumes por el artista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="74"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="120"/>
-        <source>Click to show Official Tracks</source>
-        <translation>Mostrar Pistas Oficiales</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="72"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="118"/>
-        <source>Click to show SuperCollection Tracks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="79"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="136"/>
-        <source>Click to show SuperCollection Albums</source>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="138"/>
-        <source>Click to show Official Albums</source>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="205"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
         <source>Other Albums by %1</source>
         <translation>Otros álbumes por %1</translation>
     </message>
@@ -174,156 +163,139 @@
 <context>
     <name>AlbumModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="145"/>
-        <source>Album</source>
-        <translation>Álbum</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="260"/>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="302"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
         <source>All albums from %1</source>
         <translation>Todos los álbumes de %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="304"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
         <source>All albums</source>
         <translation>Todos los álbumes</translation>
     </message>
 </context>
 <context>
-    <name>AlbumView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="155"/>
-        <source>After you have scanned your music collection you will find your latest album additions right here.</source>
-        <translation>Tras haber escaneado su colección aquí encontrará los últimos álbumes añadidos.</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="157"/>
-        <source>This collection doesn&apos;t have any recent albums.</source>
-        <translation>Esta colección no tiene álbumes recientes.</translation>
-    </message>
-</context>
-<context>
     <name>ArtistInfoWidget</name>
     <message>
         <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
         <source>Top Hits</source>
         <translation>Grandes éxitos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
         <source>Related Artists</source>
         <translation>Artistas relacionados</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="77"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
         <source>Albums</source>
         <translation>Álbumes</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="86"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="125"/>
-        <source>Click to show SuperCollection Albums</source>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="127"/>
-        <source>Click to show Official Albums</source>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ArtistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="272"/>
-        <source>After you have scanned your music collection you will find your tracks right here.</source>
-        <translation>Tras haber escaneado su colección aquí encontrará las últimas pistas añadidas.</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="274"/>
-        <source>This collection is currently empty.</source>
-        <translation>Esta colección está vacía.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="291"/>
-        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
-        <translation>Tu filtro &apos;%1&apos; no reportó ningún resultado.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AudioControls</name>
     <message>
-        <location filename="../src/audiocontrols.ui" line="75"/>
+        <location filename="../src/AudioControls.ui" line="75"/>
         <source>Prev</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="87"/>
+        <location filename="../src/AudioControls.ui" line="87"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="94"/>
+        <location filename="../src/AudioControls.ui" line="94"/>
         <source>Pause</source>
         <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="103"/>
+        <location filename="../src/AudioControls.ui" line="103"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="214"/>
+        <location filename="../src/AudioControls.ui" line="229"/>
         <source>Artist</source>
         <translation>Artista</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="236"/>
+        <location filename="../src/AudioControls.ui" line="248"/>
         <source>Album</source>
         <translation>Álbum</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="265"/>
+        <location filename="../src/AudioControls.ui" line="277"/>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="302"/>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation>social</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
         <source>love</source>
         <translation>favorita</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="346"/>
+        <location filename="../src/AudioControls.ui" line="383"/>
         <source>Time</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="375"/>
+        <location filename="../src/AudioControls.ui" line="412"/>
         <source>Time Left</source>
         <translation>Tiempo restante</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="453"/>
+        <location filename="../src/AudioControls.ui" line="493"/>
         <source>Shuffle</source>
         <translation>Aleatorio</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="466"/>
+        <location filename="../src/AudioControls.ui" line="506"/>
         <source>Repeat</source>
         <translation>Repetir</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="504"/>
+        <location filename="../src/AudioControls.ui" line="544"/>
         <source>Low</source>
         <translation>Bajar volumen</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="536"/>
+        <location filename="../src/AudioControls.ui" line="576"/>
         <source>High</source>
         <translation>Subir volumen</translation>
     </message>
@@ -331,41 +303,42 @@
 <context>
     <name>AudioEngine</name>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="199"/>
-        <source>Tomahawk is stopped.</source>
-        <translation>Tomahawk está parado.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="369"/>
-        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
-        <translation>Tomahawk está reproduciendo &quot;%1&quot; de %2%3.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="372"/>
-        <source>on album %1</source>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CategoryAddItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="61"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="100"/>
-        <source>New Playlist</source>
-        <translation>Nueva lista de reproducción</translation>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="63"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>New Station</source>
         <translation>Nueva estación</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>%1 Station</source>
         <translation>%1 estación</translation>
     </message>
@@ -373,12 +346,12 @@
 <context>
     <name>CategoryItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="63"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
         <source>Playlists</source>
         <translation>Listas de reproducción</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="65"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
         <source>Stations</source>
         <translation>Estaciones</translation>
     </message>
@@ -386,33 +359,12 @@
 <context>
     <name>ClearButton</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/clearbutton.cpp" line="38"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
         <source>Clear</source>
         <translation>Limpiar</translation>
     </message>
 </context>
 <context>
-    <name>CollectionFlatModel</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="72"/>
-        <source>My Collection</source>
-        <translation>Mi colección</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="74"/>
-        <source>Collection of %1</source>
-        <translation>Colección de %1</translation>
-    </message>
-</context>
-<context>
-    <name>CollectionView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionview.cpp" line="85"/>
-        <source>This collection is empty.</source>
-        <translation>Esta colección está vacía.</translation>
-    </message>
-</context>
-<context>
     <name>ContextWidget</name>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
@@ -421,12 +373,12 @@
     </message>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="344"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
         <source>Show Footnotes</source>
         <translation>Mostrar información de contexto</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="338"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
         <source>Hide Footnotes</source>
         <translation>Ocultar información de contexto</translation>
     </message>
@@ -438,39 +390,49 @@
         <source>Tomahawk Crash Reporter</source>
         <translation>Reportador de fallos de Tomahawk</translation>
     </message>
-    <message>
+    <message utf8="true">
         <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
-        <source>&lt;p&gt;&lt;b&gt;Sorry!&lt;/b&gt;&amp;nbsp;Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;b&gt;¡Ups!&lt;/b&gt;&amp;nbsp;Tomahawk ha fallado. La información acerca del fallo se enviará a Tomahawk HQ para que podamos solucionar el error.&lt;/p&gt;</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="172"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="192"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
         <source>You can disable sending crash reports in the configuration dialog.</source>
         <translation>Puede desactivar el envío de informes de error en el diálogo de configuración.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="153"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
         <source>Uploaded %L1 of %L2 KB.</source>
         <translation>Subidos %L1 of %L2 KBs.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="167"/>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="183"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="176"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
         <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
         <translation>¡Enviado!&lt;b&gt;Muchas gracias&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
         <source>Failed to send crash info.</source>
         <translation>Error al enviar la información del fallo.</translation>
     </message>
@@ -478,7 +440,7 @@
 <context>
     <name>DatabaseCommand_AllAlbums</name>
     <message>
-        <location filename="../src/libtomahawk/database/databasecommand_allalbums.cpp" line="109"/>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -486,43 +448,45 @@
 <context>
     <name>DelegateConfigWrapper</name>
     <message>
-        <location filename="../src/delegateconfigwrapper.cpp" line="61"/>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation>Acerca de</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
         <source>Delete Account</source>
-        <translation type="unfinished"/>
+        <translation>Eliminar Cuenta</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>Acerca de esta Cuenta</translation>
     </message>
 </context>
 <context>
     <name>DiagnosticsDialog</name>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="20"/>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
         <source>Tomahawk Diagnostics</source>
         <translation>Diagnósticos de Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="38"/>
-        <source>Update</source>
-        <translation>Actualizar</translation>
-    </message>
-    <message>
-        <location filename="../src/diagnosticsdialog.ui" line="45"/>
-        <source>Copy to Clipboard</source>
-        <translation>Copiar al portapapeles</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DropJob</name>
     <message>
-        <location filename="../src/libtomahawk/dropjob.cpp" line="832"/>
-        <source>No tracks found for given %1</source>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GlobalSearchWidget</name>
     <message>
-        <location filename="../src/searchbox.ui" line="14"/>
+        <location filename="../src/SearchBox.ui" line="14"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation>Formulario</translation>
     </message>
 </context>
 <context>
@@ -530,70 +494,52 @@
     <message>
         <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
         <source>Indexing database</source>
-        <translation type="unfinished"/>
+        <translation>Indexando la base de datos</translation>
     </message>
 </context>
 <context>
     <name>InfoBar</name>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.ui" line="26"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Barra de información</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="87"/>
-        <source>Automatically update</source>
-        <translation>Actualizar automáticamente</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="95"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
         <source>Filter...</source>
         <translation>Filtro...</translation>
     </message>
 </context>
 <context>
-    <name>JobStatusView</name>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Searching For</source>
-        <translation>Buscando por</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Pending</source>
-        <translation>Pendiente</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="94"/>
-        <source>Idle</source>
-        <translation>Ocupado</translation>
-    </message>
-</context>
-<context>
     <name>LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
         <source>Scrobble tracks to Last.fm</source>
-        <translation type="unfinished"/>
+        <translation>Hacer scrobble a las pistas en Last.fm</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
         <source>Username:</source>
-        <translation type="unfinished"/>
+        <translation>Usuario:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
         <source>Password:</source>
-        <translation type="unfinished"/>
+        <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
         <source>Test Login</source>
+        <translation>Probar conexión</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -609,8 +555,8 @@
     <name>LatchedStatusItem</name>
     <message>
         <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
-        <source>%1 is listening along to you!</source>
-        <translation>¡%1 está escuchando junto a usted!</translation>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -623,7 +569,7 @@
     <message>
         <location filename="../src/LoadXSPFDialog.ui" line="22"/>
         <source>Playlist URL</source>
-        <translation type="unfinished"/>
+        <translation>URL de lista de reproducción</translation>
     </message>
     <message>
         <location filename="../src/LoadXSPFDialog.ui" line="29"/>
@@ -644,12 +590,12 @@
 <context>
     <name>LoadXSPFDialog</name>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>Load XSPF File</source>
         <translation>Cargar archivo XSPF</translation>
     </message>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>XSPF Files (*.xspf)</source>
         <translation>Archivos XSPF (*.xspf)</translation>
     </message>
@@ -657,53 +603,256 @@
 <context>
     <name>LocalCollection</name>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Bookmarks</source>
         <translation>Favoritos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Saved tracks</source>
         <translation>Pistas guardadas</translation>
     </message>
 </context>
 <context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>NewPlaylistWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="20"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
         <source>Enter a title for the new playlist:</source>
         <translation>Introduzca un nombre para la nueva lista de reproducción:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
         <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
         <translation>¡Tomahawk le ofrece varias maneras para ayudarle a crear listas de reproducción y encontrar la música que le guste!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="47"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
         <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>Introduzca un género o tag y Tomahawk le sugerirá unas cuantas canciones para comenzar su nueva lista de reproducción:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.cpp" line="43"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
         <source>&amp;Create Playlist</source>
         <translation>&amp;Crear lista de reproducción</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.h" line="50"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
         <source>Create a new playlist</source>
         <translation>Crear una nueva lista de reproducción</translation>
     </message>
 </context>
 <context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>Últimas novedades</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PlaylistItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="162"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
         <source>played %1 by you</source>
         <translation>%1 reproducido por usted </translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="164"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
         <source>played %1 by %2</source>
         <translation>%1 reproducido por %2</translation>
     </message>
@@ -711,40 +860,40 @@
 <context>
     <name>PlaylistLargeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="156"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
         <source>played %1 by you</source>
-        <translation type="unfinished"/>
+        <translation>%1 reproducido por usted </translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
         <source>played %1 by %2</source>
-        <translation type="unfinished"/>
+        <translation>%1 reproducido por %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="165"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
         <source>added %1</source>
-        <translation type="unfinished"/>
+        <translation>añadio %1</translation>
     </message>
 </context>
 <context>
     <name>PlaylistModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
         <source>A playlist by %1, created %2</source>
         <translation>Una lista de reproducción de %1, creada %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="78"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
         <source>you</source>
         <translation>usted</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
         <source>All tracks by %1 on album %2</source>
         <translation>Todas las pistas de %1 en el álbum %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="152"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
         <source>All tracks by %1</source>
         <translation>Todas las pistas de %1</translation>
     </message>
@@ -752,37 +901,37 @@
 <context>
     <name>PlaylistTypeSelectorDlg</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="32"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
         <source>New Playlist</source>
         <translation>Nueva lista de reproducción</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="49"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
         <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
         <translation>Sólo una lista de reproducción normal... ¡Póngale un nombre, añada algunas pistas, y comience!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="75"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
         <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
         <translation>¿No sabe exactamente lo que desea? ¡Dele a Tomahawk algunas indicaciones y déjele construir una lista de reproducción para usted!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="92"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="102"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
         <source>New Playlist...</source>
         <translation>Nueva lista de reproducción...</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="113"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
         <source>Create Manual Playlist</source>
         <translation>Crear lista de reproducción manual</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="123"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
         <source>Create Automatic Playlist</source>
         <translation>Crear lista de reproducción automática</translation>
     </message>
@@ -790,7 +939,12 @@
 <context>
     <name>PlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistview.cpp" line="145"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
         <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
         <translation>Esta lista de reproducción está vacía. ¡Añada algunas pistas y disfrute de la música!</translation>
     </message>
@@ -798,63 +952,58 @@
 <context>
     <name>ProxyDialog</name>
     <message>
-        <location filename="../src/proxydialog.ui" line="17"/>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
         <source>Proxy Settings</source>
         <translation>Configuración del proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="70"/>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
         <source>Hostname of proxy server</source>
         <translation>Hostname del servidor proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="77"/>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="84"/>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="104"/>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
         <source>Proxy login</source>
         <translation>Proxy login</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="111"/>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="118"/>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="128"/>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
         <source>Proxy password</source>
         <translation>Contraseña del proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="135"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../src/proxydialog.ui" line="142"/>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
         <source>No Proxy Hosts:
 (Overrides system proxy)</source>
-        <translation type="unfinished"/>
+        <translation>Sin proxy (Sobreescribe el proxy del sistema)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="150"/>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
         <source>localhost *.example.com (space separated)</source>
         <translation>localhost *.ejemplo.com (separados por espacios)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="167"/>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
         <source>Use proxy for DNS lookups?</source>
         <translation>¿Usar proxy para búsquedas DNS?</translation>
     </message>
@@ -862,84 +1011,84 @@
 <context>
     <name>QObject</name>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="214"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
         <source>%n year(s) ago</source>
         <translation><numerusform>hace %n año</numerusform><numerusform>hace%n años</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="216"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
         <source>%n year(s)</source>
         <translation><numerusform>%n año</numerusform><numerusform>%n años</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="222"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
         <source>%n month(s) ago</source>
         <translation><numerusform>hace %n mes</numerusform><numerusform>hace %n meses</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
         <source>%n month(s)</source>
         <translation><numerusform>%n mes</numerusform><numerusform>%n meses</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="230"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
         <source>%n week(s) ago</source>
         <translation><numerusform>hace %n semana</numerusform><numerusform>hace %n semanas</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="232"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
         <source>%n week(s)</source>
         <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="238"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>hace %n día</numerusform><numerusform>hace %n días</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="240"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
         <source>%n day(s)</source>
         <translation><numerusform>%n día</numerusform><numerusform>%n días</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="246"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>hace %n hora</numerusform><numerusform>hace %n horas</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="248"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
         <source>%n hour(s)</source>
         <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="254"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
         <source>%1 minutes ago</source>
         <translation>hace %1 minutos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="256"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
         <source>%1 minutes</source>
         <translation>%1 minutos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="260"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
         <source>just now</source>
         <translation>justo ahora</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="34"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
         <source>Friend Finders</source>
-        <translation type="unfinished"/>
+        <translation>Buscador de amigos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
         <source>Music Finders</source>
-        <translation type="unfinished"/>
+        <translation>Buscador de musica</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="39"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
         <source>Status Updaters</source>
-        <translation type="unfinished"/>
+        <translation>Actualizadores de estado</translation>
     </message>
 </context>
 <context>
@@ -953,26 +1102,31 @@
 <context>
     <name>QueueView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="26"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
         <source>InfoBar</source>
         <translation>InfoBar</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="41"/>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="120"/>
-        <source>Show Queue</source>
-        <translation>Mostrar cola</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="130"/>
-        <source>Hide Queue</source>
-        <translation>Ocultar cola</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RelatedArtistsContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
         <source>Related Artists</source>
         <translation>Artistas relacionados</translation>
     </message>
@@ -980,12 +1134,12 @@
 <context>
     <name>ResolverConfigDelegate</name>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="110"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
         <source>Not found: %1</source>
         <translation>No encontrado: %1</translation>
     </message>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="113"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
         <source>Failed to load: %1</source>
         <translation>Fallo al cargar: %1</translation>
     </message>
@@ -993,7 +1147,7 @@
 <context>
     <name>SearchLineEdit</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/searchlineedit.cpp" line="58"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
@@ -1001,12 +1155,12 @@
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="54"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
         <source>Search: %1</source>
         <translation>Buscar: %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="55"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
         <source>Results for &apos;%1&apos;</source>
         <translation>Resultados para &apos;%1&apos;</translation>
     </message>
@@ -1014,39 +1168,49 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="245"/>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
         <source>Collection</source>
         <translation>Colección</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="252"/>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="124"/>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
         <source>All</source>
-        <translation type="unfinished"/>
+        <translation>Todo</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation>Algunos cambios no tomarán efecto hasta reiniciar Tomahawk </translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="238"/>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
         <source>Services</source>
-        <translation type="unfinished"/>
+        <translation>Servicios</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="396"/>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
         <source>Install resolver from file</source>
+        <translation>Instalar un Resolver desde un fichero</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Information</source>
-        <translation>Información</translation>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Changing this setting requires a restart of Tomahawk!</source>
-        <translation>¡Cambiar esta configuración requiere el reinicio de Tomahawk!</translation>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>Información</translation>
     </message>
 </context>
 <context>
@@ -1068,89 +1232,127 @@
     </message>
 </context>
 <context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>Portada</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation>%1 caracteres restantes</translation>
+    </message>
+</context>
+<context>
     <name>SourceDelegate</name>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="55"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
         <source>Track</source>
-        <translation>Pista</translation>
+        <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="56"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
         <source>Album</source>
         <translation>Álbum</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="57"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
         <source>Artist</source>
         <translation>Artista</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="58"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="59"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
         <source>Top 10</source>
         <translation>Top 10</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="187"/>
-        <source>Offline</source>
-        <translation>Desconectado</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
         <source>All available tracks</source>
         <translation>Todas las pistas disponibles</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="196"/>
-        <source>Online</source>
-        <translation>Conectado</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="289"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="330"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
         <source>Show</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="291"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="332"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
         <source>Hide</source>
-        <translation type="unfinished"/>
+        <translation>Ocultar</translation>
     </message>
 </context>
 <context>
     <name>SourceInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="30"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
         <source>Recent Albums</source>
         <translation>Álbumes recientes</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="74"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
         <source>Latest Additions</source>
         <translation>Añadido recientemente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="88"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
         <source>Recently Played Tracks</source>
         <translation>Pistas reproducidas recientemente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="80"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
         <source>New Additions</source>
         <translation>Nuevas adiciones</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="83"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
         <source>My recent activity</source>
         <translation>Mi actividad reciente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="87"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
         <source>Recent activity from %1</source>
         <translation>Actividad reciente de %1</translation>
     </message>
@@ -1158,55 +1360,128 @@
 <context>
     <name>SourceItem</name>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="65"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
         <source>Collection</source>
-        <translation type="unfinished"/>
+        <translation>Colección</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="73"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
         <source>Latest Additions</source>
-        <translation type="unfinished"/>
+        <translation>Añadidos recientemente</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="77"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
         <source>Recently Played</source>
-        <translation type="unfinished"/>
+        <translation>Reproducido recientemente</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="81"/>
-        <source>Loved Tracks</source>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation>SuperColección</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation>Últimas novedades en mi colección</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation>Últimas novedadoes en la colección de %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="146"/>
-        <source>SuperCollection</source>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation>Temas Escuchados Recientemente</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation>Mis canciones escuchadas recientemente</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation>Las canciones escuchadas recientemente por %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SourceTreeView</name>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="188"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
         <source>&amp;Copy Link</source>
         <translation>&amp;Copiar enlace</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
         <source>&amp;Delete %1</source>
         <translation>&amp;Eliminar %1</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="207"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
         <source>&amp;Export Playlist</source>
         <translation>&amp;Exportar lista de reproducción</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="341"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
         <source>Save XSPF</source>
         <translation>Guardar XSPF</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="342"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
         <source>Playlists (*.xspf)</source>
         <translation>Listas de reproducción (*.xspf)</translation>
     </message>
@@ -1214,138 +1489,166 @@
 <context>
     <name>SourcesModel</name>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="78"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
         <source>Group</source>
-        <translation type="unfinished"/>
+        <translation>Grupo</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="81"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
         <source>Collection</source>
         <translation>Colección</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="84"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
         <source>Playlist</source>
         <translation>Lista de reproducción</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="87"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
         <source>Automatic Playlist</source>
         <translation>Lista de reproducción automática</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="90"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
         <source>Station</source>
         <translation>Estación</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="268"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
         <source>Browse</source>
-        <translation type="unfinished"/>
+        <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="269"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
         <source>Search History</source>
-        <translation type="unfinished"/>
+        <translation>Historial de Búsqueda</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="271"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
         <source>My Music</source>
-        <translation type="unfinished"/>
+        <translation>Mi Musica</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="279"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
         <source>SuperCollection</source>
-        <translation type="unfinished"/>
+        <translation>SuperColección</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="285"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
         <source>Top Loved Tracks</source>
-        <translation type="unfinished"/>
+        <translation>Pistas favoritas</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="273"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
         <source>Dashboard</source>
-        <translation type="unfinished"/>
+        <translation>Panel de inicio</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="290"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
         <source>Recently Played</source>
-        <translation type="unfinished"/>
+        <translation>Reproducido recientemente</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
         <source>Charts</source>
-        <translation type="unfinished"/>
+        <translation>Listas</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>Últimas novedades</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="300"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
         <source>Friends</source>
-        <translation type="unfinished"/>
+        <translation>Amigos</translation>
     </message>
 </context>
 <context>
     <name>SpotifyConfig</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="48"/>
-        <source>Configure your Spotify credentials</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation>Configura tu cuenta de Spotify</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="65"/>
-        <source>Username:</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation>Usurio o dirección de correo de Facebook</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="72"/>
-        <source>placeholderUsername</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>Inciar Sesión</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
-        <source>Password:</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation>Click derecho en cualquier lista de Tomahawk para sincronizar con Spotify.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="86"/>
-        <source>placeholderPw</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation>Streams de Alta Calidad</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="116"/>
-        <source>High Quality Streaming</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation>Listas de Spotify a mantener sincronizadas:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="186"/>
-        <source>This product uses SPOTIFY(R) CORE but is not endorsed, certified or otherwise approved in any way by Spotify. Spotify is the registered trade mark of the Spotify Group.</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation>Borra las listas de Tomahawk cuando se quiten de la sincronización</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>Usuario:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>Contraseña:</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation>¿Borrar en Spotify?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation>Quieres eliminar la lista de Spotify correspondiente, también?</translation>
     </message>
 </context>
 <context>
     <name>StackedSettingsDialog</name>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="14"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
         <source>Tomahawk Settings</source>
         <translation>Preferencias de Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="158"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
         <source>Local Music Information</source>
         <translation>Información de música local</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="166"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
         <source>Path to scan for music files:</source>
         <translation>Ruta para escanear archivos de música:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="180"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
         <source>The Echo Nest supports keeping track of your catalog metadata
  and using it to craft personalized radios. Enabling this option
  will allow you (and all your friends) to create automatic playlists
@@ -1356,433 +1659,595 @@
 y estaciones basadas en sus gustos personales.</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="186"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
         <source>Upload collection list to The Echo Nest to enable user radio</source>
         <translation>Subir la lista de colección a Echo Nest para activar la radio del usuario</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="199"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
         <source>Watch for changes</source>
         <translation>Vigilar los cambios en las carpetas</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="208"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
         <source>Time between scans, in seconds:</source>
         <translation>Tiempo entre escaneo, en segundos:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="98"/>
-        <source>Internet Services</source>
-        <translation type="unfinished"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation>Ajustes avanzados</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="109"/>
-        <source>Install from file...</source>
-        <translation type="unfinished"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation>Método de conexión remota</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="129"/>
-        <source>Filter by capability:</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation>Ninguna (sólo conexiones salientes)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation>Usar UPnP para establecer la redirección de puertos (recomendado)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation>Usar IP estática externa/nombre de host y puero</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation>Ajustar a la dirección IP externa o nombre de la máquina. Hay que redirigir los puertos a esta máquina!</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation>Proxy SOCKS</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation>Utilizar el Proxy SOCKS</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="245"/>
-        <source>Advanced Network Settings</source>
-        <translation>Configuración avanzada de red</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation>Servicios de Internet</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation>Instalar desde un fichero...</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="265"/>
-        <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>Si tiene dificultades para conectarse con los pares, intente establecer su dirección IP externa/nombre del host y el número de puerto (por defecto 50210). ¡Asegúrese de redireccionar ese puerto a esta máquina!</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation>Filtrar por capacidad:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="283"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
         <source>Static Host Name:</source>
         <translation>Nombre estático del host:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="299"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
         <source>Static Port:</source>
         <translation>Puerto estático:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="321"/>
-        <source>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</source>
-        <translation>¿Siempre usar nombre eśtático del host/puerto? (Sobreescribe descubrimiento UPnP/redirección de puertos)</translation>
-    </message>
-    <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="345"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
         <source>Proxy Settings...</source>
         <translation>Configuración del proxy...</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="383"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation>Otros Ajustes</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
         <source>Send reports after Tomahawk crashed</source>
         <translation>Mandar reportes después de que Tomahawk falle</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="396"/>
-        <source>Allow web browsers to interact with Tomahawk</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation>Permitir a los navegadores web interactuar con Tomahawk (recomendado)</translation>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="409"/>
-        <source>Use UPnP to establish port forward</source>
-        <translation>Utilizar UPnP para establecer redirección de puertos</translation>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::AccountDelegate</name>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="200"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
         <source>Add Account</source>
-        <translation type="unfinished"/>
+        <translation>Añadir Cuenta</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="250"/>
-        <source>Remove Account</source>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="360"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
         <source>%1 downloads</source>
-        <translation type="unfinished"/>
+        <translation>%1 descargas</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="585"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
         <source>Online</source>
-        <translation type="unfinished"/>
+        <translation>Conectado</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="590"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
         <source>Connecting...</source>
-        <translation type="unfinished"/>
+        <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="595"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
         <source>Offline</source>
+        <translation>Desconectado</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapper</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="82"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
         <source>Configure this Google Account</source>
-        <translation type="unfinished"/>
+        <translation>Configura esta Cuenta Google</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
         <source>Google Address</source>
-        <translation type="unfinished"/>
+        <translation>Dirección de correo Google</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="84"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
         <source>Enter your Google login to connect with your friends using Tomahawk!</source>
-        <translation type="unfinished"/>
+        <translation>Introducir los datos de la cuenta Google para contectar con los amigos que usen Tomahawk!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="85"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
         <source>username@gmail.com</source>
-        <translation type="unfinished"/>
+        <translation>usuario@gmail.com</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.h" line="42"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
         <source>Connect to Google Talk to find your friends</source>
-        <translation type="unfinished"/>
+        <translation>Conectarse a Google Talk y encontrar mis amigos</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperSip</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="61"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
         <source>Add Friend</source>
-        <translation type="unfinished"/>
+        <translation>Añadir Amigo</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
         <source>Enter Google Address:</source>
-        <translation type="unfinished"/>
+        <translation>Introducir la dirección de correo de Google:</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::LastFmAccountFactory</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmAccount.h" line="47"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
         <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
-        <translation type="unfinished"/>
+        <translation>Hacer Scrobble de mis temas a last.fm y encontrar canciones gratuitas para reproducirlas</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="108"/>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="123"/>
-        <source>Failed</source>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="113"/>
-        <source>Success</source>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation>Comprobar Inicio de Sesión</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="129"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
+        <source>Failed</source>
+        <translation>Fallo</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
+        <source>Success</source>
+        <translation>Éxito</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
         <source>Could not contact server</source>
+        <translation>No se pudo contactar el servidor</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation>Sincronizar con Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation>Dejar de sincronizar con Spotify</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>Inciando sesión...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation>Fallo: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>Iniciar Sesión</translation>
+    </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccount.h" line="44"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
         <source>Play music from and sync your playlists with Spotify Premium</source>
-        <translation type="unfinished"/>
+        <translation>Reproduce música de Spotofy Premium y sincroniza las listas de reprodución</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::TwitterAccountFactory</name>
     <message>
-        <location filename="../src/accounts/twitter/twitteraccount.h" line="50"/>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
         <source>Connect to your Twitter followers.</source>
-        <translation type="unfinished"/>
+        <translation>Conectar con los seguidores de Twitter.</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="58"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="141"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="189"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
         <source>Tweet!</source>
-        <translation type="unfinished"/>
+        <translation>Twittear!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="66"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="167"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
         <source>Status: No saved credentials</source>
-        <translation type="unfinished"/>
+        <translation>Estado: Credenciales no guardadas</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="67"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="92"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="168"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
         <source>Authenticate</source>
-        <translation type="unfinished"/>
+        <translation>Autenticar</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="74"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="136"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
         <source>Status: Credentials saved for %1</source>
-        <translation type="unfinished"/>
+        <translation>Estado: Credenciales de %1 guardadas</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="75"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
         <source>De-authenticate</source>
-        <translation type="unfinished"/>
+        <translation>Desautenticar</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>Tweetin&apos; Error</source>
-        <translation type="unfinished"/>
+        <translation>Error al Twittear</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
         <source>The credentials could not be verified.
 You may wish to try re-authenticating.</source>
-        <translation type="unfinished"/>
+        <translation>Las credencials no se han podido verificar.
+Hay que volver a intentar la autenticación.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="152"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
         <source>Status: Error validating credentials</source>
-        <translation type="unfinished"/>
+        <translation>Estado: Error al validar las credenciales</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="179"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
         <source>Global Tweet</source>
-        <translation type="unfinished"/>
+        <translation>Tweet Global</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="184"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
         <source>Direct Message</source>
-        <translation type="unfinished"/>
+        <translation>Mensaje Directo</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="185"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
         <source>Send Message!</source>
-        <translation type="unfinished"/>
+        <translation>Enviar Mensaje!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="186"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
         <source>@Mention</source>
-        <translation type="unfinished"/>
+        <translation>@Mención</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="187"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
         <source>Send Mention!</source>
-        <translation type="unfinished"/>
+        <translation>Enviar Mención!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
         <source>You must enter a user name for this type of tweet.</source>
-        <translation type="unfinished"/>
+        <translation>Hay que introducir un nombre de usuario para este tipo de tweet.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
         <source>Your saved credentials could not be loaded.
 You may wish to try re-authenticating.</source>
-        <translation type="unfinished"/>
+        <translation>Las credenciales guardadas no se han podido cargar.
+Hay que volverse a autenticar.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
         <source>Your saved credentials could not be verified.
 You may wish to try re-authenticating.</source>
-        <translation type="unfinished"/>
+        <translation>Las credenciales guardadas no se han podido verificar.
+Hay que volverse a autenticar.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>There was an error posting your status -- sorry!</source>
-        <translation type="unfinished"/>
+        <translation>Error publicando el estado!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Tweeted!</source>
-        <translation type="unfinished"/>
+        <translation>Twitteado!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
         <source>Your tweet has been posted!</source>
-        <translation type="unfinished"/>
+        <translation>El tweet se ha publicado!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
         <source>There was an error posting your direct message -- sorry!</source>
-        <translation type="unfinished"/>
+        <translation>Error publicando el mensahe directo!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Your message has been posted!</source>
-        <translation type="unfinished"/>
+        <translation>El mensaje se ha publicado!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::XmppAccountFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppaccount.h" line="51"/>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
         <source>Log on to your Jabber/XMPP account to connect to your friends</source>
-        <translation type="unfinished"/>
+        <translation>Inciar sesón en Jabber/XMPP para conectar con mis amigos</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::ZeroconfFactory</name>
     <message>
-        <location filename="../src/accounts/zeroconf/zeroconfaccount.h" line="42"/>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
         <source>Automatically connect to Tomahawks on the local network</source>
-        <translation type="unfinished"/>
+        <translation>Conectarse automáticament a los Tomahawks de la red local</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::ContextMenu</name>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="79"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
         <source>&amp;Play</source>
         <translation>&amp;Reproducir</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="82"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="142"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="181"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
         <source>Add to &amp;Queue</source>
         <translation>Añadir a la &amp;cola</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="87"/>
-        <source>&amp;Continue playback after this track</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="89"/>
-        <source>&amp;Stop playback after this track</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="96"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="277"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
         <source>&amp;Love</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Favorito</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
         <source>&amp;Copy Track Link</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Copiar enlace del Tema</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="139"/>
-        <source>Show &amp;Album page</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="178"/>
-        <source>Show &amp;Artist page</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="272"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
         <source>Un-&amp;Love</source>
-        <translation type="unfinished"/>
+        <translation>Quitar de &amp;Favoritos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Items</source>
         <translation>&amp;Eliminar de la cola</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Item</source>
         <translation>&amp;Eliminar de la cola</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Tomahawk::CustomPlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="123"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
         <source>Top Loved Tracks</source>
         <translation>Pistas favoritas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="127"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
         <source>Your loved tracks</source>
         <translation>Tus pistas favoritas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="129"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
         <source>%1&apos;s loved tracks</source>
         <translation>Pistas favoritas de %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="138"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
         <source>The most loved tracks from all your friends</source>
         <translation>Las pistas favoritas de tus amigos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="142"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
         <source>All of your loved tracks</source>
         <translation>Todas tus pistas favoritas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
         <source>All of %1&apos;s loved tracks</source>
         <translation>Todas las pistas favoritas de %1</translation>
     </message>
@@ -1790,12 +2255,32 @@
 <context>
     <name>Tomahawk::DropJobNotifier</name>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="102"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
         <source>Fetching %1 from database</source>
         <translation>Obteniendo %1 de la base de datos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="106"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
         <source>Parsing %1 %2</source>
         <translation>Analizando %1 %2</translation>
     </message>
@@ -1803,7 +2288,7 @@
 <context>
     <name>Tomahawk::DynamicControlList</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
         <source>Click to collapse</source>
         <translation>Click para contraer</translation>
     </message>
@@ -1842,17 +2327,17 @@
 <context>
     <name>Tomahawk::DynamicView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
         <source>Add some filters above to seed this station!</source>
         <translation>¡Añada algunos filtros para la estación!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="149"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
         <source>Press Generate to get started!</source>
         <translation>¡Seleccione Generar para comenzar!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="151"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
         <source>Add some filters above, and press Generate to get started!</source>
         <translation>¡Añada algunos filtros, y seleccione Generar para comenzar!</translation>
     </message>
@@ -1864,7 +2349,9 @@
         <source>Station ran out of tracks!
 
 Try tweaking the filters for a new set of songs to play.</source>
-        <translation type="unfinished"/>
+        <translation>La Emisora se ha quedado sin temas!
+
+Intente ajustar los filtros para reproducir nuevas canciones.</translation>
     </message>
 </context>
 <context>
@@ -2172,97 +2659,97 @@
 <context>
     <name>Tomahawk::EchonestSteerer</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="57"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
         <source>Steer this station:</source>
         <translation>Dirigir esta estación:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="71"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
         <source>Much less</source>
         <translation>Mucho menos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="72"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
         <source>Less</source>
         <translation>Menos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="73"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
         <source>A bit less</source>
         <translation>Un poco menos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="74"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
         <source>Keep at current</source>
         <translation>Mantener en el actual</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="75"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
         <source>A bit more</source>
         <translation>Un poco más</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="76"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
         <source>More</source>
         <translation>Más</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
         <source>Much more</source>
         <translation>Mucho más</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="80"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
         <source>Loudness</source>
         <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
         <source>Danceability</source>
         <translation>Bailabilidad</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
         <source>Energy</source>
         <translation>Energía</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
         <source>Song Hotttnesss</source>
         <translation>Popularidad de la pista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
         <source>Artist Hotttnesss</source>
         <translation>Popularidad del artista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
         <source>Artist Familiarity</source>
         <translation>Familiaridad del artista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
         <source>By Description</source>
         <translation>Por descripción</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
         <source>Enter a description</source>
         <translation>Introducir una descripción</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="102"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
         <source>Apply steering command</source>
         <translation>Aplicar comando</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="108"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
         <source>Reset all steering commands</source>
         <translation>Resetear todos los comandos</translation>
     </message>
@@ -2270,94 +2757,123 @@
 <context>
     <name>Tomahawk::GroovesharkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/groovesharkparser.cpp" line="255"/>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
         <source>Error fetching Grooveshark information from the network!</source>
-        <translation type="unfinished"/>
+        <translation>Error al buscar la información de Grooveshar en la red!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::InfoSystem::ChartsPlugin</name>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="307"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
         <source>Top Overall</source>
         <translation>Top total</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="396"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
         <source>Artists</source>
         <translation>Artistas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="398"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
         <source>Albums</source>
         <translation>Álbumes</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="400"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
         <source>Tracks</source>
         <translation>Pistas</translation>
     </message>
 </context>
 <context>
-    <name>Tomahawk::InfoSystem::LastFmPlugin</name>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation>Tomahawk está reproduciendo &quot;%1&quot; de %2%3.</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation>en &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
         <source>Top Tracks</source>
-        <translation>Pistas más escuchadas</translation>
+        <translation>Temas más escuchados</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
         <source>Loved Tracks</source>
-        <translation>Pistas favoritas</translation>
+        <translation>Temas Favoritos</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
         <source>Hyped Tracks</source>
-        <translation>Pistas en alza</translation>
+        <translation>Temas a la alza</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
         <source>Top Artists</source>
         <translation>Artistas más escuchados</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
         <source>Hyped Artists</source>
-        <translation>Artistas en alza</translation>
+        <translation>Artistas a la alza</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>Álbumes</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation>Escuchando &quot;%1&quot; de %2 y me encanta! %3</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::ItunesParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/itunesparser.cpp" line="170"/>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
         <source>Error fetching iTunes information from the network!</source>
-        <translation type="unfinished"/>
+        <translation>Error al buscar la información de iTunes en la red!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::JSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="137"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
         <source>New Playlist</source>
         <translation>Nueva lista de reproducción</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Failed to save tracks</source>
         <translation>Fallo al guardar pistas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation>Algunas pistas en la lista de reproducción no contienen artista ni título. Éstas serán ignoradas.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>XSPF Error</source>
         <translation>Error XSPF</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>Esta no es una lista de reproducción XSPF válida.</translation>
     </message>
@@ -2379,103 +2895,121 @@
 <context>
     <name>Tomahawk::Query</name>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="637"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
         <source> and </source>
-        <translation type="unfinished"/>
+        <translation>y</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="645"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
         <source>You</source>
-        <translation type="unfinished"/>
+        <translation>usted</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="647"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
         <source>you</source>
-        <translation type="unfinished"/>
+        <translation>usted</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>and</source>
-        <translation type="unfinished"/>
+        <translation>y</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>%n other(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n más</numerusform><numerusform>%n más</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="659"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
         <source>%1 people</source>
-        <translation type="unfinished"/>
+        <translation>%1 personas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="661"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
         <source>loved this track</source>
-        <translation type="unfinished"/>
+        <translation>han añadido este tema a Favoritos</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::RdioParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/rdioparser.cpp" line="193"/>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
         <source>Error fetching Rdio information from the network!</source>
-        <translation type="unfinished"/>
+        <translation>Error al buscar la información de Rdio en la red!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::ShortenedLinkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/shortenedlinkparser.cpp" line="96"/>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
         <source>Network error parsing shortened link!</source>
-        <translation type="unfinished"/>
+        <translation>Error en la red al analizar el enlace acortado!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Source</name>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="242"/>
-        <location filename="../src/libtomahawk/source.cpp" line="293"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
         <source>Scanning (%L1 tracks)</source>
         <translation>Escaneando (%L1 pistas)</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="244"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
         <source>Scanning</source>
-        <translation type="unfinished"/>
+        <translation>Escaneando</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="278"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
         <source>Checking</source>
         <translation>Comprobando</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="283"/>
-        <source>Fetching</source>
-        <translation>Obteniendo</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="288"/>
-        <source>Parsing</source>
-        <translation>Analizando</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="417"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
         <source>Saving (%1%)</source>
         <translation>Guardando (%1%)</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Tomahawk::SpotifyParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/spotifyparser.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
         <source>Error fetching Spotify information from the network!</source>
-        <translation type="unfinished"/>
+        <translation>Error al buscar la información de Spotify en la red!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation>Actualizar automáticamente desde XSPF</translation>
     </message>
 </context>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/tomahawkapp.cpp" line="534"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Mi colección</translation>
     </message>
@@ -2483,12 +3017,12 @@
 <context>
     <name>TomahawkOAuthTwitter</name>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>Twitter PIN</source>
         <translation>PIN de Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>After authenticating on Twitter's web site,
 enter the displayed PIN number here:</source>
         <translation>Después de autenticarse en el sitio web de Twitter,
@@ -2498,464 +3032,466 @@
 <context>
     <name>TomahawkTrayIcon</name>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="59"/>
-        <location filename="../src/tomahawktrayicon.cpp" line="93"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation>&amp;Para la Reproducción después de este Tema</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
         <source>Hide Tomahawk Window</source>
         <translation>Ocultar ventana de Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="98"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
         <source>Show Tomahawk Window</source>
         <translation>Mostrar ventana de Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="158"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
         <source>Currently not playing.</source>
         <translation>Ninguna pista en reproducción.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="219"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="226"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
         <source>Pause</source>
         <translation>Pausar</translation>
     </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation>&amp;Continuar la Reproducción después de este Tema</translation>
+    </message>
 </context>
 <context>
     <name>TomahawkWindow</name>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="14"/>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
         <source>Tomahawk</source>
         <translation>Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="75"/>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
         <source>&amp;Settings</source>
         <translation>&amp;Configuración</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="81"/>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
         <source>&amp;Controls</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Controles</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="100"/>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
         <source>&amp;Network</source>
         <translation>&amp;Red</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="107"/>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
         <source>&amp;Window</source>
         <translation>&amp;Ventana</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="114"/>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="128"/>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="131"/>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="139"/>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
         <source>Go &amp;Online</source>
         <translation>&amp;Conectarse</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="144"/>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
         <source>Add &amp;Friend...</source>
         <translation>Añadir &amp;amigo...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="149"/>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
         <source>U&amp;pdate Collection</source>
         <translation>A&amp;ctualizar colección</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="152"/>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
         <source>Update Collection</source>
         <translation>Actualizar colección</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="157"/>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
         <source>&amp;Configure Tomahawk...</source>
         <translation>&amp;Configurar Tomahawk...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="165"/>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
         <source>Load &amp;XSPF...</source>
         <translation>Cargar &amp;XSPF...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="170"/>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
         <source>Create &amp;New Playlist...</source>
         <translation>Crear una &amp;nueva lista de reproducción...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="175"/>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
         <source>About &amp;Tomahawk...</source>
         <translation>Acerca de &amp;Tomahawk...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="183"/>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
         <source>Create New &amp;Automatic Playlist</source>
         <translation>Crear nueva &amp;lista de reproducción automática</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="188"/>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
         <source>Create New &amp;Station</source>
         <translation>Crear nueva &amp;estación</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="196"/>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
         <source>Show Offline Sources</source>
         <translation>Mostrar fuentes fuera de línea</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="201"/>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
         <source>Hide Offline Sources</source>
         <translation>Ocultar fuentes fuera de línea</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="206"/>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
         <source>Minimize</source>
         <translation>Minimizar</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="209"/>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="214"/>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="217"/>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
         <source>Meta+Ctrl+Z</source>
         <translation>Meta+Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="222"/>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
         <source>Diagnostics...</source>
         <translation>Diagnósticos...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="230"/>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
         <source>Fully &amp;Rescan Collection</source>
         <translation>&amp;Re-escanear completamente la colección</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="233"/>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
         <source>Fully Rescan Collection</source>
         <translation>Re-escanear completamente la colección</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="238"/>
-        <location filename="../src/tomahawkwindow.cpp" line="676"/>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="241"/>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
         <source>Space</source>
         <translation>Espacio</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="246"/>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="251"/>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="219"/>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
         <source>Global Search...</source>
         <translation>Búsqueda global...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="270"/>
-        <location filename="../src/tomahawkwindow.cpp" line="287"/>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
         <source>Check For Updates...</source>
         <translation>Buscar actualizaciones...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="449"/>
-        <location filename="../src/tomahawkwindow.cpp" line="456"/>
-        <location filename="../src/tomahawkwindow.cpp" line="464"/>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
         <source>Connect To Peer</source>
         <translation>Conectar a un par</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="450"/>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
         <source>Enter peer address:</source>
         <translation>Introducir dirección del par:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="457"/>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
         <source>Enter peer port:</source>
         <translation>Introducir puerto del par:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="465"/>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
         <source>Enter peer key:</source>
         <translation>Introducir contraseña del par:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>XSPF Error</source>
         <translation>Error XSPF</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>Esta no es una lista de reproducción XSPF válida.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Failed to save tracks</source>
         <translation>Fallo al guardar pistas</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation>Algunas pistas en la lista de reproducción no contienen artista ni título. Serán ignoradas.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="579"/>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
-        <translation type="unfinished"/>
+        <translation>Se ha producido un error al acceder al dispostivo de audio o al tema deseado y se va saltar. Asegúrese de que ha instalado un backend de Phonon adecuado y los plugins necesarios.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="581"/>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
+        <translation>Se ha producido un error al acceder al dispostivo de audio o al tema deseado y se va saltar.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Create New Station</source>
         <translation>Crear nueva estación</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
-        <source>New Station</source>
-        <translation>Nueva estación</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="650"/>
-        <source>New Playlist</source>
-        <translation>Nueva lista de reproducción</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="668"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
         <source>Pause</source>
         <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="691"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
         <source>Go &amp;offline</source>
         <translation>&amp;Desconectarse</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="698"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
         <source>Go &amp;online</source>
         <translation>&amp;Conectarse</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="720"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
         <source>Authentication Error</source>
         <translation>Error de autenticación</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="735"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
         <source>%1 by %2</source>
         <comment>track, artist name</comment>
         <translation>%1 por %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="736"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
         <source>%1 - %2</source>
         <comment>current track, some window title</comment>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="747"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="751"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="755"/>
-        <source>Copyright 2010 - 2012&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson</source>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="758"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
         <source>About Tomahawk</source>
         <translation>Acerca de Tomahawk</translation>
     </message>
 </context>
 <context>
-    <name>TopBar</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="26"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="66"/>
-        <source>0 Sources</source>
-        <translation>0 fuentes</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="89"/>
-        <source>0 Tracks</source>
-        <translation>0 pistas</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="112"/>
-        <source>0 Artists</source>
-        <translation>0 artistas</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="135"/>
-        <source>0 Shown</source>
-        <translation>0 mostradas</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="49"/>
-        <source>Tracks</source>
-        <translation>Pistas</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="50"/>
-        <source>Artists</source>
-        <translation>Artistas</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="54"/>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="84"/>
-        <source>Artist View</source>
-        <translation>Vista de artista</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="85"/>
-        <source>Flat View</source>
-        <translation>Vista simple</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="195"/>
-        <source>Sources</source>
-        <translation>Fuentes</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="247"/>
-        <source>Shown</source>
-        <translation>Mostradas</translation>
-    </message>
-</context>
-<context>
     <name>TopTracksContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
         <source>Top Hits</source>
         <translation>Grandes éxitos</translation>
     </message>
 </context>
 <context>
-    <name>TrackModel</name>
+    <name>TrackInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Artist</source>
-        <translation>Artista</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Title</source>
-        <translation>Título</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Album</source>
-        <translation>Álbum</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation>Portada</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
         <source>Track</source>
-        <translation>Pista</translation>
+        <translation>Tema</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Duration</source>
-        <translation>Duración</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation>Artista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Bitrate</source>
-        <translation>Bitrate</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation>Álbum</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Age</source>
-        <translation>Edad</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation>Estadísticas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Year</source>
-        <translation>Año</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation>Temas Similares</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Size</source>
-        <translation>Tamaño</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation><numerusform>Ha escuchado esta canción %n vez.</numerusform><numerusform>Ha escuchado esta canción %n veces.</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Origin</source>
-        <translation>Origen</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation>Nunca ha escuchado este tema antes.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Score</source>
-        <translation>Puntuación</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation>Escuchó este tema pro primera vez en %1.</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation><numerusform>Ha escuchado %1 %n vez.</numerusform><numerusform>Ha escuchado %1 %n veces.</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Composer</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation>Nunca ha escuchado %1 antes.</translation>
     </message>
 </context>
 <context>
     <name>TrackView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackview.cpp" line="493"/>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
         <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
         <translation>Lo siento, tu filtro &apos;%1&apos; no ha encontrado resultados.</translation>
     </message>
@@ -2976,7 +3512,7 @@
 <context>
     <name>TreeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treeitemdelegate.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
@@ -2984,92 +3520,60 @@
 <context>
     <name>TreeModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Duration</source>
-        <translation>Duración</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Bitrate</source>
-        <translation>Bitrate</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Age</source>
-        <translation>Edad</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Year</source>
-        <translation>Año</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Size</source>
-        <translation>Tamaño</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Origin</source>
-        <translation>Origen</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Composer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="585"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
         <source>All Artists</source>
         <translation>Todos los artistas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="699"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="724"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
         <source>My Collection</source>
         <translation>Mi colección</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="701"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="726"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
         <source>Collection of %1</source>
         <translation>Colección de %1</translation>
     </message>
 </context>
 <context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="73"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
         <source>Configure this Twitter account</source>
         <translation>Configurar esta cuenta de Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="119"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
         <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
         <translation>El plugin de Twitter le permite descubrir y reproducir música de sus amigos de Twitter que usen Tomahawk y además, publicar mensajes en tu cuenta.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
         <source>Status: No saved credentials</source>
         <translation>Estado: No hay credenciales guardadas</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="166"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
         <source>Authenticate with Twitter</source>
         <translation>Autenticarse con Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="196"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
         <source>Twitter Connections</source>
         <translation>Conexiones de Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
         <source>
 If you only want to post tweets, you're done.
 
@@ -3084,32 +3588,32 @@
 Puede reenviar el mensaje de sincronización en cualquier momento simplemente enviando otro tweet mediante el botón.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="244"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
         <source>Select the kind of tweet you would like, then press the button to post it:</source>
         <translation>Seleccione el tipo de tweet, y pulse el botón para enviarlo:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="276"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
         <source>Global Tweet</source>
         <translation>Tweet global</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="281"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
         <source>@Mention</source>
         <translation>@Mención</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="286"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
         <source>Direct Message</source>
         <translation>Mensaje directo</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="322"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
         <source>e.g. @tomahawk</source>
         <translation>p. ej. @tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="351"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
         <source>Send Message</source>
         <translation>Enviar mensaje</translation>
     </message>
@@ -3117,45 +3621,60 @@
 <context>
     <name>ViewManager</name>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="383"/>
-        <source>SuperCollection</source>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="384"/>
-        <source>Combined libraries of all your online friends</source>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="385"/>
-        <source>All available albums</source>
-        <translation>Todos los álbumes disponibles</translation>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
+        <source>SuperCollection</source>
+        <translation>SuperColección</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
+        <source>Combined libraries of all your online friends</source>
+        <translation>Bibliotecas combinadas de todos tus amigos conectados</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation>Temas Escuchados Recientemente</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation>Temas escuchados recientemente por mis amigos</translation>
     </message>
 </context>
 <context>
     <name>WelcomeWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="34"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
         <source>Recent Additions</source>
         <translation>Añadidos recientemente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
         <source>Newest Stations &amp; Playlists</source>
         <translation>Nuevas estaciones y listas de reproducción</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="70"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
         <source>Recently Played Tracks</source>
         <translation>Pistas reproducidas recientemente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.cpp" line="152"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
         <source>No recently created playlists in your network.</source>
         <translation>No hay listas de reproducción recientemente creadas en su red.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.h" line="90"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
         <source>Welcome to Tomahawk</source>
         <translation>Bienvenido a Tomahawk</translation>
     </message>
@@ -3163,7 +3682,7 @@
 <context>
     <name>WhatsHotWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/whatshotwidget.h" line="72"/>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
         <source>Charts</source>
         <translation>Listas de éxitos</translation>
     </message>
@@ -3179,7 +3698,7 @@
 <context>
     <name>XMPPBot</name>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="312"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
         <source>
 Terms for %1:
 </source>
@@ -3187,12 +3706,12 @@
 Términos de %1:</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="314"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
         <source>No terms found, sorry.</source>
         <translation>No se encuentran términos, lo siento.</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="347"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
         <source>
 Hotttness for %1: %2
 </source>
@@ -3201,7 +3720,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="363"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
         <source>
 Familiarity for %1: %2
 </source>
@@ -3210,7 +3729,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="381"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
         <source>
 Lyrics for &quot;%1&quot; by %2:
 
@@ -3226,22 +3745,22 @@
 <context>
     <name>XSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="49"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
         <source>Failed to parse contents of XSPF playlist</source>
-        <translation type="unfinished"/>
+        <translation>Error al analizar los contenidos de la lista XSPF</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="51"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
         <source>Some playlist entries were found without artist and track name, they will be omitted</source>
-        <translation type="unfinished"/>
+        <translation>Algunas entradas de la lista no tenía información de artista o de títul y serán omitidas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="53"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
         <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
-        <translation type="unfinished"/>
+        <translation>Error al buscar la lista deseada en la red, o el fichero no existe</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="188"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
         <source>New Playlist</source>
         <translation>Nueva lista de reproducción</translation>
     </message>
@@ -3249,78 +3768,78 @@
 <context>
     <name>XmlConsole</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
         <source>Xml stream console</source>
         <translation>Consola XML de stream</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="33"/>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="60"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="43"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
         <source>Save log</source>
         <translation>Guardar log</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
         <source>Disabled</source>
         <translation>Desactivado</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="65"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
         <source>By JID</source>
         <translation>Por JID</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="68"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
         <source>By namespace uri</source>
         <translation>Por uri de namespace</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="71"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
         <source>By all attributes</source>
         <translation>Por todos los atributos</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="76"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
         <source>Visible stanzas</source>
         <translation>Estrofas visibles</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="79"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
         <source>Information query</source>
         <translation>Consulta de información</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
         <source>Message</source>
         <translation>Mensaje</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="87"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
         <source>Presence</source>
         <translation>Presencia</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="91"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="107"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="358"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
         <source>Save XMPP log to file</source>
         <translation>Guardar XMPP log en un archivo</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
         <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
         <translation>Formato OpenDocument (*.odf);; archivo HTML (*.html);;texto plano (*.txt)</translation>
     </message>
@@ -3328,203 +3847,203 @@
 <context>
     <name>XmppConfigWidget</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
         <source>Xmpp Configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configuración XMPP</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="52"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
         <source>Configure this Xmpp account</source>
-        <translation type="unfinished"/>
+        <translation>Configurar esta cuenta XMPP</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="89"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
         <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
-        <translation type="unfinished"/>
+        <translation>Introduzca sus datos de inicio de sesión de XMPP para conectarse son sus amigos que usen Tomahawk!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="111"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
         <source>Login Information</source>
-        <translation type="unfinished"/>
+        <translation>Información de Inicio de Sesión</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="131"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
         <source>Xmpp ID:</source>
-        <translation type="unfinished"/>
+        <translation>ID XMPP:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="147"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
         <source>e.g. user@example.com</source>
-        <translation type="unfinished"/>
+        <translation>e.g. usuario@ejemplo.com</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="160"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
         <source>Password:</source>
-        <translation type="unfinished"/>
+        <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="188"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
         <source>An account with this name already exists!</source>
-        <translation type="unfinished"/>
+        <translation>Ya existe una cuenta con el mismo nombre!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="210"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
         <source>Advanced Xmpp Settings</source>
-        <translation type="unfinished"/>
+        <translation>Ajustes avanzados de XMPP</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="230"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
         <source>Server:</source>
-        <translation type="unfinished"/>
+        <translation>Servidor:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="253"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
         <source>Port:</source>
-        <translation type="unfinished"/>
+        <translation>Puerto:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="299"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
         <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
-        <translation type="unfinished"/>
+        <translation>Muchos servidores no soporta esta opción (e.g. GTalk, jabber.org)</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="302"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
         <source>Publish currently playing track</source>
-        <translation type="unfinished"/>
+        <translation>Publicar el tema reproducido al momento</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="309"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
         <source>Enforce secure connection</source>
-        <translation type="unfinished"/>
+        <translation>Forzar conexión segura</translation>
     </message>
 </context>
 <context>
     <name>XmppSipPlugin</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
         <source>User Interaction</source>
-        <translation type="unfinished"/>
+        <translation>Interacción de usuario</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="362"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
         <source>Host is unknown</source>
-        <translation type="unfinished"/>
+        <translation>Máquina desconocida</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="365"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
         <source>Item not found</source>
-        <translation type="unfinished"/>
+        <translation>Elemento no encontrado</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="368"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
         <source>Authorization Error</source>
-        <translation type="unfinished"/>
+        <translation>Error de Autorización</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="371"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
         <source>Remote Stream Error</source>
-        <translation type="unfinished"/>
+        <translation>Error de Stream Remoto</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="374"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
         <source>Remote Connection failed</source>
-        <translation type="unfinished"/>
+        <translation>Fallo en la Conexión Remota</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="377"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
         <source>Internal Server Error</source>
-        <translation type="unfinished"/>
+        <translation>Error de Servidor Interno</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="380"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
         <source>System shutdown</source>
-        <translation type="unfinished"/>
+        <translation>Sistema apagado</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="383"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
         <source>Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Conflicto</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="387"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
         <source>Unknown</source>
+        <translation>Desconocido</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="391"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
         <source>No Compression Support</source>
-        <translation type="unfinished"/>
+        <translation>Compresión no sportada</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="395"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
         <source>No Encryption Support</source>
-        <translation type="unfinished"/>
+        <translation>Encriptación no soportada</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="399"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
         <source>No Authorization Support</source>
-        <translation type="unfinished"/>
+        <translation>Autorización no soportada</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="403"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
         <source>No Supported Feature</source>
-        <translation type="unfinished"/>
+        <translation>Característica no soportada</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="500"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
         <source>Add Friend</source>
-        <translation type="unfinished"/>
+        <translation>Añadir Amigo</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="501"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
         <source>Enter Xmpp ID:</source>
-        <translation type="unfinished"/>
+        <translation>Introducir ID XMPP:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="617"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
         <source>Add Friend...</source>
-        <translation type="unfinished"/>
+        <translation>Añadir Amigo...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="622"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
         <source>XML Console...</source>
-        <translation type="unfinished"/>
+        <translation>Consola XML...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="670"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
         <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
-        <translation type="unfinished"/>
+        <translation>Lo siento -- soy una presencia automática usada por el Reproductor Tomahawk (http://gettomahawk.com). Si recibe este mensaje, la persona con quién intenta contactar no esté contectada probablemente. Inténtelo más tarde!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="768"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
         <source>Authorize User</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="769"/>
-        <source>Do you want to grant &lt;b&gt;%1&lt;/b&gt; access to your Collection?</source>
-        <translation type="unfinished"/>
+        <translation>Autorizar Usuario</translation>
     </message>
 </context>
 <context>
     <name>ZeroconfConfig</name>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="14"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="55"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
         <source>Local Network configuration</source>
         <translation>Configuración de red local</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="77"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
         <source>This plugin will automatically find other users running Tomahawk on your local network</source>
         <translation>Este plugin encontrará automáticamente a otros usuarios que estén ejecutando Tomahawk en su red local</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="84"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
         <source>Connect automatically when Tomahawk starts</source>
         <translation>Conectar automáticamente cuando se inicie Tomahawk</translation>
     </message>

tomahawk-0.5.5.tar.bz2/lang/tomahawk_fr.ts Added

@@ -0,0 +1,4054 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.0">
+<context>
+    <name>ACLJobDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation>Permettre a %1
+de se connecter et streamer de vous?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation>Permettre Streaming</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation>Refuser l&apos;accès</translation>
+    </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation>Tomahawk a besoin de vous pour décider si %1 est autorisé à se connecter.</translation>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
+        <source>Description goes here</source>
+        <translation>ici la description</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
+        <source>Add Account</source>
+        <translation>Ajouter un compte</translation>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapperDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
+        <source>Online</source>
+        <translation>En Ligne</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
+        <source>Connecting...</source>
+        <translation>Connexion en cours...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
+        <source>Offline</source>
+        <translation>Hors ligne</translation>
+    </message>
+</context>
+<context>
+    <name>ActionCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
+        <source>&amp;Listen Along</source>
+        <translation>&amp;Ecouter avec</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
+        <source>Stop &amp;Listening Along</source>
+        <translation>Arrêter d&apos;&amp;écouter avec</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
+        <source>&amp;Follow in real-time</source>
+        <translation>&amp;Suivre en temps réel</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Privately</source>
+        <translation>&amp;Ecouter en privé</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Publicly</source>
+        <translation>&amp;Ecouter publiquement</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
+        <source>&amp;Load Playlist</source>
+        <translation>&amp;Charger une liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
+        <source>&amp;Rename Playlist</source>
+        <translation>&amp;Renommer la liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
+        <source>&amp;Copy Playlist Link</source>
+        <translation>&amp;Copier le lien de la piste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Lire</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
+        <source>&amp;Stop</source>
+        <translation>&amp;Stop</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
+        <source>&amp;Previous Track</source>
+        <translation>Piste &amp;Précédente</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
+        <source>&amp;Next Track</source>
+        <translation>Piste &amp;Suivante</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quitter</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="31"/>
+        <source>Other Albums by Artist</source>
+        <translation>Tous les albums par cet artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation>Désolé, aucun autre album n&apos;a pu être trouvé pour cet artiste !</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation>Désolé, on a pas pu trouver aucune pistes pour cet album!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
+        <source>Other Albums by %1</source>
+        <translation>Autres albums de %1</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
+        <source>All albums from %1</source>
+        <translation>Tous les albums de %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
+        <source>All albums</source>
+        <translation>Tous les albums</translation>
+    </message>
+</context>
+<context>
+    <name>ArtistInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
+        <source>Top Hits</source>
+        <translation>Top Hits</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
+        <source>Related Artists</source>
+        <translation>Artistes similaires</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation>Artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>Albums</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation>Pochette</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation>Désolé, on a pas pu trouver aucun album pour cet artiste!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation>Désolé, on a rien trouvé par rapport a cet artite!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation>Désolé, on a pas pu trouver aucun top hit pour cet artiste! </translation>
+    </message>
+</context>
+<context>
+    <name>AudioControls</name>
+    <message>
+        <location filename="../src/AudioControls.ui" line="75"/>
+        <source>Prev</source>
+        <translation>Précédent</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="87"/>
+        <source>Play</source>
+        <translation>Lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="94"/>
+        <source>Pause</source>
+        <translation>Pause</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="103"/>
+        <source>Next</source>
+        <translation>Suivant</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="229"/>
+        <source>Artist</source>
+        <translation>Artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="248"/>
+        <source>Album</source>
+        <translation>Album</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="277"/>
+        <source>Owner</source>
+        <translation>Propriétaire</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation>social</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
+        <source>love</source>
+        <translation>love</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="383"/>
+        <source>Time</source>
+        <translation>Durée</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="412"/>
+        <source>Time Left</source>
+        <translation>Durée restante</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="493"/>
+        <source>Shuffle</source>
+        <translation>Lecture Aléatoire</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="506"/>
+        <source>Repeat</source>
+        <translation>Répéter</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="544"/>
+        <source>Low</source>
+        <translation>Bas</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="576"/>
+        <source>High</source>
+        <translation>Haut</translation>
+    </message>
+</context>
+<context>
+    <name>AudioEngine</name>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation>Désolé, on a pas pu trouver la piste &apos;%1&apos; pour %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation>Désolé, on a pas pu trouver l&apos;artiste &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation>Désolé, on a pas pu trouver l&apos;album &apos;%1&apos; pour %2</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryAddItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation>Créer une nouvelle liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation>Créer une nouvelle station</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>New Station</source>
+        <translation>Nouvelle Station</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>%1 Station</source>
+        <translation>Station %1</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
+        <source>Playlists</source>
+        <translation>Listes de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
+        <source>Stations</source>
+        <translation>Stations</translation>
+    </message>
+</context>
+<context>
+    <name>ClearButton</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
+        <source>Clear</source>
+        <translation>Vider</translation>
+    </message>
+</context>
+<context>
+    <name>ContextWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>Barre d&apos;information</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
+        <source>Show Footnotes</source>
+        <translation>Afficher les notes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
+        <source>Hide Footnotes</source>
+        <translation>Masquer les notes</translation>
+    </message>
+</context>
+<context>
+    <name>CrashReporter</name>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="23"/>
+        <source>Tomahawk Crash Reporter</source>
+        <translation>Tomahawk Crash Reporter</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Désolé !&lt;/span&gt;&amp;nbsp;Tomahawk a planté. Dites-nous ce qui ne va pas ! Tomahawk a créé un rapport d&apos;erreur qui sera utile pour améliorer la stabilité des prochaines versions. Vous pouvez dès maintenant envoyer ce rapport aux développeurs de Tomahawk.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation>Envoyer le rapport</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation>Ne pas envoyer</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
+        <source>Abort</source>
+        <translation>Abandonner</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
+        <source>You can disable sending crash reports in the configuration dialog.</source>
+        <translation>Vous pouvez désactiver l&apos;envoi des rapports de plantage dans la boite de dialogue de configuration.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
+        <source>Uploaded %L1 of %L2 KB.</source>
+        <translation>Chargement %L1 de %L2 ko.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
+        <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
+        <translation>Envoyé ! &lt;b&gt;Merci beaucoup&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
+        <source>Failed to send crash info.</source>
+        <translation>Échec de l&apos;envoi des informations de plantage. </translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseCommand_AllAlbums</name>
+    <message>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
+        <source>Unknown</source>
+        <translation>Inconnu</translation>
+    </message>
+</context>
+<context>
+    <name>DelegateConfigWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation>A propos</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
+        <source>Delete Account</source>
+        <translation>Supprimer le compte</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>A propos de ce compte</translation>
+    </message>
+</context>
+<context>
+    <name>DiagnosticsDialog</name>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
+        <source>Tomahawk Diagnostics</source>
+        <translation>Diagnostics de Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobalSearchWidget</name>
+    <message>
+        <location filename="../src/SearchBox.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+</context>
+<context>
+    <name>IndexingJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
+        <source>Indexing database</source>
+        <translation>Indexation de la base de données</translation>
+    </message>
+</context>
+<context>
+    <name>InfoBar</name>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>Barre d&apos;information</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
+        <source>Filter...</source>
+        <translation>Filtre...</translation>
+    </message>
+</context>
+<context>
+    <name>LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <source>Scrobble tracks to Last.fm</source>
+        <translation>Scrobbler les titres sur Last.fm</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <source>Username:</source>
+        <translation>Nom d&apos;utilisateur :</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <source>Password:</source>
+        <translation>Mot de passe :</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <source>Test Login</source>
+        <translation>Login test</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation>Importer l&apos;historique</translation>
+    </message>
+</context>
+<context>
+    <name>LastfmContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="67"/>
+        <source>Last.fm</source>
+        <translation>Last.fm</translation>
+    </message>
+</context>
+<context>
+    <name>LatchedStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoadXSPF</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="14"/>
+        <source>Load XSPF</source>
+        <translation>Charger XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="22"/>
+        <source>Playlist URL</source>
+        <translation>URL de la liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="29"/>
+        <source>Enter URL...</source>
+        <translation>Saisir une URL...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="42"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="51"/>
+        <source>Automatically update</source>
+        <translation>Mise à jour automatique</translation>
+    </message>
+</context>
+<context>
+    <name>LoadXSPFDialog</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>Load XSPF File</source>
+        <translation>Charger un fichier XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>XSPF Files (*.xspf)</source>
+        <translation>Fichiers XSPF (*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>LocalCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Bookmarks</source>
+        <translation>Signets</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Saved tracks</source>
+        <translation>Titres sauvegardés</translation>
+    </message>
+</context>
+<context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation>Désolé, on a pas pu trouver aucune piste favoris!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation>Titres favoris</translation>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation>Forme</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation>Étiquettes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation>Titre:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation>Titre...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation>Artiste:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation>Artiste...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation>Album:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation>Album...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation>Numéro Du Disque:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation>Durée:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation>00.00</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation>Année:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation>Bitrate:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation>Fichier</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation>Nom Du Fichier:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation>Nom Du Fichier...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation>Taille Du Fichier...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation>Taille Du Fichier...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation>Taille Du Fichier:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation>Avancer</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation> - Propriétés </translation>
+    </message>
+</context>
+<context>
+    <name>NewPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
+        <source>Enter a title for the new playlist:</source>
+        <translation>Entrer un titre pour la nouvelle liste de lecture:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
+        <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
+        <translation>Tomahawk offre plusieurs façons de créer des listes de lecture et de trouver la musique que vous aimerez !</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
+        <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>Entrez un genre ou un tag et Tomahawk vous suggérera quelques morceaux pour commencer votre nouvelle liste de lecture :</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
+        <source>&amp;Create Playlist</source>
+        <translation>&amp;Créer une liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
+        <source>Create a new playlist</source>
+        <translation>Créer une nouvelle liste de lecture</translation>
+    </message>
+</context>
+<context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>Nouveautés</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation>Artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation>Titre</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation>Compositeur</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation>Album</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation>Piste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation>Durée</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation>Bitrate</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation>Age</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation>Année</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Taille</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation>Origine</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation>Score</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
+        <source>played %1 by you</source>
+        <translation>joué %1 par vous</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
+        <source>played %1 by %2</source>
+        <translation>joué %1 par %2</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistLargeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <source>played %1 by you</source>
+        <translation>joué %1 par vous</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
+        <source>played %1 by %2</source>
+        <translation>joué %1 par %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
+        <source>added %1</source>
+        <translation>ajouté par %1</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
+        <source>A playlist by %1, created %2</source>
+        <translation>Une liste de lecture par %1, créée %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
+        <source>you</source>
+        <translation>vous</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
+        <source>All tracks by %1 on album %2</source>
+        <translation>Tous les titres de %1 sur l&apos;album %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
+        <source>All tracks by %1</source>
+        <translation>Tous les titres de %1</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistTypeSelectorDlg</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
+        <source>New Playlist</source>
+        <translation>Nouvelle liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
+        <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
+        <translation>Une liste de lecture toute simple... Donnez lui un nom, faites glisser quelques pistes et c&apos;est parti !</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
+        <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
+        <translation>Vous ne savez pas ce que vous voulez exactement ? Donnez quelques idées à Tomahawk et laissez le créer une liste de lecture pour vous !</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
+        <source>Name:</source>
+        <translation>Nom :</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
+        <source>New Playlist...</source>
+        <translation>Nouvelle liste de lecture...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
+        <source>Create Manual Playlist</source>
+        <translation>Liste de lecture manuelle</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
+        <source>Create Automatic Playlist</source>
+        <translation>Liste de lecture automatique</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation>La collection est vide actuellement.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
+        <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
+        <translation>La liste de lecture est vide. Ajoutez des pistes et profitez de la musique !</translation>
+    </message>
+</context>
+<context>
+    <name>ProxyDialog</name>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
+        <source>Proxy Settings</source>
+        <translation>Paramètres de proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
+        <source>Hostname of proxy server</source>
+        <translation>Nom d&apos;hôte du serveur proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
+        <source>Host</source>
+        <translation>Hôte</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
+        <source>Proxy login</source>
+        <translation>Login du proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
+        <source>User</source>
+        <translation>Utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
+        <source>Proxy password</source>
+        <translation>Mot de passe du proxy</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
+        <source>No Proxy Hosts:
+(Overrides system proxy)</source>
+        <translation>Pas de proxy pour :
+(remplace les paramètres système)</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
+        <source>localhost *.example.com (space separated)</source>
+        <translation>localhost *.example.com (séparé par espace)</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
+        <source>Use proxy for DNS lookups?</source>
+        <translation>Utiliser le proxy pour les requêtes DNS ?</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
+        <source>%n year(s) ago</source>
+        <translation><numerusform>il y a %n an</numerusform><numerusform>il y a %n ans</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
+        <source>%n year(s)</source>
+        <translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
+        <source>%n month(s) ago</source>
+        <translation><numerusform>il y a %n mois</numerusform><numerusform>il y a %n mois</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
+        <source>%n month(s)</source>
+        <translation><numerusform>%n mois</numerusform><numerusform>%n mois</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
+        <source>%n week(s) ago</source>
+        <translation><numerusform>il y a %n semaine</numerusform><numerusform>il y a %n semaines</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
+        <source>%n week(s)</source>
+        <translation><numerusform>%n semaine</numerusform><numerusform>%n semaines</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
+        <source>%n day(s) ago</source>
+        <translation><numerusform>il y a %n jour</numerusform><numerusform>il y a %n jours</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
+        <source>%n day(s)</source>
+        <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
+        <source>%n hour(s) ago</source>
+        <translation><numerusform>il y a %n heure</numerusform><numerusform>il y a %n heures</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
+        <source>%1 minutes ago</source>
+        <translation>il y a %1 minutes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
+        <source>%1 minutes</source>
+        <translation>%1 minutes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
+        <source>just now</source>
+        <translation>à l&apos;instant</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <source>Friend Finders</source>
+        <translation>Rechercher vos amis</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
+        <source>Music Finders</source>
+        <translation>Trouver de la musique</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
+        <source>Status Updaters</source>
+        <translation>Mettre à jour votre statut</translation>
+    </message>
+</context>
+<context>
+    <name>QuaZipFilePrivate</name>
+    <message>
+        <location filename="../src/libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation>Erreur %1 ZIP/UNZIP API</translation>
+    </message>
+</context>
+<context>
+    <name>QueueView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>Barre d&apos;information</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation>Ouvrir la file d&apos;attente</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation><numerusform>Ouvrir la file d&apos;attente - %n élément</numerusform><numerusform>Ouvrir la file d&apos;attente - %n éléments</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation>Fermer la file d&apos;attente</translation>
+    </message>
+</context>
+<context>
+    <name>RelatedArtistsContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
+        <source>Related Artists</source>
+        <translation>Artistes similaires</translation>
+    </message>
+</context>
+<context>
+    <name>ResolverConfigDelegate</name>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
+        <source>Not found: %1</source>
+        <translation>Non trouvé : %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
+        <source>Failed to load: %1</source>
+        <translation>Echec du chargement : %1</translation>
+    </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
+        <source>Search</source>
+        <translation>Rechercher</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
+        <source>Search: %1</source>
+        <translation>Rechercher : %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
+        <source>Results for &apos;%1&apos;</source>
+        <translation>Résultats pour &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
+        <source>Collection</source>
+        <translation>Collection</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
+        <source>Advanced</source>
+        <translation>Avancés</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
+        <source>All</source>
+        <translation>Tous</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation>Certaines modifications ne prendront effet qu&apos;au prochain démarrage de Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
+        <source>Services</source>
+        <translation>Services</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
+        <source>Install resolver from file</source>
+        <translation>Installer un script de résolution depuis un fichier</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation>Supprimer toutes les entrées de Contrôle d&apos;accès?</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation>Voulez-vous vraiment supprimer toutes les entrées de contrôle d&apos;accès ? On vous demandera de nouveau votre autorisation pour toutes les nouvelles connexions.</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>Information</translation>
+    </message>
+</context>
+<context>
+    <name>SocialPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="34"/>
+        <source>Popular New Albums From Your Friends</source>
+        <translation>Nouveaux Albums Populaires de vos Amis</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="48"/>
+        <source>Most Played Playlists</source>
+        <translation>Liste de lecture les plus jouées</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="63"/>
+        <source>Most Played Tracks You Don&apos;t Have</source>
+        <translation>Titres les plus joués que vous n&apos;avez pas</translation>
+    </message>
+</context>
+<context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>Pochette</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation>Tweet</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation>J&apos;écoute &quot;%1&quot; par %2. %3</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation>J&apos;écoute &quot;%1&quot; par %2 sur &quot;%3&quot;. %4</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation>%1 caractères restants</translation>
+    </message>
+</context>
+<context>
+    <name>SourceDelegate</name>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
+        <source>Track</source>
+        <translation>Piste</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
+        <source>Album</source>
+        <translation>Album</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
+        <source>Artist</source>
+        <translation>Artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
+        <source>Local</source>
+        <translation>Local</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
+        <source>Top 10</source>
+        <translation>Top 10</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
+        <source>All available tracks</source>
+        <translation>Tous les titres disponibles</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
+        <source>Show</source>
+        <translation>Afficher</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
+        <source>Hide</source>
+        <translation>Masquer</translation>
+    </message>
+</context>
+<context>
+    <name>SourceInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
+        <source>Recent Albums</source>
+        <translation>Derniers Albums</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
+        <source>Latest Additions</source>
+        <translation>Derniers ajouts</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
+        <source>Recently Played Tracks</source>
+        <translation>Dernières titres joués</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
+        <source>New Additions</source>
+        <translation>Nouveaux ajouts</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
+        <source>My recent activity</source>
+        <translation>Mon activité récente</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
+        <source>Recent activity from %1</source>
+        <translation>Activité récente de %1</translation>
+    </message>
+</context>
+<context>
+    <name>SourceItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
+        <source>Collection</source>
+        <translation>Collection</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
+        <source>Latest Additions</source>
+        <translation>Derniers ajouts</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
+        <source>Recently Played</source>
+        <translation>Joués récemment</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation>SuperCollection</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation>Derniers ajouts à votre collection</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation>Derniers ajouts à la collection de %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation>Désolé, on a pas pu trouver des dernier ajouts!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation>Derniers titres joués</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation>Les derniers titres que vous avez joués</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation>Derniers titres joués par %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation>Désolé, on a pas pu trouver aucune piste récement joués!</translation>
+    </message>
+</context>
+<context>
+    <name>SourceTreeView</name>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
+        <source>&amp;Copy Link</source>
+        <translation>&amp;Copier le lien</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
+        <source>&amp;Delete %1</source>
+        <translation>&amp;Supprimer %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation>Ajoute a mes listes de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation>Ajoute a mes listes de lecture automatique</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation>Ajouter à mes stations</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
+        <source>&amp;Export Playlist</source>
+        <translation>&amp;Exporter la liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation>liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation>liste de lecture automatique</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation>station</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation>Supprimer %1?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation>Voulez-vous supprimer la %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
+        <source>Save XSPF</source>
+        <translation>Enregistrer XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
+        <source>Playlists (*.xspf)</source>
+        <translation>Listes de lecture (*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>SourcesModel</name>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
+        <source>Group</source>
+        <translation>Groupe</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
+        <source>Collection</source>
+        <translation>Collection</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
+        <source>Playlist</source>
+        <translation>Liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
+        <source>Automatic Playlist</source>
+        <translation>Liste de lecture automatique</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
+        <source>Station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
+        <source>Browse</source>
+        <translation>Parcourir</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
+        <source>Search History</source>
+        <translation>Chercher dans l&apos;historique</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
+        <source>My Music</source>
+        <translation>Ma Musique</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
+        <source>SuperCollection</source>
+        <translation>SuperCollection</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
+        <source>Top Loved Tracks</source>
+        <translation>Top des titres favoris</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
+        <source>Dashboard</source>
+        <translation>Tableau de bord</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
+        <source>Recently Played</source>
+        <translation>Joués récemment</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
+        <source>Charts</source>
+        <translation>Charts</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>Nouveautés</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
+        <source>Friends</source>
+        <translation>Amis</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation>Configurer votre compte Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation>Nom d&apos;utilisateur ou email Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>Connexion</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation>Clic droit pour synchroniser une liste de lecture Tomahawk vers Spotify.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation>Streaming haute qualité</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation>Liste de lecture Spotify à synchroniser :</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation>Supprimer la liste de lecture de Tomahawk à la suppression de la synchronisation</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>Nom d&apos;utilisateur :</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>Mot de passe :</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation>Supprimer dans Spotify ?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation>Voulez-vous aussi supprimer la liste de lecture correspondante dans Spotify ?</translation>
+    </message>
+</context>
+<context>
+    <name>StackedSettingsDialog</name>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
+        <source>Tomahawk Settings</source>
+        <translation>Paramètres de Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
+        <source>Local Music Information</source>
+        <translation>Fichiers de musique locaux</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
+        <source>Path to scan for music files:</source>
+        <translation>Chemin à scanner pour des fichiers musicaux :</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
+        <source>The Echo Nest supports keeping track of your catalog metadata
+ and using it to craft personalized radios. Enabling this option
+ will allow you (and all your friends) to create automatic playlists
+ and stations based on your personal taste profile.</source>
+        <translation>The Echo Nest peut garder les métadonnées de votre catalogue
+et les utiliser pour créer des radios personnalisées. En activant cette option
+vous (et vos amis) pourrez créer des listes de lecture automatiquement
+et des stations basées sur vos goûts.</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
+        <source>Upload collection list to The Echo Nest to enable user radio</source>
+        <translation>Envoyer la collection à The Echo Nest pour activer la radio utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
+        <source>Watch for changes</source>
+        <translation>Surveiller les changements</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
+        <source>Time between scans, in seconds:</source>
+        <translation>Période de scan, en secondes :</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation>Paramètres avancés</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation>Méthode de connexion distante à un pair</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation>Aucune (Connexions sortantes uniquement)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation>Utiliser UPnP pour la redirection des ports (recommandé)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation>Utiliser une adresse IP externe statique/nom d&apos;hôte et un port</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation>Indiquez votre adresse IP externe ou nom d&apos;hôte. Vérifiez que le port est bien redirigé vers cet hôte !</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation>Proxy SOCKS</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation>Utiliser un proxy SOCKS</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation>Supprimer toutes les entrées de Contrôle d&apos;accès</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation>Services Internet</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation>Installer depuis un fichier...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation>Filtrer par fonctionnalité :</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
+        <source>Static Host Name:</source>
+        <translation>Nom d&apos;hôte statique :</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
+        <source>Static Port:</source>
+        <translation>Port statique :</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
+        <source>Proxy Settings...</source>
+        <translation>Paramètres du proxy...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation>Autres paramètres</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
+        <source>Send reports after Tomahawk crashed</source>
+        <translation>Envoyer un rapport après un crash de Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation>Permettre aux navigateurs web d’interagir avec Tomahawk (recommandé)</translation>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation>Copier le lien de l&apos;artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation>Copier le lien de l&apos;album</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation>Copier le lien de la piste</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
+        <source>Add Account</source>
+        <translation>Ajouter un compte</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
+        <source>%1 downloads</source>
+        <translation>%1 téléchargements</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
+        <source>Online</source>
+        <translation>En Ligne</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
+        <source>Connecting...</source>
+        <translation>Connexion en cours...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
+        <source>Offline</source>
+        <translation>Hors ligne</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation>Installation manuelle requise</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation>Malheureusement, l&apos;installation automatique de ce script de résolution n&apos;est pas disponible ou a été désactivé sur votre plateforme.&lt;br /&gt;&lt;br /&gt;Utiliser &quot;Installer depuis un fichier&quot; ci-dessus et téléchargez le fichier pour votre distribution, ou compilez-le. D&apos;autres instructions sont disponibles ici :&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapper</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
+        <source>Configure this Google Account</source>
+        <translation>Configurer le compte Google</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
+        <source>Google Address</source>
+        <translation>Adresse Google</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
+        <source>Enter your Google login to connect with your friends using Tomahawk!</source>
+        <translation>Entrer votre login Google pour vous connecter avec vos amis qui utilisent Tomahawk !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
+        <source>username@gmail.com</source>
+        <translation>utilisateur@gmail.com</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
+        <source>Connect to Google Talk to find your friends</source>
+        <translation>Connectez vous à Google Talk pour trouver vos amis</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperSip</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
+        <source>Add Friend</source>
+        <translation>Ajouter un ami</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
+        <source>Enter Google Address:</source>
+        <translation>Saisir l&apos;adresse google : </translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
+        <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
+        <translation>Scrobbler vos écoutes sur Last.fm et trouver des morceaux téléchargeables gratuitement</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation>Test...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation>Test de connexion</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation>Importation %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation>Import de l&apos;historique...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation>Historique incomplet. Reprendre</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation>Historique de lecture importé</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
+        <source>Failed</source>
+        <translation>Échec</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
+        <source>Success</source>
+        <translation>Succès</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
+        <source>Could not contact server</source>
+        <translation>Impossible de contacter le serveur</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation>Synchroniser avec Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation>Réactiver la synchronisation avec Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation>Stopper la synchronisation avec Spotify</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>Connexion...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation>Echec : %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>Connexion</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
+        <source>Play music from and sync your playlists with Spotify Premium</source>
+        <translation>Jouer la musique et synchroniser vos listes avec Spotify Premium</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
+        <source>Connect to your Twitter followers.</source>
+        <translation>Se connecter à vos followers sur Twitter.</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
+        <source>Tweet!</source>
+        <translation>Tweet!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
+        <source>Status: No saved credentials</source>
+        <translation>Statut : Pas de compte enregistré</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
+        <source>Authenticate</source>
+        <translation>S&apos;authentifier</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
+        <source>Status: Credentials saved for %1</source>
+        <translation>Statut : Compte enregistré pour %1</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
+        <source>De-authenticate</source>
+        <translation>Se déconnecter</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>Tweetin&apos; Error</source>
+        <translation>Erreur de Tweet</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <source>The credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation>Votre compte n&apos;a pas pu être vérifié.
+Essayer de vous authentifier de nouveau.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
+        <source>Status: Error validating credentials</source>
+        <translation>Statut : Erreur de validation de votre compte</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
+        <source>Global Tweet</source>
+        <translation>Tweet Global</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
+        <source>Direct Message</source>
+        <translation>Message direct</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
+        <source>Send Message!</source>
+        <translation>Envoyer le message !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
+        <source>@Mention</source>
+        <translation>@Mention</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
+        <source>Send Mention!</source>
+        <translation>Envoyer la mention !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <source>You must enter a user name for this type of tweet.</source>
+        <translation>Vous devez saisir un nom d&apos;utilisateur pour ce type de tweet.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <source>Your saved credentials could not be loaded.
+You may wish to try re-authenticating.</source>
+        <translation>Les informations de votre compte ne peuvent être chargées.
+Essayez de vous authentifier de nouveau.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <source>Your saved credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation>Les informations de votre compte ne peuvent être vérifiées.
+Essayez de vous authentifier de nouveau.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>There was an error posting your status -- sorry!</source>
+        <translation>Une erreur s&apos;est produite en postant votre statut -- Désolé !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Tweeted!</source>
+        <translation>Tweeté !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <source>Your tweet has been posted!</source>
+        <translation>Votre tweet a été posté !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <source>There was an error posting your direct message -- sorry!</source>
+        <translation>Une erreur s&apos;est produit pendant l&apos;envoi de votre message direct !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Your message has been posted!</source>
+        <translation>Votre message a été posté !</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::XmppAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
+        <source>Log on to your Jabber/XMPP account to connect to your friends</source>
+        <translation>Connectez vous à votre compte Jabber/XMPP pour retrouver vos amis</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::ZeroconfFactory</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
+        <source>Automatically connect to Tomahawks on the local network</source>
+        <translation>Se connecter automatiquement aux Tomahawks sur le réseau local</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ContextMenu</name>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
+        <source>Add to &amp;Queue</source>
+        <translation>&amp;Ajouter à la file d&apos;attente</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation>Continuer la lecture après cette &amp;piste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation>Stopper la lecture après cette &amp;piste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
+        <source>&amp;Love</source>
+        <translation>&amp;Favori</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
+        <source>&amp;Copy Track Link</source>
+        <translation>&amp;Copier le lien de la piste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation>Copier le &amp;lien de l&apos;album</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation>Copier le &amp;lien de l&apos;artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
+        <source>Un-&amp;Love</source>
+        <translation>&amp;Supprimer des Favoris</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Items</source>
+        <translation>&amp;Supprimer les éléments</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation>&amp;Afficher la page de la piste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Item</source>
+        <translation>&amp;Supprimer l&apos;élément</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation>&amp;Afficher la page de l&apos;album</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation>&amp;Afficher la page artiste</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::CustomPlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
+        <source>Top Loved Tracks</source>
+        <translation>Top des titres favoris</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
+        <source>Your loved tracks</source>
+        <translation>Vos titres favoris</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
+        <source>%1&apos;s loved tracks</source>
+        <translation>Titres favoris de %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
+        <source>The most loved tracks from all your friends</source>
+        <translation>Les titres favoris de vos amis</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
+        <source>All of your loved tracks</source>
+        <translation>Tous vos titres favoris</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
+        <source>All of %1&apos;s loved tracks</source>
+        <translation>Tous les titres favoris de %1</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DropJobNotifier</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation>liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation>artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation>titre</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation>album</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
+        <source>Fetching %1 from database</source>
+        <translation>Chargement de %1 depuis la base de données</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
+        <source>Parsing %1 %2</source>
+        <translation>Décodage %1 %2</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicControlList</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
+        <source>Click to collapse</source>
+        <translation>Cliquez pour masquer</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="172"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="301"/>
+        <source>Could not find a playable track.
+
+Please change the filters or try again.</source>
+        <translation>Impossible de trouver une piste jouable.
+
+Veuillez changer les filtres et essayez de nouveau.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="230"/>
+        <source>Failed to generate preview with the desired filters</source>
+        <translation>Échec de la génération de l&apos;aperçu avec ces filtres</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicSetupWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="53"/>
+        <source>Type:</source>
+        <translation>Type :</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="67"/>
+        <source>Generate</source>
+        <translation>Générer</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
+        <source>Add some filters above to seed this station!</source>
+        <translation>Ajoutez des filtres ci dessus pour commencer une station !</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <source>Press Generate to get started!</source>
+        <translation>Appuyez sur Générer pour commencer !</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
+        <source>Add some filters above, and press Generate to get started!</source>
+        <translation>Ajoutez des filtres ci dessus et appuyez sur &quot;Générer&quot; pour commencer !</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp" line="472"/>
+        <source>Station ran out of tracks!
+
+Try tweaking the filters for a new set of songs to play.</source>
+        <translation>Il n&apos;y a plus de chansons dans la station !
+
+Essayez de changer les filtres pour avoir de nouveaux morceaux à jouer.</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestControl</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="188"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="255"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="276"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="341"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="360"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="425"/>
+        <source>is</source>
+        <translation>est</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="207"/>
+        <source>from user</source>
+        <translation>de l&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="216"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="584"/>
+        <source>No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings</source>
+        <translation>Aucun utilisateur avec un Catalogue The Echo Nest actif. Essayez d&apos;activer l&apos;option dans les préférences de Collection</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="235"/>
+        <source>similar to</source>
+        <translation>similaire à</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>Less</source>
+        <translation>Moins</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>More</source>
+        <translation>Plus</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>0 BPM</source>
+        <translation>0 BPM</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>500 BPM</source>
+        <translation>500 BPM</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>0 secs</source>
+        <translation>0 secs</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>3600 secs</source>
+        <translation>3600 secs</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>-100 dB</source>
+        <translation>-100 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>100 dB</source>
+        <translation>100 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="343"/>
+        <source>Major</source>
+        <translation>Majeur</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="344"/>
+        <source>Minor</source>
+        <translation>Mineur</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
+        <source>C</source>
+        <translation>Do</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
+        <source>C Sharp</source>
+        <translation>Do dièse</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
+        <source>D</source>
+        <translation>Ré</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
+        <source>E Flat</source>
+        <translation>Mi bémol</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
+        <source>E</source>
+        <translation>Mi</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
+        <source>F</source>
+        <translation>Fa</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
+        <source>F Sharp</source>
+        <translation>Fa dièse</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="369"/>
+        <source>G</source>
+        <translation>Sol</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="370"/>
+        <source>A Flat</source>
+        <translation>La bémol</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="371"/>
+        <source>A</source>
+        <translation>La</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="372"/>
+        <source>B Flat</source>
+        <translation>Si bémol</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="373"/>
+        <source>B</source>
+        <translation>Si</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
+        <source>Ascending</source>
+        <translation>Croissant</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="391"/>
+        <source>Descending</source>
+        <translation>Décroissant</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="394"/>
+        <source>Tempo</source>
+        <translation>Tempo</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="395"/>
+        <source>Duration</source>
+        <translation>Durée</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="396"/>
+        <source>Loudness</source>
+        <translation>Intensité</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="397"/>
+        <source>Artist Familiarity</source>
+        <translation>Familiarité de l&apos;artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
+        <source>Artist Hotttnesss</source>
+        <translation>Hotttnesss de l&apos;artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
+        <source>Song Hotttnesss</source>
+        <translation>Hotttness du morceau</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
+        <source>Latitude</source>
+        <translation>Latitude</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="401"/>
+        <source>Longitude</source>
+        <translation>Longitude</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="402"/>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="403"/>
+        <source>Key</source>
+        <translation>Tonalité</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="404"/>
+        <source>Energy</source>
+        <translation>Energie</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="405"/>
+        <source>Danceability</source>
+        <translation>Dansabilité</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="744"/>
+        <source>only by ~%1</source>
+        <translation>uniquement par ~%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="746"/>
+        <source>similar to ~%1</source>
+        <translation>similaire à ~%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="748"/>
+        <source>with genre ~%1</source>
+        <translation>avec le genre ~%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="754"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="766"/>
+        <source>from no one</source>
+        <translation>de personne</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="758"/>
+        <source>My Collection</source>
+        <translation>Ma Collection</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="762"/>
+        <source>from %1 radio</source>
+        <translation>de la radio %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="785"/>
+        <source>with %1 %2</source>
+        <translation>avec %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="787"/>
+        <source>about %1 BPM</source>
+        <translation>environ %1 BPM</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
+        <source>about %n minute(s) long</source>
+        <translation><numerusform>environ %n minute</numerusform><numerusform>environ %n minutes</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
+        <source>about %1 dB</source>
+        <translation>environ %1 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="793"/>
+        <source>at around %1%2 %3</source>
+        <translation>à environ %1%2 %3</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="798"/>
+        <source>in %1</source>
+        <translation>dans %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="803"/>
+        <source>in a %1 key</source>
+        <translation>en tonalité %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="813"/>
+        <source>sorted in %1 %2 order</source>
+        <translation>trié par ordre %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="818"/>
+        <source>with a %1 mood</source>
+        <translation>avec une ambiance %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="823"/>
+        <source>in a %1 style</source>
+        <translation>ayant un style %1</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestSteerer</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
+        <source>Steer this station:</source>
+        <translation>Modifier cette station :</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <source>Much less</source>
+        <translation>Beaucoup moins</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <source>Less</source>
+        <translation>Moins</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <source>A bit less</source>
+        <translation>Un peu moins</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <source>Keep at current</source>
+        <translation>Garder le même</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <source>A bit more</source>
+        <translation>Un peu plus</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <source>More</source>
+        <translation>Plus</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <source>Much more</source>
+        <translation>Beaucoup plus</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
+        <source>Tempo</source>
+        <translation>Tempo</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
+        <source>Loudness</source>
+        <translation>Intensité</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
+        <source>Danceability</source>
+        <translation>Dansabilité</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
+        <source>Energy</source>
+        <translation>Energie</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
+        <source>Song Hotttnesss</source>
+        <translation>Hotttnesss du morceau</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <source>Artist Hotttnesss</source>
+        <translation>Hotttnesss de l&apos;artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
+        <source>Artist Familiarity</source>
+        <translation>Familiarité de l&apos;artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
+        <source>By Description</source>
+        <translation>Par description</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
+        <source>Enter a description</source>
+        <translation>Entrer une description</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
+        <source>Apply steering command</source>
+        <translation>Appliquer la commande de direction</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
+        <source>Reset all steering commands</source>
+        <translation>Annuler les commandes de direction</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::GroovesharkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
+        <source>Error fetching Grooveshark information from the network!</source>
+        <translation>Échec du chargement des informations Grooveshark depuis le réseau!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::ChartsPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
+        <source>Top Overall</source>
+        <translation>Top global</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
+        <source>Artists</source>
+        <translation>Artistes</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
+        <source>Albums</source>
+        <translation>Albums</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
+        <source>Tracks</source>
+        <translation>Pistes</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation>Tomahawk joue &quot;%1&quot; par %2%3.</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation>sur &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
+        <source>Top Tracks</source>
+        <translation>Top des titres</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
+        <source>Loved Tracks</source>
+        <translation>Titres favoris</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
+        <source>Hyped Tracks</source>
+        <translation>Titres Hype</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
+        <source>Top Artists</source>
+        <translation>Top Artistes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
+        <source>Hyped Artists</source>
+        <translation>Artistes Hype</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>Albums</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation>J&apos;écoute &quot;%1&quot; par %2 et j&apos;adore ! %3</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ItunesParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
+        <source>Error fetching iTunes information from the network!</source>
+        <translation>Échec du chargement des informations iTunes depuis le réseau !</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::JSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
+        <source>New Playlist</source>
+        <translation>Nouvelle liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Failed to save tracks</source>
+        <translation>Échec de la sauvegarde des pistes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation>Certaines pistes dans la liste de lecture ne contiennent pas d&apos;artiste ou de titre. Elles seront ignorées.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>XSPF Error</source>
+        <translation>Erreur XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation>Ceci n&apos;est pas une liste de lecture XSPF valide.</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::LatchManager</name>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="86"/>
+        <source>&amp;Catch Up</source>
+        <translation>&amp;Rattraper son retard</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="123"/>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="144"/>
+        <source>&amp;Listen Along</source>
+        <translation>&amp;Ecouter avec</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Query</name>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
+        <source> and </source>
+        <translation> et </translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
+        <source>You</source>
+        <translation>Vous</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
+        <source>you</source>
+        <translation>vous</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>and</source>
+        <translation>et</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>%n other(s)</source>
+        <translation><numerusform>%n autre</numerusform><numerusform>%n autres</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
+        <source>%1 people</source>
+        <translation>%1 personnes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
+        <source>loved this track</source>
+        <translation>a enregistré cette piste dans ses favoris</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::RdioParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
+        <source>Error fetching Rdio information from the network!</source>
+        <translation>Échec du chargement des informations Rdio depuis le réseau!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ShortenedLinkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
+        <source>Network error parsing shortened link!</source>
+        <translation>Erreur réseau lors du décodage de l&apos;URL courte!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Source</name>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
+        <source>Scanning (%L1 tracks)</source>
+        <translation>Scan en cours (%L1 titres)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
+        <source>Scanning</source>
+        <translation>Scan en cours</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
+        <source>Checking</source>
+        <translation>Vérification</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation>Synchronisation</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation>Importation</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
+        <source>Saving (%1%)</source>
+        <translation>Enregistrement (%1%)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation>En Ligne</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation>Hors ligne</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::SpotifyParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
+        <source>Error fetching Spotify information from the network!</source>
+        <translation>Échec du chargement des informations Spotify depuis le réseau!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation>Mise à jour automatique XSPF</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkApp</name>
+    <message>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
+        <source>My Collection</source>
+        <translation>Ma Collection</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkOAuthTwitter</name>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>Twitter PIN</source>
+        <translation>Identification Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>After authenticating on Twitter's web site,
+enter the displayed PIN number here:</source>
+        <translation>Après vous être authentifié sur le site de Twitter,
+saisissez le numéro PIN ici :</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkTrayIcon</name>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation>&amp;Stopper la lecture après cette piste</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
+        <source>Hide Tomahawk Window</source>
+        <translation>Masquer la fenêtre Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
+        <source>Show Tomahawk Window</source>
+        <translation>Afficher la fenêtre Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
+        <source>Currently not playing.</source>
+        <translation>Pas de lecture en cours.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
+        <source>Play</source>
+        <translation>Lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
+        <source>Pause</source>
+        <translation>Pause</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation>&amp;Favori</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation>&amp;Supprimer des Favoris</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation>&amp;Continuer la lecture après cette piste</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkWindow</name>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
+        <source>Tomahawk</source>
+        <translation>Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
+        <source>&amp;Settings</source>
+        <translation>&amp;Paramètres</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
+        <source>&amp;Controls</source>
+        <translation>&amp;Contrôles </translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
+        <source>&amp;Network</source>
+        <translation>&amp;Réseau</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
+        <source>&amp;Window</source>
+        <translation>&amp;Fenêtre</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Aide</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quitter</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
+        <source>Go &amp;Online</source>
+        <translation>Se c&amp;onnecter</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
+        <source>Add &amp;Friend...</source>
+        <translation>Ajouter un &amp;ami...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
+        <source>U&amp;pdate Collection</source>
+        <translation>Mettre à Jo&amp;ur la Collection </translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
+        <source>Update Collection</source>
+        <translation>Mettre à Jour la Collection</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
+        <source>&amp;Configure Tomahawk...</source>
+        <translation>&amp;Configurer Tomahawk...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
+        <source>Load &amp;XSPF...</source>
+        <translation>Charger &amp;XSPF...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
+        <source>Create &amp;New Playlist...</source>
+        <translation>Créer une &amp;nouvelle liste de lecture...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
+        <source>About &amp;Tomahawk...</source>
+        <translation>A propos de &amp;Tomahawk...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
+        <source>Create New &amp;Automatic Playlist</source>
+        <translation>Créer une nouvelle liste de lecture &amp;automatique</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
+        <source>Create New &amp;Station</source>
+        <translation>Créer une nouvelle &amp;Station</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
+        <source>Show Offline Sources</source>
+        <translation>Afficher les sources hors ligne</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
+        <source>Hide Offline Sources</source>
+        <translation>Masquer les sources hors ligne</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
+        <source>Minimize</source>
+        <translation>Réduire</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
+        <source>Zoom</source>
+        <translation>Zoom</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
+        <source>Meta+Ctrl+Z</source>
+        <translation>Meta+Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation>&amp;Informations Légales...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
+        <source>Diagnostics...</source>
+        <translation>Diagnostics...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
+        <source>Fully &amp;Rescan Collection</source>
+        <translation>&amp;Rescanner la collection entièrement</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
+        <source>Fully Rescan Collection</source>
+        <translation>Rescanner la collection entièrement</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
+        <source>Play</source>
+        <translation>Lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
+        <source>Space</source>
+        <translation>Espace</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
+        <source>Previous</source>
+        <translation>Précédent</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
+        <source>Next</source>
+        <translation>Suivant</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation>Reculer d&apos;une page</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation>Avancer</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation>Avancer d&apos;une page</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
+        <source>Global Search...</source>
+        <translation>Recherche Globale...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
+        <source>Check For Updates...</source>
+        <translation>Rechercher une mise à jour...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
+        <source>Connect To Peer</source>
+        <translation>Connexion à un pair</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
+        <source>Enter peer address:</source>
+        <translation>Adresse du pair :</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
+        <source>Enter peer port:</source>
+        <translation>Port du pair :</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
+        <source>Enter peer key:</source>
+        <translation>Clé du pair : </translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>XSPF Error</source>
+        <translation>Erreur XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation>Ceci n&apos;est pas une liste de lecture XSPF valide.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Failed to save tracks</source>
+        <translation>Échec de la sauvegarde des pistes </translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation>Certaines pistes dans la liste de lecture ne contiennent pas d&apos;artiste ou de titre. Elles seront ignorées.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
+        <translation>Désolé, il y a un problème d&apos;accès à votre matériel audio ou la piste en cours va être sautée. Vérifiez que vous avez un backend Phonon et les plugins requis installés.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
+        <translation>Désolé, il y a un problème d&apos;accès à votre matériel audio ou la piste en cours va être sauter.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Create New Station</source>
+        <translation>Créer une nouvelle station</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Name:</source>
+        <translation>Nom :</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation>Liste de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation>Liste de lecture automatique</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
+        <source>Pause</source>
+        <translation>Pause</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
+        <source>Go &amp;offline</source>
+        <translation>Se &amp;déconnecter</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
+        <source>Go &amp;online</source>
+        <translation>Se c&amp;onnecter</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
+        <source>Authentication Error</source>
+        <translation>Erreur d&apos;authentification</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation>Erreur de connexion SIP : échec de l&apos;authentification !</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
+        <source>%1 by %2</source>
+        <comment>track, artist name</comment>
+        <translation>%1 par %2</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
+        <source>%1 - %2</source>
+        <comment>current track, some window title</comment>
+        <translation>%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation>Droit d&apos;auteur 2010 - 2012</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation>Merci a:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation>A propos de Tomahawk</translation>
+    </message>
+</context>
+<context>
+    <name>TopTracksContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
+        <source>Top Hits</source>
+        <translation>Top Hits</translation>
+    </message>
+</context>
+<context>
+    <name>TrackInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation>Pochette</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
+        <source>Track</source>
+        <translation>Piste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation>Artiste</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation>Album</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation>Statistiques</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation>Piste similaire</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation>Désolé, on a pas pu trouver aucune pistes pour cette chanson!</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation><numerusform>Vous avez écouté cette piste %n fois.</numerusform><numerusform>Vous avez écouté cette piste %n fois.</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation>Vous n&apos;avez encore jamais écouté cette piste.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation>Vous l&apos;avez écouté pour la première fois le %1.</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation><numerusform>Vous avez écouté %1 %n fois.</numerusform><numerusform>Vous avez écouté %1 %n fois.</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation>Vous n&apos;avez encore jamais écouté %1.</translation>
+    </message>
+</context>
+<context>
+    <name>TrackView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>Désolé, votre filtre &apos;%1&apos; ne correspond à aucun résultat.</translation>
+    </message>
+</context>
+<context>
+    <name>TransferStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>from</source>
+        <translation>de</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>to</source>
+        <translation>à</translation>
+    </message>
+</context>
+<context>
+    <name>TreeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
+        <source>Unknown</source>
+        <translation>Inconnu</translation>
+    </message>
+</context>
+<context>
+    <name>TreeModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
+        <source>All Artists</source>
+        <translation>Tous les artistes</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
+        <source>My Collection</source>
+        <translation>Ma Collection</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
+        <source>Collection of %1</source>
+        <translation>Collection de %1</translation>
+    </message>
+</context>
+<context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>Désolé, votre filtre &apos;%1&apos; ne correspond à aucun résultat.</translation>
+    </message>
+</context>
+<context>
+    <name>TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
+        <source>Configure this Twitter account</source>
+        <translation>Configurer ce compte Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
+        <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
+        <translation>Le plugin Twitter vous permet de découvrir et jouer la musique de vos amis Twitter utilisant Tomahawk et de publier des messages sur votre compte.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
+        <source>Status: No saved credentials</source>
+        <translation>Statut : Aucun compte sauvegardé</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
+        <source>Authenticate with Twitter</source>
+        <translation>S&apos;authentifier avec Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
+        <source>Twitter Connections</source>
+        <translation>Connexions Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
+        <source>
+If you only want to post tweets, you're done.
+
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.</source>
+        <translation>
+Si vous voulez juste poster des tweets, c&apos;est fini.
+
+Si vous voulez connecter Tomahawk à vos amis qui utilisent Twitter, sélectionnez le type de tweet and cliquez sur le bouton ci dessous pour envoyer un message de synchronisation. Vous devez vous suivre mutuellement car des messages directs sont utilisés. Ensuite soyez (très) patient -- ça peut prendre plusieurs minutes !
+
+Vous pouvez envoyer un message de synchronisation quand vous le souhaitez en envoyant un nouveau tweet en utilisant ce bouton.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
+        <source>Select the kind of tweet you would like, then press the button to post it:</source>
+        <translation>Sélectionnez le type de tweet, puis appuyez sur le bouton pour le poster :</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
+        <source>Global Tweet</source>
+        <translation>Tweet Global</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
+        <source>@Mention</source>
+        <translation>@Mention</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
+        <source>Direct Message</source>
+        <translation>Message Direct</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
+        <source>e.g. @tomahawk</source>
+        <translation>par exemple @tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
+        <source>Send Message</source>
+        <translation>Envoyer le message</translation>
+    </message>
+</context>
+<context>
+    <name>ViewManager</name>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation>Après avoir scanné votre collection musicale, vous trouverez tous vos titres ici.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation>La collection est vide.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
+        <source>SuperCollection</source>
+        <translation>SuperCollection</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
+        <source>Combined libraries of all your online friends</source>
+        <translation>Collections regroupant toutes celles de vos amis en ligne</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation>Derniers titres joués</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation>Derniers titres joués par vos amis</translation>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
+        <source>Recent Additions</source>
+        <translation>Derniers Ajouts</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
+        <source>Newest Stations &amp; Playlists</source>
+        <translation>Dernières stations et listes de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
+        <source>Recently Played Tracks</source>
+        <translation>Joués récemment</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
+        <source>No recently created playlists in your network.</source>
+        <translation>Pas de liste de lecture créée récemment sur votre réseau.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
+        <source>Welcome to Tomahawk</source>
+        <translation>Bienvenue dans Tomahawk</translation>
+    </message>
+</context>
+<context>
+    <name>WhatsHotWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
+        <source>Charts</source>
+        <translation>Charts</translation>
+    </message>
+</context>
+<context>
+    <name>WikipediaContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="42"/>
+        <source>Wikipedia</source>
+        <translation>Wikipedia</translation>
+    </message>
+</context>
+<context>
+    <name>XMPPBot</name>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
+        <source>
+Terms for %1:
+</source>
+        <translation>
+Résultats pour %1 :
+</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
+        <source>No terms found, sorry.</source>
+        <translation>Aucun terme trouvé, désolé.</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
+        <source>
+Hotttness for %1: %2
+</source>
+        <translation>
+Hotttness pour %1 : %2
+</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
+        <source>
+Familiarity for %1: %2
+</source>
+        <translation>
+Familiarité pour %1 : %2
+</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
+        <source>
+Lyrics for &quot;%1&quot; by %2:
+
+%3
+</source>
+        <translation>
+Paroles de &quot;%1&quot; par %2 :
+
+%3
+</translation>
+    </message>
+</context>
+<context>
+    <name>XSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
+        <source>Failed to parse contents of XSPF playlist</source>
+        <translation>Échec du décodage de la liste de lecture XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
+        <source>Some playlist entries were found without artist and track name, they will be omitted</source>
+        <translation>Certaines entrées de la liste de lecture n&apos;ont pas d&apos;artiste ou de titre, elles seront omises</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
+        <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
+        <translation>Échec du chargement de la liste de lecture depuis le réseau, ou le fichier n&apos;existe pas</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
+        <source>New Playlist</source>
+        <translation>Nouvelle liste de lecture</translation>
+    </message>
+</context>
+<context>
+    <name>XmlConsole</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
+        <source>Xml stream console</source>
+        <translation>Console stream xml</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
+        <source>Filter</source>
+        <translation>Filtre</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
+        <source>Save log</source>
+        <translation>Sauvegarder le journal</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
+        <source>Disabled</source>
+        <translation>Désactivé</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
+        <source>By JID</source>
+        <translation>Par JID</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
+        <source>By namespace uri</source>
+        <translation>Par namespace uri</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
+        <source>By all attributes</source>
+        <translation>Par tous les attributs</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
+        <source>Visible stanzas</source>
+        <translation>Strophes visibles</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
+        <source>Information query</source>
+        <translation>Requête d&apos;information</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
+        <source>Message</source>
+        <translation>Message</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
+        <source>Presence</source>
+        <translation>Présence</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
+        <source>Custom</source>
+        <translation>Personnalisé</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
+        <source>Save XMPP log to file</source>
+        <translation>Enregistrer le log XMPP dans un fichier</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
+        <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
+        <translation>Format OpenDocument (*.odf);;Fichiers HTML (*.html);;Texte (*.txt)</translation>
+    </message>
+</context>
+<context>
+    <name>XmppConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
+        <source>Xmpp Configuration</source>
+        <translation>Configuration XMPP</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
+        <source>Configure this Xmpp account</source>
+        <translation>Configurer ce compte XMPP</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
+        <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
+        <translation>Entrer votre login XMPP pour vous connecter avec vos amis qui utilisent Tomahawk !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
+        <source>Login Information</source>
+        <translation>Informations de connexion</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
+        <source>Xmpp ID:</source>
+        <translation>ID XMPP :</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
+        <source>e.g. user@example.com</source>
+        <translation>par exemple utilisateur@exemple.fr</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
+        <source>Password:</source>
+        <translation>Mot de passe :</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
+        <source>An account with this name already exists!</source>
+        <translation>Un compte avec ce nom existe déjà !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
+        <source>Advanced Xmpp Settings</source>
+        <translation>Paramètres XMPP avancés</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
+        <source>Server:</source>
+        <translation>Serveur :</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
+        <source>Port:</source>
+        <translation>Port :</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
+        <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
+        <translation>Beaucoup de serveurs ne supportent pas ceci (GTalk, jabber.org)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
+        <source>Publish currently playing track</source>
+        <translation>Publier la piste en cours de lecture</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
+        <source>Enforce secure connection</source>
+        <translation>Forcer la connexion sécurisée</translation>
+    </message>
+</context>
+<context>
+    <name>XmppSipPlugin</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
+        <source>User Interaction</source>
+        <translation>Interaction utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
+        <source>Host is unknown</source>
+        <translation>L&apos;hôte est inconnu</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
+        <source>Item not found</source>
+        <translation>Objet non trouvé</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
+        <source>Authorization Error</source>
+        <translation>Erreur d&apos;autorisation</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
+        <source>Remote Stream Error</source>
+        <translation>Erreur de lecture à distance</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
+        <source>Remote Connection failed</source>
+        <translation>Erreur de connexion à distance</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
+        <source>Internal Server Error</source>
+        <translation>Erreur interne du serveur</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
+        <source>System shutdown</source>
+        <translation>Arrêt du système</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
+        <source>Conflict</source>
+        <translation>Conflit</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
+        <source>Unknown</source>
+        <translation>Inconnu</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation>Voulez-vous ajouter &lt;b&gt;%1&lt;/b&gt; à votre liste d&apos;amis?</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
+        <source>No Compression Support</source>
+        <translation>Pas de support de la compression</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
+        <source>No Encryption Support</source>
+        <translation>Pas de support du chiffrement</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
+        <source>No Authorization Support</source>
+        <translation>Pas de support de l&apos;authorization</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
+        <source>No Supported Feature</source>
+        <translation>Fonctionnalité non supportée</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
+        <source>Add Friend</source>
+        <translation>Ajouter un ami</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
+        <source>Enter Xmpp ID:</source>
+        <translation>Entrer l&apos;ID XMPP:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
+        <source>Add Friend...</source>
+        <translation>Ajouter un ami...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
+        <source>XML Console...</source>
+        <translation>Console XML...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
+        <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
+        <translation>Désolé -- Je suis une présence automatique utilisé par le lecteur Tomahawk (http://gettomahawk.com). Si vous lisez ce message, la personne que vous essayez de joindre n&apos;est probablement pas connecter, donc essayez plus tard ! Merci !</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
+        <source>Authorize User</source>
+        <translation>Autoriser l&apos;utilisateur</translation>
+    </message>
+</context>
+<context>
+    <name>ZeroconfConfig</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
+        <source>Local Network configuration</source>
+        <translation>Configuration réseau local</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
+        <source>This plugin will automatically find other users running Tomahawk on your local network</source>
+        <translation>Ce plugin va automatiquement trouver les autres utilisateurs de Tomahawk sur votre réseau local</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
+        <source>Connect automatically when Tomahawk starts</source>
+        <translation>Se connecter automatiquement quand Tomahawk démarre</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/lang/tomahawk_i18n.qrc -> tomahawk-0.5.5.tar.bz2/lang/tomahawk_i18n.qrc Changed

tomahawk-0.5.5.tar.bz2/lang/tomahawk_ja.ts Added

@@ -0,0 +1,4036 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja" version="2.0">
+<context>
+    <name>ACLJobDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>ダイアログ</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
+        <source>Description goes here</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
+        <source>Add Account</source>
+        <translation>アカウントを追加</translation>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapperDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
+        <source>Online</source>
+        <translation>オンライン</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
+        <source>Connecting...</source>
+        <translation>接続中...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
+        <source>Offline</source>
+        <translation>オフライン</translation>
+    </message>
+</context>
+<context>
+    <name>ActionCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
+        <source>&amp;Listen Along</source>
+        <translation>共有聴取</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
+        <source>Stop &amp;Listening Along</source>
+        <translation>共有聴取を中止</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
+        <source>&amp;Follow in real-time</source>
+        <translation>実時間にフォロー</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Privately</source>
+        <translation>非公開で聴く</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Publicly</source>
+        <translation>公開で聴く</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
+        <source>&amp;Load Playlist</source>
+        <translation>プレイリストを読み込み</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
+        <source>&amp;Rename Playlist</source>
+        <translation>プレイリスト名を変更</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
+        <source>&amp;Copy Playlist Link</source>
+        <translation>プレイリストリンクをコピー</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
+        <source>&amp;Play</source>
+        <translation>再生</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
+        <source>&amp;Stop</source>
+        <translation>停止</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
+        <source>&amp;Previous Track</source>
+        <translation>前のトラック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
+        <source>&amp;Next Track</source>
+        <translation>次のトラック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
+        <source>&amp;Quit</source>
+        <translation>終了</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>フォーム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="31"/>
+        <source>Other Albums by Artist</source>
+        <translation>他のアルバム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
+        <source>Other Albums by %1</source>
+        <translation>%1の他のアルバム</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
+        <source>All albums from %1</source>
+        <translation>%1のすべてのアルバム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
+        <source>All albums</source>
+        <translation>全アルバム</translation>
+    </message>
+</context>
+<context>
+    <name>ArtistInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>フォーム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
+        <source>Top Hits</source>
+        <translation>大ヒット曲</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
+        <source>Related Artists</source>
+        <translation>似たアーティスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>アルバム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation>このアーティストのアルバムは見つかりませんでした。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AudioControls</name>
+    <message>
+        <location filename="../src/AudioControls.ui" line="75"/>
+        <source>Prev</source>
+        <translation>前へ</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="87"/>
+        <source>Play</source>
+        <translation>再生</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="94"/>
+        <source>Pause</source>
+        <translation>一時停止</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="103"/>
+        <source>Next</source>
+        <translation>次へ</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="229"/>
+        <source>Artist</source>
+        <translation>アーティスト</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="248"/>
+        <source>Album</source>
+        <translation>アルバム</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="277"/>
+        <source>Owner</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation>ソーシャル</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
+        <source>love</source>
+        <translation>Love</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="383"/>
+        <source>Time</source>
+        <translation>時間</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="412"/>
+        <source>Time Left</source>
+        <translation>残り時間</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="493"/>
+        <source>Shuffle</source>
+        <translation>シャッフル</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="506"/>
+        <source>Repeat</source>
+        <translation>リピート</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="544"/>
+        <source>Low</source>
+        <translation>小</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="576"/>
+        <source>High</source>
+        <translation>大</translation>
+    </message>
+</context>
+<context>
+    <name>AudioEngine</name>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CategoryAddItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation>新規プレイリストを作成</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation>新規ステーションを作成</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>New Station</source>
+        <translation>新規ステーション</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>%1 Station</source>
+        <translation>%1 ステーション</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
+        <source>Playlists</source>
+        <translation>プレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
+        <source>Stations</source>
+        <translation>ステーション</translation>
+    </message>
+</context>
+<context>
+    <name>ClearButton</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
+        <source>Clear</source>
+        <translation>クリアー</translation>
+    </message>
+</context>
+<context>
+    <name>ContextWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>インフォメーションバー</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
+        <source>Show Footnotes</source>
+        <translation>脚注を表示</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
+        <source>Hide Footnotes</source>
+        <translation>脚注を隠す</translation>
+    </message>
+</context>
+<context>
+    <name>CrashReporter</name>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="23"/>
+        <source>Tomahawk Crash Reporter</source>
+        <translation>Tomahawkの問題のレポート</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tomahawkがクラッシュしました。その情報をTomahawkに送信してください。安定した機能に改善するためにエラーレポートを用意しています。このレポートはTomahawkの開発者に直接送られます。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation>レポートを送信</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation>送信しない</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
+        <source>Abort</source>
+        <translation>中止する</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
+        <source>You can disable sending crash reports in the configuration dialog.</source>
+        <translation>設定ダイアログでクラッシュレポートの送信を無効にすることができます。
+</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
+        <source>Uploaded %L1 of %L2 KB.</source>
+        <translation>%L1/%L2 KB アップロード完了</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
+        <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
+        <translation>送信完了！ &lt;b&gt;ありがとうございます！&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
+        <source>Failed to send crash info.</source>
+        <translation>クラッシュ情報の送信に失敗しました。</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseCommand_AllAlbums</name>
+    <message>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
+        <source>Unknown</source>
+        <translation>不明</translation>
+    </message>
+</context>
+<context>
+    <name>DelegateConfigWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
+        <source>Delete Account</source>
+        <translation>アカウントを削除</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>このアカウントについて</translation>
+    </message>
+</context>
+<context>
+    <name>DiagnosticsDialog</name>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
+        <source>Tomahawk Diagnostics</source>
+        <translation>Tomahawkの診断</translation>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobalSearchWidget</name>
+    <message>
+        <location filename="../src/SearchBox.ui" line="14"/>
+        <source>Form</source>
+        <translation>フォーム</translation>
+    </message>
+</context>
+<context>
+    <name>IndexingJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
+        <source>Indexing database</source>
+        <translation>データベースのインデックスを作成中</translation>
+    </message>
+</context>
+<context>
+    <name>InfoBar</name>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>インフォメーションバー</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
+        <source>Filter...</source>
+        <translation>フィルター...</translation>
+    </message>
+</context>
+<context>
+    <name>LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <source>Form</source>
+        <translation>フォーム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <source>Scrobble tracks to Last.fm</source>
+        <translation>Last.fmにトラックをscrobbleする</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <source>Username:</source>
+        <translation>ユーザー名:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <source>Password:</source>
+        <translation>パスワード:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <source>Test Login</source>
+        <translation>ログインを確認する</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation>再生履歴をインポートする</translation>
+    </message>
+</context>
+<context>
+    <name>LastfmContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="67"/>
+        <source>Last.fm</source>
+        <translation>Last.fm</translation>
+    </message>
+</context>
+<context>
+    <name>LatchedStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoadXSPF</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="14"/>
+        <source>Load XSPF</source>
+        <translation>XSPFを読み込み</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="22"/>
+        <source>Playlist URL</source>
+        <translation>プレイリストURL</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="29"/>
+        <source>Enter URL...</source>
+        <translation>URLを入力...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="42"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="51"/>
+        <source>Automatically update</source>
+        <translation>自動更新する</translation>
+    </message>
+</context>
+<context>
+    <name>LoadXSPFDialog</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>Load XSPF File</source>
+        <translation>XSPFファイルを読み込む</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>XSPF Files (*.xspf)</source>
+        <translation>XSPFファイル (*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>LocalCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Bookmarks</source>
+        <translation>ブックマーク</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Saved tracks</source>
+        <translation>トラックを保存する</translation>
+    </message>
+</context>
+<context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
+        <source>Enter a title for the new playlist:</source>
+        <translation>新規プレイリストのタイトルを入力:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
+        <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
+        <translation>Tomahawkは新規プレイリストを作成したり、好きな曲を見つける様々な方法を提供しています！</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
+        <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>ジャンルやタグ名を入力すると、Tomahawkが新しいプレイリストに曲を推薦します:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
+        <source>&amp;Create Playlist</source>
+        <translation>新規プレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
+        <source>Create a new playlist</source>
+        <translation>新規プレイリストを作成</translation>
+    </message>
+</context>
+<context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>ニューリリース</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation>アーティスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation>タイトル</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation>作曲者</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation>アルバム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation>トラック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation>時間</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation>ビットレート</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation>変更日</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation>年</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>サイズ</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation>音源</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation>スコア</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
+        <source>played %1 by you</source>
+        <translation>%1を再生しました。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
+        <source>played %1 by %2</source>
+        <translation>%2が%1を再生しました。</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistLargeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <source>played %1 by you</source>
+        <translation>%1を再生しました。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
+        <source>played %1 by %2</source>
+        <translation>%2が%1を再生しました。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
+        <source>added %1</source>
+        <translation>%1を追加しました。</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
+        <source>A playlist by %1, created %2</source>
+        <translation>%2に作成した%1のプレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
+        <source>you</source>
+        <translation>あなた</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
+        <source>All tracks by %1 on album %2</source>
+        <translation>%1のアルバム%2のトラック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
+        <source>All tracks by %1</source>
+        <translation>%1のトラック</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistTypeSelectorDlg</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
+        <source>New Playlist</source>
+        <translation>新規プレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
+        <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
+        <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
+        <source>Name:</source>
+        <translation>名前:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
+        <source>New Playlist...</source>
+        <translation>新規プレイリスト...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
+        <source>Create Manual Playlist</source>
+        <translation>自分でプレイリストを作成する</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
+        <source>Create Automatic Playlist</source>
+        <translation>自動でプレイリストを作成する</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation>このプレイリストには何も入っていません。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
+        <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
+        <translation>プレイリストには何も入っていません。トラックを追加して、音楽を楽しみましょう！</translation>
+    </message>
+</context>
+<context>
+    <name>ProxyDialog</name>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
+        <source>Proxy Settings</source>
+        <translation>プロクシ設定</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
+        <source>Hostname of proxy server</source>
+        <translation>プロキシサーバのホスト</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
+        <source>Host</source>
+        <translation>ホスト</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
+        <source>Port</source>
+        <translation>ポート</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
+        <source>Proxy login</source>
+        <translation>プロキシのログインネーム</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
+        <source>User</source>
+        <translation>ユーザー</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
+        <source>Proxy password</source>
+        <translation>プロキシのパスワード</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
+        <source>No Proxy Hosts:
+(Overrides system proxy)</source>
+        <translation>優先プロキシ:
+(システムプロキシより優先されます)</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
+        <source>localhost *.example.com (space separated)</source>
+        <translation>localhost *.example.com (スペースで区切られます)</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
+        <source>Use proxy for DNS lookups?</source>
+        <translation>正引きDNSにプロキシを使用しますか？</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
+        <source>%n year(s) ago</source>
+        <translation><numerusform>%n年前</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
+        <source>%n year(s)</source>
+        <translation><numerusform>%n年</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
+        <source>%n month(s) ago</source>
+        <translation><numerusform>%nヶ月前</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
+        <source>%n month(s)</source>
+        <translation><numerusform>%nヶ月</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
+        <source>%n week(s) ago</source>
+        <translation><numerusform>%n週間前</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
+        <source>%n week(s)</source>
+        <translation><numerusform>%n週間</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
+        <source>%n day(s) ago</source>
+        <translation><numerusform>%n日前</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
+        <source>%n day(s)</source>
+        <translation><numerusform>%n日</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
+        <source>%n hour(s) ago</source>
+        <translation><numerusform>%n時間前</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n時間</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
+        <source>%1 minutes ago</source>
+        <translation>%1分前</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
+        <source>%1 minutes</source>
+        <translation>%1分</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
+        <source>just now</source>
+        <translation>たった今</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <source>Friend Finders</source>
+        <translation>友達を探す</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
+        <source>Music Finders</source>
+        <translation>音楽を探す</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
+        <source>Status Updaters</source>
+        <translation>ステータスを更新</translation>
+    </message>
+</context>
+<context>
+    <name>QuaZipFilePrivate</name>
+    <message>
+        <location filename="../src/libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation>ZIP/UNZIP API error %1</translation>
+    </message>
+</context>
+<context>
+    <name>QueueView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>インフォメーションバー</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation>キューを表示</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation><numerusform>キューを表示 - %n項目</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation>キューを隠す</translation>
+    </message>
+</context>
+<context>
+    <name>RelatedArtistsContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
+        <source>Related Artists</source>
+        <translation>似たアーティスト</translation>
+    </message>
+</context>
+<context>
+    <name>ResolverConfigDelegate</name>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
+        <source>Not found: %1</source>
+        <translation>見つかりません: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
+        <source>Failed to load: %1</source>
+        <translation>ロードに失敗しました: %1</translation>
+    </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
+        <source>Search</source>
+        <translation>検索</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
+        <source>Search: %1</source>
+        <translation>検索: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
+        <source>Results for &apos;%1&apos;</source>
+        <translation>&apos;%1&apos;の結果</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
+        <source>Collection</source>
+        <translation>コレクション</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
+        <source>Advanced</source>
+        <translation>詳細</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
+        <source>All</source>
+        <translation>すべて</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation>Tomahawkを再起動すると設定変更が反映されます</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
+        <source>Services</source>
+        <translation>サービス</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
+        <source>Install resolver from file</source>
+        <translation>ファイルからリゾルバをインストールする</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>情報</translation>
+    </message>
+</context>
+<context>
+    <name>SocialPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="34"/>
+        <source>Popular New Albums From Your Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="48"/>
+        <source>Most Played Playlists</source>
+        <translation>最も再生しているプレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="63"/>
+        <source>Most Played Tracks You Don&apos;t Have</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceDelegate</name>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
+        <source>Track</source>
+        <translation>トラック</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
+        <source>Album</source>
+        <translation>アルバム</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
+        <source>Artist</source>
+        <translation>アーティスト</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
+        <source>Local</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
+        <source>Top 10</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
+        <source>All available tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
+        <source>Hide</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
+        <source>Recent Albums</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
+        <source>Latest Additions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
+        <source>New Additions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
+        <source>My recent activity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
+        <source>Recent activity from %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
+        <source>Collection</source>
+        <translation>コレクション</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
+        <source>Latest Additions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
+        <source>Recently Played</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation>スーパーコレクション</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceTreeView</name>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
+        <source>&amp;Copy Link</source>
+        <translation>リンクをコピー</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
+        <source>&amp;Delete %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
+        <source>&amp;Export Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
+        <source>Save XSPF</source>
+        <translation>XSPFを保存する</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
+        <source>Playlists (*.xspf)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourcesModel</name>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
+        <source>Collection</source>
+        <translation>コレクション</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
+        <source>Playlist</source>
+        <translation>プレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
+        <source>Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
+        <source>Station</source>
+        <translation>ステーション</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
+        <source>Browse</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
+        <source>Search History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
+        <source>My Music</source>
+        <translation>マイミュージック</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
+        <source>SuperCollection</source>
+        <translation>スーパーコレクション</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
+        <source>Top Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
+        <source>Dashboard</source>
+        <translation>ダッシュボード</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
+        <source>Recently Played</source>
+        <translation>最近聴いたトラック</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
+        <source>Charts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SpotifyConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <source>Form</source>
+        <translation>フォーム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>ログイン</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>ユーザー名</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>パスワード</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>StackedSettingsDialog</name>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
+        <source>Tomahawk Settings</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
+        <source>Local Music Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
+        <source>Path to scan for music files:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
+        <source>The Echo Nest supports keeping track of your catalog metadata
+ and using it to craft personalized radios. Enabling this option
+ will allow you (and all your friends) to create automatic playlists
+ and stations based on your personal taste profile.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
+        <source>Upload collection list to The Echo Nest to enable user radio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
+        <source>Watch for changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
+        <source>Time between scans, in seconds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation>フォーム</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
+        <source>Static Host Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
+        <source>Static Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
+        <source>Proxy Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
+        <source>Send reports after Tomahawk crashed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
+        <source>Add Account</source>
+        <translation>アカウントを追加</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
+        <source>%1 downloads</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
+        <source>Online</source>
+        <translation>オンライン</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
+        <source>Offline</source>
+        <translation>・オフライン</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapper</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
+        <source>Configure this Google Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
+        <source>Google Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
+        <source>Enter your Google login to connect with your friends using Tomahawk!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
+        <source>username@gmail.com</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
+        <source>Connect to Google Talk to find your friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperSip</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
+        <source>Add Friend</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
+        <source>Enter Google Address:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
+        <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
+        <source>Failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
+        <source>Success</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
+        <source>Could not contact server</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>ログイン中...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>ログイン</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
+        <source>Play music from and sync your playlists with Spotify Premium</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
+        <source>Connect to your Twitter followers.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
+        <source>Tweet!</source>
+        <translation>ツイート!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
+        <source>Status: No saved credentials</source>
+        <translation>ステータス: 保存された認証情報がありません</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
+        <source>Authenticate</source>
+        <translation>認証</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
+        <source>Status: Credentials saved for %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
+        <source>De-authenticate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>Tweetin&apos; Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <source>The credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
+        <source>Status: Error validating credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
+        <source>Global Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
+        <source>Direct Message</source>
+        <translation>ダイレクトメッセージ</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
+        <source>Send Message!</source>
+        <translation>メッセージを送信!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
+        <source>@Mention</source>
+        <translation>@メンション</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
+        <source>Send Mention!</source>
+        <translation>メンションを送信!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <source>You must enter a user name for this type of tweet.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <source>Your saved credentials could not be loaded.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <source>Your saved credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>There was an error posting your status -- sorry!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Tweeted!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <source>Your tweet has been posted!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <source>There was an error posting your direct message -- sorry!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Your message has been posted!</source>
+        <translation>あなたのメッセージが投稿されました！</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::XmppAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
+        <source>Log on to your Jabber/XMPP account to connect to your friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::ZeroconfFactory</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
+        <source>Automatically connect to Tomahawks on the local network</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ContextMenu</name>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
+        <source>&amp;Play</source>
+        <translation>再生</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
+        <source>Add to &amp;Queue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
+        <source>&amp;Love</source>
+        <translation>&amp;Love</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
+        <source>&amp;Copy Track Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
+        <source>Un-&amp;Love</source>
+        <translation>Loveじゃないトラック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Items</source>
+        <translation>項目を削除</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Item</source>
+        <translation>項目を削除</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::CustomPlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
+        <source>Top Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
+        <source>Your loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
+        <source>%1&apos;s loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
+        <source>The most loved tracks from all your friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
+        <source>All of your loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
+        <source>All of %1&apos;s loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DropJobNotifier</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation>プレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation>アーティスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation>トラック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation>アルバム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
+        <source>Fetching %1 from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
+        <source>Parsing %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicControlList</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
+        <source>Click to collapse</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="172"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="301"/>
+        <source>Could not find a playable track.
+
+Please change the filters or try again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="230"/>
+        <source>Failed to generate preview with the desired filters</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicSetupWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="53"/>
+        <source>Type:</source>
+        <translation>入力:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="67"/>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
+        <source>Add some filters above to seed this station!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <source>Press Generate to get started!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
+        <source>Add some filters above, and press Generate to get started!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp" line="472"/>
+        <source>Station ran out of tracks!
+
+Try tweaking the filters for a new set of songs to play.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestControl</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="188"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="255"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="276"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="341"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="360"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="425"/>
+        <source>is</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="207"/>
+        <source>from user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="216"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="584"/>
+        <source>No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="235"/>
+        <source>similar to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>Less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>More</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>0 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>500 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>0 secs</source>
+        <translation>0秒</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>3600 secs</source>
+        <translation>3600秒</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>-100 dB</source>
+        <translation>-100dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>100 dB</source>
+        <translation>100dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="343"/>
+        <source>Major</source>
+        <translation>長調</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="344"/>
+        <source>Minor</source>
+        <translation>短調</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
+        <source>C</source>
+        <translation>ハ調</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
+        <source>C Sharp</source>
+        <translation>嬰ハ調</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
+        <source>D</source>
+        <translation>ニ調</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
+        <source>E Flat</source>
+        <translation>変ホ調</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
+        <source>E</source>
+        <translation>ホ調</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
+        <source>F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
+        <source>F Sharp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="369"/>
+        <source>G</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="370"/>
+        <source>A Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="371"/>
+        <source>A</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="372"/>
+        <source>B Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="373"/>
+        <source>B</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
+        <source>Ascending</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="391"/>
+        <source>Descending</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="394"/>
+        <source>Tempo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="395"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="396"/>
+        <source>Loudness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="397"/>
+        <source>Artist Familiarity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
+        <source>Artist Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
+        <source>Song Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
+        <source>Latitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="401"/>
+        <source>Longitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="402"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="403"/>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="404"/>
+        <source>Energy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="405"/>
+        <source>Danceability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="744"/>
+        <source>only by ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="746"/>
+        <source>similar to ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="748"/>
+        <source>with genre ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="754"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="766"/>
+        <source>from no one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="758"/>
+        <source>My Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="762"/>
+        <source>from %1 radio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="785"/>
+        <source>with %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="787"/>
+        <source>about %1 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
+        <source>about %n minute(s) long</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
+        <source>about %1 dB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="793"/>
+        <source>at around %1%2 %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="798"/>
+        <source>in %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="803"/>
+        <source>in a %1 key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="813"/>
+        <source>sorted in %1 %2 order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="818"/>
+        <source>with a %1 mood</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="823"/>
+        <source>in a %1 style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestSteerer</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
+        <source>Steer this station:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <source>Much less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <source>Less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <source>A bit less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <source>Keep at current</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <source>A bit more</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <source>More</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <source>Much more</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
+        <source>Tempo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
+        <source>Loudness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
+        <source>Danceability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
+        <source>Energy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
+        <source>Song Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <source>Artist Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
+        <source>Artist Familiarity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
+        <source>By Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
+        <source>Enter a description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
+        <source>Apply steering command</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
+        <source>Reset all steering commands</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::GroovesharkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
+        <source>Error fetching Grooveshark information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::ChartsPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
+        <source>Top Overall</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
+        <source>Artists</source>
+        <translation>アーティスト</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
+        <source>Albums</source>
+        <translation>アルバム</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
+        <source>Tracks</source>
+        <translation>トラック</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
+        <source>Top Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
+        <source>Hyped Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
+        <source>Top Artists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
+        <source>Hyped Artists</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>アルバム</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ItunesParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
+        <source>Error fetching iTunes information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::JSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
+        <source>New Playlist</source>
+        <translation>新規プレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Failed to save tracks</source>
+        <translation>トラックの保存に失敗しました。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>XSPF Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::LatchManager</name>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="86"/>
+        <source>&amp;Catch Up</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="123"/>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="144"/>
+        <source>&amp;Listen Along</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Query</name>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
+        <source> and </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
+        <source>You</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
+        <source>you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>and</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>%n other(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
+        <source>%1 people</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
+        <source>loved this track</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::RdioParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
+        <source>Error fetching Rdio information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ShortenedLinkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
+        <source>Network error parsing shortened link!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Source</name>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
+        <source>Scanning (%L1 tracks)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
+        <source>Scanning</source>
+        <translation>走査中</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
+        <source>Checking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
+        <source>Saving (%1%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::SpotifyParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
+        <source>Error fetching Spotify information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkApp</name>
+    <message>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
+        <source>My Collection</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkOAuthTwitter</name>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>Twitter PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>After authenticating on Twitter's web site,
+enter the displayed PIN number here:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkTrayIcon</name>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
+        <source>Hide Tomahawk Window</source>
+        <translation>Tomahawkのウインドウを隠す</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
+        <source>Show Tomahawk Window</source>
+        <translation>Tomahawkのウインドウを表示</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
+        <source>Currently not playing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
+        <source>Play</source>
+        <translation>再生</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
+        <source>Pause</source>
+        <translation>一時停止</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkWindow</name>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
+        <source>Tomahawk</source>
+        <translation>Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
+        <source>&amp;Settings</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
+        <source>&amp;Controls</source>
+        <translation>&amp;制御</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
+        <source>&amp;Network</source>
+        <translation>ネットワーク</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
+        <source>&amp;Window</source>
+        <translation>ウインドウ</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
+        <source>&amp;Help</source>
+        <translation>ヘルプ</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
+        <source>&amp;Quit</source>
+        <translation>終了</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
+        <source>Go &amp;Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
+        <source>Add &amp;Friend...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
+        <source>U&amp;pdate Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
+        <source>Update Collection</source>
+        <translation>コレクションを更新</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
+        <source>&amp;Configure Tomahawk...</source>
+        <translation>Tomahawkを設定...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
+        <source>Load &amp;XSPF...</source>
+        <translation>XSPFを読み込み...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
+        <source>Create &amp;New Playlist...</source>
+        <translation>新規プレイリストを作成...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
+        <source>About &amp;Tomahawk...</source>
+        <translation>Tomahawk について...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
+        <source>Create New &amp;Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
+        <source>Create New &amp;Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
+        <source>Show Offline Sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
+        <source>Hide Offline Sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
+        <source>Minimize</source>
+        <translation>最小化</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
+        <source>Zoom</source>
+        <translation>ズーム</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
+        <source>Meta+Ctrl+Z</source>
+        <translation>
+Meta+Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
+        <source>Diagnostics...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
+        <source>Fully &amp;Rescan Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
+        <source>Fully Rescan Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
+        <source>Play</source>
+        <translation>再生</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
+        <source>Space</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
+        <source>Previous</source>
+        <translation>前へ</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
+        <source>Next</source>
+        <translation>次へ</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation>プレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
+        <source>Global Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
+        <source>Check For Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
+        <source>Connect To Peer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
+        <source>Enter peer address:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
+        <source>Enter peer port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
+        <source>Enter peer key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>XSPF Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Failed to save tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation>ステーション</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Create New Station</source>
+        <translation>新規ステーションを作成</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Name:</source>
+        <translation>名前:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation>プレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
+        <source>Pause</source>
+        <translation>一時停止</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
+        <source>Go &amp;offline</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
+        <source>Go &amp;online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
+        <source>Authentication Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
+        <source>%1 by %2</source>
+        <comment>track, artist name</comment>
+        <translation>%1 by %2</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
+        <source>%1 - %2</source>
+        <comment>current track, some window title</comment>
+        <translation>%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation>Copyright 2010 - 2012</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation>Thanks to:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation>Tomahawkについて</translation>
+    </message>
+</context>
+<context>
+    <name>TopTracksContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
+        <source>Top Hits</source>
+        <translation>TOP HITS</translation>
+    </message>
+</context>
+<context>
+    <name>TrackInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>フォーム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation>カバー</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
+        <source>Track</source>
+        <translation>トラック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation>アーティスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation>アルバム</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation>統計</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation>似ているトラック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation>この曲に似ているトラックが見つかりませんでした。</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation><numerusform>このトラックは%n回聴いています。</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation>このトラックを一度も聴いていません。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation>初めてこの曲を聴いたのは、%1です。</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation><numerusform>%1を%n回聴いています。</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation>%1を一度も聴いていません。</translation>
+    </message>
+</context>
+<context>
+    <name>TrackView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TransferStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>from</source>
+        <translation>から</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>to</source>
+        <translation>まで</translation>
+    </message>
+</context>
+<context>
+    <name>TreeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
+        <source>Unknown</source>
+        <translation>不明</translation>
+    </message>
+</context>
+<context>
+    <name>TreeModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
+        <source>All Artists</source>
+        <translation>すべてのアーティスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
+        <source>My Collection</source>
+        <translation>マイコレクション</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
+        <source>Collection of %1</source>
+        <translation>%1のコレクション</translation>
+    </message>
+</context>
+<context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>%1に一致する結果は見つかりませんでした。</translation>
+    </message>
+</context>
+<context>
+    <name>TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
+        <source>Configure this Twitter account</source>
+        <translation>このTwitterアカウントを設定する</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
+        <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
+        <translation>TwitterプラグインはTomahawkを使っているTwitterの友達があなたの曲を見つけて再生したり、あなたにメッセージを投稿することを許可します。</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
+        <source>Status: No saved credentials</source>
+        <translation>ステータス: 保存された認証情報がありません</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
+        <source>Authenticate with Twitter</source>
+        <translation>Twitterで認証する</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
+        <source>Twitter Connections</source>
+        <translation>Twitter接続</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
+        <source>
+If you only want to post tweets, you're done.
+
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.</source>
+        <translation>
+ツイートするだけなら、これで設定は完了です。
+
+Twitterを使っている友達にTomahawkを接続したいなら、ツイートの種類を選択し、以下のボタンを押してメッセージを送信して下さい。ダイレクトメッセージを使用するためにお互いのフォローが必要です。時間がかかる場合がありますので、しばらくお待ち下さい。
+
+ボタンを押してもう一度ツイートを送信すると、メッセージをいつでも再送信できます。</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
+        <source>Select the kind of tweet you would like, then press the button to post it:</source>
+        <translation>ツイートの種類を選択し、ボタンを押して投稿してください:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
+        <source>Global Tweet</source>
+        <translation>ツイートする</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
+        <source>@Mention</source>
+        <translation>@メンション</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
+        <source>Direct Message</source>
+        <translation>ダイレクトメッセージ</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
+        <source>e.g. @tomahawk</source>
+        <translation>(例) @tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
+        <source>Send Message</source>
+        <translation>メッセージを送信</translation>
+    </message>
+</context>
+<context>
+    <name>ViewManager</name>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation>コレクションのスキャンが完了したら、トラックはここに表示されます。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation>このコレクションには何も入っていません。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
+        <source>SuperCollection</source>
+        <translation>スーパーコレクション</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
+        <source>Combined libraries of all your online friends</source>
+        <translation>オンラインの友達全員のライブラリ</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation>最近再生したトラック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation>友達の最近再生したトラック</translation>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
+        <source>Recent Additions</source>
+        <translation>最近追加した項目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
+        <source>Newest Stations &amp; Playlists</source>
+        <translation>最新のステーション &amp; プレイリスト</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
+        <source>Recently Played Tracks</source>
+        <translation>最近再生したトラック</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
+        <source>No recently created playlists in your network.</source>
+        <translation>ネットワークに最近作成したプレイリストはありません。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
+        <source>Welcome to Tomahawk</source>
+        <translation>Tomahawkへようこそ</translation>
+    </message>
+</context>
+<context>
+    <name>WhatsHotWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
+        <source>Charts</source>
+        <translation>チャート</translation>
+    </message>
+</context>
+<context>
+    <name>WikipediaContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="42"/>
+        <source>Wikipedia</source>
+        <translation>ウィキペディア</translation>
+    </message>
+</context>
+<context>
+    <name>XMPPBot</name>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
+        <source>
+Terms for %1:
+</source>
+        <translation>
+%1の語句:
+</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
+        <source>No terms found, sorry.</source>
+        <translation>語句と一致する結果は見つかりませんでした。</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
+        <source>
+Hotttness for %1: %2
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
+        <source>
+Familiarity for %1: %2
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
+        <source>
+Lyrics for &quot;%1&quot; by %2:
+
+%3
+</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
+        <source>Failed to parse contents of XSPF playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
+        <source>Some playlist entries were found without artist and track name, they will be omitted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
+        <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
+        <source>New Playlist</source>
+        <translation>新規プレイリスト</translation>
+    </message>
+</context>
+<context>
+    <name>XmlConsole</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
+        <source>Xml stream console</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
+        <source>Filter</source>
+        <translation>フィルター</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
+        <source>Save log</source>
+        <translation>ログを保存</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
+        <source>Disabled</source>
+        <translation>無効</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
+        <source>By JID</source>
+        <translation>JIDの順に分類する</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
+        <source>By namespace uri</source>
+        <translation>ネームスペースのURIの順に分類する</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
+        <source>By all attributes</source>
+        <translation>すべての属性の順に分類する</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
+        <source>Visible stanzas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
+        <source>Information query</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
+        <source>Message</source>
+        <translation>メッセージ</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
+        <source>Presence</source>
+        <translation>状態</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
+        <source>Custom</source>
+        <translation>カスタム</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
+        <source>Save XMPP log to file</source>
+        <translation>XMPPのログをファイルに保存する</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
+        <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
+        <translation>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</translation>
+    </message>
+</context>
+<context>
+    <name>XmppConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
+        <source>Xmpp Configuration</source>
+        <translation>XMPP設定</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
+        <source>Configure this Xmpp account</source>
+        <translation>XMPPアカウントを設定</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
+        <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
+        <translation>Tomahawkを使っている友達とつながるためにXMPPログインを入力してください。</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
+        <source>Login Information</source>
+        <translation>ログイン情報</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
+        <source>Xmpp ID:</source>
+        <translation>XMPP ID:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
+        <source>e.g. user@example.com</source>
+        <translation>(例) user@example.com</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
+        <source>Password:</source>
+        <translation>パスワード:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
+        <source>An account with this name already exists!</source>
+        <translation>この名前のアカウントは既に存在しています！</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
+        <source>Advanced Xmpp Settings</source>
+        <translation>XMPPの詳細設定</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
+        <source>Server:</source>
+        <translation>サーバー:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
+        <source>Port:</source>
+        <translation>ポート:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
+        <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
+        <translation>多くのサーバで対応していません(例: GTalk, jabber.org)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
+        <source>Publish currently playing track</source>
+        <translation>今現在再生しているトラックを公開する</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
+        <source>Enforce secure connection</source>
+        <translation>安全な接続を強制する</translation>
+    </message>
+</context>
+<context>
+    <name>XmppSipPlugin</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
+        <source>User Interaction</source>
+        <translation>ユーザインタラクション</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
+        <source>Host is unknown</source>
+        <translation>不明なホスト</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
+        <source>Item not found</source>
+        <translation>項目が見つかりません</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
+        <source>Authorization Error</source>
+        <translation>認証エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
+        <source>Remote Stream Error</source>
+        <translation>配信エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
+        <source>Remote Connection failed</source>
+        <translation>接続に失敗しました</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
+        <source>Internal Server Error</source>
+        <translation>サーバ内部エラー</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
+        <source>System shutdown</source>
+        <translation>システム終了</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
+        <source>Conflict</source>
+        <translation>コンフリクト</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
+        <source>Unknown</source>
+        <translation>不明</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
+        <source>No Compression Support</source>
+        <translation>圧縮に対応していません</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
+        <source>No Encryption Support</source>
+        <translation>暗号化に対応していません</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
+        <source>No Authorization Support</source>
+        <translation>Authorizationに対応していません</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
+        <source>No Supported Feature</source>
+        <translation>未対応昨機能</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
+        <source>Add Friend</source>
+        <translation>友達を追加</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
+        <source>Enter Xmpp ID:</source>
+        <translation>XMPP IDを入力:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
+        <source>Add Friend...</source>
+        <translation>友達を追加...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
+        <source>XML Console...</source>
+        <translation>XMLコンソール...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
+        <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
+        <source>Authorize User</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ZeroconfConfig</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>フォーム</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
+        <source>Local Network configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
+        <source>This plugin will automatically find other users running Tomahawk on your local network</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
+        <source>Connect automatically when Tomahawk starts</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/lang/tomahawk_pl.ts -> tomahawk-0.5.5.tar.bz2/lang/tomahawk_pl.ts Changed

@@ -1,43 +1,45 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.0">
 <context>
-    <name>ACLRegistry</name>
+    <name>ACLJobDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="140"/>
-        <source>Connect to Peer?</source>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="141"/>
-        <source>Another Tomahawk instance that claims to be owned by %1 is attempting to connect to you. Select whether to allow or deny this connection.
-
-Remember: Only allow peers to connect if you trust who they are and if you have the legal right for them to stream music from you.</source>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="142"/>
-        <source>Deny</source>
-        <translation>Odmów</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="143"/>
-        <source>Allow</source>
-        <translation>Zezwól</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AccountFactoryWrapper</name>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
         <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="30"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
         <source>Description goes here</source>
-        <translation type="unfinished"/>
+        <translation>Tutaj pojawi się opis</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.cpp" line="41"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
         <source>Add Account</source>
         <translation>Dodaj Konto</translation>
     </message>
@@ -45,17 +47,17 @@
 <context>
     <name>AccountFactoryWrapperDelegate</name>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="105"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
         <source>Online</source>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="110"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
         <source>Connecting...</source>
         <translation>Łączenie...</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="115"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
@@ -63,69 +65,69 @@
 <context>
     <name>ActionCollection</name>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="43"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
         <source>&amp;Listen Along</source>
         <translation>&amp;Słuchaj razem</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="46"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
         <source>Stop &amp;Listening Along</source>
         <translation>Przestań &amp;Słuchać razem</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="50"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
         <source>&amp;Follow in real-time</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Podążaj na bieżąco</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Privately</source>
         <translation>&amp;Słuchaj Prywatnie</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Publicly</source>
         <translation>&amp;Słuchaj Publicznie</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="61"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
         <source>&amp;Load Playlist</source>
         <translation>&amp;Załaduj listę</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="62"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
         <source>&amp;Rename Playlist</source>
         <translation>&amp;Zmień nazwę listy</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="63"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
         <source>&amp;Copy Playlist Link</source>
         <translation>&amp;Skopiuj link listy</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="64"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
         <source>&amp;Play</source>
         <translation>&amp;Odtwarzaj</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="65"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
         <source>&amp;Stop</source>
         <translation>&amp;Zatrzymaj</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
         <source>&amp;Previous Track</source>
         <translation>&amp;Poprzednia piosenka</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="67"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
         <source>&amp;Next Track</source>
         <translation>&amp;Następna piosenka</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="68"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
         <source>&amp;Quit</source>
         <translation>&amp;Wyjdź</translation>
     </message>
@@ -143,30 +145,17 @@
         <translation>Inne albumy artysty</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="74"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="120"/>
-        <source>Click to show Official Tracks</source>
-        <translation>Kliknij aby pokazać Oficjalne Utwory</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="72"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="118"/>
-        <source>Click to show SuperCollection Tracks</source>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="79"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="136"/>
-        <source>Click to show SuperCollection Albums</source>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="138"/>
-        <source>Click to show Official Albums</source>
-        <translation>Kliknij aby pokazać Oficjalnie Wydane Albumy</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="205"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
         <source>Other Albums by %1</source>
         <translation>Inne albumy %1</translation>
     </message>
@@ -174,36 +163,18 @@
 <context>
     <name>AlbumModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="145"/>
-        <source>Album</source>
-        <translation>Album</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="260"/>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="302"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
         <source>All albums from %1</source>
         <translation>Wszystkie albumy %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="304"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
         <source>All albums</source>
         <translation>Wszystkie albumy</translation>
     </message>
 </context>
 <context>
-    <name>AlbumView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="155"/>
-        <source>After you have scanned your music collection you will find your latest album additions right here.</source>
-        <translation>Po zeskanowaniu swojej kolekcji muzycznej znajdziesz ostatnio dodane albumy właśnie tutaj.</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="157"/>
-        <source>This collection doesn&apos;t have any recent albums.</source>
-        <translation>Ta kolekcja nie zawiera żadnych nowo dodanych albumów.</translation>
-    </message>
-</context>
-<context>
     <name>ArtistInfoWidget</name>
     <message>
         <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
@@ -211,119 +182,120 @@
         <translation>Formularz</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
         <source>Top Hits</source>
         <translation>Hity na Topie</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
         <source>Related Artists</source>
         <translation>Powiązani artyści</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="77"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
         <source>Albums</source>
         <translation>Albumy</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="86"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="125"/>
-        <source>Click to show SuperCollection Albums</source>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="127"/>
-        <source>Click to show Official Albums</source>
-        <translation>Kliknij aby pokazać Oficjalnie Wydane Albumy</translation>
-    </message>
-</context>
-<context>
-    <name>ArtistView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="272"/>
-        <source>After you have scanned your music collection you will find your tracks right here.</source>
-        <translation>Po zeskanowaniu swojej kolekcji muzycznej znajdziesz utwory właśnie tutaj.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="274"/>
-        <source>This collection is currently empty.</source>
-        <translation>Ta kolekcja jest aktualnie pusta.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="291"/>
-        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
-        <translation>Przepraszamy, twój filtr %1&apos; nie pasuje do żadnych wyników.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AudioControls</name>
     <message>
-        <location filename="../src/audiocontrols.ui" line="75"/>
+        <location filename="../src/AudioControls.ui" line="75"/>
         <source>Prev</source>
         <translation>Poprzedni</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="87"/>
+        <location filename="../src/AudioControls.ui" line="87"/>
         <source>Play</source>
         <translation>Odtwarzaj</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="94"/>
+        <location filename="../src/AudioControls.ui" line="94"/>
         <source>Pause</source>
         <translation>Pauza</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="103"/>
+        <location filename="../src/AudioControls.ui" line="103"/>
         <source>Next</source>
         <translation>Następny</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="214"/>
+        <location filename="../src/AudioControls.ui" line="229"/>
         <source>Artist</source>
         <translation>Artysta</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="236"/>
+        <location filename="../src/AudioControls.ui" line="248"/>
         <source>Album</source>
         <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="265"/>
+        <location filename="../src/AudioControls.ui" line="277"/>
         <source>Owner</source>
         <translation>Właściciel</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="302"/>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
         <source>love</source>
         <translation>ulubione</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="346"/>
+        <location filename="../src/AudioControls.ui" line="383"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="375"/>
+        <location filename="../src/AudioControls.ui" line="412"/>
         <source>Time Left</source>
         <translation>Pozostały czas</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="453"/>
+        <location filename="../src/AudioControls.ui" line="493"/>
         <source>Shuffle</source>
         <translation>Losowo</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="466"/>
+        <location filename="../src/AudioControls.ui" line="506"/>
         <source>Repeat</source>
         <translation>Powtarzaj</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="504"/>
+        <location filename="../src/AudioControls.ui" line="544"/>
         <source>Low</source>
         <translation>Nisko</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="536"/>
+        <location filename="../src/AudioControls.ui" line="576"/>
         <source>High</source>
         <translation>Wysoko</translation>
     </message>
@@ -331,41 +303,42 @@
 <context>
     <name>AudioEngine</name>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="199"/>
-        <source>Tomahawk is stopped.</source>
-        <translation>Tomahawk jest zatrzymany.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="369"/>
-        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
-        <translation>Tomahawk odtwarza &quot;%1&quot; wykonawcy %2%3.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="372"/>
-        <source>on album %1</source>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CategoryAddItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="61"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="100"/>
-        <source>New Playlist</source>
-        <translation>Nowa lista</translation>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="63"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>New Station</source>
         <translation>Nowa stacja</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>%1 Station</source>
         <translation>Stacja %1</translation>
     </message>
@@ -373,12 +346,12 @@
 <context>
     <name>CategoryItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="63"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
         <source>Playlists</source>
         <translation>Listy</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="65"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
         <source>Stations</source>
         <translation>Stacje</translation>
     </message>
@@ -386,33 +359,12 @@
 <context>
     <name>ClearButton</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/clearbutton.cpp" line="38"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
         <source>Clear</source>
         <translation>Wyczyść</translation>
     </message>
 </context>
 <context>
-    <name>CollectionFlatModel</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="72"/>
-        <source>My Collection</source>
-        <translation>Moja Kolekcja</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="74"/>
-        <source>Collection of %1</source>
-        <translation>Kolekcja %1</translation>
-    </message>
-</context>
-<context>
-    <name>CollectionView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionview.cpp" line="85"/>
-        <source>This collection is empty.</source>
-        <translation>Ta kolekcja jest pusta.</translation>
-    </message>
-</context>
-<context>
     <name>ContextWidget</name>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
@@ -421,12 +373,12 @@
     </message>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="344"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
         <source>Show Footnotes</source>
         <translation>Pokaż przypisy</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="338"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
         <source>Hide Footnotes</source>
         <translation>Schowaj przypisy</translation>
     </message>
@@ -438,39 +390,49 @@
         <source>Tomahawk Crash Reporter</source>
         <translation>Agent zgłaszania awarii Tomahawka</translation>
     </message>
-    <message>
+    <message utf8="true">
         <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
-        <source>&lt;p&gt;&lt;b&gt;Sorry!&lt;/b&gt;&amp;nbsp;Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;b&gt;Przepraszamy!&lt;/b&gt;&amp;nbsp;Tomahawk uległ awarii. Informacja o incydencie zostanie teraz wysłana do kwatery głównej programu, abyśmy mogli poprawić błędy.&lt;/p&gt;</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="172"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
         <source>Abort</source>
         <translation>Przerwij</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="192"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
         <source>You can disable sending crash reports in the configuration dialog.</source>
         <translation>Możesz wyłączyć zgłaszanie awarii w ustawieniach.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="153"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
         <source>Uploaded %L1 of %L2 KB.</source>
         <translation>Wysłano %L1 z %L2 KB.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="167"/>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="183"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="176"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
         <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
         <translation>Wysłano! &lt;b&gt;Wielkie dzięki&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
         <source>Failed to send crash info.</source>
         <translation>Nie udało sie wysłać informacji o awarii.</translation>
     </message>
@@ -478,7 +440,7 @@
 <context>
     <name>DatabaseCommand_AllAlbums</name>
     <message>
-        <location filename="../src/libtomahawk/database/databasecommand_allalbums.cpp" line="109"/>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
@@ -486,41 +448,43 @@
 <context>
     <name>DelegateConfigWrapper</name>
     <message>
-        <location filename="../src/delegateconfigwrapper.cpp" line="61"/>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
         <source>Delete Account</source>
+        <translation>Usuń Konto</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DiagnosticsDialog</name>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="20"/>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
         <source>Tomahawk Diagnostics</source>
         <translation>Diagnostyka Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="38"/>
-        <source>Update</source>
-        <translation>Aktualizuj</translation>
-    </message>
-    <message>
-        <location filename="../src/diagnosticsdialog.ui" line="45"/>
-        <source>Copy to Clipboard</source>
-        <translation>Skopiuj do schowka</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DropJob</name>
     <message>
-        <location filename="../src/libtomahawk/dropjob.cpp" line="832"/>
-        <source>No tracks found for given %1</source>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GlobalSearchWidget</name>
     <message>
-        <location filename="../src/searchbox.ui" line="14"/>
+        <location filename="../src/SearchBox.ui" line="14"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
@@ -530,70 +494,52 @@
     <message>
         <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
         <source>Indexing database</source>
-        <translation type="unfinished"/>
+        <translation>Indeksowanie bazy danych</translation>
     </message>
 </context>
 <context>
     <name>InfoBar</name>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.ui" line="26"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="87"/>
-        <source>Automatically update</source>
-        <translation>Aktualizuj automatycznie</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="95"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
         <source>Filter...</source>
         <translation>Filtruj...</translation>
     </message>
 </context>
 <context>
-    <name>JobStatusView</name>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Searching For</source>
-        <translation>Szukanie</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Pending</source>
-        <translation>w trakcie</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="94"/>
-        <source>Idle</source>
-        <translation>Bezczynny</translation>
-    </message>
-</context>
-<context>
     <name>LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
         <source>Scrobble tracks to Last.fm</source>
-        <translation type="unfinished"/>
+        <translation>Skrobluj utwory do Last.fm</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
         <source>Username:</source>
-        <translation type="unfinished"/>
+        <translation>Użytkownik:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
         <source>Password:</source>
-        <translation type="unfinished"/>
+        <translation>Hasło:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
         <source>Test Login</source>
+        <translation>Test logowania</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -609,8 +555,8 @@
     <name>LatchedStatusItem</name>
     <message>
         <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
-        <source>%1 is listening along to you!</source>
-        <translation>%1 słucha razem z tobą!</translation>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -623,7 +569,7 @@
     <message>
         <location filename="../src/LoadXSPFDialog.ui" line="22"/>
         <source>Playlist URL</source>
-        <translation type="unfinished"/>
+        <translation>URL Listy odtwarzania</translation>
     </message>
     <message>
         <location filename="../src/LoadXSPFDialog.ui" line="29"/>
@@ -644,12 +590,12 @@
 <context>
     <name>LoadXSPFDialog</name>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>Load XSPF File</source>
         <translation>Załaduj plik XSPF</translation>
     </message>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>XSPF Files (*.xspf)</source>
         <translation>Pliki XSPF (*.xspf)</translation>
     </message>
@@ -657,53 +603,256 @@
 <context>
     <name>LocalCollection</name>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Bookmarks</source>
         <translation>Zakładki</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Saved tracks</source>
         <translation>Zapisane piosenki</translation>
     </message>
 </context>
 <context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>NewPlaylistWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="20"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
         <source>Enter a title for the new playlist:</source>
         <translation>Wprowadź nazwę dla nowej listy:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
         <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
-        <translation>Tomahawk oferuje różne sposoby pomocy w tworzeniu list i poszukiwaniu muzyki, którą lubisz!</translation>
+        <translation>Tomahawk oferuje różne sposoby pomocy w tworzeniu list i poszukiwaniu twojej ulubionej muzyki!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="47"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
         <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>Podaj tylko tag lub gatunek, a Tomahawk zasugeruje kilka piosenek, żeby pomóc ci zacząć z nową listą:</translation>
+        <translation>Jeśli podasz chociaż jeden tag lub gatunek, Tomahawk postara się zasugerować ci kilka piosenek na dobry początek:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.cpp" line="43"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
         <source>&amp;Create Playlist</source>
         <translation>&amp;Utwórz Listę</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.h" line="50"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
         <source>Create a new playlist</source>
         <translation>Utwórz nową listę</translation>
     </message>
 </context>
 <context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>Nowe Wydania</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PlaylistItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="162"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
         <source>played %1 by you</source>
         <translation>odtworzone %1 przez ciebie</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="164"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
         <source>played %1 by %2</source>
         <translation>odtworzone %1 przez %2</translation>
     </message>
@@ -711,40 +860,40 @@
 <context>
     <name>PlaylistLargeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="156"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
         <source>played %1 by you</source>
-        <translation type="unfinished"/>
+        <translation>odtworzone %1 przez ciebie</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
         <source>played %1 by %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="165"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
         <source>added %1</source>
-        <translation type="unfinished"/>
+        <translation>dodano %1</translation>
     </message>
 </context>
 <context>
     <name>PlaylistModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
         <source>A playlist by %1, created %2</source>
-        <translation>Lista %1, utworzona %2</translation>
+        <translation>%1 lista, utworzona %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="78"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
         <source>you</source>
-        <translation>ty</translation>
+        <translation>Twoja</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
         <source>All tracks by %1 on album %2</source>
         <translation>Wszystkie piosenki %1 z albumu %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="152"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
         <source>All tracks by %1</source>
         <translation>Wszystkie piosenki %1</translation>
     </message>
@@ -752,37 +901,37 @@
 <context>
     <name>PlaylistTypeSelectorDlg</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="32"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
         <source>New Playlist</source>
         <translation>Nowa Lista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="49"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
         <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
-        <translation>Po prostu zwykła stara lista... Nazwij, upuść na nią trochę piosenek i gotowe!</translation>
+        <translation>Po prostu zwykła stara lista... Nazwij ją, upuść na nią trochę piosenek i gotowe!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="75"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
         <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
         <translation>Nie wiesz dokładnie czego chcesz? Daj Tomahawkowi kilka wskazówek i pozwól stworzyć listę za ciebie!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="92"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="102"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
         <source>New Playlist...</source>
         <translation>Nowa lista...</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="113"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
         <source>Create Manual Playlist</source>
         <translation>Utwórz Ręczną Listę</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="123"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
         <source>Create Automatic Playlist</source>
         <translation>Utwórz Automatyczną Listę</translation>
     </message>
@@ -790,7 +939,12 @@
 <context>
     <name>PlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistview.cpp" line="145"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
         <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
         <translation>Ta lista jest aktualnie pusta. Dodaj do niej trochę piosenek i ciesz się muzyką!</translation>
     </message>
@@ -798,63 +952,58 @@
 <context>
     <name>ProxyDialog</name>
     <message>
-        <location filename="../src/proxydialog.ui" line="17"/>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
         <source>Proxy Settings</source>
         <translation>Ustawienia Proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="70"/>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
         <source>Hostname of proxy server</source>
-        <translation>Nazwa hosta serwera proxy</translation>
+        <translation>Host serwera proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="77"/>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="84"/>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="104"/>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
         <source>Proxy login</source>
         <translation>Login Proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="111"/>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
         <source>User</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="118"/>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="128"/>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
         <source>Proxy password</source>
         <translation>Hasło Proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="135"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../src/proxydialog.ui" line="142"/>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
         <source>No Proxy Hosts:
 (Overrides system proxy)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="150"/>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
         <source>localhost *.example.com (space separated)</source>
         <translation>localhost *.example.com (oddzielone spacją)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="167"/>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
         <source>Use proxy for DNS lookups?</source>
         <translation>Używać proxy dla zapytań DNS?</translation>
     </message>
@@ -862,82 +1011,82 @@
 <context>
     <name>QObject</name>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="214"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
         <source>%n year(s) ago</source>
         <translation><numerusform>%n rok temu</numerusform><numerusform>%n lata temu</numerusform><numerusform>%n lat temu</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="216"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
         <source>%n year(s)</source>
         <translation><numerusform>%n rok</numerusform><numerusform>%n lata</numerusform><numerusform>%n lat</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="222"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
         <source>%n month(s) ago</source>
         <translation><numerusform>%n miesiąc temu</numerusform><numerusform>%n miesiące temu</numerusform><numerusform>%n miesięcy temu</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
         <source>%n month(s)</source>
         <translation><numerusform>%n miesiąc</numerusform><numerusform>%n miesiące</numerusform><numerusform>%n miesięcy</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="230"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
         <source>%n week(s) ago</source>
         <translation><numerusform>%n tydzień temu</numerusform><numerusform>%n tygodnie temu</numerusform><numerusform>%n tygodni temu</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="232"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
         <source>%n week(s)</source>
         <translation><numerusform>%n tydzień</numerusform><numerusform>%n tygodnie</numerusform><numerusform>%n tygodni</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="238"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>%n dzień temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="240"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
         <source>%n day(s)</source>
         <translation><numerusform>%n dzień</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="246"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>%n godzinę temu</numerusform><numerusform>%n godziny temu</numerusform><numerusform>%n godzin temu</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="248"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
         <source>%n hour(s)</source>
         <translation><numerusform>%n godzinę</numerusform><numerusform>%n godziny</numerusform><numerusform>%n godzin</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="254"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
         <source>%1 minutes ago</source>
         <translation>%1 minut temu</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="256"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
         <source>%1 minutes</source>
         <translation>%1 minut</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="260"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
         <source>just now</source>
         <translation>przed chwilą</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="34"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
         <source>Friend Finders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
         <source>Music Finders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="39"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
         <source>Status Updaters</source>
         <translation type="unfinished"/>
     </message>
@@ -953,26 +1102,31 @@
 <context>
     <name>QueueView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="26"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="41"/>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="120"/>
-        <source>Show Queue</source>
-        <translation>Pokaż Kolejkę</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="130"/>
-        <source>Hide Queue</source>
-        <translation>Schowaj Kolejkę</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RelatedArtistsContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
         <source>Related Artists</source>
         <translation>Podobni Artyści</translation>
     </message>
@@ -980,12 +1134,12 @@
 <context>
     <name>ResolverConfigDelegate</name>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="110"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
         <source>Not found: %1</source>
-        <translation>Nie znaleziono %1</translation>
+        <translation>Nie znaleziono: %1</translation>
     </message>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="113"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
         <source>Failed to load: %1</source>
         <translation>Nie udało sie załadować: %1</translation>
     </message>
@@ -993,7 +1147,7 @@
 <context>
     <name>SearchLineEdit</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/searchlineedit.cpp" line="58"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
@@ -1001,12 +1155,12 @@
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="54"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
         <source>Search: %1</source>
         <translation>Wyszukaj: %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="55"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
         <source>Results for &apos;%1&apos;</source>
         <translation>Wyniki dla &apos;%1&apos;</translation>
     </message>
@@ -1014,39 +1168,49 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="245"/>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
         <source>Collection</source>
         <translation>Kolekcje</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="252"/>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
         <source>Advanced</source>
         <translation>Zaawansowane</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="124"/>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
         <source>All</source>
+        <translation>Wszystkie</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="238"/>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
         <source>Services</source>
-        <translation type="unfinished"/>
+        <translation>Usługi</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="396"/>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
         <source>Install resolver from file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Information</source>
-        <translation>Informacja</translation>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Changing this setting requires a restart of Tomahawk!</source>
-        <translation>Zmiana tych ustawień wymaga ponownego uruchomienia Tomahawka!</translation>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>Informacja</translation>
     </message>
 </context>
 <context>
@@ -1068,89 +1232,127 @@
     </message>
 </context>
 <context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>Okładka</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation>pozostało znaków: %1</translation>
+    </message>
+</context>
+<context>
     <name>SourceDelegate</name>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="55"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
         <source>Track</source>
         <translation>Utwór</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="56"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
         <source>Album</source>
         <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="57"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
         <source>Artist</source>
         <translation>Artysta</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="58"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
         <source>Local</source>
         <translation>Lokalny</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="59"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
         <source>Top 10</source>
         <translation>Top 10</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="187"/>
-        <source>Offline</source>
-        <translation>Offline</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
         <source>All available tracks</source>
         <translation>Wszystkie dostępne utwory</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="196"/>
-        <source>Online</source>
-        <translation>Online</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="289"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="330"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
         <source>Show</source>
-        <translation type="unfinished"/>
+        <translation>Pokaż</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="291"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="332"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
         <source>Hide</source>
-        <translation type="unfinished"/>
+        <translation>Ukryj</translation>
     </message>
 </context>
 <context>
     <name>SourceInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="30"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
         <source>Recent Albums</source>
         <translation>Ostatnie Albumy</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="74"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
         <source>Latest Additions</source>
         <translation>Najnowsze dodane</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="88"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
         <source>Recently Played Tracks</source>
         <translation>Ostatnio Odtwarzane Utwory</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="80"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
         <source>New Additions</source>
         <translation>Nowo dodane</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="83"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
         <source>My recent activity</source>
         <translation>Moja ostatnia aktywność</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="87"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
         <source>Recent activity from %1</source>
         <translation>Ostatnia aktywność %1</translation>
     </message>
@@ -1158,55 +1360,128 @@
 <context>
     <name>SourceItem</name>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="65"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
         <source>Collection</source>
-        <translation type="unfinished"/>
+        <translation>Kolekcja</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="73"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
         <source>Latest Additions</source>
-        <translation type="unfinished"/>
+        <translation>Ostatnio Dodane</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="77"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
         <source>Recently Played</source>
+        <translation>Ostatnio Odtworzone</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation>Superkolekcja</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="81"/>
-        <source>Loved Tracks</source>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="146"/>
-        <source>SuperCollection</source>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SourceTreeView</name>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="188"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
         <source>&amp;Copy Link</source>
         <translation>&amp;Kopiuj Link</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
         <source>&amp;Delete %1</source>
         <translation>&amp;Usuń %1</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="207"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
         <source>&amp;Export Playlist</source>
         <translation>&amp;Eksportuj Listę</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="341"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
         <source>Save XSPF</source>
         <translation>Zapisz XSPF</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="342"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
         <source>Playlists (*.xspf)</source>
         <translation>Listy (*.xspf)</translation>
     </message>
@@ -1214,138 +1489,166 @@
 <context>
     <name>SourcesModel</name>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="78"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
         <source>Group</source>
-        <translation type="unfinished"/>
+        <translation>Grupa</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="81"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
         <source>Collection</source>
         <translation>kolekcja</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="84"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
         <source>Playlist</source>
         <translation>Lista</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="87"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
         <source>Automatic Playlist</source>
         <translation>Automatyczna Lista</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="90"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
         <source>Station</source>
         <translation>Stacja</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="268"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
         <source>Browse</source>
-        <translation type="unfinished"/>
+        <translation>Przeglądaj</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="269"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
         <source>Search History</source>
-        <translation type="unfinished"/>
+        <translation>Historia wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="271"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
         <source>My Music</source>
-        <translation type="unfinished"/>
+        <translation>Moja Muzyka</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="279"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
         <source>SuperCollection</source>
-        <translation type="unfinished"/>
+        <translation>Superkolekcja</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="285"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
         <source>Top Loved Tracks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="273"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
         <source>Dashboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="290"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
         <source>Recently Played</source>
-        <translation type="unfinished"/>
+        <translation>Ostatnio Odtworzone</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
         <source>Charts</source>
-        <translation type="unfinished"/>
+        <translation>Listy Przebojów</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>Nowe Wydania</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="300"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
         <source>Friends</source>
-        <translation type="unfinished"/>
+        <translation>Znajomi</translation>
     </message>
 </context>
 <context>
     <name>SpotifyConfig</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="48"/>
-        <source>Configure your Spotify credentials</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="65"/>
-        <source>Username:</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="72"/>
-        <source>placeholderUsername</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
-        <source>Password:</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="86"/>
-        <source>placeholderPw</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="116"/>
-        <source>High Quality Streaming</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="186"/>
-        <source>This product uses SPOTIFY(R) CORE but is not endorsed, certified or otherwise approved in any way by Spotify. Spotify is the registered trade mark of the Spotify Group.</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>Użytkownik:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>Hasło:</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StackedSettingsDialog</name>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="14"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
         <source>Tomahawk Settings</source>
         <translation>Ustawienia Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="158"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
         <source>Local Music Information</source>
-        <translation>Lokalne Informacje o Muzyce</translation>
+        <translation>Informacje o Lokalnej Muzyce</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="166"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
         <source>Path to scan for music files:</source>
         <translation>Ścieżka poszukiwania plików muzycznych:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="180"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
         <source>The Echo Nest supports keeping track of your catalog metadata
  and using it to craft personalized radios. Enabling this option
  will allow you (and all your friends) to create automatic playlists
@@ -1357,162 +1660,223 @@
 indywidualnego profilu gustu.</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="186"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
         <source>Upload collection list to The Echo Nest to enable user radio</source>
         <translation>Wyślij informacje o kolekcji do The Echo Nest, aby włączyć radio użytkownika</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="199"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
         <source>Watch for changes</source>
-        <translation>Obserwuj pod kątem zmian</translation>
+        <translation>Obserwuj zmiany</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="208"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
         <source>Time between scans, in seconds:</source>
         <translation>Czas pomiędzy skanami, w sekundach:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="98"/>
-        <source>Internet Services</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="109"/>
-        <source>Install from file...</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="129"/>
-        <source>Filter by capability:</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="245"/>
-        <source>Advanced Network Settings</source>
-        <translation>Zaawansowane Ustawienia Sieci</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation>Usługi internetowe</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation>Zainstaluj z pliku...</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="265"/>
-        <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>Jeśli masz problemy z łączeniem się z innymi, spróbuj ustawić tutaj swój zewnętrzny adres IP/nazwę hosta i numer portu (domyślnie 50210). Upewnij się, że przekierowujesz port na tą maszynę!</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="283"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
         <source>Static Host Name:</source>
         <translation>Nazwa statycznego hosta:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="299"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
         <source>Static Port:</source>
         <translation>Statyczny Port:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="321"/>
-        <source>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</source>
-        <translation>Zawsze używać statycznej nazwy hosta/portu? (Nadpisuje wykrywanie/przekierowanie UPnP)</translation>
-    </message>
-    <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="345"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
         <source>Proxy Settings...</source>
         <translation>Ustawienia Proxy...</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="383"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
         <source>Send reports after Tomahawk crashed</source>
         <translation>Wysyłaj zgłoszenia po awarii Tomahawka</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="396"/>
-        <source>Allow web browsers to interact with Tomahawk</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="409"/>
-        <source>Use UPnP to establish port forward</source>
-        <translation>Używaj UPnP, aby uzyskać przekierowanie portu</translation>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::AccountDelegate</name>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="200"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
         <source>Add Account</source>
-        <translation type="unfinished"/>
+        <translation>Dodaj Konto</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="250"/>
-        <source>Remove Account</source>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="360"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
         <source>%1 downloads</source>
-        <translation type="unfinished"/>
+        <translation>pobrań: %1</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="585"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
         <source>Online</source>
-        <translation type="unfinished"/>
+        <translation>Online</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="590"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
         <source>Connecting...</source>
-        <translation type="unfinished"/>
+        <translation>Łączenie...</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="595"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
         <source>Offline</source>
+        <translation>Offline</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapper</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="82"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
         <source>Configure this Google Account</source>
-        <translation type="unfinished"/>
+        <translation>Konfiguruj to Konto Google</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
         <source>Google Address</source>
-        <translation type="unfinished"/>
+        <translation>Adres Google</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="84"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
         <source>Enter your Google login to connect with your friends using Tomahawk!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="85"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
         <source>username@gmail.com</source>
-        <translation type="unfinished"/>
+        <translation>użytkownik@gmail.com</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.h" line="42"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
         <source>Connect to Google Talk to find your friends</source>
-        <translation type="unfinished"/>
+        <translation>Połącz z Google Talk aby znaleźć znajomych</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperSip</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="61"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
         <source>Add Friend</source>
-        <translation type="unfinished"/>
+        <translation>Dodaj Znajomego</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
         <source>Enter Google Address:</source>
-        <translation type="unfinished"/>
+        <translation>Podaj Adres Google</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::LastFmAccountFactory</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmAccount.h" line="47"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
         <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
         <translation type="unfinished"/>
     </message>
@@ -1520,26 +1884,104 @@
 <context>
     <name>Tomahawk::Accounts::LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="108"/>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="123"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="113"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="129"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
         <source>Could not contact server</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccount.h" line="44"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
         <source>Play music from and sync your playlists with Spotify Premium</source>
         <translation type="unfinished"/>
     </message>
@@ -1547,141 +1989,141 @@
 <context>
     <name>Tomahawk::Accounts::TwitterAccountFactory</name>
     <message>
-        <location filename="../src/accounts/twitter/twitteraccount.h" line="50"/>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
         <source>Connect to your Twitter followers.</source>
-        <translation type="unfinished"/>
+        <translation>Łącz się z osobami śledzącymi cię na Twitterze.</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="58"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="141"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="189"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
         <source>Tweet!</source>
-        <translation type="unfinished"/>
+        <translation>Tweet!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="66"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="167"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
         <source>Status: No saved credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="67"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="92"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="168"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
         <source>Authenticate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="74"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="136"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
         <source>Status: Credentials saved for %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="75"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
         <source>De-authenticate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>Tweetin&apos; Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
         <source>The credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="152"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
         <source>Status: Error validating credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="179"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
         <source>Global Tweet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="184"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
         <source>Direct Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="185"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
         <source>Send Message!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="186"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
         <source>@Mention</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="187"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
         <source>Send Mention!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
         <source>You must enter a user name for this type of tweet.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
         <source>Your saved credentials could not be loaded.
 You may wish to try re-authenticating.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
         <source>Your saved credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>There was an error posting your status -- sorry!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Tweeted!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
         <source>Your tweet has been posted!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
         <source>There was an error posting your direct message -- sorry!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Your message has been posted!</source>
-        <translation type="unfinished"/>
+        <translation>Twoja wiadomość została wysłana!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::XmppAccountFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppaccount.h" line="51"/>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
         <source>Log on to your Jabber/XMPP account to connect to your friends</source>
         <translation type="unfinished"/>
     </message>
@@ -1689,7 +2131,7 @@
 <context>
     <name>Tomahawk::Accounts::ZeroconfFactory</name>
     <message>
-        <location filename="../src/accounts/zeroconf/zeroconfaccount.h" line="42"/>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
         <source>Automatically connect to Tomahawks on the local network</source>
         <translation type="unfinished"/>
     </message>
@@ -1697,93 +2139,113 @@
 <context>
     <name>Tomahawk::ContextMenu</name>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="79"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
         <source>&amp;Play</source>
         <translation>&amp;Odtwarzaj</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="82"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="142"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="181"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
         <source>Add to &amp;Queue</source>
-        <translation>Dodaj do &amp;Kolejki</translation>
+        <translation>Dodaj do &amp;kolejki</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="87"/>
-        <source>&amp;Continue playback after this track</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="89"/>
-        <source>&amp;Stop playback after this track</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="96"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="277"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
         <source>&amp;Love</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Uwielbiam</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
         <source>&amp;Copy Track Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="139"/>
-        <source>Show &amp;Album page</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="178"/>
-        <source>Show &amp;Artist page</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="272"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
         <source>Un-&amp;Love</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Items</source>
         <translation>&amp;Usuń pozycje</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Item</source>
         <translation>&amp;Usuń pozycję</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Tomahawk::CustomPlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="123"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
         <source>Top Loved Tracks</source>
         <translation>Najbardziej Lubiane Utwory</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="127"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
         <source>Your loved tracks</source>
         <translation>Twoje ulubione utwory</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="129"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
         <source>%1&apos;s loved tracks</source>
         <translation>Ulubione utwory %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="138"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
         <source>The most loved tracks from all your friends</source>
         <translation>Najbardziej lubiane utwory wszystkich twoich znajomych</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="142"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
         <source>All of your loved tracks</source>
         <translation>Wszystkie twoje ulubione utwory</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
         <source>All of %1&apos;s loved tracks</source>
         <translation>Wszystkie ulubione utwory %1</translation>
     </message>
@@ -1791,12 +2253,32 @@
 <context>
     <name>Tomahawk::DropJobNotifier</name>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="102"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
         <source>Fetching %1 from database</source>
         <translation>Wydobywanie %1 z bazy danych</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="106"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
         <source>Parsing %1 %2</source>
         <translation>Analizowanie %1 %2</translation>
     </message>
@@ -1804,7 +2286,7 @@
 <context>
     <name>Tomahawk::DynamicControlList</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
         <source>Click to collapse</source>
         <translation>Kliknij, aby schować</translation>
     </message>
@@ -1843,19 +2325,19 @@
 <context>
     <name>Tomahawk::DynamicView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
         <source>Add some filters above to seed this station!</source>
-        <translation>Dodaj trochę filtrów powyżej, aby załączyć tą stację!</translation>
+        <translation>Dodaj powyżej trochę filtrów, a Tomahawk utworzy stację z podobną muzyką!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="149"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
         <source>Press Generate to get started!</source>
-        <translation>Naciśnij Generuj, aby zacząć!</translation>
+        <translation>Naciśnij Generuj aby zacząć!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="151"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
         <source>Add some filters above, and press Generate to get started!</source>
-        <translation>Dodaj trochę filtrów powyżej i naciśnij Generuj, aby zacząć!</translation>
+        <translation>Dodaj powyżej trochę filtrów i naciśnij Generuj aby zacząć!</translation>
     </message>
 </context>
 <context>
@@ -2173,97 +2655,97 @@
 <context>
     <name>Tomahawk::EchonestSteerer</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="57"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
         <source>Steer this station:</source>
         <translation>Steruj tą stacją:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="71"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
         <source>Much less</source>
         <translation>Dużo mniej</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="72"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
         <source>Less</source>
         <translation>Mniej</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="73"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
         <source>A bit less</source>
         <translation>Trochę mniej</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="74"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
         <source>Keep at current</source>
         <translation>Pozostaw jak jest</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="75"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
         <source>A bit more</source>
         <translation>Trochę więcej</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="76"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
         <source>More</source>
         <translation>Więcej</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
         <source>Much more</source>
         <translation>Dużo więcej</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="80"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
         <source>Loudness</source>
         <translation>Głośność</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
         <source>Danceability</source>
         <translation>Taneczność</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
         <source>Energy</source>
         <translation>Energiczność</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
         <source>Song Hotttnesss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
         <source>Artist Hotttnesss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
         <source>Artist Familiarity</source>
         <translation>Znajomość Artysty</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
         <source>By Description</source>
         <translation>Po Opisie</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
         <source>Enter a description</source>
         <translation>Wprowadź opis</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="102"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
         <source>Apply steering command</source>
         <translation>Zastosuj komendę sterowania</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="108"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
         <source>Reset all steering commands</source>
         <translation>Zresetuj wszystkie komendy sterowania</translation>
     </message>
@@ -2271,7 +2753,7 @@
 <context>
     <name>Tomahawk::GroovesharkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/groovesharkparser.cpp" line="255"/>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
         <source>Error fetching Grooveshark information from the network!</source>
         <translation type="unfinished"/>
     </message>
@@ -2279,58 +2761,87 @@
 <context>
     <name>Tomahawk::InfoSystem::ChartsPlugin</name>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="307"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
         <source>Top Overall</source>
         <translation>Top Wszechczasów</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="396"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
         <source>Artists</source>
         <translation>Artyści</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="398"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
         <source>Albums</source>
         <translation>Albumy</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="400"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
         <source>Tracks</source>
         <translation>Utwory</translation>
     </message>
 </context>
 <context>
-    <name>Tomahawk::InfoSystem::LastFmPlugin</name>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation>z &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
         <source>Top Tracks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
         <source>Loved Tracks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
         <source>Hyped Tracks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
         <source>Top Artists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
         <source>Hyped Artists</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>Albumy</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Tomahawk::ItunesParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/itunesparser.cpp" line="170"/>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
         <source>Error fetching iTunes information from the network!</source>
         <translation type="unfinished"/>
     </message>
@@ -2338,27 +2849,27 @@
 <context>
     <name>Tomahawk::JSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="137"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
         <source>New Playlist</source>
         <translation>Nowa Lista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Failed to save tracks</source>
         <translation>Nie udało się zapisać utworów</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation>Niektóre utwory na liście nie zawierają artysty lub tytułu. Zostaną one zignorowane.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>XSPF Error</source>
         <translation>Błąd XSPF</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>To nie jest poprawna lista XSPF.</translation>
     </message>
@@ -2380,37 +2891,37 @@
 <context>
     <name>Tomahawk::Query</name>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="637"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
         <source> and </source>
-        <translation type="unfinished"/>
+        <translation> i </translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="645"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
         <source>You</source>
-        <translation type="unfinished"/>
+        <translation>Ty</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="647"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
         <source>you</source>
-        <translation type="unfinished"/>
+        <translation>ty</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>and</source>
-        <translation type="unfinished"/>
+        <translation>i</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>%n other(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n inny</numerusform><numerusform>%n inne</numerusform><numerusform>%n innych</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="659"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
         <source>%1 people</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="661"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
         <source>loved this track</source>
         <translation type="unfinished"/>
     </message>
@@ -2418,7 +2929,7 @@
 <context>
     <name>Tomahawk::RdioParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/rdioparser.cpp" line="193"/>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
         <source>Error fetching Rdio information from the network!</source>
         <translation type="unfinished"/>
     </message>
@@ -2426,7 +2937,7 @@
 <context>
     <name>Tomahawk::ShortenedLinkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/shortenedlinkparser.cpp" line="96"/>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
         <source>Network error parsing shortened link!</source>
         <translation type="unfinished"/>
     </message>
@@ -2434,49 +2945,67 @@
 <context>
     <name>Tomahawk::Source</name>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="242"/>
-        <location filename="../src/libtomahawk/source.cpp" line="293"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
         <source>Scanning (%L1 tracks)</source>
         <translation>Skanowanie (%L1 utworów)</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="244"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
         <source>Scanning</source>
         <translation>Skanowanie</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="278"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
         <source>Checking</source>
         <translation>Sprawdzanie</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="283"/>
-        <source>Fetching</source>
-        <translation>Pobieranie</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="288"/>
-        <source>Parsing</source>
-        <translation>Analizowanie</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="417"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
         <source>Saving (%1%)</source>
         <translation>Zapisywanie (%1%)</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Tomahawk::SpotifyParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/spotifyparser.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
         <source>Error fetching Spotify information from the network!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/tomahawkapp.cpp" line="534"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation>Moja Kolekcja</translation>
     </message>
@@ -2484,12 +3013,12 @@
 <context>
     <name>TomahawkOAuthTwitter</name>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>Twitter PIN</source>
-        <translation>PIN Twitter</translation>
+        <translation>Twitter PIN</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>After authenticating on Twitter's web site,
 enter the displayed PIN number here:</source>
         <translation>Po uwierzytelnieniu na stronie Twittera,
@@ -2499,464 +3028,466 @@
 <context>
     <name>TomahawkTrayIcon</name>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="59"/>
-        <location filename="../src/tomahawktrayicon.cpp" line="93"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
         <source>Hide Tomahawk Window</source>
         <translation>Ukryj Okno Tomahawka</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="98"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
         <source>Show Tomahawk Window</source>
         <translation>Pokaż Okno Tomahawka</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="158"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
         <source>Currently not playing.</source>
         <translation>Aktualnie nie odtwarza.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="219"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
         <source>Play</source>
         <translation>Odtwarzaj</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="226"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
         <source>Pause</source>
         <translation>Pauza</translation>
     </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>TomahawkWindow</name>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="14"/>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
         <source>Tomahawk</source>
         <translation>Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="75"/>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
         <source>&amp;Settings</source>
         <translation>&amp;Ustawienia</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="81"/>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
         <source>&amp;Controls</source>
         <translation>&amp;Steruj</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="100"/>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
         <source>&amp;Network</source>
         <translation>&amp;Sieć</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="107"/>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
         <source>&amp;Window</source>
         <translation>&amp;Okno</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="114"/>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
         <source>&amp;Help</source>
         <translation>&amp;Pomoc</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="128"/>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
         <source>&amp;Quit</source>
         <translation>&amp;Zakończ</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="131"/>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="139"/>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
         <source>Go &amp;Online</source>
         <translation>Przejdź do trybu &amp;Online</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="144"/>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
         <source>Add &amp;Friend...</source>
         <translation>Dodaj &amp;Znajomego...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="149"/>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
         <source>U&amp;pdate Collection</source>
         <translation>U&amp;aktualnij Kolekcję</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="152"/>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
         <source>Update Collection</source>
         <translation>Uaktualnij Kolekcję</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="157"/>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
         <source>&amp;Configure Tomahawk...</source>
         <translation>&amp;Konfiguruj Tomahawk...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="165"/>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
         <source>Load &amp;XSPF...</source>
         <translation>Załaduj &amp;XSPF...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="170"/>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
         <source>Create &amp;New Playlist...</source>
         <translation>Utwórz &amp;Nową Listę...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="175"/>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
         <source>About &amp;Tomahawk...</source>
         <translation>O &amp;Tomahawk...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="183"/>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
         <source>Create New &amp;Automatic Playlist</source>
         <translation>Utwórz Nową &amp;Automatyczną Listę</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="188"/>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
         <source>Create New &amp;Station</source>
         <translation>Utwórz Nową &amp;Stację</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="196"/>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
         <source>Show Offline Sources</source>
         <translation>Pokaż Źródła Offline</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="201"/>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
         <source>Hide Offline Sources</source>
         <translation>Ukryj Źródła Offline</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="206"/>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
         <source>Minimize</source>
         <translation>Minimalizuj</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="209"/>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="214"/>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
         <source>Zoom</source>
         <translation>Powiększenie</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="217"/>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
         <source>Meta+Ctrl+Z</source>
         <translation>Meta+Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="222"/>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
         <source>Diagnostics...</source>
         <translation>Diagnostyka...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="230"/>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
         <source>Fully &amp;Rescan Collection</source>
         <translation>Kompletnie &amp;Przeskanuj Kolekcję</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="233"/>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
         <source>Fully Rescan Collection</source>
         <translation>Kompletnie Przeskanuj Kolekcję</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="238"/>
-        <location filename="../src/tomahawkwindow.cpp" line="676"/>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
         <source>Play</source>
         <translation>Odtwarzaj</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="241"/>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
         <source>Space</source>
         <translation>Spacja</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="246"/>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
         <source>Previous</source>
         <translation>Poprzedni</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="251"/>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
         <source>Next</source>
         <translation>Następny</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="219"/>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
         <source>Global Search...</source>
         <translation>Globalne Wyszukiwanie...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="270"/>
-        <location filename="../src/tomahawkwindow.cpp" line="287"/>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
         <source>Check For Updates...</source>
         <translation>Sprawdź uaktualnienia...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="449"/>
-        <location filename="../src/tomahawkwindow.cpp" line="456"/>
-        <location filename="../src/tomahawkwindow.cpp" line="464"/>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
         <source>Connect To Peer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="450"/>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
         <source>Enter peer address:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="457"/>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
         <source>Enter peer port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="465"/>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
         <source>Enter peer key:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>XSPF Error</source>
         <translation>Błąd XSPF</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>To nie jest poprawna lista XSPF.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Failed to save tracks</source>
         <translation>Nie udało się zapisać utworów</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation>Niektóre utwory na liście nie zawierają artysty i tytułu. Zostaną one zignorowane.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="579"/>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="581"/>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Create New Station</source>
         <translation>Utwórz Nową Stację</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
-        <source>New Station</source>
-        <translation>Nowa stacja</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="650"/>
-        <source>New Playlist</source>
-        <translation>Nowa Lista</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="668"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
         <source>Pause</source>
         <translation>Pauza</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="691"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
         <source>Go &amp;offline</source>
         <translation>Przejdź do trybu &amp;offline</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="698"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
         <source>Go &amp;online</source>
         <translation>Przejdź do trybu &amp;online</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="720"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
         <source>Authentication Error</source>
         <translation>Błąd uwierzytelniania</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="735"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
         <source>%1 by %2</source>
         <comment>track, artist name</comment>
         <translation>%1 wykonawcy %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="736"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
         <source>%1 - %2</source>
         <comment>current track, some window title</comment>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="747"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="751"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="755"/>
-        <source>Copyright 2010 - 2012&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson</source>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="758"/>
-        <source>About Tomahawk</source>
-        <translation>O Tomahawk</translation>
-    </message>
-</context>
-<context>
-    <name>TopBar</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="26"/>
-        <source>Form</source>
-        <translation>Formularz</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="66"/>
-        <source>0 Sources</source>
-        <translation>0 Źródeł</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="89"/>
-        <source>0 Tracks</source>
-        <translation>0 Utworów</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="112"/>
-        <source>0 Artists</source>
-        <translation>0 Artystów</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="135"/>
-        <source>0 Shown</source>
-        <translation>0 Pokazanych</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="49"/>
-        <source>Tracks</source>
-        <translation>Utwory</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="50"/>
-        <source>Artists</source>
-        <translation>Artyści</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="54"/>
-        <source>Filter</source>
-        <translation>Filtr</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="84"/>
-        <source>Artist View</source>
-        <translation>Widok Artysty</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="85"/>
-        <source>Flat View</source>
-        <translation>Płaski Widok</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="195"/>
-        <source>Sources</source>
-        <translation>Źródła</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="247"/>
-        <source>Shown</source>
-        <translation>Pokazane</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TopTracksContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
         <source>Top Hits</source>
         <translation>Hity na Topie</translation>
     </message>
 </context>
 <context>
-    <name>TrackModel</name>
+    <name>TrackInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Artist</source>
-        <translation>Artysta</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Title</source>
-        <translation>Tytuł</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Album</source>
-        <translation>Album</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
         <source>Track</source>
-        <translation>Utwór</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Duration</source>
-        <translation>Czas trwania</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Bitrate</source>
-        <translation>Bitrate</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Age</source>
-        <translation>Wiek</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Year</source>
-        <translation>Rok</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Size</source>
-        <translation>Rozmiar</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Origin</source>
-        <translation>Pochodzenie</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Score</source>
-        <translation>Punktacja</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Composer</source>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackview.cpp" line="493"/>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
         <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
         <translation>Przepraszamy, twój filtr &apos;%1&apos; nie dopasował żadnych wyników.</translation>
     </message>
@@ -2977,7 +3508,7 @@
 <context>
     <name>TreeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treeitemdelegate.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
@@ -2985,92 +3516,60 @@
 <context>
     <name>TreeModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Name</source>
-        <translation>Nazwa</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Duration</source>
-        <translation>Czas trwania</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Bitrate</source>
-        <translation>Bitrate</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Age</source>
-        <translation>Wiek</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Year</source>
-        <translation>Rok</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Size</source>
-        <translation>Rozmiar</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Origin</source>
-        <translation>Pochodzenie</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Composer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="585"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
         <source>All Artists</source>
         <translation>Wszyscy Artyści</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="699"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="724"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
         <source>My Collection</source>
         <translation>Moja Kolekcja</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="701"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="726"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
         <source>Collection of %1</source>
         <translation>Kolekcja %1</translation>
     </message>
 </context>
 <context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="73"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
         <source>Configure this Twitter account</source>
-        <translation>Konfiguruj to konto Twitter</translation>
+        <translation>Konfiguruj konto na Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="119"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
         <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
-        <translation>Wtyczka Twittera pozwala ci odkrywać i odtwarzać muzykę znajomych z Twittera, którzy używają Tomahawka i wysyłać wiadomości ze swojego konta.</translation>
+        <translation>Wtyczka Twittera pozwala ci odkrywać i odtwarzać muzykę znajomych z Twittera, którzy używają Tomahawka oraz wysyłać wiadomości ze swojego konta.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
         <source>Status: No saved credentials</source>
         <translation>Status: Brak zapisanych informacji uwierzytelniania</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="166"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
         <source>Authenticate with Twitter</source>
         <translation>Autoryzuj z Twitterem</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="196"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
         <source>Twitter Connections</source>
         <translation>Połączenia Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
         <source>
 If you only want to post tweets, you're done.
 
@@ -3080,37 +3579,37 @@
         <translation>
 Jeśli chcesz jedynie wysyłać tweety, wszystko gotowe.
 
-Jeśli chcesz, aby Tomahawk łączył się z twoimi znajomymi używając Twittera, wybierz rodzaj tweeta i naciśnij przycisk poniżej by wysłać wiadomość synchronizacyjną. Obie strony muszą śledzić się nawzajem, ponieważ używane są Wiadomości Prywatne. Teraz miej (dużo) cierpliwości - może to zająć kilka minut!
+Jeśli chcesz, aby Tomahawk łączył się z twoimi znajomymi używając Twittera, wybierz rodzaj tweeta i naciśnij przycisk poniżej by wysłać wiadomość synchronizacyjną. Obie strony muszą śledzić się nawzajem, ponieważ używane są Wiadomości Prywatne. Miej (bardzo) dużo cierpliwości - może to zająć kilka minut!
 
-Możesz wysłać wiadomość synchronizacyjną ponownie kiedykolwiek, po prostu wyślij kolejnego tweeta używając przycisku.</translation>
+Zawsze możesz ponownie wysłać wiadomość synchronizacyjną - po prostu wyślij kolejnego tweeta używając przycisku.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="244"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
         <source>Select the kind of tweet you would like, then press the button to post it:</source>
-        <translation>Wybierz rodzaj tweeta, który ci odpowiada, a następnie naciśnij przycisk, aby go wysłać:</translation>
+        <translation>Wybierz rodzaj tweeta który ci odpowiada, a następnie naciśnij przycisk aby go wysłać:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="276"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
         <source>Global Tweet</source>
         <translation>Globalny Tweet</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="281"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
         <source>@Mention</source>
         <translation>@Wzmianka</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="286"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
         <source>Direct Message</source>
         <translation>Wiadomość Prywatna</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="322"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
         <source>e.g. @tomahawk</source>
         <translation>n.p. @tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="351"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
         <source>Send Message</source>
         <translation>Wyślij Wiadomość</translation>
     </message>
@@ -3118,45 +3617,60 @@
 <context>
     <name>ViewManager</name>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="383"/>
-        <source>SuperCollection</source>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="384"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
+        <source>SuperCollection</source>
+        <translation>SuperKolekcja</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
         <source>Combined libraries of all your online friends</source>
+        <translation>Połączone biblioteki wszystkich twoich znajomych online</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="385"/>
-        <source>All available albums</source>
-        <translation>Wszystkie dostępne albumy</translation>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WelcomeWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="34"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
         <source>Recent Additions</source>
         <translation>Ostatnio Dodane</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
         <source>Newest Stations &amp; Playlists</source>
         <translation>Najnowsze Stacje i Listy</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="70"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
         <source>Recently Played Tracks</source>
         <translation>Ostatnio Odtworzone Utwory</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.cpp" line="152"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
         <source>No recently created playlists in your network.</source>
         <translation>Brak ostatnio utworzonych list w twojej sieci.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.h" line="90"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
         <source>Welcome to Tomahawk</source>
         <translation>Witaj w Tomahawk</translation>
     </message>
@@ -3164,7 +3678,7 @@
 <context>
     <name>WhatsHotWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/whatshotwidget.h" line="72"/>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
         <source>Charts</source>
         <translation>Listy przebojów</translation>
     </message>
@@ -3180,26 +3694,26 @@
 <context>
     <name>XMPPBot</name>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="312"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
         <source>
 Terms for %1:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="314"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
         <source>No terms found, sorry.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="347"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
         <source>
 Hotttness for %1: %2
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="363"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
         <source>
 Familiarity for %1: %2
 </source>
@@ -3208,7 +3722,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="381"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
         <source>
 Lyrics for &quot;%1&quot; by %2:
 
@@ -3224,22 +3738,22 @@
 <context>
     <name>XSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="49"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
         <source>Failed to parse contents of XSPF playlist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="51"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
         <source>Some playlist entries were found without artist and track name, they will be omitted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="53"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
         <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="188"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
         <source>New Playlist</source>
         <translation>Nowa Lista</translation>
     </message>
@@ -3247,78 +3761,78 @@
 <context>
     <name>XmlConsole</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
         <source>Xml stream console</source>
         <translation>Konsola strumienia XML</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="33"/>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="60"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="43"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
         <source>Save log</source>
         <translation>Zapisz log</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
         <source>Disabled</source>
         <translation>Wyłączone</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="65"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
         <source>By JID</source>
         <translation>Po JID</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="68"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
         <source>By namespace uri</source>
         <translation>Po URI przestrzeni nazw</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="71"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
         <source>By all attributes</source>
         <translation>Po wszystkich atrybutach</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="76"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
         <source>Visible stanzas</source>
         <translation>Widoczne stanzy</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="79"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
         <source>Information query</source>
         <translation>Zapytanie o informacje</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
         <source>Message</source>
         <translation>Wiadomość</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="87"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
         <source>Presence</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="91"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
         <source>Custom</source>
         <translation>Niestandardowa</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="107"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="358"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
         <source>Save XMPP log to file</source>
         <translation>Zapisz log XMPP do pliku</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
         <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
         <translation>Format Open Document (*.odf);;Plik HTML (*.html);;Czysty tekst (*.txt)</translation>
     </message>
@@ -3326,203 +3840,203 @@
 <context>
     <name>XmppConfigWidget</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
         <source>Xmpp Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="52"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
         <source>Configure this Xmpp account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="89"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
         <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="111"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
         <source>Login Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="131"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
         <source>Xmpp ID:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="147"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
         <source>e.g. user@example.com</source>
-        <translation type="unfinished"/>
+        <translation>n.p. uzytkownik@example.com</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="160"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
         <source>Password:</source>
-        <translation type="unfinished"/>
+        <translation>Hasło:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="188"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
         <source>An account with this name already exists!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="210"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
         <source>Advanced Xmpp Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="230"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
         <source>Server:</source>
-        <translation type="unfinished"/>
+        <translation>Serwer:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="253"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
         <source>Port:</source>
-        <translation type="unfinished"/>
+        <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="299"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
         <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="302"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
         <source>Publish currently playing track</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="309"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
         <source>Enforce secure connection</source>
-        <translation type="unfinished"/>
+        <translation>Wymuś bezpieczne połączenie</translation>
     </message>
 </context>
 <context>
     <name>XmppSipPlugin</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
         <source>User Interaction</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="362"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
         <source>Host is unknown</source>
-        <translation type="unfinished"/>
+        <translation>Nieznany Host</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="365"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
         <source>Item not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="368"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
         <source>Authorization Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="371"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
         <source>Remote Stream Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="374"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
         <source>Remote Connection failed</source>
-        <translation type="unfinished"/>
+        <translation>Połączenie sieciowe się nie powiodło</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="377"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
         <source>Internal Server Error</source>
-        <translation type="unfinished"/>
+        <translation>Wewnętrzny błąd serwera</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="380"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
         <source>System shutdown</source>
-        <translation type="unfinished"/>
+        <translation>Wyłączenie systemu</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="383"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
         <source>Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Konflikt</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="387"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
         <source>Unknown</source>
+        <translation>Nieznany</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="391"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
         <source>No Compression Support</source>
-        <translation type="unfinished"/>
+        <translation>Brak obsługi kompresji</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="395"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
         <source>No Encryption Support</source>
-        <translation type="unfinished"/>
+        <translation>Brak obsługi szyfrowania</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="399"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
         <source>No Authorization Support</source>
-        <translation type="unfinished"/>
+        <translation>Brak obsługi autoryzacji</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="403"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
         <source>No Supported Feature</source>
-        <translation type="unfinished"/>
+        <translation>Brak obsługi danej funkcji</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="500"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
         <source>Add Friend</source>
-        <translation type="unfinished"/>
+        <translation>Dodaj Znajomego</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="501"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
         <source>Enter Xmpp ID:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="617"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
         <source>Add Friend...</source>
-        <translation type="unfinished"/>
+        <translation>Dodaj Znajomego...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="622"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
         <source>XML Console...</source>
-        <translation type="unfinished"/>
+        <translation>Konsola XML...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="670"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
         <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="768"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
         <source>Authorize User</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="769"/>
-        <source>Do you want to grant &lt;b&gt;%1&lt;/b&gt; access to your Collection?</source>
-        <translation type="unfinished"/>
+        <translation>Autoryzuj Użytkownika</translation>
     </message>
 </context>
 <context>
     <name>ZeroconfConfig</name>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="14"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="55"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
         <source>Local Network configuration</source>
         <translation>Konfiguracja Sieci Lokalnej</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="77"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
         <source>This plugin will automatically find other users running Tomahawk on your local network</source>
         <translation>Ta wtyczka automatycznie znajdzie użytkowników Tomahawka w sieci lokalnej</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="84"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
         <source>Connect automatically when Tomahawk starts</source>
         <translation>Połącz automatycznie przy starcie Tomahawka</translation>
     </message>

tomahawk-0.4.2.tar.bz2/lang/tomahawk_pt_BR.ts -> tomahawk-0.5.5.tar.bz2/lang/tomahawk_pt_BR.ts Changed

@@ -1,131 +1,134 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
 <context>
-    <name>ACLRegistry</name>
+    <name>ACLJobDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="140"/>
-        <source>Connect to Peer?</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation>Permitir que %1 ⏎
+se conecte e faça o stream de você?</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="141"/>
-        <source>Another Tomahawk instance that claims to be owned by %1 is attempting to connect to you. Select whether to allow or deny this connection.
-
-Remember: Only allow peers to connect if you trust who they are and if you have the legal right for them to stream music from you.</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation>Permitir Streaming</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="142"/>
-        <source>Deny</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation>Negar Acesso</translation>
     </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="143"/>
-        <source>Allow</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation>Tomahawk precisa que você decida se %1 tem permissão para conectar.</translation>
     </message>
 </context>
 <context>
     <name>AccountFactoryWrapper</name>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished"/>
+        <translation>Aba</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="30"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
         <source>Description goes here</source>
-        <translation type="unfinished"/>
+        <translation>Descrição aqui</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.cpp" line="41"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
         <source>Add Account</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar Conta</translation>
     </message>
 </context>
 <context>
     <name>AccountFactoryWrapperDelegate</name>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="105"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
         <source>Online</source>
-        <translation type="unfinished"/>
+        <translation>Online</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="110"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
         <source>Connecting...</source>
-        <translation type="unfinished"/>
+        <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="115"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
         <source>Offline</source>
-        <translation type="unfinished"/>
+        <translation>Offline</translation>
     </message>
 </context>
 <context>
     <name>ActionCollection</name>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="43"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
         <source>&amp;Listen Along</source>
-        <translation>&amp;Reproduzir acompanhado</translation>
+        <translation>&amp;Ouça Junto</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="46"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
         <source>Stop &amp;Listening Along</source>
-        <translation>&amp;Parar acompanhado</translation>
+        <translation>Parar de &amp;Ouvir Junto</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="50"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
         <source>&amp;Follow in real-time</source>
         <translation>&amp;Seguir em tempo real</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Privately</source>
-        <translation>&amp;Escutar de forma privada</translation>
+        <translation>&amp;Ouvir Privadamente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Publicly</source>
-        <translation>&amp;Escutar forma pública</translation>
+        <translation>&amp;Ouvir Publicamente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="61"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
         <source>&amp;Load Playlist</source>
-        <translation>&amp;Carregar lista de reprodução</translation>
+        <translation>&amp;Carregar Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="62"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
         <source>&amp;Rename Playlist</source>
-        <translation>&amp;Renomear lista</translation>
+        <translation>&amp;Renomear Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="63"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
         <source>&amp;Copy Playlist Link</source>
-        <translation>&amp;Copiar link da lista de reprodução</translation>
+        <translation>&amp;Copiar link da Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="64"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
         <source>&amp;Play</source>
-        <translation>&amp;Reproduzir</translation>
+        <translation>&amp;Play</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="65"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
         <source>&amp;Stop</source>
-        <translation>&amp;Parar</translation>
+        <translation>&amp;Stop</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
         <source>&amp;Previous Track</source>
-        <translation>&amp;Faixa anterior</translation>
+        <translation>&amp;Faixa Anterior</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="67"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
         <source>&amp;Next Track</source>
-        <translation>&amp;Próxima faixa</translation>
+        <translation>&amp;Próxima Faixa</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="68"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
         <source>&amp;Quit</source>
         <translation>&amp;Sair</translation>
     </message>
@@ -143,67 +146,36 @@
         <translation>Outros álbuns do artista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="74"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="120"/>
-        <source>Click to show Official Tracks</source>
-        <translation>Clique para mostrar as Faixas Oficiais</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="72"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="118"/>
-        <source>Click to show SuperCollection Tracks</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="79"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="136"/>
-        <source>Click to show SuperCollection Albums</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation>Desculpe, mas não conseguimos encontrar outro álbum para este artista!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="138"/>
-        <source>Click to show Official Albums</source>
-        <translation>Clique para mostrar os Ábuns Oficiais</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation>Desculpe, mas não conseguimos encontrar outras faixas para este álbum!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="205"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
         <source>Other Albums by %1</source>
-        <translation>Outros álbuns por %1</translation>
+        <translation>Outros álbuns de %1</translation>
     </message>
 </context>
 <context>
     <name>AlbumModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="145"/>
-        <source>Album</source>
-        <translation>Álbum</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="260"/>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="302"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
         <source>All albums from %1</source>
         <translation>Todos os álbuns de %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="304"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
         <source>All albums</source>
         <translation>Todos os álbuns</translation>
     </message>
 </context>
 <context>
-    <name>AlbumView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="155"/>
-        <source>After you have scanned your music collection you will find your latest album additions right here.</source>
-        <translation>Depois que você escanear a sua biblioteca musical você encontrará aqui o último álbum adicionado.</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="157"/>
-        <source>This collection doesn&apos;t have any recent albums.</source>
-        <translation>Essa biblioteca não tem nenhum álbum recente.</translation>
-    </message>
-</context>
-<context>
     <name>ArtistInfoWidget</name>
     <message>
         <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
@@ -211,119 +183,120 @@
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
         <source>Top Hits</source>
-        <translation>Maiores sucessos</translation>
+        <translation>Mais Tocadas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
         <source>Related Artists</source>
-        <translation>Artistas relacionados</translation>
+        <translation>Artistas Relacionados</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="77"/>
-        <source>Albums</source>
-        <translation>Álbuns</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation>Artista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="86"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="125"/>
-        <source>Click to show SuperCollection Albums</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>Álbuns</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="127"/>
-        <source>Click to show Official Albums</source>
-        <translation>Clique para mostrar os Ábuns Oficiais</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation>Capa</translation>
     </message>
-</context>
-<context>
-    <name>ArtistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="272"/>
-        <source>After you have scanned your music collection you will find your tracks right here.</source>
-        <translation>Depois que você escanear a sua biblioteca musical você encontrará aqui as suas faixas.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation>Desculpe, mas não conseguimos encontrar outros álbuns para este artista!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="274"/>
-        <source>This collection is currently empty.</source>
-        <translation>Essa biblioteca está vazia.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation>Desculpe, mas não conseguimos encontrar outros artistas relacionados a este!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="291"/>
-        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
-        <translation>Desculpe, o seu filtro &apos;%1&apos; não encontreou nenhum resultado.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation>Desculpe, mas não conseguimos encontrar outras faixas mais tocadas deste artista!</translation>
     </message>
 </context>
 <context>
     <name>AudioControls</name>
     <message>
-        <location filename="../src/audiocontrols.ui" line="75"/>
+        <location filename="../src/AudioControls.ui" line="75"/>
         <source>Prev</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="87"/>
+        <location filename="../src/AudioControls.ui" line="87"/>
         <source>Play</source>
-        <translation>Reporduzir</translation>
+        <translation>Play</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="94"/>
+        <location filename="../src/AudioControls.ui" line="94"/>
         <source>Pause</source>
         <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="103"/>
+        <location filename="../src/AudioControls.ui" line="103"/>
         <source>Next</source>
         <translation>Próxima</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="214"/>
+        <location filename="../src/AudioControls.ui" line="229"/>
         <source>Artist</source>
         <translation>Artista</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="236"/>
+        <location filename="../src/AudioControls.ui" line="248"/>
         <source>Album</source>
         <translation>Álbum</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="265"/>
+        <location filename="../src/AudioControls.ui" line="277"/>
         <source>Owner</source>
         <translation>Proprietário</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="302"/>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation>social</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
         <source>love</source>
         <translation>Favorita</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="346"/>
+        <location filename="../src/AudioControls.ui" line="383"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="375"/>
+        <location filename="../src/AudioControls.ui" line="412"/>
         <source>Time Left</source>
         <translation>Tempo restante</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="453"/>
+        <location filename="../src/AudioControls.ui" line="493"/>
         <source>Shuffle</source>
-        <translation>Embaralhar</translation>
+        <translation>Shuffle</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="466"/>
+        <location filename="../src/AudioControls.ui" line="506"/>
         <source>Repeat</source>
         <translation>Repetir</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="504"/>
+        <location filename="../src/AudioControls.ui" line="544"/>
         <source>Low</source>
         <translation>Diminuir</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="536"/>
+        <location filename="../src/AudioControls.ui" line="576"/>
         <source>High</source>
         <translation>Aumentar</translation>
     </message>
@@ -331,41 +304,42 @@
 <context>
     <name>AudioEngine</name>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="199"/>
-        <source>Tomahawk is stopped.</source>
-        <translation>Tomahawk está inativo.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation>Desculpe, o Tomahawk não encontrou a faixa &apos;%1&apos; de %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="369"/>
-        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
-        <translation>Tomahawk está reproduzindo &quot;%1&quot; por %2%3.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation>Desculpe, o Tomahawk não encontrou o artista &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="372"/>
-        <source>on album %1</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation>Desculpe, o Tomahawk não encontrou o álbum &apos;%1&apos; de %2</translation>
     </message>
 </context>
 <context>
     <name>CategoryAddItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="61"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="100"/>
-        <source>New Playlist</source>
-        <translation>Nova lista de reprodução</translation>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation>Criar nova Playlist</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="63"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation>Criar nova Estação</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>New Station</source>
         <translation>Nova estação</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>%1 Station</source>
         <translation>%1 Estação</translation>
     </message>
@@ -373,12 +347,12 @@
 <context>
     <name>CategoryItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="63"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
         <source>Playlists</source>
-        <translation>Listas de reprodução</translation>
+        <translation>Playlists</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="65"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
         <source>Stations</source>
         <translation>Estações</translation>
     </message>
@@ -386,33 +360,12 @@
 <context>
     <name>ClearButton</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/clearbutton.cpp" line="38"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
 </context>
 <context>
-    <name>CollectionFlatModel</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="72"/>
-        <source>My Collection</source>
-        <translation>Minha biblioteca</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="74"/>
-        <source>Collection of %1</source>
-        <translation>Biblioteca de %1</translation>
-    </message>
-</context>
-<context>
-    <name>CollectionView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionview.cpp" line="85"/>
-        <source>This collection is empty.</source>
-        <translation>Essa biblioteca está vazia.</translation>
-    </message>
-</context>
-<context>
     <name>ContextWidget</name>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
@@ -421,14 +374,14 @@
     </message>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="344"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
         <source>Show Footnotes</source>
-        <translation>Mostrar rodapé</translation>
+        <translation>Mostrar Notas de Rodapé</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="338"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
         <source>Hide Footnotes</source>
-        <translation>Ocultar rodapé</translation>
+        <translation>Ocultar Notas de Rodapé</translation>
     </message>
 </context>
 <context>
@@ -436,49 +389,59 @@
     <message>
         <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="23"/>
         <source>Tomahawk Crash Reporter</source>
-        <translation>Informante de falha do Tomahawk</translation>
+        <translation>Relatório de falha do Tomahawk</translation>
     </message>
-    <message>
+    <message utf8="true">
         <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
-        <source>&lt;p&gt;&lt;b&gt;Sorry!&lt;/b&gt;&amp;nbsp;Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;b&gt;Desculpe!&lt;/b&gt;&amp;nbsp;O Tomahawk travou. As informações sobre o travamento estão sendo enviadas para o quartel general do Tomahawk para que possamos solucionar esse problema.&lt;/p&gt;</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Desculpe!&lt;/span&gt; O Tomahawk travou. Por favor, informe-nos sobre isso! Criamos um relatório de erro que pode ajudar a melhorar a estabilidade no futuro. Você pode enviar este relatório diretamente para os desenvolvedores do Tomahawk.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation>Enviar este relatório</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="172"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation>Não enviar</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
         <source>Abort</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="192"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
         <source>You can disable sending crash reports in the configuration dialog.</source>
-        <translation type="unfinished"/>
+        <translation>Você pode desabilitar o envio de relatórios de erros na aba de configurações.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="153"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
         <source>Uploaded %L1 of %L2 KB.</source>
         <translation>Enviado %L1 de %L2 KB.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="167"/>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="183"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="176"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
         <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
         <translation>Enviado! &lt;b&gt;Muito obrigado&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
         <source>Failed to send crash info.</source>
-        <translation>Falha ao enviar as informações de travamento.</translation>
+        <translation>Falha ao enviar as informações de erro.</translation>
     </message>
 </context>
 <context>
     <name>DatabaseCommand_AllAlbums</name>
     <message>
-        <location filename="../src/libtomahawk/database/databasecommand_allalbums.cpp" line="109"/>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
@@ -486,41 +449,43 @@
 <context>
     <name>DelegateConfigWrapper</name>
     <message>
-        <location filename="../src/delegateconfigwrapper.cpp" line="61"/>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation>Sobre</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
         <source>Delete Account</source>
-        <translation type="unfinished"/>
+        <translation>Excluir Conta</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>Sobre esta Conta</translation>
     </message>
 </context>
 <context>
     <name>DiagnosticsDialog</name>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="20"/>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
         <source>Tomahawk Diagnostics</source>
-        <translation>Diagnóstico do Tomahawk</translation>
-    </message>
-    <message>
-        <location filename="../src/diagnosticsdialog.ui" line="38"/>
-        <source>Update</source>
-        <translation>Atualização</translation>
+        <translation>Diagnósticos do Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="45"/>
-        <source>Copy to Clipboard</source>
-        <translation>Copiar</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DropJob</name>
     <message>
-        <location filename="../src/libtomahawk/dropjob.cpp" line="832"/>
-        <source>No tracks found for given %1</source>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GlobalSearchWidget</name>
     <message>
-        <location filename="../src/searchbox.ui" line="14"/>
+        <location filename="../src/SearchBox.ui" line="14"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
@@ -530,71 +495,53 @@
     <message>
         <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
         <source>Indexing database</source>
-        <translation type="unfinished"/>
+        <translation>Indexando banco de dados</translation>
     </message>
 </context>
 <context>
     <name>InfoBar</name>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.ui" line="26"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Barra de informações</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="87"/>
-        <source>Automatically update</source>
-        <translation>Atualização automática</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="95"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
         <source>Filter...</source>
         <translation>Filtro...</translation>
     </message>
 </context>
 <context>
-    <name>JobStatusView</name>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Searching For</source>
-        <translation>Buscando por</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Pending</source>
-        <translation>Pendente</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="94"/>
-        <source>Idle</source>
-        <translation>Ocioso</translation>
-    </message>
-</context>
-<context>
     <name>LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
         <source>Scrobble tracks to Last.fm</source>
-        <translation type="unfinished"/>
+        <translation>Scrobble para o Last.fm</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
         <source>Username:</source>
-        <translation type="unfinished"/>
+        <translation>Usuário:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
         <source>Password:</source>
-        <translation type="unfinished"/>
+        <translation>Senha:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
         <source>Test Login</source>
-        <translation type="unfinished"/>
+        <translation>Teste o login</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation>Importar Histórico de Reprodução</translation>
     </message>
 </context>
 <context>
@@ -609,8 +556,8 @@
     <name>LatchedStatusItem</name>
     <message>
         <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
-        <source>%1 is listening along to you!</source>
-        <translation>%1 está escutando junto com você!</translation>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -623,7 +570,7 @@
     <message>
         <location filename="../src/LoadXSPFDialog.ui" line="22"/>
         <source>Playlist URL</source>
-        <translation type="unfinished"/>
+        <translation>URL da Playlist</translation>
     </message>
     <message>
         <location filename="../src/LoadXSPFDialog.ui" line="29"/>
@@ -638,18 +585,18 @@
     <message>
         <location filename="../src/LoadXSPFDialog.ui" line="51"/>
         <source>Automatically update</source>
-        <translation>Atualização automática</translation>
+        <translation>Atualizar automaticamente</translation>
     </message>
 </context>
 <context>
     <name>LoadXSPFDialog</name>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>Load XSPF File</source>
         <translation>Carregar arquivo XSPF</translation>
     </message>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>XSPF Files (*.xspf)</source>
         <translation>Arquivos XSPF (*.xspf)</translation>
     </message>
@@ -657,94 +604,297 @@
 <context>
     <name>LocalCollection</name>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Bookmarks</source>
         <translation>Favoritos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Saved tracks</source>
-        <translation>Faixas guardadas</translation>
+        <translation>Faixas salvas</translation>
+    </message>
+</context>
+<context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation>Desculpe, não encontramos nenhuma faixa favorita!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation>Faixas Favoritas</translation>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation>Tags</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation>Título:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation>Título...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation>Artista:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation>Artista...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation>Álbum:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation>Álbum...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation>Número do Disco:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation>Duração:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation>00.00</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation>Ano:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation>Taxa de bits:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation>Arquivo</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation>Nome do Arquivo:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation>Nome do Arquivo...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation>Tamanho do Arquivo...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation>Tamanho do Arquivo...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation>Tamanho do Arquivo:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation>Voltar</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation>Avançar</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation> - Propriedades</translation>
     </message>
 </context>
 <context>
     <name>NewPlaylistWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="20"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
         <source>Enter a title for the new playlist:</source>
-        <translation>Coloque um título para a nova lista:</translation>
+        <translation>Coloque um título para a nova playlist:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
         <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
-        <translation>Tomahawk oferece várias maneiras de lhe ajudar a criar suas listas e encontrar as músicas que você curte!</translation>
+        <translation>Tomahawk oferece várias maneiras de lhe ajudar a criar suas playlists e encontrar as músicas que você curte!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="47"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
         <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>Coloque o gênero ou o nome da etiqueta e o Tomahawk dará sugestões para que você começe com a sua nova lista:</translation>
+        <translation>É só inserir um gênero ou tag e o Tomahawk irá sugerir algumas músicas para que você inicie sua nova playlist:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.cpp" line="43"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
         <source>&amp;Create Playlist</source>
-        <translation>&amp;Criar lista de reprodução</translation>
+        <translation>&amp;Criar Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.h" line="50"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
         <source>Create a new playlist</source>
-        <translation>Criar uma nova lista de reprodução</translation>
+        <translation>Criar uma nova Playlist</translation>
+    </message>
+</context>
+<context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>Lançamentos</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation>Artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation>Título</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation>Compositor</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation>Álbum</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation>Faixa</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation>Taxa de bits</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation>Idade</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation>Ano</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Tamanho</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation>Origem</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation>Pontuação</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation>Nome</translation>
     </message>
 </context>
 <context>
     <name>PlaylistItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="162"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
         <source>played %1 by you</source>
-        <translation>reproduzido %1 por você</translation>
+        <translation>tocou %1 por você</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="164"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
         <source>played %1 by %2</source>
-        <translation>reproduzido %1 por %2</translation>
+        <translation>tocou %1 por %2</translation>
     </message>
 </context>
 <context>
     <name>PlaylistLargeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="156"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
         <source>played %1 by you</source>
-        <translation type="unfinished"/>
+        <translation>tocou %1 por você</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
         <source>played %1 by %2</source>
-        <translation type="unfinished"/>
+        <translation>tocou %1 por %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="165"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
         <source>added %1</source>
-        <translation type="unfinished"/>
+        <translation>adicionou %1</translation>
     </message>
 </context>
 <context>
     <name>PlaylistModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
         <source>A playlist by %1, created %2</source>
-        <translation>Uma lista de reprodução de %1, criada %2</translation>
+        <translation>Uma playlist de %1, criada %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="78"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
         <source>you</source>
         <translation>você</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
         <source>All tracks by %1 on album %2</source>
         <translation>Todas as faixas de %1 no álbum %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="152"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
         <source>All tracks by %1</source>
         <translation>Todas as faixas de %1</translation>
     </message>
@@ -752,109 +902,110 @@
 <context>
     <name>PlaylistTypeSelectorDlg</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="32"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
         <source>New Playlist</source>
-        <translation>Nova lista de reprodução</translation>
+        <translation>Nova Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="49"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
         <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
-        <translation>Uma lista de reprodução normal... Coloque um nome e arraste algumas faixas aqui!</translation>
+        <translation>Apenas a boa e velha playlist... Atribua um nome a ela, arraste algumas faixas pra cá e siga!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="75"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
         <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
-        <translation>Não sabe o que fazer? Dê ao Tomahawk algumas indicações e deixe-o criar uma lista para você!</translation>
+        <translation>Não sabe o que fazer? Dê ao Tomahawk algumas indicações e deixe-o criar uma playlist para você!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="92"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="102"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
         <source>New Playlist...</source>
-        <translation>Nova lista de reprodução...</translation>
+        <translation>Nova Playlist...</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="113"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
         <source>Create Manual Playlist</source>
-        <translation>Criar uma lista manualmente</translation>
+        <translation>Criar uma Playlist manualmente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="123"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
         <source>Create Automatic Playlist</source>
-        <translation>Criar uma lista automaticamente</translation>
+        <translation>Criar uma Playlist automaticamente</translation>
     </message>
 </context>
 <context>
     <name>PlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistview.cpp" line="145"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation>Esta playlist esta atualmente vazia.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
         <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
-        <translation>Esta lista de reprodução está vazia. Adicione algumas faixas para disfrutar de uma música!</translation>
+        <translation>Esta playlist está vazia. Adicione algumas faixas a ela e aprecie a música!</translation>
     </message>
 </context>
 <context>
     <name>ProxyDialog</name>
     <message>
-        <location filename="../src/proxydialog.ui" line="17"/>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
         <source>Proxy Settings</source>
         <translation>Configurações de proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="70"/>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
         <source>Hostname of proxy server</source>
         <translation>Endereço do servidor proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="77"/>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
         <source>Host</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="84"/>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="104"/>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
         <source>Proxy login</source>
         <translation>Usuário do servidor proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="111"/>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
         <source>User</source>
         <translation>Usuário</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="118"/>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="128"/>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
         <source>Proxy password</source>
         <translation>Senha do servidor proxy</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="135"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
-    </message>
-    <message>
-        <location filename="../src/proxydialog.ui" line="142"/>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
         <source>No Proxy Hosts:
 (Overrides system proxy)</source>
-        <translation type="unfinished"/>
+        <translation>Sem Servidores de Proxy:⏎
+(Substitui o proxy do sistema)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="150"/>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
         <source>localhost *.example.com (space separated)</source>
         <translation>localhost *.exemplo.com (separado por espaço)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="167"/>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
         <source>Use proxy for DNS lookups?</source>
         <translation>Usar proxy para resolução DNS?</translation>
     </message>
@@ -862,84 +1013,84 @@
 <context>
     <name>QObject</name>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="214"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
         <source>%n year(s) ago</source>
-        <translation><numerusform>%n year ago</numerusform><numerusform>%n years ago</numerusform></translation>
+        <translation><numerusform>%n ano atrás</numerusform><numerusform>%n anos atrás</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="216"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
         <source>%n year(s)</source>
-        <translation><numerusform>%n year</numerusform><numerusform>%n years</numerusform></translation>
+        <translation><numerusform>%n ano</numerusform><numerusform>%n anos</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="222"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
         <source>%n month(s) ago</source>
-        <translation><numerusform>%n month ago</numerusform><numerusform>%n months ago</numerusform></translation>
+        <translation><numerusform>%n mês atrás</numerusform><numerusform>%n meses atrás</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
         <source>%n month(s)</source>
-        <translation><numerusform>%n month</numerusform><numerusform>%n months</numerusform></translation>
+        <translation><numerusform>%n mês</numerusform><numerusform>%n meses</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="230"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
         <source>%n week(s) ago</source>
-        <translation><numerusform>%n week ago</numerusform><numerusform>%n weeks ago</numerusform></translation>
+        <translation><numerusform>%n semana atrás</numerusform><numerusform>%n semanas atrás</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="232"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
         <source>%n week(s)</source>
-        <translation><numerusform>%n week</numerusform><numerusform>%n weeks</numerusform></translation>
+        <translation><numerusform>%n semana</numerusform><numerusform>%n semanas</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="238"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
         <source>%n day(s) ago</source>
-        <translation><numerusform>%n day ago</numerusform><numerusform>%n days ago</numerusform></translation>
+        <translation><numerusform>%n dia atrás</numerusform><numerusform>%n dias atrás</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="240"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
         <source>%n day(s)</source>
-        <translation><numerusform>%n day</numerusform><numerusform>%n days</numerusform></translation>
+        <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="246"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
         <source>%n hour(s) ago</source>
-        <translation><numerusform>%n hour ago</numerusform><numerusform>%n hours ago</numerusform></translation>
+        <translation><numerusform>%n hora atrás</numerusform><numerusform>%n horas atrás</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="248"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
         <source>%n hour(s)</source>
-        <translation><numerusform>%n hour</numerusform><numerusform>%n hours</numerusform></translation>
+        <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="254"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
         <source>%1 minutes ago</source>
-        <translation type="unfinished"/>
+        <translation>%1 minutos atrás</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="256"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
         <source>%1 minutes</source>
-        <translation type="unfinished"/>
+        <translation>%1 minutos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="260"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
         <source>just now</source>
-        <translation type="unfinished"/>
+        <translation>agora</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="34"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
         <source>Friend Finders</source>
-        <translation type="unfinished"/>
+        <translation>Descobridor de amigos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
         <source>Music Finders</source>
-        <translation type="unfinished"/>
+        <translation>Descobridor de músicas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="39"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
         <source>Status Updaters</source>
-        <translation type="unfinished"/>
+        <translation>Atualizadores de Status</translation>
     </message>
 </context>
 <context>
@@ -947,32 +1098,37 @@
     <message>
         <location filename="../src/libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
         <source>ZIP/UNZIP API error %1</source>
-        <translation>Erro com a aplicação ZIP/UNZIP %1</translation>
+        <translation>Erro com o API ZIP/UNZIP %1</translation>
     </message>
 </context>
 <context>
     <name>QueueView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="26"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Barra de informações</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="41"/>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="120"/>
-        <source>Show Queue</source>
-        <translation>Mostrar fila</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation>Abrir Lista</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation><numerusform>Abrir Fila - %n item</numerusform><numerusform>Abrir Fila - %n itens</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="130"/>
-        <source>Hide Queue</source>
-        <translation>Ocultar fila</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation>Fechar Lista</translation>
     </message>
 </context>
 <context>
     <name>RelatedArtistsContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
         <source>Related Artists</source>
         <translation>Artistas relacionados</translation>
     </message>
@@ -980,12 +1136,12 @@
 <context>
     <name>ResolverConfigDelegate</name>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="110"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
         <source>Not found: %1</source>
         <translation>Não encontrado: %1</translation>
     </message>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="113"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
         <source>Failed to load: %1</source>
         <translation>Falha ao carregar: %1</translation>
     </message>
@@ -993,7 +1149,7 @@
 <context>
     <name>SearchLineEdit</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/searchlineedit.cpp" line="58"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
@@ -1001,52 +1157,62 @@
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="54"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
         <source>Search: %1</source>
         <translation>Buscar: %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="55"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
         <source>Results for &apos;%1&apos;</source>
-        <translation>Resultados de &apos;%1&apos;</translation>
+        <translation>Resultados para &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="245"/>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
         <source>Collection</source>
-        <translation>Biblioteca</translation>
+        <translation>Coleção</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="252"/>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="124"/>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
         <source>All</source>
-        <translation type="unfinished"/>
+        <translation>Todos</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation>Algumas configurações não terão efeito até que o Tomahawk seja reiniciado</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="238"/>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
         <source>Services</source>
-        <translation type="unfinished"/>
+        <translation>Serviços</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="396"/>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
         <source>Install resolver from file</source>
-        <translation type="unfinished"/>
+        <translation>Instalar resolvedor via arquivo</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Information</source>
-        <translation>Informação</translation>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation>Excluir todas as entradas de controle de acesso?</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation>Você realmente quer apagar todas as entradas de controle de acesso? Você será solicitado a tomar uma decisão para cada ponto a que você se conectar.</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Changing this setting requires a restart of Tomahawk!</source>
-        <translation>Mudando essas contigurações será necessário reiniciar o Tomahawk!</translation>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>Informação</translation>
     </message>
 </context>
 <context>
@@ -1059,65 +1225,103 @@
     <message>
         <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="48"/>
         <source>Most Played Playlists</source>
-        <translation>Listas mais reproduzidas</translation>
+        <translation>Playlists mais tocadas</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="63"/>
         <source>Most Played Tracks You Don&apos;t Have</source>
-        <translation>Faixas mais reproduzidas que você não possui</translation>
+        <translation>Faixas mais tocadas que você não possui</translation>
+    </message>
+</context>
+<context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>Capa</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation>Tweet</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation>Ouvindo &quot;%1&quot; de %2. %3</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation>Ouvindo &quot;%1&quot; de %2 em &quot;%3&quot;. %4</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation>%1 caracteres restantes</translation>
     </message>
 </context>
 <context>
     <name>SourceDelegate</name>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="55"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
         <source>Track</source>
         <translation>Faixa</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="56"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
         <source>Album</source>
         <translation>Álbum</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="57"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
         <source>Artist</source>
         <translation>Artista</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="58"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="59"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
         <source>Top 10</source>
         <translation>10 Mais</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="187"/>
-        <source>Offline</source>
-        <translation>Desconectado</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
         <source>All available tracks</source>
         <translation>Todas as faixas disponíveis</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="196"/>
-        <source>Online</source>
-        <translation>Conectado</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="289"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="330"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="291"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="332"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
         <source>Hide</source>
         <translation>Ocultar</translation>
     </message>
@@ -1125,32 +1329,32 @@
 <context>
     <name>SourceInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="30"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
         <source>Recent Albums</source>
-        <translation>Álbuns recentes</translation>
+        <translation>Álbuns Recentes</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="74"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
         <source>Latest Additions</source>
-        <translation>Mais recentes</translation>
+        <translation>Últimas Adições</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="88"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
         <source>Recently Played Tracks</source>
-        <translation>Faixas reproduzidas recentemente</translation>
+        <translation>Faixas Ouvidas Recentemente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="80"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
         <source>New Additions</source>
-        <translation>Novas adições</translation>
+        <translation>Novas Adições</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="83"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
         <source>My recent activity</source>
-        <translation>Minha atividade recentes</translation>
+        <translation>Minha atividade recente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="87"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
         <source>Recent activity from %1</source>
         <translation>Atividade recente de %1</translation>
     </message>
@@ -1158,128 +1362,206 @@
 <context>
     <name>SourceItem</name>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="65"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
         <source>Collection</source>
-        <translation>Biblioteca</translation>
+        <translation>Coleção</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="73"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
         <source>Latest Additions</source>
-        <translation type="unfinished"/>
+        <translation>Últimas Adições</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="77"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
         <source>Recently Played</source>
-        <translation type="unfinished"/>
+        <translation>Ouvidas Recentemente</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="81"/>
-        <source>Loved Tracks</source>
-        <translation>Faixas favoritas</translation>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation>SuperColeção</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="146"/>
-        <source>SuperCollection</source>
-        <translation type="unfinished"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation>Últimas adições à sua coleção</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation>Últimas adições à coleção de %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation>Desculpe, não foi possível encontrar adições recentes!</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation>Faixas Reproduzidas Recentemente</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation>Suas faixas reproduzidas recentemente</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation>Faixas reproduzidas recentemente por %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation>Desculpe, não foi possível encontrar playlists recentes!</translation>
     </message>
 </context>
 <context>
     <name>SourceTreeView</name>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="188"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
         <source>&amp;Copy Link</source>
         <translation>&amp;Copiar link</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
         <source>&amp;Delete %1</source>
-        <translation>&amp;Eliminar %1</translation>
+        <translation>&amp;Excluir %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation>Adicionar às minhas Playlists</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="207"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation>Adicionar às minhas Playlists Automáticas</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation>Adicionar às minhas Estações</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
         <source>&amp;Export Playlist</source>
-        <translation>&amp;Exportar lista de reprodução</translation>
+        <translation>&amp;Exportar Playlist</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation>playlist</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation>playlist automática</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation>estação</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation>Deletar %1?</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="341"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation>Gostaria de deletar a %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
         <source>Save XSPF</source>
         <translation>Salvar XSPF</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="342"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
         <source>Playlists (*.xspf)</source>
-        <translation>Listas de reprodução (*.xspf)</translation>
+        <translation>Playlists (*.xspf)</translation>
     </message>
 </context>
 <context>
     <name>SourcesModel</name>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="78"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="81"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
         <source>Collection</source>
-        <translation>Biblioteca</translation>
+        <translation>Coleção</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="84"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
         <source>Playlist</source>
-        <translation>Lista de reprodução</translation>
+        <translation>Playlist</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="87"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
         <source>Automatic Playlist</source>
-        <translation>Lista automática</translation>
+        <translation>Playlist Automática</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="90"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
         <source>Station</source>
         <translation>Estação</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="268"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
         <source>Browse</source>
         <translation>Navegar</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="269"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
         <source>Search History</source>
-        <translation type="unfinished"/>
+        <translation>Histórico de Busca</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="271"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
         <source>My Music</source>
-        <translation type="unfinished"/>
+        <translation>Minhas Músicas</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="279"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
         <source>SuperCollection</source>
-        <translation type="unfinished"/>
+        <translation>SuperColeção</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="285"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
         <source>Top Loved Tracks</source>
-        <translation>Faixas favoritas</translation>
+        <translation>Faixas Favoritas</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="273"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
         <source>Dashboard</source>
         <translation>Painel</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="290"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
         <source>Recently Played</source>
-        <translation type="unfinished"/>
+        <translation>Ouvidas Recentemente</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
         <source>Charts</source>
-        <translation>Gráficos</translation>
+        <translation>Charts</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>Lançamentos</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="300"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
         <source>Friends</source>
         <translation>Amigos</translation>
     </message>
@@ -1287,515 +1569,720 @@
 <context>
     <name>SpotifyConfig</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="48"/>
-        <source>Configure your Spotify credentials</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation>Configure sua conta do Spotify</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="65"/>
-        <source>Username:</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation>Nome de usuário ou email do Facebook</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="72"/>
-        <source>placeholderUsername</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>Log In</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
-        <source>Password:</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation>Clique com o botão direito em qualquer playlist do Tomahawk para sincronizá-la com o Spotify.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="86"/>
-        <source>placeholderPw</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation>Streams de Alta Qualidade</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="116"/>
-        <source>High Quality Streaming</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation>Playlists do Spotify para sincronizar:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="186"/>
-        <source>This product uses SPOTIFY(R) CORE but is not endorsed, certified or otherwise approved in any way by Spotify. Spotify is the registered trade mark of the Spotify Group.</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation>Deletar a playlist do Tomahawk quando remover a sincronização</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>Usuário:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>Senha:</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation>Deletar no Spotify?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation>Você também gostaria de deletar a playlist correspondente no Spotify?</translation>
     </message>
 </context>
 <context>
     <name>StackedSettingsDialog</name>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="14"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
         <source>Tomahawk Settings</source>
         <translation>Configurações do Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="158"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
         <source>Local Music Information</source>
-        <translation>Informação da música local</translation>
+        <translation>Informação de Músicas Locais</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="166"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
         <source>Path to scan for music files:</source>
-        <translation>Caminho dos arquivos de música:</translation>
+        <translation>Caminho para os arquivos de música:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="180"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
         <source>The Echo Nest supports keeping track of your catalog metadata
  and using it to craft personalized radios. Enabling this option
  will allow you (and all your friends) to create automatic playlists
  and stations based on your personal taste profile.</source>
-        <translation>O Echo Nest analisa os dados da sua biblioteca
- e usa esses dados para criar rádios personalizadas. Habilitando esta opção
- irá permitir a você (e seus amigos) criar listas de reprodução e rádios
-.automáticas baseadas no seu gosto pessoal.</translation>
+        <translation>O Echo Nest pode analisar os metadados de sua biblioteca 
+e usá-los para criar rádios personalizadas. Habilitando esta opção 
+irá permitir a você (e seus amigos) criar playlists e estações 
+automáticas baseadas no seu gosto pessoal.</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="186"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
         <source>Upload collection list to The Echo Nest to enable user radio</source>
-        <translation>Carregar biblioteca ao Echo Nest para habilitar a rádio do usuário</translation>
+        <translation>Carregar coleção ao Echo Nest para habilitar a rádio do usuário</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="199"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
         <source>Watch for changes</source>
-        <translation>Observar qualquer mudança</translation>
+        <translation>Acompanhar alterações</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="208"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
         <source>Time between scans, in seconds:</source>
-        <translation>Tempo entre os escaneos, em segundos:</translation>
+        <translation>Tempo entre escaneamentos, em segundos:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="98"/>
-        <source>Internet Services</source>
-        <translation type="unfinished"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation>Configurações Avançadas</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="109"/>
-        <source>Install from file...</source>
-        <translation type="unfinished"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation>Método de Conexão Remota por Peer</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="129"/>
-        <source>Filter by capability:</source>
-        <translation type="unfinished"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation>Nenhum (somente conexões de saída)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation>Use UPnP para estabelecer o encaminhamento de porta (recomendado)</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation>Use endereço IP, nome de servidor e porta estáticos externos.</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation>Defina esta opção para o seu endereço de IP externo ou servidor. Certifique-se de encaminhar a porta para este servidor!</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="245"/>
-        <source>Advanced Network Settings</source>
-        <translation>Configurações de rede avançadas</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation>Utilizar Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="265"/>
-        <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>Se você está tendo dificuldade em conectar-se com outros pares tente colocar o seu endereço IP externo e número da porta (padrão 50210) Não se esqueça de redirecionar essa porta para este dispositivo!</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation>Limpar todas as entradas de controle de acesso</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="283"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation>Serviços de Internet</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation>Instalar via arquivo...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation>Filtrar por capacidade:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
         <source>Static Host Name:</source>
-        <translation>Nome do servidor estático:</translation>
+        <translation>Nome do Servidor Estático:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="299"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
         <source>Static Port:</source>
-        <translation>Porta estática:</translation>
+        <translation>Porta Estática:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="321"/>
-        <source>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</source>
-        <translation>Usar sempre nome de dispositivo/porta? (Substituirá as configurações de UPnP/port forwarding)</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
+        <source>Proxy Settings...</source>
+        <translation>Configurações de Proxy...</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="345"/>
-        <source>Proxy Settings...</source>
-        <translation>Configurações de proxy...</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation>Outras configurações</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="383"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
         <source>Send reports after Tomahawk crashed</source>
         <translation>Enviar informações caso o Tomahawk trave</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="396"/>
-        <source>Allow web browsers to interact with Tomahawk</source>
-        <translation type="unfinished"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation>Permitir que navegadores web interajam com o Tomahawk (recomendado)</translation>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation>Copiar Link do Artista</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation>Copiar Link do Álbum</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="409"/>
-        <source>Use UPnP to establish port forward</source>
-        <translation>Usar UPnP para estabelecer port forward</translation>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation>Copiar Link da Faixa</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::AccountDelegate</name>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="200"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
         <source>Add Account</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar Conta</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="250"/>
-        <source>Remove Account</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation>Remover</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="360"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
         <source>%1 downloads</source>
-        <translation type="unfinished"/>
+        <translation>%1 downloads</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="585"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
         <source>Online</source>
-        <translation type="unfinished"/>
+        <translation>Online</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="590"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
         <source>Connecting...</source>
-        <translation type="unfinished"/>
+        <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="595"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
         <source>Offline</source>
-        <translation type="unfinished"/>
+        <translation>Offline</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation>Instalação Manual Requerida</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation>Infelizmente, a instalação automática deste resolvedor não esta disponível ou esta desabilitada para sua plataforma.&lt;br /&gt;&lt;br /&gt;Por favor, utilize a opção &quot;Instalar via arquivo&quot; acima e instale do arquivo baixado ou compilado. Instruções adicionais podem ser encontradas aqui:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapper</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="82"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
         <source>Configure this Google Account</source>
-        <translation type="unfinished"/>
+        <translation>Configurar esta Conta do Google</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
         <source>Google Address</source>
-        <translation type="unfinished"/>
+        <translation>Endereço de email do Google</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="84"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
         <source>Enter your Google login to connect with your friends using Tomahawk!</source>
-        <translation type="unfinished"/>
+        <translation>Digite seu login do Google para se conectar com seus amigos usando o Tomahawk!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="85"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
         <source>username@gmail.com</source>
-        <translation type="unfinished"/>
+        <translation>username@gmail.com</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.h" line="42"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
         <source>Connect to Google Talk to find your friends</source>
-        <translation type="unfinished"/>
+        <translation>Conecte-se ao Google Talk para encontrar seus amigos</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperSip</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="61"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
         <source>Add Friend</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar Amigo</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
         <source>Enter Google Address:</source>
-        <translation type="unfinished"/>
+        <translation>Insira o endereço de email do Google:</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::LastFmAccountFactory</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmAccount.h" line="47"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
         <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
-        <translation type="unfinished"/>
+        <translation>Faça o scrobble para o last.fm e encontre faixas gratuitas para reproduzir</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="108"/>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="123"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation>Testando...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation>Testar Login</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation>Importando %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation>Importando Histórico...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation>Histórico Incompleto. Retomar</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation>Reproduzir Histórico Importado</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
         <source>Failed</source>
-        <translation type="unfinished"/>
+        <translation>Falhou</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="113"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
         <source>Success</source>
-        <translation type="unfinished"/>
+        <translation>Sucesso</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="129"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
         <source>Could not contact server</source>
+        <translation>Não foi possível contatar o servidor</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation>Sincronizar com o Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation>Reativar sincronização com Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation>Parar a sincronização com o Spotify</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>Logando...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation>Falha: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>Log In</translation>
+    </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccount.h" line="44"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
         <source>Play music from and sync your playlists with Spotify Premium</source>
-        <translation type="unfinished"/>
+        <translation>Reproduzir e sincronizar suas playlists com o Spotify Premium</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::TwitterAccountFactory</name>
     <message>
-        <location filename="../src/accounts/twitter/twitteraccount.h" line="50"/>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
         <source>Connect to your Twitter followers.</source>
-        <translation type="unfinished"/>
+        <translation>Conecte-se aos seus seguidores do Twitter.</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="58"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="141"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="189"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
         <source>Tweet!</source>
-        <translation type="unfinished"/>
+        <translation>Tweet!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="66"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="167"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
         <source>Status: No saved credentials</source>
-        <translation type="unfinished"/>
+        <translation>Status: Sem credenciais salvas</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="67"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="92"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="168"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
         <source>Authenticate</source>
-        <translation type="unfinished"/>
+        <translation>Autenticar</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="74"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="136"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
         <source>Status: Credentials saved for %1</source>
-        <translation type="unfinished"/>
+        <translation>Status: Credenciais salvas para %1</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="75"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
         <source>De-authenticate</source>
-        <translation type="unfinished"/>
+        <translation>Desautenticar</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>Tweetin&apos; Error</source>
-        <translation type="unfinished"/>
+        <translation>Erro ao Tuitar</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
         <source>The credentials could not be verified.
 You may wish to try re-authenticating.</source>
-        <translation type="unfinished"/>
+        <translation>As credenciais não puderam ser verificadas.⏎
+Você pode tentar re-autenticar.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="152"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
         <source>Status: Error validating credentials</source>
-        <translation type="unfinished"/>
+        <translation>Status: Erro ao validar credenciais</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="179"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
         <source>Global Tweet</source>
-        <translation type="unfinished"/>
+        <translation>Tweet Global</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="184"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
         <source>Direct Message</source>
-        <translation type="unfinished"/>
+        <translation>Mensagem Direta (DM)</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="185"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
         <source>Send Message!</source>
-        <translation type="unfinished"/>
+        <translation>Enviar Mensagem!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="186"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
         <source>@Mention</source>
-        <translation type="unfinished"/>
+        <translation>@Mention</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="187"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
         <source>Send Mention!</source>
-        <translation type="unfinished"/>
+        <translation>Enviar Menção!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
         <source>You must enter a user name for this type of tweet.</source>
-        <translation type="unfinished"/>
+        <translation>Você precisa inserir um nome de usuário para este tipo de tweet.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
         <source>Your saved credentials could not be loaded.
 You may wish to try re-authenticating.</source>
-        <translation type="unfinished"/>
+        <translation>Suas credenciais salvas não puderam ser carregadas.⏎
+Você pode tentar re-autenticar.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
         <source>Your saved credentials could not be verified.
 You may wish to try re-authenticating.</source>
-        <translation type="unfinished"/>
+        <translation>Suas credenciais salvas não puderam ser verificadas. ⏎
+Você pode tentar re-autenticar.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>There was an error posting your status -- sorry!</source>
-        <translation type="unfinished"/>
+        <translation>Houve um erro ao postar seu status -- desculpe!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Tweeted!</source>
-        <translation type="unfinished"/>
+        <translation>Tuitado!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
         <source>Your tweet has been posted!</source>
-        <translation type="unfinished"/>
+        <translation>Seu tweet foi postado!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
         <source>There was an error posting your direct message -- sorry!</source>
-        <translation type="unfinished"/>
+        <translation>Houve um erro ao enviar seu DM -- desculpe!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Your message has been posted!</source>
-        <translation type="unfinished"/>
+        <translation>Sua mensagem foi postada!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::XmppAccountFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppaccount.h" line="51"/>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
         <source>Log on to your Jabber/XMPP account to connect to your friends</source>
-        <translation type="unfinished"/>
+        <translation>Entre em sua conta do Jabber/XMPP para se conectar com seus amigos</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::ZeroconfFactory</name>
     <message>
-        <location filename="../src/accounts/zeroconf/zeroconfaccount.h" line="42"/>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
         <source>Automatically connect to Tomahawks on the local network</source>
-        <translation type="unfinished"/>
+        <translation>Conectar automaticamente ao Tomahawk na rede local.</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::ContextMenu</name>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="79"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
         <source>&amp;Play</source>
-        <translation>&amp;Reproduzir</translation>
+        <translation>&amp;Play</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="82"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="142"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="181"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
         <source>Add to &amp;Queue</source>
         <translation>Adicionar à &amp;lista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="87"/>
-        <source>&amp;Continue playback after this track</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation>Continuar a reprodução após esta &amp;Faixa</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="89"/>
-        <source>&amp;Stop playback after this track</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation>Parar a reprodução após esta &amp;Faixa</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="96"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="277"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
         <source>&amp;Love</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Favorita</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
         <source>&amp;Copy Track Link</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Copiar Link da Faixa</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="139"/>
-        <source>Show &amp;Album page</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation>Copiar &amp;Link do Álbum </translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="178"/>
-        <source>Show &amp;Artist page</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation>Copiar &amp;Link do Artista </translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="272"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
         <source>Un-&amp;Love</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Desfavoritar</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Items</source>
-        <translation>&amp;Eliminar itens</translation>
+        <translation>&amp;Deletar itens</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation>&amp;Mostrar Página da Faixa</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Item</source>
-        <translation>&amp;Eliminar item</translation>
+        <translation>&amp;Deletar item</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation>&amp;Mostrar Página do Álbum</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation>&amp;Mostrar Página do Artista</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::CustomPlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="123"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
         <source>Top Loved Tracks</source>
-        <translation>Faixas favoritas</translation>
+        <translation>Faixas Favoritas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="127"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
         <source>Your loved tracks</source>
         <translation>Suas faixas favoritas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="129"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
         <source>%1&apos;s loved tracks</source>
         <translation>Faixas favoritas de %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="138"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
         <source>The most loved tracks from all your friends</source>
-        <translation>As faixas preferidas dos seus amigos</translation>
+        <translation>As faixas favoritas de todos os seus amigos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="142"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
         <source>All of your loved tracks</source>
-        <translation>Todas as suas faixas preferidas</translation>
+        <translation>Todas as suas faixas favoritas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
         <source>All of %1&apos;s loved tracks</source>
-        <translation>Todas as faixas preferidas de %1</translation>
+        <translation>Todas as faixas favoritas de %1</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::DropJobNotifier</name>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="102"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation>playlist</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation>artista</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation>faixa</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation>álbum</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
         <source>Fetching %1 from database</source>
         <translation>Buscando %1 na base de dados</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="106"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
         <source>Parsing %1 %2</source>
         <translation>Analisando %1 %2</translation>
     </message>
@@ -1803,9 +2290,9 @@
 <context>
     <name>Tomahawk::DynamicControlList</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
         <source>Click to collapse</source>
-        <translation>Clique para colapsar</translation>
+        <translation>Clique para abrir</translation>
     </message>
 </context>
 <context>
@@ -1831,30 +2318,30 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="53"/>
         <source>Type:</source>
-        <translation>Type:</translation>
+        <translation>Tipo:</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="67"/>
         <source>Generate</source>
-        <translation>Criar</translation>
+        <translation>Gerar</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::DynamicView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
         <source>Add some filters above to seed this station!</source>
-        <translation>Adicione alguns filtros para alimentar essa estação!</translation>
+        <translation>Adicione alguns filtros acima para alimentar essa estação!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="149"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
         <source>Press Generate to get started!</source>
-        <translation>Precione Criar para iniciar!</translation>
+        <translation>Pressione Gerar para começar!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="151"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
         <source>Add some filters above, and press Generate to get started!</source>
-        <translation>Adicione alguns filtros acima e precione Criar para iniciar!</translation>
+        <translation>Adicione alguns filtros acima e precione Gerar para iniciar!</translation>
     </message>
 </context>
 <context>
@@ -1864,7 +2351,9 @@
         <source>Station ran out of tracks!
 
 Try tweaking the filters for a new set of songs to play.</source>
-        <translation type="unfinished"/>
+        <translation>A estação ficou sem faixas! ⏎
+⏎
+Tente ajustar os filtros para ouvir um novo conjunto de músicas.</translation>
     </message>
 </context>
 <context>
@@ -1888,12 +2377,12 @@
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="216"/>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="584"/>
         <source>No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings</source>
-        <translation>Nenhum usuário com catálogo Echo Nest habilitado. Tente habilitar essa opção nas configurações da biblioteca</translation>
+        <translation>Nenhum usuário com catálogo Echo Nest habilitado. Tente habilitar essa opção nas configurações da Coleção</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="235"/>
         <source>similar to</source>
-        <translation>parecido a</translation>
+        <translation>similar a</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
@@ -1950,72 +2439,72 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="343"/>
         <source>Major</source>
-        <translation>Major</translation>
+        <translation>Maior</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="344"/>
         <source>Minor</source>
-        <translation>Minor</translation>
+        <translation>Menor</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
         <source>C</source>
-        <translation>Dó</translation>
+        <translation>C</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
         <source>C Sharp</source>
-        <translation>Dó sustenido</translation>
+        <translation>C#</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
         <source>D</source>
-        <translation>Ré</translation>
+        <translation>D</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
         <source>E Flat</source>
-        <translation>Mi bemol</translation>
+        <translation>E♭</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
         <source>E</source>
-        <translation>Mi</translation>
+        <translation>E</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
         <source>F</source>
-        <translation>Fá</translation>
+        <translation>F</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
         <source>F Sharp</source>
-        <translation>Fá sustenido</translation>
+        <translation>F#</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="369"/>
         <source>G</source>
-        <translation>Sol</translation>
+        <translation>G</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="370"/>
         <source>A Flat</source>
-        <translation>Sol bemol</translation>
+        <translation>A♭</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="371"/>
         <source>A</source>
-        <translation>Lá</translation>
+        <translation>A</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="372"/>
         <source>B Flat</source>
-        <translation>Sí bemol</translation>
+        <translation>B♭</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="373"/>
         <source>B</source>
-        <translation>Sí</translation>
+        <translation>B</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
@@ -2040,22 +2529,22 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="396"/>
         <source>Loudness</source>
-        <translation>Mais alto</translation>
+        <translation>Altura</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="397"/>
         <source>Artist Familiarity</source>
-        <translation>Familiaridade do artista</translation>
+        <translation>Familiaridade do Artista</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
         <source>Artist Hotttnesss</source>
-        <translation>Artistas preferidos</translation>
+        <translation>Hotttnesss do Artista</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
         <source>Song Hotttnesss</source>
-        <translation>Canções preferidas</translation>
+        <translation>Hotttnesss da Música</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
@@ -2075,7 +2564,7 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="403"/>
         <source>Key</source>
-        <translation>Chave</translation>
+        <translation>Tom</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="404"/>
@@ -2085,7 +2574,7 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="405"/>
         <source>Danceability</source>
-        <translation>Habilidade de dança</translation>
+        <translation>Dançabilidade</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="744"/>
@@ -2095,7 +2584,7 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="746"/>
         <source>similar to ~%1</source>
-        <translation>parecido a~%1</translation>
+        <translation>similar a ~%1</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="748"/>
@@ -2111,12 +2600,12 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="758"/>
         <source>My Collection</source>
-        <translation>Minha biblioteca</translation>
+        <translation>Minha Coleção</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="762"/>
         <source>from %1 radio</source>
-        <translation>da %1 rádio</translation>
+        <translation>da rádio %1</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="785"/>
@@ -2131,7 +2620,7 @@
     <message numerus="yes">
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
         <source>about %n minute(s) long</source>
-        <translation><numerusform>aproximadamente %n minuto(s) de duração</numerusform><numerusform>about %n minutes long</numerusform></translation>
+        <translation><numerusform>aproximadamente %n minuto de duração</numerusform><numerusform>aproximadamente %n minutos de duração</numerusform></translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
@@ -2151,7 +2640,7 @@
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="803"/>
         <source>in a %1 key</source>
-        <translation>em uma %1 chave</translation>
+        <translation>em um tom %1</translation>
     </message>
     <message>
         <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="813"/>
@@ -2172,194 +2661,223 @@
 <context>
     <name>Tomahawk::EchonestSteerer</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="57"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
         <source>Steer this station:</source>
-        <translation>Conduzir essa estação:</translation>
+        <translation>Conduza esta estação:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="71"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
         <source>Much less</source>
         <translation>Muito menos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="72"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
         <source>Less</source>
         <translation>Menos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="73"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
         <source>A bit less</source>
         <translation>Um pouco menos</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="74"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
         <source>Keep at current</source>
         <translation>Manter atual</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="75"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
         <source>A bit more</source>
         <translation>Um pouco mais</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="76"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
         <source>More</source>
         <translation>Mais</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
         <source>Much more</source>
         <translation>Muito mais</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="80"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
         <source>Loudness</source>
-        <translation>Mais alto</translation>
+        <translation>Altura</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
         <source>Danceability</source>
-        <translation>Habilidade de dança</translation>
+        <translation>Dançabilidade</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
         <source>Energy</source>
         <translation>Energia</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
         <source>Song Hotttnesss</source>
-        <translation>Canções preferidas</translation>
+        <translation>Hotttnesss da Música</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
         <source>Artist Hotttnesss</source>
-        <translation>Artistas preferidos</translation>
+        <translation>Hotttnesss do Artista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
         <source>Artist Familiarity</source>
         <translation>Familiaridade do artista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
         <source>By Description</source>
-        <translation>Por descrição</translation>
+        <translation>Pela Descrição</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
         <source>Enter a description</source>
-        <translation>Coloque uma descrição</translation>
+        <translation>Coloque uma Descrição</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="102"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
         <source>Apply steering command</source>
         <translation>Aplicar comando de condução</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="108"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
         <source>Reset all steering commands</source>
-        <translation>Redefinir todos os comandos de direção</translation>
+        <translation>Limpar todos os comandos de condução</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::GroovesharkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/groovesharkparser.cpp" line="255"/>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
         <source>Error fetching Grooveshark information from the network!</source>
-        <translation type="unfinished"/>
+        <translation>Erro ao obter informações do Grooveshark pela rede!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::InfoSystem::ChartsPlugin</name>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="307"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
         <source>Top Overall</source>
-        <translation>Classificação geral</translation>
+        <translation>Classificação Geral</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="396"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
         <source>Artists</source>
         <translation>Artistas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="398"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
         <source>Albums</source>
         <translation>Álbuns</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="400"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
         <source>Tracks</source>
         <translation>Faixas</translation>
     </message>
 </context>
 <context>
-    <name>Tomahawk::InfoSystem::LastFmPlugin</name>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation>Tomahawk está tocando &quot;%1&quot; de %2%3.</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation>em &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
         <source>Top Tracks</source>
-        <translation>Faixas principais</translation>
+        <translation>Faixas Mais Tocadas</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
         <source>Loved Tracks</source>
-        <translation>Faixas favoritas</translation>
+        <translation>Faixas Favoritas</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
         <source>Hyped Tracks</source>
-        <translation>Faixas mais populares</translation>
+        <translation>Faixas Mais Populares</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
         <source>Top Artists</source>
-        <translation>Artistas principais</translation>
+        <translation>Artistas Mais Tocados</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
         <source>Hyped Artists</source>
-        <translation>Artistas mais populares</translation>
+        <translation>Artistas Mais Populares</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>Álbuns</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation>Ouvindo &quot;%1&quot; de %2 e gostando! %3</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::ItunesParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/itunesparser.cpp" line="170"/>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
         <source>Error fetching iTunes information from the network!</source>
-        <translation type="unfinished"/>
+        <translation>Erro ao obter informações do iTunes pela rede!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::JSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="137"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
         <source>New Playlist</source>
-        <translation>Nova lista de reprodução</translation>
+        <translation>Nova Playlist</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Failed to save tracks</source>
         <translation>Falha ao salvar faixas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
-        <translation>Algumas faixas da lista de reprodução não contem artista e título. Estas serão ignoradas.</translation>
+        <translation>Algumas faixas na playlist não contem artista e título. Elas serão ignoradas.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>XSPF Error</source>
         <translation>Erro XSPF</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>This is not a valid XSPF playlist.</source>
-        <translation>Essa não é uma lista XSPF válida.</translation>
+        <translation>Essa não é uma playlist XSPF válida.</translation>
     </message>
 </context>
 <context>
@@ -2373,122 +2891,140 @@
         <location filename="../src/libtomahawk/LatchManager.cpp" line="123"/>
         <location filename="../src/libtomahawk/LatchManager.cpp" line="144"/>
         <source>&amp;Listen Along</source>
-        <translation>&amp;Reproduzir acompanhado</translation>
+        <translation>&amp;Ouvir Junto</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Query</name>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="637"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
         <source> and </source>
-        <translation type="unfinished"/>
+        <translation> e </translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="645"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
         <source>You</source>
-        <translation type="unfinished"/>
+        <translation>Você</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="647"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
         <source>you</source>
-        <translation type="unfinished"/>
+        <translation>você</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>and</source>
-        <translation type="unfinished"/>
+        <translation>e</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>%n other(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n outro</numerusform><numerusform>%n outros</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="659"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
         <source>%1 people</source>
-        <translation type="unfinished"/>
+        <translation>%1 pessoas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="661"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
         <source>loved this track</source>
-        <translation type="unfinished"/>
+        <translation>favoritou essa faixa</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::RdioParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/rdioparser.cpp" line="193"/>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
         <source>Error fetching Rdio information from the network!</source>
-        <translation type="unfinished"/>
+        <translation>Erro ao obter informações do Rdio pela rede!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::ShortenedLinkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/shortenedlinkparser.cpp" line="96"/>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
         <source>Network error parsing shortened link!</source>
-        <translation type="unfinished"/>
+        <translation>Erro de rede ao analisar o encurtador de link!</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Source</name>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="242"/>
-        <location filename="../src/libtomahawk/source.cpp" line="293"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
         <source>Scanning (%L1 tracks)</source>
         <translation>Escaneando (%L1 faixas)</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="244"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
         <source>Scanning</source>
         <translation>Escaneando</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="278"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
         <source>Checking</source>
         <translation>Verificando</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="283"/>
-        <source>Fetching</source>
-        <translation>Buscando</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation>Sincronizando</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="288"/>
-        <source>Parsing</source>
-        <translation>Analisando</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation>Importando</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="417"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
         <source>Saving (%1%)</source>
-        <translation>Guardando (%1%)</translation>
+        <translation>Salvando (%1%)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation>Online</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation>Offline</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::SpotifyParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/spotifyparser.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
         <source>Error fetching Spotify information from the network!</source>
-        <translation type="unfinished"/>
+        <translation>Erro ao obter informações do Spotify pela rede!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation>Atualizar automaticamente via XSPF</translation>
     </message>
 </context>
 <context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/tomahawkapp.cpp" line="534"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
-        <translation>Minha biblioteca</translation>
+        <translation>Minha Coleção</translation>
     </message>
 </context>
 <context>
     <name>TomahawkOAuthTwitter</name>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>Twitter PIN</source>
-        <translation>PIN de Twitter</translation>
+        <translation>PIN do Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>After authenticating on Twitter's web site,
 enter the displayed PIN number here:</source>
         <translation>Depois de autenticar-se no site do Twitter,
@@ -2498,464 +3034,466 @@
 <context>
     <name>TomahawkTrayIcon</name>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="59"/>
-        <location filename="../src/tomahawktrayicon.cpp" line="93"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation>&amp;Parar a reprodução após a faixa atual</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
         <source>Hide Tomahawk Window</source>
         <translation>Esconder janela do Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="98"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
         <source>Show Tomahawk Window</source>
         <translation>Mostrar janela do Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="158"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
         <source>Currently not playing.</source>
         <translation>Não reproduzindo nada.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="219"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
         <source>Play</source>
         <translation>Reporduzir</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="226"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
         <source>Pause</source>
         <translation>Pausar</translation>
     </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation>&amp;Favorito</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation>Remover dos &amp;Favoritos</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation>&amp;Continuar a reprodução após a faixa atual</translation>
+    </message>
 </context>
 <context>
     <name>TomahawkWindow</name>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="14"/>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
         <source>Tomahawk</source>
         <translation>Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="75"/>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
         <source>&amp;Settings</source>
         <translation>&amp;Configurações</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="81"/>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
         <source>&amp;Controls</source>
         <translation>C&amp;ontroles</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="100"/>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
         <source>&amp;Network</source>
         <translation>&amp;Rede</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="107"/>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
         <source>&amp;Window</source>
         <translation>&amp;Janela</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="114"/>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="128"/>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
         <source>&amp;Quit</source>
         <translation>&amp;Sair</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="131"/>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="139"/>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
         <source>Go &amp;Online</source>
         <translation>Co&amp;nectar</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="144"/>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
         <source>Add &amp;Friend...</source>
         <translation>Adicionar A&amp;migo...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="149"/>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
         <source>U&amp;pdate Collection</source>
         <translation>A&amp;tualizar biblioteca</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="152"/>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
         <source>Update Collection</source>
         <translation>Atualizar biblioteca</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="157"/>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
         <source>&amp;Configure Tomahawk...</source>
         <translation>Configurar To&amp;mahawk...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="165"/>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
         <source>Load &amp;XSPF...</source>
         <translation>Abrir &amp;XSPF...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="170"/>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
         <source>Create &amp;New Playlist...</source>
         <translation>Criar nova &amp;lista de reprodução...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="175"/>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
         <source>About &amp;Tomahawk...</source>
         <translation>Sobre Tomaha&amp;wk...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="183"/>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
         <source>Create New &amp;Automatic Playlist</source>
         <translation>Criar no&amp;va lista Automática</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="188"/>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
         <source>Create New &amp;Station</source>
         <translation>Criar n&amp;ova estação</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="196"/>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
         <source>Show Offline Sources</source>
         <translation>Mostrar origens desconectadas</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="201"/>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
         <source>Hide Offline Sources</source>
         <translation>Ocultar origens desconectadas</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="206"/>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
         <source>Minimize</source>
         <translation>Minimizar</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="209"/>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="214"/>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="217"/>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
         <source>Meta+Ctrl+Z</source>
         <translation>Meta+Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="222"/>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation>&amp;Informação Legal</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
         <source>Diagnostics...</source>
         <translation>Diagnósticos...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="230"/>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
         <source>Fully &amp;Rescan Collection</source>
         <translation>Escanear &amp;toda a biblioteca</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="233"/>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
         <source>Fully Rescan Collection</source>
         <translation>Escanear toda biblioteca novamente</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="238"/>
-        <location filename="../src/tomahawkwindow.cpp" line="676"/>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
         <source>Play</source>
         <translation>Reporduzir</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="241"/>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="246"/>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="251"/>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="219"/>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation>Voltar</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation>Voltar uma página</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation>Avançar</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation>Avançar uma página</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
         <source>Global Search...</source>
         <translation>Busca global...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="270"/>
-        <location filename="../src/tomahawkwindow.cpp" line="287"/>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
         <source>Check For Updates...</source>
         <translation>Buscar atualizações...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="449"/>
-        <location filename="../src/tomahawkwindow.cpp" line="456"/>
-        <location filename="../src/tomahawkwindow.cpp" line="464"/>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
         <source>Connect To Peer</source>
         <translation>Conectar-se ao par</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="450"/>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
         <source>Enter peer address:</source>
         <translation>Coloque o endereço do par:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="457"/>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
         <source>Enter peer port:</source>
         <translation>Coloque a porta do par:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="465"/>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
         <source>Enter peer key:</source>
         <translation>Coloque a chave do par:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>XSPF Error</source>
         <translation>Erro de XSPF</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>Esta não é uma lista de reprodução XSPF válida.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Failed to save tracks</source>
         <translation>Falha ao salvar faixas</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation>Algumas faixas da lista de reprodução não contem artista e título. Estas serão ignoradas.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="579"/>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
-        <translation type="unfinished"/>
+        <translation>Desculpe, há um problema ao acessar sua placa de áudio ou a faixa desejada, a faixa atual será ignorada. Certifique-se de ter um backend do Phonon adequado e os plugins necessários instalados.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="581"/>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
-        <translation type="unfinished"/>
+        <translation>Desculpe, há um problema ao acessar sua placa de áudio ou a faixa desejada, a faixa atual será ignorada.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation>Estação</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Create New Station</source>
         <translation>Criar uma nova estação</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
-        <source>New Station</source>
-        <translation>Nova estação</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation>Playlist</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="650"/>
-        <source>New Playlist</source>
-        <translation>Nova lista de reprodução</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation>Playlist Automática</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="668"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
         <source>Pause</source>
-        <translation>Pausar</translation>
+        <translation>PIN do Twitter</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="691"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
         <source>Go &amp;offline</source>
         <translation>Desc&amp;onectar</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="698"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
         <source>Go &amp;online</source>
         <translation>C&amp;onectar</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="720"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
         <source>Authentication Error</source>
         <translation>Erro de autenticação</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="735"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation>Erro ao conectar ao SIP: Falha de autenticação!</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
         <source>%1 by %2</source>
         <comment>track, artist name</comment>
         <translation>%1 de %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="736"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
         <source>%1 - %2</source>
         <comment>current track, some window title</comment>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="747"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="751"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/tomahawkwindow.cpp" line="755"/>
-        <source>Copyright 2010 - 2012&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson</source>
-        <translation type="unfinished"/>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="758"/>
-        <source>About Tomahawk</source>
-        <translation>Sobre Tomahawk</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation>Copyright 2010 - 2012</translation>
     </message>
-</context>
-<context>
-    <name>TopBar</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="26"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="66"/>
-        <source>0 Sources</source>
-        <translation>0 Origens</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="89"/>
-        <source>0 Tracks</source>
-        <translation>0 Faixas</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="112"/>
-        <source>0 Artists</source>
-        <translation>0 Artistas</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="135"/>
-        <source>0 Shown</source>
-        <translation>0 Mostrando</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="49"/>
-        <source>Tracks</source>
-        <translation>Faixas</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation>Agradecimentos:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="50"/>
-        <source>Artists</source>
-        <translation>Artistas</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="54"/>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="84"/>
-        <source>Artist View</source>
-        <translation>Vizualizar artista</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="85"/>
-        <source>Flat View</source>
-        <translation>Vizualização plana</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="195"/>
-        <source>Sources</source>
-        <translation>Origens</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="247"/>
-        <source>Shown</source>
-        <translation>Mostrado</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation>Sobre o Tomahawk</translation>
     </message>
 </context>
 <context>
     <name>TopTracksContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
         <source>Top Hits</source>
         <translation>Maiores sucessos</translation>
     </message>
 </context>
 <context>
-    <name>TrackModel</name>
+    <name>TrackInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Artist</source>
-        <translation>Artista</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Title</source>
-        <translation>Título</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Album</source>
-        <translation>Álbum</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation>Capa</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
         <source>Track</source>
         <translation>Faixa</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation>Artista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Bitrate</source>
-        <translation>Taxa de bits</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation>Álbum</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Age</source>
-        <translation>Idate</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Year</source>
-        <translation>Ano</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation>Faixas Similares</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Size</source>
-        <translation>Tamanho</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation>Desculpe, mas não conseguimos encontrar faixas similares para esta música!</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation><numerusform>Você ouviu esta faixa %n vez.</numerusform><numerusform>Você ouviu esta faixa %n vezes.</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Origin</source>
-        <translation>Origem</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation>Você nunca ouviu esta faixa antes.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Score</source>
-        <translation>Pontuação</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation>Você ouviu pela primeira vez em %1.</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation><numerusform>Você ouviu %1 %n vez.</numerusform><numerusform>Você ouviu %1 %n vezes.</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Composer</source>
-        <translation type="unfinished"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation>Você nunca ouviu %1 antes.</translation>
     </message>
 </context>
 <context>
     <name>TrackView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackview.cpp" line="493"/>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
         <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
         <translation>Desculpe, o seu filtro &apos;%1&apos; não encontreou nenhum resultado.</translation>
     </message>
@@ -2976,7 +3514,7 @@
 <context>
     <name>TreeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treeitemdelegate.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
@@ -2984,92 +3522,60 @@
 <context>
     <name>TreeModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Bitrate</source>
-        <translation>Taxa de bits</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Age</source>
-        <translation>Idate</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Year</source>
-        <translation>Ano</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Size</source>
-        <translation>Tamanho</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Origin</source>
-        <translation>Origem</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Composer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="585"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
         <source>All Artists</source>
         <translation>Todos artistas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="699"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="724"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
         <source>My Collection</source>
         <translation>Minha biblioteca</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="701"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="726"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
         <source>Collection of %1</source>
         <translation>Biblioteca de %1</translation>
     </message>
 </context>
 <context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>Desculpe, seu filtro &apos;%1&apos; não encontrou nenhum resultado.</translation>
+    </message>
+</context>
+<context>
     <name>TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="73"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
         <source>Configure this Twitter account</source>
         <translation>Configurar conta de Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="119"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
         <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
         <translation>O complemento do Twitter permite que você descubra e reproduza música pelo seus amigos do Twitter usando Tomahawk e publicar mensagem no seu Twitter.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
         <source>Status: No saved credentials</source>
         <translation>Estado: Credenciais não salvadas</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="166"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
         <source>Authenticate with Twitter</source>
         <translation>Autenticar com Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="196"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
         <source>Twitter Connections</source>
         <translation>Conexões com Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
         <source>
 If you only want to post tweets, you're done.
 
@@ -3084,32 +3590,32 @@
 Você pode enviar uma outra mensagem de sincronia a qualquer momento simplesmente enviando outro tweet usando o botão abaixo.</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="244"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
         <source>Select the kind of tweet you would like, then press the button to post it:</source>
         <translation>Selecione o tipo de tweet que você deseja enviar e pressione o botão para enviar a mensagem:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="276"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
         <source>Global Tweet</source>
         <translation>Tweet global</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="281"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
         <source>@Mention</source>
         <translation>@Menção</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="286"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
         <source>Direct Message</source>
         <translation>Mensagem direta</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="322"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
         <source>e.g. @tomahawk</source>
         <translation>ex.: @tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="351"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
         <source>Send Message</source>
         <translation>Enviar mensagem</translation>
     </message>
@@ -3117,45 +3623,60 @@
 <context>
     <name>ViewManager</name>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="383"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation>Depois de escanear sua biblioteca de músicas as faixas irão aparecer aqui.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation>Esta coleção esta vazia.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
         <source>SuperCollection</source>
-        <translation type="unfinished"/>
+        <translation>SuperColeção</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="384"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
         <source>Combined libraries of all your online friends</source>
-        <translation type="unfinished"/>
+        <translation>Bibliotecas combinadas de todos os seus amigos online</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="385"/>
-        <source>All available albums</source>
-        <translation>Todos os álbuns disponíveis</translation>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation>Faixas Reproduzidas Recentemente</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation>Faixas reproduzidas recentemente por todos os seus amigos</translation>
     </message>
 </context>
 <context>
     <name>WelcomeWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="34"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
         <source>Recent Additions</source>
         <translation>Mais recentes</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
         <source>Newest Stations &amp; Playlists</source>
         <translation>Estações e listas mais recentes</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="70"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
         <source>Recently Played Tracks</source>
         <translation>Faixas reproduzidas recentemente</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.cpp" line="152"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
         <source>No recently created playlists in your network.</source>
         <translation>Nenhuma lista de reprodução criada recentemente na sua rede.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.h" line="90"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
         <source>Welcome to Tomahawk</source>
         <translation>Bem-vindo ao Tomahawk</translation>
     </message>
@@ -3163,7 +3684,7 @@
 <context>
     <name>WhatsHotWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/whatshotwidget.h" line="72"/>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
         <source>Charts</source>
         <translation>Gráficos</translation>
     </message>
@@ -3179,7 +3700,7 @@
 <context>
     <name>XMPPBot</name>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="312"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
         <source>
 Terms for %1:
 </source>
@@ -3188,12 +3709,12 @@
 </translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="314"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
         <source>No terms found, sorry.</source>
         <translation>Nenhum termo encontrado, descupe.</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="347"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
         <source>
 Hotttness for %1: %2
 </source>
@@ -3202,14 +3723,14 @@
 </translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="363"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
         <source>
 Familiarity for %1: %2
 </source>
         <translation>Familiar para %1: %2</translation>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="381"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
         <source>
 Lyrics for &quot;%1&quot; by %2:
 
@@ -3224,22 +3745,22 @@
 <context>
     <name>XSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="49"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
         <source>Failed to parse contents of XSPF playlist</source>
-        <translation type="unfinished"/>
+        <translation>Falha ao analisar conteúdos da playlist XSPF</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="51"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
         <source>Some playlist entries were found without artist and track name, they will be omitted</source>
-        <translation type="unfinished"/>
+        <translation>Algumas entradas da playlist foram encontradas sem o nome do artista e música, elas serão omitidas</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="53"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
         <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
-        <translation type="unfinished"/>
+        <translation>Falha ao buscar a playlist desejada na rede ou o arquivo desejado não existe</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="188"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
         <source>New Playlist</source>
         <translation>Nova lista de reprodução</translation>
     </message>
@@ -3247,78 +3768,78 @@
 <context>
     <name>XmlConsole</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
         <source>Xml stream console</source>
         <translation>Terminal de fluxo Xml</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="33"/>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="60"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="43"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
         <source>Save log</source>
         <translation>Salvar log</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
         <source>Disabled</source>
         <translation>Desabilitado</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="65"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
         <source>By JID</source>
         <translation>Por JID</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="68"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
         <source>By namespace uri</source>
         <translation>Por namespace uri</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="71"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
         <source>By all attributes</source>
         <translation>Todos os atributos</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="76"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
         <source>Visible stanzas</source>
         <translation>Estâncias visíveis</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="79"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
         <source>Information query</source>
         <translation>Consulta de informação</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
         <source>Message</source>
         <translation>Mensagem</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="87"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
         <source>Presence</source>
         <translation>Presença</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="91"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="107"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="358"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
         <source>Save XMPP log to file</source>
         <translation>Salvar log XMPP em um arquivo</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
         <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
         <translation>Formato OpenDocument (*.odf);;Arquivo HTML (*.html);;Texto plano (*.txt</translation>
     </message>
@@ -3326,203 +3847,203 @@
 <context>
     <name>XmppConfigWidget</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
         <source>Xmpp Configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configuração do Xmpp</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="52"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
         <source>Configure this Xmpp account</source>
-        <translation type="unfinished"/>
+        <translation>Configure essa conta do Xmpp</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="89"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
         <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
-        <translation type="unfinished"/>
+        <translation>Entre com seu login do Xmpp para se conectar a seus amigos usando o Tomahawk!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="111"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
         <source>Login Information</source>
-        <translation type="unfinished"/>
+        <translation>Informação de Login</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="131"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
         <source>Xmpp ID:</source>
-        <translation type="unfinished"/>
+        <translation>ID Xmpp:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="147"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
         <source>e.g. user@example.com</source>
-        <translation type="unfinished"/>
+        <translation>ex: user@exemplo.com</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="160"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
         <source>Password:</source>
-        <translation type="unfinished"/>
+        <translation>Senha:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="188"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
         <source>An account with this name already exists!</source>
-        <translation type="unfinished"/>
+        <translation>Uma conta com esse nome já existe!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="210"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
         <source>Advanced Xmpp Settings</source>
-        <translation type="unfinished"/>
+        <translation>Configurações Avançadas do Xmpp</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="230"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
         <source>Server:</source>
-        <translation type="unfinished"/>
+        <translation>Servidor:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="253"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
         <source>Port:</source>
-        <translation type="unfinished"/>
+        <translation>Porta:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="299"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
         <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
-        <translation type="unfinished"/>
+        <translation>Vários servidores não suportam isso (ex: GTalk, jabber.org)</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="302"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
         <source>Publish currently playing track</source>
-        <translation type="unfinished"/>
+        <translation>Publicar faixa tocando agora</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="309"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
         <source>Enforce secure connection</source>
-        <translation type="unfinished"/>
+        <translation>Forçar Conexão Segura</translation>
     </message>
 </context>
 <context>
     <name>XmppSipPlugin</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
         <source>User Interaction</source>
-        <translation type="unfinished"/>
+        <translation>Interação com usuário</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="362"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
         <source>Host is unknown</source>
-        <translation type="unfinished"/>
+        <translation>Servidor desconhecido</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="365"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
         <source>Item not found</source>
-        <translation type="unfinished"/>
+        <translation>Item não encontrado</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="368"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
         <source>Authorization Error</source>
-        <translation type="unfinished"/>
+        <translation>Erro de Autorização</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="371"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
         <source>Remote Stream Error</source>
-        <translation type="unfinished"/>
+        <translation>Erro do Stream Remoto</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="374"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
         <source>Remote Connection failed</source>
-        <translation type="unfinished"/>
+        <translation>Conexão Remota falhou</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="377"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
         <source>Internal Server Error</source>
-        <translation type="unfinished"/>
+        <translation>Erro Interno do Servidor</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="380"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
         <source>System shutdown</source>
-        <translation type="unfinished"/>
+        <translation>Desligamento do sistema</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="383"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
         <source>Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Conflito</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="387"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
         <source>Unknown</source>
-        <translation type="unfinished"/>
+        <translation>Desconhecido</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation>Gostaria de adicionar &lt;b&gt;%1&lt;/b&gt; à sua lista de amigos?</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="391"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
         <source>No Compression Support</source>
-        <translation type="unfinished"/>
+        <translation>Não há suporte para Compressão</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="395"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
         <source>No Encryption Support</source>
-        <translation type="unfinished"/>
+        <translation>Não há suporte para Criptografia</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="399"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
         <source>No Authorization Support</source>
-        <translation type="unfinished"/>
+        <translation>Não há suporte para Autorização</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="403"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
         <source>No Supported Feature</source>
-        <translation type="unfinished"/>
+        <translation>Recurso não suportado</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="500"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
         <source>Add Friend</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar Amigo</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="501"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
         <source>Enter Xmpp ID:</source>
-        <translation type="unfinished"/>
+        <translation>Entre o ID do Xmpp</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="617"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
         <source>Add Friend...</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar Amigo...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="622"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
         <source>XML Console...</source>
-        <translation type="unfinished"/>
+        <translation>Console XML...</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="670"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
         <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
-        <translation type="unfinished"/>
+        <translation>Desculpe -- Sou apenas uma presença automáica usada pelo Tomahawk (http://gettomahawk.com). Se você esta recebendo esta mensagem, a pessoa que esta tentando alcançar provavelmente não esta logada, então tente mais tarde!</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="768"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
         <source>Authorize User</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="769"/>
-        <source>Do you want to grant &lt;b&gt;%1&lt;/b&gt; access to your Collection?</source>
-        <translation type="unfinished"/>
+        <translation>Autorizar Usuário</translation>
     </message>
 </context>
 <context>
     <name>ZeroconfConfig</name>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="14"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="55"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
         <source>Local Network configuration</source>
         <translation>Configuração da rede local</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="77"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
         <source>This plugin will automatically find other users running Tomahawk on your local network</source>
         <translation>Esse complemento encontrará automaticamente usuários do Tomahawk na sua rede</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="84"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
         <source>Connect automatically when Tomahawk starts</source>
         <translation>Conectar automaticamente quando o Tomahawk iniciar</translation>
     </message>

tomahawk-0.5.5.tar.bz2/lang/tomahawk_ru.ts Added

@@ -0,0 +1,4042 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.0">
+<context>
+    <name>ACLJobDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>Диалог</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
+        <source>Description goes here</source>
+        <translation>Описание тут</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
+        <source>Add Account</source>
+        <translation>Добавить аккаунт</translation>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapperDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
+        <source>Online</source>
+        <translation>В сети</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
+        <source>Connecting...</source>
+        <translation>Соединяюсь...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
+        <source>Offline</source>
+        <translation>Не в сети</translation>
+    </message>
+</context>
+<context>
+    <name>ActionCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
+        <source>&amp;Listen Along</source>
+        <translation>&amp;Слушать Его</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
+        <source>Stop &amp;Listening Along</source>
+        <translation>&amp;Прекратить его слушать</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
+        <source>&amp;Follow in real-time</source>
+        <translation>&amp;Следить в реальном времени</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Privately</source>
+        <translation>&amp;Слушать Cамому</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Publicly</source>
+        <translation>&amp;Слушать со всеми</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
+        <source>&amp;Load Playlist</source>
+        <translation>&amp;Загрузить Плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
+        <source>&amp;Rename Playlist</source>
+        <translation>&amp;Переименовать Плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
+        <source>&amp;Copy Playlist Link</source>
+        <translation>&amp;Скопировать Cсылку Плейлиста</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Играть</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
+        <source>&amp;Stop</source>
+        <translation>&amp;Стоп</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
+        <source>&amp;Previous Track</source>
+        <translation>&amp;Предыдущий</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
+        <source>&amp;Next Track</source>
+        <translation>&amp;Следующий</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Выйти</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="31"/>
+        <source>Other Albums by Artist</source>
+        <translation>Другие альбомы артиста</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
+        <source>Other Albums by %1</source>
+        <translation>Другие альбомы %1</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
+        <source>All albums from %1</source>
+        <translation>Все альбомы %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
+        <source>All albums</source>
+        <translation>Все альбомы</translation>
+    </message>
+</context>
+<context>
+    <name>ArtistInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
+        <source>Top Hits</source>
+        <translation>Хиты</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
+        <source>Related Artists</source>
+        <translation>Похожие исполнители</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation>Исполнитель</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>Альбомы</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AudioControls</name>
+    <message>
+        <location filename="../src/AudioControls.ui" line="75"/>
+        <source>Prev</source>
+        <translation>Предыдущая</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="87"/>
+        <source>Play</source>
+        <translation>Играть</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="94"/>
+        <source>Pause</source>
+        <translation>Пауза</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="103"/>
+        <source>Next</source>
+        <translation>Следующая</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="229"/>
+        <source>Artist</source>
+        <translation>Исполнитель</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="248"/>
+        <source>Album</source>
+        <translation>Альбом</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="277"/>
+        <source>Owner</source>
+        <translation>Владелец</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation>социальный</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
+        <source>love</source>
+        <translation>Любимая</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="383"/>
+        <source>Time</source>
+        <translation>Прошло</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="412"/>
+        <source>Time Left</source>
+        <translation>Осталось</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="493"/>
+        <source>Shuffle</source>
+        <translation>Случаная</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="506"/>
+        <source>Repeat</source>
+        <translation>Повторять</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="544"/>
+        <source>Low</source>
+        <translation>Тише</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="576"/>
+        <source>High</source>
+        <translation>Громче</translation>
+    </message>
+</context>
+<context>
+    <name>AudioEngine</name>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CategoryAddItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation>Создать новый Плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation>Создать Новую Станцию</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>New Station</source>
+        <translation>Новая станция</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>%1 Station</source>
+        <translation>%1 Станция</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
+        <source>Playlists</source>
+        <translation>Плейлисты</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
+        <source>Stations</source>
+        <translation>Станции</translation>
+    </message>
+</context>
+<context>
+    <name>ClearButton</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
+        <source>Clear</source>
+        <translation>Очистить</translation>
+    </message>
+</context>
+<context>
+    <name>ContextWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>Панель информации</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
+        <source>Show Footnotes</source>
+        <translation>Показать Информацию об Исполнителе</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
+        <source>Hide Footnotes</source>
+        <translation>Спрятать Информацию об Исполнителе</translation>
+    </message>
+</context>
+<context>
+    <name>CrashReporter</name>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="23"/>
+        <source>Tomahawk Crash Reporter</source>
+        <translation>Отчет о ошибках</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation>Отправить отчет</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation>Не отплавлять</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
+        <source>Abort</source>
+        <translation>Отменить</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
+        <source>You can disable sending crash reports in the configuration dialog.</source>
+        <translation>Вы можете отключить отправку отчетов об ошибках в диалоге настройки.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
+        <source>Uploaded %L1 of %L2 KB.</source>
+        <translation>Загружено %L1 из %L2 KB.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
+        <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
+        <translation>Отправлен! &lt;b&gt;Большое спасибо!!!&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
+        <source>Failed to send crash info.</source>
+        <translation>Невозможно отправить отчет о ошибке.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseCommand_AllAlbums</name>
+    <message>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
+        <source>Unknown</source>
+        <translation>Неизвестный</translation>
+    </message>
+</context>
+<context>
+    <name>DelegateConfigWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation>О</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
+        <source>Delete Account</source>
+        <translation>Удалить аккаунт</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>Об этом аккаунте</translation>
+    </message>
+</context>
+<context>
+    <name>DiagnosticsDialog</name>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
+        <source>Tomahawk Diagnostics</source>
+        <translation>Диагностика</translation>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobalSearchWidget</name>
+    <message>
+        <location filename="../src/SearchBox.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+</context>
+<context>
+    <name>IndexingJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
+        <source>Indexing database</source>
+        <translation>Индексирую базу данных</translation>
+    </message>
+</context>
+<context>
+    <name>InfoBar</name>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>Информация</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
+        <source>Filter...</source>
+        <translation>Фильтр...</translation>
+    </message>
+</context>
+<context>
+    <name>LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <source>Scrobble tracks to Last.fm</source>
+        <translation>Скроблинг треков Last.fm</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <source>Username:</source>
+        <translation>Имя пользователя:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <source>Password:</source>
+        <translation>Пароль:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <source>Test Login</source>
+        <translation>Проверить</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LastfmContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="67"/>
+        <source>Last.fm</source>
+        <translation>Last.fm</translation>
+    </message>
+</context>
+<context>
+    <name>LatchedStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoadXSPF</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="14"/>
+        <source>Load XSPF</source>
+        <translation>Загрузить XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="22"/>
+        <source>Playlist URL</source>
+        <translation>Плейлист URL</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="29"/>
+        <source>Enter URL...</source>
+        <translation>Введите ссылку на плейлист (URI)...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="42"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="51"/>
+        <source>Automatically update</source>
+        <translation>Обновлять автоматически</translation>
+    </message>
+</context>
+<context>
+    <name>LoadXSPFDialog</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>Load XSPF File</source>
+        <translation>Загрузить файл XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>XSPF Files (*.xspf)</source>
+        <translation>Файлы XSPF (*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>LocalCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Bookmarks</source>
+        <translation>Закладки</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Saved tracks</source>
+        <translation>Сохраненные песни</translation>
+    </message>
+</context>
+<context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
+        <source>Enter a title for the new playlist:</source>
+        <translation>Введите название нового плейлиста:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
+        <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
+        <translation>Tomahawk предлагает целый ряд способов, которые помогут вам создавать списки воспроизведения и найти музыку, вам понравится!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
+        <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>Просто введите жанра или имя тега и Tomahawk предложит несколько песен, чтобы создать новой плейлист:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
+        <source>&amp;Create Playlist</source>
+        <translation>&amp;Создать плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
+        <source>Create a new playlist</source>
+        <translation>Создать Новый Плейлист</translation>
+    </message>
+</context>
+<context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>Новые релизы</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation>Исполнитель</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation>Название</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation>Композитор</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation>Альбом</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation>Песня</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation>Продолжительность</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation>Битрей</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation>Год</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation>Размер</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation>Количество воспроизведений </translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation>Имя</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
+        <source>played %1 by you</source>
+        <translation>Проиграно %1 мной</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
+        <source>played %1 by %2</source>
+        <translation>Песня %1 проиграна %2</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistLargeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <source>played %1 by you</source>
+        <translation>Воспроизводилось %1 вами</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
+        <source>played %1 by %2</source>
+        <translation>Воспроизводилось %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
+        <source>added %1</source>
+        <translation>Добавлено %1</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
+        <source>A playlist by %1, created %2</source>
+        <translation>Плейлист %1 создан %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
+        <source>you</source>
+        <translation>Вы</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
+        <source>All tracks by %1 on album %2</source>
+        <translation>Все песни %1 альбома %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
+        <source>All tracks by %1</source>
+        <translation>Все песни %1</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistTypeSelectorDlg</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
+        <source>New Playlist</source>
+        <translation>Новый плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
+        <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
+        <translation>Только регулярный старый плейлист ... Дайте ему имя, перетащитьте какие-нибудь пески, и можно слушать!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
+        <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
+        <translation>Не знаю точно, что вы хотите? Дайте Tomahawk несколько указателей, и пусть он построить плейлист для Вас!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
+        <source>Name:</source>
+        <translation>Имя:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
+        <source>New Playlist...</source>
+        <translation>Название нового плейлиста...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
+        <source>Create Manual Playlist</source>
+        <translation>Создать вручную</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
+        <source>Create Automatic Playlist</source>
+        <translation>Создать автоматический плейлист</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation>Текущий плейлист пуст.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
+        <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
+        <translation>Этот плейлист пустой. Добавьте какие-нибудь треки и наслаждайтесь музыкой!</translation>
+    </message>
+</context>
+<context>
+    <name>ProxyDialog</name>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
+        <source>Proxy Settings</source>
+        <translation>Настройки прокси</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
+        <source>Hostname of proxy server</source>
+        <translation>Имя хоста прокси сервера</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
+        <source>Host</source>
+        <translation>Хост</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
+        <source>Port</source>
+        <translation>Порт</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
+        <source>Proxy login</source>
+        <translation>Введите логин</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
+        <source>User</source>
+        <translation>Логин</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
+        <source>Proxy password</source>
+        <translation>Введите пароль</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
+        <source>No Proxy Hosts:
+(Overrides system proxy)</source>
+        <translation>Не использовать прокси:
+(Переопределение прокси)</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
+        <source>localhost *.example.com (space separated)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
+        <source>Use proxy for DNS lookups?</source>
+        <translation>Использовать прокси для поиска DNS?</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
+        <source>%n year(s) ago</source>
+        <translation><numerusform>%n год назад</numerusform><numerusform>%n года назад</numerusform><numerusform>%n лет назад</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
+        <source>%n year(s)</source>
+        <translation><numerusform>%n год</numerusform><numerusform>%n года</numerusform><numerusform>%n лет</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
+        <source>%n month(s) ago</source>
+        <translation><numerusform>%n месяц назад</numerusform><numerusform>%n месяца назад</numerusform><numerusform>%n месяцей назад</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
+        <source>%n month(s)</source>
+        <translation><numerusform>%n месяц</numerusform><numerusform>%n месяца</numerusform><numerusform>%n месяцей</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
+        <source>%n week(s) ago</source>
+        <translation><numerusform>%n неделю назад</numerusform><numerusform>%n недели назад</numerusform><numerusform>%n недель назад</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
+        <source>%n week(s)</source>
+        <translation><numerusform>%n неделю</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
+        <source>%n day(s) ago</source>
+        <translation><numerusform>%n день назад</numerusform><numerusform>%n дня назад</numerusform><numerusform>%n дней назад</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
+        <source>%n day(s)</source>
+        <translation><numerusform>%n день</numerusform><numerusform>%n дня</numerusform><numerusform>%n дней</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
+        <source>%n hour(s) ago</source>
+        <translation><numerusform>%n час назад</numerusform><numerusform>%n часа назад</numerusform><numerusform>%n часов назад</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
+        <source>%n hour(s)</source>
+        <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform><numerusform>%n часов</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
+        <source>%1 minutes ago</source>
+        <translation>%1 минут(ы) назад</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
+        <source>%1 minutes</source>
+        <translation>%1 минут(ы)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
+        <source>just now</source>
+        <translation>только что</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <source>Friend Finders</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
+        <source>Music Finders</source>
+        <translation>Music Finders</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
+        <source>Status Updaters</source>
+        <translation>Статус обновления</translation>
+    </message>
+</context>
+<context>
+    <name>QuaZipFilePrivate</name>
+    <message>
+        <location filename="../src/libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation>ZIP/UNZIP API error %1</translation>
+    </message>
+</context>
+<context>
+    <name>QueueView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>Информационный Бар</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation>Показать Очередь</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation>Спрятать Очередь</translation>
+    </message>
+</context>
+<context>
+    <name>RelatedArtistsContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
+        <source>Related Artists</source>
+        <translation>Похожие исполнители</translation>
+    </message>
+</context>
+<context>
+    <name>ResolverConfigDelegate</name>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
+        <source>Not found: %1</source>
+        <translation>Не найдено:  %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
+        <source>Failed to load: %1</source>
+        <translation>Ошибка при загрузке: %1</translation>
+    </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
+        <source>Search</source>
+        <translation>Поиск</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
+        <source>Search: %1</source>
+        <translation>Поиск: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
+        <source>Results for &apos;%1&apos;</source>
+        <translation>Результаты для &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
+        <source>Collection</source>
+        <translation>Коллекция</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
+        <source>Advanced</source>
+        <translation>Дополнительны</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
+        <source>All</source>
+        <translation>Все</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
+        <source>Services</source>
+        <translation>Сервисы</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
+        <source>Install resolver from file</source>
+        <translation>Установить resolver из файла</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation>Удаление всех записей контроля доступа?</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>Инофрмация</translation>
+    </message>
+</context>
+<context>
+    <name>SocialPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="34"/>
+        <source>Popular New Albums From Your Friends</source>
+        <translation>Популярные альбомы ваших друзей</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="48"/>
+        <source>Most Played Playlists</source>
+        <translation>Часто проигрываемые плейлисты</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="63"/>
+        <source>Most Played Tracks You Don&apos;t Have</source>
+        <translation>Популярные проигрываемые песни которых у вас нет</translation>
+    </message>
+</context>
+<context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>Обложка</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation>TextLabel</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation>Твит</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation>%1 символов осталось</translation>
+    </message>
+</context>
+<context>
+    <name>SourceDelegate</name>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
+        <source>Track</source>
+        <translation>Трек</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
+        <source>Album</source>
+        <translation>Альбом</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
+        <source>Artist</source>
+        <translation>Исполнитель</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
+        <source>Local</source>
+        <translation>Локальная</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
+        <source>Top 10</source>
+        <translation>Топ 10</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
+        <source>All available tracks</source>
+        <translation>Доступные песни</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
+        <source>Show</source>
+        <translation>Показать</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
+        <source>Hide</source>
+        <translation>Спрятать</translation>
+    </message>
+</context>
+<context>
+    <name>SourceInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
+        <source>Recent Albums</source>
+        <translation>Последние альбомы</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
+        <source>Latest Additions</source>
+        <translation>Последние добавленые</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
+        <source>Recently Played Tracks</source>
+        <translation>Последние проигрыные песни</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
+        <source>New Additions</source>
+        <translation>Последние добавленые</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
+        <source>My recent activity</source>
+        <translation>Моя последняя активность</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
+        <source>Recent activity from %1</source>
+        <translation>Последняя активно %1</translation>
+    </message>
+</context>
+<context>
+    <name>SourceItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
+        <source>Collection</source>
+        <translation>Коллекция</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
+        <source>Latest Additions</source>
+        <translation>Последние добавленные</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
+        <source>Recently Played</source>
+        <translation>Последние воспроизводимые</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation>Общая коллекция</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation>Последние добавления в коллекцию</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation>Недавно Воспроизводимые</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation>Ваши Недавно Воспроизводимые</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceTreeView</name>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
+        <source>&amp;Copy Link</source>
+        <translation>&amp;Скопировать Cсылку</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
+        <source>&amp;Delete %1</source>
+        <translation>&amp;Удалить %1</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation>Добавить к моим Плейлистам</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation>Добавить к моим Автоматическим Плейлистам</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation>Добавить к моим Станциям</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
+        <source>&amp;Export Playlist</source>
+        <translation>&amp;Экспорт Плейлиста</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation>плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation>автоматический плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation>станция</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation>Удалить %1?</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
+        <source>Save XSPF</source>
+        <translation>Сохранить XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
+        <source>Playlists (*.xspf)</source>
+        <translation>Плейлисты (*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>SourcesModel</name>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
+        <source>Group</source>
+        <translation>Группа</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
+        <source>Collection</source>
+        <translation>Коллекция</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
+        <source>Playlist</source>
+        <translation>Плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
+        <source>Automatic Playlist</source>
+        <translation>Автоматический плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
+        <source>Station</source>
+        <translation>Станция</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
+        <source>Browse</source>
+        <translation>Просмотреть</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
+        <source>Search History</source>
+        <translation>История поиска</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
+        <source>My Music</source>
+        <translation>Моя музыка</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
+        <source>SuperCollection</source>
+        <translation>Общая коллекция</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
+        <source>Top Loved Tracks</source>
+        <translation>Топ любимых песен</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
+        <source>Dashboard</source>
+        <translation>Панель</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
+        <source>Recently Played</source>
+        <translation>Последние воспроизводимые</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
+        <source>Charts</source>
+        <translation>Чарты</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>Новые релизы</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
+        <source>Friends</source>
+        <translation>Друзья</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation>Настроить аккаунт Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation>Имя пользователя или Facebook Email</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>Войти</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation>Поток высокого качества</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation>Синхронизировать плейлисты Spotify:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>Имя пользователя:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>Пароль:</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation>Удалить в Spotify?</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>StackedSettingsDialog</name>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
+        <source>Tomahawk Settings</source>
+        <translation>Настройки</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
+        <source>Local Music Information</source>
+        <translation>Информация о локальной коллекции</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
+        <source>Path to scan for music files:</source>
+        <translation>Путь по которому сканировать музыку:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
+        <source>The Echo Nest supports keeping track of your catalog metadata
+ and using it to craft personalized radios. Enabling this option
+ will allow you (and all your friends) to create automatic playlists
+ and stations based on your personal taste profile.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
+        <source>Upload collection list to The Echo Nest to enable user radio</source>
+        <translation>Заргузить список на The Echo Nest, чтобы включить пользовательское радио</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
+        <source>Watch for changes</source>
+        <translation>Следить за изменением коллекции</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
+        <source>Time between scans, in seconds:</source>
+        <translation>Время между сканированием, в секундах:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation>Дополнительные Настройки</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation>SOCKS Прокси</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation>Использовать SOCKS Прокси</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation>Сервисы интернета</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation>Установить из файла</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation>Фильтр по возможности:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
+        <source>Static Host Name:</source>
+        <translation>Статическое имя хоста:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
+        <source>Static Port:</source>
+        <translation>Статический порт:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
+        <source>Proxy Settings...</source>
+        <translation>Настройки прокси...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation>Другие Настройки</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
+        <source>Send reports after Tomahawk crashed</source>
+        <translation>Отправить отчет после падения Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation>Скопировать Ссылку на Исполнителя</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation>Скопировать Ссылку на Альбом</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation>Скопировать Ссылку на Песню</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
+        <source>Add Account</source>
+        <translation>Добавить аккаунт</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
+        <source>%1 downloads</source>
+        <translation>%1 загружено</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
+        <source>Online</source>
+        <translation>В сети</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
+        <source>Connecting...</source>
+        <translation>Соединяюсь...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
+        <source>Offline</source>
+        <translation>Не в сети</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation>Ручная установка обязательно</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapper</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
+        <source>Configure this Google Account</source>
+        <translation>Настройка учетной записи Google</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
+        <source>Google Address</source>
+        <translation>Адрес Google</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
+        <source>Enter your Google login to connect with your friends using Tomahawk!</source>
+        <translation>Введите ваш логин Google, чтобы связаться с друзьями, используя Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
+        <source>username@gmail.com</source>
+        <translation>username@gmail.com</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
+        <source>Connect to Google Talk to find your friends</source>
+        <translation>Подключение к Google Talk, чтобы найти друзей</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperSip</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
+        <source>Add Friend</source>
+        <translation>Добавить друга</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
+        <source>Enter Google Address:</source>
+        <translation>Введите Google Адрес:</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
+        <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation>Тестирую...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation>Импортирование %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation>Импортирование истории...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
+        <source>Failed</source>
+        <translation>Неудача</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
+        <source>Success</source>
+        <translation>Успех</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
+        <source>Could not contact server</source>
+        <translation>Не удается связаться с сервером</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation>Синхронизировать с Spotify</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation>Прекратить синхронизацию с Spotify</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>Вхожу...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation>Ошибка: %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>Войти</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
+        <source>Play music from and sync your playlists with Spotify Premium</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
+        <source>Connect to your Twitter followers.</source>
+        <translation>Подключитесь к Twitter followers</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
+        <source>Tweet!</source>
+        <translation>Tweet!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
+        <source>Status: No saved credentials</source>
+        <translation>Статус: Нет сохраненных учетных данных</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
+        <source>Authenticate</source>
+        <translation>Аутентификация</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
+        <source>Status: Credentials saved for %1</source>
+        <translation>Статус: Полномочия сохранены для %1</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
+        <source>De-authenticate</source>
+        <translation>Де-аутентификация</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>Tweetin&apos; Error</source>
+        <translation>Ошибка твита</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <source>The credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation>Полномочия не могут быть проверены. ⏎
+Вы можете попробовать повторно аутенфицироваться.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
+        <source>Status: Error validating credentials</source>
+        <translation>Статус: Ошибка при проверке полномочий</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
+        <source>Global Tweet</source>
+        <translation>Global Tweet</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
+        <source>Direct Message</source>
+        <translation>Прямое сообщение</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
+        <source>Send Message!</source>
+        <translation>Отправить сообщение!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
+        <source>@Mention</source>
+        <translation>@ Упоминание</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
+        <source>Send Mention!</source>
+        <translation>Отправить упоминание!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <source>You must enter a user name for this type of tweet.</source>
+        <translation>Вы должны ввести имя пользователя для этого типа твита.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <source>Your saved credentials could not be loaded.
+You may wish to try re-authenticating.</source>
+        <translation>Сохраненные учетные данные не могут быть загружены. ⏎
+Вы можете попробовать повторно аутенфицироваться.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <source>Your saved credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation>Сохраненные учетные данные не могут быть проверены. ⏎
+Вы можете попробовать повторно аутенфицироваться.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>There was an error posting your status -- sorry!</source>
+        <translation>Ошибка при отправке вашего статуса, извините!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Tweeted!</source>
+        <translation>Твитното!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <source>Your tweet has been posted!</source>
+        <translation>Ваш твит был отправлен!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <source>There was an error posting your direct message -- sorry!</source>
+        <translation>Извините! Возникла ошибка при отправке твита.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Your message has been posted!</source>
+        <translation>Ваше сообщение было отправлено!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::XmppAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
+        <source>Log on to your Jabber/XMPP account to connect to your friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::ZeroconfFactory</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
+        <source>Automatically connect to Tomahawks on the local network</source>
+        <translation>Автоматическое подключение к Tomahawks в локальной сети</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ContextMenu</name>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Играть</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
+        <source>Add to &amp;Queue</source>
+        <translation>Добавить В &amp;Очередь</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
+        <source>&amp;Love</source>
+        <translation>&amp;Любимая</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
+        <source>&amp;Copy Track Link</source>
+        <translation>&amp;Скопировать Ссылку Песни</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
+        <source>Un-&amp;Love</source>
+        <translation>&amp;Не Любимая</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Items</source>
+        <translation>&amp;Удалить Песни</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation>&amp;Показать Станицу Песни</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Item</source>
+        <translation>&amp;Удалить Песню</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation>&amp;Показать Станицу Альбома</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation>&amp;Показать Станицу Исполнителя</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::CustomPlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
+        <source>Top Loved Tracks</source>
+        <translation>Топ любимых песен</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
+        <source>Your loved tracks</source>
+        <translation>Ваши любимые песни</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
+        <source>%1&apos;s loved tracks</source>
+        <translation>%1&apos;s любимая песня</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
+        <source>The most loved tracks from all your friends</source>
+        <translation>Самые любимые песни от всех ваших друзей</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
+        <source>All of your loved tracks</source>
+        <translation>Все любимые песни</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
+        <source>All of %1&apos;s loved tracks</source>
+        <translation>Все от %1 любимые песни</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DropJobNotifier</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation>плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation>исполнитель</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation>песня</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation>альбом</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
+        <source>Fetching %1 from database</source>
+        <translation>Выборка %1 из базы данных</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
+        <source>Parsing %1 %2</source>
+        <translation>Анализирую %1 %2</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicControlList</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
+        <source>Click to collapse</source>
+        <translation>Нажмите, чтобы свернуть</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="172"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="301"/>
+        <source>Could not find a playable track.
+
+Please change the filters or try again.</source>
+        <translation>Не удалось найти какие-либо песни.
+
+Пожалуйста, измените фильтры и попробуйте еще раз.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="230"/>
+        <source>Failed to generate preview with the desired filters</source>
+        <translation>Не удалось создать предварительный просмотр с желаемым фильтры</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicSetupWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="53"/>
+        <source>Type:</source>
+        <translation>Тип:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="67"/>
+        <source>Generate</source>
+        <translation>Создать</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
+        <source>Add some filters above to seed this station!</source>
+        <translation>Добавить некоторые фильтры, чтобы увидеть эту станцию!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <source>Press Generate to get started!</source>
+        <translation>Нажмите кнопку Создать, чтобы начать!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
+        <source>Add some filters above, and press Generate to get started!</source>
+        <translation>Добавьте несколько фильтров выше, а затем нажмите Создать, чтобы начать!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp" line="472"/>
+        <source>Station ran out of tracks!
+
+Try tweaking the filters for a new set of songs to play.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestControl</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="188"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="255"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="276"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="341"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="360"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="425"/>
+        <source>is</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="207"/>
+        <source>from user</source>
+        <translation>от пользователя</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="216"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="584"/>
+        <source>No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="235"/>
+        <source>similar to</source>
+        <translation>похожие на</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>Less</source>
+        <translation>Ьеньше</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>More</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>0 BPM</source>
+        <translation>0 BPM</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>500 BPM</source>
+        <translation>500 BPM</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>0 secs</source>
+        <translation>0 сек</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>3600 secs</source>
+        <translation>3600 сек</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>-100 dB</source>
+        <translation>-100 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>100 dB</source>
+        <translation>100 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="343"/>
+        <source>Major</source>
+        <translation>Основной</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="344"/>
+        <source>Minor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
+        <source>C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
+        <source>C Sharp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
+        <source>D</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
+        <source>E Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
+        <source>E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
+        <source>F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
+        <source>F Sharp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="369"/>
+        <source>G</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="370"/>
+        <source>A Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="371"/>
+        <source>A</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="372"/>
+        <source>B Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="373"/>
+        <source>B</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
+        <source>Ascending</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="391"/>
+        <source>Descending</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="394"/>
+        <source>Tempo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="395"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="396"/>
+        <source>Loudness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="397"/>
+        <source>Artist Familiarity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
+        <source>Artist Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
+        <source>Song Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
+        <source>Latitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="401"/>
+        <source>Longitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="402"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="403"/>
+        <source>Key</source>
+        <translation>Ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="404"/>
+        <source>Energy</source>
+        <translation>Энергия</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="405"/>
+        <source>Danceability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="744"/>
+        <source>only by ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="746"/>
+        <source>similar to ~%1</source>
+        <translation>похожие на ~%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="748"/>
+        <source>with genre ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="754"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="766"/>
+        <source>from no one</source>
+        <translation>ни от кого не</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="758"/>
+        <source>My Collection</source>
+        <translation>Моя коллекция</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="762"/>
+        <source>from %1 radio</source>
+        <translation>от %1 радио</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="785"/>
+        <source>with %1 %2</source>
+        <translation>с %1 %2</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="787"/>
+        <source>about %1 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
+        <source>about %n minute(s) long</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
+        <source>about %1 dB</source>
+        <translation>около %1 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="793"/>
+        <source>at around %1%2 %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="798"/>
+        <source>in %1</source>
+        <translation>в %1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="803"/>
+        <source>in a %1 key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="813"/>
+        <source>sorted in %1 %2 order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="818"/>
+        <source>with a %1 mood</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="823"/>
+        <source>in a %1 style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestSteerer</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
+        <source>Steer this station:</source>
+        <translation>Управляй этой станции:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <source>Much less</source>
+        <translation>Гораздо меньше</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <source>Less</source>
+        <translation>Менее</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <source>A bit less</source>
+        <translation>Чуть меньше</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <source>Keep at current</source>
+        <translation>Имейтся в текущих</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <source>A bit more</source>
+        <translation>Немного более</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <source>More</source>
+        <translation>Более</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <source>Much more</source>
+        <translation>Гораздо больше</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
+        <source>Tempo</source>
+        <translation>Ритм</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
+        <source>Loudness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
+        <source>Danceability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
+        <source>Energy</source>
+        <translation>Мощность</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
+        <source>Song Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <source>Artist Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
+        <source>Artist Familiarity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
+        <source>By Description</source>
+        <translation>По описанию</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
+        <source>Enter a description</source>
+        <translation>Введите описание</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
+        <source>Apply steering command</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
+        <source>Reset all steering commands</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::GroovesharkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
+        <source>Error fetching Grooveshark information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::ChartsPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
+        <source>Top Overall</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
+        <source>Artists</source>
+        <translation>Исполнители</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
+        <source>Albums</source>
+        <translation>Альбомы</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
+        <source>Tracks</source>
+        <translation>Песни</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation>Tomahawk играет &quot;%1&quot;  %2%3.</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
+        <source>Top Tracks</source>
+        <translation>ТОП Песен</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
+        <source>Loved Tracks</source>
+        <translation>Любимые Песни</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
+        <source>Hyped Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
+        <source>Top Artists</source>
+        <translation>ТОП Исполнителей</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
+        <source>Hyped Artists</source>
+        <translation>Форма</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>Альбом</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ItunesParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
+        <source>Error fetching iTunes information from the network!</source>
+        <translation>Возникла ошибка при получении информации из iTunes!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::JSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
+        <source>New Playlist</source>
+        <translation>Новый плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Failed to save tracks</source>
+        <translation>Не удалось сохранить треки</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation>Некоторые треки в плейлисте не содержат исполнителя и название. Они будут проигнорированы.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>XSPF Error</source>
+        <translation>Ошибка XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation>Это не является допустимым XSPF плейлистом.</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::LatchManager</name>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="86"/>
+        <source>&amp;Catch Up</source>
+        <translation>&amp;Подхватить</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="123"/>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="144"/>
+        <source>&amp;Listen Along</source>
+        <translation>&amp;Слушать Его</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Query</name>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
+        <source> and </source>
+        <translation> и </translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
+        <source>You</source>
+        <translation>Ты</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
+        <source>you</source>
+        <translation>ты</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>and</source>
+        <translation>и</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>%n other(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
+        <source>%1 people</source>
+        <translation>%1 человек</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
+        <source>loved this track</source>
+        <translation>любимый</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::RdioParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
+        <source>Error fetching Rdio information from the network!</source>
+        <translation>Возникла ошибка при получении информации из Rdio!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ShortenedLinkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
+        <source>Network error parsing shortened link!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Source</name>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
+        <source>Scanning (%L1 tracks)</source>
+        <translation>Сканирование (%L1 песни)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
+        <source>Scanning</source>
+        <translation>Сканирую</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
+        <source>Checking</source>
+        <translation>Проверяю</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation>Импортирование</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
+        <source>Saving (%1%)</source>
+        <translation>Сохраняю (%1%)</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation>В сети</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::SpotifyParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
+        <source>Error fetching Spotify information from the network!</source>
+        <translation>Возникла ошибка при получении информации из Spotify!</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation>Автоматическое обновление из XSPF</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkApp</name>
+    <message>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
+        <source>My Collection</source>
+        <translation>Моя коллекция</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkOAuthTwitter</name>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>Twitter PIN</source>
+        <translation>Твиттер PIN</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>After authenticating on Twitter's web site,
+enter the displayed PIN number here:</source>
+        <translation>После авторизации в твиттере введите номер PIN сюда:</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkTrayIcon</name>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation>&amp;Остановить после текущего трека</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
+        <source>Hide Tomahawk Window</source>
+        <translation>Спрятать окно Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
+        <source>Show Tomahawk Window</source>
+        <translation>Показать окно Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
+        <source>Currently not playing.</source>
+        <translation>Не воспроизводится.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
+        <source>Play</source>
+        <translation>Играть</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
+        <source>Pause</source>
+        <translation>Пауза</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation>&amp;Любимый</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation>&amp;Не любимый</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation>&amp;Продолжить воспроизведение после текущего трека</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkWindow</name>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
+        <source>Tomahawk</source>
+        <translation>Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
+        <source>&amp;Settings</source>
+        <translation>Настройки</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
+        <source>&amp;Controls</source>
+        <translation>Управления</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
+        <source>&amp;Network</source>
+        <translation>Сеть</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
+        <source>&amp;Window</source>
+        <translation>Окно</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
+        <source>&amp;Help</source>
+        <translation>Помощь</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
+        <source>&amp;Quit</source>
+        <translation>Выйти</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
+        <source>Go &amp;Online</source>
+        <translation>Стать онлайн</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
+        <source>Add &amp;Friend...</source>
+        <translation>Добавить друга</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
+        <source>U&amp;pdate Collection</source>
+        <translation>Обновить коллекцию</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
+        <source>Update Collection</source>
+        <translation>Обновить коллекцию</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
+        <source>&amp;Configure Tomahawk...</source>
+        <translation>Настроить Tomahawk...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
+        <source>Load &amp;XSPF...</source>
+        <translation>Загрузить XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
+        <source>Create &amp;New Playlist...</source>
+        <translation>Создать Новый Плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
+        <source>About &amp;Tomahawk...</source>
+        <translation>О Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
+        <source>Create New &amp;Automatic Playlist</source>
+        <translation>Создать новый автоматический плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
+        <source>Create New &amp;Station</source>
+        <translation>Создать Новую Станцию</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
+        <source>Show Offline Sources</source>
+        <translation>Показать офлайн содержимое</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
+        <source>Hide Offline Sources</source>
+        <translation>Скрыть офлайн содержимое</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
+        <source>Minimize</source>
+        <translation>Скрыть</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
+        <source>Zoom</source>
+        <translation>Увеличить</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
+        <source>Meta+Ctrl+Z</source>
+        <translation>Meta+Ctrl+Z</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation>&amp;Юридическая информация...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
+        <source>Diagnostics...</source>
+        <translation>Диагностика</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
+        <source>Fully &amp;Rescan Collection</source>
+        <translation>Заново &amp;проверить коллекцию</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
+        <source>Fully Rescan Collection</source>
+        <translation>Заново проверить коллекцию</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
+        <source>Play</source>
+        <translation>Играть</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
+        <source>Space</source>
+        <translation>Пауза</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
+        <source>Previous</source>
+        <translation>Предыдущая</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
+        <source>Next</source>
+        <translation>Следующая</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation>Перейти на предыдущую страницу</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation>Вперед</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
+        <source>Global Search...</source>
+        <translation>Глобальный поиск</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
+        <source>Check For Updates...</source>
+        <translation>Проверить обновления...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
+        <source>Connect To Peer</source>
+        <translation>Связаться с Peer</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
+        <source>Enter peer address:</source>
+        <translation>Введите адрес узла:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
+        <source>Enter peer port:</source>
+        <translation>Введите адрес порта:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
+        <source>Enter peer key:</source>
+        <translation>Введите адрес ключа:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>XSPF Error</source>
+        <translation>Ошибка XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation>Это не является допустимым XSPF плейлистом.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Failed to save tracks</source>
+        <translation>Не удалось сохранить песни</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation>Некоторые треки в плейлисте не содержат исполнителя и название. Они будут проигнорированы.</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation>Станция</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Create New Station</source>
+        <translation>Создать новую станцию</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Name:</source>
+        <translation>Имя:</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation>Плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation>Автоматический Плейлист</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
+        <source>Pause</source>
+        <translation>Пауза</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
+        <source>Go &amp;offline</source>
+        <translation>Отключиться</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
+        <source>Go &amp;online</source>
+        <translation>Подлючиться</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
+        <source>Authentication Error</source>
+        <translation>Ошибка авторизации</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation>Ошибка соединения с SIP: Ошибка авторизации!</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
+        <source>%1 by %2</source>
+        <comment>track, artist name</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
+        <source>%1 - %2</source>
+        <comment>current track, some window title</comment>
+        <translation>%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation>Авторское право 2010 - 2012</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation>Благодарность</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation>О Tomahawk</translation>
+    </message>
+</context>
+<context>
+    <name>TopTracksContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
+        <source>Top Hits</source>
+        <translation>Хиты</translation>
+    </message>
+</context>
+<context>
+    <name>TrackInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation>Обложка</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
+        <source>Track</source>
+        <translation>Песня</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation>Исполнитель</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation>Альбом</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation>Статистика</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation>Похожие Песни</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation>Вы никогда не слушали этот трек раньше.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TrackView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation>Ваш поиск &apos;%1&apos; недал результатов.</translation>
+    </message>
+</context>
+<context>
+    <name>TransferStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>from</source>
+        <translation>из</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>to</source>
+        <translation>к</translation>
+    </message>
+</context>
+<context>
+    <name>TreeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
+        <source>Unknown</source>
+        <translation>Неизвестный</translation>
+    </message>
+</context>
+<context>
+    <name>TreeModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
+        <source>All Artists</source>
+        <translation>Все исполнители</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
+        <source>My Collection</source>
+        <translation>Моя коллекция</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
+        <source>Collection of %1</source>
+        <translation>Коллекция из %1</translation>
+    </message>
+</context>
+<context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
+        <source>Configure this Twitter account</source>
+        <translation>Настройка Твиттер аккаунта</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
+        <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
+        <translation>Твиттер плагин позволяет вам находить и воспроизводить музыку друзей через Твиттер и посылать сообщения.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
+        <source>Status: No saved credentials</source>
+        <translation>Статус: Нет сохраненных учетных данных</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
+        <source>Authenticate with Twitter</source>
+        <translation>Авторизироваться</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
+        <source>Twitter Connections</source>
+        <translation>Твиттер соединение</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
+        <source>
+If you only want to post tweets, you're done.
+
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.</source>
+        <translation>Если вы хотите посылать твиты, это все.
+
+Если вы хотите подключиться через Tomahawk к вашим друзьями через Twitter, выбрать тип чириканье и нажмите на кнопку ниже, чтобы отправить сообщение синхронизации. Вы оба должны быть следующими друг за другом, как прямого сообщения используются. Тогда не (очень) пациента - это может занять несколько минут!
+
+Вы можете повторно отправить сообщение синхронизации в любое время, просто отправив другой твиты с помощью кнопки.</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
+        <source>Select the kind of tweet you would like, then press the button to post it:</source>
+        <translation>Выберите вид твита, затем нажмите кнопку, чтобы отправить его:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
+        <source>Global Tweet</source>
+        <translation>Глобальный Твит</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
+        <source>@Mention</source>
+        <translation>@ Упоминание</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
+        <source>Direct Message</source>
+        <translation>Прямое сообщение</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
+        <source>e.g. @tomahawk</source>
+        <translation>например @tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
+        <source>Send Message</source>
+        <translation>Отправть сообщение</translation>
+    </message>
+</context>
+<context>
+    <name>ViewManager</name>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation>Коллекция пуста</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
+        <source>SuperCollection</source>
+        <translation>Общая коллекция</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
+        <source>Combined libraries of all your online friends</source>
+        <translation>Комбинированные библиотек всех ваших друзей онлайн</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
+        <source>Recent Additions</source>
+        <translation>Последние Добавленные Песни</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
+        <source>Newest Stations &amp; Playlists</source>
+        <translation>Последние Станции и Плейлисты</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
+        <source>Recently Played Tracks</source>
+        <translation>Последние Воспроизводимые Песни</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
+        <source>No recently created playlists in your network.</source>
+        <translation>Нет списков, созданных в последнее время в вашей сети.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
+        <source>Welcome to Tomahawk</source>
+        <translation>Добро пожаловать в Tomahawk</translation>
+    </message>
+</context>
+<context>
+    <name>WhatsHotWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
+        <source>Charts</source>
+        <translation>Чарты</translation>
+    </message>
+</context>
+<context>
+    <name>WikipediaContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="42"/>
+        <source>Wikipedia</source>
+        <translation>Википедия</translation>
+    </message>
+</context>
+<context>
+    <name>XMPPBot</name>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
+        <source>
+Terms for %1:
+</source>
+        <translation>
+Условия для %1:</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
+        <source>No terms found, sorry.</source>
+        <translation>Извините не найдено терминов.</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
+        <source>
+Hotttness for %1: %2
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
+        <source>
+Familiarity for %1: %2
+</source>
+        <translation>
+Знакомство для %1: %2
+</translation>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
+        <source>
+Lyrics for &quot;%1&quot; by %2:
+
+%3
+</source>
+        <translation>
+Текст для &quot;%1&quot; by %2:
+
+%3</translation>
+    </message>
+</context>
+<context>
+    <name>XSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
+        <source>Failed to parse contents of XSPF playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
+        <source>Some playlist entries were found without artist and track name, they will be omitted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
+        <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
+        <source>New Playlist</source>
+        <translation>Новый Плейлист</translation>
+    </message>
+</context>
+<context>
+    <name>XmlConsole</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
+        <source>Xml stream console</source>
+        <translation>Xml поток консоли</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
+        <source>Filter</source>
+        <translation>Фильтр</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
+        <source>Save log</source>
+        <translation>Сохранить логи</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
+        <source>Disabled</source>
+        <translation>Отменить</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
+        <source>By JID</source>
+        <translation>По JID</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
+        <source>By namespace uri</source>
+        <translation>По имен URI</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
+        <source>By all attributes</source>
+        <translation>По всем признакам</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
+        <source>Visible stanzas</source>
+        <translation>Видимые строфы</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
+        <source>Information query</source>
+        <translation>Информация запроса</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
+        <source>Message</source>
+        <translation>Сообщение</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
+        <source>Presence</source>
+        <translation>Наличие</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
+        <source>Custom</source>
+        <translation>Разный</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
+        <source>Save XMPP log to file</source>
+        <translation>Сохранить XMPP лог в файл</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
+        <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
+        <translation>OpenDocument Format (*.odf);;HTML файл (*.html);;Обычный текст (*.txt)</translation>
+    </message>
+</context>
+<context>
+    <name>XmppConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
+        <source>Xmpp Configuration</source>
+        <translation>Конфигурация Xmpp</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
+        <source>Configure this Xmpp account</source>
+        <translation>Настроить аккаунт XMPP</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
+        <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
+        <translation>Введите ваш логин Xmpp, чтобы связаться с друзьями, используя Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
+        <source>Login Information</source>
+        <translation>Информация о входе</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
+        <source>Xmpp ID:</source>
+        <translation>Xmpp ID:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
+        <source>e.g. user@example.com</source>
+        <translation>e.g. user@example.com</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
+        <source>Password:</source>
+        <translation>Пароль:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
+        <source>An account with this name already exists!</source>
+        <translation>Аккаунт с этим именем уже существует!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
+        <source>Advanced Xmpp Settings</source>
+        <translation>Дополнительные параметры XMPP</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
+        <source>Server:</source>
+        <translation>Сервер:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
+        <source>Port:</source>
+        <translation>Порт:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
+        <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
+        <translation>Многие серверы не поддерживают это (например, GTalk, jabber.org)</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
+        <source>Publish currently playing track</source>
+        <translation>Опубликовать текущую песню</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
+        <source>Enforce secure connection</source>
+        <translation>Обеспечение безопасного соединения</translation>
+    </message>
+</context>
+<context>
+    <name>XmppSipPlugin</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
+        <source>User Interaction</source>
+        <translation>Взаимодействие с пользователем</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
+        <source>Host is unknown</source>
+        <translation>Неизвестный хост</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
+        <source>Item not found</source>
+        <translation>Песня не найдена</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
+        <source>Authorization Error</source>
+        <translation>Ошибка авторизации</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
+        <source>Remote Stream Error</source>
+        <translation>Удаленный поток ошибок</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
+        <source>Remote Connection failed</source>
+        <translation>Ошибка подключения</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
+        <source>Internal Server Error</source>
+        <translation>Внутренняя ошибка сервера</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
+        <source>System shutdown</source>
+        <translation>Выключение системы</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
+        <source>Conflict</source>
+        <translation>Конфликт</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
+        <source>Unknown</source>
+        <translation>Неизвестный</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
+        <source>No Compression Support</source>
+        <translation>Нет поддержки сжатия</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
+        <source>No Encryption Support</source>
+        <translation>Нет поддержки шифрования</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
+        <source>No Authorization Support</source>
+        <translation>Нет поддержки авторизации</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
+        <source>No Supported Feature</source>
+        <translation>Не поддерживаемые функции</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
+        <source>Add Friend</source>
+        <translation>Добавить друга</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
+        <source>Enter Xmpp ID:</source>
+        <translation>Введите XMPP ID:</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
+        <source>Add Friend...</source>
+        <translation>Добавить друга...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
+        <source>XML Console...</source>
+        <translation>XML Console...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
+        <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
+        <source>Authorize User</source>
+        <translation>Авторизация пользователя</translation>
+    </message>
+</context>
+<context>
+    <name>ZeroconfConfig</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
+        <source>Local Network configuration</source>
+        <translation>Локальная конфигурация сети</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
+        <source>This plugin will automatically find other users running Tomahawk on your local network</source>
+        <translation>Этот плагин автоматически найдет других пользователей, работающих с Tomahawk в вашей локальной сети</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
+        <source>Connect automatically when Tomahawk starts</source>
+        <translation>Подключаться автоматически, при старте Tomahawk</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/lang/tomahawk_sv.ts -> tomahawk-0.5.5.tar.bz2/lang/tomahawk_sv.ts Changed

@@ -1,45 +1,45 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.0">
 <context>
-    <name>ACLRegistry</name>
+    <name>ACLJobDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="140"/>
-        <source>Connect to Peer?</source>
-        <translation>Anslut till klient?</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="141"/>
-        <source>Another Tomahawk instance that claims to be owned by %1 is attempting to connect to you. Select whether to allow or deny this connection.
-
-Remember: Only allow peers to connect if you trust who they are and if you have the legal right for them to stream music from you.</source>
-        <translation>En annan Tomahawk instans som påstås vara ägd av %1 försöker ansluta till dig. Välj om du vill tillåta eller neka detta.
-
-Kom ihåg: Tillåt endast anslutning från klienter du litar på, och som har laglig rätt att streama musik från dig.</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="142"/>
-        <source>Deny</source>
-        <translation>Neka</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
     <message>
-        <location filename="../src/libtomahawk/aclregistry.cpp" line="143"/>
-        <source>Allow</source>
-        <translation>Tillåt</translation>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AccountFactoryWrapper</name>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.ui" line="30"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
         <source>Description goes here</source>
         <translation>Beskrivning här</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapper.cpp" line="41"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
         <source>Add Account</source>
         <translation>Lägg till konto</translation>
     </message>
@@ -47,17 +47,17 @@
 <context>
     <name>AccountFactoryWrapperDelegate</name>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="105"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
         <source>Online</source>
         <translation>Online</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="110"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
         <source>Connecting...</source>
         <translation>Ansluter...</translation>
     </message>
     <message>
-        <location filename="../src/AccountFactoryWrapperDelegate.cpp" line="115"/>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
         <source>Offline</source>
         <translation>Offline</translation>
     </message>
@@ -65,69 +65,69 @@
 <context>
     <name>ActionCollection</name>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="43"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
         <source>&amp;Listen Along</source>
         <translation>&amp;Lyssna med</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="46"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
         <source>Stop &amp;Listening Along</source>
         <translation>Sluta &amp;Lyssna med</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="50"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
         <source>&amp;Follow in real-time</source>
         <translation>&amp;Lyssna med i realtid</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Privately</source>
         <translation>&amp;Lyssna privat</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="55"/>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
         <source>&amp;Listen Publicly</source>
         <translation>&amp;Lyssna publikt</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="61"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
         <source>&amp;Load Playlist</source>
         <translation>&amp;Läs in spellista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="62"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
         <source>&amp;Rename Playlist</source>
         <translation>&amp;Byt namn på spellista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="63"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
         <source>&amp;Copy Playlist Link</source>
         <translation>&amp;Kopiera länk till spellista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="64"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
         <source>&amp;Play</source>
         <translation>Spela &amp;upp</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="65"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
         <source>&amp;Stop</source>
         <translation>&amp;Stoppa</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
         <source>&amp;Previous Track</source>
         <translation>&amp;Föregående spår</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="67"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
         <source>&amp;Next Track</source>
         <translation>&amp;Nästa spår</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/actioncollection.cpp" line="68"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
         <source>&amp;Quit</source>
         <translation>A&amp;vsluta</translation>
     </message>
@@ -145,30 +145,17 @@
         <translation>Andra album av artisten</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="74"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="120"/>
-        <source>Click to show Official Tracks</source>
-        <translation>Klicka för att visa officiella spår</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="72"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="118"/>
-        <source>Click to show SuperCollection Tracks</source>
-        <translation>Klicka för att visa SuperCollection spår</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="79"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="136"/>
-        <source>Click to show SuperCollection Albums</source>
-        <translation>Klicka för att visa SuperCollection Album</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="138"/>
-        <source>Click to show Official Albums</source>
-        <translation>Klicka för att visa Officiella Album</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="205"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
         <source>Other Albums by %1</source>
         <translation>Andra album av %1</translation>
     </message>
@@ -176,36 +163,18 @@
 <context>
     <name>AlbumModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="145"/>
-        <source>Album</source>
-        <translation>Album</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="260"/>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="302"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
         <source>All albums from %1</source>
         <translation>Alla album från %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/albummodel.cpp" line="304"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
         <source>All albums</source>
         <translation>Alla album</translation>
     </message>
 </context>
 <context>
-    <name>AlbumView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="155"/>
-        <source>After you have scanned your music collection you will find your latest album additions right here.</source>
-        <translation>Efter att du har scannat din musiksamling kommer du finna dina senaste tillagda album här.</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/albumview.cpp" line="157"/>
-        <source>This collection doesn&apos;t have any recent albums.</source>
-        <translation>Den här samlingen inga nya album.</translation>
-    </message>
-</context>
-<context>
     <name>ArtistInfoWidget</name>
     <message>
         <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
@@ -213,119 +182,120 @@
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
         <source>Top Hits</source>
         <translation>Största hits</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
         <source>Related Artists</source>
         <translation>Relaterade artister</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="77"/>
-        <source>Albums</source>
-        <translation>Album</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="86"/>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="125"/>
-        <source>Click to show SuperCollection Albums</source>
-        <translation>Klicka för att visa SuperCollection Album</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="127"/>
-        <source>Click to show Official Albums</source>
-        <translation>Klicka för visa Officiella Album</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>ArtistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="272"/>
-        <source>After you have scanned your music collection you will find your tracks right here.</source>
-        <translation>Efter att du har scannat din musiksamling kommer du finna dina senaste tillagda låtar här.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="274"/>
-        <source>This collection is currently empty.</source>
-        <translation>Denna samling är tom.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/artistview.cpp" line="291"/>
-        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
-        <translation>Tyvärr, ditt filter &quot;%1&quot; matchade inte några resultat.</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AudioControls</name>
     <message>
-        <location filename="../src/audiocontrols.ui" line="75"/>
+        <location filename="../src/AudioControls.ui" line="75"/>
         <source>Prev</source>
         <translation>Föreg</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="87"/>
+        <location filename="../src/AudioControls.ui" line="87"/>
         <source>Play</source>
         <translation>Spela upp</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="94"/>
+        <location filename="../src/AudioControls.ui" line="94"/>
         <source>Pause</source>
         <translation>Paus</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="103"/>
+        <location filename="../src/AudioControls.ui" line="103"/>
         <source>Next</source>
         <translation>Nästa</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="214"/>
+        <location filename="../src/AudioControls.ui" line="229"/>
         <source>Artist</source>
         <translation>Artist</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="236"/>
+        <location filename="../src/AudioControls.ui" line="248"/>
         <source>Album</source>
         <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="265"/>
+        <location filename="../src/AudioControls.ui" line="277"/>
         <source>Owner</source>
         <translation>Ägare</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="302"/>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
         <source>love</source>
         <translation>älska</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="346"/>
+        <location filename="../src/AudioControls.ui" line="383"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="375"/>
+        <location filename="../src/AudioControls.ui" line="412"/>
         <source>Time Left</source>
         <translation>Tid kvar</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="453"/>
+        <location filename="../src/AudioControls.ui" line="493"/>
         <source>Shuffle</source>
         <translation>Blanda</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="466"/>
+        <location filename="../src/AudioControls.ui" line="506"/>
         <source>Repeat</source>
         <translation>Upprepa</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="504"/>
+        <location filename="../src/AudioControls.ui" line="544"/>
         <source>Low</source>
         <translation>Låg</translation>
     </message>
     <message>
-        <location filename="../src/audiocontrols.ui" line="536"/>
+        <location filename="../src/AudioControls.ui" line="576"/>
         <source>High</source>
         <translation>Hög</translation>
     </message>
@@ -333,41 +303,42 @@
 <context>
     <name>AudioEngine</name>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="199"/>
-        <source>Tomahawk is stopped.</source>
-        <translation>Tomahawk är stoppad.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="369"/>
-        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
-        <translation>Tomahawk spelar upp &quot;%1&quot; av %2%3.</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/audio/audioengine.cpp" line="372"/>
-        <source>on album %1</source>
-        <translation>på album %1</translation>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CategoryAddItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="61"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="100"/>
-        <source>New Playlist</source>
-        <translation>Ny spellista</translation>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="63"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>New Station</source>
         <translation>Ny station</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="207"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="316"/>
-        <location filename="../src/sourcetree/items/categoryitems.cpp" line="318"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
         <source>%1 Station</source>
         <translation>%1 station</translation>
     </message>
@@ -375,12 +346,12 @@
 <context>
     <name>CategoryItem</name>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="63"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
         <source>Playlists</source>
         <translation>Spellistor</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/categoryitems.h" line="65"/>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
         <source>Stations</source>
         <translation>Stationer</translation>
     </message>
@@ -388,33 +359,12 @@
 <context>
     <name>ClearButton</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/clearbutton.cpp" line="38"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
         <source>Clear</source>
         <translation>Töm</translation>
     </message>
 </context>
 <context>
-    <name>CollectionFlatModel</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="72"/>
-        <source>My Collection</source>
-        <translation>Min samling</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionflatmodel.cpp" line="74"/>
-        <source>Collection of %1</source>
-        <translation>Samling av %1</translation>
-    </message>
-</context>
-<context>
-    <name>CollectionView</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/collectionview.cpp" line="85"/>
-        <source>This collection is empty.</source>
-        <translation>Denna samling är tom.</translation>
-    </message>
-</context>
-<context>
     <name>ContextWidget</name>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
@@ -423,12 +373,12 @@
     </message>
     <message>
         <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="344"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
         <source>Show Footnotes</source>
         <translation>Visa fotnot</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="338"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
         <source>Hide Footnotes</source>
         <translation>Dölj fotnot</translation>
     </message>
@@ -440,39 +390,49 @@
         <source>Tomahawk Crash Reporter</source>
         <translation>Tomahawk kraschrapport</translation>
     </message>
-    <message>
+    <message utf8="true">
         <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
-        <source>&lt;p&gt;&lt;b&gt;Sorry!&lt;/b&gt;&amp;nbsp;Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;b&gt;Oj!&lt;/b&gt;&amp;nbsp; Tomahawk kraschade. Information om denna krasch skickas nu till Tomahawk HQ så att vi kan lösa problemet.&lt;/p&gt;</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="172"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
         <source>Abort</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="192"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
         <source>You can disable sending crash reports in the configuration dialog.</source>
         <translation>Du kan välja att inte skicka kraschrapporter i konfigurationsdialogen. </translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="153"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
         <source>Uploaded %L1 of %L2 KB.</source>
         <translation>Laddade upp %L1 av %L2 KB.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="167"/>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="183"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="176"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
         <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
         <translation>Skickat! &lt;b&gt;Tack så mycket&lt;/b&gt;.</translation>
     </message>
     <message>
-        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
         <source>Failed to send crash info.</source>
         <translation>Misslyckades skicka kraschrapport.</translation>
     </message>
@@ -480,7 +440,7 @@
 <context>
     <name>DatabaseCommand_AllAlbums</name>
     <message>
-        <location filename="../src/libtomahawk/database/databasecommand_allalbums.cpp" line="109"/>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
         <source>Unknown</source>
         <translation>Okänt</translation>
     </message>
@@ -488,41 +448,43 @@
 <context>
     <name>DelegateConfigWrapper</name>
     <message>
-        <location filename="../src/delegateconfigwrapper.cpp" line="61"/>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
         <source>Delete Account</source>
         <translation>Ta bort konto</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiagnosticsDialog</name>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="20"/>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
         <source>Tomahawk Diagnostics</source>
         <translation>Diagnostik för Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="38"/>
-        <source>Update</source>
-        <translation>Uppdatera</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/diagnosticsdialog.ui" line="45"/>
-        <source>Copy to Clipboard</source>
-        <translation>Kopiera till urklipp</translation>
-    </message>
-</context>
-<context>
-    <name>DropJob</name>
-    <message>
-        <location filename="../src/libtomahawk/dropjob.cpp" line="832"/>
-        <source>No tracks found for given %1</source>
-        <translation>Inga låtar hittades för %1</translation>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>GlobalSearchWidget</name>
     <message>
-        <location filename="../src/searchbox.ui" line="14"/>
+        <location filename="../src/SearchBox.ui" line="14"/>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
@@ -538,66 +500,48 @@
 <context>
     <name>InfoBar</name>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.ui" line="26"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Inforad</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="87"/>
-        <source>Automatically update</source>
-        <translation>Uppdatera automatiskt</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/infobar/infobar.cpp" line="95"/>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
         <source>Filter...</source>
         <translation>Filter...</translation>
     </message>
 </context>
 <context>
-    <name>JobStatusView</name>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Searching For</source>
-        <translation>Söker efter</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="44"/>
-        <source>Pending</source>
-        <translation>Väntar</translation>
-    </message>
-    <message>
-        <location filename="../src/PipelineStatusView.cpp" line="94"/>
-        <source>Idle</source>
-        <translation>Overksam</translation>
-    </message>
-</context>
-<context>
     <name>LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
         <source>Scrobble tracks to Last.fm</source>
         <translation>Scrobbla låtar till Last.fm</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
         <source>Username:</source>
         <translation>Användarnamn:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
         <source>Password:</source>
         <translation>Lösenord:</translation>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
         <source>Test Login</source>
         <translation>Testinloggning</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>LastfmContext</name>
@@ -611,8 +555,8 @@
     <name>LatchedStatusItem</name>
     <message>
         <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
-        <source>%1 is listening along to you!</source>
-        <translation>%1 lyssnar samtidigt som du!</translation>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -646,12 +590,12 @@
 <context>
     <name>LoadXSPFDialog</name>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>Load XSPF File</source>
         <translation>Läs in XSPF-fil</translation>
     </message>
     <message>
-        <location filename="../src/LoadXSPFDialog.cpp" line="47"/>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
         <source>XSPF Files (*.xspf)</source>
         <translation>XSPF Filer (*.xspf)</translation>
     </message>
@@ -659,53 +603,256 @@
 <context>
     <name>LocalCollection</name>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Bookmarks</source>
         <translation>Bokmärken</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/database/localcollection.cpp" line="54"/>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
         <source>Saved tracks</source>
         <translation>Sparade spår</translation>
     </message>
 </context>
 <context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>NewPlaylistWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="20"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
         <source>Enter a title for the new playlist:</source>
         <translation>Gib einen Titel für die neue Playliste ein:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.ui" line="37"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
         <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
         <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="47"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
         <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>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="43"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
         <source>&amp;Create Playlist</source>
         <translation>Playliste &amp;erstellen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/newplaylistwidget.h" line="50"/>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
         <source>Create a new playlist</source>
         <translation>Erstelle eine neue Playliste</translation>
     </message>
 </context>
 <context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>PlaylistItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="162"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
         <source>played %1 by you</source>
         <translation>%1 spelades av dig</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistitemdelegate.cpp" line="164"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
         <source>played %1 by %2</source>
         <translation>%1 spelades av %2</translation>
     </message>
@@ -713,17 +860,17 @@
 <context>
     <name>PlaylistLargeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="156"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
         <source>played %1 by you</source>
         <translation>%1 spelades av dig</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
         <source>played %1 by %2</source>
         <translation>%1 spelades av %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="165"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
         <source>added %1</source>
         <translation>%1 tillagd</translation>
     </message>
@@ -731,22 +878,22 @@
 <context>
     <name>PlaylistModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
         <source>A playlist by %1, created %2</source>
         <translation>En spellista av %1, skapad %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="78"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
         <source>you</source>
         <translation>dig</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
         <source>All tracks by %1 on album %2</source>
         <translation>Alla spår av %1 från albumet %2</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistmodel.cpp" line="152"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
         <source>All tracks by %1</source>
         <translation>Alla spår av %1</translation>
     </message>
@@ -754,37 +901,37 @@
 <context>
     <name>PlaylistTypeSelectorDlg</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="32"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
         <source>New Playlist</source>
         <translation>Ny spellista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="49"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
         <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
         <translation>En helt vanlig gammal spellista... Ge den ett namn, dra dit några spår och kör!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="75"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
         <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
         <translation>Vet du inte exakt vad vill göra? Ge Tomahawk ett par parametrar och låt den bygga en spellista åt dig!</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="92"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="102"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
         <source>New Playlist...</source>
         <translation>Ny spellista...</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="113"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
         <source>Create Manual Playlist</source>
         <translation>Skapa manuell spellista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/playlisttypeselectordlg.ui" line="123"/>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
         <source>Create Automatic Playlist</source>
         <translation>Skapa automatisk spellista</translation>
     </message>
@@ -792,7 +939,12 @@
 <context>
     <name>PlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/playlistview.cpp" line="145"/>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
         <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
         <translation>Denna spellista är för närvarande tom. Lägg till några spår och njut av musiken!</translation>
     </message>
@@ -800,64 +952,59 @@
 <context>
     <name>ProxyDialog</name>
     <message>
-        <location filename="../src/proxydialog.ui" line="17"/>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
         <source>Proxy Settings</source>
         <translation>Proxyinställningar</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="70"/>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
         <source>Hostname of proxy server</source>
         <translation>Värdnamn för proxyservern</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="77"/>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
         <source>Host</source>
         <translation>Värdnamn</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="84"/>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="104"/>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
         <source>Proxy login</source>
         <translation>Proxy login</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="111"/>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
         <source>User</source>
         <translation>Användare</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="118"/>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="128"/>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
         <source>Proxy password</source>
         <translation>Proxy lösenord</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="135"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../src/proxydialog.ui" line="142"/>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
         <source>No Proxy Hosts:
 (Overrides system proxy)</source>
         <translation>Ingen Proxy host
 (Skriver över systemproxyn)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="150"/>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
         <source>localhost *.example.com (space separated)</source>
         <translation>localhost *.example.com (separeras med mellanslag)</translation>
     </message>
     <message>
-        <location filename="../src/proxydialog.ui" line="167"/>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
         <source>Use proxy for DNS lookups?</source>
         <translation>Använd proxy för DNS kontroll?</translation>
     </message>
@@ -865,82 +1012,82 @@
 <context>
     <name>QObject</name>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="214"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
         <source>%n year(s) ago</source>
         <translation><numerusform>%n år sedan</numerusform><numerusform>%n år sedan</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="216"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
         <source>%n year(s)</source>
         <translation><numerusform>%n år sedan</numerusform><numerusform>%n år sedan</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="222"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
         <source>%n month(s) ago</source>
         <translation><numerusform>%n månad sedan</numerusform><numerusform>%n månader sedan</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
         <source>%n month(s)</source>
         <translation><numerusform>%n månad</numerusform><numerusform>%n månader</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="230"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
         <source>%n week(s) ago</source>
         <translation><numerusform>%n vecka sedan</numerusform><numerusform>%n veckor sedan</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="232"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
         <source>%n week(s)</source>
         <translation><numerusform>%n vecka</numerusform><numerusform>%n veckor</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="238"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>%n dag sedan</numerusform><numerusform>%n dagar sedan</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="240"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
         <source>%n day(s)</source>
         <translation><numerusform>%n dag</numerusform><numerusform>%n dagar</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="246"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>%n timme sedan</numerusform><numerusform>%n timmar sedan</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="248"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
         <source>%n hour(s)</source>
         <translation><numerusform>%n timme</numerusform><numerusform>%n timmar</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="254"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
         <source>%1 minutes ago</source>
         <translation>%1 minuter sedan</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="256"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
         <source>%1 minutes</source>
         <translation>%1 minuter</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/tomahawkutils.cpp" line="260"/>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
         <source>just now</source>
         <translation>precis nyss</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="34"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
         <source>Friend Finders</source>
         <translation>Hitta vänner</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
         <source>Music Finders</source>
         <translation>Hitta musik</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/accounts/Account.cpp" line="39"/>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
         <source>Status Updaters</source>
         <translation>Status uppdaterare</translation>
     </message>
@@ -956,26 +1103,31 @@
 <context>
     <name>QueueView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="26"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
         <source>InfoBar</source>
         <translation>Inforad</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.ui" line="41"/>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="120"/>
-        <source>Show Queue</source>
-        <translation>Visa kö</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/queueview.cpp" line="130"/>
-        <source>Hide Queue</source>
-        <translation>Dölj kö</translation>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RelatedArtistsContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
         <source>Related Artists</source>
         <translation>Relaterade artister</translation>
     </message>
@@ -983,12 +1135,12 @@
 <context>
     <name>ResolverConfigDelegate</name>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="110"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
         <source>Not found: %1</source>
         <translation>Hittades inte: %1</translation>
     </message>
     <message>
-        <location filename="../src/resolverconfigdelegate.cpp" line="113"/>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
         <source>Failed to load: %1</source>
         <translation>Gick inte att läsa in: %1</translation>
     </message>
@@ -996,7 +1148,7 @@
 <context>
     <name>SearchLineEdit</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/searchlineedit.cpp" line="58"/>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
         <source>Search</source>
         <translation>Sök</translation>
     </message>
@@ -1004,12 +1156,12 @@
 <context>
     <name>SearchWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="54"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
         <source>Search: %1</source>
         <translation>Sök: %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/searchwidget.h" line="55"/>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
         <source>Results for &apos;%1&apos;</source>
         <translation>Resultat för &quot;%1&quot;</translation>
     </message>
@@ -1017,39 +1169,49 @@
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="245"/>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
         <source>Collection</source>
         <translation>Samling</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="252"/>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
         <source>Advanced</source>
         <translation>Avancerat</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="124"/>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
         <source>All</source>
         <translation>Alla</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="238"/>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
         <source>Services</source>
         <translation>Tjänster</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="396"/>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
         <source>Install resolver from file</source>
         <translation>Installera resolver från fil</translation>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Information</source>
-        <translation>Information</translation>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/settingsdialog.cpp" line="423"/>
-        <source>Changing this setting requires a restart of Tomahawk!</source>
-        <translation>Ändring av detta kräver omstart av Tomahawk!</translation>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>Information</translation>
     </message>
 </context>
 <context>
@@ -1071,56 +1233,94 @@
     </message>
 </context>
 <context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SourceDelegate</name>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="55"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
         <source>Track</source>
         <translation>Spår</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="56"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
         <source>Album</source>
         <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="57"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
         <source>Artist</source>
         <translation>Artist</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="58"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
         <source>Local</source>
         <translation>Lokalt</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="59"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
         <source>Top 10</source>
         <translation>Topp 10</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="187"/>
-        <source>Offline</source>
-        <translation>Frånkopplad</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
         <source>All available tracks</source>
         <translation>Alla tillgängliga spår</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="196"/>
-        <source>Online</source>
-        <translation>Ansluten</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="289"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="330"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
         <source>Show</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="291"/>
-        <location filename="../src/sourcetree/sourcedelegate.cpp" line="332"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
         <source>Hide</source>
         <translation>Göm</translation>
     </message>
@@ -1128,32 +1328,32 @@
 <context>
     <name>SourceInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="30"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
         <source>Recent Albums</source>
         <translation>Senaste album</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="74"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
         <source>Latest Additions</source>
         <translation>Senaste tilläggen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="88"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
         <source>Recently Played Tracks</source>
         <translation>Senaste spelade spår</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="80"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
         <source>New Additions</source>
         <translation>Nya tillägg</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="83"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
         <source>My recent activity</source>
         <translation>Min senaste aktivitet</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="87"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
         <source>Recent activity from %1</source>
         <translation>Senaste aktivitet från %1</translation>
     </message>
@@ -1161,55 +1361,128 @@
 <context>
     <name>SourceItem</name>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="65"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
         <source>Collection</source>
         <translation>Samling</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="73"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
         <source>Latest Additions</source>
         <translation>Senast tillagda</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="77"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
         <source>Recently Played</source>
         <translation>Senast spelade spår</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="81"/>
-        <source>Loved Tracks</source>
-        <translation>Älskade låtar</translation>
-    </message>
-    <message>
-        <location filename="../src/sourcetree/items/sourceitem.cpp" line="146"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
         <source>SuperCollection</source>
         <translation>SuperCollection</translation>
     </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SourceTreeView</name>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="188"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
         <source>&amp;Copy Link</source>
         <translation>&amp;Kopiera länk</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="189"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
         <source>&amp;Delete %1</source>
         <translation>&amp;Ta bort %1</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="207"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
         <source>&amp;Export Playlist</source>
         <translation>&amp;Exportera spellista</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="341"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
         <source>Save XSPF</source>
         <translation>Spara XSPF</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcetreeview.cpp" line="342"/>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
         <source>Playlists (*.xspf)</source>
         <translation>Spellistor (*.xspf)</translation>
     </message>
@@ -1217,138 +1490,166 @@
 <context>
     <name>SourcesModel</name>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="78"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
         <source>Group</source>
         <translation>Grupp</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="81"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
         <source>Collection</source>
         <translation>Samling</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="84"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
         <source>Playlist</source>
         <translation>Spellista</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="87"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
         <source>Automatic Playlist</source>
         <translation>Automatisk spellista</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="90"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
         <source>Station</source>
         <translation>Station</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="268"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
         <source>Browse</source>
         <translation>Bläddra</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="269"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
         <source>Search History</source>
         <translation>Sökhistorik</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="271"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
         <source>My Music</source>
         <translation>Min Musik</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="279"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
         <source>SuperCollection</source>
         <translation>SuperCollection</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="285"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
         <source>Top Loved Tracks</source>
         <translation>Mest älskade spår</translation>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="273"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
         <source>Dashboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="290"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
         <source>Recently Played</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
         <source>Charts</source>
+        <translation>Topplistor</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/sourcetree/sourcesmodel.cpp" line="300"/>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
         <source>Friends</source>
-        <translation type="unfinished"/>
+        <translation>Vänner</translation>
     </message>
 </context>
 <context>
     <name>SpotifyConfig</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="48"/>
-        <source>Configure your Spotify credentials</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="65"/>
-        <source>Username:</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="72"/>
-        <source>placeholderUsername</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
-        <source>Password:</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="86"/>
-        <source>placeholderPw</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="116"/>
-        <source>High Quality Streaming</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccountConfig.ui" line="186"/>
-        <source>This product uses SPOTIFY(R) CORE but is not endorsed, certified or otherwise approved in any way by Spotify. Spotify is the registered trade mark of the Spotify Group.</source>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>Användarnamn:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>Lösenord:</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StackedSettingsDialog</name>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="14"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
         <source>Tomahawk Settings</source>
         <translation>Inställningar för Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="158"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
         <source>Local Music Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="166"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
         <source>Path to scan for music files:</source>
-        <translation type="unfinished"/>
+        <translation>Sökväg att leta efter musik i</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="180"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
         <source>The Echo Nest supports keeping track of your catalog metadata
  and using it to craft personalized radios. Enabling this option
  will allow you (and all your friends) to create automatic playlists
@@ -1356,141 +1657,202 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="186"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
         <source>Upload collection list to The Echo Nest to enable user radio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="199"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
         <source>Watch for changes</source>
-        <translation type="unfinished"/>
+        <translation>Bevaka förändringar</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="208"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
         <source>Time between scans, in seconds:</source>
+        <translation>Intervall mellan letande, i sekunder</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="98"/>
-        <source>Internet Services</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="109"/>
-        <source>Install from file...</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="129"/>
-        <source>Filter by capability:</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="245"/>
-        <source>Advanced Network Settings</source>
-        <translation>Avancerade nätverksinställningar</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="265"/>
-        <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>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="283"/>
-        <source>Static Host Name:</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="299"/>
-        <source>Static Port:</source>
-        <translation>Statisk port:</translation>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation>Internet-tjänster</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation>Installera från fil…</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation>Filtrera efter funktion:</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="321"/>
-        <source>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</source>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
+        <source>Static Host Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="345"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
+        <source>Static Port:</source>
+        <translation>Statisk port:</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
         <source>Proxy Settings...</source>
         <translation>Proxyinställningar...</translation>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="383"/>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
         <source>Send reports after Tomahawk crashed</source>
+        <translation>Skicka en felrapport om Tomahawk kraschar</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="396"/>
-        <source>Allow web browsers to interact with Tomahawk</source>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/stackedsettingsdialog.ui" line="409"/>
-        <source>Use UPnP to establish port forward</source>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::AccountDelegate</name>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="200"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
         <source>Add Account</source>
-        <translation type="unfinished"/>
+        <translation>Lägg till konto</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="250"/>
-        <source>Remove Account</source>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="360"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
         <source>%1 downloads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="585"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
         <source>Online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="590"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
         <source>Connecting...</source>
-        <translation type="unfinished"/>
+        <translation>Ansluter…</translation>
     </message>
     <message>
-        <location filename="../src/AccountDelegate.cpp" line="595"/>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
         <source>Offline</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Tomahawk::Accounts::GoogleWrapper</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="82"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
         <source>Configure this Google Account</source>
-        <translation type="unfinished"/>
+        <translation>Konfigurera Google-konto</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
         <source>Google Address</source>
-        <translation type="unfinished"/>
+        <translation>Google-adress</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="84"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
         <source>Enter your Google login to connect with your friends using Tomahawk!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="85"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
         <source>username@gmail.com</source>
-        <translation type="unfinished"/>
+        <translation>användarnamn@gmail.com</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.h" line="42"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
         <source>Connect to Google Talk to find your friends</source>
         <translation type="unfinished"/>
     </message>
@@ -1498,20 +1860,20 @@
 <context>
     <name>Tomahawk::Accounts::GoogleWrapperSip</name>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="61"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
         <source>Add Friend</source>
-        <translation type="unfinished"/>
+        <translation>Lägg till vän</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/googlewrapper/googlewrapper.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
         <source>Enter Google Address:</source>
-        <translation type="unfinished"/>
+        <translation>Ange Google-adress:</translation>
     </message>
 </context>
 <context>
     <name>Tomahawk::Accounts::LastFmAccountFactory</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmAccount.h" line="47"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
         <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
         <translation type="unfinished"/>
     </message>
@@ -1519,26 +1881,104 @@
 <context>
     <name>Tomahawk::Accounts::LastFmConfig</name>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="108"/>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="123"/>
-        <source>Failed</source>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="113"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
+        <source>Failed</source>
+        <translation>Misslyckades</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/LastFmConfig.cpp" line="129"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
         <source>Could not contact server</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
     <message>
-        <location filename="../src/accounts/spotify/SpotifyAccount.h" line="44"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
         <source>Play music from and sync your playlists with Spotify Premium</source>
         <translation type="unfinished"/>
     </message>
@@ -1546,7 +1986,7 @@
 <context>
     <name>Tomahawk::Accounts::TwitterAccountFactory</name>
     <message>
-        <location filename="../src/accounts/twitter/twitteraccount.h" line="50"/>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
         <source>Connect to your Twitter followers.</source>
         <translation type="unfinished"/>
     </message>
@@ -1554,125 +1994,125 @@
 <context>
     <name>Tomahawk::Accounts::TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="58"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="141"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="189"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
         <source>Tweet!</source>
-        <translation type="unfinished"/>
+        <translation>Twittra</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="66"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="167"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
         <source>Status: No saved credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="67"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="92"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="168"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
         <source>Authenticate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="74"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="136"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
         <source>Status: Credentials saved for %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="75"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
         <source>De-authenticate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>Tweetin&apos; Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="122"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
         <source>The credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="152"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
         <source>Status: Error validating credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="179"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
         <source>Global Tweet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="184"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
         <source>Direct Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="185"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
         <source>Send Message!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="186"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
         <source>@Mention</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="187"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
         <source>Send Mention!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="200"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
         <source>You must enter a user name for this type of tweet.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="211"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
         <source>Your saved credentials could not be loaded.
 You may wish to try re-authenticating.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="229"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
         <source>Your saved credentials could not be verified.
 You may wish to try re-authenticating.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="271"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="290"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
         <source>There was an error posting your status -- sorry!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Tweeted!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
         <source>Your tweet has been posted!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="280"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
         <source>There was an error posting your direct message -- sorry!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
         <source>Your message has been posted!</source>
         <translation type="unfinished"/>
     </message>
@@ -1680,7 +2120,7 @@
 <context>
     <name>Tomahawk::Accounts::XmppAccountFactory</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppaccount.h" line="51"/>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
         <source>Log on to your Jabber/XMPP account to connect to your friends</source>
         <translation type="unfinished"/>
     </message>
@@ -1688,7 +2128,7 @@
 <context>
     <name>Tomahawk::Accounts::ZeroconfFactory</name>
     <message>
-        <location filename="../src/accounts/zeroconf/zeroconfaccount.h" line="42"/>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
         <source>Automatically connect to Tomahawks on the local network</source>
         <translation type="unfinished"/>
     </message>
@@ -1696,93 +2136,113 @@
 <context>
     <name>Tomahawk::ContextMenu</name>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="79"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
         <source>&amp;Play</source>
         <translation>Spela &amp;upp</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="82"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="142"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="181"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
         <source>Add to &amp;Queue</source>
         <translation>Lägg till i &amp;kö</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="87"/>
-        <source>&amp;Continue playback after this track</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="89"/>
-        <source>&amp;Stop playback after this track</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="96"/>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="277"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
         <source>&amp;Love</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="105"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
         <source>&amp;Copy Track Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="139"/>
-        <source>Show &amp;Album page</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="178"/>
-        <source>Show &amp;Artist page</source>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="272"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
         <source>Un-&amp;Love</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Items</source>
         <translation>&amp;Ta bort objekt</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/contextmenu.cpp" line="110"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
         <source>&amp;Delete Item</source>
         <translation>&amp;Ta bort objekt</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Tomahawk::CustomPlaylistView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="123"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
         <source>Top Loved Tracks</source>
         <translation>Mest älskade spår</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="127"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
         <source>Your loved tracks</source>
         <translation>Dina älskade spår</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="129"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
         <source>%1&apos;s loved tracks</source>
         <translation>Älskade spår för %1</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="138"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
         <source>The most loved tracks from all your friends</source>
         <translation>De mest älskade spåren från alla dina vänner</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="142"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
         <source>All of your loved tracks</source>
         <translation>Alla dina älskade spår</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/customplaylistview.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
         <source>All of %1&apos;s loved tracks</source>
         <translation>Alla spår som %1 älskar</translation>
     </message>
@@ -1790,12 +2250,32 @@
 <context>
     <name>Tomahawk::DropJobNotifier</name>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="102"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
         <source>Fetching %1 from database</source>
         <translation>Hämtar %1 från databasen</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/dropjobnotifier.cpp" line="106"/>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
         <source>Parsing %1 %2</source>
         <translation>Tolkar %1 %2</translation>
     </message>
@@ -1803,7 +2283,7 @@
 <context>
     <name>Tomahawk::DynamicControlList</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
         <source>Click to collapse</source>
         <translation>Klicka för att fälla in</translation>
     </message>
@@ -1840,17 +2320,17 @@
 <context>
     <name>Tomahawk::DynamicView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
         <source>Add some filters above to seed this station!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="149"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
         <source>Press Generate to get started!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="151"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
         <source>Add some filters above, and press Generate to get started!</source>
         <translation type="unfinished"/>
     </message>
@@ -2170,97 +2650,97 @@
 <context>
     <name>Tomahawk::EchonestSteerer</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="57"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
         <source>Steer this station:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="71"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
         <source>Much less</source>
         <translation>Mycket mindre</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="72"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
         <source>Less</source>
         <translation>Mindre</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="73"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
         <source>A bit less</source>
         <translation>Lite mindre</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="74"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
         <source>Keep at current</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="75"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
         <source>A bit more</source>
         <translation>Lite mer</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="76"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
         <source>More</source>
         <translation>Mer</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="77"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
         <source>Much more</source>
         <translation>Mycket mer</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="80"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
         <source>Tempo</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
         <source>Loudness</source>
         <translation>Loudness</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
         <source>Danceability</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
         <source>Energy</source>
         <translation>Energi</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
         <source>Song Hotttnesss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
         <source>Artist Hotttnesss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
         <source>Artist Familiarity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
         <source>By Description</source>
         <translation>Efter beskrivning</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
         <source>Enter a description</source>
         <translation>Ange en beskrivning</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="102"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
         <source>Apply steering command</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="108"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
         <source>Reset all steering commands</source>
         <translation type="unfinished"/>
     </message>
@@ -2268,7 +2748,7 @@
 <context>
     <name>Tomahawk::GroovesharkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/groovesharkparser.cpp" line="255"/>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
         <source>Error fetching Grooveshark information from the network!</source>
         <translation type="unfinished"/>
     </message>
@@ -2276,58 +2756,87 @@
 <context>
     <name>Tomahawk::InfoSystem::ChartsPlugin</name>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="307"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
         <source>Top Overall</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="396"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
         <source>Artists</source>
         <translation>Artister</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="398"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
         <source>Albums</source>
         <translation>Album</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/infosystem/infoplugins/generic/chartsplugin.cpp" line="400"/>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
         <source>Tracks</source>
         <translation>Spår</translation>
     </message>
 </context>
 <context>
-    <name>Tomahawk::InfoSystem::LastFmPlugin</name>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="401"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
         <source>Top Tracks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="404"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
         <source>Loved Tracks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="407"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
         <source>Hyped Tracks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="413"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
         <source>Top Artists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/lastfm/lastfmplugin.cpp" line="416"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
         <source>Hyped Artists</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>Tomahawk::ItunesParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/itunesparser.cpp" line="170"/>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
         <source>Error fetching iTunes information from the network!</source>
         <translation type="unfinished"/>
     </message>
@@ -2335,27 +2844,27 @@
 <context>
     <name>Tomahawk::JSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="137"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
         <source>New Playlist</source>
         <translation>Ny spellista</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Failed to save tracks</source>
         <translation>Misslyckades med att spara spår</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="163"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>XSPF Error</source>
         <translation>XSPF-fel</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/jspfloader.cpp" line="182"/>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>Detta är inte en giltig XSPF-spellista.</translation>
     </message>
@@ -2377,37 +2886,37 @@
 <context>
     <name>Tomahawk::Query</name>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="637"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="645"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
         <source>You</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="647"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
         <source>you</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>and</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../src/libtomahawk/query.cpp" line="656"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
         <source>%n other(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="659"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
         <source>%1 people</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/query.cpp" line="661"/>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
         <source>loved this track</source>
         <translation type="unfinished"/>
     </message>
@@ -2415,7 +2924,7 @@
 <context>
     <name>Tomahawk::RdioParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/rdioparser.cpp" line="193"/>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
         <source>Error fetching Rdio information from the network!</source>
         <translation type="unfinished"/>
     </message>
@@ -2423,7 +2932,7 @@
 <context>
     <name>Tomahawk::ShortenedLinkParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/shortenedlinkparser.cpp" line="96"/>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
         <source>Network error parsing shortened link!</source>
         <translation type="unfinished"/>
     </message>
@@ -2431,49 +2940,67 @@
 <context>
     <name>Tomahawk::Source</name>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="242"/>
-        <location filename="../src/libtomahawk/source.cpp" line="293"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
         <source>Scanning (%L1 tracks)</source>
         <translation>Söker igenom (%L1 spår)</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="244"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
         <source>Scanning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="278"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
         <source>Checking</source>
         <translation>Kontrollerar</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="283"/>
-        <source>Fetching</source>
-        <translation>Hämtar</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="288"/>
-        <source>Parsing</source>
-        <translation>Tolkar</translation>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/source.cpp" line="417"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
         <source>Saving (%1%)</source>
         <translation>Sparar (%1%)</translation>
     </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>Tomahawk::SpotifyParser</name>
     <message>
-        <location filename="../src/libtomahawk/utils/spotifyparser.cpp" line="224"/>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
         <source>Error fetching Spotify information from the network!</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>TomahawkApp</name>
     <message>
-        <location filename="../src/tomahawkapp.cpp" line="534"/>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
         <source>My Collection</source>
         <translation type="unfinished"/>
     </message>
@@ -2481,12 +3008,12 @@
 <context>
     <name>TomahawkOAuthTwitter</name>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>Twitter PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/tomahawkoauthtwitter.cpp" line="39"/>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
         <source>After authenticating on Twitter's web site,
 enter the displayed PIN number here:</source>
         <translation type="unfinished"/>
@@ -2495,464 +3022,466 @@
 <context>
     <name>TomahawkTrayIcon</name>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="59"/>
-        <location filename="../src/tomahawktrayicon.cpp" line="93"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
         <source>Hide Tomahawk Window</source>
         <translation>Dölj Tomahawk-fönstret</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="98"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
         <source>Show Tomahawk Window</source>
         <translation>Visa Tomahawk-fönstret</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="158"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
         <source>Currently not playing.</source>
         <translation>Spelar ingenting för närvarande.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="219"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
         <source>Play</source>
         <translation>Spela upp</translation>
     </message>
     <message>
-        <location filename="../src/tomahawktrayicon.cpp" line="226"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
         <source>Pause</source>
         <translation>Paus</translation>
     </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>TomahawkWindow</name>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="14"/>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
         <source>Tomahawk</source>
         <translation>Tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="75"/>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
         <source>&amp;Settings</source>
         <translation>&amp;Inställningar</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="81"/>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
         <source>&amp;Controls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="100"/>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
         <source>&amp;Network</source>
         <translation>&amp;Nätverk</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="107"/>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
         <source>&amp;Window</source>
         <translation>&amp;Fönster</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="114"/>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="128"/>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
         <source>&amp;Quit</source>
         <translation>A&amp;vsluta</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="131"/>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="139"/>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
         <source>Go &amp;Online</source>
         <translation>A&amp;nslut</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="144"/>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
         <source>Add &amp;Friend...</source>
         <translation>Lägg till &amp;vän...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="149"/>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
         <source>U&amp;pdate Collection</source>
         <translation>U&amp;ppdatera samling</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="152"/>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
         <source>Update Collection</source>
         <translation>Uppdatera samling</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="157"/>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
         <source>&amp;Configure Tomahawk...</source>
         <translation>&amp;Konfigurera Tomahawk...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="165"/>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
         <source>Load &amp;XSPF...</source>
         <translation>Läs in &amp;XSPF...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="170"/>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
         <source>Create &amp;New Playlist...</source>
         <translation>Skapa &amp;ny spellista...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="175"/>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
         <source>About &amp;Tomahawk...</source>
         <translation>Om &amp;Tomahawk...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="183"/>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
         <source>Create New &amp;Automatic Playlist</source>
         <translation>Skapa ny a&amp;utomatisk spellista</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="188"/>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
         <source>Create New &amp;Station</source>
         <translation>Skapa ny &amp;station</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="196"/>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
         <source>Show Offline Sources</source>
         <translation>Visa frånkopplade källor</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="201"/>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
         <source>Hide Offline Sources</source>
         <translation>Dölj frånkopplade källor</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="206"/>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
         <source>Minimize</source>
         <translation>Minimera</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="209"/>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="214"/>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="217"/>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
         <source>Meta+Ctrl+Z</source>
         <translation>Meta+Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="222"/>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
         <source>Diagnostics...</source>
         <translation>Diagnostik...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="230"/>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
         <source>Fully &amp;Rescan Collection</source>
         <translation>Sök &amp;igenom hela samlingen igen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="233"/>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
         <source>Fully Rescan Collection</source>
         <translation>Sök igenom hela samlingen igen</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="238"/>
-        <location filename="../src/tomahawkwindow.cpp" line="676"/>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
         <source>Play</source>
         <translation>Spela upp</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="241"/>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
         <source>Space</source>
         <translation>Blanksteg</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="246"/>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
         <source>Previous</source>
         <translation>Föregående</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.ui" line="251"/>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
         <source>Next</source>
         <translation>Nästa</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="219"/>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
         <source>Global Search...</source>
         <translation>Global sökning...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="270"/>
-        <location filename="../src/tomahawkwindow.cpp" line="287"/>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
         <source>Check For Updates...</source>
         <translation>Leta efter uppdateringar...</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="449"/>
-        <location filename="../src/tomahawkwindow.cpp" line="456"/>
-        <location filename="../src/tomahawkwindow.cpp" line="464"/>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
         <source>Connect To Peer</source>
         <translation>Anslut till klient</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="450"/>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
         <source>Enter peer address:</source>
         <translation>Ange klientadress:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="457"/>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
         <source>Enter peer port:</source>
         <translation>Ange klientport:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="465"/>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
         <source>Enter peer key:</source>
         <translation>Ange klientnyckel:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>XSPF Error</source>
         <translation>XSPF-fel</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="561"/>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
         <source>This is not a valid XSPF playlist.</source>
         <translation>Detta är inte en giltig XSPF-spellista.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Failed to save tracks</source>
         <translation>Misslyckades med att spara spår</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="565"/>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
         <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
         <translation>Några spår i spellistan innehåller inte någon artist och titel. De kommer att ignoreras.</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="579"/>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="581"/>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
         <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Create New Station</source>
         <translation>Skapa ny station</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="614"/>
-        <source>New Station</source>
-        <translation>Ny station</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="650"/>
-        <source>New Playlist</source>
-        <translation>Ny spellista</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="668"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
         <source>Pause</source>
         <translation>Paus</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="691"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
         <source>Go &amp;offline</source>
         <translation>Koppla &amp;från</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="698"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
         <source>Go &amp;online</source>
         <translation>A&amp;nslut</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="720"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
         <source>Authentication Error</source>
         <translation>Autentiseringsfel</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="735"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
         <source>%1 by %2</source>
         <comment>track, artist name</comment>
         <translation>%1 av %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="736"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
         <source>%1 - %2</source>
         <comment>current track, some window title</comment>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="747"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="751"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
         <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="755"/>
-        <source>Copyright 2010 - 2012&lt;br/&gt;Christian Muehlhaeuser &amp;lt;muesli@tomahawk-player.org&amp;gt;&lt;br/&gt;&lt;br/&gt;Thanks to: Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&amp;ouml;m, Michael Zanetti, Harald Sitter and Steve Robertson</source>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/tomahawkwindow.cpp" line="758"/>
-        <source>About Tomahawk</source>
-        <translation>Om Tomahawk</translation>
-    </message>
-</context>
-<context>
-    <name>TopBar</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="26"/>
-        <source>Form</source>
-        <translation>Formulär</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="66"/>
-        <source>0 Sources</source>
-        <translation>0 källor</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="89"/>
-        <source>0 Tracks</source>
-        <translation>0 spår</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="112"/>
-        <source>0 Artists</source>
-        <translation>0 artister</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.ui" line="135"/>
-        <source>0 Shown</source>
-        <translation>0 visade</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="49"/>
-        <source>Tracks</source>
-        <translation>Spår</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="50"/>
-        <source>Artists</source>
-        <translation>Artister</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="54"/>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="84"/>
-        <source>Artist View</source>
-        <translation>Artistvy</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="85"/>
-        <source>Flat View</source>
-        <translation>Platt vy</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="195"/>
-        <source>Sources</source>
-        <translation>Källor</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/topbar/topbar.cpp" line="247"/>
-        <source>Shown</source>
-        <translation>Visade</translation>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TopTracksContext</name>
     <message>
-        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="48"/>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
         <source>Top Hits</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>TrackModel</name>
-    <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Artist</source>
-        <translation>Artist</translation>
-    </message>
+    <name>TrackInfoWidget</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Title</source>
-        <translation>Titel</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Album</source>
-        <translation>Album</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
         <source>Track</source>
-        <translation>Spår</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Duration</source>
-        <translation>Speltid</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Bitrate</source>
-        <translation>Bitfrekvens</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Age</source>
-        <translation>Ålder</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Year</source>
-        <translation>År</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Size</source>
-        <translation>Storlek</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Origin</source>
-        <translation>Källa</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Score</source>
-        <translation>Betyg</translation>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackmodel.cpp" line="248"/>
-        <source>Composer</source>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrackView</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/trackview.cpp" line="493"/>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
         <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
         <translation>Entschuldige, dein Filter &apos;%1&apos; erzeugte keine Ergebnisse.</translation>
     </message>
@@ -2973,7 +3502,7 @@
 <context>
     <name>TreeItemDelegate</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treeitemdelegate.cpp" line="132"/>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Okänt</translation>
     </message>
@@ -2981,92 +3510,60 @@
 <context>
     <name>TreeModel</name>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Name</source>
-        <translation>Namn</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Duration</source>
-        <translation>Speltid</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Bitrate</source>
-        <translation>Bitfrekvens</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Age</source>
-        <translation>Ålder</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Year</source>
-        <translation>År</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Size</source>
-        <translation>Storlek</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Origin</source>
-        <translation>Källa</translation>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="369"/>
-        <source>Composer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="585"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
         <source>All Artists</source>
         <translation>Alla artister</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="699"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="724"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
         <source>My Collection</source>
         <translation>Min samling</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="701"/>
-        <location filename="../src/libtomahawk/playlist/treemodel.cpp" line="726"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
         <source>Collection of %1</source>
         <translation>Samling av %1</translation>
     </message>
 </context>
 <context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>TwitterConfigWidget</name>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="73"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
         <source>Configure this Twitter account</source>
         <translation>Konfigurera detta Twitter-konto</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="119"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
         <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="137"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
         <source>Status: No saved credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="166"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
         <source>Authenticate with Twitter</source>
         <translation>Autentisera med Twitter</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="196"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
         <source>Twitter Connections</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
         <source>
 If you only want to post tweets, you're done.
 
@@ -3076,32 +3573,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="244"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
         <source>Select the kind of tweet you would like, then press the button to post it:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="276"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
         <source>Global Tweet</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="281"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
         <source>@Mention</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="286"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
         <source>Direct Message</source>
         <translation>Direktmeddelande</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="322"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
         <source>e.g. @tomahawk</source>
         <translation>t.ex. @tomahawk</translation>
     </message>
     <message>
-        <location filename="../src/accounts/twitter/twitterconfigwidget.ui" line="351"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
         <source>Send Message</source>
         <translation>Skicka meddelande</translation>
     </message>
@@ -3109,45 +3606,60 @@
 <context>
     <name>ViewManager</name>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="383"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
         <source>SuperCollection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="384"/>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
         <source>Combined libraries of all your online friends</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/viewmanager.cpp" line="385"/>
-        <source>All available albums</source>
-        <translation>Alla tillgängliga album</translation>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>WelcomeWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="34"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
         <source>Recent Additions</source>
         <translation>Senaste tillägg</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="55"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
         <source>Newest Stations &amp; Playlists</source>
         <translation>Nyaste stationer och spellistor</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.ui" line="70"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
         <source>Recently Played Tracks</source>
         <translation>Senaste spelade spår</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.cpp" line="152"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
         <source>No recently created playlists in your network.</source>
         <translation>Inga skapade spellistor i ditt nätverk på sistone.</translation>
     </message>
     <message>
-        <location filename="../src/libtomahawk/widgets/welcomewidget.h" line="90"/>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
         <source>Welcome to Tomahawk</source>
         <translation>Välkommen till Tomahawk</translation>
     </message>
@@ -3155,7 +3667,7 @@
 <context>
     <name>WhatsHotWidget</name>
     <message>
-        <location filename="../src/libtomahawk/widgets/whatshotwidget.h" line="72"/>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
         <source>Charts</source>
         <translation>Topplistor</translation>
     </message>
@@ -3171,33 +3683,33 @@
 <context>
     <name>XMPPBot</name>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="312"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
         <source>
 Terms for %1:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="314"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
         <source>No terms found, sorry.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="347"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
         <source>
 Hotttness for %1: %2
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="363"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
         <source>
 Familiarity for %1: %2
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/xmppbot/xmppbot.cpp" line="381"/>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
         <source>
 Lyrics for &quot;%1&quot; by %2:
 
@@ -3209,22 +3721,22 @@
 <context>
     <name>XSPFLoader</name>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="49"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
         <source>Failed to parse contents of XSPF playlist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="51"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
         <source>Some playlist entries were found without artist and track name, they will be omitted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="53"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
         <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/libtomahawk/utils/xspfloader.cpp" line="188"/>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
         <source>New Playlist</source>
         <translation>Ny spellista</translation>
     </message>
@@ -3232,78 +3744,78 @@
 <context>
     <name>XmlConsole</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
         <source>Xml stream console</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="33"/>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="60"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
         <source>Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.ui" line="43"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
         <source>Save log</source>
         <translation>Spara logg</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="62"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
         <source>Disabled</source>
         <translation>Inaktiverad</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="65"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
         <source>By JID</source>
         <translation>Efter JID</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="68"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
         <source>By namespace uri</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="71"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
         <source>By all attributes</source>
         <translation>Efter alla attribut</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="76"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
         <source>Visible stanzas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="79"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
         <source>Information query</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="83"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
         <source>Message</source>
         <translation>Meddelande</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="87"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
         <source>Presence</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="91"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
         <source>Custom</source>
         <translation>Anpassad</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="107"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="358"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
         <source>Save XMPP log to file</source>
         <translation>Spara XMPP-logg till fil</translation>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmlconsole.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
         <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
         <translation>OpenDocument-format (*.odf);;HTML-fil (*.html);;Vanlig text (*.txt)</translation>
     </message>
@@ -3311,72 +3823,72 @@
 <context>
     <name>XmppConfigWidget</name>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="14"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
         <source>Xmpp Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="52"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
         <source>Configure this Xmpp account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="89"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
         <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="111"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
         <source>Login Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="131"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
         <source>Xmpp ID:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="147"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
         <source>e.g. user@example.com</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="160"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
         <source>Password:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="188"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
         <source>An account with this name already exists!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="210"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
         <source>Advanced Xmpp Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="230"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
         <source>Server:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="253"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
         <source>Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="299"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
         <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="302"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
         <source>Publish currently playing track</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/xmppconfigwidget.ui" line="309"/>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
         <source>Enforce secure connection</source>
         <translation type="unfinished"/>
     </message>
@@ -3384,130 +3896,130 @@
 <context>
     <name>XmppSipPlugin</name>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="359"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
         <source>User Interaction</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="362"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
         <source>Host is unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="365"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
         <source>Item not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="368"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
         <source>Authorization Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="371"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
         <source>Remote Stream Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="374"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
         <source>Remote Connection failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="377"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
         <source>Internal Server Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="380"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
         <source>System shutdown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="383"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
         <source>Conflict</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="387"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="391"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
         <source>No Compression Support</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="395"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
         <source>No Encryption Support</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="399"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
         <source>No Authorization Support</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="403"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
         <source>No Supported Feature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="500"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
         <source>Add Friend</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="501"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
         <source>Enter Xmpp ID:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="617"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
         <source>Add Friend...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="622"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
         <source>XML Console...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="670"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
         <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="768"/>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
         <source>Authorize User</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../src/accounts/xmpp/sip/xmppsip.cpp" line="769"/>
-        <source>Do you want to grant &lt;b&gt;%1&lt;/b&gt; access to your Collection?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>ZeroconfConfig</name>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="14"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="55"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
         <source>Local Network configuration</source>
         <translation>Lokal nätverkskonfiguration</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="77"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
         <source>This plugin will automatically find other users running Tomahawk on your local network</source>
         <translation>Denna insticksmodul hittar automatiskt andra användare som kör Tomahawk på ditt lokala nätverk</translation>
     </message>
     <message>
-        <location filename="../src/accounts/zeroconf/configwidget.ui" line="84"/>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
         <source>Connect automatically when Tomahawk starts</source>
         <translation>Anslut automatiskt när Tomahawk startar</translation>
     </message>

tomahawk-0.5.5.tar.bz2/lang/tomahawk_tr.ts Added

@@ -0,0 +1,4026 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.0">
+<context>
+    <name>ACLJobDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>İletişim Kutusu</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
+        <source>Description goes here</source>
+        <translation>Buraya açıklama gelecek</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
+        <source>Add Account</source>
+        <translation>Hesap Ekle</translation>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapperDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
+        <source>Online</source>
+        <translation>Çevrimiçi</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
+        <source>Connecting...</source>
+        <translation>Bağlanıyor...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
+        <source>Offline</source>
+        <translation>Çevrimdışı</translation>
+    </message>
+</context>
+<context>
+    <name>ActionCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
+        <source>&amp;Listen Along</source>
+        <translation>&amp;Birlikte Dinle</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
+        <source>Stop &amp;Listening Along</source>
+        <translation>&amp;Birlikte Dinlemeyi Durdur</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
+        <source>&amp;Follow in real-time</source>
+        <translation>&amp;Gerçek zamanlı takip et</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Privately</source>
+        <translation>&amp;Gizli Dinle</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Publicly</source>
+        <translation>&amp;Yayınlayarak Dinle</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
+        <source>&amp;Load Playlist</source>
+        <translation>&amp;Şarkı Listesini Yükle</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
+        <source>&amp;Rename Playlist</source>
+        <translation>&amp;Şarkı Listesini Yeniden Adlandır</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
+        <source>&amp;Copy Playlist Link</source>
+        <translation>&amp;Şarkı Listesinin Bağlantısını Kopyala</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
+        <source>&amp;Play</source>
+        <translation>&amp;Yürüt</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
+        <source>&amp;Stop</source>
+        <translation>&amp;Durdur</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
+        <source>&amp;Previous Track</source>
+        <translation>&amp;Önceki Parça</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
+        <source>&amp;Next Track</source>
+        <translation>&amp;Sonraki Parça</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Çıkış</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="31"/>
+        <source>Other Albums by Artist</source>
+        <translation>Sanatçının Diğer Albümleri</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
+        <source>Other Albums by %1</source>
+        <translation>Diğer %1 Albümleri</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
+        <source>All albums from %1</source>
+        <translation>Bütün %1 albümleri</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
+        <source>All albums</source>
+        <translation>Bütün albümler</translation>
+    </message>
+</context>
+<context>
+    <name>ArtistInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
+        <source>Top Hits</source>
+        <translation>En Çok Dinlenenler</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
+        <source>Related Artists</source>
+        <translation>Benzer Sanatçılar</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>Albümler</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AudioControls</name>
+    <message>
+        <location filename="../src/AudioControls.ui" line="75"/>
+        <source>Prev</source>
+        <translation>Geri</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="87"/>
+        <source>Play</source>
+        <translation>Yürüt</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="94"/>
+        <source>Pause</source>
+        <translation>Duraklat</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="103"/>
+        <source>Next</source>
+        <translation>Sonraki</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="229"/>
+        <source>Artist</source>
+        <translation>Sanatçı</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="248"/>
+        <source>Album</source>
+        <translation>Albüm</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="277"/>
+        <source>Owner</source>
+        <translation>Sahibi</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
+        <source>love</source>
+        <translation>beğen</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="383"/>
+        <source>Time</source>
+        <translation>Süre</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="412"/>
+        <source>Time Left</source>
+        <translation>Kalan Süre</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="493"/>
+        <source>Shuffle</source>
+        <translation>Karışık</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="506"/>
+        <source>Repeat</source>
+        <translation>Yenile</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="544"/>
+        <source>Low</source>
+        <translation>Düşük</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="576"/>
+        <source>High</source>
+        <translation>Yüksek</translation>
+    </message>
+</context>
+<context>
+    <name>AudioEngine</name>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CategoryAddItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>New Station</source>
+        <translation>Yeni İstasyon</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>%1 Station</source>
+        <translation>%1 İstasyon</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
+        <source>Playlists</source>
+        <translation>Şarkı Listeleri</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
+        <source>Stations</source>
+        <translation>İstasyonlar</translation>
+    </message>
+</context>
+<context>
+    <name>ClearButton</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
+        <source>Clear</source>
+        <translation>Temizle</translation>
+    </message>
+</context>
+<context>
+    <name>ContextWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>BilgiÇubuğu</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
+        <source>Show Footnotes</source>
+        <translation>Dipnotları Göster</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
+        <source>Hide Footnotes</source>
+        <translation>Dipnotları Gizle</translation>
+    </message>
+</context>
+<context>
+    <name>CrashReporter</name>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="23"/>
+        <source>Tomahawk Crash Reporter</source>
+        <translation>Tomahawk Çökme Raporcusu</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
+        <source>Abort</source>
+        <translation>Vazgeç</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
+        <source>You can disable sending crash reports in the configuration dialog.</source>
+        <translation>Çökme raporu göndermeyi yapılandırma iletişim kutusundan devre dışı bırakabilirsiz.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
+        <source>Uploaded %L1 of %L2 KB.</source>
+        <translation> %L2 içinden %L1 KB karşıya yüklendin.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <source>Close</source>
+        <translation>Kapat.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
+        <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
+        <translation>Gönderildi! &lt;b&gt;Çok teşekkürler.&lt;/b&gt;.</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
+        <source>Failed to send crash info.</source>
+        <translation>Çökme bilgisi gönderimi başarısız.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseCommand_AllAlbums</name>
+    <message>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
+        <source>Unknown</source>
+        <translation>Bilinmeyen</translation>
+    </message>
+</context>
+<context>
+    <name>DelegateConfigWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
+        <source>Delete Account</source>
+        <translation>Hesabı Sil</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiagnosticsDialog</name>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
+        <source>Tomahawk Diagnostics</source>
+        <translation>Tomahawk Tanılama</translation>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobalSearchWidget</name>
+    <message>
+        <location filename="../src/SearchBox.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+</context>
+<context>
+    <name>IndexingJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
+        <source>Indexing database</source>
+        <translation>Veritabanı dizini oluşturuluyor</translation>
+    </message>
+</context>
+<context>
+    <name>InfoBar</name>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>BilgiÇubuğu</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
+        <source>Filter...</source>
+        <translation>Filtre...</translation>
+    </message>
+</context>
+<context>
+    <name>LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <source>Scrobble tracks to Last.fm</source>
+        <translation>Dinlediğim şarkıların bilgisini Last.fm&apos;e gönder.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <source>Username:</source>
+        <translation>Kullanıcı adı:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <source>Password:</source>
+        <translation>Parola:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <source>Test Login</source>
+        <translation>Bilgileri Test Et</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LastfmContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="67"/>
+        <source>Last.fm</source>
+        <translation>Last.fm</translation>
+    </message>
+</context>
+<context>
+    <name>LatchedStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoadXSPF</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="14"/>
+        <source>Load XSPF</source>
+        <translation>XSPF Yükle</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="22"/>
+        <source>Playlist URL</source>
+        <translation>Şarkı Listesi URL&apos;si</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="29"/>
+        <source>Enter URL...</source>
+        <translation>URL Girin...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="42"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="51"/>
+        <source>Automatically update</source>
+        <translation>Otomatik güncelle</translation>
+    </message>
+</context>
+<context>
+    <name>LoadXSPFDialog</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>Load XSPF File</source>
+        <translation>XSPF Dosyası Yükle</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>XSPF Files (*.xspf)</source>
+        <translation>XSPF Dosyaları (*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>LocalCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Bookmarks</source>
+        <translation>Sık Kullanılanlar</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Saved tracks</source>
+        <translation>Kaydedilen parçalar</translation>
+    </message>
+</context>
+<context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
+        <source>Enter a title for the new playlist:</source>
+        <translation>Yeni şarkı listesi için bir başlık girin:</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
+        <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
+        <translation>Tomahawk şarkı listeleri yaratmak ve zevk alacağınız şarkılar bulmanıza yardımcı olmak için çeşitli yollar sunar!</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
+        <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>Bir tarz yada etiket girin ve Tomahawk size yeni şarkı listenizi başlatmak için birkaç şarkı sunacak.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
+        <source>&amp;Create Playlist</source>
+        <translation>&amp;Şarkı Listesi Yarat</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
+        <source>Create a new playlist</source>
+        <translation>Yeni şarkı listesi yarat</translation>
+    </message>
+</context>
+<context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
+        <source>played %1 by you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
+        <source>played %1 by %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistLargeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <source>played %1 by you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
+        <source>played %1 by %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
+        <source>added %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
+        <source>A playlist by %1, created %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
+        <source>you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
+        <source>All tracks by %1 on album %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
+        <source>All tracks by %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistTypeSelectorDlg</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
+        <source>New Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
+        <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
+        <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
+        <source>Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
+        <source>New Playlist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
+        <source>Create Manual Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
+        <source>Create Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
+        <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ProxyDialog</name>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
+        <source>Proxy Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
+        <source>Hostname of proxy server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
+        <source>Proxy login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
+        <source>User</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
+        <source>Proxy password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
+        <source>No Proxy Hosts:
+(Overrides system proxy)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
+        <source>localhost *.example.com (space separated)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
+        <source>Use proxy for DNS lookups?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
+        <source>%n year(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
+        <source>%n month(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
+        <source>%n week(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
+        <source>%n week(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
+        <source>%n day(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
+        <source>%n hour(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
+        <source>%1 minutes ago</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
+        <source>%1 minutes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
+        <source>just now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <source>Friend Finders</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
+        <source>Music Finders</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
+        <source>Status Updaters</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFilePrivate</name>
+    <message>
+        <location filename="../src/libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QueueView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RelatedArtistsContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
+        <source>Related Artists</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ResolverConfigDelegate</name>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
+        <source>Not found: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
+        <source>Failed to load: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
+        <source>Search: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
+        <source>Results for &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
+        <source>Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
+        <source>All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
+        <source>Services</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
+        <source>Install resolver from file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SocialPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="34"/>
+        <source>Popular New Albums From Your Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="48"/>
+        <source>Most Played Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="63"/>
+        <source>Most Played Tracks You Don&apos;t Have</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceDelegate</name>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
+        <source>Local</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
+        <source>Top 10</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
+        <source>All available tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
+        <source>Hide</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
+        <source>Recent Albums</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
+        <source>Latest Additions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
+        <source>New Additions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
+        <source>My recent activity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
+        <source>Recent activity from %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
+        <source>Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
+        <source>Latest Additions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
+        <source>Recently Played</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceTreeView</name>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
+        <source>&amp;Copy Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
+        <source>&amp;Delete %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
+        <source>&amp;Export Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
+        <source>Save XSPF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
+        <source>Playlists (*.xspf)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourcesModel</name>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
+        <source>Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
+        <source>Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
+        <source>Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
+        <source>Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
+        <source>Browse</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
+        <source>Search History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
+        <source>My Music</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
+        <source>SuperCollection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
+        <source>Top Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
+        <source>Dashboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
+        <source>Recently Played</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
+        <source>Charts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SpotifyConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>StackedSettingsDialog</name>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
+        <source>Tomahawk Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
+        <source>Local Music Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
+        <source>Path to scan for music files:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
+        <source>The Echo Nest supports keeping track of your catalog metadata
+ and using it to craft personalized radios. Enabling this option
+ will allow you (and all your friends) to create automatic playlists
+ and stations based on your personal taste profile.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
+        <source>Upload collection list to The Echo Nest to enable user radio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
+        <source>Watch for changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
+        <source>Time between scans, in seconds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
+        <source>Static Host Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
+        <source>Static Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
+        <source>Proxy Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
+        <source>Send reports after Tomahawk crashed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
+        <source>%1 downloads</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
+        <source>Offline</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapper</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
+        <source>Configure this Google Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
+        <source>Google Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
+        <source>Enter your Google login to connect with your friends using Tomahawk!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
+        <source>username@gmail.com</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
+        <source>Connect to Google Talk to find your friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperSip</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
+        <source>Add Friend</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
+        <source>Enter Google Address:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
+        <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
+        <source>Failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
+        <source>Success</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
+        <source>Could not contact server</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
+        <source>Play music from and sync your playlists with Spotify Premium</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
+        <source>Connect to your Twitter followers.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
+        <source>Tweet!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
+        <source>Status: No saved credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
+        <source>Authenticate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
+        <source>Status: Credentials saved for %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
+        <source>De-authenticate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>Tweetin&apos; Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <source>The credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
+        <source>Status: Error validating credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
+        <source>Global Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
+        <source>Direct Message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
+        <source>Send Message!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
+        <source>@Mention</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
+        <source>Send Mention!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <source>You must enter a user name for this type of tweet.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <source>Your saved credentials could not be loaded.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <source>Your saved credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>There was an error posting your status -- sorry!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Tweeted!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <source>Your tweet has been posted!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <source>There was an error posting your direct message -- sorry!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Your message has been posted!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::XmppAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
+        <source>Log on to your Jabber/XMPP account to connect to your friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::ZeroconfFactory</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
+        <source>Automatically connect to Tomahawks on the local network</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ContextMenu</name>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
+        <source>&amp;Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
+        <source>Add to &amp;Queue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
+        <source>&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
+        <source>&amp;Copy Track Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Items</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Item</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::CustomPlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
+        <source>Top Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
+        <source>Your loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
+        <source>%1&apos;s loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
+        <source>The most loved tracks from all your friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
+        <source>All of your loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
+        <source>All of %1&apos;s loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DropJobNotifier</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
+        <source>Fetching %1 from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
+        <source>Parsing %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicControlList</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
+        <source>Click to collapse</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="172"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="301"/>
+        <source>Could not find a playable track.
+
+Please change the filters or try again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="230"/>
+        <source>Failed to generate preview with the desired filters</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicSetupWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="53"/>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="67"/>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
+        <source>Add some filters above to seed this station!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <source>Press Generate to get started!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
+        <source>Add some filters above, and press Generate to get started!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp" line="472"/>
+        <source>Station ran out of tracks!
+
+Try tweaking the filters for a new set of songs to play.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestControl</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="188"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="255"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="276"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="341"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="360"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="425"/>
+        <source>is</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="207"/>
+        <source>from user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="216"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="584"/>
+        <source>No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="235"/>
+        <source>similar to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>Less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>More</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>0 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>500 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>0 secs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>3600 secs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>-100 dB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>100 dB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="343"/>
+        <source>Major</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="344"/>
+        <source>Minor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
+        <source>C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
+        <source>C Sharp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
+        <source>D</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
+        <source>E Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
+        <source>E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
+        <source>F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
+        <source>F Sharp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="369"/>
+        <source>G</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="370"/>
+        <source>A Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="371"/>
+        <source>A</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="372"/>
+        <source>B Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="373"/>
+        <source>B</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
+        <source>Ascending</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="391"/>
+        <source>Descending</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="394"/>
+        <source>Tempo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="395"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="396"/>
+        <source>Loudness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="397"/>
+        <source>Artist Familiarity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
+        <source>Artist Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
+        <source>Song Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
+        <source>Latitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="401"/>
+        <source>Longitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="402"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="403"/>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="404"/>
+        <source>Energy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="405"/>
+        <source>Danceability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="744"/>
+        <source>only by ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="746"/>
+        <source>similar to ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="748"/>
+        <source>with genre ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="754"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="766"/>
+        <source>from no one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="758"/>
+        <source>My Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="762"/>
+        <source>from %1 radio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="785"/>
+        <source>with %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="787"/>
+        <source>about %1 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
+        <source>about %n minute(s) long</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
+        <source>about %1 dB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="793"/>
+        <source>at around %1%2 %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="798"/>
+        <source>in %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="803"/>
+        <source>in a %1 key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="813"/>
+        <source>sorted in %1 %2 order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="818"/>
+        <source>with a %1 mood</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="823"/>
+        <source>in a %1 style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestSteerer</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
+        <source>Steer this station:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <source>Much less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <source>Less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <source>A bit less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <source>Keep at current</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <source>A bit more</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <source>More</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <source>Much more</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
+        <source>Tempo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
+        <source>Loudness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
+        <source>Danceability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
+        <source>Energy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
+        <source>Song Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <source>Artist Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
+        <source>Artist Familiarity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
+        <source>By Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
+        <source>Enter a description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
+        <source>Apply steering command</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
+        <source>Reset all steering commands</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::GroovesharkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
+        <source>Error fetching Grooveshark information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::ChartsPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
+        <source>Top Overall</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
+        <source>Artists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
+        <source>Albums</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
+        <source>Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
+        <source>Top Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
+        <source>Hyped Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
+        <source>Top Artists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
+        <source>Hyped Artists</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ItunesParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
+        <source>Error fetching iTunes information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::JSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
+        <source>New Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Failed to save tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>XSPF Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::LatchManager</name>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="86"/>
+        <source>&amp;Catch Up</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="123"/>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="144"/>
+        <source>&amp;Listen Along</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Query</name>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
+        <source> and </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
+        <source>You</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
+        <source>you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>and</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>%n other(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
+        <source>%1 people</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
+        <source>loved this track</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::RdioParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
+        <source>Error fetching Rdio information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ShortenedLinkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
+        <source>Network error parsing shortened link!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Source</name>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
+        <source>Scanning (%L1 tracks)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
+        <source>Scanning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
+        <source>Checking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
+        <source>Saving (%1%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::SpotifyParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
+        <source>Error fetching Spotify information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkApp</name>
+    <message>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
+        <source>My Collection</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkOAuthTwitter</name>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>Twitter PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>After authenticating on Twitter's web site,
+enter the displayed PIN number here:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkTrayIcon</name>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
+        <source>Hide Tomahawk Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
+        <source>Show Tomahawk Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
+        <source>Currently not playing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
+        <source>Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkWindow</name>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
+        <source>Tomahawk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
+        <source>&amp;Controls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
+        <source>&amp;Network</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
+        <source>&amp;Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
+        <source>Go &amp;Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
+        <source>Add &amp;Friend...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
+        <source>U&amp;pdate Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
+        <source>Update Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
+        <source>&amp;Configure Tomahawk...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
+        <source>Load &amp;XSPF...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
+        <source>Create &amp;New Playlist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
+        <source>About &amp;Tomahawk...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
+        <source>Create New &amp;Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
+        <source>Create New &amp;Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
+        <source>Show Offline Sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
+        <source>Hide Offline Sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
+        <source>Minimize</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
+        <source>Ctrl+M</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
+        <source>Zoom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
+        <source>Meta+Ctrl+Z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
+        <source>Diagnostics...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
+        <source>Fully &amp;Rescan Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
+        <source>Fully Rescan Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
+        <source>Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
+        <source>Space</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
+        <source>Next</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
+        <source>Global Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
+        <source>Check For Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
+        <source>Connect To Peer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
+        <source>Enter peer address:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
+        <source>Enter peer port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
+        <source>Enter peer key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>XSPF Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Failed to save tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Create New Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
+        <source>Go &amp;offline</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
+        <source>Go &amp;online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
+        <source>Authentication Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
+        <source>%1 by %2</source>
+        <comment>track, artist name</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
+        <source>%1 - %2</source>
+        <comment>current track, some window title</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TopTracksContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
+        <source>Top Hits</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TrackInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TrackView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TransferStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>to</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TreeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TreeModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
+        <source>All Artists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
+        <source>My Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
+        <source>Collection of %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
+        <source>Configure this Twitter account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
+        <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
+        <source>Status: No saved credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
+        <source>Authenticate with Twitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
+        <source>Twitter Connections</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
+        <source>
+If you only want to post tweets, you're done.
+
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
+        <source>Select the kind of tweet you would like, then press the button to post it:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
+        <source>Global Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
+        <source>@Mention</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
+        <source>Direct Message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
+        <source>e.g. @tomahawk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
+        <source>Send Message</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ViewManager</name>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
+        <source>SuperCollection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
+        <source>Combined libraries of all your online friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
+        <source>Recent Additions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
+        <source>Newest Stations &amp; Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
+        <source>No recently created playlists in your network.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
+        <source>Welcome to Tomahawk</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WhatsHotWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
+        <source>Charts</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WikipediaContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="42"/>
+        <source>Wikipedia</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XMPPBot</name>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
+        <source>
+Terms for %1:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
+        <source>No terms found, sorry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
+        <source>
+Hotttness for %1: %2
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
+        <source>
+Familiarity for %1: %2
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
+        <source>
+Lyrics for &quot;%1&quot; by %2:
+
+%3
+</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
+        <source>Failed to parse contents of XSPF playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
+        <source>Some playlist entries were found without artist and track name, they will be omitted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
+        <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
+        <source>New Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XmlConsole</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
+        <source>Xml stream console</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
+        <source>Filter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
+        <source>Save log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
+        <source>By JID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
+        <source>By namespace uri</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
+        <source>By all attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
+        <source>Visible stanzas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
+        <source>Information query</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
+        <source>Message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
+        <source>Presence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
+        <source>Custom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
+        <source>Save XMPP log to file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
+        <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XmppConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
+        <source>Xmpp Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
+        <source>Configure this Xmpp account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
+        <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
+        <source>Login Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
+        <source>Xmpp ID:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
+        <source>e.g. user@example.com</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
+        <source>An account with this name already exists!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
+        <source>Advanced Xmpp Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
+        <source>Server:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
+        <source>Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
+        <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
+        <source>Publish currently playing track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
+        <source>Enforce secure connection</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XmppSipPlugin</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
+        <source>User Interaction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
+        <source>Host is unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
+        <source>Item not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
+        <source>Authorization Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
+        <source>Remote Stream Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
+        <source>Remote Connection failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
+        <source>Internal Server Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
+        <source>System shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
+        <source>Conflict</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
+        <source>No Compression Support</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
+        <source>No Encryption Support</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
+        <source>No Authorization Support</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
+        <source>No Supported Feature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
+        <source>Add Friend</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
+        <source>Enter Xmpp ID:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
+        <source>Add Friend...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
+        <source>XML Console...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
+        <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
+        <source>Authorize User</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ZeroconfConfig</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
+        <source>Local Network configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
+        <source>This plugin will automatically find other users running Tomahawk on your local network</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
+        <source>Connect automatically when Tomahawk starts</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/lang/tomahawk_zh_CN.ts Added

@@ -0,0 +1,4026 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.0">
+<context>
+    <name>ACLJobDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>对话框</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
+        <source>Description goes here</source>
+        <translation>注释于此处</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
+        <source>Add Account</source>
+        <translation>添加帐号</translation>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapperDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
+        <source>Online</source>
+        <translation>在线</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
+        <source>Connecting...</source>
+        <translation>连接中...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
+        <source>Offline</source>
+        <translation>离线</translation>
+    </message>
+</context>
+<context>
+    <name>ActionCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
+        <source>&amp;Listen Along</source>
+        <translation>独自收听</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
+        <source>Stop &amp;Listening Along</source>
+        <translation>停止独自收听</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
+        <source>&amp;Follow in real-time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Privately</source>
+        <translation>私下收听</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Publicly</source>
+        <translation>公开收听</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
+        <source>&amp;Load Playlist</source>
+        <translation>载入播放列表</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
+        <source>&amp;Rename Playlist</source>
+        <translation>重命名播放列表</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
+        <source>&amp;Copy Playlist Link</source>
+        <translation>复制播放列表链接</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
+        <source>&amp;Play</source>
+        <translation>播放</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
+        <source>&amp;Stop</source>
+        <translation>停止</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
+        <source>&amp;Previous Track</source>
+        <translation>上一首</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
+        <source>&amp;Next Track</source>
+        <translation>下一首</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
+        <source>&amp;Quit</source>
+        <translation>退出</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>来自</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="31"/>
+        <source>Other Albums by Artist</source>
+        <translation>艺人的其他专辑</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
+        <source>Other Albums by %1</source>
+        <translation>%1 的其他专辑</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
+        <source>All albums from %1</source>
+        <translation>来自 %1 的所有专辑</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
+        <source>All albums</source>
+        <translation>所有专辑</translation>
+    </message>
+</context>
+<context>
+    <name>ArtistInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
+        <source>Top Hits</source>
+        <translation>最热曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
+        <source>Related Artists</source>
+        <translation>相关艺人</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>专辑</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AudioControls</name>
+    <message>
+        <location filename="../src/AudioControls.ui" line="75"/>
+        <source>Prev</source>
+        <translation>上一首</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="87"/>
+        <source>Play</source>
+        <translation>播放</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="94"/>
+        <source>Pause</source>
+        <translation>暂停</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="103"/>
+        <source>Next</source>
+        <translation>下一首</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="229"/>
+        <source>Artist</source>
+        <translation>艺人</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="248"/>
+        <source>Album</source>
+        <translation>专辑</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="277"/>
+        <source>Owner</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
+        <source>love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="383"/>
+        <source>Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="412"/>
+        <source>Time Left</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="493"/>
+        <source>Shuffle</source>
+        <translation>无序播放</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="506"/>
+        <source>Repeat</source>
+        <translation>重复播放</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="544"/>
+        <source>Low</source>
+        <translation>低</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="576"/>
+        <source>High</source>
+        <translation>高</translation>
+    </message>
+</context>
+<context>
+    <name>AudioEngine</name>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CategoryAddItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>New Station</source>
+        <translation>新电台</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>%1 Station</source>
+        <translation>%1 电台</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
+        <source>Playlists</source>
+        <translation>播放列表</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
+        <source>Stations</source>
+        <translation>电台</translation>
+    </message>
+</context>
+<context>
+    <name>ClearButton</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContextWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
+        <source>Show Footnotes</source>
+        <translation>显示脚注</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
+        <source>Hide Footnotes</source>
+        <translation>隐藏脚注</translation>
+    </message>
+</context>
+<context>
+    <name>CrashReporter</name>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="23"/>
+        <source>Tomahawk Crash Reporter</source>
+        <translation>Tomahawk 崩溃报告</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
+        <source>Abort</source>
+        <translation>中止</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
+        <source>You can disable sending crash reports in the configuration dialog.</source>
+        <translation>你可以在设置中禁用发送崩溃报告</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
+        <source>Uploaded %L1 of %L2 KB.</source>
+        <translation>已发送 %L2 KB 中的 %L1</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <source>Close</source>
+        <translation>关闭</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
+        <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
+        <translation>已发送！&lt;b&gt;非常感谢&lt;/b&gt;。</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
+        <source>Failed to send crash info.</source>
+        <translation>发送崩溃信息失败。</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseCommand_AllAlbums</name>
+    <message>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
+        <source>Unknown</source>
+        <translation>未知</translation>
+    </message>
+</context>
+<context>
+    <name>DelegateConfigWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
+        <source>Delete Account</source>
+        <translation>删除账户</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiagnosticsDialog</name>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
+        <source>Tomahawk Diagnostics</source>
+        <translation>Tomahawk 诊断信息</translation>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobalSearchWidget</name>
+    <message>
+        <location filename="../src/SearchBox.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>IndexingJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
+        <source>Indexing database</source>
+        <translation>正在索引数据库</translation>
+    </message>
+</context>
+<context>
+    <name>InfoBar</name>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
+        <source>Filter...</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <source>Scrobble tracks to Last.fm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <source>Username:</source>
+        <translation>用户名</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <source>Password:</source>
+        <translation>密码</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <source>Test Login</source>
+        <translation>测试登录</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LastfmContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="67"/>
+        <source>Last.fm</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LatchedStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoadXSPF</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="14"/>
+        <source>Load XSPF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="22"/>
+        <source>Playlist URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="29"/>
+        <source>Enter URL...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="42"/>
+        <source>...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="51"/>
+        <source>Automatically update</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoadXSPFDialog</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>Load XSPF File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>XSPF Files (*.xspf)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LocalCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Bookmarks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Saved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation>喜爱曲目</translation>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
+        <source>Enter a title for the new playlist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
+        <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
+        <source>&amp;Create Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
+        <source>Create a new playlist</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>新专辑</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
+        <source>played %1 by you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
+        <source>played %1 by %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistLargeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <source>played %1 by you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
+        <source>played %1 by %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
+        <source>added %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
+        <source>A playlist by %1, created %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
+        <source>you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
+        <source>All tracks by %1 on album %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
+        <source>All tracks by %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistTypeSelectorDlg</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
+        <source>New Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
+        <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
+        <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
+        <source>Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
+        <source>New Playlist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
+        <source>Create Manual Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
+        <source>Create Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
+        <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ProxyDialog</name>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
+        <source>Proxy Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
+        <source>Hostname of proxy server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
+        <source>Host</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
+        <source>Proxy login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
+        <source>User</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
+        <source>Proxy password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
+        <source>No Proxy Hosts:
+(Overrides system proxy)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
+        <source>localhost *.example.com (space separated)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
+        <source>Use proxy for DNS lookups?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
+        <source>%n year(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
+        <source>%n month(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
+        <source>%n week(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
+        <source>%n week(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
+        <source>%n day(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
+        <source>%n hour(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
+        <source>%1 minutes ago</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
+        <source>%1 minutes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
+        <source>just now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <source>Friend Finders</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
+        <source>Music Finders</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
+        <source>Status Updaters</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFilePrivate</name>
+    <message>
+        <location filename="../src/libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QueueView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RelatedArtistsContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
+        <source>Related Artists</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ResolverConfigDelegate</name>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
+        <source>Not found: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
+        <source>Failed to load: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
+        <source>Search: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
+        <source>Results for &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
+        <source>Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
+        <source>All</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
+        <source>Services</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
+        <source>Install resolver from file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SocialPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="34"/>
+        <source>Popular New Albums From Your Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="48"/>
+        <source>Most Played Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="63"/>
+        <source>Most Played Tracks You Don&apos;t Have</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceDelegate</name>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
+        <source>Local</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
+        <source>Top 10</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
+        <source>All available tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
+        <source>Show</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
+        <source>Hide</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
+        <source>Recent Albums</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
+        <source>Latest Additions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
+        <source>Recently Played Tracks</source>
+        <translation>最近播放曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
+        <source>New Additions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
+        <source>My recent activity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
+        <source>Recent activity from %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
+        <source>Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
+        <source>Latest Additions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
+        <source>Recently Played</source>
+        <translation>最近播放</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation>最近播放曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation>你最近播放的曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation>%1最近播放的曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceTreeView</name>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
+        <source>&amp;Copy Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
+        <source>&amp;Delete %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
+        <source>&amp;Export Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
+        <source>Save XSPF</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
+        <source>Playlists (*.xspf)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourcesModel</name>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
+        <source>Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
+        <source>Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
+        <source>Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
+        <source>Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
+        <source>Browse</source>
+        <translation>随便看看</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
+        <source>Search History</source>
+        <translation>搜索历史</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
+        <source>My Music</source>
+        <translation>我的音乐</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
+        <source>SuperCollection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
+        <source>Top Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
+        <source>Dashboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
+        <source>Recently Played</source>
+        <translation>最近播放</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
+        <source>Charts</source>
+        <translation>排行榜</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>新专辑</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SpotifyConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>StackedSettingsDialog</name>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
+        <source>Tomahawk Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
+        <source>Local Music Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
+        <source>Path to scan for music files:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
+        <source>The Echo Nest supports keeping track of your catalog metadata
+ and using it to craft personalized radios. Enabling this option
+ will allow you (and all your friends) to create automatic playlists
+ and stations based on your personal taste profile.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
+        <source>Upload collection list to The Echo Nest to enable user radio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
+        <source>Watch for changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
+        <source>Time between scans, in seconds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
+        <source>Static Host Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
+        <source>Static Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
+        <source>Proxy Settings...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
+        <source>Send reports after Tomahawk crashed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation>允许浏览器与 Tomahawk 之间的交互 （推荐）</translation>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
+        <source>Add Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
+        <source>%1 downloads</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
+        <source>Connecting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
+        <source>Offline</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapper</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
+        <source>Configure this Google Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
+        <source>Google Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
+        <source>Enter your Google login to connect with your friends using Tomahawk!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
+        <source>username@gmail.com</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
+        <source>Connect to Google Talk to find your friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperSip</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
+        <source>Add Friend</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
+        <source>Enter Google Address:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
+        <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
+        <source>Failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
+        <source>Success</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
+        <source>Could not contact server</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
+        <source>Play music from and sync your playlists with Spotify Premium</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
+        <source>Connect to your Twitter followers.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
+        <source>Tweet!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
+        <source>Status: No saved credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
+        <source>Authenticate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
+        <source>Status: Credentials saved for %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
+        <source>De-authenticate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>Tweetin&apos; Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <source>The credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
+        <source>Status: Error validating credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
+        <source>Global Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
+        <source>Direct Message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
+        <source>Send Message!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
+        <source>@Mention</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
+        <source>Send Mention!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <source>You must enter a user name for this type of tweet.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <source>Your saved credentials could not be loaded.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <source>Your saved credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>There was an error posting your status -- sorry!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Tweeted!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <source>Your tweet has been posted!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <source>There was an error posting your direct message -- sorry!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Your message has been posted!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::XmppAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
+        <source>Log on to your Jabber/XMPP account to connect to your friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::ZeroconfFactory</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
+        <source>Automatically connect to Tomahawks on the local network</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ContextMenu</name>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
+        <source>&amp;Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
+        <source>Add to &amp;Queue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
+        <source>&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
+        <source>&amp;Copy Track Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Items</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Item</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::CustomPlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
+        <source>Top Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
+        <source>Your loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
+        <source>%1&apos;s loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
+        <source>The most loved tracks from all your friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
+        <source>All of your loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
+        <source>All of %1&apos;s loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DropJobNotifier</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
+        <source>Fetching %1 from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
+        <source>Parsing %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicControlList</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
+        <source>Click to collapse</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="172"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="301"/>
+        <source>Could not find a playable track.
+
+Please change the filters or try again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="230"/>
+        <source>Failed to generate preview with the desired filters</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicSetupWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="53"/>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="67"/>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
+        <source>Add some filters above to seed this station!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <source>Press Generate to get started!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
+        <source>Add some filters above, and press Generate to get started!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp" line="472"/>
+        <source>Station ran out of tracks!
+
+Try tweaking the filters for a new set of songs to play.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestControl</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="188"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="255"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="276"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="341"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="360"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="425"/>
+        <source>is</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="207"/>
+        <source>from user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="216"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="584"/>
+        <source>No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="235"/>
+        <source>similar to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>Less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>More</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>0 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>500 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>0 secs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>3600 secs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>-100 dB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>100 dB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="343"/>
+        <source>Major</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="344"/>
+        <source>Minor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
+        <source>C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
+        <source>C Sharp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
+        <source>D</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
+        <source>E Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
+        <source>E</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
+        <source>F</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
+        <source>F Sharp</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="369"/>
+        <source>G</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="370"/>
+        <source>A Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="371"/>
+        <source>A</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="372"/>
+        <source>B Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="373"/>
+        <source>B</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
+        <source>Ascending</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="391"/>
+        <source>Descending</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="394"/>
+        <source>Tempo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="395"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="396"/>
+        <source>Loudness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="397"/>
+        <source>Artist Familiarity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
+        <source>Artist Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
+        <source>Song Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
+        <source>Latitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="401"/>
+        <source>Longitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="402"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="403"/>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="404"/>
+        <source>Energy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="405"/>
+        <source>Danceability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="744"/>
+        <source>only by ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="746"/>
+        <source>similar to ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="748"/>
+        <source>with genre ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="754"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="766"/>
+        <source>from no one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="758"/>
+        <source>My Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="762"/>
+        <source>from %1 radio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="785"/>
+        <source>with %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="787"/>
+        <source>about %1 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
+        <source>about %n minute(s) long</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
+        <source>about %1 dB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="793"/>
+        <source>at around %1%2 %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="798"/>
+        <source>in %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="803"/>
+        <source>in a %1 key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="813"/>
+        <source>sorted in %1 %2 order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="818"/>
+        <source>with a %1 mood</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="823"/>
+        <source>in a %1 style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestSteerer</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
+        <source>Steer this station:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <source>Much less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <source>Less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <source>A bit less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <source>Keep at current</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <source>A bit more</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <source>More</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <source>Much more</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
+        <source>Tempo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
+        <source>Loudness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
+        <source>Danceability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
+        <source>Energy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
+        <source>Song Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <source>Artist Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
+        <source>Artist Familiarity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
+        <source>By Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
+        <source>Enter a description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
+        <source>Apply steering command</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
+        <source>Reset all steering commands</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::GroovesharkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
+        <source>Error fetching Grooveshark information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::ChartsPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
+        <source>Top Overall</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
+        <source>Artists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
+        <source>Albums</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
+        <source>Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
+        <source>Top Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
+        <source>Loved Tracks</source>
+        <translation>喜爱曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
+        <source>Hyped Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
+        <source>Top Artists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
+        <source>Hyped Artists</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ItunesParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
+        <source>Error fetching iTunes information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::JSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
+        <source>New Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Failed to save tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>XSPF Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::LatchManager</name>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="86"/>
+        <source>&amp;Catch Up</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="123"/>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="144"/>
+        <source>&amp;Listen Along</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Query</name>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
+        <source> and </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
+        <source>You</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
+        <source>you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>and</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>%n other(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
+        <source>%1 people</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
+        <source>loved this track</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::RdioParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
+        <source>Error fetching Rdio information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ShortenedLinkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
+        <source>Network error parsing shortened link!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Source</name>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
+        <source>Scanning (%L1 tracks)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
+        <source>Scanning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
+        <source>Checking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
+        <source>Saving (%1%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::SpotifyParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
+        <source>Error fetching Spotify information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkApp</name>
+    <message>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
+        <source>My Collection</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkOAuthTwitter</name>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>Twitter PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>After authenticating on Twitter's web site,
+enter the displayed PIN number here:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkTrayIcon</name>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
+        <source>Hide Tomahawk Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
+        <source>Show Tomahawk Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
+        <source>Currently not playing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
+        <source>Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkWindow</name>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
+        <source>Tomahawk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
+        <source>&amp;Controls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
+        <source>&amp;Network</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
+        <source>&amp;Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
+        <source>Go &amp;Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
+        <source>Add &amp;Friend...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
+        <source>U&amp;pdate Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
+        <source>Update Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
+        <source>&amp;Configure Tomahawk...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
+        <source>Load &amp;XSPF...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
+        <source>Create &amp;New Playlist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
+        <source>About &amp;Tomahawk...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
+        <source>Create New &amp;Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
+        <source>Create New &amp;Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
+        <source>Show Offline Sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
+        <source>Hide Offline Sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
+        <source>Minimize</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
+        <source>Ctrl+M</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
+        <source>Zoom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
+        <source>Meta+Ctrl+Z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
+        <source>Diagnostics...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
+        <source>Fully &amp;Rescan Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
+        <source>Fully Rescan Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
+        <source>Play</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
+        <source>Space</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
+        <source>Next</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
+        <source>Global Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
+        <source>Check For Updates...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
+        <source>Connect To Peer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
+        <source>Enter peer address:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
+        <source>Enter peer port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
+        <source>Enter peer key:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>XSPF Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Failed to save tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Create New Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
+        <source>Go &amp;offline</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
+        <source>Go &amp;online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
+        <source>Authentication Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
+        <source>%1 by %2</source>
+        <comment>track, artist name</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
+        <source>%1 - %2</source>
+        <comment>current track, some window title</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TopTracksContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
+        <source>Top Hits</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TrackInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TrackView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TransferStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>to</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TreeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TreeModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
+        <source>All Artists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
+        <source>My Collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
+        <source>Collection of %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
+        <source>Configure this Twitter account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
+        <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
+        <source>Status: No saved credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
+        <source>Authenticate with Twitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
+        <source>Twitter Connections</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
+        <source>
+If you only want to post tweets, you're done.
+
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
+        <source>Select the kind of tweet you would like, then press the button to post it:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
+        <source>Global Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
+        <source>@Mention</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
+        <source>Direct Message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
+        <source>e.g. @tomahawk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
+        <source>Send Message</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ViewManager</name>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
+        <source>SuperCollection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
+        <source>Combined libraries of all your online friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation>最近播放曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation>所有朋友最近播放的曲目</translation>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
+        <source>Recent Additions</source>
+        <translation>最近新增</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
+        <source>Newest Stations &amp; Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
+        <source>Recently Played Tracks</source>
+        <translation>最近播放曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
+        <source>No recently created playlists in your network.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
+        <source>Welcome to Tomahawk</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WhatsHotWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
+        <source>Charts</source>
+        <translation>排行榜</translation>
+    </message>
+</context>
+<context>
+    <name>WikipediaContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="42"/>
+        <source>Wikipedia</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XMPPBot</name>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
+        <source>
+Terms for %1:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
+        <source>No terms found, sorry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
+        <source>
+Hotttness for %1: %2
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
+        <source>
+Familiarity for %1: %2
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
+        <source>
+Lyrics for &quot;%1&quot; by %2:
+
+%3
+</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
+        <source>Failed to parse contents of XSPF playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
+        <source>Some playlist entries were found without artist and track name, they will be omitted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
+        <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
+        <source>New Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XmlConsole</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
+        <source>Xml stream console</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
+        <source>Filter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
+        <source>Save log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
+        <source>By JID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
+        <source>By namespace uri</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
+        <source>By all attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
+        <source>Visible stanzas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
+        <source>Information query</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
+        <source>Message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
+        <source>Presence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
+        <source>Custom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
+        <source>Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
+        <source>Save XMPP log to file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
+        <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XmppConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
+        <source>Xmpp Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
+        <source>Configure this Xmpp account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
+        <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
+        <source>Login Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
+        <source>Xmpp ID:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
+        <source>e.g. user@example.com</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
+        <source>Password:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
+        <source>An account with this name already exists!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
+        <source>Advanced Xmpp Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
+        <source>Server:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
+        <source>Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
+        <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
+        <source>Publish currently playing track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
+        <source>Enforce secure connection</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XmppSipPlugin</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
+        <source>User Interaction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
+        <source>Host is unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
+        <source>Item not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
+        <source>Authorization Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
+        <source>Remote Stream Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
+        <source>Remote Connection failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
+        <source>Internal Server Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
+        <source>System shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
+        <source>Conflict</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
+        <source>No Compression Support</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
+        <source>No Encryption Support</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
+        <source>No Authorization Support</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
+        <source>No Supported Feature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
+        <source>Add Friend</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
+        <source>Enter Xmpp ID:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
+        <source>Add Friend...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
+        <source>XML Console...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
+        <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
+        <source>Authorize User</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ZeroconfConfig</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
+        <source>Local Network configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
+        <source>This plugin will automatically find other users running Tomahawk on your local network</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
+        <source>Connect automatically when Tomahawk starts</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/lang/tomahawk_zh_TW.ts Added

@@ -0,0 +1,4026 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.0">
+<context>
+    <name>ACLJobDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="71"/>
+        <source>Allow %1 to
+connect and stream from you?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="87"/>
+        <source>Allow Streaming</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="90"/>
+        <source>Deny Access</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ACLJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/AclJobItem.cpp" line="187"/>
+        <source>Tomahawk needs you to decide whether %1 is allowed to connect.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="14"/>
+        <source>Dialog</source>
+        <translation>對話框</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.ui" line="30"/>
+        <source>Description goes here</source>
+        <translation>說明放在這裡</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapper.cpp" line="42"/>
+        <source>Add Account</source>
+        <translation>新增帳戶</translation>
+    </message>
+</context>
+<context>
+    <name>AccountFactoryWrapperDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="106"/>
+        <source>Online</source>
+        <translation>線上</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="111"/>
+        <source>Connecting...</source>
+        <translation>連接中...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp" line="116"/>
+        <source>Offline</source>
+        <translation>離線</translation>
+    </message>
+</context>
+<context>
+    <name>ActionCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="54"/>
+        <source>&amp;Listen Along</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="57"/>
+        <source>Stop &amp;Listening Along</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="61"/>
+        <source>&amp;Follow in real-time</source>
+        <translation>即時跟隨</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Privately</source>
+        <translation>私下聆聽</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="66"/>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="152"/>
+        <source>&amp;Listen Publicly</source>
+        <translation>公開聆聽</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="72"/>
+        <source>&amp;Load Playlist</source>
+        <translation>載入播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="73"/>
+        <source>&amp;Rename Playlist</source>
+        <translation>重新命名播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="74"/>
+        <source>&amp;Copy Playlist Link</source>
+        <translation>複製播放清單連結</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="75"/>
+        <source>&amp;Play</source>
+        <translation>播放</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="76"/>
+        <source>&amp;Stop</source>
+        <translation>停止</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="77"/>
+        <source>&amp;Previous Track</source>
+        <translation>上一首曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="78"/>
+        <source>&amp;Next Track</source>
+        <translation>下一個曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ActionCollection.cpp" line="79"/>
+        <source>&amp;Quit</source>
+        <translation>結束</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>形式</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui" line="31"/>
+        <source>Other Albums by Artist</source>
+        <translation>列出演出者的其他專輯</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="52"/>
+        <source>Sorry, we could not find any other albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="59"/>
+        <source>Sorry, we could not find any tracks for this album!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp" line="126"/>
+        <source>Other Albums by %1</source>
+        <translation>列出所有其他專輯，依 %1</translation>
+    </message>
+</context>
+<context>
+    <name>AlbumModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="65"/>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="107"/>
+        <source>All albums from %1</source>
+        <translation>從 %1 的所有專輯</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/AlbumModel.cpp" line="109"/>
+        <source>All albums</source>
+        <translation>所有專輯</translation>
+    </message>
+</context>
+<context>
+    <name>ArtistInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>形式</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="73"/>
+        <source>Top Hits</source>
+        <translation>流行精選</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="236"/>
+        <source>Related Artists</source>
+        <translation>相關演出者</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="310"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="153"/>
+        <source>Albums</source>
+        <translation>專輯</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui" line="284"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="69"/>
+        <source>Sorry, we could not find any albums for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="74"/>
+        <source>Sorry, we could not find any related artists!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp" line="80"/>
+        <source>Sorry, we could not find any top hits for this artist!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AudioControls</name>
+    <message>
+        <location filename="../src/AudioControls.ui" line="75"/>
+        <source>Prev</source>
+        <translation>上一首</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="87"/>
+        <source>Play</source>
+        <translation>播放</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="94"/>
+        <source>Pause</source>
+        <translation>暫停</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="103"/>
+        <source>Next</source>
+        <translation>下一首</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="229"/>
+        <source>Artist</source>
+        <translation>演出者</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="248"/>
+        <source>Album</source>
+        <translation>專輯</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="277"/>
+        <source>Owner</source>
+        <translation>擁有人</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="314"/>
+        <source>social</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="330"/>
+        <source>love</source>
+        <translation>喜愛</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="383"/>
+        <source>Time</source>
+        <translation>時間</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="412"/>
+        <source>Time Left</source>
+        <translation>剩餘時間</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="493"/>
+        <source>Shuffle</source>
+        <translation>隨機</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="506"/>
+        <source>Repeat</source>
+        <translation>重複</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="544"/>
+        <source>Low</source>
+        <translation>低</translation>
+    </message>
+    <message>
+        <location filename="../src/AudioControls.ui" line="576"/>
+        <source>High</source>
+        <translation>高</translation>
+    </message>
+</context>
+<context>
+    <name>AudioEngine</name>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="614"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the track &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="638"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the artist &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/audio/AudioEngine.cpp" line="664"/>
+        <source>Sorry, Tomahawk couldn&apos;t find the album &apos;%1&apos; by %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CategoryAddItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="62"/>
+        <source>Create new Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="65"/>
+        <source>Create new Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>New Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="183"/>
+        <location filename="../src/sourcetree/items/CategoryItems.cpp" line="292"/>
+        <source>%1 Station</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CategoryItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="63"/>
+        <source>Playlists</source>
+        <translation>播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/CategoryItems.h" line="65"/>
+        <source>Stations</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ClearButton</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/ClearButton.cpp" line="38"/>
+        <source>Clear</source>
+        <translation>清除</translation>
+    </message>
+</context>
+<context>
+    <name>ContextWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>信息欄</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.ui" line="38"/>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="343"/>
+        <source>Show Footnotes</source>
+        <translation>顯示註腳</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/context/ContextWidget.cpp" line="337"/>
+        <source>Hide Footnotes</source>
+        <translation>隱藏註腳</translation>
+    </message>
+</context>
+<context>
+    <name>CrashReporter</name>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="23"/>
+        <source>Tomahawk Crash Reporter</source>
+        <translation>Tomahawk 崩潰報告</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="80"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="129"/>
+        <source>Send this report</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="136"/>
+        <source>Don&apos;t send</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="190"/>
+        <source>Abort</source>
+        <translation>中止</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.ui" line="210"/>
+        <source>You can disable sending crash reports in the configuration dialog.</source>
+        <translation>在配置對話框中，您可以禁用發送崩潰報告。</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="154"/>
+        <source>Uploaded %L1 of %L2 KB.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="168"/>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="184"/>
+        <source>Close</source>
+        <translation>關閉</translation>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="177"/>
+        <source>Sent! &lt;b&gt;Many thanks&lt;/b&gt;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/breakpad/CrashReporter/CrashReporter.cpp" line="185"/>
+        <source>Failed to send crash info.</source>
+        <translation>無法發送故障信息。</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseCommand_AllAlbums</name>
+    <message>
+        <location filename="../src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp" line="109"/>
+        <source>Unknown</source>
+        <translation>未知</translation>
+    </message>
+</context>
+<context>
+    <name>DelegateConfigWrapper</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="52"/>
+        <source>About</source>
+        <translation>關於</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="77"/>
+        <source>Delete Account</source>
+        <translation>刪除帳戶</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/DelegateConfigWrapper.cpp" line="140"/>
+        <source>About this Account</source>
+        <translation>關於此帳戶</translation>
+    </message>
+</context>
+<context>
+    <name>DiagnosticsDialog</name>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="20"/>
+        <source>Tomahawk Diagnostics</source>
+        <translation>Tomahawk 診斷</translation>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="42"/>
+        <source>&amp;Copy to Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/DiagnosticsDialog.ui" line="49"/>
+        <source>Open &amp;Log-file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GlobalSearchWidget</name>
+    <message>
+        <location filename="../src/SearchBox.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>IndexingJobItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/IndexingJobItem.cpp" line="31"/>
+        <source>Indexing database</source>
+        <translation>索引資料庫</translation>
+    </message>
+</context>
+<context>
+    <name>InfoBar</name>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation>信息欄</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/infobar/InfoBar.cpp" line="90"/>
+        <source>Filter...</source>
+        <translation>過濾器...</translation>
+    </message>
+</context>
+<context>
+    <name>LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="41"/>
+        <source>Scrobble tracks to Last.fm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="50"/>
+        <source>Username:</source>
+        <translation>用戶名稱：</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="60"/>
+        <source>Password:</source>
+        <translation>密碼：</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="76"/>
+        <source>Test Login</source>
+        <translation>測試登錄</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.ui" line="83"/>
+        <source>Import Playback History</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LastfmContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="67"/>
+        <source>Last.fm</source>
+        <translation>Last.fm</translation>
+    </message>
+</context>
+<context>
+    <name>LatchedStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/LatchedStatusItem.cpp" line="33"/>
+        <source>%1 is listening along with you!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LoadXSPF</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="14"/>
+        <source>Load XSPF</source>
+        <translation>載入 XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="22"/>
+        <source>Playlist URL</source>
+        <translation>播放清單 URL</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="29"/>
+        <source>Enter URL...</source>
+        <translation>輸入網址...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="42"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.ui" line="51"/>
+        <source>Automatically update</source>
+        <translation>自動更新</translation>
+    </message>
+</context>
+<context>
+    <name>LoadXSPFDialog</name>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>Load XSPF File</source>
+        <translation>載入 XSPF 檔</translation>
+    </message>
+    <message>
+        <location filename="../src/LoadXSPFDialog.cpp" line="50"/>
+        <source>XSPF Files (*.xspf)</source>
+        <translation>XSPF 檔 (*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>LocalCollection</name>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Bookmarks</source>
+        <translation>書籤</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/database/LocalCollection.cpp" line="54"/>
+        <source>Saved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LovedTracksItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.cpp" line="59"/>
+        <source>Sorry, we could not find any loved tracks!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/LovedTracksItem.h" line="36"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MetadataEditor</name>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="30"/>
+        <source>Tags</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="39"/>
+        <source>Title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="49"/>
+        <source>Title...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="56"/>
+        <source>Artist:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="66"/>
+        <source>Artist...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="73"/>
+        <source>Album:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="83"/>
+        <source>Album...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="90"/>
+        <source>Disc Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="119"/>
+        <source>Duration:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="129"/>
+        <source>00.00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="136"/>
+        <source>Year:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="162"/>
+        <source>Bitrate:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="183"/>
+        <source>File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="189"/>
+        <source>File Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="199"/>
+        <source>File Name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="206"/>
+        <source>File Size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="212"/>
+        <source>File size...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="219"/>
+        <source>File Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="235"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.ui" line="245"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/filemetadata/MetadataEditor.cpp" line="44"/>
+        <source> - Properties</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>NewPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="20"/>
+        <source>Enter a title for the new playlist:</source>
+        <translation>輸入一個新的播放清單的標題：</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="37"/>
+        <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
+        <translation>Tomahawk 提供了多種方法來幫助您建立播放清單，及找到您喜歡的音樂！</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.ui" line="47"/>
+        <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>只要輸入一種類型或標籤名稱，然後Tomahawk 將顯示幾首歌曲，讓您開始用新的播放清單：</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.cpp" line="43"/>
+        <source>&amp;Create Playlist</source>
+        <translation>建立播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewPlaylistWidget.h" line="50"/>
+        <source>Create a new playlist</source>
+        <translation>建立一個新的播放清單</translation>
+    </message>
+</context>
+<context>
+    <name>NewReleasesWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/NewReleasesWidget.h" line="71"/>
+        <source>New Releases</source>
+        <translation>新版本</translation>
+    </message>
+</context>
+<context>
+    <name>PlayableModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Composer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="49"/>
+        <source>Duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Bitrate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Age</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Year</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Origin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <source>Score</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="50"/>
+        <location filename="../src/libtomahawk/playlist/PlayableModel.cpp" line="290"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="154"/>
+        <source>played %1 by you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistItemDelegate.cpp" line="156"/>
+        <source>played %1 by %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistLargeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="158"/>
+        <source>played %1 by you</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="160"/>
+        <source>played %1 by %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp" line="167"/>
+        <source>added %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="82"/>
+        <source>A playlist by %1, created %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="83"/>
+        <source>you</source>
+        <translation>您</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="140"/>
+        <source>All tracks by %1 on album %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistModel.cpp" line="165"/>
+        <source>All tracks by %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PlaylistTypeSelectorDlg</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="32"/>
+        <source>New Playlist</source>
+        <translation>新增播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="49"/>
+        <source>Just a regular old playlist... Give it a name, drag in some tracks, and go!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="75"/>
+        <source>Don&apos;t know exactly what you want? Give Tomahawk a few pointers and let it build a playlist for you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="92"/>
+        <source>Name:</source>
+        <translation>名稱：</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="102"/>
+        <source>New Playlist...</source>
+        <translation>新增播放清單...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="113"/>
+        <source>Create Manual Playlist</source>
+        <translation>建立手動播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui" line="123"/>
+        <source>Create Automatic Playlist</source>
+        <translation>建立自動播放清單</translation>
+    </message>
+</context>
+<context>
+    <name>PlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="163"/>
+        <source>This playlist is currently empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/PlaylistView.cpp" line="165"/>
+        <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
+        <translation>目前這個播放清單是空的。請加入一些曲目，然後盡情享受音樂！</translation>
+    </message>
+</context>
+<context>
+    <name>ProxyDialog</name>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="17"/>
+        <source>Proxy Settings</source>
+        <translation>代理服務器設定</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="37"/>
+        <source>Hostname of proxy server</source>
+        <translation>代理服務器的主機名稱</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="44"/>
+        <source>Host</source>
+        <translation>主機</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="51"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="71"/>
+        <source>Proxy login</source>
+        <translation>Proxy 登錄</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="78"/>
+        <source>User</source>
+        <translation>用戶</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="85"/>
+        <source>Password</source>
+        <translation>密碼</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="95"/>
+        <source>Proxy password</source>
+        <translation>Proxy 密碼</translation>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="102"/>
+        <source>No Proxy Hosts:
+(Overrides system proxy)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="110"/>
+        <source>localhost *.example.com (space separated)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/ProxyDialog.ui" line="127"/>
+        <source>Use proxy for DNS lookups?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="233"/>
+        <source>%n year(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="235"/>
+        <source>%n year(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="241"/>
+        <source>%n month(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="243"/>
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="249"/>
+        <source>%n week(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="251"/>
+        <source>%n week(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="257"/>
+        <source>%n day(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="259"/>
+        <source>%n day(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="265"/>
+        <source>%n hour(s) ago</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="267"/>
+        <source>%n hour(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="273"/>
+        <source>%1 minutes ago</source>
+        <translation>%1 分鐘前</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="275"/>
+        <source>%1 minutes</source>
+        <translation>%1 分鐘</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/TomahawkUtils.cpp" line="279"/>
+        <source>just now</source>
+        <translation>剛才</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="36"/>
+        <source>Friend Finders</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="38"/>
+        <source>Music Finders</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/Account.cpp" line="41"/>
+        <source>Status Updaters</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QuaZipFilePrivate</name>
+    <message>
+        <location filename="../src/libtomahawk/thirdparty/quazip/quazip/quazipfile.cpp" line="172"/>
+        <source>ZIP/UNZIP API error %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QueueView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="26"/>
+        <source>InfoBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.ui" line="41"/>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="188"/>
+        <source>Open Queue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="186"/>
+        <source>Open Queue - %n item(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/QueueView.cpp" line="192"/>
+        <source>Close Queue</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RelatedArtistsContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/RelatedArtistsContext.h" line="47"/>
+        <source>Related Artists</source>
+        <translation>相關演出者</translation>
+    </message>
+</context>
+<context>
+    <name>ResolverConfigDelegate</name>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="110"/>
+        <source>Not found: %1</source>
+        <translation>未找到：%1</translation>
+    </message>
+    <message>
+        <location filename="../src/ResolverConfigDelegate.cpp" line="113"/>
+        <source>Failed to load: %1</source>
+        <translation>無法載入：%1</translation>
+    </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/searchlineedit/SearchLineEdit.cpp" line="58"/>
+        <source>Search</source>
+        <translation>搜尋</translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="53"/>
+        <source>Search: %1</source>
+        <translation>搜尋：%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SearchWidget.h" line="54"/>
+        <source>Results for &apos;%1&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="300"/>
+        <source>Collection</source>
+        <translation>收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="307"/>
+        <source>Advanced</source>
+        <translation>進階</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="155"/>
+        <source>All</source>
+        <translation>所有</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Some changed settings will not take effect until Tomahawk is restarted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="293"/>
+        <source>Services</source>
+        <translation>服務</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="459"/>
+        <source>Install resolver from file</source>
+        <translation>從檔案安裝解析器</translation>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="506"/>
+        <source>Delete all Access Control entries?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="507"/>
+        <source>Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SettingsDialog.cpp" line="246"/>
+        <source>Information</source>
+        <translation>資訊</translation>
+    </message>
+</context>
+<context>
+    <name>SocialPlaylistWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="34"/>
+        <source>Popular New Albums From Your Friends</source>
+        <translation>在您所有的朋友中，受歡迎的新專輯</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="48"/>
+        <source>Most Played Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/SocialPlaylistWidget.ui" line="63"/>
+        <source>Most Played Tracks You Don&apos;t Have</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SocialWidget</name>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="31"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="41"/>
+        <source>Twitter</source>
+        <translation>Twitter</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="67"/>
+        <source>Cover</source>
+        <translation>封面</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.ui" line="101"/>
+        <source>TextLabel</source>
+        <translation>文字標籤</translation>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="59"/>
+        <source>Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="207"/>
+        <source>Listening to &quot;%1&quot; by %2. %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="209"/>
+        <source>Listening to &quot;%1&quot; by %2 on &quot;%3&quot;. %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/SocialWidget.cpp" line="230"/>
+        <source>%1 characters left</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceDelegate</name>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="55"/>
+        <source>Track</source>
+        <translation>曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="56"/>
+        <source>Album</source>
+        <translation>專輯</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="57"/>
+        <source>Artist</source>
+        <translation>演出者</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="58"/>
+        <source>Local</source>
+        <translation>本地</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="59"/>
+        <source>Top 10</source>
+        <translation>前10名</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="202"/>
+        <source>All available tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="295"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="336"/>
+        <source>Show</source>
+        <translation>顯示</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="297"/>
+        <location filename="../src/sourcetree/SourceDelegate.cpp" line="338"/>
+        <source>Hide</source>
+        <translation>隱藏</translation>
+    </message>
+</context>
+<context>
+    <name>SourceInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="30"/>
+        <source>Recent Albums</source>
+        <translation>最新專輯</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="74"/>
+        <source>Latest Additions</source>
+        <translation>最新加入</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui" line="88"/>
+        <source>Recently Played Tracks</source>
+        <translation>最近播放的曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="70"/>
+        <source>New Additions</source>
+        <translation>新增</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="73"/>
+        <source>My recent activity</source>
+        <translation>我的近期活動</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp" line="77"/>
+        <source>Recent activity from %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="64"/>
+        <source>Collection</source>
+        <translation>收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="72"/>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="517"/>
+        <source>Latest Additions</source>
+        <translation>最新加入</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="76"/>
+        <source>Recently Played</source>
+        <translation>最近播放的</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="141"/>
+        <source>SuperCollection</source>
+        <translation>超級收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="520"/>
+        <source>Latest additions to your collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="522"/>
+        <source>Latest additions to %1&apos;s collection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="530"/>
+        <source>Sorry, we could not find any recent additions!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="560"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="563"/>
+        <source>Your recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="565"/>
+        <source>%1&apos;s recently played tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/SourceItem.cpp" line="572"/>
+        <source>Sorry, we could not find any recent plays!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SourceTreeView</name>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="192"/>
+        <source>&amp;Copy Link</source>
+        <translation>複製鏈接</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="200"/>
+        <source>&amp;Delete %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="204"/>
+        <source>Add to my Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="206"/>
+        <source>Add to my Automatic Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="208"/>
+        <source>Add to my Stations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="196"/>
+        <source>&amp;Export Playlist</source>
+        <translation>匯出播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="350"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="354"/>
+        <source>automatic playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="358"/>
+        <source>station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="365"/>
+        <source>Delete %1?</source>
+        <comment>playlist/station/...</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="366"/>
+        <source>Would you like to delete the %1 &lt;b&gt;&quot;%2&quot;&lt;/b&gt;?</source>
+        <comment>e.g. Would you like to delete the playlist named Foobar?</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="433"/>
+        <source>Save XSPF</source>
+        <translation>儲存 XSPF</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourceTreeView.cpp" line="434"/>
+        <source>Playlists (*.xspf)</source>
+        <translation>播放清單(*.xspf)</translation>
+    </message>
+</context>
+<context>
+    <name>SourcesModel</name>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="78"/>
+        <source>Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="81"/>
+        <source>Collection</source>
+        <translation>收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="84"/>
+        <source>Playlist</source>
+        <translation>播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="87"/>
+        <source>Automatic Playlist</source>
+        <translation>自動播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="90"/>
+        <source>Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="279"/>
+        <source>Browse</source>
+        <translation>瀏覽</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="280"/>
+        <source>Search History</source>
+        <translation>搜尋記錄</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="282"/>
+        <source>My Music</source>
+        <translation>我的音樂</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="290"/>
+        <source>SuperCollection</source>
+        <translation>超級收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="296"/>
+        <source>Top Loved Tracks</source>
+        <translation>最喜愛的曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="284"/>
+        <source>Dashboard</source>
+        <translation>儀表板</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="301"/>
+        <source>Recently Played</source>
+        <translation>最近播放的</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="306"/>
+        <source>Charts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="311"/>
+        <source>New Releases</source>
+        <translation>新版本</translation>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/SourcesModel.cpp" line="316"/>
+        <source>Friends</source>
+        <translation>朋友</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="57"/>
+        <source>Configure your Spotify account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="89"/>
+        <source>Username or Facebook Email</source>
+        <translation>使用者名稱或 Facebook 的電子郵件</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="117"/>
+        <source>Log In</source>
+        <translation>登錄</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="124"/>
+        <source>Right click on any Tomahawk playlist to sync it to Spotify.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="147"/>
+        <source>High Quality Streams</source>
+        <translation>高品質的串流</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="134"/>
+        <source>Spotify playlists to keep in sync:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="157"/>
+        <source>Delete Tomahawk playlist when removing synchronization</source>
+        <translation>刪除同步時，刪除 Tomahawk 播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="79"/>
+        <source>Username:</source>
+        <translation>用戶名稱：</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui" line="96"/>
+        <source>Password:</source>
+        <translation>密碼：</translation>
+    </message>
+</context>
+<context>
+    <name>SpotifyPlaylistUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Delete in Spotify?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp" line="143"/>
+        <source>Would you like to delete the corresponding Spotify playlist as well?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>StackedSettingsDialog</name>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="14"/>
+        <source>Tomahawk Settings</source>
+        <translation>Tomahawk 設定</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="158"/>
+        <source>Local Music Information</source>
+        <translation>本地音樂資訊</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="166"/>
+        <source>Path to scan for music files:</source>
+        <translation>掃描音樂檔的路徑：</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="180"/>
+        <source>The Echo Nest supports keeping track of your catalog metadata
+ and using it to craft personalized radios. Enabling this option
+ will allow you (and all your friends) to create automatic playlists
+ and stations based on your personal taste profile.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="186"/>
+        <source>Upload collection list to The Echo Nest to enable user radio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="199"/>
+        <source>Watch for changes</source>
+        <translation>觀看變化</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="208"/>
+        <source>Time between scans, in seconds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="245"/>
+        <source>Advanced Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="254"/>
+        <source>Remote Peer Connection Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="260"/>
+        <source>None (outgoing connections only)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="267"/>
+        <source>Use UPnP to establish port forward (recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="274"/>
+        <source>Use static external IP address/host name and port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="287"/>
+        <source>Set this to your external IP address or host name. Make sure to forward the port to this host!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="356"/>
+        <source>SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="362"/>
+        <source>Use SOCKS Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="439"/>
+        <source>Clear All Access Control Entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="98"/>
+        <source>Internet Services</source>
+        <translation>上網服務</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="109"/>
+        <source>Install from file...</source>
+        <translation>從安裝檔案...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="129"/>
+        <source>Filter by capability:</source>
+        <translation>按能力篩選：</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="305"/>
+        <source>Static Host Name:</source>
+        <translation>靜態主機名稱：</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="321"/>
+        <source>Static Port:</source>
+        <translation>靜態通訊埠：</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="369"/>
+        <source>Proxy Settings...</source>
+        <translation>代理服務器設定...</translation>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="392"/>
+        <source>Other Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="414"/>
+        <source>Send reports after Tomahawk crashed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/StackedSettingsDialog.ui" line="401"/>
+        <source>Allow web browsers to interact with Tomahawk (recommended)</source>
+        <translation>允許 Web 瀏覽器與 Tomahawk 互動 (推薦)</translation>
+    </message>
+</context>
+<context>
+    <name>TemporaryPageItem</name>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="51"/>
+        <source>Copy Artist Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="58"/>
+        <source>Copy Album Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/sourcetree/items/TemporaryPageItem.cpp" line="65"/>
+        <source>Copy Track Link</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="224"/>
+        <source>Add Account</source>
+        <translation>新增帳戶</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="274"/>
+        <source>Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="387"/>
+        <source>%1 downloads</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="570"/>
+        <source>Online</source>
+        <translation>線上</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="575"/>
+        <source>Connecting...</source>
+        <translation>連接中...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountDelegate.cpp" line="580"/>
+        <source>Offline</source>
+        <translation>離線</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::AccountModel</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="529"/>
+        <source>Manual Install Required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/AccountModel.cpp" line="532"/>
+        <source>Unfortunately, automatic installation of this resolver is not available or disabled for your platform.&lt;br /&gt;&lt;br /&gt;Please use &quot;Install from file&quot; above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:&lt;br /&gt;&lt;br /&gt;http://www.tomahawk-player.org/resolvers/%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapper</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="82"/>
+        <source>Configure this Google Account</source>
+        <translation>配置這個 Google 帳戶</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="83"/>
+        <source>Google Address</source>
+        <translation>輸入谷歌地址</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="84"/>
+        <source>Enter your Google login to connect with your friends using Tomahawk!</source>
+        <translation>輸入您的 Google登錄，以與您使用的 Tomahawk 朋友連線！</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="85"/>
+        <source>username@gmail.com</source>
+        <translation>username@gmail.com</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.h" line="42"/>
+        <source>Connect to Google Talk to find your friends</source>
+        <translation>連線到 Google Talk，找到您的朋友</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::GoogleWrapperSip</name>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="61"/>
+        <source>Add Friend</source>
+        <translation>加為好友</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp" line="62"/>
+        <source>Enter Google Address:</source>
+        <translation>輸入谷歌地址：</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmAccount.h" line="48"/>
+        <source>Scrobble your tracks to last.fm, and find freely downloadable tracks to play</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::LastFmConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="82"/>
+        <source>Testing...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="104"/>
+        <source>Test Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="114"/>
+        <source>Importing %1</source>
+        <comment>e.g. Importing 2012/01/01</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="117"/>
+        <source>Importing History...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="185"/>
+        <source>History Incomplete. Resume</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="190"/>
+        <source>Playback History Imported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="213"/>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="228"/>
+        <source>Failed</source>
+        <translation>失敗</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="218"/>
+        <source>Success</source>
+        <translation>成功</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmConfig.cpp" line="234"/>
+        <source>Could not contact server</source>
+        <translation>無法聯繫服務器</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccount</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="442"/>
+        <source>Sync with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="446"/>
+        <source>Re-enable syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.cpp" line="450"/>
+        <source>Stop syncing with Spotify</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountConfig</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="151"/>
+        <source>Logging in...</source>
+        <translation>登錄中...</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="188"/>
+        <source>Failed: %1</source>
+        <translation>失敗：%1</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="211"/>
+        <source>Logged in as %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="213"/>
+        <source>Log Out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="229"/>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp" line="239"/>
+        <source>Log In</source>
+        <translation>登錄</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::SpotifyAccountFactory</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/spotify/SpotifyAccount.h" line="68"/>
+        <source>Play music from and sync your playlists with Spotify Premium</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterAccount.h" line="51"/>
+        <source>Connect to your Twitter followers.</source>
+        <translation>連接到您的 Twitter 追隨者。</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="60"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="143"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="191"/>
+        <source>Tweet!</source>
+        <translation>Tweet!</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="68"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="169"/>
+        <source>Status: No saved credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="69"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="94"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="170"/>
+        <source>Authenticate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="76"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="138"/>
+        <source>Status: Credentials saved for %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="77"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="139"/>
+        <source>De-authenticate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>Tweetin&apos; Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="124"/>
+        <source>The credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="154"/>
+        <source>Status: Error validating credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="181"/>
+        <source>Global Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="186"/>
+        <source>Direct Message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="187"/>
+        <source>Send Message!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="188"/>
+        <source>@Mention</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="189"/>
+        <source>Send Mention!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="202"/>
+        <source>You must enter a user name for this type of tweet.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="213"/>
+        <source>Your saved credentials could not be loaded.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="231"/>
+        <source>Your saved credentials could not be verified.
+You may wish to try re-authenticating.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="273"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="292"/>
+        <source>There was an error posting your status -- sorry!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Tweeted!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="275"/>
+        <source>Your tweet has been posted!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="282"/>
+        <source>There was an error posting your direct message -- sorry!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.cpp" line="284"/>
+        <source>Your message has been posted!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::XmppAccountFactory</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppAccount.h" line="51"/>
+        <source>Log on to your Jabber/XMPP account to connect to your friends</source>
+        <translation>登錄到你的 Jabber/ XMPP 帳號以與您的朋友連線</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Accounts::ZeroconfFactory</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ZeroconfAccount.h" line="43"/>
+        <source>Automatically connect to Tomahawks on the local network</source>
+        <translation>自動連接到區域網路上的 Tomahawks</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ContextMenu</name>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="84"/>
+        <source>&amp;Play</source>
+        <translation>播放</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="87"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="165"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="207"/>
+        <source>Add to &amp;Queue</source>
+        <translation>添加至佇列</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="92"/>
+        <source>Continue Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="94"/>
+        <source>Stop Playback after this &amp;Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="101"/>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="346"/>
+        <source>&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="109"/>
+        <source>&amp;Copy Track Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="175"/>
+        <source>Copy Album &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="217"/>
+        <source>Copy Artist &amp;Link</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="341"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Items</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="112"/>
+        <source>&amp;Show Track Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="125"/>
+        <source>Properties...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="130"/>
+        <source>&amp;Delete Item</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="168"/>
+        <source>&amp;Show Album Page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ContextMenu.cpp" line="210"/>
+        <source>&amp;Show Artist Page</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::CustomPlaylistView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="126"/>
+        <source>Top Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="130"/>
+        <source>Your loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="132"/>
+        <source>%1&apos;s loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="141"/>
+        <source>The most loved tracks from all your friends</source>
+        <translation>在您所有的朋友中，最受喜愛的曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="145"/>
+        <source>All of your loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/CustomPlaylistView.cpp" line="147"/>
+        <source>All of %1&apos;s loved tracks</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DropJobNotifier</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="72"/>
+        <source>playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="75"/>
+        <source>artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="78"/>
+        <source>track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="81"/>
+        <source>album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="104"/>
+        <source>Fetching %1 from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/DropJobNotifier.cpp" line="108"/>
+        <source>Parsing %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicControlList</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp" line="83"/>
+        <source>Click to collapse</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="172"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="301"/>
+        <source>Could not find a playable track.
+
+Please change the filters or try again.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicModel.cpp" line="230"/>
+        <source>Failed to generate preview with the desired filters</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicSetupWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="53"/>
+        <source>Type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="67"/>
+        <source>Generate</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="139"/>
+        <source>Add some filters above to seed this station!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="144"/>
+        <source>Press Generate to get started!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="146"/>
+        <source>Add some filters above, and press Generate to get started!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::DynamicWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp" line="472"/>
+        <source>Station ran out of tracks!
+
+Try tweaking the filters for a new set of songs to play.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestControl</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="188"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="255"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="276"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="341"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="360"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="425"/>
+        <source>is</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="207"/>
+        <source>from user</source>
+        <translation>從用戶</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="216"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="584"/>
+        <source>No users with Echo Nest Catalogs enabled. Try enabling option in Collection settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="235"/>
+        <source>similar to</source>
+        <translation>類似</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>Less</source>
+        <translation>較少</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="256"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="277"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="311"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="315"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="319"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="323"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="327"/>
+        <source>More</source>
+        <translation>更多</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>0 BPM</source>
+        <translation>0 BPM</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="298"/>
+        <source>500 BPM</source>
+        <translation>500 BPM</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>0 secs</source>
+        <translation>0秒</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="302"/>
+        <source>3600 secs</source>
+        <translation>3600秒</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>-100 dB</source>
+        <translation>-100 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="306"/>
+        <source>100 dB</source>
+        <translation>100 dB</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="343"/>
+        <source>Major</source>
+        <translation>主要</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="344"/>
+        <source>Minor</source>
+        <translation>次要</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="362"/>
+        <source>C</source>
+        <translation>C</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="363"/>
+        <source>C Sharp</source>
+        <translation>升C</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="364"/>
+        <source>D</source>
+        <translation>D</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="365"/>
+        <source>E Flat</source>
+        <translation>降E大調</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="366"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="367"/>
+        <source>F</source>
+        <translation>F</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="368"/>
+        <source>F Sharp</source>
+        <translation>升F</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="369"/>
+        <source>G</source>
+        <translation>G</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="370"/>
+        <source>A Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="371"/>
+        <source>A</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="372"/>
+        <source>B Flat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="373"/>
+        <source>B</source>
+        <translation>B</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="390"/>
+        <source>Ascending</source>
+        <translation>遞增</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="391"/>
+        <source>Descending</source>
+        <translation>遞減</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="394"/>
+        <source>Tempo</source>
+        <translation>拍子</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="395"/>
+        <source>Duration</source>
+        <translation>長度</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="396"/>
+        <source>Loudness</source>
+        <translation>音量</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="397"/>
+        <source>Artist Familiarity</source>
+        <translation>藝術家熟悉程度</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="398"/>
+        <source>Artist Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="399"/>
+        <source>Song Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="400"/>
+        <source>Latitude</source>
+        <translation>緯度</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="401"/>
+        <source>Longitude</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="402"/>
+        <source>Mode</source>
+        <translation>模式</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="403"/>
+        <source>Key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="404"/>
+        <source>Energy</source>
+        <translation>能量</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="405"/>
+        <source>Danceability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="744"/>
+        <source>only by ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="746"/>
+        <source>similar to ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="748"/>
+        <source>with genre ~%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="754"/>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="766"/>
+        <source>from no one</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="758"/>
+        <source>My Collection</source>
+        <translation>我的收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="762"/>
+        <source>from %1 radio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="785"/>
+        <source>with %1 %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="787"/>
+        <source>about %1 BPM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="789"/>
+        <source>about %n minute(s) long</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="791"/>
+        <source>about %1 dB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="793"/>
+        <source>at around %1%2 %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="798"/>
+        <source>in %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="803"/>
+        <source>in a %1 key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="813"/>
+        <source>sorted in %1 %2 order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="818"/>
+        <source>with a %1 mood</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp" line="823"/>
+        <source>in a %1 style</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::EchonestSteerer</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="58"/>
+        <source>Steer this station:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="81"/>
+        <source>Much less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="82"/>
+        <source>Less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="83"/>
+        <source>A bit less</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="84"/>
+        <source>Keep at current</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="85"/>
+        <source>A bit more</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="86"/>
+        <source>More</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="87"/>
+        <source>Much more</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="90"/>
+        <source>Tempo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="91"/>
+        <source>Loudness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="92"/>
+        <source>Danceability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="93"/>
+        <source>Energy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="94"/>
+        <source>Song Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="95"/>
+        <source>Artist Hotttnesss</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="96"/>
+        <source>Artist Familiarity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="97"/>
+        <source>By Description</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="105"/>
+        <source>Enter a description</source>
+        <translation>輸入一個描述</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="112"/>
+        <source>Apply steering command</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp" line="118"/>
+        <source>Reset all steering commands</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::GroovesharkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/GroovesharkParser.cpp" line="256"/>
+        <source>Error fetching Grooveshark information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::ChartsPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="373"/>
+        <source>Top Overall</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="462"/>
+        <source>Artists</source>
+        <translation>演出者</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="464"/>
+        <source>Albums</source>
+        <translation>專輯</translation>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/generic/charts/ChartsPlugin.cpp" line="466"/>
+        <source>Tracks</source>
+        <translation>曲目</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::FdoNotifyPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="140"/>
+        <source>Tomahawk is playing &quot;%1&quot; by %2%3.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp" line="143"/>
+        <source>on &quot;%1&quot;</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::LastFmInfoPlugin</name>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="456"/>
+        <source>Top Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="459"/>
+        <source>Loved Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="462"/>
+        <source>Hyped Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="468"/>
+        <source>Top Artists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp" line="471"/>
+        <source>Hyped Artists</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::NewReleasesPlugin</name>
+    <message>
+        <location filename="../src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp" line="293"/>
+        <source>Albums</source>
+        <translation>專輯</translation>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::InfoSystem::TwitterInfoPlugin</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterInfoPlugin.cpp" line="159"/>
+        <source>Listening to &quot;%1&quot; by %2 and loving it! %3</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ItunesParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ItunesParser.cpp" line="175"/>
+        <source>Error fetching iTunes information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::JSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="144"/>
+        <source>New Playlist</source>
+        <translation>新增播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Failed to save tracks</source>
+        <translation>無法保存曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="170"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>XSPF Error</source>
+        <translation>XSPF </translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/JspfLoader.cpp" line="192"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::LatchManager</name>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="86"/>
+        <source>&amp;Catch Up</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="123"/>
+        <location filename="../src/libtomahawk/LatchManager.cpp" line="144"/>
+        <source>&amp;Listen Along</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Query</name>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="738"/>
+        <source> and </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="746"/>
+        <source>You</source>
+        <translation>您</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="748"/>
+        <source>you</source>
+        <translation>您</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>and</source>
+        <translation>和</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/Query.cpp" line="757"/>
+        <source>%n other(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="760"/>
+        <source>%1 people</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Query.cpp" line="762"/>
+        <source>loved this track</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::RdioParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/RdioParser.cpp" line="200"/>
+        <source>Error fetching Rdio information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::ShortenedLinkParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/ShortenedLinkParser.cpp" line="99"/>
+        <source>Network error parsing shortened link!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::Source</name>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="286"/>
+        <location filename="../src/libtomahawk/Source.cpp" line="335"/>
+        <source>Scanning (%L1 tracks)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="288"/>
+        <source>Scanning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="320"/>
+        <source>Checking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="325"/>
+        <source>Syncing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="330"/>
+        <source>Importing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="472"/>
+        <source>Saving (%1%)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="553"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/Source.cpp" line="557"/>
+        <source>Offline</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::SpotifyParser</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/SpotifyParser.cpp" line="225"/>
+        <source>Error fetching Spotify information from the network!</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Tomahawk::XspfUpdater</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/XspfUpdater.cpp" line="60"/>
+        <source>Automatically update from XSPF</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkApp</name>
+    <message>
+        <location filename="../src/TomahawkApp.cpp" line="603"/>
+        <source>My Collection</source>
+        <translation>我的收藏</translation>
+    </message>
+</context>
+<context>
+    <name>TomahawkOAuthTwitter</name>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>Twitter PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TomahawkOAuthTwitter.cpp" line="39"/>
+        <source>After authenticating on Twitter's web site,
+enter the displayed PIN number here:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkTrayIcon</name>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="181"/>
+        <source>&amp;Stop Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="76"/>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="115"/>
+        <source>Hide Tomahawk Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="120"/>
+        <source>Show Tomahawk Window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="201"/>
+        <source>Currently not playing.</source>
+        <translation>目前沒有播放。</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="262"/>
+        <source>Play</source>
+        <translation>播放</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="290"/>
+        <source>Pause</source>
+        <translation>暫停</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="320"/>
+        <source>&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="328"/>
+        <source>Un-&amp;Love</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkTrayIcon.cpp" line="179"/>
+        <source>&amp;Continue Playback after current Track</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TomahawkWindow</name>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="14"/>
+        <source>Tomahawk</source>
+        <translation>Tomahawk</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="75"/>
+        <source>&amp;Settings</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="81"/>
+        <source>&amp;Controls</source>
+        <translation>控制</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="100"/>
+        <source>&amp;Network</source>
+        <translation>網路</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="107"/>
+        <source>&amp;Window</source>
+        <translation>視窗</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="114"/>
+        <source>&amp;Help</source>
+        <translation>幫助</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="129"/>
+        <source>&amp;Quit</source>
+        <translation>結束</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="132"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="140"/>
+        <source>Go &amp;Online</source>
+        <translation>上網</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="145"/>
+        <source>Add &amp;Friend...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="150"/>
+        <source>U&amp;pdate Collection</source>
+        <translation>更新收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="153"/>
+        <source>Update Collection</source>
+        <translation>更新收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="158"/>
+        <source>&amp;Configure Tomahawk...</source>
+        <translation>配置 Tomahawk ...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="166"/>
+        <source>Load &amp;XSPF...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="171"/>
+        <source>Create &amp;New Playlist...</source>
+        <translation>建立新的播放清單...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="176"/>
+        <source>About &amp;Tomahawk...</source>
+        <translation>關於 Tomahawk...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="184"/>
+        <source>Create New &amp;Automatic Playlist</source>
+        <translation>建立新的自動播放清單</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="189"/>
+        <source>Create New &amp;Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="197"/>
+        <source>Show Offline Sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="202"/>
+        <source>Hide Offline Sources</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="207"/>
+        <source>Minimize</source>
+        <translation>最小化</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="210"/>
+        <source>Ctrl+M</source>
+        <translation>Ctrl+M</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="215"/>
+        <source>Zoom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="218"/>
+        <source>Meta+Ctrl+Z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="223"/>
+        <source>&amp;Legal Info...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="231"/>
+        <source>Diagnostics...</source>
+        <translation>診斷...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="239"/>
+        <source>Fully &amp;Rescan Collection</source>
+        <translation>徹底地重新掃描收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="242"/>
+        <source>Fully Rescan Collection</source>
+        <translation>徹底地重新掃描收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="247"/>
+        <location filename="../src/TomahawkWindow.cpp" line="1043"/>
+        <source>Play</source>
+        <translation>播放</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="250"/>
+        <source>Space</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="255"/>
+        <source>Previous</source>
+        <translation>前一首</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.ui" line="260"/>
+        <source>Next</source>
+        <translation>下一首</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="237"/>
+        <source>Back</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="238"/>
+        <source>Go back one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="239"/>
+        <source>Forward</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="240"/>
+        <source>Go forward one page</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="247"/>
+        <source>Global Search...</source>
+        <translation>全域搜尋...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="314"/>
+        <location filename="../src/TomahawkWindow.cpp" line="331"/>
+        <source>Check For Updates...</source>
+        <translation>檢查更新...</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="749"/>
+        <location filename="../src/TomahawkWindow.cpp" line="756"/>
+        <location filename="../src/TomahawkWindow.cpp" line="764"/>
+        <source>Connect To Peer</source>
+        <translation>連接點對點</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="750"/>
+        <source>Enter peer address:</source>
+        <translation>輸入對等地址：</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="757"/>
+        <source>Enter peer port:</source>
+        <translation>輸入對等連接埠：</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="765"/>
+        <source>Enter peer key:</source>
+        <translation>輸入對等密鑰：</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>XSPF Error</source>
+        <translation>XSPF 錯誤</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="875"/>
+        <source>This is not a valid XSPF playlist.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Failed to save tracks</source>
+        <translation>無法儲存曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="879"/>
+        <source>Some tracks in the playlist do not contain an artist and a title. They will be ignored.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="893"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="895"/>
+        <source>Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="927"/>
+        <source>Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Create New Station</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="929"/>
+        <source>Name:</source>
+        <translation>名稱：</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="992"/>
+        <source>Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1014"/>
+        <source>Automatic Playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1035"/>
+        <source>Pause</source>
+        <translation>暫停</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1069"/>
+        <source>Go &amp;offline</source>
+        <translation>離線</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1076"/>
+        <source>Go &amp;online</source>
+        <translation>上網</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1099"/>
+        <source>Authentication Error</source>
+        <translation>驗證錯誤</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1100"/>
+        <source>Error connecting to SIP: Authentication failed!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1114"/>
+        <source>%1 by %2</source>
+        <comment>track, artist name</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1115"/>
+        <source>%1 - %2</source>
+        <comment>current track, some window title</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1126"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;br/&gt;(%2)&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1130"/>
+        <source>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</source>
+        <translation>&lt;h2&gt;&lt;b&gt;Tomahawk %1&lt;/h2&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1134"/>
+        <source>Copyright 2010 - 2012</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1135"/>
+        <source>Thanks to:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/TomahawkWindow.cpp" line="1142"/>
+        <source>About Tomahawk</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TopTracksContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/TopTracksContext.h" line="47"/>
+        <source>Top Hits</source>
+        <translation>流行精選</translation>
+    </message>
+</context>
+<context>
+    <name>TrackInfoWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="164"/>
+        <source>Cover</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="198"/>
+        <source>Track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="216"/>
+        <source>Artist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="236"/>
+        <source>Album</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="266"/>
+        <source>Statistics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui" line="89"/>
+        <source>Similar Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="96"/>
+        <source>Sorry, but we could not find similar tracks for this song!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="217"/>
+        <source>You&apos;ve listened to this track %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="219"/>
+        <source>You&apos;ve never listened to this track before.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="223"/>
+        <source>You first listened to it on %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="227"/>
+        <source>You&apos;ve listened to %1 %n time(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp" line="229"/>
+        <source>You&apos;ve never listened to %1 before.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TrackView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TrackView.cpp" line="508"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TransferStatusItem</name>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>from</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/jobview/TransferStatusItem.cpp" line="58"/>
+        <source>to</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TreeItemDelegate</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeItemDelegate.cpp" line="148"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TreeModel</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="149"/>
+        <source>All Artists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="267"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="292"/>
+        <source>My Collection</source>
+        <translation>我的收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="269"/>
+        <location filename="../src/libtomahawk/playlist/TreeModel.cpp" line="294"/>
+        <source>Collection of %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TreeView</name>
+    <message>
+        <location filename="../src/libtomahawk/playlist/TreeView.cpp" line="297"/>
+        <source>Sorry, your filter &apos;%1&apos; did not match any results.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TwitterConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="73"/>
+        <source>Configure this Twitter account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="119"/>
+        <source>The Twitter plugin allows you to discover and play music from your Twitter friends running Tomahawk and post messages to your account.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="137"/>
+        <source>Status: No saved credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="166"/>
+        <source>Authenticate with Twitter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="196"/>
+        <source>Twitter Connections</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="202"/>
+        <source>
+If you only want to post tweets, you're done.
+
+If you want to connect Tomahawk to your friends using Twitter, select the type of tweet and press the button below to send a sync message. You must both be following each other as Direct Messages are used. Then be (very) patient -- it can take several minutes!
+
+You can re-send a sync message at any time simply by sending another tweet using the button.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="244"/>
+        <source>Select the kind of tweet you would like, then press the button to post it:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="276"/>
+        <source>Global Tweet</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="281"/>
+        <source>@Mention</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="286"/>
+        <source>Direct Message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="322"/>
+        <source>e.g. @tomahawk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/twitter/TwitterConfigWidget.ui" line="351"/>
+        <source>Send Message</source>
+        <translation>發送訊息</translation>
+    </message>
+</context>
+<context>
+    <name>ViewManager</name>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="281"/>
+        <source>After you have scanned your music collection you will find your tracks right here.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="283"/>
+        <source>This collection is empty.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="342"/>
+        <source>SuperCollection</source>
+        <translation>超級收藏</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="343"/>
+        <source>Combined libraries of all your online friends</source>
+        <translation>聯合您所有線上朋友的音樂庫</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="413"/>
+        <source>Recently Played Tracks</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/ViewManager.cpp" line="414"/>
+        <source>Recently played tracks from all your friends</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="34"/>
+        <source>Recent Additions</source>
+        <translation>最近新增</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="55"/>
+        <source>Newest Stations &amp; Playlists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.ui" line="70"/>
+        <source>Recently Played Tracks</source>
+        <translation>最近播放的曲目</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.cpp" line="150"/>
+        <source>No recently created playlists in your network.</source>
+        <translation>沒有最近建立的播放清單在您的網路。</translation>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WelcomeWidget.h" line="98"/>
+        <source>Welcome to Tomahawk</source>
+        <translation>歡迎到 Tomahawk</translation>
+    </message>
+</context>
+<context>
+    <name>WhatsHotWidget</name>
+    <message>
+        <location filename="../src/libtomahawk/widgets/WhatsHotWidget.h" line="69"/>
+        <source>Charts</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WikipediaContext</name>
+    <message>
+        <location filename="../src/libtomahawk/context/pages/WikipediaContext.h" line="42"/>
+        <source>Wikipedia</source>
+        <translation>維基百科</translation>
+    </message>
+</context>
+<context>
+    <name>XMPPBot</name>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="315"/>
+        <source>
+Terms for %1:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="317"/>
+        <source>No terms found, sorry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="350"/>
+        <source>
+Hotttness for %1: %2
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="366"/>
+        <source>
+Familiarity for %1: %2
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/xmppbot/XmppBot.cpp" line="384"/>
+        <source>
+Lyrics for &quot;%1&quot; by %2:
+
+%3
+</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XSPFLoader</name>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="50"/>
+        <source>Failed to parse contents of XSPF playlist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="52"/>
+        <source>Some playlist entries were found without artist and track name, they will be omitted</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="54"/>
+        <source>Failed to fetch the desired playlist from the network, or the desired file does not exist</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/libtomahawk/utils/XspfLoader.cpp" line="191"/>
+        <source>New Playlist</source>
+        <translation>新播放清單</translation>
+    </message>
+</context>
+<context>
+    <name>XmlConsole</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="14"/>
+        <source>Xml stream console</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="33"/>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="60"/>
+        <source>Filter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.ui" line="43"/>
+        <source>Save log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="62"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="65"/>
+        <source>By JID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="68"/>
+        <source>By namespace uri</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="71"/>
+        <source>By all attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="76"/>
+        <source>Visible stanzas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="79"/>
+        <source>Information query</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="83"/>
+        <source>Message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="87"/>
+        <source>Presence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="91"/>
+        <source>Custom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="107"/>
+        <source>Close</source>
+        <translation>關閉</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="358"/>
+        <source>Save XMPP log to file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmlConsole.cpp" line="359"/>
+        <source>OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XmppConfigWidget</name>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="14"/>
+        <source>Xmpp Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="52"/>
+        <source>Configure this Xmpp account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="89"/>
+        <source>Enter your Xmpp login to connect with your friends using Tomahawk!</source>
+        <translation>輸入您的的 XMPP 登錄，與您使用 Tomahawk 的朋友連線！</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="111"/>
+        <source>Login Information</source>
+        <translation>登入資訊</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="131"/>
+        <source>Xmpp ID:</source>
+        <translation>XMPP 識別碼：</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="147"/>
+        <source>e.g. user@example.com</source>
+        <translation>例如 user@example.com</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="160"/>
+        <source>Password:</source>
+        <translation>密碼：</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="188"/>
+        <source>An account with this name already exists!</source>
+        <translation>這個名字的帳戶已經存在！</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="210"/>
+        <source>Advanced Xmpp Settings</source>
+        <translation>進階 Xmpp 設定</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="230"/>
+        <source>Server:</source>
+        <translation>服務器：</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="253"/>
+        <source>Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="299"/>
+        <source>Lots of servers don&apos;t support this (e.g. GTalk, jabber.org)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="302"/>
+        <source>Publish currently playing track</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/XmppConfigWidget.ui" line="309"/>
+        <source>Enforce secure connection</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>XmppSipPlugin</name>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="372"/>
+        <source>User Interaction</source>
+        <translation>使用者互動</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="375"/>
+        <source>Host is unknown</source>
+        <translation>主機是未知</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="378"/>
+        <source>Item not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="381"/>
+        <source>Authorization Error</source>
+        <translation>授權錯誤</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="384"/>
+        <source>Remote Stream Error</source>
+        <translation>遠端串流錯誤</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="387"/>
+        <source>Remote Connection failed</source>
+        <translation>遠端連線失敗</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="390"/>
+        <source>Internal Server Error</source>
+        <translation>內部服務器錯誤</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="393"/>
+        <source>System shutdown</source>
+        <translation>系統關閉</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="396"/>
+        <source>Conflict</source>
+        <translation>衝突</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="411"/>
+        <source>Unknown</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="780"/>
+        <source>Do you want to add &lt;b&gt;%1&lt;/b&gt; to your friend list?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="399"/>
+        <source>No Compression Support</source>
+        <translation>沒有壓縮支持</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="402"/>
+        <source>No Encryption Support</source>
+        <translation>沒有加密支持</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="405"/>
+        <source>No Authorization Support</source>
+        <translation>沒有授權支持</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="408"/>
+        <source>No Supported Feature</source>
+        <translation>沒有支持的功能</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="475"/>
+        <source>Add Friend</source>
+        <translation>加為好友</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="476"/>
+        <source>Enter Xmpp ID:</source>
+        <translation>輸入XMPP識別碼：</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="632"/>
+        <source>Add Friend...</source>
+        <translation>加為好友...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="637"/>
+        <source>XML Console...</source>
+        <translation>XML的控制台...</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="685"/>
+        <source>I&apos;m sorry -- I&apos;m just an automatic presence used by Tomahawk Player (http://gettomahawk.com). If you are getting this message, the person you are trying to reach is probably not signed on, so please try again later!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/xmpp/sip/XmppSip.cpp" line="779"/>
+        <source>Authorize User</source>
+        <translation>授權用戶</translation>
+    </message>
+</context>
+<context>
+    <name>ZeroconfConfig</name>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="55"/>
+        <source>Local Network configuration</source>
+        <translation>區域網路配置</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="77"/>
+        <source>This plugin will automatically find other users running Tomahawk on your local network</source>
+        <translation>這個插件會自動在您的區域網絡上尋找其他運行 Tomahawk 的用戶</translation>
+    </message>
+    <message>
+        <location filename="../src/accounts/zeroconf/ConfigWidget.ui" line="84"/>
+        <source>Connect automatically when Tomahawk starts</source>
+        <translation>Tomahawk 啟動時自動連接</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/lang/translations.cmake -> tomahawk-0.5.5.tar.bz2/lang/translations.cmake Changed

@@ -1,25 +1,48 @@
-FILE (GLOB TS_FILES ${CMAKE_SOURCE_DIR}/lang/*.ts)
-QT4_ADD_TRANSLATION(QM_FILES ${TS_FILES})
-
-## HACK HACK HACK - around rcc limitations to allow out of source-tree building
-SET( trans_file tomahawk_i18n )
-SET( trans_srcfile ${CMAKE_SOURCE_DIR}/lang/${trans_file}.qrc)
-SET( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc)
-SET( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${trans_file}.cxx)
-
-# Copy the QRC file to the output directory
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${trans_infile}
-  COMMAND ${CMAKE_COMMAND} -E copy ${trans_srcfile} ${trans_infile}
-  MAIN_DEPENDENCY ${trans_srcfile}
-)
-
-# Run the resource compiler (rcc_options should already be set)
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${trans_outfile}
-  COMMAND ${QT_RCC_EXECUTABLE}
-  ARGS ${rcc_options} -name ${trans_file} -o ${trans_outfile} ${trans_infile}
-  MAIN_DEPENDENCY ${trans_infile}
-  DEPENDS ${QM_FILES}
-)
+macro(add_tomahawk_translations language)
+    list(APPEND TOMAHAWK_LANGUAGES ${ARGV})
+
+    set(tomahawk_i18n_qrc_content "<!DOCTYPE RCC><RCC version=\"1.0\">\n")
+
+    # tomahawk and qt language files
+    set(tomahawk_i18n_qrc_content "${tomahawk_i18n_qrc_content}<qresource prefix=\"/lang\">\n")
+    foreach(lang ${TOMAHAWK_LANGUAGES})
+        set(tomahawk_i18n_qrc_content "${tomahawk_i18n_qrc_content}<file>tomahawk_${lang}.qm</file>\n")
+        if(NOT lang STREQUAL "en" AND EXISTS ${QT_TRANSLATIONS_DIR}/qt_${lang}.qm)
+            file(COPY ${QT_TRANSLATIONS_DIR}/qt_${lang}.qm DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+            set(tomahawk_i18n_qrc_content "${tomahawk_i18n_qrc_content}<file>qt_${lang}.qm</file>\n")
+        endif()
+
+        # build explicitly enabled languages
+        list(APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/tomahawk_${lang}.ts")
+    endforeach()
+
+    set(tomahawk_i18n_qrc_content "${tomahawk_i18n_qrc_content}</qresource>\n")
+    set(tomahawk_i18n_qrc_content "${tomahawk_i18n_qrc_content}</RCC>\n")
+
+    file(WRITE ${CMAKE_BINARY_DIR}/lang/tomahawk_i18n.qrc "${tomahawk_i18n_qrc_content}" )
+
+    QT4_ADD_TRANSLATION(QM_FILES ${TS_FILES})
+
+    ## HACK HACK HACK - around rcc limitations to allow out of source-tree building
+    SET( trans_file tomahawk_i18n )
+    SET( trans_srcfile ${CMAKE_BINARY_DIR}/lang/${trans_file}.qrc)
+    SET( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc)
+    SET( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${trans_file}.cxx)
+
+    # Copy the QRC file to the output directory
+    ADD_CUSTOM_COMMAND(
+        OUTPUT ${trans_infile}
+        COMMAND ${CMAKE_COMMAND} -E copy ${trans_srcfile} ${trans_infile}
+        MAIN_DEPENDENCY ${trans_srcfile}
+    )
+
+    # Run the resource compiler (rcc_options should already be set)
+    ADD_CUSTOM_COMMAND(
+        OUTPUT ${trans_outfile}
+        COMMAND ${QT_RCC_EXECUTABLE}
+        ARGS ${rcc_options} -name ${trans_file} -o ${trans_outfile} ${trans_infile}
+        MAIN_DEPENDENCY ${trans_infile}
+        DEPENDS ${QM_FILES}
+    )
+endmacro()

tomahawk-0.4.2.tar.bz2/resources.qrc -> tomahawk-0.5.5.tar.bz2/resources.qrc Changed

@@ -1,7 +1,5 @@
 <RCC>
     <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/filter.png</file>
@@ -9,6 +7,8 @@
         <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/artist-placeholder-grid.png</file>
+        <file>data/images/album-placeholder-grid.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>
@@ -66,12 +66,10 @@
         <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/private-listening.png</file>
         <file>data/images/add.png</file>
         <file>data/images/recently-played.png</file>
@@ -87,6 +85,7 @@
         <file>data/images/station.png</file>
         <file>data/images/new-additions.png</file>
         <file>data/images/charts.png</file>
+        <file>data/images/new-releases.png</file>
         <file>data/images/loved_playlist.png</file>
         <file>data/images/dashboard.png</file>
         <file>data/images/artist-icon.png</file>
@@ -134,7 +133,18 @@
         <file>data/images/no-album-no-case.png</file>
         <file>data/images/rdio.png</file>
         <file>data/images/grooveshark.png</file>
+        <file>data/images/lastfm-icon.png</file>
+        <file>data/images/spotifycore-logo.png</file>
+        <file>data/images/playlist-header-tiled.png</file>
+        <file>data/images/share.png</file>
         <file>data/sql/dbmigrate-27_to_28.sql</file>
         <file>data/images/process-stop.png</file>
+        <file>data/icons/tomahawk-icon-128x128-grayscale.png</file>
+        <file>data/images/collection.png</file>
+        <file>data/misc/tomahawk_pubkey.pem</file>
+        <file>data/images/track-icon-sidebar.png</file>
+        <file>data/images/jump-link.png</file>
+        <file>data/images/scrollbar-vertical-handle.png</file>
+        <file>data/images/scrollbar-horizontal-handle.png</file>
     </qresource>
 </RCC>

tomahawk-0.5.5.tar.bz2/src/AudioControls.cpp Added

@@ -0,0 +1,625 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "AudioControls.h"
+#include "ui_AudioControls.h"
+
+#include <QtNetwork/QNetworkReply>
+#include <QtGui/QDropEvent>
+#include <QtGui/QMouseEvent>
+
+#include "audio/AudioEngine.h"
+#include "playlist/PlaylistView.h"
+#include "database/Database.h"
+#include "widgets/ImageButton.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "Album.h"
+#include "DropJob.h"
+#include "SocialWidget.h"
+#include "GlobalActionManager.h"
+#include "ViewManager.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+
+
+AudioControls::AudioControls( QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::AudioControls )
+    , m_repeatMode( PlaylistModes::NoRepeat )
+    , m_shuffled( false )
+    , m_lastSliderCheck( 0 )
+    , m_parent( parent )
+{
+    ui->setupUi( this );
+    setAcceptDrops( true );
+
+    QFont font( ui->artistTrackLabel->font() );
+    font.setPixelSize( 12 );
+
+    ui->artistTrackLabel->setFont( font );
+    ui->artistTrackLabel->setElideMode( Qt::ElideMiddle );
+    ui->artistTrackLabel->setType( QueryLabel::ArtistAndTrack );
+    ui->artistTrackLabel->setJumpLinkVisible( true );
+
+    ui->albumLabel->setFont( font );
+    ui->albumLabel->setType( QueryLabel::Album );
+
+    ui->timeLabel->setFont( font );
+    ui->timeLeftLabel->setFont( font );
+
+    font.setPixelSize( 9 );
+    ui->ownerLabel->setFont( font );
+
+    ui->prevButton->setPixmap( RESPATH "images/back-rest.png" );
+    ui->prevButton->setPixmap( RESPATH "images/back-pressed.png", QIcon::Off, QIcon::Active );
+    ui->playPauseButton->setPixmap( RESPATH "images/play-rest.png" );
+    ui->playPauseButton->setPixmap( RESPATH "images/play-pressed.png", QIcon::Off, QIcon::Active );
+    ui->pauseButton->setPixmap( RESPATH "images/pause-rest.png" );
+    ui->pauseButton->setPixmap( RESPATH "images/pause-pressed.png", QIcon::Off, QIcon::Active );
+    ui->nextButton->setPixmap( RESPATH "images/skip-rest.png" );
+    ui->nextButton->setPixmap( RESPATH "images/skip-pressed.png", QIcon::Off, QIcon::Active );
+    ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-rest.png" );
+    ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-pressed.png", QIcon::Off, QIcon::Active );
+    ui->repeatButton->setPixmap( RESPATH "images/repeat-off-rest.png" );
+    ui->repeatButton->setPixmap( RESPATH "images/repeat-off-pressed.png", QIcon::Off, QIcon::Active );
+    ui->volumeLowButton->setPixmap( RESPATH "images/volume-icon-muted.png" );
+    ui->volumeHighButton->setPixmap( RESPATH "images/volume-icon-full.png" );
+    ui->socialButton->setPixmap( RESPATH "images/share.png" );
+    ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
+    ui->loveButton->setCheckable( true );
+
+    ui->socialButton->setFixedSize( QSize( 20, 20 ) );
+    ui->loveButton->setFixedSize( QSize( 20, 20 ) );
+
+#ifdef Q_WS_MAC
+    ui->ownerLabel->setForegroundRole( QPalette::Text );
+#else
+    ui->ownerLabel->setForegroundRole( QPalette::Dark );
+#endif
+    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->setEnabled( true );
+    ui->seekSlider->setTimeLine( &m_sliderTimeLine );
+    ui->volumeSlider->setRange( 0, 100 );
+    ui->volumeSlider->setValue( AudioEngine::instance()->volume() );
+
+    m_phononTickCheckTimer.setSingleShot( true );
+
+    connect( &m_phononTickCheckTimer, SIGNAL( timeout() ), SLOT( phononTickCheckTimeout() ) );
+    connect( &m_sliderTimeLine,    SIGNAL( frameChanged( int ) ), ui->seekSlider, SLOT( setValue( int ) ) );
+
+    connect( ui->seekSlider,       SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( seek( int ) ) );
+    connect( ui->volumeSlider,     SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( setVolume( int ) ) );
+    connect( ui->prevButton,       SIGNAL( clicked() ), AudioEngine::instance(), SLOT( previous() ) );
+    connect( ui->playPauseButton,  SIGNAL( clicked() ), AudioEngine::instance(), SLOT( play() ) );
+    connect( ui->pauseButton,      SIGNAL( clicked() ), AudioEngine::instance(), SLOT( pause() ) );
+    connect( ui->nextButton,       SIGNAL( clicked() ), AudioEngine::instance(), SLOT( next() ) );
+    connect( ui->volumeLowButton,  SIGNAL( clicked() ), AudioEngine::instance(), SLOT( lowerVolume() ) );
+    connect( ui->volumeHighButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( raiseVolume() ) );
+
+    connect( ui->playPauseButton,  SIGNAL( clicked() ), SIGNAL( playPressed() ) );
+    connect( ui->pauseButton,      SIGNAL( clicked() ), SIGNAL( pausePressed() ) );
+
+    connect( ui->repeatButton,     SIGNAL( clicked() ), SLOT( onRepeatClicked() ) );
+    connect( ui->shuffleButton,    SIGNAL( clicked() ), SLOT( onShuffleClicked() ) );
+
+    connect( ui->artistTrackLabel, SIGNAL( clickedArtist() ), SLOT( onArtistClicked() ) );
+    connect( ui->artistTrackLabel, SIGNAL( clickedTrack() ),  SLOT( onTrackClicked() ) );
+    connect( ui->albumLabel,       SIGNAL( clickedAlbum() ),  SLOT( onAlbumClicked() ) );
+    connect( ui->socialButton,     SIGNAL( clicked() ),       SLOT( onSocialButtonClicked() ) );
+    connect( ui->loveButton,       SIGNAL( clicked( bool ) ), SLOT( onLoveButtonClicked( bool ) ) );
+
+    // <From AudioEngine>
+    connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), SLOT( onPlaybackLoading( Tomahawk::result_ptr ) ) );
+    connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( onPlaybackStarted( Tomahawk::result_ptr ) ) );
+    connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( onPlaybackPaused() ) );
+    connect( AudioEngine::instance(), SIGNAL( resumed() ), SLOT( onPlaybackResumed() ) );
+    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ) );
+    connect( AudioEngine::instance(), SIGNAL( seeked( qint64 ) ), SLOT( onPlaybackSeeked( qint64 ) ) );
+    connect( AudioEngine::instance(), SIGNAL( timerMilliSeconds( qint64 ) ), SLOT( onPlaybackTimer( qint64 ) ) );
+    connect( AudioEngine::instance(), SIGNAL( volumeChanged( int ) ), SLOT( onVolumeChanged( int ) ) );
+
+    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
+}
+
+
+AudioControls::~AudioControls()
+{
+    delete ui;
+}
+
+
+void
+AudioControls::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+//            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+AudioControls::phononTickCheckTimeout()
+{
+    onPlaybackTimer( m_lastSliderCheck );
+}
+
+
+void
+AudioControls::onVolumeChanged( int volume )
+{
+    ui->volumeSlider->blockSignals( true );
+    ui->volumeSlider->setValue( volume );
+    ui->volumeSlider->blockSignals( false );
+}
+
+
+void
+AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
+{
+    if ( result.isNull() )
+        return;
+
+    if ( m_currentTrack.isNull() || ( !m_currentTrack.isNull() && m_currentTrack.data()->id() != result.data()->id() ) )
+        onPlaybackLoading( result );
+
+    qint64 duration = AudioEngine::instance()->currentTrackTotalTime();
+
+    if ( duration == -1 )
+        duration = result.data()->duration() * 1000;
+
+    ui->seekSlider->setRange( 0, duration );
+    ui->seekSlider->setValue( 0 );
+    ui->seekSlider->setEnabled( AudioEngine::instance()->canSeek() );
+
+    m_phononTickCheckTimer.stop();
+
+    m_sliderTimeLine.stop();
+    m_sliderTimeLine.setDuration( duration );
+    m_sliderTimeLine.setFrameRange( 0, duration );
+    m_sliderTimeLine.setCurveShape( QTimeLine::LinearCurve );
+    m_sliderTimeLine.setCurrentTime( 0 );
+    m_seekMsecs = -1;
+
+    ui->seekSlider->setVisible( true );
+
+    int updateRate = (double)1000 / ( (double)ui->seekSlider->contentsRect().width() / (double)( duration / 1000 ) );
+    m_sliderTimeLine.setUpdateInterval( qBound( 40, updateRate, 500 ) );
+
+    m_noTimeChange = false;
+    m_lastSliderCheck = 0;
+}
+
+
+void
+AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
+{
+    if ( !m_currentTrack.isNull() )
+    {
+        disconnect( m_currentTrack->toQuery().data(), SIGNAL( updated() ), this, SLOT( onCoverUpdated() ) );
+        disconnect( m_currentTrack->toQuery().data(), SIGNAL( socialActionsLoaded() ), this, SLOT( onSocialActionsLoaded() ) );
+    }
+
+    m_currentTrack = result;
+    connect( m_currentTrack->toQuery().data(), SIGNAL( updated() ), SLOT( onCoverUpdated() ) );
+    connect( m_currentTrack->toQuery().data(), SIGNAL( socialActionsLoaded() ), SLOT( onSocialActionsLoaded() ) );
+
+    ui->artistTrackLabel->setResult( result );
+    ui->albumLabel->setResult( result );
+    ui->ownerLabel->setText( result->friendlySource() );
+
+    const QString duration = TomahawkUtils::timeToString( result.data()->duration() );
+    ui->timeLabel->setFixedWidth( ui->timeLabel->fontMetrics().width( QString( duration.length(), QChar( '0' ) ) ) );
+    ui->timeLabel->setText( TomahawkUtils::timeToString( 0 ) );
+    ui->timeLeftLabel->setFixedWidth( ui->timeLeftLabel->fontMetrics().width( QString( duration.length() + 1, QChar( '0' ) ) ) );
+    ui->timeLeftLabel->setText( "-" + duration );
+    m_lastTextSecondShown = 0;
+
+    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
+
+    ui->loveButton->setEnabled( true );
+    ui->loveButton->setVisible( true );
+    ui->socialButton->setEnabled( true );
+    ui->socialButton->setVisible( true );
+
+    setCover();
+    setSocialActions();
+}
+
+
+void
+AudioControls::onCoverUpdated()
+{
+    Query* query = qobject_cast< Query* >( sender() );
+    if ( !query || !m_currentTrack || query != m_currentTrack->toQuery().data() )
+        return;
+
+    setCover();
+}
+
+
+void
+AudioControls::setCover()
+{
+    if ( !m_currentTrack->toQuery()->cover( ui->coverImage->size() ).isNull() )
+    {
+        QPixmap cover;
+        cover = m_currentTrack->toQuery()->cover( ui->coverImage->size() );
+        ui->coverImage->setPixmap( cover, false );
+    }
+    else
+        ui->coverImage->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, ui->coverImage->size() ), true );
+}
+
+
+void
+AudioControls::onSocialActionsLoaded()
+{
+    Query* query = qobject_cast< Query* >( sender() );
+    if ( !query || !m_currentTrack || !query->equals( m_currentTrack->toQuery() ) )
+        return;
+
+    setSocialActions();
+}
+
+
+void
+AudioControls::setSocialActions()
+{
+    if ( m_currentTrack->toQuery()->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 );
+    }
+}
+
+
+void
+AudioControls::onPlaybackPaused()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
+    m_sliderTimeLine.setPaused( true );
+}
+
+
+void
+AudioControls::onPlaybackResumed()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
+    m_sliderTimeLine.resume();
+}
+
+
+void
+AudioControls::onPlaybackSeeked( qint64 msec )
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO << " setting current timer to " << msec;
+    m_sliderTimeLine.setPaused( true );
+    m_sliderTimeLine.setCurrentTime( msec );
+    m_lastSliderCheck = msec;
+    m_seekMsecs = msec;
+}
+
+
+void
+AudioControls::onPlaybackStopped()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+    m_currentTrack.clear();
+
+    ui->artistTrackLabel->setText( "" );
+    ui->albumLabel->setText( "" );
+    ui->ownerLabel->setText( "" );
+    ui->timeLabel->setText( "" );
+    ui->timeLeftLabel->setText( "" );
+    ui->coverImage->setPixmap( QPixmap(), false );
+    ui->seekSlider->setVisible( false );
+    m_sliderTimeLine.stop();
+    m_sliderTimeLine.setCurrentTime( 0 );
+
+    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
+    ui->loveButton->setEnabled( false );
+    ui->loveButton->setVisible( false );
+    ui->socialButton->setEnabled( false );
+    ui->socialButton->setVisible( false );
+}
+
+
+void
+AudioControls::onPlaybackTimer( qint64 msElapsed )
+{
+    const int seconds = msElapsed / 1000;
+    if ( seconds != m_lastTextSecondShown && !m_currentTrack.isNull() )
+    {
+        ui->timeLabel->setText( TomahawkUtils::timeToString( seconds ) );
+        ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( m_currentTrack->duration() - seconds ) );
+        m_lastTextSecondShown = seconds;
+    }
+
+    //tDebug( LOGEXTRA ) << Q_FUNC_INFO << "msElapsed =" << msElapsed << "and timer current time =" << m_sliderTimeLine.currentTime() << "and m_seekMsecs =" << m_seekMsecs;
+    if ( msElapsed > 0 && msElapsed != m_lastSliderCheck && m_seekMsecs == -1 && msElapsed - 500 < m_lastSliderCheck )
+        return;
+    m_lastSliderCheck = msElapsed;
+
+    if ( m_currentTrack.isNull() )
+    {
+        m_sliderTimeLine.stop();
+        return;
+    }
+
+    ui->seekSlider->blockSignals( true );
+
+    if ( sender() != &m_phononTickCheckTimer )
+        m_phononTickCheckTimer.start( 1000 );
+
+    int currentTime = m_sliderTimeLine.currentTime();
+    if ( m_noTimeChange )
+    {
+        if ( currentTime != msElapsed )
+        {
+            m_sliderTimeLine.setPaused( true );
+            m_noTimeChange = false;
+            m_sliderTimeLine.setCurrentTime( msElapsed );
+            m_seekMsecs = -1;
+            m_sliderTimeLine.resume();
+        }
+    }
+    else if ( currentTime >= msElapsed || m_seekMsecs != -1 )
+    {
+        m_sliderTimeLine.setPaused( true );
+
+        m_noTimeChange = false;
+        if ( currentTime == msElapsed )
+            m_noTimeChange = true;
+
+        m_sliderTimeLine.setCurrentTime( msElapsed );
+        m_seekMsecs = -1;
+        if ( AudioEngine::instance()->state() != AudioEngine::Paused && sender() != &m_phononTickCheckTimer )
+            m_sliderTimeLine.resume();
+    }
+    else if ( m_sliderTimeLine.duration() > msElapsed && m_sliderTimeLine.state() == QTimeLine::NotRunning && AudioEngine::instance()->state() == AudioEngine::Playing )
+    {
+        m_sliderTimeLine.start();
+    }
+    else if ( m_sliderTimeLine.state() == QTimeLine::Paused && AudioEngine::instance()->state() != AudioEngine::Paused )
+    {
+        m_sliderTimeLine.resume();
+    }
+
+    ui->seekSlider->blockSignals( false );
+}
+
+
+void
+AudioControls::onRepeatModeChanged( PlaylistModes::RepeatMode mode )
+{
+    m_repeatMode = mode;
+
+    switch ( m_repeatMode )
+    {
+        case PlaylistModes::NoRepeat:
+        {
+            // switch to RepeatOne
+            ui->repeatButton->setPixmap( RESPATH "images/repeat-off-rest.png" );
+            ui->repeatButton->setPixmap( RESPATH "images/repeat-off-pressed.png", QIcon::Off, QIcon::Active );
+        }
+        break;
+
+        case PlaylistModes::RepeatOne:
+        {
+            // switch to RepeatAll
+            ui->repeatButton->setPixmap( RESPATH "images/repeat-1-on-rest.png" );
+            ui->repeatButton->setPixmap( RESPATH "images/repeat-1-on-pressed.png", QIcon::Off, QIcon::Active );
+        }
+        break;
+
+        case PlaylistModes::RepeatAll:
+        {
+            // switch to NoRepeat
+            ui->repeatButton->setPixmap( RESPATH "images/repeat-all-on-rest.png" );
+            ui->repeatButton->setPixmap( RESPATH "images/repeat-all-on-pressed.png", QIcon::Off, QIcon::Active );
+        }
+        break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+AudioControls::onRepeatClicked()
+{
+    switch ( m_repeatMode )
+    {
+        case PlaylistModes::NoRepeat:
+        {
+            // switch to RepeatOne
+            ViewManager::instance()->setRepeatMode( PlaylistModes::RepeatOne );
+        }
+        break;
+
+        case PlaylistModes::RepeatOne:
+        {
+            // switch to RepeatAll
+            ViewManager::instance()->setRepeatMode( PlaylistModes::RepeatAll );
+        }
+        break;
+
+        case PlaylistModes::RepeatAll:
+        {
+            // switch to NoRepeat
+            ViewManager::instance()->setRepeatMode( PlaylistModes::NoRepeat );
+        }
+        break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+AudioControls::onShuffleModeChanged( bool enabled )
+{
+    m_shuffled = enabled;
+
+    if ( m_shuffled )
+    {
+        ui->shuffleButton->setPixmap( RESPATH "images/shuffle-on-rest.png" );
+        ui->shuffleButton->setPixmap( RESPATH "images/shuffle-on-pressed.png", QIcon::Off, QIcon::Active );
+
+        ui->repeatButton->setEnabled( false );
+    }
+    else
+    {
+        ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-rest.png" );
+        ui->shuffleButton->setPixmap( RESPATH "images/shuffle-off-pressed.png", QIcon::Off, QIcon::Active );
+
+        ui->repeatButton->setEnabled( true );
+    }
+}
+
+
+void
+AudioControls::onShuffleClicked()
+{
+    ViewManager::instance()->setShuffled( m_shuffled ^ true );
+}
+
+
+void
+AudioControls::onArtistClicked()
+{
+    ViewManager::instance()->show( m_currentTrack->artist() );
+}
+
+
+void
+AudioControls::onAlbumClicked()
+{
+    ViewManager::instance()->show( m_currentTrack->album() );
+}
+
+
+void
+AudioControls::onTrackClicked()
+{
+    ViewManager::instance()->show( m_currentTrack->toQuery() );
+}
+
+
+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();
+        dj->setDropAction( DropJob::Append );
+        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 no matter what
+        GlobalActionManager::instance()->handlePlayTrack( tracks.first() );
+        ViewManager::instance()->queue()->model()->appendQueries( tracks );
+    }
+}
+
+
+void
+AudioControls::onSocialButtonClicked()
+{
+    if ( !m_socialWidget.isNull() )
+        return;
+
+    m_socialWidget = new SocialWidget( m_parent );
+    m_socialWidget.data()->setPosition( m_socialWidget.data()->mapFromGlobal( QCursor::pos() ) );
+    m_socialWidget.data()->setQuery( m_currentTrack->toQuery() );
+    m_socialWidget.data()->show();
+}
+
+
+void
+AudioControls::onLoveButtonClicked( bool checked )
+{
+    if ( checked )
+    {
+        ui->loveButton->setPixmap( RESPATH "images/loved.png" );
+
+        m_currentTrack->toQuery()->setLoved( true );
+    }
+    else
+    {
+        ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
+
+        m_currentTrack->toQuery()->setLoved( false );
+    }
+}
+

tomahawk-0.5.5.tar.bz2/src/AudioControls.h Added

@@ -0,0 +1,112 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 AUDIOCONTROLS_H
+#define AUDIOCONTROLS_H
+
+#include <QtGui/QWidget>
+#include <QtCore/QTimer>
+#include <QtCore/QTimeLine>
+
+#include "Result.h"
+#include "PlaylistInterface.h"
+#include "Query.h"
+
+class QDropEvent;
+class QDragEnterEvent;
+class QDragMoveEvent;
+class SocialWidget;
+
+namespace Ui
+{
+    class AudioControls;
+}
+
+class AudioControls : public QWidget
+{
+Q_OBJECT
+
+public:
+    AudioControls( QWidget* parent = 0 );
+    ~AudioControls();
+
+signals:
+    void playPressed();
+    void pausePressed();
+
+public slots:
+    void onRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode );
+    void onShuffleModeChanged( bool enabled );
+
+protected:
+    void changeEvent( QEvent* e );
+    void dragEnterEvent ( QDragEnterEvent* );
+    void dragMoveEvent ( QDragMoveEvent* );
+    void dropEvent ( QDropEvent* );
+
+private slots:
+    void phononTickCheckTimeout();
+
+    void onPlaybackStarted( const Tomahawk::result_ptr& result );
+    void onPlaybackLoading( const Tomahawk::result_ptr& result );
+    void onPlaybackPaused();
+    void onPlaybackResumed();
+    void onPlaybackSeeked( qint64 msec );
+    void onPlaybackStopped();
+
+    void onPlaybackTimer( qint64 msElapsed );
+    void onVolumeChanged( int volume );
+
+    void onRepeatClicked();
+    void onShuffleClicked();
+
+    void onArtistClicked();
+    void onAlbumClicked();
+    void onTrackClicked();
+    void onSocialButtonClicked();
+    void onLoveButtonClicked( bool );
+
+    void droppedTracks( QList<Tomahawk::query_ptr> );
+
+    void onCoverUpdated();
+    void onSocialActionsLoaded();
+
+private:
+    void setCover();
+    void setSocialActions();
+
+    Ui::AudioControls* ui;
+    
+    QWeakPointer<SocialWidget> m_socialWidget;
+
+    Tomahawk::result_ptr m_currentTrack;
+    Tomahawk::PlaylistModes::RepeatMode m_repeatMode;
+    bool m_shuffled;
+
+    QTimer m_phononTickCheckTimer;
+    QTimeLine m_sliderTimeLine;
+    qint64 m_seekMsecs;
+    qint64 m_lastSliderCheck;
+    bool m_noTimeChange;
+    qint64 m_lastTextSecondShown;
+
+    QWidget* m_parent;
+};
+
+#endif // AUDIOCONTROLS_H

tomahawk-0.5.5.tar.bz2/src/AudioControls.ui Added

@@ -0,0 +1,612 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AudioControls</class>
+ <widget class="QWidget" name="AudioControls">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>929</width>
+    <height>80</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>80</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>80</height>
+   </size>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_4">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QWidget" name="buttonArea" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>254</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>254</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <layout class="QHBoxLayout" name="buttonAreaLayout">
+      <item>
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="ImageButton" name="prevButton">
+        <property name="text">
+         <string>Prev</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QStackedLayout" name="stackedLayout">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <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">
+        <property name="text">
+         <string>Next</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="metaDataArea" native="true">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>74</height>
+      </size>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <property name="leftMargin">
+       <number>10</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>12</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="FadingPixmap" name="coverImage">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>60</width>
+          <height>60</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>60</width>
+          <height>60</height>
+         </size>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <property name="leftMargin">
+         <number>4</number>
+        </property>
+        <property name="topMargin">
+         <number>6</number>
+        </property>
+        <property name="bottomMargin">
+         <number>2</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0,0">
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <layout class="QVBoxLayout" name="trackLabelLayout">
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="spacing">
+             <number>3</number>
+            </property>
+            <item>
+             <widget class="QueryLabel" name="artistTrackLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Artist</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QueryLabel" name="albumLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>16</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>Album</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <spacer name="horizontalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>4</width>
+              <height>8</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_2">
+            <item>
+             <widget class="QLabel" name="ownerLabel">
+              <property name="font">
+               <font>
+                <pointsize>7</pointsize>
+               </font>
+              </property>
+              <property name="text">
+               <string>Owner</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTop</set>
+              </property>
+              <property name="margin">
+               <number>0</number>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="socialLayout">
+              <item>
+               <spacer name="socialSpacer">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>20</width>
+                  <height>1</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="ImageButton" name="socialButton">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="cursor">
+                 <cursorShape>PointingHandCursor</cursorShape>
+                </property>
+                <property name="text">
+                 <string>social</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="ImageButton" name="loveButton">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="cursor">
+                 <cursorShape>PointingHandCursor</cursorShape>
+                </property>
+                <property name="text">
+                 <string>love</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>1</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>    
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>4</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="timeLabel">
+            <property name="text">
+             <string>Time</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeft|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="SeekSlider" name="seekSlider">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>20</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>20</height>
+             </size>
+            </property>
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="timeLeftLabel">
+            <property name="text">
+             <string>Time Left</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget_4" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>200</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>200</width>
+       <height>66</height>
+      </size>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <property name="spacing">
+       <number>2</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>2</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QWidget" name="widget_6" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <property name="spacing">
+          <number>2</number>
+         </property>
+         <property name="margin">
+          <number>2</number>
+         </property>
+         <item>
+          <spacer name="horizontalSpacer_6">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="ImageButton" name="shuffleButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Shuffle</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="ImageButton" name="repeatButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Repeat</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_7">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" name="widget_5" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_6">
+         <property name="spacing">
+          <number>2</number>
+         </property>
+         <property name="margin">
+          <number>2</number>
+         </property>
+         <item>
+          <widget class="ImageButton" name="volumeLowButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Low</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="SeekSlider" name="volumeSlider">
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>20</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>20</height>
+            </size>
+           </property>
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="ImageButton" name="volumeHighButton">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>High</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </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>
+   <header>widgets/ImageButton.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QueryLabel</class>
+   <extends>QLabel</extends>
+   <header>widgets/QueryLabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>FadingPixmap</class>
+   <extends>QLabel</extends>
+   <header>widgets/FadingPixmap.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.4.2.tar.bz2/src/CMakeLists.txt -> tomahawk-0.5.5.tar.bz2/src/CMakeLists.txt Changed

@@ -13,8 +13,6 @@
 SET( QT_USE_QTXML TRUE )
 SET( QT_USE_QTWEBKIT TRUE )
 
-add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
-
 INCLUDE( ${QT_USE_FILE} )
 INCLUDE( AddAppIconMacro )
 
@@ -37,121 +35,65 @@
 #ENDFOREACH( moddir )
 
 SET( tomahawkSources ${tomahawkSources}
-     web/api_v1.cpp
+     web/Api_v1.cpp
 
-     musicscanner.cpp
-     shortcuthandler.cpp
-     scanmanager.cpp
-     ubuntuunityhack.cpp
-     tomahawkapp.cpp
+     MusicScanner.cpp
+     ShortcutHandler.cpp
+     ScanManager.cpp
+     UbuntuUnityHack.cpp
+     TomahawkApp.cpp
      main.cpp
 )
 
 IF(LIBLASTFM_FOUND)
     SET(tomahawkSources ${tomahawkSources}
-        scrobbler.cpp
+        Scrobbler.cpp
     )
 ENDIF(LIBLASTFM_FOUND)
 
 SET( tomahawkSourcesGui ${tomahawkSourcesGui}
-     sourcetree/sourcesmodel.cpp
-     sourcetree/sourcesproxymodel.cpp
-     sourcetree/sourcetreeview.cpp
-     sourcetree/sourcedelegate.cpp
-     sourcetree/animationhelper.cpp
-     sourcetree/items/sourcetreeitem.cpp
-     sourcetree/items/sourceitem.cpp
-     sourcetree/items/playlistitems.cpp
-     sourcetree/items/categoryitems.cpp
-     sourcetree/items/genericpageitems.cpp
-     sourcetree/items/temporarypageitem.cpp
-     sourcetree/items/groupitem.cpp
-     sourcetree/items/historyitem.cpp
-
-     breakpad/BreakPad.cpp
-
-     tomahawktrayicon.cpp
-     audiocontrols.cpp
-     settingsdialog.cpp
-     diagnosticsdialog.cpp
-     configdelegatebase.cpp
-     sipconfigdelegate.cpp
-     resolverconfigdelegate.cpp
-     settingslistdelegate.cpp
-     resolversmodel.cpp
-     tomahawkwindow.cpp
+     sourcetree/SourcesModel.cpp
+     sourcetree/SourcesProxyModel.cpp
+     sourcetree/SourceTreeView.cpp
+     sourcetree/SourceDelegate.cpp
+     sourcetree/AnimationHelper.cpp
+     sourcetree/items/SourceTreeItem.cpp
+     sourcetree/items/SourceItem.cpp
+     sourcetree/items/PlaylistItems.cpp
+     sourcetree/items/CategoryItems.cpp
+     sourcetree/items/GenericPageItems.cpp
+     sourcetree/items/TemporaryPageItem.cpp
+     sourcetree/items/GroupItem.cpp
+     sourcetree/items/HistoryItem.cpp
+
+     TomahawkTrayIcon.cpp
+     AudioControls.cpp
+     SettingsDialog.cpp
+     DiagnosticsDialog.cpp
+     SettingsListDelegate.cpp
+     TomahawkWindow.cpp
      LoadXSPFDialog.cpp
+     SocialWidget.cpp
 )
 
-SET( tomahawkHeaders ${tomahawkHeaders}
-     tomahawkapp.h
-
-     web/api_v1.h
-
-     musicscanner.h
-     scanmanager.h
-     ubuntuunityhack.h
-     shortcuthandler.h
-)
-
-IF(LIBLASTFM_FOUND)
-    SET(tomahawkHeaders ${tomahawkHeaders}
-        scrobbler.h
-    )
-ENDIF(LIBLASTFM_FOUND)
-
-IF(LIBATTICA_FOUND)
-    SET( tomahawkSourcesGui ${tomahawkSourcesGui} GetNewStuffDialog.cpp GetNewStuffDelegate.cpp GetNewStuffModel.cpp )
-    SET( tomahawkHeadersGui ${tomahawkHeadersGui} GetNewStuffDialog.h GetNewStuffDelegate.h GetNewStuffModel.h )
-    INCLUDE_DIRECTORIES( ${LIBATTICA_INCLUDE_DIR} )
-ENDIF(LIBATTICA_FOUND)
-
-
-SET( tomahawkHeadersGui ${tomahawkHeadersGui}
-     sourcetree/sourcesmodel.h
-     sourcetree/sourcesproxymodel.h
-     sourcetree/sourcetreeview.h
-     sourcetree/sourcedelegate.h
-     sourcetree/animationhelper.h
-     sourcetree/items/sourcetreeitem.h
-     sourcetree/items/sourceitem.h
-     sourcetree/items/playlistitems.h
-     sourcetree/items/categoryitems.h
-     sourcetree/items/genericpageitems.h
-     sourcetree/items/temporarypageitem.h
-     sourcetree/items/groupitem.h
-     sourcetree/items/historyitem.h
-
-     tomahawktrayicon.h
-     audiocontrols.h
-     settingsdialog.h
-     diagnosticsdialog.h
-     configdelegatebase.h
-     resolverconfigdelegate.h
-     sipconfigdelegate.h
-     settingslistdelegate.h
-     resolversmodel.h
-     delegateconfigwrapper.h
-     tomahawkwindow.h
-     LoadXSPFDialog.h
-)
+IF( WITH_BREAKPAD )
+    LIST(APPEND tomahawkSourcesGui breakpad/BreakPad.cpp)
+ENDIF()
 
 SET( tomahawkUI ${tomahawkUI}
-     tomahawkwindow.ui
-     diagnosticsdialog.ui
-     stackedsettingsdialog.ui
-     proxydialog.ui
-
-     audiocontrols.ui
+     TomahawkWindow.ui
+     DiagnosticsDialog.ui
+     StackedSettingsDialog.ui
+     ProxyDialog.ui
 
-     GetNewStuffDialog.ui
+     AudioControls.ui
      LoadXSPFDialog.ui
+     SocialWidget.ui
 )
 
 INCLUDE_DIRECTORIES(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src
 
     audio
     database
@@ -159,7 +101,6 @@
     network
     sourcetree
     topbar
-    utils
     libtomahawk
     mac
 
@@ -171,8 +112,10 @@
     ${TAGLIB_INCLUDES}
     ${PHONON_INCLUDES}
     ${QJSON_INCLUDE_DIR}
-    ${LIBECHONEST_INCLUDE_DIR}
-    ${LIBECHONEST_INCLUDE_DIR}/..
+    ${LIBATTICA_INCLUDE_DIR}
+    ${ECHONEST_INCLUDE_DIR}
+    ${LIBLASTFM_INCLUDE_DIRS}
+    ${LIBLASTFM_INCLUDE_DIRS}/..
 )
 
 SET( OS_SPECIFIC_LINK_LIBRARIES "" )
@@ -185,44 +128,42 @@
 ENDIF( UNIX )
 
 IF( APPLE )
-    INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/thirdparty/SPMediaKeyTap )
+    SET( CMAKE_LINKER_FLAGS "-headerpad_max_install_names ${CMAKE_LINKER_FLAGS}" )
 
-    SET( tomahawkHeaders ${tomahawkHeaders} mac/tomahawkapp_mac.h mac/macshortcuthandler.h )
-    SET( tomahawkSources ${tomahawkSources} mac/tomahawkapp_mac.mm mac/macshortcuthandler.cpp )
+    INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/thirdparty/SPMediaKeyTap )
 
-    IF(HAVE_SPARKLE)
-        SET( tomahawkHeaders ${tomahawkHeaders} ${SPARKLE}/Headers )
-    ENDIF(HAVE_SPARKLE)
+    SET( tomahawkSources ${tomahawkSources} mac/TomahawkApp_Mac.mm mac/MacShortcutHandler.cpp )
 ENDIF( APPLE )
 
-IF(GLOOX_FOUND)
-  INCLUDE_DIRECTORIES( ${GLOOX_INCLUDE_DIR} )
-  SET( tomahawkHeaders ${tomahawkHeaders} xmppbot/xmppbot.h )
-  SET( tomahawkSources ${tomahawkSources} xmppbot/xmppbot.cpp )
-ENDIF(GLOOX_FOUND)
-ADD_SUBDIRECTORY( sip )
+ADD_SUBDIRECTORY( accounts )
+ADD_SUBDIRECTORY( infoplugins )
 
 IF(QCA2_FOUND)
     INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
 ENDIF(QCA2_FOUND)
 
 INCLUDE(GNUInstallDirs)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
+# translations
 include( ${CMAKE_SOURCE_DIR}/lang/translations.cmake )
+add_tomahawk_translations(ar bg ca de en es fr ja pl pt_BR ru sv tr zh_CN zh_TW)
 
-SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${tomahawkHeaders} ${trans_outfile})
+SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${trans_outfile})
 
 IF( BUILD_GUI )
-    LIST(APPEND tomahawkHeaders ${tomahawkHeadersGui})
     LIST(APPEND tomahawkSources ${tomahawkSourcesGui})
     qt4_wrap_ui( tomahawkUI_H ${tomahawkUI} )
+
+    IF( WITH_CRASHREPORTER )
+        ADD_SUBDIRECTORY( breakpad/CrashReporter )
+    ENDIF()
 ENDIF()
 
 kde4_add_app_icon( tomahawkSources "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
 qt4_add_resources( RC_SRCS "../resources.qrc" )
-qt4_wrap_cpp( tomahawkMoc ${tomahawkHeaders} )
+
 SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} )
 
 IF( UNIX AND NOT APPLE )
@@ -230,35 +171,35 @@
 ENDIF( UNIX AND NOT APPLE )
 IF( APPLE )
     ADD_EXECUTABLE( tomahawk MACOSX_BUNDLE ${final_src} )
-    SET_TARGET_PROPERTIES(tomahawk PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/Info.plist"
-)
+    SET_TARGET_PROPERTIES(tomahawk PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/Info.plist")
 ENDIF( APPLE )
 IF( WIN32 )
     ADD_EXECUTABLE( tomahawk WIN32 ${final_src} )
 ENDIF( WIN32 )
 
+SET_TARGET_PROPERTIES(tomahawk PROPERTIES AUTOMOC TRUE)
+
 MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
 
 SET(LINK_LIBRARIES  "")
 IF(LIBLASTFM_FOUND)
-    SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 )
+    SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${LIBLASTFM_LIBRARIES} )
 ENDIF(LIBLASTFM_FOUND)
-IF(GLOOX_FOUND)
-    SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${GLOOX_LIBRARIES} )
-ENDIF(GLOOX_FOUND)
 IF(QCA2_FOUND)
-    SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
+    SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
 ENDIF(QCA2_FOUND)
+IF(WITH_BREAKPAD)
+    SET( LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_breakpad )
+ENDIF()
 
 TARGET_LINK_LIBRARIES( tomahawk
-    tomahawk_breakpad
     ${LINK_LIBRARIES}
     ${TOMAHAWK_LIBRARIES}
     ${PHONON_LIBS}
     ${OS_SPECIFIC_LINK_LIBRARIES}
     ${QT_LIBRARIES}
     ${MAC_EXTRA_LIBS}
-    ${LIBECHONEST_LIBRARY}
+    ${ECHONEST_LIBRARIES}
     ${QXTWEB_LIBRARIES}
     ${QJSON_LIBRARIES}
     ${TAGLIB_LIBRARIES}

tomahawk-0.5.5.tar.bz2/src/Config.h.in Added

tomahawk-0.5.5.tar.bz2/src/ConfigDelegateBase.h Added

@@ -0,0 +1,53 @@
+/*
+    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
+
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef CONFIGDELEGATEBASE_H
+#define CONFIGDELEGATEBASE_H
+
+#include "DllMacro.h"
+
+#include <QStyledItemDelegate>
+
+#define PADDING 4
+
+class QPainter;
+class Q_DECL_EXPORT ConfigDelegateBase : public QStyledItemDelegate
+{
+    Q_OBJECT
+public:
+  ConfigDelegateBase( QObject* parent = 0 );
+  virtual QSize sizeHint ( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+  virtual bool editorEvent ( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
+
+  // if you want to use a checkbox, you need to have this say where to paint it
+  virtual QRect checkRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx, int role ) const = 0;
+  // if you want to use a config wrench, you need to have this say where to paint it
+  virtual QRect configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const = 0;
+
+  virtual QList<int> extraCheckRoles() const { return QList<int>(); }
+signals:
+    void configPressed( const QModelIndex& idx );
+
+protected:
+
+private:
+    QModelIndex m_configPressed;
+};
+
+#endif // CONFIGDELEGATEBASE_H

tomahawk-0.5.5.tar.bz2/src/DiagnosticsDialog.cpp Added

@@ -0,0 +1,187 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *   Copyright 2011, Jeff Mitchell <jeff@tomahawk-player.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 "DiagnosticsDialog.h"
+#include "ui_DiagnosticsDialog.h"
+
+#include "config.h"
+
+#include <QLabel>
+#include <QTextEdit>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QApplication>
+#include <QClipboard>
+#include <QDebug>
+
+#include "accounts/AccountManager.h"
+#include "network/Servent.h"
+#include "SourceList.h"
+
+#include "sip/SipHandler.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
+
+DiagnosticsDialog::DiagnosticsDialog( QWidget *parent )
+    : QDialog( parent )
+    , ui( new Ui::DiagnosticsDialog )
+{
+    ui->setupUi( this );
+
+    connect( ui->clipboardButton, SIGNAL( clicked() ), SLOT( copyToClipboard() ) );
+    connect( ui->logfileButton, SIGNAL( clicked() ), SLOT( openLogfile() ) );
+    connect( ui->buttonBox, SIGNAL( rejected() ), SLOT( reject() ) );
+
+    updateLogView();
+}
+
+
+void
+DiagnosticsDialog::updateLogView()
+{
+    QString log;
+
+    log.append( QString( "TOMAHAWK DIAGNOSTICS LOG -%1 \n\n" ).arg( QDateTime::currentDateTime().toString() ) );
+    log.append( "TOMAHAWK-VERSION: " TOMAHAWK_VERSION "\n\n" );
+    log.append( "NETWORK:\n    General:\n" );
+
+    if ( Servent::instance()->visibleExternally() )
+    {
+        log.append(
+            QString(
+                "      visible: true\n"
+                "      host: %1\n"
+                "      port: %2\n"
+                "\n"
+            ).arg( Servent::instance()->externalAddress() )
+             .arg( Servent::instance()->externalPort() )
+
+        );
+    }
+    else
+    {
+        log.append( "      visible: false" );
+    }
+
+    log.append( "ACCOUNTS:\n" );
+
+    const QList< Tomahawk::source_ptr > sources = SourceList::instance()->sources( true );
+    const QList< Tomahawk::Accounts::Account* > accounts = Tomahawk::Accounts::AccountManager::instance()->accounts( Tomahawk::Accounts::SipType );
+    foreach ( Tomahawk::Accounts::Account* account, accounts )
+    {
+        Q_ASSERT( account && account->sipPlugin() );
+        if ( !account || !account->sipPlugin() )
+            continue;
+
+        connect( account, SIGNAL( connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ), SLOT( updateLogView() ), Qt::UniqueConnection );
+        connect( account, SIGNAL( error( int, QString ) ), SLOT( updateLogView() ), Qt::UniqueConnection );
+        connect( account->sipPlugin(), SIGNAL( peerOnline( QString ) ), SLOT( updateLogView() ), Qt::UniqueConnection );
+        connect( account->sipPlugin(), SIGNAL( peerOffline( QString ) ), SLOT( updateLogView() ), Qt::UniqueConnection );
+        connect( account->sipPlugin(), SIGNAL( sipInfoReceived( QString, SipInfo ) ), SLOT( updateLogView() ), Qt::UniqueConnection );
+        connect( account->sipPlugin(), SIGNAL( softwareVersionReceived( QString, QString ) ), SLOT( updateLogView() ), Qt::UniqueConnection );
+
+        log.append( accountLog( account ) + "\n" );
+    }
+
+    ui->text->setText( log );
+}
+
+
+void
+DiagnosticsDialog::copyToClipboard()
+{
+    QApplication::clipboard()->setText( ui->text->toPlainText() );
+}
+
+
+void
+DiagnosticsDialog::openLogfile()
+{
+    TomahawkUtils::openUrl( Logger::logFile() );
+}
+
+
+QString
+DiagnosticsDialog::accountLog( Tomahawk::Accounts::Account* account )
+{
+    QString accountInfo;
+    QString stateString;
+    switch( account->connectionState() )
+    {
+        case Tomahawk::Accounts::Account::Connecting:
+            stateString = "Connecting";
+            break;
+        case Tomahawk::Accounts::Account::Connected:
+            stateString = "Connected";
+            break;
+
+        case Tomahawk::Accounts::Account::Disconnected:
+            stateString = "Disconnected";
+            break;
+        case Tomahawk::Accounts::Account::Disconnecting:
+            stateString = "Disconnecting";
+    }
+    accountInfo.append(
+        QString( "  %2 (%1): %3 (%4)\n" )
+            .arg( account->accountServiceName() )
+            .arg( account->sipPlugin()->friendlyName() )
+            .arg( account->accountFriendlyName())
+            .arg( stateString )
+    );
+
+    foreach( const QString& peerId, account->sipPlugin()->peersOnline() )
+    {
+        QString versionString = SipHandler::instance()->versionString( peerId );
+        SipInfo sipInfo = SipHandler::instance()->sipInfo( peerId );
+        if ( !sipInfo.isValid() )
+        {
+            accountInfo.append(
+                QString("       %1: %2 %3" /*"(%4)"*/ "\n")
+                    .arg( peerId )
+                    .arg( "sipinfo invalid" )
+                    .arg( versionString )
+                    // .arg( connected ? "connected" : "not connected")
+            );
+        }
+        else if ( sipInfo.isVisible() )
+        {
+            accountInfo.append(
+                QString("       %1: %2:%3 %4" /*" (%5)"*/ "\n")
+                    .arg( peerId )
+                    .arg( sipInfo.host() )
+                    .arg( sipInfo.port() )
+                    .arg( versionString )
+                    // .arg( connected ? "connected" : "not connected")
+            );
+        }
+        else
+        {
+            accountInfo.append(
+                QString("       %1: visible: false %2" /*" (%3)"*/ "\n")
+                    .arg( peerId )
+                    .arg( versionString )
+                    // .arg( connected ? "connected" : "not connected")
+            );
+        }
+    }
+    accountInfo.append( "\n" );
+
+    return accountInfo;
+}
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/DiagnosticsDialog.h Added

@@ -0,0 +1,56 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *
+ *   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 DIGANOSTICSDIALOG_H
+#define DIAGNOSTICSDIALOG_H
+
+#include "accounts/Account.h"
+
+#include <QDialog>
+#include <QMap>
+
+
+class QLabel;
+
+class SipInfo;
+
+namespace Ui
+{
+    class DiagnosticsDialog;
+}
+
+class DiagnosticsDialog : public QDialog
+{
+Q_OBJECT
+
+public:
+    explicit DiagnosticsDialog( QWidget* parent = 0 );
+    ~DiagnosticsDialog() {};
+
+private slots:
+    void updateLogView();
+    void copyToClipboard();
+    void openLogfile();
+
+    QString accountLog( Tomahawk::Accounts::Account* );
+
+private:
+    Ui::DiagnosticsDialog* ui;
+};
+
+#endif // DIAGNOSTICSDIALOG_H

tomahawk-0.5.5.tar.bz2/src/DiagnosticsDialog.ui Added

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DiagnosticsDialog</class>
+ <widget class="QDialog" name="DiagnosticsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>724</width>
+    <height>433</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>353</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <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>
+      <widget class="QTextBrowser" name="text">
+       <property name="lineWrapMode">
+        <enum>QTextEdit::NoWrap</enum>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="clipboardButton">
+       <property name="text">
+        <string>&amp;Copy to Clipboard</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="logfileButton">
+       <property name="text">
+        <string>Open &amp;Log-file</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/HeadlessCheck.h Added

@@ -0,0 +1,35 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 HEADLESSCHECK
+#define HEADLESSCHECK
+
+#ifdef ENABLE_HEADLESS
+
+#define TOMAHAWK_APPLICATION QCoreApplication
+#include <QCoreApplication>
+
+#else
+
+#define TOMAHAWK_APPLICATION QApplication
+#include <QApplication>
+
+#endif
+
+#endif

tomahawk-0.4.2.tar.bz2/src/LoadXSPFDialog.cpp -> tomahawk-0.5.5.tar.bz2/src/LoadXSPFDialog.cpp Changed

tomahawk-0.4.2.tar.bz2/src/LoadXSPFDialog.ui -> tomahawk-0.5.5.tar.bz2/src/LoadXSPFDialog.ui Changed

tomahawk-0.5.5.tar.bz2/src/MusicScanner.cpp Added

@@ -0,0 +1,385 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "MusicScanner.h"
+
+#include <QtCore/QCoreApplication>
+
+#include "utils/TomahawkUtils.h"
+#include "TomahawkSettings.h"
+#include "SourceList.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_DirMtimes.h"
+#include "database/DatabaseCommand_FileMTimes.h"
+#include "database/DatabaseCommand_CollectionStats.h"
+#include "database/DatabaseCommand_AddFiles.h"
+#include "database/DatabaseCommand_DeleteFiles.h"
+#include "taghandlers/tag.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+void
+DirLister::go()
+{
+    foreach ( const QString& dir, m_dirs )
+    {
+        m_opcount++;
+        QMetaObject::invokeMethod( this, "scanDir", Qt::QueuedConnection, Q_ARG( QDir, QDir( dir, 0 ) ), Q_ARG( int, 0 ) );
+    }
+}
+
+
+void
+DirLister::scanDir( QDir dir, int depth )
+{
+    if ( isDeleting() )
+    {
+        m_opcount--;
+        if ( m_opcount == 0 )
+            emit finished();
+
+        return;
+    }
+
+    tDebug( LOGVERBOSE ) << "DirLister::scanDir scanning:" << dir.canonicalPath();
+    if ( !dir.exists() )
+    {
+        tDebug( LOGVERBOSE ) << "Dir no longer exists, not scanning";
+
+        m_opcount--;
+        if ( m_opcount == 0 )
+            emit finished();
+
+        return;
+    }
+
+    QFileInfoList dirs;
+
+    dir.setFilter( QDir::Files | QDir::Readable | QDir::NoDotAndDotDot );
+    dir.setSorting( QDir::Name );
+    dirs = dir.entryInfoList();
+
+    foreach ( const QFileInfo& di, dirs )
+        emit fileToScan( di );
+
+    dir.setFilter( QDir::Dirs | QDir::Readable | QDir::NoDotAndDotDot );
+    dirs = dir.entryInfoList();
+
+    foreach ( const QFileInfo& di, dirs )
+    {
+        const QString canonical = di.canonicalFilePath();
+        m_opcount++;
+        QMetaObject::invokeMethod( this, "scanDir", Qt::QueuedConnection, Q_ARG( QDir, di.canonicalFilePath() ), Q_ARG( int, depth + 1 ) );
+    }
+
+    m_opcount--;
+    if ( m_opcount == 0 )
+    {
+        tDebug() << Q_FUNC_INFO << "emitting finished";
+        emit finished();
+    }
+}
+
+
+MusicScanner::MusicScanner( const QStringList& dirs, quint32 bs )
+    : QObject()
+    , m_dirs( dirs )
+    , m_batchsize( bs )
+    , m_dirListerThreadController( 0 )
+{
+    m_ext2mime.insert( "mp3",  TomahawkUtils::extensionToMimetype( "mp3" ) );
+    m_ext2mime.insert( "ogg",  TomahawkUtils::extensionToMimetype( "ogg" ) );
+    m_ext2mime.insert( "oga",  TomahawkUtils::extensionToMimetype( "oga" ) );
+    m_ext2mime.insert( "mpc",  TomahawkUtils::extensionToMimetype( "mpc" ) );
+    m_ext2mime.insert( "wma",  TomahawkUtils::extensionToMimetype( "wma" ) );
+    m_ext2mime.insert( "aac",  TomahawkUtils::extensionToMimetype( "aac" ) );
+    m_ext2mime.insert( "m4a",  TomahawkUtils::extensionToMimetype( "m4a" ) );
+    m_ext2mime.insert( "mp4",  TomahawkUtils::extensionToMimetype( "mp4" ) );
+    m_ext2mime.insert( "flac", TomahawkUtils::extensionToMimetype( "flac" ) );
+    m_ext2mime.insert( "aiff", TomahawkUtils::extensionToMimetype( "aiff" ) );
+    m_ext2mime.insert( "aif",  TomahawkUtils::extensionToMimetype( "aif" ) );
+}
+
+
+MusicScanner::~MusicScanner()
+{
+    tDebug() << Q_FUNC_INFO;
+
+    if ( !m_dirLister.isNull() )
+    {
+        m_dirListerThreadController->quit();;
+        m_dirListerThreadController->wait( 60000 );
+
+        delete m_dirLister.data();
+        delete m_dirListerThreadController;
+        m_dirListerThreadController = 0;
+    }
+}
+
+
+void
+MusicScanner::startScan()
+{
+    tDebug( LOGVERBOSE ) << "Loading mtimes...";
+    m_scanned = m_skipped = m_cmdQueue = 0;
+    m_skippedFiles.clear();
+
+    SourceList::instance()->getLocal()->scanningProgress( m_scanned );
+
+    // trigger the scan once we've loaded old filemtimes
+    //FIXME: For multiple collection support make sure the right prefix gets passed in...or not...
+    //bear in mind that simply passing in the top-level of a defined collection means it will not return items that need
+    //to be removed that aren't in that root any longer -- might have to do the filtering in setMTimes based on strings
+    DatabaseCommand_FileMtimes *cmd = new DatabaseCommand_FileMtimes();
+    connect( cmd, SIGNAL( done( QMap< QString, QMap< unsigned int, unsigned int > > ) ),
+                    SLOT( setFileMtimes( QMap< QString, QMap< unsigned int, unsigned int > > ) ) );
+
+    Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
+    return;
+}
+
+
+void
+MusicScanner::setFileMtimes( const QMap< QString, QMap< unsigned int, unsigned int > >& m )
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << m.count();
+    m_filemtimes = m;
+    scan();
+}
+
+
+void
+MusicScanner::scan()
+{
+    tDebug( LOGEXTRA ) << "Num saved file mtimes from last scan:" << m_filemtimes.size();
+
+    connect( this, SIGNAL( batchReady( QVariantList, QVariantList ) ),
+                     SLOT( commitBatch( QVariantList, QVariantList ) ), Qt::DirectConnection );
+
+    m_dirListerThreadController = new QThread( this );
+
+    m_dirLister = QWeakPointer< DirLister >( new DirLister( m_dirs ) );
+    m_dirLister.data()->moveToThread( m_dirListerThreadController );
+
+    connect( m_dirLister.data(), SIGNAL( fileToScan( QFileInfo ) ),
+                                   SLOT( scanFile( QFileInfo ) ), Qt::QueuedConnection );
+
+    // queued, so will only fire after all dirs have been scanned:
+    connect( m_dirLister.data(), SIGNAL( finished() ),
+                                   SLOT( listerFinished() ), Qt::QueuedConnection );
+
+    m_dirListerThreadController->start( QThread::IdlePriority );
+    QMetaObject::invokeMethod( m_dirLister.data(), "go" );
+}
+
+
+void
+MusicScanner::listerFinished()
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+
+    // any remaining stuff that wasnt emitted as a batch:
+    foreach( const QString& key, m_filemtimes.keys() )
+        m_filesToDelete << m_filemtimes key .keys().first();
+
+    tDebug( LOGINFO ) << "Scanning complete, saving to database. ( deleted" << m_filesToDelete.count() << "- scanned" << m_scanned << "- skipped" << m_skipped << ")";
+    tDebug( LOGEXTRA ) << "Skipped the following files (no tags / no valid audio):";
+    foreach ( const QString& s, m_skippedFiles )
+        tDebug( LOGEXTRA ) << s;
+
+    if ( m_filesToDelete.length() || m_scannedfiles.length() )
+    {
+        SourceList::instance()->getLocal()->updateIndexWhenSynced();
+        commitBatch( m_scannedfiles, m_filesToDelete );
+        m_scannedfiles.clear();
+        m_filesToDelete.clear();
+    }
+    else
+        cleanup();
+}
+
+
+void
+MusicScanner::cleanup()
+{
+    if ( !m_dirLister.isNull() )
+    {
+        m_dirListerThreadController->quit();;
+        m_dirListerThreadController->wait( 60000 );
+
+        delete m_dirLister.data();
+        delete m_dirListerThreadController;
+        m_dirListerThreadController = 0;
+    }
+
+    tDebug() << Q_FUNC_INFO << "emitting finished!";
+    emit finished();
+}
+
+
+void
+MusicScanner::commitBatch( const QVariantList& tracks, const QVariantList& deletethese )
+{
+    if ( deletethese.length() )
+    {
+        tDebug( LOGINFO ) << Q_FUNC_INFO << "deleting" << deletethese.length() << "tracks";
+        executeCommand( QSharedPointer<DatabaseCommand>( new DatabaseCommand_DeleteFiles( deletethese, SourceList::instance()->getLocal() ) ) );
+    }
+
+    if ( tracks.length() )
+    {
+        tDebug( LOGINFO ) << Q_FUNC_INFO << "adding" << tracks.length() << "tracks";
+        executeCommand( QSharedPointer<DatabaseCommand>( new DatabaseCommand_AddFiles( tracks, SourceList::instance()->getLocal() ) ) );
+    }
+}
+
+
+void
+MusicScanner::executeCommand( QSharedPointer< DatabaseCommand > cmd )
+{
+    tDebug() << Q_FUNC_INFO << m_cmdQueue;
+    m_cmdQueue++;
+    connect( cmd.data(), SIGNAL( finished() ), SLOT( commandFinished() ) );
+    Database::instance()->enqueue( cmd );
+}
+
+
+void
+MusicScanner::commandFinished()
+{
+    tDebug() << Q_FUNC_INFO << m_cmdQueue;
+
+    if ( --m_cmdQueue == 0 )
+        cleanup();
+}
+
+
+void
+MusicScanner::scanFile( const QFileInfo& fi )
+{
+    if ( m_filemtimes.contains( "file://" + fi.canonicalFilePath() ) )
+    {
+        if ( fi.lastModified().toUTC().toTime_t() == m_filemtimes.value( "file://" + fi.canonicalFilePath() ).values().first() )
+        {
+            m_filemtimes.remove( "file://" + fi.canonicalFilePath() );
+            return;
+        }
+
+        m_filesToDelete << m_filemtimes.value( "file://" + fi.canonicalFilePath() ).keys().first();
+        m_filemtimes.remove( "file://" + fi.canonicalFilePath() );
+    }
+
+    //tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Scanning file:" << fi.canonicalFilePath();
+    QVariant m = readFile( fi );
+    if ( m.toMap().isEmpty() )
+        return;
+
+    m_scannedfiles << m;
+    if ( m_batchsize != 0 && (quint32)m_scannedfiles.length() >= m_batchsize )
+    {
+        emit batchReady( m_scannedfiles, m_filesToDelete );
+        m_scannedfiles.clear();
+        m_filesToDelete.clear();
+    }
+}
+
+
+QVariant
+MusicScanner::readFile( const QFileInfo& fi )
+{
+    const QString suffix = fi.suffix().toLower();
+
+    if ( !m_ext2mime.contains( suffix ) )
+    {
+        return QVariantMap(); // invalid extension
+    }
+
+    if ( m_scanned )
+        if ( m_scanned % 3 == 0 )
+            SourceList::instance()->getLocal()->scanningProgress( m_scanned );
+    if ( m_scanned % 100 == 0 )
+        tDebug( LOGINFO ) << "Scan progress:" << m_scanned << fi.canonicalFilePath();
+
+    #ifdef COMPLEX_TAGLIB_FILENAME
+        const wchar_t *encodedName = reinterpret_cast< const wchar_t * >( fi.canonicalFilePath().utf16() );
+    #else
+        QByteArray fileName = QFile::encodeName( fi.canonicalFilePath() );
+        const char *encodedName = fileName.constData();
+    #endif
+
+    TagLib::FileRef f( encodedName );
+    if ( f.isNull() || !f.tag() )
+    {
+        m_skippedFiles << fi.canonicalFilePath();
+        m_skipped++;
+        return QVariantMap();
+    }
+
+    int bitrate = 0;
+    int duration = 0;
+
+    Tag *tag = Tag::fromFile( f );
+    if ( f.audioProperties() )
+    {
+        TagLib::AudioProperties *properties = f.audioProperties();
+        duration = properties->length();
+        bitrate = properties->bitrate();
+    }
+
+    QString artist, album, track;
+    if ( tag )
+    {
+        artist = tag->artist().trimmed();
+        album  = tag->album().trimmed();
+        track  = tag->title().trimmed();
+    }
+    if ( !tag || artist.isEmpty() || track.isEmpty() )
+    {
+        // FIXME: do some clever filename guessing
+        m_skippedFiles << fi.canonicalFilePath();
+        m_skipped++;
+        return QVariantMap();
+    }
+
+    QString mimetype = m_ext2mime.value( suffix );
+    QString url( "file://%1" );
+
+    QVariantMap m;
+    m"url"          = url.arg( fi.canonicalFilePath() );
+    m"mtime"        = fi.lastModified().toUTC().toTime_t();
+    m"size"         = (unsigned int)fi.size();
+    m"mimetype"     = mimetype;
+    m"duration"     = duration;
+    m"bitrate"      = bitrate;
+    m"artist"       = artist;
+    m"album"        = album;
+    m"track"        = track;
+    m"albumpos"     = tag->track();
+    m"year"         = tag->year();
+    m"albumartist"  = tag->albumArtist();
+    m"composer"     = tag->composer();
+    m"discnumber"   = tag->discNumber();
+    m"hash"         = ""; // TODO
+
+    m_scanned++;
+    return m;
+}

tomahawk-0.5.5.tar.bz2/src/MusicScanner.h Added

@@ -0,0 +1,127 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 MUSICSCANNER_H
+#define MUSICSCANNER_H
+
+#include "TomahawkSettings.h"
+#include "database/DatabaseCommand.h"
+
+/* taglib */
+#include <taglib/fileref.h>
+#include <taglib/tag.h>
+
+#include <QtCore/QVariantMap>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QString>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
+#include <QtCore/QMutex>
+#include <QtCore/QMutexLocker>
+#include <QtCore/QWeakPointer>
+#include <database/Database.h>
+
+// descend dir tree comparing dir mtimes to last known mtime
+// emit signal for any dir with new content, so we can scan it.
+// finally, emit the list of new mtimes we observed.
+class DirLister : public QObject
+{
+Q_OBJECT
+
+public:
+
+    DirLister( const QStringList& dirs )
+        : QObject(), m_dirs( dirs ), m_opcount( 0 ), m_deleting( false )
+    {
+        qDebug() << Q_FUNC_INFO;
+    }
+
+    ~DirLister()
+    {
+        qDebug() << Q_FUNC_INFO;
+    }
+
+    bool isDeleting() { QMutexLocker locker( &m_deletingMutex ); return m_deleting; };
+    void setIsDeleting() { QMutexLocker locker( &m_deletingMutex ); m_deleting = true; };
+
+signals:
+    void fileToScan( QFileInfo );
+    void finished();
+
+private slots:
+    void go();
+    void scanDir( QDir dir, int depth );
+
+private:
+    QStringList m_dirs;
+
+    uint m_opcount;
+    QMutex m_deletingMutex;
+    bool m_deleting;
+};
+
+
+class MusicScanner : public QObject
+{
+Q_OBJECT
+
+public:
+    MusicScanner( const QStringList& dirs, quint32 bs = 0 );
+    ~MusicScanner();
+
+signals:
+    //void fileScanned( QVariantMap );
+    void finished();
+    void batchReady( const QVariantList&, const QVariantList& );
+
+private:
+    QVariant readFile( const QFileInfo& fi );
+    void executeCommand( QSharedPointer< DatabaseCommand > cmd );
+
+private slots:
+    void listerFinished();
+    void scanFile( const QFileInfo& fi );
+    void setFileMtimes( const QMap< QString, QMap< unsigned int, unsigned int > >& m );
+    void startScan();
+    void scan();
+    void cleanup();
+    void commitBatch( const QVariantList& tracks, const QVariantList& deletethese );
+    void commandFinished();
+
+private:
+    QStringList m_dirs;
+    QMap<QString, QString> m_ext2mime; // eg: mp3 -> audio/mpeg
+    unsigned int m_scanned;
+    unsigned int m_skipped;
+
+    QList<QString> m_skippedFiles;
+    QMap<QString, QMap< unsigned int, unsigned int > > m_filemtimes;
+
+    unsigned int m_cmdQueue;
+
+    QVariantList m_scannedfiles;
+    QVariantList m_filesToDelete;
+    quint32 m_batchsize;
+
+    QWeakPointer< DirLister > m_dirLister;
+    QThread* m_dirListerThreadController;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/ProxyDialog.ui Added

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProxyDialog</class>
+ <widget class="QDialog" name="ProxyDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>222</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Proxy Settings</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>2</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="rightMargin">
+      <number>8</number>
+     </property>
+     <property name="horizontalSpacing">
+      <number>4</number>
+     </property>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="hostLineEdit">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="placeholderText">
+        <string>Hostname of proxy server</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="hostLabel">
+       <property name="text">
+        <string>Host</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="portLabel">
+       <property name="text">
+        <string>Port</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="portSpinBox">
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>65535</number>
+       </property>
+       <property name="value">
+        <number>1080</number>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="userLineEdit">
+       <property name="placeholderText">
+        <string>Proxy login</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="userLabel">
+       <property name="text">
+        <string>User</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="passwordLabel">
+       <property name="text">
+        <string>Password</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="passwordLineEdit">
+       <property name="echoMode">
+        <enum>QLineEdit::Password</enum>
+       </property>
+       <property name="placeholderText">
+        <string>Proxy password</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>No Proxy Hosts:
+(Overrides system proxy)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="noHostLineEdit">
+       <property name="placeholderText">
+        <string>localhost *.example.com (space separated)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="dnsLabel">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QCheckBox" name="checkBoxUseProxyForDns">
+       <property name="layoutDirection">
+        <enum>Qt::RightToLeft</enum>
+       </property>
+       <property name="text">
+        <string>Use proxy for DNS lookups?</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>ProxyDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>ProxyDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

tomahawk-0.5.5.tar.bz2/src/ResolverConfigDelegate.cpp Added

@@ -0,0 +1,153 @@
+/* === 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 "ResolverConfigDelegate.h"
+
+// #include "resolversmodel.h"
+#include "ExternalResolverGui.h"
+
+#include <QApplication>
+#include <QPainter>
+#include <QMouseEvent>
+
+#include "utils/Logger.h"
+
+#define PADDING 4
+#define ICONSIZE 24
+
+
+ResolverConfigDelegate::ResolverConfigDelegate( QObject* parent )
+    : ConfigDelegateBase( parent )
+{
+    connect( this, SIGNAL( configPressed( QModelIndex ) ), this, SLOT( onConfigPressed( QModelIndex ) ) );
+}
+
+void
+ResolverConfigDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, index );
+    QRect itemRect = opt.rect;
+    int top = itemRect.top();
+
+    QFont name = opt.font;
+    name.setPointSize( name.pointSize() + 2 );
+    name.setBold( true );
+
+    QFont path = opt.font;
+    path.setItalic( true );
+    path.setPointSize( path.pointSize() - 1 );
+
+    const bool error =  (Tomahawk::ExternalResolver::ErrorState)index.data( ResolversModel::ErrorState ).toInt() != Tomahawk::ExternalResolver::NoError;
+    const bool fileNotFound = (Tomahawk::ExternalResolver::ErrorState)index.data( ResolversModel::ErrorState ).toInt() == Tomahawk::ExternalResolver::FileNotFound;
+    const bool failedToLoad = (Tomahawk::ExternalResolver::ErrorState)index.data( ResolversModel::ErrorState ).toInt() == Tomahawk::ExternalResolver::FailedToLoad;
+
+    QFontMetrics bfm( name );
+    QFontMetrics sfm( path );
+
+    // draw the background
+    const QWidget* w = opt.widget;
+    QStyle* style = w ? w->style() : QApplication::style();
+    style->drawPrimitive( QStyle::PE_PanelItemViewItem, &opt, painter, w );
+
+    int rightSplit = itemRect.width();
+    QRect confRect = QRect( rightSplit - ICONSIZE - 2 * PADDING, 2 * PADDING + top, ICONSIZE, ICONSIZE );
+
+    // if the Resolver.has a config widget, paint it first (right-aligned)
+    if( index.data( ResolversModel::HasConfig ).toBool() ) {
+        QStyleOptionToolButton topt;
+        topt.rect = confRect;
+        topt.pos = confRect.topLeft();
+
+        drawConfigWrench( painter, opt, topt );
+    }
+
+    // draw check
+    QRect checkRect = confRect;
+    checkRect.moveTo( 2 * PADDING, 2 * PADDING + top );
+    opt.rect = checkRect;
+    drawCheckBox( opt, painter, w );
+    itemRect.setX( opt.rect.topRight().x() + PADDING );
+
+    painter->save();
+    painter->setFont( name );
+    QRect textRect = itemRect.adjusted( PADDING, PADDING, -PADDING, -PADDING );
+
+    if( index.data( ResolversModel::HasConfig ).toBool() )
+        textRect.setRight( confRect.topLeft().x() - PADDING );
+
+    textRect.setBottom( itemRect.height() / 2 + top  );
+    QString nameStr = bfm.elidedText( index.data( ResolversModel::ResolverName ).toString(),Qt::ElideRight, textRect.width() );
+    painter->drawText( textRect, nameStr );
+    painter->restore();
+
+    painter->save();
+    painter->setFont( path );
+    QString pathStr = index.data( ResolversModel::ResolverPath ).toString();
+    if( error )
+    {
+        painter->setPen( QColor( Qt::red ).lighter( 150 ) );
+    } else {
+        painter->setPen( Qt::gray );
+    }
+
+    if( fileNotFound ) {
+        pathStr = tr( "Not found: %1" ).arg( pathStr );
+    } else if ( failedToLoad )
+    {
+        pathStr = tr( "Failed to load: %1" ).arg( pathStr );
+    }
+
+    textRect.moveTop(  itemRect.height() / 2 + top );
+    pathStr = sfm.elidedText( pathStr, Qt::ElideMiddle, textRect.width() );
+    painter->drawText( textRect, pathStr );
+    painter->restore();
+
+}
+
+QRect
+ResolverConfigDelegate::configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const
+{
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, idx );
+    QRect itemRect = opt.rect;
+    int top = itemRect.top();
+
+    QRect confRect = QRect( itemRect.width() - ICONSIZE - 2 * PADDING, 2 * PADDING + top, ICONSIZE, ICONSIZE );
+    return confRect;
+}
+
+QRect
+ResolverConfigDelegate::checkRectForIndex( const QStyleOptionViewItem &option, const QModelIndex &idx, int role ) const
+{
+    Q_UNUSED( role );
+
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, idx );
+    QRect itemRect = opt.rect;
+    int top = itemRect.top();
+
+    QRect checkRect = QRect(2 * PADDING, 2 * PADDING + top, ICONSIZE, ICONSIZE );
+    return checkRect;
+}
+
+void
+ResolverConfigDelegate::onConfigPressed( const QModelIndex& idx )
+{
+    emit openConfig( idx.data( ResolversModel::ResolverPath ).toString() );
+}

tomahawk-0.5.5.tar.bz2/src/ResolverConfigDelegate.h Added

@@ -0,0 +1,42 @@
+/* === 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 RESOLVERCONFIGDELEGATE_H
+#define RESOLVERCONFIGDELEGATE_H
+
+#include "ConfigDelegateBase.h"
+
+class ResolverConfigDelegate : public ConfigDelegateBase
+{
+    Q_OBJECT
+public:
+    explicit ResolverConfigDelegate( QObject* parent = 0 );
+    virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+    virtual QRect checkRectForIndex( const QStyleOptionViewItem &option, const QModelIndex &idx, int role ) const;
+    virtual QRect configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const;
+
+private slots:
+    void onConfigPressed ( const QModelIndex& );
+
+signals:
+    void openConfig( const QString& resolverPath );
+};
+
+#endif // RESOLVERCONFIGDELEGATE_H

tomahawk-0.5.5.tar.bz2/src/ScanManager.cpp Added

@@ -0,0 +1,230 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "ScanManager.h"
+
+#include <QtCore/QThread>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+
+#include "MusicScanner.h"
+#include "TomahawkSettings.h"
+#include "utils/TomahawkUtils.h"
+#include "libtomahawk/SourceList.h"
+
+#include "database/Database.h"
+#include "database/DatabaseCommand_FileMTimes.h"
+#include "database/DatabaseCommand_DeleteFiles.h"
+
+#include "utils/Logger.h"
+
+ScanManager* ScanManager::s_instance = 0;
+
+
+ScanManager*
+ScanManager::instance()
+{
+    return s_instance;
+}
+
+
+ScanManager::ScanManager( QObject* parent )
+    : QObject( parent )
+    , m_musicScannerThreadController( 0 )
+    , m_currScannerPaths()
+{
+    s_instance = this;
+
+    m_scanTimer = new QTimer( this );
+    m_scanTimer->setSingleShot( false );
+    m_scanTimer->setInterval( TomahawkSettings::instance()->scannerTime() * 1000 );
+
+    connect( TomahawkSettings::instance(), SIGNAL( changed() ), SLOT( onSettingsChanged() ) );
+    connect( m_scanTimer, SIGNAL( timeout() ), SLOT( scanTimerTimeout() ) );
+
+    if ( TomahawkSettings::instance()->hasScannerPaths() )
+    {
+        m_currScannerPaths = TomahawkSettings::instance()->scannerPaths();
+        m_scanTimer->start();
+        if ( TomahawkSettings::instance()->watchForChanges() )
+            QTimer::singleShot( 1000, this, SLOT( runStartupScan() ) );
+    }
+}
+
+
+ScanManager::~ScanManager()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    if ( !m_scanner.isNull() )
+    {
+        m_musicScannerThreadController->quit();
+        m_musicScannerThreadController->wait( 60000 );
+
+        delete m_scanner.data();
+        delete m_musicScannerThreadController;
+        m_musicScannerThreadController = 0;
+    }
+    qDebug() << Q_FUNC_INFO << "scanner thread controller finished, exiting ScanManager";
+}
+
+
+void
+ScanManager::onSettingsChanged()
+{
+    if ( !TomahawkSettings::instance()->watchForChanges() && m_scanTimer->isActive() )
+        m_scanTimer->stop();
+
+    m_scanTimer->setInterval( TomahawkSettings::instance()->scannerTime() * 1000 );
+
+    if ( TomahawkSettings::instance()->hasScannerPaths() &&
+        m_currScannerPaths != TomahawkSettings::instance()->scannerPaths() )
+    {
+        m_currScannerPaths = TomahawkSettings::instance()->scannerPaths();
+        runScan();
+    }
+
+    if ( TomahawkSettings::instance()->watchForChanges() && !m_scanTimer->isActive() )
+        m_scanTimer->start();
+}
+
+
+void
+ScanManager::runStartupScan()
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
+        QTimer::singleShot( 1000, this, SLOT( runStartupScan() ) );
+    else
+        runScan();
+}
+
+
+void
+ScanManager::scanTimerTimeout()
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( !TomahawkSettings::instance()->watchForChanges() ||
+         !Database::instance() ||
+         ( Database::instance() && !Database::instance()->isReady() ) )
+        return;
+    else
+        runScan();
+}
+
+
+void
+ScanManager::runScan( bool manualFull )
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( !Database::instance() || ( Database::instance() && !Database::instance()->isReady() ) )
+        return;
+
+    if ( !m_musicScannerThreadController && m_scanner.isNull() ) //still running if these are not zero
+    {
+        if ( manualFull )
+        {
+            DatabaseCommand_DeleteFiles *cmd = new DatabaseCommand_DeleteFiles( SourceList::instance()->getLocal() );
+            connect( cmd, SIGNAL( finished() ), SLOT( filesDeleted() ) );
+            Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
+            return;
+        }
+
+        DatabaseCommand_FileMtimes *cmd = new DatabaseCommand_FileMtimes( true );
+        connect( cmd, SIGNAL( done( const QMap< QString, QMap< unsigned int, unsigned int > >& ) ),
+                        SLOT( fileMtimesCheck( const QMap< QString, QMap< unsigned int, unsigned int > >& ) ) );
+
+        Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
+    }
+    else
+    {
+        qDebug() << "Could not run dir scan, old scan still running";
+        return;
+    }
+}
+
+
+void
+ScanManager::fileMtimesCheck( const QMap< QString, QMap< unsigned int, unsigned int > >& mtimes )
+{
+    if ( !mtimes.isEmpty() && TomahawkSettings::instance()->scannerPaths().isEmpty() )
+    {
+        DatabaseCommand_DeleteFiles *cmd = new DatabaseCommand_DeleteFiles( SourceList::instance()->getLocal() );
+        connect( cmd, SIGNAL( finished() ), SLOT( filesDeleted() ) );
+        Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
+        return;
+    }
+
+    runDirScan();
+}
+
+
+void
+ScanManager::filesDeleted()
+{
+    if ( !TomahawkSettings::instance()->scannerPaths().isEmpty() )
+        runDirScan();
+    else
+        scannerFinished();
+}
+
+
+void
+ScanManager::runDirScan()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    QStringList paths = TomahawkSettings::instance()->scannerPaths();
+
+    if ( !m_musicScannerThreadController && m_scanner.isNull() ) //still running if these are not zero
+    {
+        m_scanTimer->stop();
+        m_musicScannerThreadController = new QThread( this );
+        m_scanner = QWeakPointer< MusicScanner >( new MusicScanner( paths ) );
+        m_scanner.data()->moveToThread( m_musicScannerThreadController );
+        connect( m_scanner.data(), SIGNAL( finished() ), SLOT( scannerFinished() ) );
+        m_musicScannerThreadController->start( QThread::IdlePriority );
+        QMetaObject::invokeMethod( m_scanner.data(), "startScan" );
+    }
+    else
+    {
+        qDebug() << "Could not run dir scan, old scan still running";
+        return;
+    }
+}
+
+
+void
+ScanManager::scannerFinished()
+{
+    tDebug() << "deleting scanner";
+    if ( !m_scanner.isNull() )
+    {
+        m_musicScannerThreadController->quit();
+        m_musicScannerThreadController->wait( 60000 );
+
+        delete m_scanner.data();
+        delete m_musicScannerThreadController;
+        m_musicScannerThreadController = 0;
+    }
+
+    m_scanTimer->start();
+    SourceList::instance()->getLocal()->scanningFinished( 0 );
+    emit finished();
+}

tomahawk-0.5.5.tar.bz2/src/ScanManager.h Added

@@ -0,0 +1,75 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 SCANMANAGER_H
+#define SCANMANAGER_H
+
+#include "Typedefs.h"
+
+#include <QtCore/QHash>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
+#include <QtCore/QWeakPointer>
+#include <QtCore/QSet>
+
+class MusicScanner;
+class QThread;
+class QFileSystemWatcher;
+class QTimer;
+
+class ScanManager : public QObject
+{
+Q_OBJECT
+
+public:
+    static ScanManager* instance();
+
+    explicit ScanManager( QObject* parent = 0 );
+    virtual ~ScanManager();
+
+signals:
+    void finished();
+
+public slots:
+    void runScan( bool manualFull = false );
+    void runDirScan();
+
+private slots:
+    void scannerFinished();
+
+    void runStartupScan();
+    void scanTimerTimeout();
+
+    void onSettingsChanged();
+
+    void fileMtimesCheck( const QMap< QString, QMap< unsigned int, unsigned int > >& mtimes );
+    void filesDeleted();
+
+private:
+    static ScanManager* s_instance;
+
+    QWeakPointer< MusicScanner > m_scanner;
+    QThread* m_musicScannerThreadController;
+    QStringList m_currScannerPaths;
+
+    QTimer* m_scanTimer;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/Scrobbler.cpp Added

@@ -0,0 +1,173 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "Scrobbler.h"
+
+#include <QDir>
+#include <QSettings>
+#include <QCryptographicHash>
+
+#include "Artist.h"
+#include "Album.h"
+#include "Typedefs.h"
+#include "audio/AudioEngine.h"
+#include "TomahawkSettings.h"
+#include "infosystem/InfoSystem.h"
+#include "Source.h"
+
+#include "utils/Logger.h"
+
+static QString s_scInfoIdentifier = QString( "SCROBBLER" );
+
+
+Scrobbler::Scrobbler( QObject* parent )
+    : QObject( parent )
+    , m_reachedScrobblePoint( false )
+{
+    connect( AudioEngine::instance(), SIGNAL( timerSeconds( unsigned int ) ),
+                                        SLOT( engineTick( unsigned int ) ), Qt::QueuedConnection );
+
+    connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+             SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+             SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
+
+    connect( AudioEngine::instance(), SIGNAL( started( const Tomahawk::result_ptr& ) ),
+             SLOT( trackStarted( const Tomahawk::result_ptr& ) ), Qt::QueuedConnection );
+
+    connect( AudioEngine::instance(), SIGNAL( paused() ),
+             SLOT( trackPaused() ), Qt::QueuedConnection );
+
+    connect( AudioEngine::instance(), SIGNAL( resumed() ),
+             SLOT( trackResumed() ), Qt::QueuedConnection );
+
+    connect( AudioEngine::instance(), SIGNAL( stopped() ),
+             SLOT( trackStopped() ), Qt::QueuedConnection );
+
+    connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) );
+}
+
+
+Scrobbler::~Scrobbler()
+{
+}
+
+
+void
+Scrobbler::trackStarted( const Tomahawk::result_ptr& track )
+{
+    Q_ASSERT( QThread::currentThread() == thread() );
+
+    if ( m_reachedScrobblePoint )
+    {
+        m_reachedScrobblePoint = false;
+        scrobble();
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash trackInfo;
+    trackInfo"title" = track->track();
+    trackInfo"artist" = track->artist()->name();
+    trackInfo"album" = track->album()->name();
+    trackInfo"duration" = QString::number( track->duration() );
+    trackInfo"albumpos" = QString::number( track->albumpos() );
+
+    QVariantMap playInfo;
+    playInfo"trackinfo" = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
+    playInfo"private" = TomahawkSettings::instance()->privateListeningMode();
+
+    Tomahawk::InfoSystem::InfoPushData pushData (
+        s_scInfoIdentifier, Tomahawk::InfoSystem::InfoSubmitNowPlaying,
+        playInfo,
+        Tomahawk::InfoSystem::PushNoFlag );
+
+    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
+
+    // liblastfm forces 0-length tracks to scrobble after 4 minutes, stupid.
+    if ( track->duration() == 0 )
+        m_scrobblePoint = lastfm::ScrobblePoint( 30 );
+    else
+        m_scrobblePoint = lastfm::ScrobblePoint( track->duration() / 2 );
+}
+
+
+void
+Scrobbler::trackPaused()
+{
+    Q_ASSERT( QThread::currentThread() == thread() );
+}
+
+
+void
+Scrobbler::trackResumed()
+{
+    Q_ASSERT( QThread::currentThread() == thread() );
+}
+
+
+void
+Scrobbler::trackStopped()
+{
+    Q_ASSERT( QThread::currentThread() == thread() );
+
+    if ( m_reachedScrobblePoint )
+    {
+        m_reachedScrobblePoint = false;
+        scrobble();
+    }
+}
+
+
+void
+Scrobbler::engineTick( unsigned int secondsElapsed )
+{
+    if ( secondsElapsed > m_scrobblePoint )
+        m_reachedScrobblePoint = true;
+}
+
+
+void
+Scrobbler::scrobble()
+{
+    Q_ASSERT( QThread::currentThread() == thread() );
+
+    Tomahawk::InfoSystem::InfoPushData pushData (
+        s_scInfoIdentifier, Tomahawk::InfoSystem::InfoSubmitScrobble,
+        QVariant(), Tomahawk::InfoSystem::PushNoFlag );
+
+    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
+}
+
+
+void
+Scrobbler::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
+{
+    Q_UNUSED( output );
+    if ( requestData.caller == s_scInfoIdentifier )
+        qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+Scrobbler::infoSystemFinished( QString target )
+{
+    if ( target == s_scInfoIdentifier )
+    {
+        qDebug() << Q_FUNC_INFO;
+        qDebug() << "Scrobbler received done signal from InfoSystem";
+    }
+}

tomahawk-0.5.5.tar.bz2/src/Scrobbler.h Added

@@ -0,0 +1,58 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWK_SCROBBLER_H
+#define TOMAHAWK_SCROBBLER_H
+
+#include "lastfm/ScrobblePoint.h"
+#include "Result.h"
+#include "infosystem/InfoSystem.h"
+
+#include <QObject>
+
+/**
+ * Simple class that listens to signals from AudioEngine and scrobbles
+ *  what it is playing.
+ */
+class Scrobbler : public QObject
+{
+    Q_OBJECT
+public:
+    Scrobbler( QObject* parent = 0 );
+    virtual ~Scrobbler();
+
+public slots:
+    void trackStarted( const Tomahawk::result_ptr& );
+    void trackPaused();
+    void trackResumed();
+    void trackStopped();
+    void engineTick( unsigned int secondsElapsed );
+
+    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void infoSystemFinished( QString target );
+
+private:
+    void scrobble();
+
+    bool m_reachedScrobblePoint;
+    lastfm::ScrobblePoint m_scrobblePoint;
+};
+
+
+#endif

tomahawk-0.5.5.tar.bz2/src/SearchBox.ui Added

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GlobalSearchWidget</class>
+ <widget class="QWidget" name="GlobalSearchWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>345</width>
+    <height>51</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="SearchLineEdit" name="searchEdit">
+     <property name="minimumSize">
+      <size>
+       <width>60</width>
+       <height>27</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>180</width>
+       <height>16777215</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>libtomahawk/playlist/topbar/SearchLineEdit.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/SettingsDialog.cpp Added

@@ -0,0 +1,570 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "SettingsDialog.h"
+#include "config.h"
+
+#include <QtGui/QDesktopServices>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMessageBox>
+#include <QtNetwork/QNetworkConfiguration>
+#include <QtNetwork/QNetworkProxy>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QSizeGrip>
+
+#include "AtticaManager.h"
+#include "AclRegistry.h"
+#include "TomahawkApp.h"
+#include "TomahawkSettings.h"
+#include "accounts/DelegateConfigWrapper.h"
+#include "MusicScanner.h"
+#include "Pipeline.h"
+#include "Resolver.h"
+#include "ExternalResolverGui.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/GuiHelpers.h"
+#include "ScanManager.h"
+#include "SettingsListDelegate.h"
+#include "accounts/AccountDelegate.h"
+#include "database/Database.h"
+#include "network/Servent.h"
+#include "utils/AnimatedSpinner.h"
+#include "accounts/AccountModel.h"
+#include "accounts/Account.h"
+#include "accounts/AccountManager.h"
+#include <accounts/AccountModelFilterProxy.h>
+#include <accounts/ResolverAccount.h>
+#include "utils/Logger.h"
+#include "accounts/AccountFactoryWrapper.h"
+#include "accounts/spotify/SpotifyAccount.h"
+
+#include "ui_ProxyDialog.h"
+#include "ui_StackedSettingsDialog.h"
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+SettingsDialog::SettingsDialog( QWidget *parent )
+    : QDialog( parent )
+    , ui( new Ui_StackedSettingsDialog )
+    , m_proxySettings( this )
+    , m_rejected( false )
+    , m_restartRequired( false )
+    , m_accountModel( 0 )
+    , m_sipSpinner( 0 )
+{
+    ui->setupUi( this );
+    TomahawkSettings* s = TomahawkSettings::instance();
+
+    TomahawkUtils::unmarginLayout( layout() );
+    ui->stackedWidget->setContentsMargins( 4, 4, 4, 0 );
+
+    ui->checkBoxReporter->setChecked( s->crashReporterEnabled() );
+    ui->checkBoxHttp->setChecked( s->httpEnabled() );
+
+
+    //Network settings
+    TomahawkSettings::ExternalAddressMode mode = TomahawkSettings::instance()->externalAddressMode();
+    if ( mode == TomahawkSettings::Lan )
+        ui->lanOnlyRadioButton->setChecked( true );
+    else if ( mode == TomahawkSettings::Static )
+        ui->staticIpRadioButton->setChecked( true );
+    else
+        ui->upnpRadioButton->setChecked( true );
+
+    ui->staticHostNamePortLabel->setEnabled( ui->staticIpRadioButton->isChecked() );
+    ui->staticHostName->setEnabled( ui->staticIpRadioButton->isChecked() );
+    ui->staticPort->setEnabled( ui->staticIpRadioButton->isChecked() );
+    ui->staticHostNameLabel->setEnabled( ui->staticIpRadioButton->isChecked() );
+    ui->staticPortLabel->setEnabled( ui->staticIpRadioButton->isChecked() );
+
+    bool useProxy = TomahawkSettings::instance()->proxyType() == QNetworkProxy::Socks5Proxy;
+    ui->enableProxyCheckBox->setChecked( useProxy );
+    ui->proxyButton->setEnabled( useProxy );
+
+    ui->aclEntryClearButton->setEnabled( TomahawkSettings::instance()->aclEntries().size() > 0 );
+    connect( ui->aclEntryClearButton, SIGNAL( clicked( bool ) ), this, SLOT( aclEntryClearButtonClicked() ) );
+
+    createIcons();
+#ifdef Q_WS_X11
+    ui->listWidget->setFrameShape( QFrame::StyledPanel );
+    ui->listWidget->setFrameShadow( QFrame::Sunken );
+    setContentsMargins( 4, 4, 4, 4 );
+#else
+    setContentsMargins( 0, 4, 4, 4 );
+#endif
+
+#ifdef Q_WS_MAC
+    ui->listWidget->setFixedWidth( 83 );
+#endif
+
+#ifdef Q_WS_MAC
+    // Avoid resize handles on sheets on osx
+    m_proxySettings.setSizeGripEnabled( true );
+    QSizeGrip* p = m_proxySettings.findChild< QSizeGrip* >();
+    p->setFixedSize( 0, 0 );
+
+    ui->groupBoxNetworkAdvanced->layout()->removeItem( ui->verticalSpacer );
+    ui->groupBoxNetworkAdvanced->layout()->removeItem( ui->verticalSpacer_2 );
+    ui->groupBoxNetworkAdvanced->layout()->removeItem( ui->verticalSpacer_4 );
+    delete ui->verticalSpacer;
+    delete ui->verticalSpacer_2;
+    delete ui->verticalSpacer_4;
+#endif
+
+    // Accounts
+    AccountDelegate* accountDelegate = new AccountDelegate( this );
+    ui->accountsView->setItemDelegate( accountDelegate );
+    ui->accountsView->setContextMenuPolicy( Qt::CustomContextMenu );
+    ui->accountsView->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
+    ui->accountsView->setMouseTracking( true );
+
+    connect( accountDelegate, SIGNAL( openConfig( Tomahawk::Accounts::Account* ) ), this, SLOT( openAccountConfig( Tomahawk::Accounts::Account* ) ) );
+    connect( accountDelegate, SIGNAL( openConfig( Tomahawk::Accounts::AccountFactory* ) ), this, SLOT( openAccountFactoryConfig( Tomahawk::Accounts::AccountFactory* ) ) );
+    connect( accountDelegate, SIGNAL( update( QModelIndex ) ), ui->accountsView, SLOT( update( QModelIndex ) ) );
+
+    m_accountModel = new AccountModel( this );
+    m_accountProxy = new AccountModelFilterProxy( m_accountModel );
+    m_accountProxy->setSourceModel( m_accountModel );
+
+    connect( m_accountProxy, SIGNAL( startInstalling( QPersistentModelIndex ) ), accountDelegate, SLOT( startInstalling(QPersistentModelIndex) ) );
+    connect( m_accountProxy, SIGNAL( doneInstalling( QPersistentModelIndex ) ), accountDelegate, SLOT( doneInstalling(QPersistentModelIndex) ) );
+    connect( m_accountProxy, SIGNAL( errorInstalling( QPersistentModelIndex ) ), accountDelegate, SLOT( errorInstalling(QPersistentModelIndex) ) );
+    connect( m_accountProxy, SIGNAL( scrollTo( QModelIndex ) ), this, SLOT( scrollTo( QModelIndex ) ) );
+
+    ui->accountsView->setModel( m_accountProxy );
+
+    connect( ui->installFromFileBtn, SIGNAL( clicked( bool ) ), this, SLOT( installFromFile() ) );
+    connect( m_accountModel, SIGNAL( createAccount( Tomahawk::Accounts::AccountFactory* ) ), this, SLOT( createAccountFromFactory( Tomahawk::Accounts::AccountFactory* ) ) );
+
+    ui->accountsFilterCombo->addItem( tr( "All" ), Accounts::NoType );
+    ui->accountsFilterCombo->addItem( accountTypeToString( SipType ), SipType );
+    ui->accountsFilterCombo->addItem( accountTypeToString( ResolverType ), ResolverType );
+    ui->accountsFilterCombo->addItem( accountTypeToString( StatusPushType ), StatusPushType );
+
+    connect( ui->accountsFilterCombo, SIGNAL( activated( int ) ), this, SLOT( accountsFilterChanged( int ) ) );
+
+    if ( !Servent::instance()->isReady() )
+    {
+        m_sipSpinner = new AnimatedSpinner( ui->accountsView );
+        m_sipSpinner->fadeIn();
+
+        connect( Servent::instance(), SIGNAL( ready() ), this, SLOT( serventReady() ) );
+    }
+
+    // ADVANCED
+    ui->staticHostName->setText( s->externalHostname() );
+    ui->staticPort->setValue( s->externalPort() );
+    ui->proxyButton->setVisible( true );
+
+    ui->checkBoxWatchForChanges->setChecked( s->watchForChanges() );
+    ui->scannerTimeSpinBox->setValue( s->scannerTime() );
+    ui->enableEchonestCatalog->setChecked( s->enableEchonestCatalogs() );
+
+    connect( ui->checkBoxWatchForChanges, SIGNAL( clicked( bool ) ), SLOT( updateScanOptionsView() ) );
+
+    if ( ui->checkBoxWatchForChanges->isChecked() )
+    {
+        ui->scanTimeLabel->show();
+        ui->scannerTimeSpinBox->show();
+    }
+    else
+    {
+        ui->scanTimeLabel->hide();
+        ui->scannerTimeSpinBox->hide();
+    }
+
+    foreach ( const QString& dir, TomahawkSettings::instance()->scannerPaths() )
+    {
+        ui->dirTree->checkPath( dir, Qt::Checked );
+    }
+
+    // NOW PLAYING
+// #ifdef Q_WS_MAC
+//     ui->checkBoxEnableAdium->setChecked( s->nowPlayingEnabled() );
+// #else
+//     ui->checkBoxEnableAdium->hide();
+// #endif
+
+    connect( ui->proxyButton,  SIGNAL( clicked() ),  SLOT( showProxySettings() ) );
+    connect( ui->lanOnlyRadioButton, SIGNAL( toggled(bool) ), SLOT( requiresRestart() ) );
+    connect( ui->staticIpRadioButton, SIGNAL( toggled(bool) ), SLOT( requiresRestart() ) );
+    connect( ui->upnpRadioButton, SIGNAL( toggled(bool) ), SLOT( requiresRestart() ) );
+    connect( ui->lanOnlyRadioButton, SIGNAL( toggled(bool) ), SLOT( toggleRemoteMode() ) );
+    connect( ui->staticIpRadioButton, SIGNAL( toggled(bool) ), SLOT( toggleRemoteMode() ) );
+    connect( ui->upnpRadioButton, SIGNAL( toggled(bool) ), SLOT( toggleRemoteMode() ) );
+    connect( ui->enableProxyCheckBox, SIGNAL( toggled(bool) ), SLOT( toggleProxyEnabled() ) );
+    connect( this, SIGNAL( rejected() ), SLOT( onRejected() ) );
+
+    ui->listWidget->setCurrentRow( 0 );
+    ui->listWidget->setItemDelegate(new SettingsListDelegate());
+}
+
+
+SettingsDialog::~SettingsDialog()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    if ( !m_rejected )
+    {
+        TomahawkSettings* s = TomahawkSettings::instance();
+
+        s->setCrashReporterEnabled( ui->checkBoxReporter->checkState() == Qt::Checked );
+        s->setHttpEnabled( ui->checkBoxHttp->checkState() == Qt::Checked );
+        s->setProxyType( ui->enableProxyCheckBox->isChecked() ? QNetworkProxy::Socks5Proxy : QNetworkProxy::NoProxy );
+        s->setExternalAddressMode( ui->upnpRadioButton->isChecked() ? TomahawkSettings::Upnp : ( ui->lanOnlyRadioButton->isChecked() ? TomahawkSettings::Lan : TomahawkSettings::Static ) );
+
+        s->setExternalHostname( ui->staticHostName->text() );
+        s->setExternalPort( ui->staticPort->value() );
+
+        s->setScannerPaths( ui->dirTree->getCheckedPaths() );
+        s->setWatchForChanges( ui->checkBoxWatchForChanges->isChecked() );
+        s->setScannerTime( ui->scannerTimeSpinBox->value() );
+        s->setEnableEchonestCatalogs( ui->enableEchonestCatalog->isChecked() );
+
+//         s->setNowPlayingEnabled( ui->checkBoxEnableAdium->isChecked() );
+
+        s->applyChanges();
+        s->sync();
+
+        if ( m_restartRequired )
+            QMessageBox::information( this, tr( "Information" ), tr( "Some changed settings will not take effect until Tomahawk is restarted" ) );
+
+        TomahawkUtils::NetworkProxyFactory* proxyFactory = TomahawkUtils::proxyFactory();
+        if ( !ui->enableProxyCheckBox->isChecked() )
+        {
+            tDebug() << Q_FUNC_INFO << "Got NoProxy selected";
+            proxyFactory->setProxy( QNetworkProxy::NoProxy );
+        }
+        else
+        {
+            tDebug() << Q_FUNC_INFO << "Got Socks5Proxy selected";
+            proxyFactory->setProxy( QNetworkProxy( QNetworkProxy::Socks5Proxy, s->proxyHost(), s->proxyPort(), s->proxyUsername(), s->proxyPassword() ) );
+            if ( !s->proxyNoProxyHosts().isEmpty() )
+            {
+                tDebug() << Q_FUNC_INFO << "noproxy hosts:" << s->proxyNoProxyHosts();
+                tDebug() << Q_FUNC_INFO << "split noproxy line edit is " << s->proxyNoProxyHosts().split( ' ', QString::SkipEmptyParts );
+                proxyFactory->setNoProxyHosts( s->proxyNoProxyHosts().split( ' ', QString::SkipEmptyParts ) );
+            }
+        }
+    }
+    else
+        qDebug() << "Settings dialog cancelled, NOT saving prefs.";
+
+    delete ui;
+}
+
+
+void
+SettingsDialog::serventReady()
+{
+    m_sipSpinner->fadeOut();
+}
+
+
+void
+SettingsDialog::createIcons()
+{
+    /// Not fun but QListWidget sucks. Do our max-width calculation manually
+    /// so the icons arre lined up.
+    // Resolvers is the longest string... in english. fml.
+
+    ensurePolished();
+
+    int maxlen = 0;
+    QFontMetrics fm( font() );
+    QListWidgetItem *accountsButton = new QListWidgetItem( ui->listWidget );
+    accountsButton->setIcon( QIcon( RESPATH "images/account-settings.png" ) );
+    accountsButton->setText( tr( "Services" ) );
+    accountsButton->setTextAlignment( Qt::AlignHCenter );
+    accountsButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
+    maxlen = fm.width( accountsButton->text() );
+
+    QListWidgetItem *musicButton = new QListWidgetItem( ui->listWidget );
+    musicButton->setIcon( QIcon( RESPATH "images/music-settings.png" ) );
+    musicButton->setText( tr( "Collection" ) );
+    musicButton->setTextAlignment( Qt::AlignHCenter );
+    musicButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
+    maxlen = qMax( fm.width( musicButton->text() ), maxlen );
+
+    QListWidgetItem *advancedButton = new QListWidgetItem( ui->listWidget );
+    advancedButton->setIcon( QIcon( RESPATH "images/advanced-settings.png" ) );
+    advancedButton->setText( tr( "Advanced" ) );
+    advancedButton->setTextAlignment( Qt::AlignHCenter );
+    advancedButton->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
+    maxlen = qMax( fm.width( advancedButton->text() ), maxlen );
+
+    maxlen += 15; // padding
+    accountsButton->setSizeHint( QSize( maxlen, 60 ) );
+    musicButton->setSizeHint( QSize( maxlen, 60 ) );
+    advancedButton->setSizeHint( QSize( maxlen, 60 ) );
+
+#ifndef Q_WS_MAC
+    // doesn't listen to sizehint...
+    ui->listWidget->setFixedWidth( maxlen + 8 );
+#endif
+
+    connect( ui->listWidget, SIGNAL( currentItemChanged( QListWidgetItem*, QListWidgetItem* ) ), SLOT( changePage( QListWidgetItem*, QListWidgetItem* ) ) );
+}
+
+
+void
+SettingsDialog::changePage( QListWidgetItem* current, QListWidgetItem* previous )
+{
+    if ( !current )
+        current = previous;
+
+    ui->stackedWidget->setCurrentIndex( ui->listWidget->row(current) );
+}
+
+
+void
+SettingsDialog::onRejected()
+{
+    m_rejected = true;
+}
+
+
+void
+SettingsDialog::changeEvent( QEvent *e )
+{
+    QDialog::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+SettingsDialog::showProxySettings()
+{
+    m_proxySettings.exec();
+    if ( m_proxySettings.result() == QDialog::Accepted )
+        m_proxySettings.saveSettings();
+}
+
+
+void
+SettingsDialog::toggleRemoteMode()
+{
+    ui->staticHostNamePortLabel->setEnabled( ui->staticIpRadioButton->isChecked() );
+    ui->staticHostName->setEnabled( ui->staticIpRadioButton->isChecked() );
+    ui->staticPort->setEnabled( ui->staticIpRadioButton->isChecked() );
+    ui->staticHostNameLabel->setEnabled( ui->staticIpRadioButton->isChecked() );
+    ui->staticPortLabel->setEnabled( ui->staticIpRadioButton->isChecked() );
+}
+
+
+void
+SettingsDialog::toggleProxyEnabled()
+{
+    ui->proxyButton->setEnabled( ui->enableProxyCheckBox->isChecked() );
+}
+
+
+void
+SettingsDialog::updateScanOptionsView()
+{
+    if ( ui->checkBoxWatchForChanges->isChecked() )
+    {
+        ui->scanTimeLabel->show();
+        ui->scannerTimeSpinBox->show();
+    }
+    else
+    {
+        ui->scanTimeLabel->hide();
+        ui->scannerTimeSpinBox->hide();
+    }
+}
+
+
+void
+SettingsDialog::accountsFilterChanged( int )
+{
+    AccountType filter = static_cast< AccountType >( ui->accountsFilterCombo->itemData( ui->accountsFilterCombo->currentIndex() ).toInt() );
+    m_accountProxy->setFilterType( filter );
+}
+
+
+void
+SettingsDialog::openAccountFactoryConfig( AccountFactory* factory )
+{
+    QList< Account* > accts;
+    foreach ( Account* acct, AccountManager::instance()->accounts() )
+    {
+        if ( AccountManager::instance()->factoryForAccount( acct ) == factory )
+            accts << acct;
+        if ( accts.size() > 1 )
+            break;
+    }
+    Q_ASSERT( accts.size() > 0 ); // Shouldn't have a config wrench if there are no accounts!
+    if ( accts.size() == 1 )
+    {
+        // If there's just one, open the config directly w/ the delete button. Otherwise open the multi dialog
+        openAccountConfig( accts.first(), true );
+        return;
+    }
+
+#ifndef Q_OS_MAC
+    AccountFactoryWrapper dialog( factory, this );
+    QWeakPointer< AccountFactoryWrapper > watcher( &dialog );
+
+    dialog.exec();
+#else
+    // on osx a sheet needs to be non-modal
+    AccountFactoryWrapper* dialog = new AccountFactoryWrapper( factory, this );
+    dialog->show();
+#endif
+}
+
+
+void
+SettingsDialog::createAccountFromFactory( AccountFactory* factory )
+{
+    TomahawkUtils::createAccountFromFactory( factory, this );
+}
+
+
+void
+SettingsDialog::openAccountConfig( Account* account, bool showDelete )
+{
+    TomahawkUtils::openAccountConfig( account, this, showDelete );
+}
+
+
+void
+SettingsDialog::installFromFile()
+{
+    const QString resolver = QFileDialog::getOpenFileName( this, tr( "Install resolver from file" ), TomahawkSettings::instance()->scriptDefaultPath() );
+
+    if( !resolver.isEmpty() )
+    {
+        const QFileInfo resolverAbsoluteFilePath( resolver );
+        TomahawkSettings::instance()->setScriptDefaultPath( resolverAbsoluteFilePath.absolutePath() );
+
+        if ( resolverAbsoluteFilePath.baseName() == "spotify_tomahawkresolver" )
+        {
+            // HACK if this is a spotify resolver, we treat is specially.
+            // usually we expect the user to just download the spotify resolver from attica,
+            // however developers, those who build their own tomahawk, can't do that, or linux
+            // users can't do that. However, we have an already-existing SpotifyAccount that we
+            // know exists that we need to use this resolver path.
+            //
+            // Hence, we special-case the spotify resolver and directly set the path on it here.
+            SpotifyAccount* acct = 0;
+            foreach ( Account* account, AccountManager::instance()->accounts() )
+            {
+                if ( SpotifyAccount* spotify = qobject_cast< SpotifyAccount* >( account ) )
+                {
+                    acct = spotify;
+                    break;
+                }
+            }
+
+            if ( acct )
+            {
+                acct->setManualResolverPath( resolver );
+                return;
+            }
+        }
+
+        Account* acct = AccountManager::instance()->accountFromPath( resolver );
+
+        AccountManager::instance()->addAccount( acct );
+        TomahawkSettings::instance()->addAccount( acct->accountId() );
+        AccountManager::instance()->enableAccount( acct );
+    }
+}
+
+
+void
+SettingsDialog::aclEntryClearButtonClicked()
+{
+    QMessageBox::StandardButton button = QMessageBox::question(
+                           ui->stackedWidget,
+                           tr( "Delete all Access Control entries?" ),
+                           tr( "Do you really want to delete all Access Control entries? You will be asked for a decision again for each peer that you connect to." ),
+                           QMessageBox::Ok | QMessageBox::Cancel,
+                           QMessageBox::Ok
+                         );
+    if ( button == QMessageBox::Ok )
+    {
+        ACLRegistry::instance()->wipeEntries();
+        ui->aclEntryClearButton->setEnabled( false );
+    }
+}
+
+
+void
+SettingsDialog::scrollTo( const QModelIndex& idx )
+{
+    ui->accountsView->scrollTo( idx, QAbstractItemView::PositionAtBottom );
+}
+
+
+void
+SettingsDialog::requiresRestart()
+{
+    m_restartRequired = true;
+}
+
+
+ProxyDialog::ProxyDialog( QWidget *parent )
+: QDialog( parent )
+, ui( new Ui::ProxyDialog )
+{
+    ui->setupUi( this );
+
+    // ugly, I know, but...
+
+    TomahawkSettings* s = TomahawkSettings::instance();
+
+    ui->hostLineEdit->setText( s->proxyHost() );
+    ui->portSpinBox->setValue( s->proxyPort() );
+    ui->userLineEdit->setText( s->proxyUsername() );
+    ui->passwordLineEdit->setText( s->proxyPassword() );
+    ui->checkBoxUseProxyForDns->setChecked( s->proxyDns() );
+    ui->noHostLineEdit->setText( s->proxyNoProxyHosts() );
+}
+
+
+void
+ProxyDialog::saveSettings()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    //First set settings
+    TomahawkSettings* s = TomahawkSettings::instance();
+    s->setProxyHost( ui->hostLineEdit->text() );
+
+    int port = ui->portSpinBox->value();
+    s->setProxyPort( port );
+    s->setProxyNoProxyHosts( ui->noHostLineEdit->text() );
+    s->setProxyUsername( ui->userLineEdit->text() );
+    s->setProxyPassword( ui->passwordLineEdit->text() );
+    s->setProxyDns( ui->checkBoxUseProxyForDns->checkState() == Qt::Checked );
+    s->sync();
+}

tomahawk-0.5.5.tar.bz2/src/SettingsDialog.h Added

@@ -0,0 +1,118 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 SETTINGSDIALOG_H
+#define SETTINGSDIALOG_H
+
+#include <QtGui/QDialog>
+#include <QtCore/QModelIndex>
+
+#include "config.h"
+
+class AnimatedSpinner;
+class QListWidgetItem;
+class Ui_StackedSettingsDialog;
+class SipPlugin;
+class ResolversModel;
+class QNetworkReply;
+
+namespace Ui
+{
+    class SettingsDialog;
+    class ProxyDialog;
+}
+
+namespace Tomahawk
+{
+    namespace Accounts
+    {
+        class AccountModel;
+        class Account;
+        class AccountFactory;
+class Account;
+class AccountModelFilterProxy;
+}
+}
+
+class ProxyDialog : public QDialog
+{
+Q_OBJECT
+
+public:
+    explicit ProxyDialog( QWidget* parent = 0 );
+    ~ProxyDialog() {};
+
+    void saveSettings();
+
+private:
+    Ui::ProxyDialog* ui;
+};
+
+class SettingsDialog : public QDialog
+{
+Q_OBJECT
+
+public:
+    explicit SettingsDialog( QWidget* parent = 0 );
+    ~SettingsDialog();
+
+protected:
+    void changeEvent( QEvent* e );
+
+private slots:
+    void onRejected();
+
+    void toggleRemoteMode();
+    void toggleProxyEnabled();
+    void showProxySettings();
+
+    void accountsFilterChanged( int );
+
+    void createAccountFromFactory( Tomahawk::Accounts::AccountFactory* );
+    void openAccountConfig( Tomahawk::Accounts::Account*, bool showDelete = false );
+    void openAccountFactoryConfig( Tomahawk::Accounts::AccountFactory* );
+
+    void installFromFile();
+    void scrollTo( const QModelIndex& );
+
+    void updateScanOptionsView();
+
+    void changePage( QListWidgetItem*, QListWidgetItem* );
+    void serventReady();
+
+    void aclEntryClearButtonClicked();
+    
+    void requiresRestart();
+
+private:
+    void createIcons();
+
+    Ui_StackedSettingsDialog* ui;
+
+    ProxyDialog m_proxySettings;
+    bool m_rejected;
+    bool m_restartRequired;
+    Tomahawk::Accounts::AccountModel* m_accountModel;
+    Tomahawk::Accounts::AccountModelFilterProxy* m_accountProxy;
+    AnimatedSpinner* m_sipSpinner;
+};
+
+#endif // SETTINGSDIALOG_H
+

tomahawk-0.5.5.tar.bz2/src/SettingsListDelegate.cpp Added

@@ -0,0 +1,74 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Michael Zanetti <mzanetti@kde.org>
+ *   Copyright 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 "SettingsListDelegate.h"
+#include "utils/Logger.h"
+
+#include <QPainter>
+#include <QIcon>
+#include <QApplication>
+
+SettingsListDelegate::SettingsListDelegate(QObject *parent) :
+    QStyledItemDelegate(parent)
+{
+}
+
+
+void SettingsListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    painter->save();
+
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, QModelIndex() );
+    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
+
+#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
+    // On mac draw our own selection rect as we don't get one from osx (around the whole icon or around just text)
+    if ( opt.state & QStyle::State_Selected )
+    {
+        painter->setRenderHint( QPainter::Antialiasing );
+
+        QPainterPath p;
+        p.addRoundedRect( opt.rect.adjusted( 2, 1, -1, -1 ), 5, 5 );
+
+        QColor fill( 214, 214, 214 );
+        QColor border( 107, 107, 107 );
+        painter->setPen( border );
+        painter->drawPath( p );
+        painter->fillPath( p, fill );
+    }
+#else
+    if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected )
+    {
+        painter->setPen( option.palette.color( QPalette::HighlightedText ) );
+    }
+#endif
+
+    int horizontalOffset = ( option.rect.width() - option.decorationSize.width() ) /2;
+    QRect iconRect = option.rect.adjusted( horizontalOffset, 6, -horizontalOffset, -option.rect.height() + 6 + option.decorationSize.height() );
+    QPixmap avatar = index.data( Qt::DecorationRole ).value<QIcon>().pixmap( iconRect.size() );
+    painter->drawPixmap( iconRect, avatar );
+
+    QRect textRect = option.rect.adjusted( 6, iconRect.height() + 8, -6, 0 );
+    QString text = painter->fontMetrics().elidedText( index.data( Qt::DisplayRole ).toString(), Qt::ElideRight, textRect.width() );
+    QTextOption to( Qt::AlignHCenter );
+    painter->drawText( textRect, text, to );
+
+    painter->restore();
+}

tomahawk-0.5.5.tar.bz2/src/SettingsListDelegate.h Changed

tomahawk-0.5.5.tar.bz2/src/ShortcutHandler.cpp Added

@@ -0,0 +1,31 @@
+/* === 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
+ *   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 "ShortcutHandler.h"
+
+using namespace Tomahawk;
+
+ShortcutHandler::ShortcutHandler( QObject *parent )
+    : QObject( parent )
+{
+
+}
+
+ ShortcutHandler::~ShortcutHandler()
+ {
+ }

tomahawk-0.5.5.tar.bz2/src/ShortcutHandler.h Changed

tomahawk-0.5.5.tar.bz2/src/SocialWidget.cpp Added

@@ -0,0 +1,300 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Christian Muehlhaeuser <muesli@tomahawk-player.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 "SocialWidget.h"
+#include "ui_SocialWidget.h"
+
+#include <QPainter>
+#include <QDialog>
+#include <QPropertyAnimation>
+
+#include "GlobalActionManager.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+#define CORNER_ROUNDNESS 8.0
+#define FADING_DURATION 500
+#define FONT_SIZE 16
+#define OPACITY 0.85
+
+
+SocialWidget::SocialWidget( QWidget* parent )
+    : QWidget( parent ) // this is on purpose!
+    , ui( new Ui::SocialWidget )
+    , m_opacity( 0.00 )
+    , m_parent( parent )
+    , m_parentRect( parent->rect() )
+{
+    ui->setupUi( this );
+
+    setAttribute( Qt::WA_TranslucentBackground, true );
+    setOpacity( m_opacity );
+
+    m_timer.setSingleShot( true );
+    connect( &m_timer, SIGNAL( timeout() ), this, SLOT( hide() ) );
+
+#ifdef Q_WS_MAC
+    QFont f( font() );
+    f.setPointSize( f.pointSize() - 2 );
+    setFont( f );
+#endif
+
+    ui->charsLeftLabel->setForegroundRole( QPalette::BrightText );
+    
+    ui->buttonBox->button( QDialogButtonBox::Ok )->setText( tr( "Tweet" ) );
+    
+    m_parent->installEventFilter( this );
+
+    connect( ui->buttonBox, SIGNAL( accepted() ), SLOT( accept() ) );
+    connect( ui->buttonBox, SIGNAL( rejected() ), SLOT( close() ) );
+    connect( ui->textEdit, SIGNAL( textChanged() ), SLOT( onChanged() ) );
+    connect( ui->facebookButton, SIGNAL( clicked( bool ) ), SLOT( onChanged() ) );
+    connect( ui->twitterButton, SIGNAL( clicked( bool ) ), SLOT( onChanged() ) );
+    connect( GlobalActionManager::instance(), SIGNAL( shortLinkReady( QUrl, QUrl, QVariant ) ), SLOT( onShortLinkReady( QUrl, QUrl, QVariant ) ) );
+
+    onChanged();
+
+    ui->twitterButton->setChecked( true );
+    ui->twitterButton->setVisible( false );
+    ui->facebookButton->setVisible( false );
+}
+
+
+SocialWidget::~SocialWidget()
+{
+    delete ui;
+}
+
+
+void
+SocialWidget::setOpacity( qreal opacity )
+{
+    m_opacity = opacity;
+
+    if ( m_opacity == 0.00 && !isHidden() )
+    {
+        QWidget::hide();
+        emit hidden();
+    }
+    else if ( m_opacity > 0.00 && isHidden() )
+    {
+        QWidget::show();
+    }
+
+    repaint();
+}
+
+
+void
+SocialWidget::setPosition( QPoint position )
+{
+    m_position = position;
+    onGeometryUpdate();
+}
+
+
+void
+SocialWidget::show( int timeoutSecs )
+{
+    if ( !isEnabled() )
+        return;
+
+    QPropertyAnimation* animation = new QPropertyAnimation( this, "opacity" );
+    animation->setDuration( FADING_DURATION );
+    animation->setEndValue( 1.0 );
+    animation->start();
+
+    if( timeoutSecs > 0 )
+        m_timer.start( timeoutSecs * 1000 );
+}
+
+
+void
+SocialWidget::hide()
+{
+    if ( !isEnabled() )
+        return;
+
+    QPropertyAnimation* animation = new QPropertyAnimation( this, "opacity" );
+    animation->setDuration( FADING_DURATION );
+    animation->setEndValue( 0.00 );
+    animation->start();
+}
+
+
+bool
+SocialWidget::shown() const
+{
+    if ( !isEnabled() )
+        return false;
+
+    return m_opacity == OPACITY;
+}
+
+
+void
+SocialWidget::paintEvent( QPaintEvent* event )
+{
+    Q_UNUSED( event );
+
+    QPainter p( this );
+    QRect r = contentsRect();
+
+    p.setBackgroundMode( Qt::TransparentMode );
+    p.setRenderHint( QPainter::Antialiasing );
+    p.setOpacity( m_opacity );
+
+    QPen pen( palette().dark().color(), .5 );
+    p.setPen( pen );
+    p.setBrush( QColor( 30, 30, 30, 255.0 * OPACITY ) );
+
+    p.drawRoundedRect( r, CORNER_ROUNDNESS, CORNER_ROUNDNESS );
+
+    QWidget::paintEvent( event );
+    return;
+
+    QTextOption to( Qt::AlignCenter );
+    to.setWrapMode( QTextOption::WrapAtWordBoundaryOrAnywhere );
+
+    // shrink to fit if needed
+    QFont f( font() );
+    f.setPointSize( FONT_SIZE );
+    f.setBold( true );
+
+    QRectF textRect = r.adjusted( 8, 8, -8, -8 );
+    qreal availHeight = textRect.height();
+
+    QFontMetricsF fm( f );
+    qreal textHeight = fm.boundingRect( textRect, Qt::AlignCenter | Qt::TextWordWrap, "SocialWidget" ).height();
+    while( textHeight > availHeight )
+    {
+        if( f.pointSize() <= 4 ) // don't try harder
+            break;
+
+        f.setPointSize( f.pointSize() - 1 );
+        fm = QFontMetricsF( f );
+        textHeight = fm.boundingRect( textRect, Qt::AlignCenter | Qt::TextWordWrap, "SocialWidget" ).height();
+    }
+
+    p.setFont( f );
+    p.setPen( palette().highlightedText().color() );
+    p.drawText( r.adjusted( 8, 8, -8, -8 ), "SocialWidget", to );
+}
+
+
+void
+SocialWidget::onShortLinkReady( const QUrl& longUrl, const QUrl& shortUrl, const QVariant& callbackObj )
+{
+    Q_UNUSED( longUrl );
+    Q_UNUSED( callbackObj );
+
+    if ( m_query->album().isEmpty() )
+        ui->textEdit->setText( tr( "Listening to \"%1\" by %2. %3" ).arg( m_query->track() ).arg( m_query->artist() ).arg( shortUrl.toString() ) );
+    else
+        ui->textEdit->setText( tr( "Listening to \"%1\" by %2 on \"%3\". %4" ).arg( m_query->track() ).arg( m_query->artist() ).arg( m_query->album() ).arg( shortUrl.toString() ) );
+}
+
+
+void
+SocialWidget::setQuery( const Tomahawk::query_ptr& query )
+{
+    m_query = query;
+    ui->coverImage->setPixmap( query->cover( ui->coverImage->size() ) );
+    onShortLinkReady( QString(), QString(), QVariant() );
+    onChanged();
+
+    QUrl longUrl = GlobalActionManager::instance()->openLinkFromQuery( query );
+    GlobalActionManager::instance()->shortenLink( longUrl );
+}
+
+
+void
+SocialWidget::onChanged()
+{
+    const int remaining = charsAvailable() - ui->textEdit->toPlainText().length();
+    ui->charsLeftLabel->setText( tr( "%1 characters left" ).arg( remaining ) );
+    ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( remaining >= 0 && ( ui->facebookButton->isChecked() || ui->twitterButton->isChecked() ) );
+}
+
+
+void
+SocialWidget::accept()
+{
+    tDebug() << "Sharing social link!";
+    
+    QVariantMap shareInfo;
+    Tomahawk::InfoSystem::InfoStringHash trackInfo;
+
+    trackInfo"title" = m_query->track();
+    trackInfo"artist" = m_query->artist();
+    trackInfo"album" = m_query->album();
+
+    shareInfo"trackinfo" = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
+    shareInfo"message" = ui->textEdit->toPlainText();
+    shareInfo"accountlist" = QStringList( "all" );
+
+    Tomahawk::InfoSystem::InfoPushData pushData( uuid(), Tomahawk::InfoSystem::InfoShareTrack, shareInfo, Tomahawk::InfoSystem::PushNoFlag );
+    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
+
+    deleteLater();
+}
+
+
+void
+SocialWidget::close()
+{
+    QWidget::hide();
+    deleteLater();
+}
+
+
+unsigned int
+SocialWidget::charsAvailable() const
+{
+    if ( ui->twitterButton->isChecked() )
+        return 140;
+
+    return 420; // facebook max length
+}
+
+
+void
+SocialWidget::onGeometryUpdate()
+{
+    QPoint p( m_parent->rect().width() - m_parentRect.width(), m_parent->rect().height() - m_parentRect.height() );
+    m_position += p;
+    m_parentRect = m_parent->rect();
+
+    QPoint position( m_position - QPoint( size().width(), size().height() ) );
+    if ( position != pos() )
+    {
+        move( position );
+    }
+}
+
+
+bool
+SocialWidget::eventFilter( QObject* object, QEvent* event )
+{
+    if ( event->type() == QEvent::Resize )
+    {
+        onGeometryUpdate();
+    }
+
+    return QObject::eventFilter( object, event );
+}

tomahawk-0.5.5.tar.bz2/src/SocialWidget.h Added

@@ -0,0 +1,88 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Christian Muehlhaeuser <muesli@tomahawk-player.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 SOCIALWIDGET_H
+#define SOCIALWIDGET_H
+
+#include <QWidget>
+#include <QAbstractItemView>
+#include <QTimer>
+
+#include "Query.h"
+
+namespace Ui
+{
+    class SocialWidget;
+}
+
+class SocialWidget : public QWidget
+{
+Q_OBJECT
+Q_PROPERTY( qreal opacity READ opacity WRITE setOpacity )
+
+public:
+    SocialWidget( QWidget* parent );
+    ~SocialWidget();
+
+    Tomahawk::query_ptr query() const { return m_query; }
+    void setQuery( const Tomahawk::query_ptr& query );
+
+    qreal opacity() const { return m_opacity; }
+    void setOpacity( qreal opacity );
+
+    QPoint position() const { return m_position; }
+    void setPosition( QPoint position );
+
+    bool shown() const;
+
+signals:
+    void hidden();
+
+public slots:
+    void show( int timeoutSecs = 0 );
+    void hide();
+
+protected:
+//    void changeEvent( QEvent* e );
+    void paintEvent( QPaintEvent* event );
+    bool eventFilter( QObject* object, QEvent* event );
+
+private slots:
+    void accept();
+    void onChanged();
+    void onShortLinkReady( const QUrl& longUrl, const QUrl& shortUrl, const QVariant& callbackObj );
+    
+    void onGeometryUpdate();
+    void close();
+
+private:
+    unsigned int charsAvailable() const;
+
+    Ui::SocialWidget* ui;
+
+    Tomahawk::query_ptr m_query;
+
+    qreal m_opacity;
+    QPoint m_position;
+
+    QWidget* m_parent;
+    QRect m_parentRect;
+    QTimer m_timer;
+};
+
+#endif // SOCIALWIDGET_H

tomahawk-0.5.5.tar.bz2/src/SocialWidget.ui Added

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SocialWidget</class>
+ <widget class="QWidget" name="SocialWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>365</width>
+    <height>190</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>8</number>
+   </property>
+   <property name="topMargin">
+    <number>8</number>
+   </property>
+   <property name="rightMargin">
+    <number>8</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="facebookButton">
+       <property name="text">
+        <string>Facebook</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="twitterButton">
+       <property name="text">
+        <string>Twitter</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="coverImage">
+       <property name="minimumSize">
+        <size>
+         <width>96</width>
+         <height>96</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>96</width>
+         <height>96</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Cover</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QTextEdit" name="textEdit">
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>96</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="charsLeftLabel">
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/StackedSettingsDialog.ui Added

@@ -0,0 +1,524 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>StackedSettingsDialog</class>
+ <widget class="QDialog" name="StackedSettingsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>655</width>
+    <height>500</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Tomahawk Settings</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_12">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QListWidget" name="listWidget">
+         <property name="focusPolicy">
+          <enum>Qt::NoFocus</enum>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Sunken</enum>
+         </property>
+         <property name="verticalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOff</enum>
+         </property>
+         <property name="horizontalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOff</enum>
+         </property>
+         <property name="autoScroll">
+          <bool>true</bool>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>32</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="movement">
+          <enum>QListView::Static</enum>
+         </property>
+         <property name="resizeMode">
+          <enum>QListView::Adjust</enum>
+         </property>
+         <property name="layoutMode">
+          <enum>QListView::Batched</enum>
+         </property>
+         <property name="spacing">
+          <number>1</number>
+         </property>
+         <property name="viewMode">
+          <enum>QListView::IconMode</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>1</width>
+           <height>4</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QStackedWidget" name="stackedWidget">
+       <property name="currentIndex">
+        <number>2</number>
+       </property>
+       <widget class="QWidget" name="accountsPage">
+        <layout class="QVBoxLayout" name="verticalLayout_11">
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QGroupBox" name="groupBox_4">
+           <property name="title">
+            <string>Internet Services</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_8">
+            <property name="margin">
+             <number>2</number>
+            </property>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_2">
+              <item>
+               <widget class="QPushButton" name="installFromFileBtn">
+                <property name="text">
+                 <string>Install from file...</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QLabel" name="label">
+                <property name="text">
+                 <string>Filter by capability:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="accountsFilterCombo"/>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <widget class="QListView" name="accountsView">
+              <property name="alternatingRowColors">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="scannerPage">
+        <layout class="QVBoxLayout" name="verticalLayout_5">
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QGroupBox" name="groupBox_2">
+           <property name="title">
+            <string>Local Music Information</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_17">
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout_4">
+              <item>
+               <widget class="QLabel" name="label_5">
+                <property name="text">
+                 <string>Path to scan for music files:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="CheckDirTree" name="dirTree"/>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout_16">
+              <item>
+               <widget class="QCheckBox" name="enableEchonestCatalog">
+                <property name="toolTip">
+                 <string>The Echo Nest supports keeping track of your catalog metadata
+ and using it to craft personalized radios. Enabling this option
+ will allow you (and all your friends) to create automatic playlists
+ and stations based on your personal taste profile.</string>
+                </property>
+                <property name="text">
+                 <string>Upload collection list to The Echo Nest to enable user radio</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QCheckBox" name="checkBoxWatchForChanges">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Watch for changes</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_7">
+                <item>
+                 <widget class="QLabel" name="scanTimeLabel">
+                  <property name="text">
+                   <string>Time between scans, in seconds:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QSpinBox" name="scannerTimeSpinBox">
+                  <property name="minimum">
+                   <number>60</number>
+                  </property>
+                  <property name="maximum">
+                   <number>999999999</number>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="advancedPage">
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QGroupBox" name="groupBoxNetworkAdvanced">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="title">
+            <string>Advanced Settings</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_13">
+            <property name="margin">
+             <number>2</number>
+            </property>
+            <item>
+             <widget class="QGroupBox" name="remoteConnectionsGroupBox">
+              <property name="title">
+               <string>Remote Peer Connection Method</string>
+              </property>
+              <layout class="QVBoxLayout" name="verticalLayout_6">
+               <item>
+                <widget class="QRadioButton" name="lanOnlyRadioButton">
+                 <property name="text">
+                  <string>None (outgoing connections only)</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QRadioButton" name="upnpRadioButton">
+                 <property name="text">
+                  <string>Use UPnP to establish port forward (recommended)</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QRadioButton" name="staticIpRadioButton">
+                 <property name="text">
+                  <string>Use static external IP address/host name and port</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLabel" name="staticHostNamePortLabel">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="text">
+                  <string>Set this to your external IP address or host name. Make sure to forward the port to this host!</string>
+                 </property>
+                 <property name="wordWrap">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <layout class="QHBoxLayout" name="staticHostNamePortLayout">
+                 <item>
+                  <widget class="QLabel" name="staticHostNameLabel">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="text">
+                    <string>Static Host Name:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLineEdit" name="staticHostName"/>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="staticPortLabel">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="text">
+                    <string>Static Port:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSpinBox" name="staticPort">
+                   <property name="maximum">
+                    <number>65535</number>
+                   </property>
+                   <property name="value">
+                    <number>50210</number>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="proxyGroupBox">
+              <property name="title">
+               <string>SOCKS Proxy</string>
+              </property>
+              <layout class="QHBoxLayout" name="horizontalLayout_3">
+               <item>
+                <widget class="QCheckBox" name="enableProxyCheckBox">
+                 <property name="text">
+                  <string>Use SOCKS Proxy</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="proxyButton">
+                 <property name="text">
+                  <string>Proxy Settings...</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="otherSettingsGroupBox">
+              <property name="title">
+               <string>Other Settings</string>
+              </property>
+              <layout class="QVBoxLayout" name="verticalLayout_2">
+               <item>
+                <widget class="QCheckBox" name="checkBoxHttp">
+                 <property name="layoutDirection">
+                  <enum>Qt::RightToLeft</enum>
+                 </property>
+                 <property name="text">
+                  <string>Allow web browsers to interact with Tomahawk (recommended)</string>
+                 </property>
+                 <property name="checked">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="checkBoxReporter">
+                 <property name="layoutDirection">
+                  <enum>Qt::RightToLeft</enum>
+                 </property>
+                 <property name="text">
+                  <string>Send reports after Tomahawk crashed</string>
+                 </property>
+                 <property name="checked">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <layout class="QHBoxLayout" name="aclEntryClearLayout">
+                 <item>
+                  <spacer name="horizontalSpacer_2">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>40</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item>
+                  <widget class="QPushButton" name="aclEntryClearButton">
+                   <property name="text">
+                    <string>Clear All Access Control Entries</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_4">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>CheckDirTree</class>
+   <extends>QTreeView</extends>
+   <header location="global">widgets/CheckDirTree.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>StackedSettingsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>222</x>
+     <y>347</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>StackedSettingsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>290</x>
+     <y>353</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

tomahawk-0.5.5.tar.bz2/src/TomahawkApp.cpp Added

@@ -0,0 +1,757 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "TomahawkApp.h"
+
+#include <iostream>
+
+#include <QtCore/QPluginLoader>
+#include <QtCore/QDir>
+#include <QtCore/QMetaType>
+#include <QtCore/QTime>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QTranslator>
+
+#include "Artist.h"
+#include "Album.h"
+#include "Collection.h"
+#include "infosystem/InfoSystem.h"
+#include "accounts/AccountManager.h"
+#include "accounts/spotify/SpotifyAccount.h"
+#include "accounts/lastfm/LastFmAccount.h"
+#include "database/Database.h"
+#include "database/DatabaseCollection.h"
+#include "database/DatabaseCommand_CollectionStats.h"
+#include "database/DatabaseResolver.h"
+#include "playlist/dynamic/GeneratorFactory.h"
+#include "playlist/dynamic/echonest/EchonestGenerator.h"
+#include "playlist/dynamic/database/DatabaseGenerator.h"
+#include "playlist/XspfUpdater.h"
+#include "network/Servent.h"
+#include "web/Api_v1.h"
+#include "SourceList.h"
+#include "ShortcutHandler.h"
+#include "ScanManager.h"
+#include "TomahawkSettings.h"
+#include "GlobalActionManager.h"
+#include "database/LocalCollection.h"
+#include "MusicScanner.h"
+#include "Pipeline.h"
+#include "DropJob.h"
+#include "EchonestCatalogSynchronizer.h"
+
+#include "audio/AudioEngine.h"
+#include "utils/XspfLoader.h"
+#include "utils/JspfLoader.h"
+#include "utils/Logger.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "accounts/lastfm/LastFmAccount.h"
+#include "accounts/spotify/SpotifyAccount.h"
+#include "accounts/spotify/SpotifyPlaylistUpdater.h"
+#include "utils/TomahawkCache.h"
+
+#include "config.h"
+
+#ifndef ENABLE_HEADLESS
+    #include "resolvers/QtScriptResolver.h"
+    #include "resolvers/ScriptResolver.h"
+    #include "utils/SpotifyParser.h"
+    #include "AtticaManager.h"
+    #include "TomahawkWindow.h"
+    #include "SettingsDialog.h"
+    #include "ActionCollection.h"
+    #include <QtGui/QMessageBox>
+    #include "widgets/HeaderLabel.h"
+    #include <TomahawkSettingsGui.h>
+#endif
+
+#ifdef Q_WS_MAC
+#include "mac/MacShortcutHandler.h"
+
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+#endif
+
+const char* enApiSecret = "BNvTzfthHr/d1eNhHLvL1Jo=";
+
+void
+increaseMaxFileDescriptors()
+{
+#ifdef Q_WS_MAC
+    /// Following code taken from Clementine project, main.cpp. Thanks!
+    // Bump the soft limit for the number of file descriptors from the default of 256 to
+    // the maximum (usually 1024).
+    struct rlimit limit;
+    getrlimit( RLIMIT_NOFILE, &limit );
+
+    // getrlimit() lies about the hard limit so we have to check sysctl.
+    int max_fd = 0;
+    size_t len = sizeof( max_fd );
+    sysctlbyname( "kern.maxfilesperproc", &max_fd, &len, NULL, 0 );
+
+    limit.rlim_cur = max_fd;
+    int ret = setrlimit( RLIMIT_NOFILE, &limit );
+
+    if ( ret == 0 )
+      qDebug() << "Max fd:" << max_fd;
+#endif
+}
+
+
+using namespace Tomahawk;
+
+TomahawkApp::TomahawkApp( int& argc, char *argv )
+    : TOMAHAWK_APPLICATION( argc, argv )
+#ifndef ENABLE_HEADLESS
+    , m_mainwindow( 0 )
+#endif
+    , m_headless( false )
+    , m_loaded( false )
+{
+    setOrganizationName( QLatin1String( TOMAHAWK_ORGANIZATION_NAME ) );
+    setOrganizationDomain( QLatin1String( TOMAHAWK_ORGANIZATION_DOMAIN ) );
+    setApplicationName( QLatin1String( TOMAHAWK_APPLICATION_NAME ) );
+    setApplicationVersion( QLatin1String( TOMAHAWK_VERSION ) );
+
+    registerMetaTypes();
+    installTranslator();
+}
+
+
+void
+TomahawkApp::installTranslator()
+{
+    QString locale = QLocale::system().name();
+    if ( locale == "C" )
+        locale = "en";
+
+    // Tomahawk translations
+    QTranslator* translator = new QTranslator( this );
+    if ( translator->load( QString( ":/lang/tomahawk_" ) + locale ) )
+    {
+        tDebug() << "Translation: Tomahawk: Using system locale:" << locale;
+    }
+    else
+    {
+        tDebug() << "Translation: Tomahawk: Using default locale, system locale one not found:" << locale;
+        translator->load( QString( ":/lang/tomahawk_en" ) );
+    }
+
+    TOMAHAWK_APPLICATION::installTranslator( translator );
+
+    // Qt translations
+    translator = new QTranslator( this );
+    if ( translator->load( QString( ":/lang/qt_" ) + locale ) )
+    {
+        tDebug() << "Translation: Qt: Using system locale:" << locale;
+    }
+    else
+    {
+        tDebug() << "Translation: Qt: Using default locale, system locale one not found:" << locale;
+    }
+
+    TOMAHAWK_APPLICATION::installTranslator( translator );
+}
+
+
+void
+TomahawkApp::init()
+{
+    if ( arguments().contains( "--help" ) || arguments().contains( "-h" ) )
+    {
+        printHelp();
+        ::exit( 0 );
+    }
+
+    qDebug() << "TomahawkApp thread:" << thread();
+    Logger::setupLogfile();
+    qsrand( QTime( 0, 0, 0 ).secsTo( QTime::currentTime() ) );
+
+    tLog() << "Starting Tomahawk...";
+
+#ifdef ENABLE_HEADLESS
+    m_headless = true;
+#else
+    m_headless = arguments().contains( "--headless" );
+    setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
+    setQuitOnLastWindowClosed( false );
+
+    QFont f = APP->font();
+    f.setPixelSize( HeaderLabel::defaultFontSize() );
+    QFontMetrics fm( f );
+    TomahawkUtils::setHeaderHeight( fm.height() + 8 );
+#endif
+
+    TomahawkUtils::setHeadless( m_headless );
+
+    TomahawkSettings* s = TomahawkSettings::instance();
+
+    tDebug( LOGINFO ) << "Setting NAM.";
+    // Cause the creation of the nam, but don't need to address it directly, so prevent warning
+    Q_UNUSED( TomahawkUtils::nam() );
+
+    m_audioEngine = QWeakPointer<AudioEngine>( new AudioEngine );
+
+    // init pipeline and resolver factories
+    new Pipeline();
+
+    m_servent = QWeakPointer<Servent>( new Servent( this ) );
+    connect( m_servent.data(), SIGNAL( ready() ), SLOT( initSIP() ) );
+
+    tDebug() << "Init Database.";
+    initDatabase();
+
+    m_scanManager = QWeakPointer<ScanManager>( new ScanManager( this ) );
+
+#ifndef ENABLE_HEADLESS
+    Pipeline::instance()->addExternalResolverFactory( boost::bind( &QtScriptResolver::factory, _1 ) );
+    Pipeline::instance()->addExternalResolverFactory( boost::bind( &ScriptResolver::factory, _1 ) );
+
+    new ActionCollection( this );
+    connect( ActionCollection::instance()->getAction( "quit" ), SIGNAL( triggered() ), SLOT( quit() ), Qt::UniqueConnection );
+#endif
+
+    QByteArray magic = QByteArray::fromBase64( enApiSecret );
+    QByteArray wand = QByteArray::fromBase64( QCoreApplication::applicationName().toLatin1() );
+    int length = magic.length(), n2 = wand.length();
+    for ( int i=0; i<length; i++ ) magici = magici ^ wandi%n2;
+    Echonest::Config::instance()->setAPIKey( magic );
+
+#ifndef ENABLE_HEADLESS
+    tDebug() << "Init Echonest Factory.";
+    GeneratorFactory::registerFactory( "echonest", new EchonestFactory );
+#endif
+    tDebug() << "Init Database Factory.";
+    GeneratorFactory::registerFactory( "database", new DatabaseFactory );
+
+    // Register shortcut handler for this platform
+#ifdef Q_WS_MAC
+    m_shortcutHandler = QWeakPointer<Tomahawk::ShortcutHandler>( new MacShortcutHandler( this ) );
+    Tomahawk::setShortcutHandler( static_cast<MacShortcutHandler*>( m_shortcutHandler.data() ) );
+
+    Tomahawk::setApplicationHandler( this );
+    increaseMaxFileDescriptors();
+#endif
+
+    // Connect up shortcuts
+    if ( !m_shortcutHandler.isNull() )
+    {
+        connect( m_shortcutHandler.data(), SIGNAL( playPause() ), m_audioEngine.data(), SLOT( playPause() ) );
+        connect( m_shortcutHandler.data(), SIGNAL( pause() ), m_audioEngine.data(), SLOT( pause() ) );
+        connect( m_shortcutHandler.data(), SIGNAL( stop() ), m_audioEngine.data(), SLOT( stop() ) );
+        connect( m_shortcutHandler.data(), SIGNAL( previous() ), m_audioEngine.data(), SLOT( previous() ) );
+        connect( m_shortcutHandler.data(), SIGNAL( next() ), m_audioEngine.data(), SLOT( next() ) );
+        connect( m_shortcutHandler.data(), SIGNAL( volumeUp() ), m_audioEngine.data(), SLOT( raiseVolume() ) );
+        connect( m_shortcutHandler.data(), SIGNAL( volumeDown() ), m_audioEngine.data(), SLOT( lowerVolume() ) );
+        connect( m_shortcutHandler.data(), SIGNAL( mute() ), m_audioEngine.data(), SLOT( mute() ) );
+    }
+
+    tDebug() << "Init InfoSystem.";
+    m_infoSystem = QWeakPointer<Tomahawk::InfoSystem::InfoSystem>( Tomahawk::InfoSystem::InfoSystem::instance() );
+
+    tDebug() << "Init AccountManager.";
+    m_accountManager = QWeakPointer< Tomahawk::Accounts::AccountManager >( new Tomahawk::Accounts::AccountManager( this ) );
+    connect( m_accountManager.data(), SIGNAL( ready() ), SLOT( accountManagerReady() ) );
+
+    Echonest::Config::instance()->setNetworkAccessManager( TomahawkUtils::nam() );
+#ifndef ENABLE_HEADLESS
+    EchonestGenerator::setupCatalogs();
+
+    if ( !m_headless )
+    {
+        tDebug() << "Init MainWindow.";
+        m_mainwindow = new TomahawkWindow();
+        m_mainwindow->setWindowTitle( "Tomahawk" );
+        m_mainwindow->setObjectName( "TH_Main_Window" );
+        if ( !arguments().contains( "--hide" ) )
+        {
+            m_mainwindow->show();
+        }
+    }
+#endif
+
+    tDebug() << "Init Local Collection.";
+    initLocalCollection();
+    tDebug() << "Init Pipeline.";
+    initPipeline();
+
+#ifndef ENABLE_HEADLESS
+    // load remote list of resolvers able to be installed
+    AtticaManager::instance();
+#endif
+
+    if ( arguments().contains( "--http" ) || TomahawkSettings::instance()->value( "network/http", true ).toBool() )
+    {
+        initHTTP();
+    }
+    connect( TomahawkSettings::instance(), SIGNAL( changed() ), SLOT( initHTTP() ) );
+
+#ifndef ENABLE_HEADLESS
+    if ( !s->hasScannerPaths() )
+    {
+        m_mainwindow->showSettingsDialog();
+    }
+#endif
+
+#ifdef LIBLASTFM_FOUND
+    tDebug() << "Init Scrobbler.";
+    m_scrobbler = new Scrobbler( this );
+#endif
+
+    if ( arguments().contains( "--filescan" ) )
+    {
+        m_scanManager.data()->runScan( true );
+    }
+
+    // Set up echonest catalog synchronizer
+    Tomahawk::EchonestCatalogSynchronizer::instance();
+
+    PlaylistUpdaterInterface::registerUpdaterFactory( new XspfUpdaterFactory );
+    PlaylistUpdaterInterface::registerUpdaterFactory( new SpotifyUpdaterFactory );
+
+    // Following work-around/fix taken from Clementine rev. 13e13ccd9a95 and courtesy of David Sansome
+    // A bug in Qt means the wheel_scroll_lines setting gets ignored and replaced
+    // with the default value of 3 in QApplicationPrivate::initialize.
+    {
+        QSettings qt_settings(QSettings::UserScope, "Trolltech");
+        qt_settings.beginGroup("Qt");
+        QApplication::setWheelScrollLines(
+            qt_settings.value("wheelScrollLines", QApplication::wheelScrollLines()).toInt());
+    }
+
+#ifndef ENABLE_HEADLESS
+    // Make sure to init GAM in the gui thread
+    GlobalActionManager::instance();
+
+    // check if our spotify playlist api server is up and running, and enable spotify playlist drops if so
+    QNetworkReply* r = TomahawkUtils::nam()->get( QNetworkRequest( QUrl( SPOTIFY_PLAYLIST_API_URL "/pong" ) ) );
+    connect( r, SIGNAL( finished() ), this, SLOT( spotifyApiCheckFinished() ) );
+#endif
+
+#ifdef Q_OS_MAC
+    // Make sure to do this after main window is inited
+    Tomahawk::enableFullscreen( m_mainwindow );
+#endif
+}
+
+
+TomahawkApp::~TomahawkApp()
+{
+    tLog() << "Shutting down Tomahawk...";
+
+    if ( !m_session.isNull() )
+        delete m_session.data();
+    tLog() << "Deleting connector";
+    if ( !m_connector.isNull() )
+        delete m_connector.data();
+
+    tLog() << "Stopping pipeline";
+    if ( Pipeline::instance() )
+        Pipeline::instance()->stop();
+
+    tLog() << "Deleting servent";
+    if ( !m_servent.isNull() )
+        delete m_servent.data();
+    tLog() << "Deleting ScanManager";
+    if ( !m_scanManager.isNull() )
+        delete m_scanManager.data();
+
+    tLog() << "Deleting AudioEngine";
+    if ( !m_audioEngine.isNull() )
+        delete m_audioEngine.data();
+
+    tLog() << "Deleting AccountManager";
+    delete Tomahawk::Accounts::AccountManager::instance();
+
+#ifndef ENABLE_HEADLESS
+    tLog() << "Deleting AtticaManager";
+    delete AtticaManager::instance();
+    tLog() << "Deleting Window";
+    delete m_mainwindow;
+#endif
+
+    tLog() << "Deleting database";
+    if ( !m_database.isNull() )
+        delete m_database.data();
+
+    tLog() << "Deleting Pipeline";
+    delete Pipeline::instance();
+
+    tLog() << "Deleting InfoSystem";
+    if ( !m_infoSystem.isNull() )
+        delete m_infoSystem.data();
+        
+    tLog() << "Deleting Cache";
+    delete TomahawkUtils::Cache::instance();
+
+    tLog() << "Finished shutdown.";
+}
+
+
+TomahawkApp*
+TomahawkApp::instance()
+{
+    return (TomahawkApp*)TOMAHAWK_APPLICATION::instance();
+}
+
+
+void
+TomahawkApp::printHelp()
+{
+    #define echo( X ) std::cout << QString( X ).toAscii().data()
+
+    echo( "Usage: " + arguments().at( 0 ) + " options url\n" );
+    echo( "Options are:\n" );
+    echo( "  --help         Show this help\n" );
+    echo( "  --http         Initialize HTTP server\n" );
+    echo( "  --filescan     Scan files on startup\n" );
+    echo( "  --hide         Hide main window on startup\n" );
+    echo( "  --testdb       Use a test database instead of real collection\n" );
+    echo( "  --noupnp       Disable UPnP\n" );
+    echo( "  --nosip        Disable SIP\n" );
+    echo( "\nPlayback Controls:\n" );
+    echo( "  --playpause    Toggle playing/paused state\n" );
+    echo( "  --play         Start/resume playback\n" );
+    echo( "  --pause        Pause playback\n" );
+    echo( "  --stop         Stop playback\n" );
+    echo( "  --next         Advances to the next track (if available)\n" );
+    echo( "  --prev         Returns to the previous track (if available)\n" );
+    echo( "\nurl is a tomahawk:// command or alternatively a url that Tomahawk can recognize.\n" );
+    echo( "For more documentation, see http://wiki.tomahawk-player.org/mediawiki/index.php/Tomahawk://_Links\n" );
+}
+
+
+#ifndef ENABLE_HEADLESS
+AudioControls*
+TomahawkApp::audioControls()
+{
+    return m_mainwindow->audioControls();
+}
+#endif
+
+
+void
+TomahawkApp::registerMetaTypes()
+{
+    qRegisterMetaType< QSharedPointer<DatabaseCommand> >("QSharedPointer<DatabaseCommand>");
+    qRegisterMetaType< DBSyncConnection::State >("DBSyncConnection::State");
+    qRegisterMetaType< msg_ptr >("msg_ptr");
+    qRegisterMetaType< QList<dbop_ptr> >("QList<dbop_ptr>");
+    qRegisterMetaType< QList<QVariantMap> >("QList<QVariantMap>");
+    qRegisterMetaType< QList<QString> >("QList<QString>");
+    qRegisterMetaType< QList<uint> >("QList<uint>");
+    qRegisterMetaType< Connection* >("Connection*");
+    qRegisterMetaType< QAbstractSocket::SocketError >("QAbstractSocket::SocketError");
+    qRegisterMetaType< QTcpSocket* >("QTcpSocket*");
+    qRegisterMetaType< QSharedPointer<QIODevice> >("QSharedPointer<QIODevice>");
+    qRegisterMetaType< QFileInfo >("QFileInfo");
+    qRegisterMetaType< QDir >("QDir");
+    qRegisterMetaType< QHostAddress >("QHostAddress");
+    qRegisterMetaType< QMap<QString, unsigned int> >("QMap<QString, unsigned int>");
+    qRegisterMetaType< QMap< QString, plentry_ptr > >("QMap< QString, plentry_ptr >");
+    qRegisterMetaType< QHash< QString, QMap<quint32, quint16> > >("QHash< QString, QMap<quint32, quint16> >");
+    qRegisterMetaType< QMap< QString, QMap< unsigned int, unsigned int > > >("QMap< QString, QMap< unsigned int, unsigned int > >");
+    qRegisterMetaType< PairList >("PairList");
+
+    qRegisterMetaType<GeneratorMode>("GeneratorMode");
+    qRegisterMetaType<Tomahawk::GeneratorMode>("Tomahawk::GeneratorMode");
+    qRegisterMetaType<ModelMode>("Tomahawk::ModelMode");
+    qRegisterMetaType<Tomahawk::ModelMode>("Tomahawk::ModelMode");
+
+    // Extra definition for namespaced-versions of signals/slots required
+    qRegisterMetaType< Tomahawk::Resolver* >("Tomahawk::Resolver*");
+    qRegisterMetaType< Tomahawk::source_ptr >("Tomahawk::source_ptr");
+    qRegisterMetaType< Tomahawk::collection_ptr >("Tomahawk::collection_ptr");
+    qRegisterMetaType< Tomahawk::result_ptr >("Tomahawk::result_ptr");
+    qRegisterMetaType< Tomahawk::query_ptr >("Tomahawk::query_ptr");
+    qRegisterMetaType< Tomahawk::album_ptr >("Tomahawk::album_ptr");
+    qRegisterMetaType< Tomahawk::artist_ptr >("Tomahawk::artist_ptr");
+    qRegisterMetaType< Tomahawk::source_ptr >("Tomahawk::source_ptr");
+    qRegisterMetaType< Tomahawk::dyncontrol_ptr >("Tomahawk::dyncontrol_ptr");
+    qRegisterMetaType< Tomahawk::playlist_ptr >("Tomahawk::playlist_ptr");
+    qRegisterMetaType< Tomahawk::playlistinterface_ptr >("Tomahawk::playlistinterface_ptr");
+    qRegisterMetaType< Tomahawk::dynplaylist_ptr >("Tomahawk::dynplaylist_ptr");
+    qRegisterMetaType< Tomahawk::geninterface_ptr >("Tomahawk::geninterface_ptr");
+    qRegisterMetaType< QList<Tomahawk::playlist_ptr> >("QList<Tomahawk::playlist_ptr>");
+    qRegisterMetaType< QList<Tomahawk::dynplaylist_ptr> >("QList<Tomahawk::dynplaylist_ptr>");
+    qRegisterMetaType< QList<Tomahawk::dyncontrol_ptr> >("QList<Tomahawk::dyncontrol_ptr>");
+    qRegisterMetaType< QList<Tomahawk::geninterface_ptr> >("QList<Tomahawk::geninterface_ptr>");
+    qRegisterMetaType< QList<Tomahawk::plentry_ptr> >("QList<Tomahawk::plentry_ptr>");
+    qRegisterMetaType< QList<Tomahawk::query_ptr> >("QList<Tomahawk::query_ptr>");
+    qRegisterMetaType< QList<Tomahawk::result_ptr> >("QList<Tomahawk::result_ptr>");
+    qRegisterMetaType< QList<Tomahawk::artist_ptr> >("QList<Tomahawk::artist_ptr>");
+    qRegisterMetaType< QList<Tomahawk::album_ptr> >("QList<Tomahawk::album_ptr>");
+    qRegisterMetaType< QList<Tomahawk::source_ptr> >("QList<Tomahawk::source_ptr>");
+    qRegisterMetaType< QMap< QString, Tomahawk::plentry_ptr > >("QMap< QString, Tomahawk::plentry_ptr >");
+    qRegisterMetaType< Tomahawk::PlaylistRevision >("Tomahawk::PlaylistRevision");
+    qRegisterMetaType< Tomahawk::DynamicPlaylistRevision >("Tomahawk::DynamicPlaylistRevision");
+    qRegisterMetaType< Tomahawk::QID >("Tomahawk::QID");
+
+    qRegisterMetaType< AudioErrorCode >("AudioErrorCode");
+
+    qRegisterMetaType< Tomahawk::InfoSystem::InfoStringHash >( "Tomahawk::InfoSystem::InfoStringHash" );
+    qRegisterMetaType< Tomahawk::InfoSystem::InfoType >( "Tomahawk::InfoSystem::InfoType" );
+    qRegisterMetaType< Tomahawk::InfoSystem::PushInfoFlags >( "Tomahawk::InfoSystem::PushInfoFlags" );
+    qRegisterMetaType< Tomahawk::InfoSystem::PushInfoPair >( "Tomahawk::InfoSystem::PushInfoPair" );
+    qRegisterMetaType< Tomahawk::InfoSystem::InfoRequestData >( "Tomahawk::InfoSystem::InfoRequestData" );
+    qRegisterMetaType< Tomahawk::InfoSystem::InfoPushData >( "Tomahawk::InfoSystem::InfoPushData" );
+    qRegisterMetaType< Tomahawk::InfoSystem::InfoSystemCache* >( "Tomahawk::InfoSystem::InfoSystemCache*" );
+    qRegisterMetaType< Tomahawk::InfoSystem::InfoPluginPtr >( "Tomahawk::InfoSystem::InfoPluginPtr" );
+    qRegisterMetaType< Tomahawk::InfoSystem::InfoPlugin* >( "Tomahawk::InfoSystem::InfoPlugin*" );
+    qRegisterMetaType< QList< Tomahawk::InfoSystem::InfoStringHash > >("QList< Tomahawk::InfoSystem::InfoStringHash > ");
+
+    qRegisterMetaType< TomahawkSettings::PrivateListeningMode >( "TomahawkSettings::PrivateListeningMode" );
+
+    qRegisterMetaTypeStreamOperators< QList< Tomahawk::InfoSystem::InfoStringHash > >("QList< Tomahawk::InfoSystem::InfoStringHash > ");
+    qRegisterMetaType< QPersistentModelIndex >( "QPersistentModelIndex" );
+
+    qRegisterMetaType< Tomahawk::PlaylistModes::LatchMode >( "Tomahawk::PlaylistModes::LatchMode" );
+    qRegisterMetaType< Tomahawk::PlaylistModes::RepeatMode >( "Tomahawk::PlaylistModes::RepeatMode" );
+
+    qRegisterMetaType< TomahawkUtils::CacheData >( "TomahawkUtils::CacheData" );
+    qRegisterMetaTypeStreamOperators< TomahawkUtils::CacheData >( "TomahawkUtils::CacheData" );
+}
+
+
+void
+TomahawkApp::initDatabase()
+{
+    QString dbpath;
+    if ( arguments().contains( "--testdb" ) )
+    {
+        dbpath = QDir::currentPath() + "/test.db";
+    }
+    else
+    {
+        dbpath = TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.db" );
+    }
+
+    tDebug( LOGEXTRA ) << "Using database:" << dbpath;
+    m_database = QWeakPointer<Database>( new Database( dbpath, this ) );
+    Pipeline::instance()->databaseReady();
+}
+
+
+void
+TomahawkApp::initHTTP()
+{
+    if ( !TomahawkSettings::instance()->httpEnabled() )
+    {
+        tLog() << "Stopping HTTPd, not enabled";
+        if ( !m_session.isNull() )
+            delete m_session.data();
+        if ( !m_connector.isNull() )
+            delete m_connector.data();
+        return;
+    }
+
+    if ( m_session )
+    {
+        tLog() << "HTTPd session already exists, returning";
+        return;
+    }
+
+    m_session = QWeakPointer< QxtHttpSessionManager >( new QxtHttpSessionManager() );
+    m_connector = QWeakPointer< QxtHttpServerConnector >( new QxtHttpServerConnector );
+    if ( m_session.isNull() || m_connector.isNull() )
+    {
+        if ( !m_session.isNull() )
+            delete m_session.data();
+        if ( !m_connector.isNull() )
+            delete m_connector.data();
+        tLog() << "Failed to start HTTPd, could not create object";
+        return;
+    }
+
+    m_session.data()->setPort( 60210 ); //TODO config
+    m_session.data()->setListenInterface( QHostAddress::LocalHost );
+    m_session.data()->setConnector( m_connector.data() );
+
+    Api_v1* api = new Api_v1( m_session.data() );
+    m_session.data()->setStaticContentService( api );
+
+    tLog() << "Starting HTTPd on" << m_session.data()->listenInterface().toString() << m_session.data()->port();
+    m_session.data()->start();
+}
+
+
+void
+TomahawkApp::initPipeline()
+{
+    // setup resolvers for local content, and (cached) remote collection content
+    Pipeline::instance()->addResolver( new DatabaseResolver( 100 ) );
+}
+
+
+void
+TomahawkApp::initLocalCollection()
+{
+    connect( SourceList::instance(), SIGNAL( ready() ), SLOT( initServent() ) );
+
+    source_ptr src( new Source( 0, tr( "My Collection" ) ) );
+    collection_ptr coll( new LocalCollection( src ) );
+
+    src->addCollection( coll );
+    SourceList::instance()->setLocal( src );
+    SourceList::instance()->loadSources();
+
+    // to make the stats signal be emitted by our local source
+    // this will update the sidebar, etc.
+    DatabaseCommand_CollectionStats* cmd = new DatabaseCommand_CollectionStats( src );
+    connect( cmd,       SIGNAL( done( const QVariantMap& ) ),
+             src.data(),  SLOT( setStats( const QVariantMap& ) ), Qt::QueuedConnection );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+TomahawkApp::initServent()
+{
+    tDebug() << "Init Servent.";
+
+    bool upnp = !arguments().contains( "--noupnp" );
+    int port = TomahawkSettings::instance()->externalPort();
+    if ( !Servent::instance()->startListening( QHostAddress( QHostAddress::Any ), upnp, port ) )
+    {
+        tLog() << "Failed to start listening with servent";
+        exit( 1 );
+    }
+}
+
+
+// Called after Servent emits ready()
+void
+TomahawkApp::initSIP()
+{
+    tDebug() << Q_FUNC_INFO;
+    //FIXME: jabber autoconnect is really more, now that there is sip -- should be renamed and/or split out of jabber-specific settings
+    if ( !arguments().contains( "--nosip" ) )
+    {
+        tDebug( LOGINFO ) << "Connecting SIP classes";
+        Accounts::AccountManager::instance()->initSIP();
+    }
+
+    m_loaded = true;
+    emit tomahawkLoaded();
+}
+
+
+void
+TomahawkApp::spotifyApiCheckFinished()
+{
+#ifndef ENABLE_HEADLESS
+    QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
+    Q_ASSERT( reply );
+
+    DropJob::setCanParseSpotifyPlaylists( !reply->error() );
+#endif
+}
+
+
+void
+TomahawkApp::accountManagerReady()
+{
+    Tomahawk::Accounts::LastFmAccountFactory* lastfmFactory = new Tomahawk::Accounts::LastFmAccountFactory();
+    m_accountManager.data()->addAccountFactory( lastfmFactory );
+
+    Tomahawk::Accounts::SpotifyAccountFactory* spotifyFactory = new Tomahawk::Accounts::SpotifyAccountFactory;
+    m_accountManager.data()->addAccountFactory( spotifyFactory );
+    m_accountManager.data()->registerAccountFactoryForFilesystem( spotifyFactory );
+
+    Tomahawk::Accounts::AccountManager::instance()->loadFromConfig();
+}
+
+
+void
+TomahawkApp::activate()
+{
+#ifndef ENABLE_HEADLESS
+    TomahawkUtils::bringToFront();
+#endif
+}
+
+
+bool
+TomahawkApp::loadUrl( const QString& url )
+{
+#ifndef ENABLE_HEADLESS
+    if ( url.startsWith( "tomahawk://" ) )
+        return GlobalActionManager::instance()->parseTomahawkLink( url );
+    else if ( url.contains( "open.spotify.com" ) || url.contains( "spotify:track" ) )
+        return GlobalActionManager::instance()->openSpotifyLink( url );
+    else if ( url.contains( "www.rdio.com" ) )
+        return GlobalActionManager::instance()->openRdioLink( url );
+    else
+    {
+        QFile f( url );
+        QFileInfo info( f );
+        if ( info.suffix() == "xspf" )
+        {
+            XSPFLoader* l = new XSPFLoader( true, this );
+            tDebug( LOGINFO ) << "Loading spiff:" << url;
+            l->load( QUrl::fromUserInput( url ) );
+
+            return true;
+        }
+        else if ( info.suffix() == "jspf" )
+        {
+            JSPFLoader* l = new JSPFLoader( true, this );
+            tDebug( LOGINFO ) << "Loading j-spiff:" << url;
+            l->load( QUrl::fromUserInput( url ) );
+
+            return true;
+        }
+    }
+#endif
+    return false;
+}
+
+
+void
+TomahawkApp::instanceStarted( KDSingleApplicationGuard::Instance instance )
+{
+    tDebug( LOGINFO ) << "Instance started!" << instance.pid() << instance.arguments();
+    const QStringList arguments = instance.arguments();
+
+    if ( arguments.size() < 2 )
+        return;
+
+    QString arg1 = arguments 1 ;
+    if ( loadUrl( arg1 ) )
+    {
+        activate();
+        return;
+    }
+
+    if ( arguments.contains( "--next" ) )
+        AudioEngine::instance()->next();
+    else if ( arguments.contains( "--prev" ) )
+        AudioEngine::instance()->previous();
+    else if ( arguments.contains( "--playpause" ) )
+        AudioEngine::instance()->playPause();
+    else if ( arguments.contains( "--play" ) )
+        AudioEngine::instance()->play();
+    else if ( arguments.contains( "--pause" ) )
+        AudioEngine::instance()->pause();
+    else if ( arguments.contains( "--stop" ) )
+        AudioEngine::instance()->stop();
+}

tomahawk-0.5.5.tar.bz2/src/TomahawkApp.h Added

@@ -0,0 +1,154 @@
+/* === 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>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWKAPP_H
+#define TOMAHAWKAPP_H
+
+#define APP TomahawkApp::instance()
+
+#include "HeadlessCheck.h"
+#include "config.h"
+
+#include <QtCore/QRegExp>
+#include <QtCore/QFile>
+#include <QtCore/QSettings>
+#include <QtCore/QDir>
+#include <QtCore/QPersistentModelIndex>
+
+#include "QxtHttpServerConnector"
+#include "QxtHttpSessionManager"
+
+#include "mac/TomahawkApp_Mac.h" // for PlatforInterface
+#include "Typedefs.h"
+#include "utils/TomahawkUtils.h"
+#include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
+
+class AudioEngine;
+class Database;
+class ScanManager;
+class Servent;
+class SipHandler;
+class TomahawkSettings;
+class XMPPBot;
+class AudioControls;
+
+namespace Tomahawk
+{
+    class ShortcutHandler;
+    namespace InfoSystem
+    {
+        class InfoSystem;
+    }
+
+    namespace Accounts
+    {
+        class AccountManager;
+    }
+}
+
+#ifdef LIBLASTFM_FOUND
+#include <lastfm/NetworkAccessManager.h>
+#include "Scrobbler.h"
+#endif
+
+#ifndef TOMAHAWK_HEADLESS
+class TomahawkWindow;
+#endif
+
+
+// this also acts as a a container for important top-level objects
+// that other parts of the app need to find
+// (eg, library, pipeline, friends list)
+class TomahawkApp : public TOMAHAWK_APPLICATION, public Tomahawk::PlatformInterface
+{
+Q_OBJECT
+
+public:
+    TomahawkApp( int& argc, char *argv );
+    virtual ~TomahawkApp();
+
+    void init();
+    static TomahawkApp* instance();
+
+    XMPPBot* xmppBot() { return m_xmppBot.data(); }
+
+#ifndef ENABLE_HEADLESS
+    AudioControls* audioControls();
+    TomahawkWindow* mainWindow() const { return m_mainwindow; }
+#endif
+
+    // PlatformInterface
+    virtual bool loadUrl( const QString& url );
+
+    bool isTomahawkLoaded() const { return m_loaded; }
+    
+signals:
+    void tomahawkLoaded();
+
+public slots:
+    virtual void activate();
+    void instanceStarted( KDSingleApplicationGuard::Instance );
+
+private slots:
+    void initServent();
+    void initSIP();
+    void initHTTP();
+
+    void spotifyApiCheckFinished();
+    void accountManagerReady();
+
+private:
+    void installTranslator();
+    void registerMetaTypes();
+
+    void printHelp();
+
+    // Start-up order: database, collection, pipeline, servent, http
+    void initDatabase();
+    void initLocalCollection();
+    void initPipeline();
+
+    QWeakPointer<Database> m_database;
+    QWeakPointer<ScanManager> m_scanManager;
+    QWeakPointer<AudioEngine> m_audioEngine;
+    QWeakPointer<Servent> m_servent;
+    QWeakPointer<Tomahawk::InfoSystem::InfoSystem> m_infoSystem;
+    QWeakPointer<XMPPBot> m_xmppBot;
+    QWeakPointer<Tomahawk::ShortcutHandler> m_shortcutHandler;
+    QWeakPointer< Tomahawk::Accounts::AccountManager > m_accountManager;
+    bool m_scrubFriendlyName;
+
+#ifdef LIBLASTFM_FOUND
+    Scrobbler* m_scrobbler;
+#endif
+
+#ifndef TOMAHAWK_HEADLESS
+    TomahawkWindow* m_mainwindow;
+#endif
+
+    bool m_headless, m_loaded;
+
+    QWeakPointer< QxtHttpServerConnector > m_connector;
+    QWeakPointer< QxtHttpSessionManager > m_session;
+};
+
+Q_DECLARE_METATYPE( PairList )
+
+#endif // TOMAHAWKAPP_H

tomahawk-0.5.5.tar.bz2/src/TomahawkTrayIcon.cpp Added

@@ -0,0 +1,354 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "TomahawkTrayIcon.h"
+
+#include <QtGui/QWheelEvent>
+
+#include "Artist.h"
+
+#include "audio/AudioEngine.h"
+#include "TomahawkApp.h"
+#include "TomahawkWindow.h"
+#include "Query.h"
+#include "Source.h"
+#include "Collection.h"
+
+#include "utils/Logger.h"
+#include "utils/TomahawkUtilsGui.h"
+#include <ActionCollection.h>
+
+
+TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
+    : QSystemTrayIcon( parent )
+    , m_currentAnimationFrame( 0 )
+    , m_showWindowAction( 0 )
+    , m_stopContinueAfterTrackAction( 0 )
+    , m_loveTrackAction( 0 )
+{
+#ifdef Q_WS_MAC
+    QIcon icon( RESPATH "icons/tomahawk-icon-128x128-grayscale.png" );
+#else
+    QIcon icon( RESPATH "icons/tomahawk-icon-128x128.png" );
+#endif
+
+    setIcon( icon );
+
+    refreshToolTip();
+
+    m_contextMenu = new QMenu();
+    setContextMenu( m_contextMenu );
+
+    m_loveTrackAction = new QAction( this );
+    m_stopContinueAfterTrackAction = new QAction( this );
+
+    ActionCollection *ac = ActionCollection::instance();
+    m_contextMenu->addAction( ac->getAction( "playPause" ) );
+    m_contextMenu->addAction( ac->getAction( "stop" ) );
+    m_contextMenu->addSeparator();
+    m_contextMenu->addAction( m_loveTrackAction );
+    m_contextMenu->addAction( m_stopContinueAfterTrackAction );
+    m_contextMenu->addSeparator();
+    m_contextMenu->addAction( ac->getAction( "previousTrack" ) );
+    m_contextMenu->addAction( ac->getAction( "nextTrack" ) );
+    m_contextMenu->addSeparator();
+    m_contextMenu->addAction( ActionCollection::instance()->getAction( "togglePrivacy" ) );
+
+#ifdef Q_WS_MAC
+    // On mac you can close the windows while leaving the app open. We then need a way to show the main window again
+    m_contextMenu->addSeparator();
+    m_showWindowAction = m_contextMenu->addAction( tr( "Hide Tomahawk Window" ) );
+    m_showWindowAction->setData( true );
+    connect( m_showWindowAction, SIGNAL( triggered() ), this, SLOT( showWindow() ) );
+
+    connect( m_contextMenu, SIGNAL( aboutToShow() ), this, SLOT( menuAboutToShow() ) );
+#endif
+
+    m_contextMenu->addSeparator();
+    m_contextMenu->addAction( ac->getAction( "quit" ) );
+
+    connect( m_loveTrackAction, SIGNAL( triggered() ), SLOT( loveTrackTriggered() ) );
+    connect( m_stopContinueAfterTrackAction, SIGNAL( triggered() ), SLOT( stopContinueAfterTrackActionTriggered() ) );
+
+    connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), SLOT( setResult( Tomahawk::result_ptr ) ) );
+    connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( onPlay() ) );
+    connect( AudioEngine::instance(), SIGNAL( resumed() ), SLOT( onResume() ) );
+    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onStop() ) );
+    connect( AudioEngine::instance(), SIGNAL( paused() ),  SLOT( onPause() ) );
+    connect( AudioEngine::instance(), SIGNAL( stopAfterTrackChanged() ), SLOT( onStopContinueAfterTrackChanged() ) );
+
+    connect( &m_animationTimer, SIGNAL( timeout() ), SLOT( onAnimationTimer() ) );
+    connect( this, SIGNAL( activated( QSystemTrayIcon::ActivationReason ) ), SLOT( onActivated( QSystemTrayIcon::ActivationReason ) ) );
+
+    onStop();
+    show();
+}
+
+
+TomahawkTrayIcon::~TomahawkTrayIcon()
+{
+    delete m_contextMenu;
+}
+
+
+void
+TomahawkTrayIcon::setShowHideWindow( bool show )
+{
+    if ( show )
+    {
+        m_showWindowAction->setText( tr( "Hide Tomahawk Window" ) );
+        m_showWindowAction->setData( show );
+    }
+    else
+    {
+        m_showWindowAction->setText( tr( "Show Tomahawk Window" ) );
+    }
+
+    m_showWindowAction->setData( show );
+}
+
+
+void
+TomahawkTrayIcon::showWindow()
+{
+    if( !m_showWindowAction->data().toBool() )
+    {
+        APP->mainWindow()->show();
+        APP->mainWindow()->raise();
+
+        setShowHideWindow( true );
+    }
+    else
+    {
+        APP->mainWindow()->hide();
+
+        setShowHideWindow( false );
+    }
+}
+
+
+void
+TomahawkTrayIcon::menuAboutToShow()
+{
+    // When using Cmd-H on mac to hide a window, it is an OS-level hide that is different from QWidget::hide().
+    // Qt returns isVisible() == true for windows that are hidden with Cmd-H, which is weird. isActiveWindow() returns
+    // the proper information though.
+    setShowHideWindow( APP->mainWindow()->isActiveWindow() );
+}
+
+
+void
+TomahawkTrayIcon::setResult( const Tomahawk::result_ptr& result )
+{
+    if ( m_currentTrack )
+    {
+        disconnect( m_currentTrack->toQuery().data(), SIGNAL( socialActionsLoaded() ), this, SLOT( onSocialActionsLoaded() ) );
+    }
+
+    m_currentTrack = result;
+    refreshToolTip();
+
+    if ( result )
+        connect( result->toQuery().data(), SIGNAL( socialActionsLoaded() ), SLOT( onSocialActionsLoaded() ), Qt::UniqueConnection );
+
+    onSocialActionsLoaded();
+    onStopContinueAfterTrackChanged();
+}
+
+
+void
+TomahawkTrayIcon::onStopContinueAfterTrackChanged()
+{
+    if ( m_currentTrack && m_currentTrack->toQuery()->equals( AudioEngine::instance()->stopAfterTrack() ) )
+        m_stopContinueAfterTrackAction->setText( tr( "&Continue Playback after current Track" ) );
+    else
+        m_stopContinueAfterTrackAction->setText( tr( "&Stop Playback after current Track" ) );
+}
+
+
+void
+TomahawkTrayIcon::refreshToolTip()
+{
+    #ifdef Q_WS_MAC
+    // causes issues with OS X menubar, also none
+    // of the other OS X menubar icons have a tooltip
+    return;
+    #endif
+
+    QString tip;
+    if ( !m_currentTrack.isNull() )
+    {
+        tip = m_currentTrack->artist()->name() + " " + QChar( 8211 ) /*en dash*/ + " " + m_currentTrack->track();
+    }
+    else
+    {
+        tip = tr( "Currently not playing." );
+    }
+
+    #ifdef Q_WS_WIN
+        // Good old crappy Win32
+        tip.replace( "&", "&&&" );
+    #endif
+
+    setToolTip( tip );
+}
+
+
+void
+TomahawkTrayIcon::onAnimationTimer()
+{
+/*    m_currentAnimationFrame++;
+    if( m_currentAnimationFrame >= m_animationPixmaps.count() )
+        m_currentAnimationFrame = 0;
+
+    setIcon( m_animationPixmaps.at( m_currentAnimationFrame ) );*/
+}
+
+
+void
+TomahawkTrayIcon::onActivated( QSystemTrayIcon::ActivationReason reason )
+{
+#ifdef Q_WS_MAC
+    return;
+#endif
+
+    switch( reason )
+    {
+        case QSystemTrayIcon::Trigger:
+        {
+            TomahawkWindow* mainwindow = APP->mainWindow();
+            if (mainwindow->isActiveWindow())
+            {
+                mainwindow->hide();
+            }
+            else
+            {
+                TomahawkUtils::bringToFront();
+            }
+        }
+        break;
+
+        case QSystemTrayIcon::MiddleClick:
+        {
+            AudioEngine::instance()->playPause();
+        }
+        break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+TomahawkTrayIcon::onPause()
+{
+    ActionCollection::instance()->getAction( "playPause" )->setText( tr( "Play" ) );
+}
+
+
+void
+TomahawkTrayIcon::onPlay()
+{
+    m_loveTrackAction->setEnabled( true );
+    m_stopContinueAfterTrackAction->setEnabled( true );
+
+    onResume();
+}
+
+
+void
+TomahawkTrayIcon::onStop()
+{
+    m_loveTrackAction->setEnabled( false );
+    m_stopContinueAfterTrackAction->setEnabled( false );
+
+    setResult( Tomahawk::result_ptr() );
+    onPause();
+}
+
+
+void
+TomahawkTrayIcon::onResume()
+{
+    ActionCollection::instance()->getAction( "playPause" )->setText( tr( "Pause" ) );
+}
+
+
+void
+TomahawkTrayIcon::loveTrackTriggered()
+{
+    if ( !m_currentTrack )
+        return;
+
+    m_currentTrack->toQuery()->setLoved( !m_currentTrack->toQuery()->loved() );
+}
+
+
+void
+TomahawkTrayIcon::stopContinueAfterTrackActionTriggered()
+{
+    if ( !m_currentTrack )
+        return;
+
+    if ( !m_currentTrack->toQuery()->equals( AudioEngine::instance()->stopAfterTrack() ) )
+        AudioEngine::instance()->setStopAfterTrack( m_currentTrack->toQuery() );
+    else
+        AudioEngine::instance()->setStopAfterTrack( Tomahawk::query_ptr() );
+}
+
+
+void
+TomahawkTrayIcon::onSocialActionsLoaded()
+{
+    m_loveTrackAction->setText( tr( "&Love" ) );
+    m_loveTrackAction->setIcon( QIcon( RESPATH "images/loved.png" ) );
+
+    if ( !m_currentTrack )
+        return;
+
+    if ( m_currentTrack->toQuery()->loved() )
+    {
+        m_loveTrackAction->setText( tr( "Un-&Love" ) );
+        m_loveTrackAction->setIcon( QIcon( RESPATH "images/not-loved.png" ) );
+    }
+}
+
+
+bool
+TomahawkTrayIcon::event( QEvent* e )
+{
+    // Beginning with Qt 4.3, QSystemTrayIcon supports wheel events, but only
+    // on X11. Let's make it adjust the volume.
+    if ( e->type() == QEvent::Wheel )
+    {
+        if ( ((QWheelEvent*)e)->delta() > 0 )
+        {
+            AudioEngine::instance()->raiseVolume();
+        }
+        else
+        {
+            AudioEngine::instance()->lowerVolume();
+        }
+
+        return true;
+    }
+
+    return QSystemTrayIcon::event( e );
+}

tomahawk-0.5.5.tar.bz2/src/TomahawkTrayIcon.h Added

@@ -0,0 +1,77 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWK_TRAYICON_H
+#define TOMAHAWK_TRAYICON_H
+
+#include <QtGui/QSystemTrayIcon>
+#include <QtCore/QTimer>
+#include <QtGui/QMenu>
+
+#include "Result.h"
+
+class TomahawkTrayIcon : public QSystemTrayIcon
+{
+    Q_OBJECT
+
+public:
+    TomahawkTrayIcon( QObject* parent );
+    virtual bool event( QEvent* e );
+
+    void setShowHideWindow( bool show = true );
+
+public slots:
+    void setResult( const Tomahawk::result_ptr& result );
+
+private slots:
+    void onAnimationTimer();
+    void onActivated( QSystemTrayIcon::ActivationReason reason );
+    void showWindow();
+
+    void onPause();
+    void onPlay();
+    void onStop();
+    void onResume();
+    
+    void onSocialActionsLoaded();
+    void onStopContinueAfterTrackChanged();
+    void stopContinueAfterTrackActionTriggered();
+    void loveTrackTriggered();
+
+    void menuAboutToShow();
+
+private:
+    void refreshToolTip();
+    ~TomahawkTrayIcon();
+
+    QTimer m_animationTimer;
+    Tomahawk::result_ptr m_currentTrack;
+
+    QList<QPixmap> m_animationPixmaps;
+    int m_currentAnimationFrame;
+
+    QMenu* m_contextMenu;
+
+    QAction* m_showWindowAction;
+    QAction* m_stopContinueAfterTrackAction;
+    QAction* m_loveTrackAction;
+};
+
+#endif // TOMAHAWK_TRAYICON_H
+

tomahawk-0.5.5.tar.bz2/src/TomahawkWindow.cpp Added

@@ -0,0 +1,1035 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "TomahawkWindow.h"
+#include "ui_TomahawkWindow.h"
+
+#include <QAction>
+#include <QCloseEvent>
+#include <QDesktopServices>
+#include <QShowEvent>
+#include <QHideEvent>
+#include <QInputDialog>
+#include <QPixmap>
+#include <QPropertyAnimation>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QTimer>
+#include <QToolBar>
+
+#include "accounts/AccountManager.h"
+#include "sourcetree/SourceTreeView.h"
+#include "network/Servent.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/ProxyStyle.h"
+#include "utils/WidgetDragFilter.h"
+#include "widgets/AnimatedSplitter.h"
+#include "widgets/NewPlaylistWidget.h"
+#include "widgets/SearchWidget.h"
+#include "widgets/PlaylistTypeSelectorDialog.h"
+#include "thirdparty/Qocoa/qsearchfield.h"
+#include "playlist/dynamic/GeneratorInterface.h"
+#include "playlist/PlaylistModel.h"
+#include "playlist/PlaylistView.h"
+#include "playlist/QueueView.h"
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+#include "jobview/JobStatusModel.h"
+
+#include "Playlist.h"
+#include "Query.h"
+#include "Artist.h"
+#include "ViewManager.h"
+#include "ActionCollection.h"
+#include "AudioControls.h"
+#include "SettingsDialog.h"
+#include "DiagnosticsDialog.h"
+#include "TomahawkSettings.h"
+#include "SourceList.h"
+#include "TomahawkTrayIcon.h"
+#include "ScanManager.h"
+#include "TomahawkApp.h"
+#include "LoadXSPFDialog.h"
+
+#ifdef Q_WS_WIN
+#include <qtsparkle/Updater>
+#endif
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+TomahawkWindow::TomahawkWindow( QWidget* parent )
+    : QMainWindow( parent )
+    , ui( new Ui::TomahawkWindow )
+    , m_searchWidget( 0 )
+    , m_audioControls( new AudioControls( this ) )
+    , m_trayIcon( new TomahawkTrayIcon( this ) )
+    , m_audioRetryCounter( 0 )
+{
+    setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
+
+    ViewManager* vm = new ViewManager( this );
+    connect( vm, SIGNAL( showQueueRequested() ), SLOT( showQueue() ) );
+    connect( vm, SIGNAL( hideQueueRequested() ), SLOT( hideQueue() ) );
+    connect( APP, SIGNAL( tomahawkLoaded() ), vm, SLOT( setTomahawkLoaded() ) ); // Pass loaded signal into libtomahawk so components in there can connect to ViewManager
+
+    ui->setupUi( this );
+
+    ui->menuApp->insertAction( ui->actionCreatePlaylist, ActionCollection::instance()->getAction( "togglePrivacy" ) );
+    ui->menuApp->insertSeparator( ui->actionCreatePlaylist );
+
+    applyPlatformTweaks();
+
+    ui->centralWidget->setContentsMargins( 0, 0, 0, 0 );
+    TomahawkUtils::unmarginLayout( ui->centralWidget->layout() );
+
+    setupToolBar();
+    setupSideBar();
+    statusBar()->addPermanentWidget( m_audioControls, 1 );
+
+    setupUpdateCheck();
+    loadSettings();
+    setupSignals();
+
+    if ( qApp->arguments().contains( "--debug" ) )
+    {
+        ui->menu_Help->addSeparator();
+        ui->menu_Help->addAction( "Crash now...", this, SLOT( crashNow() ) );
+    }
+
+    // set initial state
+    onAccountDisconnected();
+    audioStopped();
+
+    vm->setQueue( m_queueView );
+    vm->showWelcomePage();
+}
+
+
+TomahawkWindow::~TomahawkWindow()
+{
+    saveSettings();
+    delete ui;
+}
+
+
+void
+TomahawkWindow::loadSettings()
+{
+    TomahawkSettings* s = TomahawkSettings::instance();
+
+    // Workaround for broken window geometry restoring on Qt Cocoa when setUnifiedTitleAndToolBarOnMac is true.
+    // See http://bugreports.qt.nokia.com/browse/QTBUG-3116 and
+    // http://lists.qt.nokia.com/pipermail/qt-interest/2009-August/011491.html
+    // for the 'fix'
+#ifdef QT_MAC_USE_COCOA
+     bool workaround = isVisible();
+     if ( workaround )
+     {
+       // make "invisible"
+       setWindowOpacity( 0 );
+       // let Qt update its frameStruts
+       show();
+     }
+#endif
+
+    if ( !s->mainWindowGeometry().isEmpty() )
+        restoreGeometry( s->mainWindowGeometry() );
+    if ( !s->mainWindowState().isEmpty() )
+        restoreState( s->mainWindowState() );
+    if ( !s->mainWindowSplitterState().isEmpty() )
+        ui->splitter->restoreState( s->mainWindowSplitterState() );
+
+    // Always set stretch factor. If user hasn't manually set splitter sizes,
+    // this will ensure a sane default on all startups. If the user has, the manual
+    // size will override the default stretching
+    ui->splitter->setStretchFactor( 0, 0 );
+    ui->splitter->setStretchFactor( 1, 1 );
+
+#ifdef QT_MAC_USE_COCOA
+     if ( workaround )
+     {
+       // Make it visible again
+       setWindowOpacity( 1 );
+     }
+#endif
+}
+
+
+void
+TomahawkWindow::saveSettings()
+{
+    TomahawkSettings* s = TomahawkSettings::instance();
+    s->setMainWindowGeometry( saveGeometry() );
+    s->setMainWindowState( saveState() );
+    s->setMainWindowSplitterState( ui->splitter->saveState() );
+}
+
+
+void
+TomahawkWindow::applyPlatformTweaks()
+{
+    // HACK QtCurve causes an infinite loop on startup. This is because setStyle calls setPalette, which calls ensureBaseStyle,
+    // which loads QtCurve. QtCurve calls setPalette, which creates an infinite loop. The UI will look like CRAP with QtCurve, but
+    // the user is asking for it explicitly... so he's gonna be stuck with an ugly UI.
+    if ( !QString( qApp->style()->metaObject()->className() ).toLower().contains( "qtcurve" ) )
+        qApp->setStyle( new ProxyStyle() );
+
+#ifdef Q_OS_MAC
+    setUnifiedTitleAndToolBarOnMac( true );
+    delete ui->hline1;
+    delete ui->hline2;
+#else
+    ui->hline1->setStyleSheet( "border: 1px solid gray;" );
+    ui->hline2->setStyleSheet( "border: 1px solid gray;" );
+#endif
+}
+
+
+void
+TomahawkWindow::setupToolBar()
+{
+    QToolBar* toolbar = addToolBar( "TomahawkToolbar" );
+    toolbar->setObjectName( "TomahawkToolbar" );
+    toolbar->setMovable( false );
+    toolbar->setFloatable( false );
+    toolbar->setIconSize( QSize( 22, 22 ) );
+    toolbar->setToolButtonStyle( Qt::ToolButtonIconOnly );
+    toolbar->setStyleSheet( "border-bottom: 0px" );
+
+#ifdef Q_OS_MAC
+    toolbar->installEventFilter( new WidgetDragFilter( toolbar ) );
+#endif
+
+    m_backAction = toolbar->addAction( QIcon( RESPATH "images/back.png" ), tr( "Back" ), ViewManager::instance(), SLOT( historyBack() ) );
+    m_backAction->setToolTip( tr( "Go back one page" ) );
+    m_forwardAction = toolbar->addAction( QIcon( RESPATH "images/forward.png" ), tr( "Forward" ), ViewManager::instance(), SLOT( historyForward() ) );
+    m_forwardAction->setToolTip( tr( "Go forward one page" ) );
+
+    QWidget* spacer = new QWidget( this );
+    spacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+    toolbar->addWidget( spacer );
+
+    m_searchWidget = new QSearchField( this );
+    m_searchWidget->setPlaceholderText( tr( "Global Search..." ) );
+    m_searchWidget->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+    m_searchWidget->setMaximumWidth( 340 );
+    connect( m_searchWidget, SIGNAL( returnPressed() ), this, SLOT( onFilterEdited() ) );
+    
+    toolbar->addWidget( m_searchWidget );
+}
+
+
+void
+TomahawkWindow::setupSideBar()
+{
+    // Delete fake designer widgets
+    delete ui->sidebarWidget;
+    delete ui->playlistWidget;
+
+    QWidget* sidebarWidget = new QWidget();
+    sidebarWidget->setLayout( new QVBoxLayout() );
+
+    m_sidebar = new AnimatedSplitter();
+    m_sidebar->setOrientation( Qt::Vertical );
+    m_sidebar->setChildrenCollapsible( false );
+
+    m_sourcetree = new SourceTreeView( this );
+    JobStatusView* jobsView = new JobStatusView( m_sidebar );
+    m_jobsModel = new JobStatusModel( jobsView );
+    jobsView->setModel( m_jobsModel );
+
+    m_queueView = new QueueView( m_sidebar );
+    AudioEngine::instance()->setQueue( m_queueView->queue()->proxyModel()->playlistInterface() );
+
+    m_sidebar->addWidget( m_sourcetree );
+    m_sidebar->addWidget( jobsView );
+    m_sidebar->addWidget( m_queueView );
+
+//    m_sidebar->setGreedyWidget( 1 );
+    m_sidebar->hide( 1, false );
+    m_sidebar->hide( 2, false );
+    m_sidebar->hide( 3, false );
+
+    sidebarWidget->layout()->addWidget( m_sidebar );
+    sidebarWidget->setContentsMargins( 0, 0, 0, 0 );
+    sidebarWidget->layout()->setContentsMargins( 0, 0, 0, 0 );
+    sidebarWidget->layout()->setMargin( 0 );
+
+#ifndef Q_OS_MAC
+    sidebarWidget->layout()->setSpacing( 0 );
+#endif
+
+    ui->splitter->addWidget( sidebarWidget );
+    ui->splitter->addWidget( ViewManager::instance()->widget() );
+    ui->splitter->setCollapsible( 1, false );
+
+    ui->actionShowOfflineSources->setChecked( TomahawkSettings::instance()->showOfflineSources() );
+}
+
+
+void
+TomahawkWindow::setupUpdateCheck()
+{
+#ifndef Q_OS_MAC
+    ui->menu_Help->insertSeparator( ui->actionAboutTomahawk );
+#endif
+
+#if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE )
+    QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check For Updates..." ) );
+    checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole );
+    connect( checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) );
+#elif defined( Q_WS_WIN )
+    QUrl updaterUrl;
+
+    if ( qApp->arguments().contains( "--debug" ) )
+        updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin-debug" );
+    else
+        updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin" );
+
+    qtsparkle::Updater* updater = new qtsparkle::Updater( updaterUrl, this );
+    Q_ASSERT( TomahawkUtils::nam() != 0 );
+    updater->SetNetworkAccessManager( TomahawkUtils::nam() );
+    updater->SetVersion( TomahawkUtils::appFriendlyVersion() );
+
+    ui->menu_Help->addSeparator();
+    QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check For Updates..." ) );
+    connect( checkForUpdates, SIGNAL( triggered() ), updater, SLOT( CheckNow() ) );
+#endif
+}
+
+
+void
+TomahawkWindow::setupSignals()
+{
+    // <From PlaylistManager>
+    connect( ViewManager::instance(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ),
+             m_audioControls,           SLOT( onRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
+    connect( ViewManager::instance(), SIGNAL( shuffleModeChanged( bool ) ),
+             m_audioControls,           SLOT( onShuffleModeChanged( bool ) ) );
+
+    // <From AudioEngine>
+    connect( AudioEngine::instance(), SIGNAL( error( AudioEngine::AudioErrorCode ) ), SLOT( onAudioEngineError( AudioEngine::AudioErrorCode ) ) );
+    connect( AudioEngine::instance(), SIGNAL( loading( const Tomahawk::result_ptr& ) ), SLOT( onPlaybackLoading( const Tomahawk::result_ptr& ) ) );
+    connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( audioStarted() ) );
+    connect( AudioEngine::instance(), SIGNAL( resumed()), SLOT( audioStarted() ) );
+    connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( audioPaused() ) );
+    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( audioStopped() ) );
+
+    // <Menu Items>
+    //    connect( ui->actionAddPeerManually, SIGNAL( triggered() ), SLOT( addPeerManually() ) );
+    connect( ui->actionPreferences, SIGNAL( triggered() ), SLOT( showSettingsDialog() ) );
+    connect( ui->actionDiagnostics, SIGNAL( triggered() ), SLOT( showDiagnosticsDialog() ) );
+    connect( ui->actionLegalInfo, SIGNAL( triggered() ), SLOT( legalInfo() ) );
+    connect( ui->actionToggleConnect, SIGNAL( triggered() ), AccountManager::instance(), SLOT( toggleAccountsConnected() ) );
+    connect( ui->actionUpdateCollection, SIGNAL( triggered() ), SLOT( updateCollectionManually() ) );
+    connect( ui->actionRescanCollection, SIGNAL( triggered() ), SLOT( rescanCollectionManually() ) );
+    connect( ui->actionLoadXSPF, SIGNAL( triggered() ), SLOT( loadSpiff() ));
+    connect( ui->actionCreatePlaylist, SIGNAL( triggered() ), SLOT( createPlaylist() ));
+    connect( ui->actionCreate_New_Station, SIGNAL( triggered() ), SLOT( createStation() ));
+    connect( ui->actionAboutTomahawk, SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) );
+    connect( ui->actionExit, SIGNAL( triggered() ), qApp, SLOT( quit() ) );
+    connect( ui->actionShowOfflineSources, SIGNAL( triggered() ), SLOT( showOfflineSources() ) );
+
+    connect( ui->actionPlay, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( playPause() ) );
+    connect( ui->actionNext, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( next() ) );
+    connect( ui->actionPrevious, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( previous() ) );
+
+#if defined( Q_OS_MAC )
+    connect( ui->actionMinimize, SIGNAL( triggered() ), SLOT( minimize() ) );
+    connect( ui->actionZoom, SIGNAL( triggered() ), SLOT( maximize() ) );
+#else
+    ui->menuWindow->clear();
+    ui->menuWindow->menuAction()->setVisible( false );
+#endif
+
+    // <AccountHandler>
+    connect( AccountManager::instance(), SIGNAL( connected( Tomahawk::Accounts::Account* ) ), SLOT( onAccountConnected() ) );
+    connect( AccountManager::instance(), SIGNAL( disconnected( Tomahawk::Accounts::Account* ) ), SLOT( onAccountDisconnected() ) );
+    connect( AccountManager::instance(), SIGNAL( authError( Tomahawk::Accounts::Account* ) ), SLOT( onAccountError() ) );
+
+    // Menus for accounts that support them
+    connect( AccountManager::instance(), SIGNAL( added( Tomahawk::Accounts::Account* ) ), this, SLOT( onAccountAdded( Tomahawk::Accounts::Account* ) ) );
+    foreach ( Account* account, AccountManager::instance()->accounts( Tomahawk::Accounts::SipType ) )
+    {
+        if ( !account || !account->sipPlugin() )
+            continue;
+
+        connect( account->sipPlugin(), SIGNAL( addMenu( QMenu* ) ), this, SLOT( pluginMenuAdded( QMenu* ) ) );
+        connect( account->sipPlugin(), SIGNAL( removeMenu( QMenu* ) ), this, SLOT( pluginMenuRemoved( QMenu* ) ) );
+    }
+    
+    connect( ViewManager::instance(), SIGNAL( historyBackAvailable( bool ) ), SLOT( onHistoryBackAvailable( bool ) ) );
+    connect( ViewManager::instance(), SIGNAL( historyForwardAvailable( bool ) ), SLOT( onHistoryForwardAvailable( bool ) ) );
+}
+
+
+void
+TomahawkWindow::changeEvent( QEvent* e )
+{
+    QMainWindow::changeEvent( e );
+
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+TomahawkWindow::closeEvent( QCloseEvent* e )
+{
+#ifndef Q_OS_MAC
+    if ( e->spontaneous() && QSystemTrayIcon::isSystemTrayAvailable() )
+    {
+        hide();
+        e->ignore();
+        return;
+    }
+#else
+    m_trayIcon->setShowHideWindow( false );
+#endif
+
+    e->accept();
+}
+
+
+void
+TomahawkWindow::showEvent( QShowEvent* e )
+{
+    QMainWindow::showEvent( e );
+
+#if defined( Q_OS_MAC )
+    ui->actionMinimize->setDisabled( false );
+    ui->actionZoom->setDisabled( false );
+#endif
+}
+
+
+void
+TomahawkWindow::hideEvent( QHideEvent* e )
+{
+    QMainWindow::hideEvent( e );
+
+#if defined( Q_OS_MAC )
+    ui->actionMinimize->setDisabled( true );
+    ui->actionZoom->setDisabled( true );
+#endif
+}
+
+
+void
+TomahawkWindow::keyPressEvent( QKeyEvent* e )
+{
+    bool accept = true;
+#if ! defined ( Q_OS_MAC )
+#define KEY_PRESSED Q_FUNC_INFO << "Multimedia Key Pressed:"
+    switch( e->key() )
+    {
+        case Qt::Key_MediaPlay:
+            tLog() << KEY_PRESSED << "Play";
+            AudioEngine::instance()->playPause();
+            break;
+        case Qt::Key_MediaStop:
+            tLog() << KEY_PRESSED << "Stop";
+            AudioEngine::instance()->stop();
+            break;
+        case Qt::Key_MediaPrevious:
+            tLog() << KEY_PRESSED << "Previous";
+            AudioEngine::instance()->previous();
+            break;
+        case Qt::Key_MediaNext:
+            tLog() << KEY_PRESSED << "Next";
+            AudioEngine::instance()->next();
+            break;
+        case Qt::Key_MediaPause:
+            tLog() << KEY_PRESSED << "Pause";
+            AudioEngine::instance()->pause();
+            break;
+        case Qt::Key_MediaTogglePlayPause:
+            tLog() << KEY_PRESSED << "PlayPause";
+            AudioEngine::instance()->playPause();
+            break;
+        case Qt::Key_MediaRecord:
+        default:
+            accept = false;
+    }
+#else
+    accept = false;
+#endif
+
+    if ( accept )
+        e->accept();
+
+    QMainWindow::keyPressEvent( e );
+}
+
+
+void
+TomahawkWindow::onHistoryBackAvailable( bool avail )
+{
+    m_backAction->setEnabled( avail );
+}
+
+
+void
+TomahawkWindow::onHistoryForwardAvailable( bool avail )
+{
+    m_forwardAction->setEnabled( avail );
+}
+
+
+void
+TomahawkWindow::showSettingsDialog()
+{
+    SettingsDialog win;
+    win.exec();
+}
+
+
+void 
+TomahawkWindow::showDiagnosticsDialog()
+{
+    DiagnosticsDialog win;
+    win.exec();
+}
+
+
+void
+TomahawkWindow::legalInfo()
+{
+    QDesktopServices::openUrl( QUrl( "http://www.tomahawk-player.org/legal.html" ) );
+}
+
+
+void
+TomahawkWindow::updateCollectionManually()
+{
+    if ( TomahawkSettings::instance()->hasScannerPaths() )
+        ScanManager::instance()->runScan();
+}
+
+
+void
+TomahawkWindow::rescanCollectionManually()
+{
+    if ( TomahawkSettings::instance()->hasScannerPaths() )
+        ScanManager::instance()->runScan( true );
+}
+
+
+void
+TomahawkWindow::addPeerManually()
+{
+    TomahawkSettings* s = TomahawkSettings::instance();
+    bool ok;
+    QString addr = QInputDialog::getText( this, tr( "Connect To Peer" ),
+                                                tr( "Enter peer address:" ), QLineEdit::Normal,
+                                                s->value( "connip" ).toString(), &ok ); // FIXME
+    if ( !ok )
+        return;
+
+    s->setValue( "connip", addr );
+    QString ports = QInputDialog::getText( this, tr( "Connect To Peer" ),
+                                                 tr( "Enter peer port:" ), QLineEdit::Normal,
+                                                 s->value( "connport", "50210" ).toString(), &ok );
+    if ( !ok )
+        return;
+
+    s->setValue( "connport", ports );
+    int port = ports.toInt();
+    QString key = QInputDialog::getText( this, tr( "Connect To Peer" ),
+                                               tr( "Enter peer key:" ), QLineEdit::Normal,
+                                               "whitelist", &ok );
+    if ( !ok )
+        return;
+
+    qDebug() << "Attempting to connect to" << addr;
+    Servent::instance()->connectToPeer( addr, port, key );
+}
+
+
+void
+TomahawkWindow::pluginMenuAdded( QMenu* menu )
+{
+    ui->menuNetwork->addMenu( menu );
+}
+
+
+void
+TomahawkWindow::pluginMenuRemoved( QMenu* menu )
+{
+    foreach ( QAction* action, ui->menuNetwork->actions() )
+    {
+        if ( action->menu() == menu )
+        {
+            ui->menuNetwork->removeAction( action );
+            return;
+        }
+    }
+}
+
+
+void
+TomahawkWindow::showOfflineSources()
+{
+    m_sourcetree->showOfflineSources( ui->actionShowOfflineSources->isChecked() );
+    TomahawkSettings::instance()->setShowOfflineSources( ui->actionShowOfflineSources->isChecked() );
+}
+
+
+void
+TomahawkWindow::fullScreenEntered()
+{
+    statusBar()->setSizeGripEnabled( false );
+}
+
+
+void
+TomahawkWindow::fullScreenExited()
+{
+    statusBar()->setSizeGripEnabled( true );
+}
+
+
+void
+TomahawkWindow::loadSpiff()
+{
+    LoadXSPFDialog* diag = new LoadXSPFDialog( this, Qt::Sheet );
+#ifdef Q_OS_MAC
+    connect( diag, SIGNAL( finished( int ) ), this, SLOT( loadXspfFinished( int ) ) );
+    diag->show();
+#else
+    QWeakPointer< LoadXSPFDialog > safe( diag );
+
+    int ret = diag->exec();
+    if ( !safe.isNull() && ret == QDialog::Accepted )
+    {
+        QUrl url = QUrl::fromUserInput( safe.data()->xspfUrl() );
+        bool autoUpdate = safe.data()->autoUpdate();
+
+        XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
+        connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
+        connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onXSPFOk( Tomahawk::playlist_ptr ) ) );
+        loader->load( url );
+    }
+#endif
+}
+
+
+void
+TomahawkWindow::loadXspfFinished( int ret )
+{
+    LoadXSPFDialog* d = qobject_cast< LoadXSPFDialog* >( sender() );
+    Q_ASSERT( d );
+    if ( ret == QDialog::Accepted )
+    {
+        QUrl url = QUrl::fromUserInput( d->xspfUrl() );
+        bool autoUpdate = d->autoUpdate();
+
+        XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
+        connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
+        connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onXSPFOk( Tomahawk::playlist_ptr ) ) );
+        loader->load( url );
+    }
+    d->deleteLater();
+}
+
+
+void
+TomahawkWindow::onXSPFOk( const Tomahawk::playlist_ptr& pl )
+{
+    ViewManager::instance()->show( pl );
+}
+
+
+void
+TomahawkWindow::onXSPFError( XSPFLoader::XSPFErrorCode error )
+{
+    switch ( error )
+    {
+        case XSPFLoader::ParseError:
+            QMessageBox::critical( this, tr( "XSPF Error" ), tr( "This is not a valid XSPF playlist." ) );
+            break;
+
+        case XSPFLoader::InvalidTrackError:
+            QMessageBox::warning( this, tr( "Failed to save tracks" ), tr( "Some tracks in the playlist do not contain an artist and a title. They will be ignored." ), QMessageBox::Ok );
+            break;
+        default:
+            //FIXME: This includes FetchError
+            break;
+    }
+}
+
+
+void
+TomahawkWindow::onAudioEngineError( AudioEngine::AudioErrorCode /* error */ )
+{
+    QString msg;
+#ifdef Q_WS_X11
+    msg = tr( "Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed." );
+#else
+    msg = tr( "Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped." );
+#endif
+    JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( msg, 15 ) );
+
+    if ( m_audioRetryCounter < 3 )
+        AudioEngine::instance()->play();
+    m_audioRetryCounter++;
+}
+
+
+void
+TomahawkWindow::createAutomaticPlaylist( QString playlistName )
+{
+    if ( playlistName.isEmpty() )
+        return;
+
+    source_ptr author = SourceList::instance()->getLocal();
+    QString id = uuid();
+    QString info  = ""; // FIXME
+    QString creator = "someone"; // FIXME
+
+    dynplaylist_ptr playlist = DynamicPlaylist::create( author, id, playlistName, info, creator, Static, false );
+    playlist->setMode( Static );
+    playlist->createNewRevision( uuid(), playlist->currentrevision(), playlist->type(), playlist->generator()->controls(), playlist->entries() );
+
+    ViewManager::instance()->show( playlist );
+}
+
+
+void
+TomahawkWindow::createStation()
+{
+    QString title = tr( "Station" );
+    bool ok;
+    QString playlistName = QInputDialog( this, Qt::Sheet ).getText( this, tr( "Create New Station" ), tr( "Name:" ), QLineEdit::Normal, title, &ok );
+    if ( !ok )
+        return;
+
+    if ( playlistName.isEmpty() || playlistName == title )
+    {
+        QList< dynplaylist_ptr > pls = SourceList::instance()->getLocal()->collection()->stations();
+        QStringList titles;
+        foreach ( const playlist_ptr& pl, pls )
+            titles << pl->title();
+
+        playlistName = title;
+        int i = 2;
+        while ( titles.contains( playlistName ) )
+        {
+            playlistName = QString( "%1 (%2)" ).arg( title ).arg( i++ );
+        }
+    }
+
+    source_ptr author = SourceList::instance()->getLocal();
+    QString id = uuid();
+    QString info  = ""; // FIXME
+    QString creator = "someone"; // FIXME
+
+    dynplaylist_ptr playlist = DynamicPlaylist::create( author, id, playlistName, info, creator, OnDemand, false );
+    playlist->setMode( OnDemand );
+    playlist->createNewRevision( uuid(), playlist->currentrevision(), playlist->type(), playlist->generator()->controls() );
+
+    ViewManager::instance()->show( playlist );
+}
+
+
+void
+TomahawkWindow::createPlaylist()
+{
+    PlaylistTypeSelectorDlg* playlistSelectorDlg = new PlaylistTypeSelectorDlg( TomahawkApp::instance()->mainWindow(), Qt::Sheet );
+
+#ifndef Q_OS_MAC
+    playlistSelectorDlg->setModal( true );
+#endif
+
+    connect( playlistSelectorDlg, SIGNAL( finished( int ) ), SLOT( playlistCreateDialogFinished( int ) ) );
+    playlistSelectorDlg->show();
+}
+
+
+void
+TomahawkWindow::playlistCreateDialogFinished( int ret )
+{
+    PlaylistTypeSelectorDlg* playlistSelectorDlg = qobject_cast< PlaylistTypeSelectorDlg* >( sender() );
+    Q_ASSERT( playlistSelectorDlg );
+
+    QString playlistName = playlistSelectorDlg->playlistName();
+
+    if ( !playlistSelectorDlg->playlistTypeIsAuto() && ret )
+    {
+        if ( playlistName.isEmpty() )
+        {
+            QList< playlist_ptr > pls = SourceList::instance()->getLocal()->collection()->playlists();
+            QStringList titles;
+            foreach ( const playlist_ptr& pl, pls )
+                titles << pl->title();
+
+            QString title = tr( "Playlist" );
+            playlistName = title;
+            int i = 2;
+            while ( titles.contains( playlistName ) )
+            {
+                playlistName = QString( "%1 (%2)" ).arg( title ).arg( i++ );
+            }
+        }
+
+        playlist_ptr playlist = Tomahawk::Playlist::create( SourceList::instance()->getLocal(), uuid(), playlistName, "", "", false, QList< query_ptr>() );
+        ViewManager::instance()->show( playlist );
+    }
+    else if ( playlistSelectorDlg->playlistTypeIsAuto() && ret )
+    {
+       // create Auto Playlist
+        if ( playlistName.isEmpty() )
+        {
+            QList< dynplaylist_ptr > pls = SourceList::instance()->getLocal()->collection()->autoPlaylists();
+            QStringList titles;
+            foreach ( const dynplaylist_ptr& pl, pls )
+                titles << pl->title();
+
+            QString title = tr( "Automatic Playlist" );
+            playlistName = title;
+            int i = 2;
+            while ( titles.contains( playlistName ) )
+            {
+                playlistName = QString( "%1 (%2)" ).arg( title ).arg( i++ );
+            }
+        }
+
+       createAutomaticPlaylist( playlistName );
+    }
+
+    playlistSelectorDlg->deleteLater();
+}
+
+
+void
+TomahawkWindow::audioStarted()
+{
+    m_audioRetryCounter = 0;
+
+    ui->actionPlay->setText( tr( "Pause" ) );
+    ActionCollection::instance()->getAction( "stop" )->setEnabled( true );
+}
+
+
+void
+TomahawkWindow::audioPaused()
+{
+    ui->actionPlay->setText( tr( "Play" ) );
+}
+
+
+void
+TomahawkWindow::audioStopped()
+{
+    audioPaused();
+    ActionCollection::instance()->getAction( "stop" )->setEnabled( false );
+    
+    m_currentTrack = result_ptr();
+    setWindowTitle( m_windowTitle );
+}
+
+
+void
+TomahawkWindow::onPlaybackLoading( const Tomahawk::result_ptr& result )
+{
+    m_currentTrack = result;
+    setWindowTitle( m_windowTitle );
+}
+
+
+void
+TomahawkWindow::onAccountConnected()
+{
+    ui->actionToggleConnect->setText( tr( "Go &offline" ) );
+}
+
+
+void
+TomahawkWindow::onAccountDisconnected()
+{
+    ui->actionToggleConnect->setText( tr( "Go &online" ) );
+}
+
+
+void
+TomahawkWindow::onAccountAdded( Account* acc )
+{
+    if ( !acc->types() & SipType || !acc->sipPlugin() )
+        return;
+
+    connect( acc->sipPlugin(), SIGNAL( addMenu( QMenu* ) ), this, SLOT( pluginMenuAdded( QMenu* ) ) );
+    connect( acc->sipPlugin(), SIGNAL( removeMenu( QMenu* ) ), this, SLOT( pluginMenuRemoved( QMenu* ) ) );
+}
+
+
+void
+TomahawkWindow::onAccountError()
+{
+    // TODO fix.
+//     onAccountDisconnected();
+
+    // TODO real error message from plugin kthxbbq
+    QMessageBox::warning( this,
+                          tr( "Authentication Error" ),
+                          tr( "Error connecting to SIP: Authentication failed!" ),
+                          QMessageBox::Ok );
+}
+
+
+void
+TomahawkWindow::setWindowTitle( const QString& title )
+{
+    m_windowTitle = title;
+
+    if ( m_currentTrack.isNull() )
+        QMainWindow::setWindowTitle( title );
+    else
+    {
+        QString s = tr( "%1 by %2", "track, artist name" ).arg( m_currentTrack->track(), m_currentTrack->artist()->name() );
+        QMainWindow::setWindowTitle( tr( "%1 - %2", "current track, some window title" ).arg( s, title ) );
+    }
+}
+
+
+void
+TomahawkWindow::showAboutTomahawk()
+{
+    QString head, desc;
+
+#ifdef DEBUG_BUILD
+    head = tr( "<h2><b>Tomahawk %1<br/>(%2)</h2>" )
+         .arg( TomahawkUtils::appFriendlyVersion() )
+         .arg( qApp->applicationVersion() );
+#else
+    head = tr( "<h2><b>Tomahawk %1</h2>" )
+         .arg( TomahawkUtils::appFriendlyVersion() );
+#endif
+
+    const QString copyright( tr( "Copyright 2010 - 2012" ) );
+    const QString thanksto( tr( "Thanks to:" ) );
+
+    desc = QString( "%1<br/>Christian Muehlhaeuser &lt;muesli@tomahawk-player.org&gt;<br/><br/>"
+                    "%2 Leo Franchi, Jeff Mitchell, Dominik Schmidt, Jason Herskowitz, Alejandro Wainzinger, Hugo Lindstr&ouml;m, Syd Lawrence, Michael Zanetti, Harald Sitter, Steve Robertson" )
+              .arg( copyright )
+              .arg( thanksto );
+
+    QMessageBox::about( this, tr( "About Tomahawk" ), head + desc );
+}
+
+
+void
+TomahawkWindow::checkForUpdates()
+{
+#ifdef Q_OS_MAC
+    Tomahawk::checkForUpdates();
+#endif
+}
+
+
+void
+TomahawkWindow::onSearch( const QString& search )
+{
+    if ( !search.trimmed().isEmpty() )
+        ViewManager::instance()->show( new SearchWidget( search, this ) );
+}
+
+
+void
+TomahawkWindow::onFilterEdited()
+{
+    onSearch( m_searchWidget->text() );
+    m_searchWidget->clear();
+}
+
+
+void
+TomahawkWindow::showQueue()
+{
+    if ( QThread::currentThread() != thread() )
+    {
+        qDebug() << "Reinvoking in correct thread:" << Q_FUNC_INFO;
+        QMetaObject::invokeMethod( this, "showQueue", Qt::QueuedConnection );
+        return;
+    }
+
+    m_queueView->show();
+}
+
+
+void
+TomahawkWindow::hideQueue()
+{
+    if ( QThread::currentThread() != thread() )
+    {
+        qDebug() << "Reinvoking in correct thread:" << Q_FUNC_INFO;
+        QMetaObject::invokeMethod( this, "hideQueue", Qt::QueuedConnection );
+        return;
+    }
+
+    m_queueView->hide();
+}
+
+
+void
+TomahawkWindow::minimize()
+{
+    if ( isMinimized() )
+    {
+        showNormal();
+    }
+    else
+    {
+        showMinimized();
+    }
+}
+
+
+void
+TomahawkWindow::maximize()
+{
+    if ( isMaximized() )
+    {
+        showNormal();
+    }
+    else
+    {
+        showMaximized();
+    }
+}
+
+
+void
+TomahawkWindow::crashNow()
+{
+    TomahawkUtils::crash();
+}

tomahawk-0.5.5.tar.bz2/src/TomahawkWindow.h Added

@@ -0,0 +1,164 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWKWINDOW_H
+#define TOMAHAWKWINDOW_H
+
+#include <QMainWindow>
+#include <QVariantMap>
+#include <QPushButton>
+#include <QString>
+#include <QStackedWidget>
+
+#include "Result.h"
+#include "audio/AudioEngine.h"
+#include "utils/XspfLoader.h"
+
+namespace Tomahawk {
+namespace Accounts {
+    class Account;
+}
+}
+
+class JobStatusModel;
+class QSearchField;
+class SourceTreeView;
+class QAction;
+
+class MusicScanner;
+class AudioControls;
+class TomahawkTrayIcon;
+class PlaylistModel;
+class QueueView;
+class AnimatedSplitter;
+
+namespace Ui
+{
+    class TomahawkWindow;
+    class GlobalSearchWidget;
+}
+
+class TomahawkWindow : public QMainWindow
+{
+Q_OBJECT
+
+public:
+    TomahawkWindow( QWidget* parent = 0 );
+    ~TomahawkWindow();
+
+    AudioControls* audioControls() { return m_audioControls; }
+    SourceTreeView* sourceTreeView() const { return m_sourcetree; }
+
+    void setWindowTitle( const QString& title );
+
+protected:
+    void changeEvent( QEvent* e );
+    void closeEvent( QCloseEvent* e );
+    void showEvent( QShowEvent* e );
+    void hideEvent( QHideEvent* e );
+    void keyPressEvent( QKeyEvent* e );
+
+public slots:
+    void createAutomaticPlaylist( QString );
+    void createStation();
+    void createPlaylist();
+    void loadSpiff();
+    void showSettingsDialog();
+    void showDiagnosticsDialog();
+    void legalInfo();
+    void updateCollectionManually();
+    void rescanCollectionManually();
+    void pluginMenuAdded(QMenu*);
+    void pluginMenuRemoved(QMenu*);
+    void showOfflineSources();
+
+    void fullScreenEntered();
+    void fullScreenExited();
+
+private slots:
+    void onAccountAdded( Tomahawk::Accounts::Account* account );
+    void onAccountConnected();
+    void onAccountDisconnected();
+    void onAccountError();
+
+    void onHistoryBackAvailable( bool avail );
+    void onHistoryForwardAvailable( bool avail );
+
+    void onAudioEngineError( AudioEngine::AudioErrorCode error );
+
+    void onXSPFError( XSPFLoader::XSPFErrorCode error );
+    void onXSPFOk( const Tomahawk::playlist_ptr& );
+
+    void addPeerManually();
+
+    void onPlaybackLoading( const Tomahawk::result_ptr& result );
+
+    void audioStarted();
+    void audioPaused();
+    void audioStopped();
+
+    void showAboutTomahawk();
+    void checkForUpdates();
+
+    void onSearch( const QString& search );
+    void onFilterEdited();
+
+    void loadXspfFinished( int );
+
+    void showQueue();
+    void hideQueue();
+
+    void minimize();
+    void maximize();
+
+    void playlistCreateDialogFinished( int ret );
+
+    void crashNow();
+
+private:
+    void loadSettings();
+    void saveSettings();
+
+    void applyPlatformTweaks();
+    void setupSignals();
+    void setupToolBar();
+    void setupSideBar();
+    void setupUpdateCheck();
+
+    Ui::TomahawkWindow* ui;
+    QSearchField* m_searchWidget;
+    AudioControls* m_audioControls;
+    TomahawkTrayIcon* m_trayIcon;
+    SourceTreeView* m_sourcetree;
+    QPushButton* m_statusButton;
+    QPushButton* m_queueButton;
+    QueueView* m_queueView;
+    AnimatedSplitter* m_sidebar;
+    JobStatusModel* m_jobsModel;
+
+    QAction* m_backAction;
+    QAction* m_forwardAction;
+
+    Tomahawk::result_ptr m_currentTrack;
+    QString m_windowTitle;
+    int m_audioRetryCounter;
+};
+
+#endif // TOMAHAWKWINDOW_H

tomahawk-0.5.5.tar.bz2/src/TomahawkWindow.ui Added

@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TomahawkWindow</class>
+ <widget class="QMainWindow" name="TomahawkWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1000</width>
+    <height>660</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Tomahawk</string>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QFrame" name="hline1">
+      <property name="maximumSize">
+       <size>
+        <width>16777215</width>
+        <height>1</height>
+       </size>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::HLine</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QSplitter" name="splitter">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="handleWidth">
+       <number>1</number>
+      </property>
+      <widget class="QWidget" name="sidebarWidget" native="true"/>
+      <widget class="QWidget" name="playlistWidget" native="true"/>
+     </widget>
+    </item>
+    <item>
+     <widget class="QFrame" name="hline2">
+      <property name="maximumSize">
+       <size>
+        <width>16777215</width>
+        <height>1</height>
+       </size>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::HLine</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>1000</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuSettings">
+    <property name="title">
+     <string>&amp;Settings</string>
+    </property>
+    <addaction name="actionPreferences"/>
+   </widget>
+   <widget class="QMenu" name="menuApp">
+    <property name="title">
+     <string>&amp;Controls</string>
+    </property>
+    <addaction name="actionPlay"/>
+    <addaction name="actionPrevious"/>
+    <addaction name="actionNext"/>
+    <addaction name="separator"/>
+    <addaction name="actionCreatePlaylist"/>
+    <addaction name="actionCreate_New_Station"/>
+    <addaction name="actionLoadXSPF"/>
+    <addaction name="separator"/>
+    <addaction name="actionUpdateCollection"/>
+    <addaction name="actionRescanCollection"/>
+    <addaction name="separator"/>
+    <addaction name="actionShowOfflineSources"/>
+    <addaction name="separator"/>
+    <addaction name="actionExit"/>
+   </widget>
+   <widget class="QMenu" name="menuNetwork">
+    <property name="title">
+     <string>&amp;Network</string>
+    </property>
+    <addaction name="actionToggleConnect"/>
+    <addaction name="separator"/>
+   </widget>
+   <widget class="QMenu" name="menuWindow">
+    <property name="title">
+     <string>&amp;Window</string>
+    </property>
+    <addaction name="actionMinimize"/>
+    <addaction name="actionZoom"/>
+   </widget>
+   <widget class="QMenu" name="menu_Help">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="actionDiagnostics"/>
+    <addaction name="actionAboutTomahawk"/>
+    <addaction name="actionLegalInfo"/>
+   </widget>
+   <addaction name="menuApp"/>
+   <addaction name="menuNetwork"/>
+   <addaction name="menuSettings"/>
+   <addaction name="menuWindow"/>
+   <addaction name="menu_Help"/>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+  <action name="actionExit">
+   <property name="text">
+    <string>&amp;Quit</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::QuitRole</enum>
+   </property>
+  </action>
+  <action name="actionToggleConnect">
+   <property name="text">
+    <string>Go &amp;Online</string>
+   </property>
+  </action>
+  <action name="actionAddFriendManually">
+   <property name="text">
+    <string>Add &amp;Friend...</string>
+   </property>
+  </action>
+  <action name="actionUpdateCollection">
+   <property name="text">
+    <string>U&amp;pdate Collection</string>
+   </property>
+   <property name="toolTip">
+    <string>Update Collection</string>
+   </property>
+  </action>
+  <action name="actionPreferences">
+   <property name="text">
+    <string>&amp;Configure Tomahawk...</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::PreferencesRole</enum>
+   </property>
+  </action>
+  <action name="actionLoadXSPF">
+   <property name="text">
+    <string>Load &amp;XSPF...</string>
+   </property>
+  </action>
+  <action name="actionCreatePlaylist">
+   <property name="text">
+    <string>Create &amp;New Playlist...</string>
+   </property>
+  </action>
+  <action name="actionAboutTomahawk">
+   <property name="text">
+    <string>About &amp;Tomahawk...</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::AboutRole</enum>
+   </property>
+  </action>
+  <action name="actionCreateAutomaticPlaylist">
+   <property name="text">
+    <string>Create New &amp;Automatic Playlist</string>
+   </property>
+  </action>
+  <action name="actionCreate_New_Station">
+   <property name="text">
+    <string>Create New &amp;Station</string>
+   </property>
+  </action>
+  <action name="actionShowOfflineSources">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Offline Sources</string>
+   </property>
+  </action>
+  <action name="actionHideOfflineSources">
+   <property name="text">
+    <string>Hide Offline Sources</string>
+   </property>
+  </action>
+  <action name="actionMinimize">
+   <property name="text">
+    <string>Minimize</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+M</string>
+   </property>
+  </action>
+  <action name="actionZoom">
+   <property name="text">
+    <string>Zoom</string>
+   </property>
+   <property name="shortcut">
+    <string>Meta+Ctrl+Z</string>
+   </property>
+  </action>
+  <action name="actionLegalInfo">
+   <property name="text">
+    <string>&amp;Legal Info...</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionDiagnostics">
+   <property name="text">
+    <string>Diagnostics...</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::ApplicationSpecificRole</enum>
+   </property>
+  </action>
+  <action name="actionRescanCollection">
+   <property name="text">
+    <string>Fully &amp;Rescan Collection</string>
+   </property>
+   <property name="toolTip">
+    <string>Fully Rescan Collection</string>
+   </property>
+  </action>
+  <action name="actionPlay">
+   <property name="text">
+    <string>Play</string>
+   </property>
+   <property name="shortcut">
+    <string>Space</string>
+   </property>
+  </action>
+  <action name="actionPrevious">
+   <property name="text">
+    <string>Previous</string>
+   </property>
+  </action>
+  <action name="actionNext">
+   <property name="text">
+    <string>Next</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+ <slots>
+  <slot>on_btnResolve_clicked()</slot>
+ </slots>
+</ui>

tomahawk-0.5.5.tar.bz2/src/UbuntuUnityHack.cpp Added

@@ -0,0 +1,83 @@
+/* This file is part of Clementine.
+   Copyright 2010, David Sansome <me@davidsansome.com>
+
+   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/>.
+*/
+
+#include "UbuntuUnityHack.h"
+#include "utils/Logger.h"
+
+#include <QProcess>
+
+const char* UbuntuUnityHack::kGSettingsFileName     = "gsettings";
+const char* UbuntuUnityHack::kUnityPanel            = "com.canonical.Unity.Panel";
+const char* UbuntuUnityHack::kUnitySystrayWhitelist = "systray-whitelist";
+
+UbuntuUnityHack::UbuntuUnityHack(QObject* parent)
+  : QObject(parent)
+{
+  // Get the systray whitelist from gsettings.  If this fails we're probably
+  // not running on a system with unity
+  QProcess* get = new QProcess(this);
+  connect(get, SIGNAL(finished(int)), SLOT(GetFinished(int)));
+  connect(get, SIGNAL(error(QProcess::ProcessError)), SLOT(GetError()));
+  get->start(kGSettingsFileName, QStringList()
+             << "get" << kUnityPanel << kUnitySystrayWhitelist);
+}
+
+void UbuntuUnityHack::GetError() {
+  QProcess* get = qobject_cast<QProcess*>(sender());
+  if (!get) {
+    return;
+  }
+
+  get->deleteLater();
+}
+
+void UbuntuUnityHack::GetFinished(int exit_code) {
+  QProcess* get = qobject_cast<QProcess*>(sender());
+  if (!get) {
+    return;
+  }
+
+  get->deleteLater();
+
+  if (exit_code != 0) {
+    // Probably not running in Unity.
+    return;
+  }
+
+  QByteArray whitelist = get->readAllStandardOutput();
+
+  tDebug() << "Unity whitelist is" << whitelist;
+
+  int index = whitelist.lastIndexOf('');
+  if (index == -1 || whitelist.contains("'tomahawk'")) {
+    return;
+  }
+
+  whitelist = whitelist.left(index) + QString(", 'tomahawk'").toUtf8() +
+              whitelist.mid(index);
+
+  tLog() << "Setting unity whitelist to" << whitelist;
+
+  QProcess* set = new QProcess(this);
+  connect(set, SIGNAL(finished(int)), set, SLOT(deleteLater()));
+  set->start(kGSettingsFileName, QStringList()
+             << "set" << kUnityPanel << kUnitySystrayWhitelist << whitelist);
+
+  tLog() << "Tomahawk has added itself to the Unity system tray" <<
+                "whitelist, but this won't take effect until the next time" <<
+                "you log out and log back in.";
+}

tomahawk-0.5.5.tar.bz2/src/UbuntuUnityHack.h Changed

tomahawk-0.5.5.tar.bz2/src/accounts Added

tomahawk-0.5.5.tar.bz2/src/accounts/AccountDllMacro.h Added

@@ -0,0 +1,33 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 ACCOUNTDLLMACRO_H
+#define ACCOUNTDLLMACRO_H
+
+#include <QtCore/qglobal.h>
+
+#ifndef ACCOUNTDLLEXPORT
+# if defined (ACCOUNTDLLEXPORT_PRO)
+#  define ACCOUNTDLLEXPORT Q_DECL_EXPORT
+# else
+#  define ACCOUNTDLLEXPORT Q_DECL_IMPORT
+# endif
+#endif
+
+#endif

tomahawk-0.5.5.tar.bz2/src/accounts/CMakeLists.txt Added

tomahawk-0.5.5.tar.bz2/src/accounts/twitter Added

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/CMakeLists.txt Added

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/TomahawkOAuthTwitter.cpp Added

@@ -0,0 +1,52 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "TomahawkOAuthTwitter.h"
+
+#include <QtGui/QInputDialog>
+
+#include "utils/Logger.h"
+
+
+TomahawkOAuthTwitter::TomahawkOAuthTwitter( QNetworkAccessManager *nam, QObject* parent )
+    : OAuthTwitter( QByteArray::fromBase64( "QzR2NFdmYTIxcmZJRGNrNEhNUjNB" ), QByteArray::fromBase64( "elhTalU2Ympydmc2VVZNSlg0SnVmcUh5amozaWV4dFkxNFNSOXVCRUFv" ), parent )
+{
+    setNetworkAccessManager( nam );
+}
+
+
+const QString
+TomahawkOAuthTwitter::authorizationWidget()
+{
+    bool ok;
+    const QString str = QInputDialog::getText(0, tr( "Twitter PIN" ), tr( "After authenticating on Twitter's web site,\nenter the displayed PIN number here:" ), QLineEdit::Normal, QString(), &ok);
+    if ( ok && !str.isEmpty() )
+        return str;
+
+    return QString();
+}
+
+void
+TomahawkOAuthTwitter::error()
+{
+    qDebug() << Q_FUNC_INFO;
+    setOAuthToken( QString().toLatin1() );
+    setOAuthTokenSecret( QString().toLatin1() );
+}

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/TomahawkOAuthTwitter.h Added

@@ -0,0 +1,45 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWKOAUTHTWITTERACCOUNT
+#define TOMAHAWKOAUTHTWITTERACCOUNT
+
+#include "accounts/AccountDllMacro.h"
+#include <utils/TomahawkUtils.h>
+
+#include <QTweetLib/qtweetlib_global.h>
+#include <QTweetLib/oauthtwitter.h>
+
+class ACCOUNTDLLEXPORT TomahawkOAuthTwitter : public OAuthTwitter
+{
+    Q_OBJECT
+
+public:
+    TomahawkOAuthTwitter( QNetworkAccessManager *nam = TomahawkUtils::nam() , QObject *parent = 0 );
+
+    ~TomahawkOAuthTwitter() {}
+
+protected:
+    virtual const QString authorizationWidget();
+
+private slots:
+    void error();
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/TwitterAccount.cpp Added

@@ -0,0 +1,236 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "TwitterAccount.h"
+#include "TwitterConfigWidget.h"
+#include "accounts/twitter/TomahawkOAuthTwitter.h"
+#include "libtomahawk/infosystem/InfoSystem.h"
+
+#include "sip/SipPlugin.h"
+
+#include <QTweetLib/qtweetaccountverifycredentials.h>
+#include <QTweetLib/qtweetuser.h>
+#include <QTweetLib/qtweetstatus.h>
+#include <QTweetLib/qtweetusershow.h>
+
+#include <QtCore/QtPlugin>
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+Account*
+TwitterAccountFactory::createAccount( const QString& accountId )
+{
+    return new TwitterAccount( accountId.isEmpty() ? Tomahawk::Accounts::generateId( factoryId() ) : accountId );
+}
+
+
+TwitterAccount::TwitterAccount( const QString &accountId )
+    : Account( accountId )
+    , m_isAuthenticated( false )
+    , m_isAuthenticating( false )
+{
+    setAccountServiceName( "Twitter" );
+    setTypes( AccountTypes( StatusPushType | SipType ) );
+
+    qDebug() << "Got cached peers:" << configuration() << configuration() "cachedpeers" ;
+
+    m_configWidget = QWeakPointer< TwitterConfigWidget >( new TwitterConfigWidget( this, 0 ) );
+    connect( m_configWidget.data(), SIGNAL( twitterAuthed( bool ) ), SLOT( configDialogAuthedSignalSlot( bool ) ) );
+
+    m_twitterAuth = QWeakPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) );
+}
+
+
+TwitterAccount::~TwitterAccount()
+{
+
+}
+
+
+void
+TwitterAccount::configDialogAuthedSignalSlot( bool authed )
+{
+    tDebug() << Q_FUNC_INFO;
+    m_isAuthenticated = authed;
+    if ( !credentials() "username" .toString().isEmpty() )
+        setAccountFriendlyName( QString( "@%1" ).arg( credentials() "username" .toString() ) );
+    syncConfig();
+    emit configurationChanged();
+}
+
+
+Account::ConnectionState
+TwitterAccount::connectionState() const
+{
+    return m_twitterSipPlugin.data()->connectionState();
+}
+
+SipPlugin*
+TwitterAccount::sipPlugin()
+{
+    if ( m_twitterSipPlugin.isNull() )
+    {
+        qDebug() << "CHECKING:" << configuration() << configuration() "cachedpeers" ;
+        m_twitterSipPlugin = QWeakPointer< TwitterSipPlugin >( new TwitterSipPlugin( this ) );
+
+        connect( m_twitterSipPlugin.data(), SIGNAL( stateChanged( Tomahawk::Accounts::Account::ConnectionState ) ), this, SIGNAL( connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ) );
+        return m_twitterSipPlugin.data();
+    }
+    return m_twitterSipPlugin.data();
+}
+
+
+Tomahawk::InfoSystem::InfoPluginPtr
+TwitterAccount::infoPlugin()
+{
+    if ( m_twitterInfoPlugin.isNull() )
+        m_twitterInfoPlugin = QWeakPointer< Tomahawk::InfoSystem::TwitterInfoPlugin >( new Tomahawk::InfoSystem::TwitterInfoPlugin( this ) );
+
+    return Tomahawk::InfoSystem::InfoPluginPtr( m_twitterInfoPlugin.data() );
+}
+
+
+void
+TwitterAccount::authenticate()
+{
+    // Since we need to have a chance for deletion (via the infosystem) to work on the info plugin, we put this on the event loop
+    tDebug() << Q_FUNC_INFO;
+    QTimer::singleShot( 0, this, SLOT( authenticateSlot() ) );
+}
+
+
+void
+TwitterAccount::authenticateSlot()
+{
+    tDebug() << Q_FUNC_INFO;
+    if ( m_twitterInfoPlugin.isNull() )
+    {
+        if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
+        {
+            infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+            Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
+        }
+    }
+    
+    if ( m_isAuthenticating )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Already authenticating";
+        return;
+    }
+    
+    tDebug() << Q_FUNC_INFO << "credentials: " << credentials().keys();
+
+    if ( credentials() "oauthtoken" .toString().isEmpty() || credentials() "oauthtokensecret" .toString().isEmpty() )
+    {
+        tDebug() << Q_FUNC_INFO << "TwitterSipPlugin has empty Twitter credentials; not connecting";
+        return;
+    }
+
+    if ( refreshTwitterAuth() )
+    {
+        m_isAuthenticating = true;
+        tDebug() << Q_FUNC_INFO << "Verifying credentials";
+        QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( m_twitterAuth.data(), this );
+        connect( credVerifier, SIGNAL( parsedUser( const QTweetUser & ) ), SLOT( connectAuthVerifyReply( const QTweetUser & ) ) );
+        credVerifier->verify();
+    }
+}
+
+
+void
+TwitterAccount::deauthenticate()
+{
+    tDebug() << Q_FUNC_INFO;
+    
+    if ( m_twitterSipPlugin )
+        sipPlugin()->disconnectPlugin();
+
+    if ( m_twitterInfoPlugin )
+        Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( m_twitterInfoPlugin.data() );
+
+    m_isAuthenticated = false;
+    m_isAuthenticating = false;
+    
+    emit nowDeauthenticated();
+}
+
+
+
+bool
+TwitterAccount::refreshTwitterAuth()
+{
+    qDebug() << Q_FUNC_INFO << " begin";
+    if( !m_twitterAuth.isNull() )
+        delete m_twitterAuth.data();
+
+    Q_ASSERT( TomahawkUtils::nam() != 0 );
+    tDebug() << Q_FUNC_INFO << " with nam " << TomahawkUtils::nam();
+    m_twitterAuth = QWeakPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) );
+
+    if( m_twitterAuth.isNull() )
+      return false;
+
+    m_twitterAuth.data()->setOAuthToken( credentials() "oauthtoken" .toString().toLatin1() );
+    m_twitterAuth.data()->setOAuthTokenSecret( credentials() "oauthtokensecret" .toString().toLatin1() );
+
+    return true;
+}
+
+
+void
+TwitterAccount::connectAuthVerifyReply( const QTweetUser &user )
+{
+    m_isAuthenticating = false;
+    if ( user.id() == 0 )
+    {
+        qDebug() << "TwitterAccount could not authenticate to Twitter";
+        deauthenticate();
+    }
+    else
+    {
+        tDebug() << "TwitterAccount successfully authenticated to Twitter as user " << user.screenName();
+        QVariantHash config = configuration();
+        config "screenname"  = user.screenName();
+        setConfiguration( config );
+        sync();
+
+        sipPlugin()->connectPlugin();
+
+        m_isAuthenticated = true;
+        emit nowAuthenticated( m_twitterAuth, user );
+    }
+}
+
+
+QPixmap
+TwitterAccount::icon() const {
+    return QPixmap( ":/twitter-icon.png" );
+}
+
+
+}
+
+}
+
+Q_EXPORT_PLUGIN2( Tomahawk::Accounts::AccountFactory, Tomahawk::Accounts::TwitterAccountFactory )

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/TwitterAccount.h Added

@@ -0,0 +1,108 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TWITTERACCOUNT_H
+#define TWITTERACCOUNT_H
+
+#include "TwitterConfigWidget.h"
+#include "TomahawkOAuthTwitter.h"
+
+#include "sip/TwitterSip.h"
+#include "TwitterInfoPlugin.h"
+#include "accounts/AccountDllMacro.h"
+#include "accounts/Account.h"
+
+#define MYNAME "ACCOUNTTWITTER"
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+class ACCOUNTDLLEXPORT TwitterAccountFactory : public AccountFactory
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::Accounts::AccountFactory )
+
+public:
+    TwitterAccountFactory() {}
+    virtual ~TwitterAccountFactory() {}
+
+    QString prettyName() const { return "Twitter"; }
+    QString factoryId() const { return "twitteraccount"; }
+    QString description() const { return tr( "Connect to your Twitter followers." ); }
+    QPixmap icon() const { return QPixmap( ":/twitter-icon.png" ); }
+    AccountTypes types() const { return AccountTypes( SipType | StatusPushType ); };
+    Account* createAccount( const QString& pluginId = QString() );
+};
+
+class ACCOUNTDLLEXPORT TwitterAccount : public Account
+{
+    Q_OBJECT
+
+public:
+    TwitterAccount( const QString &accountId );
+    virtual ~TwitterAccount();
+
+    QPixmap icon() const;
+
+    void authenticate();
+    void deauthenticate();
+    bool isAuthenticated() const { return m_isAuthenticated; }
+
+    ConnectionState connectionState() const;
+
+    Tomahawk::InfoSystem::InfoPluginPtr infoPlugin();
+    SipPlugin* sipPlugin();
+
+    QWidget* configurationWidget() { return m_configWidget.data(); }
+    QWidget* aclWidget() { return 0; }
+
+    bool refreshTwitterAuth();
+    TomahawkOAuthTwitter* twitterAuth() const { return m_twitterAuth.data(); }
+
+signals:
+    void nowAuthenticated( const QWeakPointer< TomahawkOAuthTwitter >&, const QTweetUser &user );
+    void nowDeauthenticated();
+
+private slots:
+    void authenticateSlot();
+    void configDialogAuthedSignalSlot( bool authed );
+    void connectAuthVerifyReply( const QTweetUser &user );
+
+private:
+    QIcon m_icon;
+    bool m_isAuthenticated;
+    bool m_isAuthenticating;
+    QWeakPointer< TomahawkOAuthTwitter > m_twitterAuth;
+    QWeakPointer< TwitterConfigWidget > m_configWidget;
+    QWeakPointer< TwitterSipPlugin > m_twitterSipPlugin;
+    QWeakPointer< Tomahawk::InfoSystem::TwitterInfoPlugin > m_twitterInfoPlugin;
+
+    // for settings access
+    friend class TwitterConfigWidget;
+};
+
+};
+
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/TwitterConfigWidget.cpp Added

@@ -0,0 +1,297 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "TwitterConfigWidget.h"
+#include "TwitterAccount.h"
+#include "ui_TwitterConfigWidget.h"
+
+#include "TomahawkSettings.h"
+#include "utils/TomahawkUtils.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "Source.h"
+
+#include "TomahawkOAuthTwitter.h"
+#include <QTweetLib/qtweetaccountverifycredentials.h>
+#include <QTweetLib/qtweetstatusupdate.h>
+#include <QTweetLib/qtweetdirectmessagenew.h>
+
+#include <QMessageBox>
+
+#include "utils/Logger.h"
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+TwitterConfigWidget::TwitterConfigWidget( TwitterAccount* account, QWidget *parent ) :
+    QWidget( parent ),
+    m_ui( new Ui::TwitterConfigWidget ),
+    m_account( account )
+{
+    m_ui->setupUi( this );
+
+    connect( m_ui->twitterAuthenticateButton, SIGNAL( pressed() ),
+            this, SLOT( authDeauthTwitter() ) );
+    connect( m_ui->twitterTweetGotTomahawkButton, SIGNAL( pressed() ),
+            this, SLOT( startPostGotTomahawkStatus() ) );
+    connect( m_ui->twitterTweetComboBox, SIGNAL( currentIndexChanged( int ) ),
+            this, SLOT( tweetComboBoxIndexChanged( int ) ) );
+
+    m_ui->twitterTweetComboBox->setCurrentIndex( 0 );
+    m_ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) );
+
+    QVariantHash credentials = m_account->credentials();
+
+    if ( credentials "oauthtoken" .toString().isEmpty() ||
+         credentials "oauthtokensecret" .toString().isEmpty() ||
+         credentials "username" .toString().isEmpty() )
+    {
+        m_ui->twitterStatusLabel->setText( tr( "Status: No saved credentials" ) );
+        m_ui->twitterAuthenticateButton->setText( tr( "Authenticate" ) );
+        m_ui->twitterSyncGroupBox->setVisible( false );
+
+        emit twitterAuthed( false );
+    }
+    else
+    {
+        m_ui->twitterStatusLabel->setText( tr( "Status: Credentials saved for %1" ).arg( m_account->credentials() "username" .toString() ) );
+        m_ui->twitterAuthenticateButton->setText( tr( "De-authenticate" ) );
+        m_ui->twitterSyncGroupBox->setVisible( true );
+        m_ui->twitterUserTweetLineEdit->setVisible( false );
+
+        emit twitterAuthed( true );
+    }
+
+}
+
+TwitterConfigWidget::~TwitterConfigWidget()
+{
+    delete m_ui;
+}
+
+void
+TwitterConfigWidget::authDeauthTwitter()
+{
+    if ( m_ui->twitterAuthenticateButton->text() == tr( "Authenticate" ) ) //FIXME: don't rely on UI strings here!
+        authenticateTwitter();
+    else
+        deauthenticateTwitter();
+}
+
+void
+TwitterConfigWidget::authenticateTwitter()
+{
+    qDebug() << Q_FUNC_INFO;
+    TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this );
+    twitAuth->authorizePin();
+
+    QVariantHash credentials = m_account->credentials();
+    credentials "oauthtoken"  = twitAuth->oauthToken();
+    credentials "oauthtokensecret"  = twitAuth->oauthTokenSecret();
+    m_account->setCredentials( credentials );
+
+    QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( twitAuth, this );
+    connect( credVerifier, SIGNAL( parsedUser( const QTweetUser & ) ), SLOT( authenticateVerifyReply( const QTweetUser & ) ) );
+    connect( credVerifier, SIGNAL( error( QTweetNetBase::ErrorCode, QString ) ), SLOT( authenticateVerifyError( QTweetNetBase::ErrorCode, QString ) ) );
+    credVerifier->verify();
+}
+
+void
+TwitterConfigWidget::authenticateVerifyReply( const QTweetUser &user )
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( user.id() == 0 )
+    {
+        QMessageBox::critical( this, tr("Tweetin' Error"), tr("The credentials could not be verified.\nYou may wish to try re-authenticating.") );
+        emit twitterAuthed( false );
+        return;
+    }
+
+    QVariantHash credentials = m_account->credentials();
+    credentials "username"  = user.screenName();
+    m_account->setCredentials( credentials );
+
+    QVariantHash configuration = m_account->configuration();
+    configuration "sipcachedfriendssinceid"  = 0;
+    configuration "sipcachedmentionssinceid"  = 0;
+    m_account->setConfiguration( configuration );
+
+    m_ui->twitterStatusLabel->setText( tr( "Status: Credentials saved for %1" ).arg( user.screenName() ) );
+    m_ui->twitterAuthenticateButton->setText( tr( "De-authenticate" ) );
+    m_ui->twitterSyncGroupBox->setVisible( true );
+    m_ui->twitterTweetComboBox->setCurrentIndex( 0 );
+    m_ui->twitterUserTweetLineEdit->setVisible( false );
+    m_ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) );
+
+    emit twitterAuthed( true );
+    emit sizeHintChanged();
+}
+
+void
+TwitterConfigWidget::authenticateVerifyError( QTweetNetBase::ErrorCode code, const QString &errorMsg )
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "Error validating credentials, error code is " << code << ", error message is " << errorMsg;
+    m_ui->twitterStatusLabel->setText(tr("Status: Error validating credentials"));
+    emit twitterAuthed( false );
+    return;
+}
+
+void
+TwitterConfigWidget::deauthenticateTwitter()
+{
+    qDebug() << Q_FUNC_INFO;
+    QVariantHash credentials = m_account->credentials();
+    credentials "oauthtoken"  = QString();
+    credentials "oauthtokensecret"  = QString();
+    credentials "username"  = QString();
+    m_account->setCredentials( credentials );
+
+    m_ui->twitterStatusLabel->setText(tr("Status: No saved credentials"));
+    m_ui->twitterAuthenticateButton->setText( tr( "Authenticate" ) );
+    m_ui->twitterSyncGroupBox->setVisible( false );
+
+    emit twitterAuthed( false );
+    emit sizeHintChanged();
+}
+
+void
+TwitterConfigWidget::tweetComboBoxIndexChanged( int index )
+{
+    Q_UNUSED( index );
+    if ( m_ui->twitterTweetComboBox->currentText() == tr( "Global Tweet" ) ) //FIXME: use data!
+        m_ui->twitterUserTweetLineEdit->setVisible( false );
+    else
+        m_ui->twitterUserTweetLineEdit->setVisible( true );
+
+    if ( m_ui->twitterTweetComboBox->currentText() == tr( "Direct Message" ) ) //FIXME: use data!
+        m_ui->twitterTweetGotTomahawkButton->setText( tr( "Send Message!" ) );
+    else if ( m_ui->twitterTweetComboBox->currentText() == tr( "@Mention" ) )
+        m_ui->twitterTweetGotTomahawkButton->setText( tr( "Send Mention!" ) );
+    else
+        m_ui->twitterTweetGotTomahawkButton->setText( tr( "Tweet!" ) );
+}
+
+void
+TwitterConfigWidget::startPostGotTomahawkStatus()
+{
+    qDebug() << Q_FUNC_INFO;
+    m_postGTtype = m_ui->twitterTweetComboBox->currentText();
+
+    if ( m_postGTtype != "Global Tweet" && ( m_ui->twitterUserTweetLineEdit->text().isEmpty() || m_ui->twitterUserTweetLineEdit->text() == "@" ) )
+    {
+        QMessageBox::critical( this, tr("Tweetin' Error"), tr("You must enter a user name for this type of tweet.") );
+        return;
+    }
+
+    qDebug() << "Posting Got Tomahawk status";
+    QVariantHash credentials = m_account->credentials();
+
+    if ( credentials "oauthtoken" .toString().isEmpty() ||
+         credentials "oauthtokensecret" .toString().isEmpty() ||
+         credentials "username" .toString().isEmpty() )
+    {
+        QMessageBox::critical( this, tr("Tweetin' Error"), tr("Your saved credentials could not be loaded.\nYou may wish to try re-authenticating.") );
+        emit twitterAuthed( false );
+        return;
+    }
+    TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this );
+    twitAuth->setOAuthToken( credentials "oauthtoken" .toString().toLatin1() );
+    twitAuth->setOAuthTokenSecret( credentials "oauthtokensecret" .toString().toLatin1() );
+    QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( twitAuth, this );
+    connect( credVerifier, SIGNAL( parsedUser(const QTweetUser &) ), SLOT( postGotTomahawkStatusAuthVerifyReply(const QTweetUser &) ) );
+    credVerifier->verify();
+}
+
+void
+TwitterConfigWidget::postGotTomahawkStatusAuthVerifyReply( const QTweetUser &user )
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( user.id() == 0 )
+    {
+        QMessageBox::critical( this, tr("Tweetin' Error"), tr("Your saved credentials could not be verified.\nYou may wish to try re-authenticating.") );
+        emit twitterAuthed( false );
+        return;
+    }
+    TomahawkOAuthTwitter *twitAuth = new TomahawkOAuthTwitter( TomahawkUtils::nam(), this );
+    QVariantHash credentials = m_account->credentials();
+    twitAuth->setOAuthToken( credentials "oauthtoken" .toString().toLatin1() );
+    twitAuth->setOAuthTokenSecret( credentials "oauthtokensecret" .toString().toLatin1() );
+    if ( m_postGTtype != "Direct Message" )
+    {
+        QTweetStatusUpdate *statUpdate = new QTweetStatusUpdate( twitAuth, this );
+        connect( statUpdate, SIGNAL( postedStatus(const QTweetStatus &) ), SLOT( postGotTomahawkStatusUpdateReply(const QTweetStatus &) ) );
+        connect( statUpdate, SIGNAL( error(QTweetNetBase::ErrorCode, const QString&) ), SLOT( postGotTomahawkStatusUpdateError(QTweetNetBase::ErrorCode, const QString &) ) );
+        QString uuid = QUuid::createUuid();
+        QString message = QString( "Got Tomahawk? {" ) + Database::instance()->impl()->dbid() + QString( "} (" ) + uuid.mid( 1, 8 ) + QString( ")" ) + QString( " http://gettomahawk.com" );
+        if ( m_postGTtype == "@Mention" )
+        {
+            QString user = m_ui->twitterUserTweetLineEdit->text();
+            if ( user.startsWith( "@" ) )
+                user.remove( 0, 1 );
+            message = QString( "@" ) + user + QString( " " ) + message;
+        }
+        statUpdate->post( message );
+    }
+    else
+    {
+        QTweetDirectMessageNew *statUpdate = new QTweetDirectMessageNew( twitAuth, this );
+        connect( statUpdate, SIGNAL( parsedDirectMessage(const QTweetDMStatus &)), SLOT( postGotTomahawkDirectMessageReply(const QTweetDMStatus &) ) );
+        connect( statUpdate, SIGNAL( error(QTweetNetBase::ErrorCode, const QString&) ), SLOT( postGotTomahawkStatusUpdateError(QTweetNetBase::ErrorCode, const QString &) ) );
+        QString uuid = QUuid::createUuid();
+        QString message = QString( "Got Tomahawk? {" ) + Database::instance()->impl()->dbid() + QString( "} (" ) + uuid.mid( 1, 8 ) + QString( ")" ) + QString( " http://gettomahawk.com" );
+        QString user = m_ui->twitterUserTweetLineEdit->text();
+        if ( user.startsWith( "@" ) )
+            user.remove( 0, 1 );
+        statUpdate->post( user, message );
+    }
+}
+
+void
+TwitterConfigWidget::postGotTomahawkStatusUpdateReply( const QTweetStatus& status )
+{
+    if ( status.id() == 0 )
+        QMessageBox::critical( this, tr("Tweetin' Error"), tr("There was an error posting your status -- sorry!") );
+    else
+        QMessageBox::information( this, tr("Tweeted!"), tr("Your tweet has been posted!") );
+}
+
+void
+TwitterConfigWidget::postGotTomahawkDirectMessageReply( const QTweetDMStatus& status )
+{
+    if ( status.id() == 0 )
+        QMessageBox::critical( this, tr("Tweetin' Error"), tr("There was an error posting your direct message -- sorry!") );
+    else
+        QMessageBox::information( this, tr("Tweeted!"), tr("Your message has been posted!") );
+}
+
+void
+TwitterConfigWidget::postGotTomahawkStatusUpdateError( QTweetNetBase::ErrorCode code, const QString& errorMsg )
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "Error posting Got Tomahawk message, error code is " << code << ", error message is " << errorMsg;
+    QMessageBox::critical( this, tr("Tweetin' Error"), tr("There was an error posting your status -- sorry!") );
+}
+
+}
+
+}
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/TwitterConfigWidget.h Added

@@ -0,0 +1,83 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TWITTERACCOUNTCONFIGWIDGET_H
+#define TWITTERACCOUNTCONFIGWIDGET_H
+
+#include "accounts/AccountDllMacro.h"
+
+#include <QTweetLib/qtweetstatus.h>
+#include <QTweetLib/qtweetdmstatus.h>
+#include <QTweetLib/qtweetuser.h>
+#include <QTweetLib/qtweetnetbase.h>
+
+#include <QWidget>
+
+namespace Ui
+{
+    class TwitterConfigWidget;
+}
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+class TwitterAccount;
+
+
+class ACCOUNTDLLEXPORT TwitterConfigWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit TwitterConfigWidget( TwitterAccount* account = 0, QWidget *parent = 0 );
+    virtual ~TwitterConfigWidget();
+
+signals:
+    void twitterAuthed( bool authed );
+
+    void sizeHintChanged();
+
+private slots:
+    void authDeauthTwitter();
+    void startPostGotTomahawkStatus();
+    void authenticateVerifyReply( const QTweetUser &user );
+    void authenticateVerifyError( QTweetNetBase::ErrorCode code, const QString &errorMsg );
+    void postGotTomahawkStatusAuthVerifyReply( const QTweetUser &user );
+    void postGotTomahawkStatusUpdateReply( const QTweetStatus &status );
+    void postGotTomahawkDirectMessageReply( const QTweetDMStatus &status );
+    void postGotTomahawkStatusUpdateError( QTweetNetBase::ErrorCode, const QString &errorMsg );
+    void tweetComboBoxIndexChanged( int index );
+
+private:
+    void authenticateTwitter();
+    void deauthenticateTwitter();
+
+    Ui::TwitterConfigWidget *m_ui;
+    TwitterAccount *m_account;
+    QString m_postGTtype;
+};
+
+}
+
+}
+
+#endif // TWITTERCONFIGWIDGET_H

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/TwitterConfigWidget.ui Changed

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/TwitterInfoPlugin.cpp Added

@@ -0,0 +1,202 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Dominik Schmidt <domme@tomahawk-player.org>
+ *   Copyright 2012, Jeff Mitchell <jeff@tomahawk-player.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 "TwitterInfoPlugin.h"
+
+#include "accounts/twitter/TwitterAccount.h"
+
+#include <QTweetLib/qtweetaccountverifycredentials.h>
+#include <QTweetLib/qtweetstatusupdate.h>
+
+#include "GlobalActionManager.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+TwitterInfoPlugin::TwitterInfoPlugin( Tomahawk::Accounts::TwitterAccount* account )
+    : m_account( account )
+{
+    m_supportedPushTypes << InfoShareTrack << InfoLove;
+}
+
+
+void
+TwitterInfoPlugin::init()
+{
+    if ( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() && thread() != Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() )
+    {
+        tDebug() << "Failure: move to the worker thread before running init";
+        return;
+    }
+
+    QVariantHash credentials = m_account->credentials();
+    if ( credentials "oauthtoken" .toString().isEmpty() || credentials "oauthtokensecret" .toString().isEmpty() )
+    {
+        tDebug() << "TwitterInfoPlugin has empty Twitter credentials; not connecting";
+        return;
+    }
+
+    if ( refreshTwitterAuth() )
+    {
+        QTweetAccountVerifyCredentials *credVerifier = new QTweetAccountVerifyCredentials( m_twitterAuth.data(), this );
+        connect( credVerifier, SIGNAL( parsedUser( const QTweetUser & ) ), SLOT( connectAuthVerifyReply( const QTweetUser & ) ) );
+        credVerifier->verify();
+    }
+}
+
+
+TwitterInfoPlugin::~TwitterInfoPlugin()
+{
+    tDebug() << Q_FUNC_INFO;
+}
+
+
+bool
+TwitterInfoPlugin::refreshTwitterAuth()
+{
+    tDebug() << Q_FUNC_INFO << "begin" << this;
+    if ( !m_twitterAuth.isNull() )
+        delete m_twitterAuth.data();
+
+    Q_ASSERT( TomahawkUtils::nam() != 0 );
+    tDebug() << Q_FUNC_INFO << "with nam" << TomahawkUtils::nam() << this;
+    m_twitterAuth = QWeakPointer< TomahawkOAuthTwitter >( new TomahawkOAuthTwitter( TomahawkUtils::nam(), this ) );
+
+    if ( m_twitterAuth.isNull() )
+      return false;
+
+    m_twitterAuth.data()->setOAuthToken( m_account->credentials() "oauthtoken" .toString().toLatin1() );
+    m_twitterAuth.data()->setOAuthTokenSecret( m_account->credentials() "oauthtokensecret" .toString().toLatin1() );
+
+    return true;
+}
+
+
+void
+TwitterInfoPlugin::connectAuthVerifyReply( const QTweetUser &user )
+{
+    if ( user.id() == 0 )
+    {
+        tDebug() << "TwitterInfoPlugin could not authenticate to Twitter" << this;
+        deleteLater();
+        return;
+    }
+    else
+    {
+        tDebug() << "TwitterInfoPlugin successfully authenticated to Twitter" << this;
+        return;
+    }
+}
+
+
+void
+TwitterInfoPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+{
+    tDebug() << Q_FUNC_INFO;
+    if ( !isValid() )
+    {
+        tDebug() << Q_FUNC_INFO << "Plugin not valid, deleting and returning";
+        deleteLater();
+        return;
+    }
+
+    Tomahawk::InfoSystem::PushInfoPair pushInfoPair = pushData.infoPair;
+
+    if ( !pushInfoPair.second.canConvert< QVariantMap >() )
+    {
+        tLog() << Q_FUNC_INFO << "Failed to find QVariantMap!";
+        return;
+    }
+
+    QVariantMap map = pushInfoPair.second.toMap();
+
+    if ( !map.contains( "accountlist" ) || !map "accountlist" .canConvert< QStringList >() )
+    {
+        tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Cowardly failing to send out a message without an account list present";
+        return;
+    }
+
+    const QStringList accountList = map "accountlist" .toStringList();
+    if ( !accountList.contains( "all" ) && !accountList.contains( m_account->accountId() ) )
+    {
+        tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Our account not in the list, not tweeting out";
+        return;
+    }
+
+    if ( !map.contains( "message" ) && ( !map.contains( "trackinfo" ) || !map "trackinfo" .canConvert< Tomahawk::InfoSystem::InfoStringHash >() ) )
+    {
+        tLog() << Q_FUNC_INFO << "Failed to find message or trackinfo";
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash info;
+    QString msg;
+    if ( !map.contains( "message" ) )
+    {
+        info = map "trackinfo" .value< Tomahawk::InfoSystem::InfoStringHash >();
+        msg = tr( "Listening to \"%1\" by %2 and loving it! %3" )
+                .arg( info "title"  )
+                .arg( info "artist"  )
+                .arg( pushInfoPair.first.contains( "shorturl" ) ?
+                        pushInfoPair.first "shorturl" .toUrl().toString() :
+                        GlobalActionManager::instance()->openLink( info "title" , info "artist" , info "album"  ).toString() );
+    }
+    else
+        msg = map "message" .toString();
+
+    QTweetStatusUpdate *statUpdate = new QTweetStatusUpdate( m_twitterAuth.data(), this );
+    connect( statUpdate, SIGNAL( postedStatus(const QTweetStatus &) ), SLOT( postLovedStatusUpdateReply(const QTweetStatus &) ) );
+    connect( statUpdate, SIGNAL( error(QTweetNetBase::ErrorCode, const QString&) ), SLOT( postLovedStatusUpdateError(QTweetNetBase::ErrorCode, const QString &) ) );
+    tDebug() << Q_FUNC_INFO << "Posting message:" << msg;
+    statUpdate->post( msg );
+}
+
+
+void
+TwitterInfoPlugin::postLovedStatusUpdateReply( const QTweetStatus& status )
+{
+    if ( status.id() == 0 )
+        tDebug() << Q_FUNC_INFO << "Failed to post loved status";
+    else
+        tDebug() << Q_FUNC_INFO << "Successfully posted loved status";
+}
+
+
+void
+TwitterInfoPlugin::postLovedStatusUpdateError( QTweetNetBase::ErrorCode code, const QString& errorMsg )
+{
+    tDebug() << Q_FUNC_INFO << "Error posting love message, error code is " << code << ", error message is " << errorMsg;
+}
+
+
+bool
+TwitterInfoPlugin::isValid() const
+{
+    return !m_twitterAuth.isNull();
+}
+
+}
+
+}

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/TwitterInfoPlugin.h Added

@@ -0,0 +1,80 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Dominik Schmidt <domme@tomahawk-player.org>
+ *   Copyright 2012, Jeff Mitchell <jeff@tomahawk-player.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 TWITTERINFOPLUGIN_H
+#define TWITTERINFOPLUGIN_H
+
+#include "infosystem/InfoSystem.h"
+#include "accounts/twitter/TomahawkOAuthTwitter.h"
+
+#include <QTweetLib/qtweetuser.h>
+#include <QTweetLib/qtweetstatus.h>
+#include <QTweetLib/qtweetnetbase.h>
+
+namespace Tomahawk {
+
+    namespace Accounts {
+        class TwitterAccount;
+    }
+    
+    namespace InfoSystem {
+
+        class TwitterInfoPlugin  : public InfoPlugin
+        {
+            Q_OBJECT
+
+        public:
+            TwitterInfoPlugin( Tomahawk::Accounts::TwitterAccount* account );
+            virtual ~TwitterInfoPlugin();
+            
+        public slots:
+            void notInCacheSlot( const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+            {
+                Q_UNUSED( criteria );
+                Q_UNUSED( requestData );
+            }
+
+        protected slots:
+            void init();
+            void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData );
+            void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+            {
+                Q_UNUSED( requestData );
+            }
+
+        private slots:
+            void connectAuthVerifyReply( const QTweetUser &user );
+            void postLovedStatusUpdateReply( const QTweetStatus& status );
+            void postLovedStatusUpdateError( QTweetNetBase::ErrorCode code, const QString& errorMsg );
+            
+        private:
+            bool refreshTwitterAuth();
+            bool isValid() const;
+            
+            Tomahawk::Accounts::TwitterAccount* m_account;
+            QWeakPointer< TomahawkOAuthTwitter > m_twitterAuth;
+        };
+
+    }
+
+}
+
+#endif // TWITTERINFOPLUGIN_H
+
+struct A;

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/resources.qrc Changed

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/sip Added

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/sip/TwitterSip.cpp Added

@@ -0,0 +1,717 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "TwitterSip.h"
+
+#include <QtPlugin>
+#include <QDateTime>
+#include <QRegExp>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QStringList>
+
+#include <QTweetLib/qtweetaccountverifycredentials.h>
+#include <QTweetLib/qtweetuser.h>
+#include <QTweetLib/qtweetstatus.h>
+#include <QTweetLib/qtweetusershow.h>
+
+#include <utils/TomahawkUtils.h>
+#include <TomahawkSettings.h>
+#include <database/Database.h>
+#include <database/DatabaseImpl.h>
+#include <network/Servent.h>
+#include "Source.h"
+
+#include "utils/Logger.h"
+#include "accounts/twitter/TomahawkOAuthTwitter.h"
+#include <accounts/twitter/TwitterAccount.h>
+
+static QString s_gotTomahawkRegex = QString( "^(@a-zA-Z0-9+ )?(Got Tomahawk\\?) (\\{a-fA-F0-9\\-+\\}) (.*)$" );
+
+TwitterSipPlugin::TwitterSipPlugin( Tomahawk::Accounts::Account* account )
+    : SipPlugin( account )
+    , m_checkTimer( this )
+    , m_connectTimer( this )
+    , m_dmPollTimer( this )
+    , m_cachedFriendsSinceId( 0 )
+    , m_cachedMentionsSinceId( 0 )
+    , m_cachedDirectMessagesSinceId( 0 )
+    , m_cachedPeers()
+    , m_keyCache()
+    , m_state( Tomahawk::Accounts::Account::Disconnected )
+{
+    qDebug() << Q_FUNC_INFO;
+
+    connect( account, SIGNAL( nowAuthenticated( const QWeakPointer< TomahawkOAuthTwitter > &, const QTweetUser & ) ), SLOT( accountAuthenticated( const QWeakPointer< TomahawkOAuthTwitter > &, const QTweetUser & ) ) );
+
+    m_configuration = account->configuration();
+    qDebug() << "SIP configuration:" << m_configuration << m_configuration "cachedpeers" ;
+    if ( Database::instance()->impl()->dbid() != m_account->configuration() "saveddbid" .toString() )
+    {
+        m_configuration "cachedpeers"  = QVariantHash();
+        m_configuration "saveddbid"  = Database::instance()->impl()->dbid();
+        syncConfig();
+    }
+
+    m_checkTimer.setInterval( 180000 );
+    m_checkTimer.setSingleShot( false );
+    connect( &m_checkTimer, SIGNAL( timeout() ), SLOT( checkTimerFired() ) );
+
+    m_dmPollTimer.setInterval( 60000 );
+    m_dmPollTimer.setSingleShot( false );
+    connect( &m_dmPollTimer, SIGNAL( timeout() ), SLOT( pollDirectMessages() ) );
+
+    m_connectTimer.setInterval( 180000 );
+    m_connectTimer.setSingleShot( false );
+    connect( &m_connectTimer, SIGNAL( timeout() ), SLOT( connectTimerFired() ) );
+}
+
+
+bool
+TwitterSipPlugin::isValid() const
+{
+    return m_account->enabled() && m_account->isAuthenticated() && !m_cachedTwitterAuth.isNull();
+}
+
+
+Tomahawk::Accounts::Account::ConnectionState
+TwitterSipPlugin::connectionState() const
+{
+    return m_state;
+}
+
+
+void
+TwitterSipPlugin::checkSettings()
+{
+    configurationChanged();
+}
+
+
+void
+TwitterSipPlugin::connectPlugin()
+{
+    tDebug() << Q_FUNC_INFO;
+    if ( !m_account->enabled() )
+    {
+        tDebug() << Q_FUNC_INFO << "account isn't enabled";
+        return;
+    }
+
+    m_cachedPeers = m_configuration "cachedpeers" .toHash();
+    QStringList peerList = m_cachedPeers.keys();
+    qStableSort( peerList.begin(), peerList.end() );
+
+    if ( !m_account->isAuthenticated() )
+    {
+        tDebug() << Q_FUNC_INFO << "account isn't authenticated, attempting";
+        m_account->authenticate();
+    }
+
+    m_state = Tomahawk::Accounts::Account::Connecting;
+    emit stateChanged( m_state );
+}
+
+
+void
+TwitterSipPlugin::disconnectPlugin()
+{
+    tDebug() << Q_FUNC_INFO;
+    m_checkTimer.stop();
+    m_connectTimer.stop();
+    m_dmPollTimer.stop();
+    if( !m_friendsTimeline.isNull() )
+        delete m_friendsTimeline.data();
+    if( !m_mentions.isNull() )
+        delete m_mentions.data();
+    if( !m_directMessages.isNull() )
+        delete m_directMessages.data();
+    if( !m_directMessageNew.isNull() )
+        delete m_directMessageNew.data();
+    if( !m_directMessageDestroy.isNull() )
+        delete m_directMessageDestroy.data();
+
+    m_cachedTwitterAuth.clear();
+
+    m_configuration "cachedpeers"  = m_cachedPeers;
+    syncConfig();
+    m_cachedPeers.empty();
+    m_state = Tomahawk::Accounts::Account::Disconnected;
+    emit stateChanged( m_state );
+}
+
+void
+TwitterSipPlugin::accountAuthenticated( const QWeakPointer< TomahawkOAuthTwitter > &twitterAuth, const QTweetUser &user )
+{
+    Q_UNUSED( user );
+
+    if ( !m_account->enabled() || !m_account->isAuthenticated() )
+        return;
+
+    m_cachedTwitterAuth = twitterAuth;
+
+    m_friendsTimeline = QWeakPointer<QTweetFriendsTimeline>( new QTweetFriendsTimeline( m_cachedTwitterAuth.data(), this ) );
+    m_mentions = QWeakPointer<QTweetMentions>( new QTweetMentions( m_cachedTwitterAuth.data(), this ) );
+    m_directMessages = QWeakPointer<QTweetDirectMessages>( new QTweetDirectMessages( m_cachedTwitterAuth.data(), this ) );
+    m_directMessageNew = QWeakPointer<QTweetDirectMessageNew>( new QTweetDirectMessageNew( m_cachedTwitterAuth.data(), this ) );
+    m_directMessageDestroy = QWeakPointer<QTweetDirectMessageDestroy>( new QTweetDirectMessageDestroy( m_cachedTwitterAuth.data(), this ) );
+    connect( m_friendsTimeline.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( friendsTimelineStatuses(const QList<QTweetStatus> &) ) );
+    connect( m_mentions.data(), SIGNAL( parsedStatuses(const QList< QTweetStatus > &) ), SLOT( mentionsStatuses(const QList<QTweetStatus> &) ) );
+    connect( m_directMessages.data(), SIGNAL( parsedDirectMessages(const QList<QTweetDMStatus> &)), SLOT( directMessages(const QList<QTweetDMStatus> &) ) );
+    connect( m_directMessageNew.data(), SIGNAL( parsedDirectMessage(const QTweetDMStatus &)), SLOT( directMessagePosted(const QTweetDMStatus &) ) );
+    connect( m_directMessageNew.data(), SIGNAL( error(QTweetNetBase::ErrorCode, const QString &) ), SLOT( directMessagePostError(QTweetNetBase::ErrorCode, const QString &) ) );
+    connect( m_directMessageDestroy.data(), SIGNAL( parsedDirectMessage(const QTweetDMStatus &) ), SLOT( directMessageDestroyed(const QTweetDMStatus &) ) );
+    m_state = Tomahawk::Accounts::Account::Connected;
+    emit stateChanged( m_state );
+    QStringList peerList = m_cachedPeers.keys();
+    qStableSort( peerList.begin(), peerList.end() );
+    registerOffers( peerList );
+    m_connectTimer.start();
+    m_checkTimer.start();
+    m_dmPollTimer.start();
+
+    QMetaObject::invokeMethod( this, "checkTimerFired", Qt::AutoConnection );
+    QTimer::singleShot( 20000, this, SLOT( connectTimerFired() ) );
+}
+
+
+void
+TwitterSipPlugin::checkTimerFired()
+{
+    if ( !isValid() )
+        return;
+
+    if ( m_cachedFriendsSinceId == 0 )
+        m_cachedFriendsSinceId = m_configuration "cachedfriendssinceid" .toLongLong();
+
+    qDebug() << "TwitterSipPlugin looking at friends timeline since id " << m_cachedFriendsSinceId;
+
+    if ( !m_friendsTimeline.isNull() )
+        m_friendsTimeline.data()->fetch( m_cachedFriendsSinceId, 0, 800 );
+
+    if ( m_cachedMentionsSinceId == 0 )
+        m_cachedMentionsSinceId = m_configuration "cachedmentionssinceid" .toLongLong();
+
+    qDebug() << "TwitterSipPlugin looking at mentions timeline since id " << m_cachedMentionsSinceId;
+
+    if ( !m_mentions.isNull() )
+        m_mentions.data()->fetch( m_cachedMentionsSinceId, 0, 800 );
+}
+
+
+void
+TwitterSipPlugin::registerOffers( const QStringList &peerList )
+{
+    if ( !isValid() )
+        return;
+
+    foreach( QString screenName, peerList )
+    {
+        QVariantHash peerData = m_cachedPeersscreenName.toHash();
+
+        if ( peerData.contains( "onod" ) && peerData"onod" != Database::instance()->impl()->dbid() )
+        {
+            m_cachedPeers.remove( screenName );
+            m_configuration "cachedpeers"  = m_cachedPeers;
+            syncConfig();
+        }
+
+        if ( Servent::instance()->connectedToSession( peerData"node".toString() ) )
+        {
+            peerData"lastseen" = QDateTime::currentMSecsSinceEpoch();
+            m_cachedPeersscreenName = peerData;
+            m_configuration "cachedpeers"  = m_cachedPeers;
+            syncConfig();
+            qDebug() << Q_FUNC_INFO << " already connected";
+            continue;
+        }
+        else if ( QDateTime::currentMSecsSinceEpoch() - peerData"lastseen".toLongLong() > 1209600000 ) // 2 weeks
+        {
+            qDebug() << Q_FUNC_INFO << " aging peer " << screenName << " out of cache";
+            m_cachedPeers.remove( screenName );
+            m_configuration "cachedpeers"  = m_cachedPeers;
+            syncConfig();
+            m_cachedAvatars.remove( screenName );
+            continue;
+        }
+
+        if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) )
+        {
+            qDebug() << "TwitterSipPlugin does not have host, port and/or pkey values for " << screenName << " (this is usually *not* a bug or problem but a normal part of the process)";
+            continue;
+        }
+
+        QMetaObject::invokeMethod( this, "registerOffer", Q_ARG( QString, screenName ), Q_ARG( QVariantHash, peerData ) );
+    }
+}
+
+
+void
+TwitterSipPlugin::connectTimerFired()
+{
+    tDebug() << Q_FUNC_INFO << " beginning";
+    if ( !isValid() || m_cachedPeers.isEmpty() )
+    {
+        if ( !isValid() )
+            tDebug() << Q_FUNC_INFO << " is not valid";
+        if ( m_cachedPeers.isEmpty() )
+            tDebug() << Q_FUNC_INFO << " has empty cached peers";
+        return;
+    }
+
+    tDebug() << Q_FUNC_INFO << " continuing";
+    QString myScreenName = m_configuration "screenname" .toString();
+    QStringList peerList = m_cachedPeers.keys();
+    qStableSort( peerList.begin(), peerList.end() );
+    registerOffers( peerList );
+}
+
+void
+TwitterSipPlugin::parseGotTomahawk( const QRegExp &regex, const QString &screenName, const QString &text )
+{
+    QString myScreenName = m_configuration "screenname" .toString();
+    qDebug() << "TwitterSipPlugin found an exact matching Got Tomahawk? mention or direct message from user " << screenName << ", now parsing";
+    regex.exactMatch( text );
+    if ( text.startsWith( '@' ) && regex.captureCount() >= 2 && regex.cap( 1 ) != QString( '@' + myScreenName ) )
+    {
+        qDebug() << "TwitterSipPlugin skipping mention because it's directed @someone that isn't us";
+        return;
+    }
+
+    QString node;
+    for ( int i = 0; i < regex.captureCount(); ++i )
+    {
+        if ( regex.cap( i ) == QString( "Got Tomahawk?" ) )
+        {
+            QString nodeCap = regex.cap( i + 1 );
+            nodeCap.chop( 1 );
+            node = nodeCap.mid( 1 );
+        }
+    }
+    if ( node.isEmpty() )
+    {
+        qDebug() << "TwitterSipPlugin could not parse node out of the tweet";
+        return;
+    }
+    else
+        qDebug() << "TwitterSipPlugin parsed node " << node << " out of the tweet";
+
+    if ( node == Database::instance()->impl()->dbid() )
+    {
+        qDebug() << "My dbid found; ignoring";
+        return;
+    }
+
+    QVariantHash peerData;
+    if( m_cachedPeers.contains( screenName ) )
+    {
+        peerData = m_cachedPeersscreenName.toHash();
+        //force a re-send of info but no need to re-register
+        peerData"resend" = QVariant::fromValue< bool >( true );
+        if ( peerData"node".toString() != node )
+            peerData"rekey" = QVariant::fromValue< bool >( true );
+    }
+    peerData"node" = QVariant::fromValue< QString >( node );
+    QMetaObject::invokeMethod( this, "registerOffer", Q_ARG( QString, screenName ), Q_ARG( QVariantHash, peerData ) );
+}
+
+void
+TwitterSipPlugin::friendsTimelineStatuses( const QList< QTweetStatus > &statuses )
+{
+    tDebug() << Q_FUNC_INFO;
+    QRegExp regex( s_gotTomahawkRegex, Qt::CaseSensitive, QRegExp::RegExp2 );
+
+    QHash< QString, QTweetStatus > latestHash;
+    foreach ( QTweetStatus status, statuses )
+    {
+        if ( !regex.exactMatch( status.text() ) )
+            continue;
+
+        if ( !latestHash.contains( status.user().screenName() ) )
+            latestHashstatus.user().screenName() = status;
+        else
+        {
+            if ( status.id() > latestHashstatus.user().screenName().id() )
+                latestHashstatus.user().screenName() = status;
+        }
+    }
+
+    foreach( QTweetStatus status, latestHash.values() )
+    {
+        if ( status.id() > m_cachedFriendsSinceId )
+            m_cachedFriendsSinceId = status.id();
+
+        tDebug() << "TwitterSipPlugin checking mention from " << status.user().screenName() << " with content " << status.text();
+        parseGotTomahawk( regex, status.user().screenName(), status.text() );
+    }
+
+    m_configuration "cachedfriendssinceid"  = m_cachedFriendsSinceId;
+    syncConfig();
+}
+
+void
+TwitterSipPlugin::mentionsStatuses( const QList< QTweetStatus > &statuses )
+{
+    tDebug() << Q_FUNC_INFO;
+    QRegExp regex( s_gotTomahawkRegex, Qt::CaseSensitive, QRegExp::RegExp2 );
+
+    QHash< QString, QTweetStatus > latestHash;
+    foreach ( QTweetStatus status, statuses )
+    {
+        if ( !regex.exactMatch( status.text() ) )
+            continue;
+
+        if ( !latestHash.contains( status.user().screenName() ) )
+            latestHashstatus.user().screenName() = status;
+        else
+        {
+            if ( status.id() > latestHashstatus.user().screenName().id() )
+                latestHashstatus.user().screenName() = status;
+        }
+    }
+
+    foreach( QTweetStatus status, latestHash.values() )
+    {
+        if ( status.id() > m_cachedMentionsSinceId )
+            m_cachedMentionsSinceId = status.id();
+
+        tDebug() << "TwitterSipPlugin checking mention from " << status.user().screenName() << " with content " << status.text();
+        parseGotTomahawk( regex, status.user().screenName(), status.text() );
+    }
+
+    m_configuration "cachedmentionssinceid"  = m_cachedMentionsSinceId;
+    syncConfig();
+}
+
+void
+TwitterSipPlugin::pollDirectMessages()
+{
+    if ( !isValid() )
+        return;
+
+    if ( m_cachedDirectMessagesSinceId == 0 )
+        m_cachedDirectMessagesSinceId = m_configuration "cacheddirectmessagessinceid" .toLongLong();
+
+    tDebug() << "TwitterSipPlugin looking for direct messages since id " << m_cachedDirectMessagesSinceId;
+
+    if ( !m_directMessages.isNull() )
+        m_directMessages.data()->fetch( m_cachedDirectMessagesSinceId, 0, 800 );
+}
+
+void
+TwitterSipPlugin::directMessages( const QList< QTweetDMStatus > &messages )
+{
+    tDebug() << Q_FUNC_INFO;
+
+    QRegExp regex( s_gotTomahawkRegex, Qt::CaseSensitive, QRegExp::RegExp2 );
+    QString myScreenName = m_configuration "screenname" .toString();
+
+    QHash< QString, QTweetDMStatus > latestHash;
+    foreach ( QTweetDMStatus status, messages )
+    {
+        if ( !regex.exactMatch( status.text() ) )
+        {
+            QStringList splitList = status.text().split(':');
+            if ( splitList.length() != 5 )
+                continue;
+            if ( splitList0 != "TOMAHAWKPEER" )
+                continue;
+            if ( !splitList1.startsWith( "Host=" ) || !splitList2.startsWith( "Port=" ) || !splitList3.startsWith( "Node=" ) || !splitList4.startsWith( "PKey=" ) )
+                continue;
+            int port = splitList2.mid( 5 ).toInt();
+            if ( port == 0 )
+                continue;
+        }
+
+        if ( !latestHash.contains( status.senderScreenName() ) )
+            latestHashstatus.senderScreenName() = status;
+        else
+        {
+            if ( status.id() > latestHashstatus.senderScreenName().id() )
+                latestHashstatus.senderScreenName() = status;
+        }
+    }
+
+    foreach( QTweetDMStatus status, latestHash.values() )
+    {
+        qDebug() << "TwitterSipPlugin checking direct message from " << status.senderScreenName() << " with content " << status.text();
+        if ( status.id() > m_cachedDirectMessagesSinceId )
+            m_cachedDirectMessagesSinceId = status.id();
+
+        if ( regex.exactMatch( status.text() ) )
+            parseGotTomahawk( regex, status.sender().screenName(), status.text() );
+        else
+        {
+            QStringList splitList = status.text().split(':');
+            qDebug() << "TwitterSipPlugin found " << splitList.length() << " parts to the message; the parts are:";
+            foreach( QString part, splitList )
+                qDebug() << part;
+            //validity is checked above
+            int port = splitList2.mid( 5 ).toInt();
+            QString host = splitList1.mid( 5 );
+            QString node = splitList3.mid( 5 );
+            QString pkey = splitList4.mid( 5 );
+            QStringList splitNode = node.split('*');
+            if ( splitNode.length() != 2 )
+            {
+                qDebug() << "Old-style node info found, ignoring";
+                continue;
+            }
+            qDebug() << "TwitterSipPlugin found a peerstart message from " << status.senderScreenName() << " with host " << host << " and port " << port << " and pkey " << pkey << " and node " << splitNode0 << " destined for node " << splitNode1;
+
+
+            QVariantHash peerData = ( m_cachedPeers.contains( status.senderScreenName() ) ) ?
+                                                        m_cachedPeersstatus.senderScreenName().toHash() :
+                                                        QVariantHash();
+
+            peerData"host" = QVariant::fromValue< QString >( host );
+            peerData"port" = QVariant::fromValue< int >( port );
+            peerData"pkey" = QVariant::fromValue< QString >( pkey );
+            peerData"node" = QVariant::fromValue< QString >( splitNode0 );
+            peerData"dirty" = QVariant::fromValue< bool >( true );
+
+            QMetaObject::invokeMethod( this, "registerOffer", Q_ARG( QString, status.senderScreenName() ), Q_ARG( QVariantHash, peerData ) );
+
+            if ( Database::instance()->impl()->dbid().startsWith( splitNode1 ) )
+            {
+                qDebug() << "TwitterSipPlugin found message destined for this node; destroying it";
+                if ( !m_directMessageDestroy.isNull() )
+                    m_directMessageDestroy.data()->destroyMessage( status.id() );
+            }
+        }
+    }
+
+    m_configuration "cacheddirectmessagessinceid"  = m_cachedDirectMessagesSinceId;
+    syncConfig();
+}
+
+void
+TwitterSipPlugin::registerOffer( const QString &screenName, const QVariantHash &peerData )
+{
+    qDebug() << Q_FUNC_INFO;
+
+    bool peersChanged = false;
+    bool needToSend = false;
+    bool needToAddToCache = false;
+
+    QString friendlyName = QString( '@' + screenName );
+
+    if ( !m_cachedAvatars.contains( screenName ) )
+        QMetaObject::invokeMethod( this, "fetchAvatar", Q_ARG( QString, screenName ) );
+
+    QVariantHash _peerData( peerData );
+
+    if ( _peerData.contains( "dirty" ) )
+    {
+        peersChanged = true;
+        _peerData.remove( "dirty" );
+    }
+
+    if ( _peerData.contains( "resend" ) )
+    {
+        needToSend = true;
+        peersChanged = true;
+        _peerData.remove( "resend" );
+    }
+
+    if ( !_peerData.contains( "okey" ) ||
+         !_peerData.contains( "onod" ) ||
+         ( _peerData.contains( "onod" ) && _peerData"onod" != Database::instance()->impl()->dbid() ) )
+    {
+        QString okey = QUuid::createUuid().toString().split( '-' ).last();
+        okey.chop( 1 );
+        _peerData"okey" = QVariant::fromValue< QString >( okey );
+        _peerData"onod" = QVariant::fromValue< QString >( Database::instance()->impl()->dbid() );
+        peersChanged = true;
+        needToAddToCache = true;
+        needToSend = true;
+    }
+
+    if ( _peerData.contains( "rekey" ) || !m_keyCache.contains( _peerData"okey".toString() ) )
+    {
+        _peerData.remove( "rekey" );
+        needToAddToCache = true;
+    }
+
+    if ( !_peerData.contains( "ohst" ) || !_peerData.contains( "oprt" ) ||
+            _peerData"ohst".toString() != Servent::instance()->externalAddress() ||
+            _peerData"oprt".toInt() != Servent::instance()->externalPort()
+        )
+        needToSend = true;
+
+    if( needToAddToCache && _peerData.contains( "node" ) )
+    {
+        qDebug() << "TwitterSipPlugin registering offer to " << friendlyName << " with node " << _peerData"node".toString() << " and offeredkey " << _peerData"okey".toString();
+        m_keyCache << Servent::instance()->createConnectionKey( friendlyName, _peerData"node".toString(), _peerData"okey".toString(), false );
+    }
+
+    if( needToSend && _peerData.contains( "node") )
+    {
+        qDebug() << "TwitterSipPlugin needs to send and has node";
+        _peerData"ohst" = QVariant::fromValue< QString >( Servent::instance()->externalAddress() );
+        _peerData"oprt" = QVariant::fromValue< int >( Servent::instance()->externalPort() );
+        peersChanged = true;
+        if( !Servent::instance()->externalAddress().isEmpty() && !Servent::instance()->externalPort() == 0 )
+            QMetaObject::invokeMethod( this, "sendOffer", Q_ARG( QString, screenName ), Q_ARG( QVariantHash, _peerData ) );
+        else
+            qDebug() << "TwitterSipPlugin did not send offer because external address is " << Servent::instance()->externalAddress() << " and external port is " << Servent::instance()->externalPort();
+    }
+
+    if ( peersChanged )
+    {
+        _peerData"lastseen" = QString::number( QDateTime::currentMSecsSinceEpoch() );
+        m_cachedPeersscreenName = QVariant::fromValue< QVariantHash >( _peerData );
+        m_configuration "cachedpeers"  = m_cachedPeers;
+        syncConfig();
+    }
+
+    if ( m_state == Tomahawk::Accounts::Account::Connected && _peerData.contains( "host" ) && _peerData.contains( "port" ) && _peerData.contains( "pkey" ) )
+        QMetaObject::invokeMethod( this, "makeConnection", Q_ARG( QString, screenName ), Q_ARG( QVariantHash, _peerData ) );
+
+}
+
+void
+TwitterSipPlugin::sendOffer( const QString &screenName, const QVariantHash &peerData )
+{
+    qDebug() << Q_FUNC_INFO;
+    QString offerString = QString( "TOMAHAWKPEER:Host=%1:Port=%2:Node=%3*%4:PKey=%5" ).arg( peerData"ohst".toString() )
+                                                                                      .arg( peerData"oprt".toString() )
+                                                                                      .arg( Database::instance()->impl()->dbid() )
+                                                                                      .arg( peerData"node".toString().left( 8 ) )
+                                                                                      .arg( peerData"okey".toString() );
+    qDebug() << "TwitterSipPlugin sending message to " << screenName << ": " << offerString;
+    if( !m_directMessageNew.isNull() )
+        m_directMessageNew.data()->post( screenName, offerString );
+}
+
+void
+TwitterSipPlugin::makeConnection( const QString &screenName, const QVariantHash &peerData )
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) || !peerData.contains( "node" ) ||
+         peerData"host".toString().isEmpty() || peerData"port".toString().isEmpty() || peerData"pkey".toString().isEmpty() || peerData"node".toString().isEmpty() )
+    {
+        qDebug() << "TwitterSipPlugin could not find host and/or port and/or pkey and/or node for peer " << screenName;
+        return;
+    }
+
+    if ( peerData"host".toString() == Servent::instance()->externalAddress() &&
+         peerData"port".toInt() == Servent::instance()->externalPort() )
+    {
+        qDebug() << "TwitterSipPlugin asked to make connection to our own host and port, ignoring " << screenName;
+        return;
+    }
+
+    QString friendlyName = QString( '@' + screenName );
+    if ( !Servent::instance()->connectedToSession( peerData"node".toString() ) )
+        Servent::instance()->connectToPeer( peerData"host".toString(),
+                                            peerData"port".toString().toInt(),
+                                            peerData"pkey".toString(),
+                                            friendlyName,
+                                            peerData"node".toString() );
+}
+
+void
+TwitterSipPlugin::directMessagePosted( const QTweetDMStatus& message )
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "TwitterSipPlugin sent message to " << message.recipientScreenName() << " containing: " << message.text();
+
+}
+
+void
+TwitterSipPlugin::directMessagePostError( QTweetNetBase::ErrorCode errorCode, const QString &message )
+{
+    Q_UNUSED( errorCode );
+    Q_UNUSED( message );
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "TwitterSipPlugin received an error posting direct message: " << m_directMessageNew.data()->lastErrorMessage();
+}
+
+void
+TwitterSipPlugin::directMessageDestroyed( const QTweetDMStatus& message )
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "TwitterSipPlugin destroyed message " << message.text();
+}
+
+void
+TwitterSipPlugin::fetchAvatar( const QString& screenName )
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( !isValid() )
+        return;
+
+    QTweetUserShow *userShowFetch = new QTweetUserShow( m_cachedTwitterAuth.data(), this );
+    connect( userShowFetch, SIGNAL( parsedUserInfo( QTweetUser ) ), SLOT( avatarUserDataSlot( QTweetUser ) ) );
+    userShowFetch->fetch( screenName );
+}
+
+void
+TwitterSipPlugin::avatarUserDataSlot( const QTweetUser &user )
+{
+    tDebug() << Q_FUNC_INFO;
+    if ( !isValid() || user.profileImageUrl().isEmpty())
+        return;
+
+    QNetworkRequest request( user.profileImageUrl() );
+    QNetworkReply *reply = m_cachedTwitterAuth.data()->networkAccessManager()->get( request );
+    reply->setProperty( "screenname", user.screenName() );
+    connect( reply, SIGNAL( finished() ), this, SLOT( profilePicReply() ) );
+}
+
+
+void
+TwitterSipPlugin::profilePicReply()
+{
+    tDebug() << Q_FUNC_INFO;
+    QNetworkReply *reply = qobject_cast< QNetworkReply* >( sender() );
+    if ( !reply || reply->error() != QNetworkReply::NoError || !reply->property( "screenname" ).isValid() )
+    {
+        tDebug() << Q_FUNC_INFO << " reply not valid or came back with error";
+        return;
+    }
+    QString screenName = reply->property( "screenname" ).toString();
+    QString friendlyName = '@' + screenName;
+    QByteArray rawData = reply->readAll();
+    QImage image;
+    image.loadFromData( rawData, "PNG" );
+    QPixmap pixmap = QPixmap::fromImage( image );
+    m_cachedAvatarsscreenName = pixmap;
+    emit avatarReceived( friendlyName, QPixmap::fromImage( image ) );
+}
+
+void
+TwitterSipPlugin::configurationChanged()
+{
+    tDebug() << Q_FUNC_INFO;
+    if ( m_state != Tomahawk::Accounts::Account::Disconnected )
+        m_account->deauthenticate();
+    connectPlugin();
+}
+
+
+void
+TwitterSipPlugin::syncConfig()
+{
+    m_account->setConfiguration( m_configuration );
+    m_account->sync();
+}

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/sip/TwitterSip.h Added

@@ -0,0 +1,127 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TWITTER_H
+#define TWITTER_H
+
+#include <QTimer>
+#include <QWeakPointer>
+#include <QSet>
+
+#include <QTweetLib/qtweetuser.h>
+#include <QTweetLib/qtweetnetbase.h>
+#include <QTweetLib/qtweetfriendstimeline.h>
+#include <QTweetLib/qtweetdirectmessages.h>
+#include <QTweetLib/qtweetdirectmessagenew.h>
+#include <QTweetLib/qtweetdirectmessagedestroy.h>
+#include <QTweetLib/qtweetmentions.h>
+#include <QTweetLib/qtweetdmstatus.h>
+
+#include "accounts/AccountDllMacro.h"
+#include "sip/SipPlugin.h"
+#include "accounts/Account.h"
+#include "accounts/twitter/TomahawkOAuthTwitter.h"
+
+class ACCOUNTDLLEXPORT TwitterSipPlugin : public SipPlugin
+{
+    Q_OBJECT
+
+public:
+    TwitterSipPlugin( Tomahawk::Accounts::Account *account );
+
+    virtual ~TwitterSipPlugin() {}
+
+    virtual bool isValid() const;
+    virtual Tomahawk::Accounts::Account::ConnectionState connectionState() const;
+
+signals:
+    void stateChanged( Tomahawk::Accounts::Account::ConnectionState );
+
+public slots:
+    virtual void connectPlugin();
+    void disconnectPlugin();
+    void configurationChanged();
+
+    void sendMsg( const QString& peerId, const SipInfo& info )
+    {
+        Q_UNUSED( peerId );
+        Q_UNUSED( info );
+    }
+
+    void broadcastMsg( const QString &msg )
+    {
+        Q_UNUSED( msg );
+    }
+
+    void addContact( const QString &peerId, const QString& msg = QString() )
+    {
+        Q_UNUSED( peerId );
+        Q_UNUSED( msg );
+    }
+
+    void checkSettings();
+
+private slots:
+    void accountAuthenticated( const QWeakPointer< TomahawkOAuthTwitter > &twitterAuth, const QTweetUser &user );
+    void checkTimerFired();
+    void connectTimerFired();
+    void friendsTimelineStatuses( const QList< QTweetStatus > &statuses );
+    void mentionsStatuses( const QList< QTweetStatus > &statuses );
+    void pollDirectMessages();
+    void directMessages( const QList< QTweetDMStatus > &messages );
+    void directMessagePosted( const QTweetDMStatus &message );
+    void directMessagePostError( QTweetNetBase::ErrorCode errorCode, const QString &message );
+    void directMessageDestroyed( const QTweetDMStatus &message );
+    void registerOffers( const QStringList &peerList );
+    void registerOffer( const QString &screenName, const QVariantHash &peerdata );
+    void sendOffer( const QString &screenName, const QVariantHash &peerdata );
+    void makeConnection( const QString &screenName, const QVariantHash &peerdata );
+    void fetchAvatar( const QString &screenName );
+    void avatarUserDataSlot( const QTweetUser &user );
+    void profilePicReply();
+
+private:
+    void syncConfig();
+    bool refreshTwitterAuth();
+    void parseGotTomahawk( const QRegExp &regex, const QString &screenName, const QString &text );
+
+    QWeakPointer< TomahawkOAuthTwitter > m_cachedTwitterAuth;
+
+    QWeakPointer< QTweetFriendsTimeline > m_friendsTimeline;
+    QWeakPointer< QTweetMentions > m_mentions;
+    QWeakPointer< QTweetDirectMessages > m_directMessages;
+    QWeakPointer< QTweetDirectMessageNew > m_directMessageNew;
+    QWeakPointer< QTweetDirectMessageDestroy > m_directMessageDestroy;
+
+    QVariantHash m_configuration;
+
+    QTimer m_checkTimer;
+    QTimer m_connectTimer;
+    QTimer m_dmPollTimer;
+    qint64 m_cachedFriendsSinceId;
+    qint64 m_cachedMentionsSinceId;
+    qint64 m_cachedDirectMessagesSinceId;
+    QVariantHash m_cachedPeers;
+    QHash< QString, QPixmap > m_cachedAvatars;
+    QSet<QString> m_keyCache;
+    Tomahawk::Accounts::Account::ConnectionState m_state;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/accounts/twitter/twitter-icon.png Changed

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp Added

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/CMakeLists.txt Added

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/XmppAccount.cpp Added

@@ -0,0 +1,125 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "XmppAccount.h"
+#include "XmppConfigWidget.h"
+#include "sip/SipPlugin.h"
+#include "XmppInfoPlugin.h"
+
+#include <QtCore/QtPlugin>
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+Account*
+XmppAccountFactory::createAccount( const QString& accountId )
+{
+    return new XmppAccount( accountId.isEmpty() ? Tomahawk::Accounts::generateId( factoryId() ) : accountId );
+}
+
+
+XmppAccount::XmppAccount( const QString &accountId )
+    : Account( accountId )
+{
+    setAccountServiceName( "Jabber (XMPP)" );
+    setTypes( SipType );
+
+    m_configWidget = QWeakPointer< QWidget >( new XmppConfigWidget( this, 0 ) );
+}
+
+
+XmppAccount::~XmppAccount()
+{
+    delete m_xmppSipPlugin.data();
+}
+
+
+void
+XmppAccount::authenticate()
+{
+    if ( connectionState() != Account::Connected )
+        sipPlugin()->connectPlugin();
+}
+
+
+void
+XmppAccount::deauthenticate()
+{
+    if ( connectionState() != Account::Disconnected )
+        sipPlugin()->disconnectPlugin();
+}
+
+bool
+XmppAccount::isAuthenticated() const
+{
+    return m_xmppSipPlugin.data()->connectionState() == Account::Connected;
+}
+
+
+Account::ConnectionState
+XmppAccount::connectionState() const
+{
+    return m_xmppSipPlugin.data()->connectionState();
+}
+
+void
+XmppAccount::saveConfig()
+{
+    if ( !m_configWidget.isNull() )
+        static_cast< XmppConfigWidget* >( m_configWidget.data() )->saveConfig();
+}
+
+
+InfoSystem::InfoPluginPtr
+XmppAccount::infoPlugin()
+{
+    if( !m_xmppSipPlugin.isNull() )
+        return m_xmppSipPlugin.data()->infoPlugin();
+
+    return InfoSystem::InfoPluginPtr();
+}
+
+
+SipPlugin*
+XmppAccount::sipPlugin()
+{
+    if ( m_xmppSipPlugin.isNull() )
+    {
+        m_xmppSipPlugin = QWeakPointer< XmppSipPlugin >( new XmppSipPlugin( this ) );
+
+        connect( m_xmppSipPlugin.data(), SIGNAL( stateChanged( Tomahawk::Accounts::Account::ConnectionState ) ), this, SIGNAL( connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ) );
+        connect( m_xmppSipPlugin.data(), SIGNAL( error( int, QString ) ), this, SIGNAL( error( int, QString ) ) );
+
+        return m_xmppSipPlugin.data();
+    }
+    return m_xmppSipPlugin.data();
+}
+
+
+}
+
+}
+
+#ifndef GOOGLE_WRAPPER
+Q_EXPORT_PLUGIN2( Tomahawk::Accounts::AccountFactory, Tomahawk::Accounts::XmppAccountFactory )
+#endif

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/XmppAccount.h Added

@@ -0,0 +1,92 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 XMPPACCOUNT_H
+#define XMPPACCOUNT_H
+
+#include "sip/XmppSip.h"
+#include "accounts/AccountDllMacro.h"
+#include "accounts/Account.h"
+
+#define MYNAME "ACCOUNTJABBER"
+
+class Ui_XmppConfigWidget;
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+class ACCOUNTDLLEXPORT XmppAccountFactory : public AccountFactory
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::Accounts::AccountFactory )
+
+    // for settings access
+    friend class XmppConfigWidget;
+public:
+    XmppAccountFactory() {}
+    virtual ~XmppAccountFactory() {}
+
+    QString prettyName() const { return "Jabber (XMPP)"; }
+    QString description() const { return tr( "Log on to your Jabber/XMPP account to connect to your friends" ); }
+    QString factoryId() const { return "xmppaccount"; }
+    QPixmap icon() const { return QPixmap( ":/xmpp-icon.png" ); }
+    AccountTypes types() const { return AccountTypes( SipType | StatusPushType ); };
+    Account* createAccount( const QString& pluginId = QString() );
+};
+
+class ACCOUNTDLLEXPORT XmppAccount : public Account
+{
+    Q_OBJECT
+
+public:
+    XmppAccount( const QString &accountId );
+    virtual ~XmppAccount();
+
+    QPixmap icon() const { return QPixmap( ":/xmpp-icon.png" ); }
+
+    void authenticate();
+    void deauthenticate();
+    bool isAuthenticated() const;
+
+    Tomahawk::InfoSystem::InfoPluginPtr infoPlugin();
+
+    SipPlugin* sipPlugin();
+
+    QWidget* configurationWidget() { return m_configWidget.data(); }
+    QWidget* aclWidget() { return 0; }
+    void saveConfig();
+
+    virtual Tomahawk::Accounts::Account::ConnectionState connectionState() const;
+
+protected:
+    QWeakPointer< QWidget > m_configWidget; // so the google wrapper can change the config dialog a bit
+    QWeakPointer< XmppSipPlugin > m_xmppSipPlugin;
+    QWeakPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_xmppInfoPlugin;
+};
+
+};
+
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/XmppConfigWidget.cpp Added

@@ -0,0 +1,113 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "XmppAccount.h"
+#include "XmppConfigWidget.h"
+#include "ui_XmppConfigWidget.h"
+
+#include <QMessageBox>
+
+#include <accounts/AccountManager.h>
+#include <utils/Logger.h>
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+XmppConfigWidget::XmppConfigWidget( XmppAccount* account, QWidget *parent ) :
+    QWidget( parent ),
+    m_ui( new Ui::XmppConfigWidget ),
+    m_account( account )
+{
+    m_ui->setupUi( this );
+
+    m_ui->xmppUsername->setText( account->credentials().contains( "username" ) ? account->credentials() "username" .toString() : QString() );
+    m_ui->xmppPassword->setText( account->credentials().contains( "password" ) ? account->credentials() "password" .toString() : QString() );
+    m_ui->xmppServer->setText( account->configuration().contains( "server" ) ? account->configuration() "server" .toString() : QString() );
+    m_ui->xmppPort->setValue( account->configuration().contains( "port" ) ? account->configuration() "port" .toInt() : 5222 );
+    m_ui->xmppPublishTracksCheckbox->setChecked( account->configuration().contains( "publishtracks" ) ? account->configuration() "publishtracks" .toBool() : true);
+    m_ui->xmppEnforceSecureCheckbox->setChecked( account->configuration().contains( "enforcesecure" ) ? account->configuration() "enforcesecure" .toBool() : false);
+    m_ui->jidExistsLabel->hide();
+
+    connect( m_ui->xmppUsername, SIGNAL( textChanged( QString ) ), SLOT( onCheckJidExists( QString ) ) );
+}
+
+
+XmppConfigWidget::~XmppConfigWidget()
+{
+    delete m_ui;
+}
+
+void
+XmppConfigWidget::saveConfig()
+{
+    QVariantHash credentials = m_account->credentials();
+    credentials "username"  = m_ui->xmppUsername->text().trimmed();
+    credentials "password"  = m_ui->xmppPassword->text().trimmed();
+
+    QVariantHash configuration = m_account->configuration();
+    configuration "server"  = m_ui->xmppServer->text().trimmed();
+    configuration "port"  = m_ui->xmppPort->text().trimmed();
+    configuration "publishtracks" = m_ui->xmppPublishTracksCheckbox->isChecked();
+    configuration "enforcesecure" = m_ui->xmppEnforceSecureCheckbox->isChecked();
+
+    m_account->setAccountFriendlyName( m_ui->xmppUsername->text() );
+    m_account->setCredentials( credentials );
+    m_account->setConfiguration( configuration);
+    m_account->sync();
+
+    static_cast< XmppSipPlugin* >( m_account->sipPlugin() )->checkSettings();
+}
+
+
+void
+XmppConfigWidget::onCheckJidExists( QString jid )
+{
+    QList< Tomahawk::Accounts::Account* > accounts = Tomahawk::Accounts::AccountManager::instance()->accounts( Tomahawk::Accounts::SipType );
+    foreach( Tomahawk::Accounts::Account* account, accounts )
+    {
+        if ( account->accountId() == m_account->accountId() )
+            continue;
+
+        QString savedUsername = account->credentials() "username" .toString();
+        QStringList savedSplitUsername = account->credentials() "username" .toString().split("@");
+        QString savedServer = account->configuration() "server" .toString();
+        int savedPort = account->configuration() "port" .toInt();
+
+        if ( ( savedUsername == jid || savedSplitUsername.contains( jid ) ) &&
+               savedServer == m_ui->xmppServer->text() &&
+               savedPort == m_ui->xmppPort->value() &&
+               !jid.trimmed().isEmpty() )
+        {
+            m_ui->jidExistsLabel->show();
+            // the already jid exists
+            emit dataError( true );
+            return;
+        }
+    }
+    m_ui->jidExistsLabel->hide();
+    emit dataError( false );
+}
+
+
+}
+
+}

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/XmppConfigWidget.h Added

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/XmppConfigWidget.ui Added

@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>XmppConfigWidget</class>
+ <widget class="QWidget" name="XmppConfig">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>451</width>
+    <height>335</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Xmpp Configuration</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="logoLabel">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="resources.qrc">:/xmpp-icon.png</pixmap>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="headerLabel">
+       <property name="font">
+        <font>
+         <pointsize>11</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Configure this Xmpp account</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="xmppBlurb">
+       <property name="text">
+        <string>Enter your Xmpp login to connect with your friends using Tomahawk!</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Login Information</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_8">
+        <item>
+         <widget class="QLabel" name="emailLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Xmpp ID:</string>
+          </property>
+          <property name="buddy">
+           <cstring>xmppUsername</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="xmppUsername">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="placeholderText">
+           <string>e.g. user@example.com</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_4">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Password:</string>
+          </property>
+          <property name="buddy">
+           <cstring>xmppPassword</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="xmppPassword">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="inputMask">
+           <string/>
+          </property>
+          <property name="echoMode">
+           <enum>QLineEdit::Password</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QLabel" name="jidExistsLabel">
+        <property name="text">
+         <string>An account with this name already exists!</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBoxXmppAdvanced">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Advanced Xmpp Settings</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLabel" name="labelXmppServer">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>50</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Server:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="buddy">
+           <cstring>xmppServer</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="xmppServer">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="labelXmppPort">
+          <property name="text">
+           <string>Port:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="xmppPort">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>90</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>90</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>65535</number>
+          </property>
+          <property name="value">
+           <number>5222</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="xmppPublishTracksCheckbox">
+        <property name="toolTip">
+         <string>Lots of servers don't support this (e.g. GTalk, jabber.org)</string>
+        </property>
+        <property name="text">
+         <string>Publish currently playing track</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="xmppEnforceSecureCheckbox">
+        <property name="text">
+         <string>Enforce secure connection</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>5</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/XmppInfoPlugin.cpp Added

@@ -0,0 +1,149 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Dominik Schmidt <domme@tomahawk-player.org>
+ *   Copyright 2012, Jeff Mitchell <jeff@tomahawk-player.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 "XmppInfoPlugin.h"
+
+#include "GlobalActionManager.h"
+#include "sip/XmppSip.h"
+#include "utils/Logger.h"
+#include "TomahawkSettings.h"
+
+
+// remove now playing status after PAUSE_TIMEOUT seconds
+static const int PAUSE_TIMEOUT = 10;
+
+Tomahawk::InfoSystem::XmppInfoPlugin::XmppInfoPlugin( XmppSipPlugin* sipPlugin )
+    : m_sipPlugin( sipPlugin )
+    , m_pauseTimer( this )
+{
+    Q_ASSERT( sipPlugin->m_client );
+
+    m_supportedPushTypes << InfoNowPlaying << InfoNowPaused << InfoNowResumed << InfoNowStopped;
+
+    m_pauseTimer.setSingleShot( true );
+    connect( &m_pauseTimer, SIGNAL( timeout() ),
+             this, SLOT( audioStopped() ) );
+}
+
+
+Tomahawk::InfoSystem::XmppInfoPlugin::~XmppInfoPlugin()
+{
+}
+
+
+void
+Tomahawk::InfoSystem::XmppInfoPlugin::init()
+{
+    if ( QThread::currentThread() != Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() )
+    {
+        QMetaObject::invokeMethod( this, "init", Qt::QueuedConnection );
+        return;
+    }
+
+    if ( m_sipPlugin.isNull() )
+        return;
+
+    connect( this, SIGNAL( publishTune( QUrl, Tomahawk::InfoSystem::InfoStringHash ) ), m_sipPlugin.data(), SLOT( publishTune( QUrl, Tomahawk::InfoSystem::InfoStringHash ) ), Qt::QueuedConnection );
+}
+
+
+void
+Tomahawk::InfoSystem::XmppInfoPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+{
+    switch ( pushData.type )
+    {
+        case InfoNowPlaying:
+        case InfoNowResumed:
+            m_pauseTimer.stop();
+            audioStarted( pushData.infoPair );
+            break;
+        case InfoNowPaused:
+            m_pauseTimer.start( PAUSE_TIMEOUT * 1000 );
+            audioPaused();
+            break;
+        case InfoNowStopped:
+            m_pauseTimer.stop();
+            audioStopped();
+            break;
+
+        default:
+            return;
+    }
+}
+
+
+void
+Tomahawk::InfoSystem::XmppInfoPlugin::audioStarted( const Tomahawk::InfoSystem::PushInfoPair &pushInfoPair )
+{
+    if ( !pushInfoPair.second.canConvert< QVariantMap >() )
+    {
+        tDebug() << Q_FUNC_INFO << "Failed to convert data to a QVariantMap";
+        return;
+    }
+
+    QVariantMap map = pushInfoPair.second.toMap();
+    if ( map.contains( "private" ) && map "private"  == TomahawkSettings::FullyPrivate )
+    {
+        emit publishTune( QUrl(), Tomahawk::InfoSystem::InfoStringHash() );
+        return;
+    }
+
+    if ( !map.contains( "trackinfo" ) || !map "trackinfo" .canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        tDebug() << Q_FUNC_INFO << "did not find an infostringhash";
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash info = map "trackinfo" .value< Tomahawk::InfoSystem::InfoStringHash >();
+
+    QUrl url;
+    if ( pushInfoPair.first.contains( "shorturl" ) )
+        url = pushInfoPair.first "shorturl" .toUrl();
+    else
+        url = GlobalActionManager::instance()->openLink( info.value( "title" ), info.value( "artist" ), info.value( "album" ) );
+
+    emit publishTune( url, info );
+}
+
+void
+Tomahawk::InfoSystem::XmppInfoPlugin::audioPaused()
+{
+}
+
+void
+Tomahawk::InfoSystem::XmppInfoPlugin::audioStopped()
+{
+    emit publishTune( QUrl(), Tomahawk::InfoSystem::InfoStringHash() );
+}
+
+
+void
+Tomahawk::InfoSystem::XmppInfoPlugin::getInfo(Tomahawk::InfoSystem::InfoRequestData requestData)
+{
+    Q_UNUSED( requestData );
+}
+
+
+void
+Tomahawk::InfoSystem::XmppInfoPlugin::notInCacheSlot(const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData)
+{
+    Q_UNUSED( criteria );
+    Q_UNUSED( requestData );
+}

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/XmppInfoPlugin.h Added

@@ -0,0 +1,66 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Dominik Schmidt <domme@tomahawk-player.org>
+ *   Copyright 2012, Jeff Mitchell <jeff@tomahawk-player.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 XMPPINFOPLUGIN_H
+#define XMPPINFOPLUGIN_H
+
+#include "infosystem/InfoSystem.h"
+
+#include <QTimer>
+
+class XmppSipPlugin;
+
+namespace Tomahawk {
+
+    namespace InfoSystem {
+
+        class XmppInfoPlugin  : public InfoPlugin
+        {
+            Q_OBJECT
+
+        public:
+            XmppInfoPlugin(XmppSipPlugin* parent);
+            virtual ~XmppInfoPlugin();
+
+        signals:
+            void publishTune( QUrl url, Tomahawk::InfoSystem::InfoStringHash trackInfo );
+
+        public slots:
+            void notInCacheSlot( const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
+
+        protected slots:
+            void init();
+            void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData );
+            void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+        private slots:
+            void audioStarted( const Tomahawk::InfoSystem::PushInfoPair& pushInfoPair );
+            void audioStopped();
+            void audioPaused();
+
+        private:
+            QWeakPointer< XmppSipPlugin > m_sipPlugin;
+            QTimer m_pauseTimer;
+        };
+
+    }
+
+}
+
+#endif // XMPPINFOPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/googlewrapper Added

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/googlewrapper/CMakeLists.txt Added

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/googlewrapper/GoogleWrapper.cpp Added

@@ -0,0 +1,123 @@
+/*
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
+    Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>    
+
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "GoogleWrapper.h"
+#include "../XmppConfigWidget.h"
+#include "ui_XmppConfigWidget.h"
+
+#include "utils/TomahawkUtilsGui.h"
+
+#include <QtPlugin>
+#include <QInputDialog>
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+Account*
+GoogleWrapperFactory::createAccount( const QString& pluginId )
+{
+    return new GoogleWrapper( pluginId.isEmpty() ? generateId( factoryId() ) : pluginId );
+}
+
+
+QPixmap
+GoogleWrapperFactory::icon() const
+{
+    return QPixmap( ":/gmail-logo.png" );
+}
+
+GoogleWrapperSip::GoogleWrapperSip( Account* account )
+    : XmppSipPlugin( account )
+{
+
+}
+
+GoogleWrapperSip::~GoogleWrapperSip()
+{
+}
+
+
+void
+GoogleWrapperSip::showAddFriendDialog()
+{
+    bool ok;
+    QString id = QInputDialog::getText( TomahawkUtils::tomahawkWindow(), tr( "Add Friend" ),
+                                        tr( "Enter Google Address:" ), QLineEdit::Normal, "", &ok );
+    if ( !ok )
+        return;
+
+    qDebug() << "Attempting to add google contact to roster:" << id;
+    addContact( id );
+}
+
+
+QString
+GoogleWrapperSip::defaultSuffix() const
+{
+    return "@gmail.com";
+}
+
+
+GoogleWrapper::GoogleWrapper ( const QString& pluginID )
+    : XmppAccount ( pluginID )
+{
+    XmppConfigWidget* config = static_cast< XmppConfigWidget* >( m_configWidget.data() );
+    config->m_ui->headerLabel->setText( tr( "Configure this Google Account" ) );
+    config->m_ui->emailLabel->setText( tr( "Google Address" ) );
+    config->m_ui->xmppBlurb->setText( tr( "Enter your Google login to connect with your friends using Tomahawk!" ) );
+    config->m_ui->xmppUsername->setPlaceholderText( tr( "username@gmail.com" ) );
+    config->m_ui->logoLabel->setPixmap( QPixmap( ":/gmail-logo.png" ) );
+    config->m_ui->xmppServer->setText( "talk.google.com" );
+    config->m_ui->xmppPort->setValue( 5222 );
+    config->m_ui->groupBoxXmppAdvanced->hide();
+}
+
+GoogleWrapper::~GoogleWrapper()
+{
+    delete m_sipPlugin.data();
+}
+
+
+QPixmap
+GoogleWrapper::icon() const
+{
+    return QPixmap( ":/gmail-logo.png" );
+}
+
+
+SipPlugin*
+GoogleWrapper::sipPlugin()
+{
+    if ( m_xmppSipPlugin.isNull() )
+    {
+        m_xmppSipPlugin = QWeakPointer< XmppSipPlugin >( new GoogleWrapperSip( const_cast< GoogleWrapper* >( this ) ) );
+
+        connect( m_xmppSipPlugin.data(), SIGNAL( stateChanged( Tomahawk::Accounts::Account::ConnectionState ) ), this, SIGNAL( connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ) );
+        connect( m_xmppSipPlugin.data(), SIGNAL( error( int, QString ) ), this, SIGNAL( error( int, QString ) ) );
+
+        return m_xmppSipPlugin.data();
+    }
+    return m_xmppSipPlugin.data();
+}
+
+
+#ifdef GOOGLE_WRAPPER
+Q_EXPORT_PLUGIN2( Tomahawk::Accounts::AccountFactory, Tomahawk::Accounts::GoogleWrapperFactory )
+#endif

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/googlewrapper/GoogleWrapper.h Added

@@ -0,0 +1,82 @@
+/*
+    Copyright (C) 2011  Leo Franchi <leo.franchi@kdab.com>
+    Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
+    
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef GOOGLEWRAPPER_H
+#define GOOGLEWRAPPER_H
+
+#include "../XmppAccount.h"
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+class ACCOUNTDLLEXPORT GoogleWrapperFactory : public XmppAccountFactory
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::Accounts::AccountFactory )
+
+public:
+    GoogleWrapperFactory() {}
+    virtual ~GoogleWrapperFactory() {}
+
+    virtual QString prettyName() const { return "Google"; }
+    virtual QString factoryId() const { return "googleaccount"; }
+    QString description() const { return tr( "Connect to Google Talk to find your friends" ); }
+    virtual QPixmap icon() const;
+    virtual Account* createAccount( const QString& pluginId );
+};
+
+class ACCOUNTDLLEXPORT GoogleWrapperSip : public XmppSipPlugin
+{
+    Q_OBJECT
+public:
+    GoogleWrapperSip( Tomahawk::Accounts::Account* account );
+    virtual ~GoogleWrapperSip();
+
+public slots:
+    void showAddFriendDialog();
+
+protected:
+    QString defaultSuffix() const;
+};
+
+class ACCOUNTDLLEXPORT GoogleWrapper : public XmppAccount
+{
+    Q_OBJECT
+public:
+    GoogleWrapper( const QString& pluginID );
+    virtual ~GoogleWrapper();
+
+    virtual const QString name() const { return QString( "Google" ); }
+    virtual const QString friendlyName() const { return "Google"; }
+    virtual QPixmap icon() const;
+
+    virtual SipPlugin* sipPlugin();
+
+private:
+    QWeakPointer< GoogleWrapperSip > m_sipPlugin;
+};
+
+}
+
+}
+
+#endif // GOOGLEWRAPPER_H

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/googlewrapper/gmail-logo.png Changed

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/googlewrapper/resources.qrc Changed

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/resources.qrc Added

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip Added

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/AvatarManager.cpp Added

@@ -0,0 +1,206 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "AvatarManager.h"
+
+#include "utils/TomahawkUtils.h"
+
+#include <jreen/vcard.h>
+#include <jreen/vcardupdate.h>
+#include <jreen/presence.h>
+#include <jreen/iqreply.h>
+
+#include <QDir>
+#include <QCryptographicHash>
+#include <QPixmap>
+
+#include "utils/Logger.h"
+
+
+AvatarManager::AvatarManager( Jreen::Client* client )
+    : m_cacheDir( TomahawkUtils::appDataDir().absolutePath().append( "/jreen/" ) )
+{
+    m_client = client;
+    m_cachedAvatars = m_cacheDir.entryList();
+
+    connect( m_client, SIGNAL( serverFeaturesReceived( QSet<QString> ) ), SLOT( onNewConnection() ) );
+    connect( m_client, SIGNAL( presenceReceived( Jreen::Presence ) ), SLOT( onNewPresence( Jreen::Presence ) ) );
+    connect( m_client, SIGNAL( iqReceived( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
+
+    connect( this, SIGNAL( newAvatar( QString ) ), SLOT( onNewAvatar( QString ) ) );
+}
+
+
+AvatarManager::~AvatarManager()
+{
+}
+
+
+void
+AvatarManager::onNewConnection()
+{
+    fetchVCard( m_client->jid().bare() );
+}
+
+
+void
+AvatarManager::fetchVCard( const QString& jid )
+{
+    Jreen::IQ iq( Jreen::IQ::Get, jid );
+    iq.addExtension( new Jreen::VCard() );
+    Jreen::IQReply *reply = m_client->send( iq );
+
+    connect( reply, SIGNAL( received( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
+}
+
+
+void
+AvatarManager::onNewPresence( const Jreen::Presence& presence )
+{
+    if ( presence.error() )
+    {
+        return;
+    }
+
+    Jreen::VCardUpdate::Ptr update = presence.payload<Jreen::VCardUpdate>();
+    if ( update )
+    {
+//        qDebug() << "vcard: found update for" << presence.from().full();
+        if ( !isCached( update->photoHash() ) )
+        {
+//            qDebug() << presence.from().full() << "vcard: photo not cached, starting request..." << update->photoHash();
+            fetchVCard( presence.from().bare() );
+        }
+        else
+        {
+//            qDebug() << presence.from().full() << "vcard: photo already cached no request necessary " << update->photoHash();
+            m_JidsAvatarHashes.insert( update->photoHash(), presence.from().bare() );
+
+            if ( !this->avatar( presence.from().bare() ).isNull() )
+                emit newAvatar( presence.from().bare() );
+        }
+    }
+    else
+    {
+        //TODO: do we want this? might fetch avatars for broken clients
+        fetchVCard( presence.from().bare() );
+    }
+}
+
+
+void
+AvatarManager::onNewIq( const Jreen::IQ& iq )
+{
+    Jreen::VCard::Ptr vcard = iq.payload<Jreen::VCard>();
+    if ( vcard )
+    {
+        iq.accept();
+//        qDebug() << Q_FUNC_INFO << "Got vcard from " << iq.from().full();
+
+        QString id = iq.from().full();
+        QString avatarHash;
+
+        const Jreen::VCard::Photo &photo = vcard->photo();
+        if ( !photo.data().isEmpty() )
+        {
+//            qDebug() << "vcard: got photo data" << id;
+
+            avatarHash = QCryptographicHash::hash( photo.data(), QCryptographicHash::Sha1 ).toHex();
+
+            if ( !m_cacheDir.exists() )
+                m_cacheDir.mkpath( avatarDir( avatarHash ).absolutePath() );
+
+            QFile file( avatarPath( avatarHash ) );
+            if ( file.open( QIODevice::WriteOnly ) )
+            {
+                file.write( photo.data() );
+                file.close();
+            }
+
+            m_cachedAvatars.append( avatarHash );
+            m_JidsAvatarHashes.insert( avatarHash, iq.from().bare() );
+
+            Q_ASSERT( !this->avatar( iq.from().bare() ).isNull() );
+            emit newAvatar( iq.from().bare() );
+        }
+
+        // got own presence
+        if ( m_client->jid().bare() == id )
+        {
+            Jreen::Presence presence = m_client->presence();
+            Jreen::VCardUpdate::Ptr update = presence.payload<Jreen::VCardUpdate>();
+            if ( update->photoHash() != avatarHash )
+            {
+                update->setPhotoHash( avatarHash );
+                m_client->send( presence );
+            }
+        }
+    }
+}
+
+
+QPixmap
+AvatarManager::avatar( const QString& jid ) const
+{
+    if ( isCached( avatarHash( jid ) ) )
+    {
+        return QPixmap( avatarPath( avatarHash( jid ) ) );
+    }
+    else
+    {
+        return QPixmap();
+    }
+}
+
+
+QString
+AvatarManager::avatarHash( const QString& jid ) const
+{
+    //qDebug() << Q_FUNC_INFO << jid << m_JidsAvatarHashes.key( jid );
+    return m_JidsAvatarHashes.key( jid );
+}
+
+
+QDir
+AvatarManager::avatarDir( const QString& /* avatarHash */ ) const
+{
+    return m_cacheDir;
+}
+
+
+QString
+AvatarManager::avatarPath( const QString& avatarHash ) const
+{
+    Q_ASSERT( !avatarHash.contains( "@" ) );
+    return avatarDir( avatarHash ).absoluteFilePath( avatarHash );
+}
+
+
+bool
+AvatarManager::isCached( const QString& avatarHash ) const
+{
+    return m_cachedAvatars.contains( avatarHash );
+}
+
+
+void
+AvatarManager::onNewAvatar( const QString& /* jid */ )
+{
+//    qDebug() << Q_FUNC_INFO <<  "Found new Avatar..." << jid;
+}

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/AvatarManager.h Added

@@ -0,0 +1,63 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 AVATARMANAGER_H
+#define AVATARMANAGER_H
+
+#include <jreen/client.h>
+
+#include <QtCore/QObject>
+#include <QtCore/QDir>
+
+#include "accounts/AccountDllMacro.h"
+
+class ACCOUNTDLLEXPORT AvatarManager : public QObject
+{
+Q_OBJECT
+
+public:
+    AvatarManager(Jreen::Client* client);
+    virtual ~AvatarManager();
+
+    QPixmap avatar(const QString& jid) const;
+
+signals:
+    void newAvatar( const QString& jid );
+
+private slots:
+    void onNewPresence( const Jreen::Presence& presence );
+    void onNewIq(const Jreen::IQ& iq);
+    void onNewConnection();
+    void onNewAvatar( const QString& jid );
+
+private:
+    void fetchVCard( const QString& jid );
+    QString avatarHash( const QString& jid ) const;
+    QString avatarPath( const QString& avatarHash ) const;
+
+    QDir avatarDir( const QString& avatarHash ) const;
+    bool isCached( const QString& avatarHash ) const;
+
+    Jreen::Client* m_client;
+    QStringList m_cachedAvatars;
+    QDir m_cacheDir;
+    QMap< QString, QString > m_JidsAvatarHashes;
+};
+
+#endif // AVATARMANAGER_H

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/TomahawkXmppMessage.cpp Added

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/TomahawkXmppMessage.h Added

@@ -0,0 +1,51 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 ENTITYTIME_H
+#define ENTITYTIME_H
+
+#include <jreen/stanzaextension.h>
+
+#define TOMAHAWK_SIP_MESSAGE_NS QLatin1String("http://www.tomhawk-player.org/sip/transports")
+
+#include "accounts/AccountDllMacro.h"
+
+class TomahawkXmppMessagePrivate;
+class ACCOUNTDLLEXPORT TomahawkXmppMessage : public Jreen::Payload
+{
+    J_PAYLOAD(TomahawkXmppMessage)
+    Q_DECLARE_PRIVATE(TomahawkXmppMessage)
+    public:
+        // sets visible to true
+        TomahawkXmppMessage(const QString &ip, unsigned int port, const QString &uniqname, const QString &key);
+
+        // sets visible to false as we dont have any extra information
+        TomahawkXmppMessage();
+        ~TomahawkXmppMessage();
+
+        const QString ip() const;
+        unsigned int port() const;
+        const QString uniqname() const;
+        const QString key() const;
+        bool visible() const;
+    private:
+        QScopedPointer<TomahawkXmppMessagePrivate> d_ptr;
+};
+
+#endif // ENTITYTIME_H

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.cpp Added

@@ -0,0 +1,147 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "TomahawkXmppMessageFactory.h"
+
+#include <QStringList>
+#include <QXmlStreamWriter>
+#include <QVariant>
+
+#include "utils/Logger.h"
+
+using namespace Jreen;
+
+TomahawkXmppMessageFactory::TomahawkXmppMessageFactory()
+{
+    m_depth = 0;
+    m_state = AtNowhere;
+}
+
+TomahawkXmppMessageFactory::~TomahawkXmppMessageFactory()
+{
+}
+
+QStringList TomahawkXmppMessageFactory::features() const
+{
+    return QStringList(TOMAHAWK_SIP_MESSAGE_NS);
+}
+
+bool TomahawkXmppMessageFactory::canParse(const QStringRef &name, const QStringRef &uri, const QXmlStreamAttributes &attributes)
+{
+    Q_UNUSED(uri);
+    Q_UNUSED(attributes);
+    return name == QLatin1String("tomahawk") && uri == TOMAHAWK_SIP_MESSAGE_NS;
+}
+
+void TomahawkXmppMessageFactory::handleStartElement(const QStringRef &name, const QStringRef &uri,
+                                            const QXmlStreamAttributes &attributes)
+{
+    m_depth++;
+    if (m_depth == 1) {
+        m_state = AtNowhere;
+        m_ip = QString();
+        m_port = -1;
+        m_uniqname = QString();
+        m_key = QString();
+        m_visible = false;
+    } else if (m_depth == 2) {
+        if (name == QLatin1String("transport"))
+        {
+//            qDebug() << "Found Transport";
+            m_state = AtTransport;
+
+            m_uniqname = attributes.value(QLatin1String("uniqname")).toString();
+            m_key = attributes.value(QLatin1String("pwd")).toString();
+        }
+    } else if(m_depth == 3) {
+        if (name == QLatin1String("candidate"))
+        {
+            m_state = AtCandidate;
+//            qDebug() << "Found candidate";
+            m_ip = attributes.value(QLatin1String("ip")).toString();
+            m_port = attributes.value(QLatin1String("port")).toString().toInt();
+
+            m_visible = true;
+        }
+    }
+    Q_UNUSED(uri);
+    Q_UNUSED(attributes);
+}
+
+void TomahawkXmppMessageFactory::handleEndElement(const QStringRef &name, const QStringRef &uri)
+{
+    if (m_depth == 3)
+        m_state = AtNowhere;
+    Q_UNUSED(name);
+    Q_UNUSED(uri);
+    m_depth--;
+}
+
+void TomahawkXmppMessageFactory::handleCharacterData(const QStringRef &text)
+{
+    /*if (m_state == AtUtc) {
+        //m_utc = Util::fromStamp(text.toString());
+    } else if (m_state == AtTzo) {
+        QString str = text.toString();
+        int multiple = str.startsWith('-') ? -1 : 1;
+        //QTime delta = QTime::fromString(str.mid(1), QLatin1String("hh:mm"));
+        //m_tzo = multiple * (delta.hour() * 60 + delta.minute());
+    }*/
+    Q_UNUSED(text);
+}
+
+void TomahawkXmppMessageFactory::serialize(Payload *extension, QXmlStreamWriter *writer)
+{
+    TomahawkXmppMessage *sipMessage = se_cast<TomahawkXmppMessage*>(extension);
+
+        writer->writeStartElement(QLatin1String("tomahawk"));
+        writer->writeDefaultNamespace(TOMAHAWK_SIP_MESSAGE_NS);
+
+        if(sipMessage->visible())
+        {
+            // add transport tag
+            writer->writeStartElement(QLatin1String("transport"));
+            writer->writeAttribute(QLatin1String("pwd"), sipMessage->key());
+            writer->writeAttribute(QLatin1String("uniqname"), sipMessage->uniqname());
+
+            writer->writeEmptyElement(QLatin1String("candidate"));
+            writer->writeAttribute(QLatin1String("component"), "1");
+            writer->writeAttribute(QLatin1String("id"), "el0747fg11"); // FIXME
+            writer->writeAttribute(QLatin1String("ip"), sipMessage->ip());
+            writer->writeAttribute(QLatin1String("network"), "1");
+            writer->writeAttribute(QLatin1String("port"), QVariant(sipMessage->port()).toString());
+            writer->writeAttribute(QLatin1String("priority"), "1"); //TODO
+            writer->writeAttribute(QLatin1String("protocol"), "tcp");
+            writer->writeAttribute(QLatin1String("type"), "host"); //FIXME: correct?!
+            writer->writeEndElement();
+        }
+        else
+        {
+            writer->writeEmptyElement(QLatin1String("transport"));
+        }
+        writer->writeEndElement();
+}
+
+Payload::Ptr TomahawkXmppMessageFactory::createPayload()
+{
+    if(m_visible)
+        return Payload::Ptr(new TomahawkXmppMessage(m_ip, m_port, m_uniqname, m_key));
+    else
+        return Payload::Ptr(new TomahawkXmppMessage());
+}

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/TomahawkXmppMessageFactory.h Added

@@ -0,0 +1,51 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 ENTITYTIMEFACTORY_P_H
+#define ENTITYTIMEFACTORY_P_H
+
+#include "TomahawkXmppMessage.h"
+
+#include <jreen/stanzaextension.h>
+
+#include "accounts/AccountDllMacro.h"
+
+class ACCOUNTDLLEXPORT TomahawkXmppMessageFactory : public Jreen::PayloadFactory<TomahawkXmppMessage>
+{
+public:
+    TomahawkXmppMessageFactory();
+    virtual ~TomahawkXmppMessageFactory();
+    QStringList features() const;
+    bool canParse(const QStringRef &name, const QStringRef &uri, const QXmlStreamAttributes &attributes);
+    void handleStartElement(const QStringRef &name, const QStringRef &uri, const QXmlStreamAttributes &attributes);
+    void handleEndElement(const QStringRef &name, const QStringRef &uri);
+    void handleCharacterData(const QStringRef &text);
+    void serialize(Jreen::Payload *extension, QXmlStreamWriter *writer);
+    Jreen::Payload::Ptr createPayload();
+private:
+    enum State { AtNowhere, AtTransport, AtCandidate } m_state;
+    int m_depth;
+    QString m_ip;
+    int m_port;
+    QString m_uniqname;
+    QString m_key;
+    bool m_visible;
+};
+
+#endif // ENTITYTIMEFACTORY_P_H

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/XmlConsole.cpp Added

@@ -0,0 +1,364 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Ruslan Nigmatullin <euroelessar@ya.ru>
+ *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *   Copyright 2011, Jeff Mitchell <jeff@tomahawk-player.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 "XmlConsole.h"
+#include "ui_XmlConsole.h"
+
+#include <QMenu>
+#include <QActionGroup>
+#include <QStringBuilder>
+#include <QTextLayout>
+#include <QPlainTextDocumentLayout>
+#include <QFileDialog>
+#include <QTextDocumentWriter>
+
+#include "utils/Logger.h"
+
+using namespace Jreen;
+
+
+XmlConsole::XmlConsole(Client* client, QWidget *parent) :
+	QWidget(parent),
+	m_ui(new Ui::XmlConsole),
+	m_client(client),	m_filter(0x1f)
+{
+	m_ui->setupUi(this);
+
+    m_client->addXmlStreamHandler(this);
+
+	QPalette pal = palette();
+	pal.setColor(QPalette::Base, Qt::black);
+	pal.setColor(QPalette::Text, Qt::white);
+	m_ui->xmlBrowser->viewport()->setPalette(pal);
+	QTextDocument *doc = m_ui->xmlBrowser->document();
+	doc->setDocumentLayout(new QPlainTextDocumentLayout(doc));
+	doc->clear();
+
+	QTextFrameFormat format = doc->rootFrame()->frameFormat();
+	format.setBackground(QColor(Qt::black));
+	format.setMargin(0);
+	doc->rootFrame()->setFrameFormat(format);
+	QMenu *menu = new QMenu(m_ui->filterButton);
+	menu->setSeparatorsCollapsible(false);
+	menu->addSeparator()->setText(tr("Filter"));
+	QActionGroup *group = new QActionGroup(menu);
+	QAction *disabled = group->addAction(menu->addAction(tr("Disabled")));
+	disabled->setCheckable(true);
+	disabled->setData(Disabled);
+	QAction *jid = group->addAction(menu->addAction(tr("By JID")));
+	jid->setCheckable(true);
+	jid->setData(ByJid);
+	QAction *xmlns = group->addAction(menu->addAction(tr("By namespace uri")));
+	xmlns->setCheckable(true);
+	xmlns->setData(ByXmlns);
+	QAction *attrb = group->addAction(menu->addAction(tr("By all attributes")));
+	attrb->setCheckable(true);
+	attrb->setData(ByAllAttributes);
+	disabled->setChecked(true);
+	connect(group, SIGNAL(triggered(QAction*)), this, SLOT(onActionGroupTriggered(QAction*)));
+	menu->addSeparator()->setText(tr("Visible stanzas"));
+	group = new QActionGroup(menu);
+	group->setExclusive(false);
+	QAction *iq = group->addAction(menu->addAction(tr("Information query")));
+	iq->setCheckable(true);
+	iq->setData(XmlNode::Iq);
+	iq->setChecked(true);
+	QAction *message = group->addAction(menu->addAction(tr("Message")));
+	message->setCheckable(true);
+	message->setData(XmlNode::Message);
+	message->setChecked(true);
+	QAction *presence = group->addAction(menu->addAction(tr("Presence")));
+	presence->setCheckable(true);
+	presence->setData(XmlNode::Presence);
+	presence->setChecked(true);
+	QAction *custom = group->addAction(menu->addAction(tr("Custom")));
+	custom->setCheckable(true);
+	custom->setData(XmlNode::Custom);
+	custom->setChecked(true);
+	connect(group, SIGNAL(triggered(QAction*)), this, SLOT(onActionGroupTriggered(QAction*)));
+	m_ui->filterButton->setMenu(menu);
+	m_stackBracketsColor = QColor(0x666666);
+	m_stackIncoming.bodyColor = QColor(0xbb66bb);
+	m_stackIncoming.tagColor = QColor(0x006666);
+	m_stackIncoming.attributeColor = QColor(0x009933);
+	m_stackIncoming.paramColor = QColor(0xcc0000);
+	m_stackOutgoing.bodyColor = QColor(0x999999);
+	m_stackOutgoing.tagColor = QColor(0x22aa22);
+	m_stackOutgoing.attributeColor = QColor(0xffff33);
+	m_stackOutgoing.paramColor = QColor(0xdd8811);
+
+	QAction *action = new QAction(tr("Close"),this);
+	action->setSoftKeyRole(QAction::NegativeSoftKey);
+	connect(action, SIGNAL(triggered()), SLOT(close()));
+	addAction(action);
+}
+
+XmlConsole::~XmlConsole()
+{
+	delete m_ui;
+}
+
+void XmlConsole::handleStreamBegin()
+{
+	m_stackIncoming.reader.clear();
+	m_stackOutgoing.reader.clear();
+	m_stackIncoming.depth = 0;
+	m_stackOutgoing.depth = 0;
+	qDeleteAll(m_stackIncoming.tokens);
+	qDeleteAll(m_stackOutgoing.tokens);
+	m_stackIncoming.tokens.clear();
+	m_stackOutgoing.tokens.clear();
+}
+
+void XmlConsole::handleStreamEnd()
+{
+	m_stackIncoming.reader.clear();
+	m_stackOutgoing.reader.clear();
+	m_stackIncoming.depth = 0;
+	m_stackOutgoing.depth = 0;
+	qDeleteAll(m_stackIncoming.tokens);
+	qDeleteAll(m_stackOutgoing.tokens);
+	m_stackIncoming.tokens.clear();
+	m_stackOutgoing.tokens.clear();
+}
+
+void XmlConsole::handleIncomingData(const char *data, qint64 size)
+{
+	stackProcess(QByteArray::fromRawData(data, size), true);
+}
+
+void XmlConsole::handleOutgoingData(const char *data, qint64 size)
+{
+	stackProcess(QByteArray::fromRawData(data, size), false);
+}
+
+QString generate_stacked_space(int depth)
+{
+	return QString(depth * 2, QLatin1Char(' '));
+}
+
+void XmlConsole::stackProcess(const QByteArray &data, bool incoming)
+{
+	StackEnvironment *d = &(incoming ? m_stackIncoming : m_stackOutgoing);
+	d->reader.addData(data);
+	StackToken *token;
+//	debug() << incoming << data;
+//	debug() << "==================================================================";
+	while (d->reader.readNext() > QXmlStreamReader::Invalid) {
+//		qDebug() << incoming << d->reader.tokenString();
+		switch(d->reader.tokenType()) {
+		case QXmlStreamReader::StartElement:
+//			dbg << d->reader.name().toString() << d->depth
+//					<< d->reader.attributes().value(QLatin1String("from")).toString();
+			d->depth++;
+			if (d->depth > 1) {
+				if (!d->tokens.isEmpty() && d->tokens.last()->type == QXmlStreamReader::Characters)
+					delete d->tokens.takeLast();
+				d->tokens << new StackToken(d->reader);
+			}
+			break;
+		case QXmlStreamReader::EndElement:
+//			dbg << d->reader.name().toString() << d->depth;
+			if (d->tokens.isEmpty())
+				break;
+			token = d->tokens.last();
+			if (token->type == QXmlStreamReader::StartElement && !token->startTag.empty)
+				token->startTag.empty = true;
+			else if (d->depth > 1)
+				d->tokens << new StackToken(d->reader);
+			if (d->depth == 2) {
+				QTextCursor cursor(m_ui->xmlBrowser->document());
+				cursor.movePosition(QTextCursor::End);
+				cursor.beginEditBlock();
+				QTextCharFormat zeroFormat = cursor.charFormat();
+				zeroFormat.setForeground(QColor(Qt::white));
+				QTextCharFormat bodyFormat = zeroFormat;
+				bodyFormat.setForeground(d->bodyColor);
+				QTextCharFormat tagFormat = zeroFormat;
+				tagFormat.setForeground(d->tagColor);
+				QTextCharFormat attributeFormat = zeroFormat;
+				attributeFormat.setForeground(d->attributeColor);
+				QTextCharFormat paramsFormat = zeroFormat;
+				paramsFormat.setForeground(d->paramColor);
+				QTextCharFormat bracketFormat = zeroFormat;
+				bracketFormat.setForeground(m_stackBracketsColor);
+				QString singleSpace = QLatin1String(" ");
+				cursor.insertBlock();
+				int depth = 0;
+				QString currentXmlns;
+				QXmlStreamReader::TokenType lastType = QXmlStreamReader::StartElement;
+				for (int i = 0; i < d->tokens.size(); i++) {
+					token = d->tokens.at(i);
+					if (token->type == QXmlStreamReader::StartElement) {
+						QString space = generate_stacked_space(depth);
+						cursor.insertText(QLatin1String("\n"));
+						cursor.insertText(space);
+						cursor.insertText(QLatin1String("<"), bracketFormat);
+						cursor.insertText(token->startTag.name->toString(), tagFormat);
+						const QStringRef &xmlns = *token->startTag.xmlns;
+						if (i == 0 || xmlns != currentXmlns) {
+							currentXmlns = xmlns.toString();
+							cursor.insertText(singleSpace);
+							cursor.insertText(QLatin1String("xmlns"), attributeFormat);
+							cursor.insertText(QLatin1String("="), zeroFormat);
+							cursor.insertText(QLatin1String("'"), paramsFormat);
+							cursor.insertText(currentXmlns, paramsFormat);
+							cursor.insertText(QLatin1String("'"), paramsFormat);
+						}
+						QXmlStreamAttributes *attributes = token->startTag.attributes;
+						for (int j = 0; j < attributes->count(); j++) {
+							const QXmlStreamAttribute &attr = attributes->at(j);
+							cursor.insertText(singleSpace);
+							cursor.insertText(attr.name().toString(), attributeFormat);
+							cursor.insertText(QLatin1String("="), zeroFormat);
+							cursor.insertText(QLatin1String("'"), paramsFormat);
+							cursor.insertText(attr.value().toString(), paramsFormat);
+							cursor.insertText(QLatin1String("'"), paramsFormat);
+						}
+						if (token->startTag.empty) {
+							cursor.insertText(QLatin1String("/>"), bracketFormat);
+						} else {
+							cursor.insertText(QLatin1String(">"), bracketFormat);
+							depth++;
+						}
+					} else if (token->type == QXmlStreamReader::EndElement) {
+						if (lastType == QXmlStreamReader::EndElement) {
+							QString space = generate_stacked_space(depth - 1);
+							cursor.insertText(QLatin1String("\n"));
+							cursor.insertText(space);
+						}
+						cursor.insertText(QLatin1String("</"), bracketFormat);
+						cursor.insertText(token->endTag.name->toString(), tagFormat);
+						cursor.insertText(QLatin1String(">"), bracketFormat);
+						depth--;
+					} else if (token->type == QXmlStreamReader::Characters) {
+						cursor.setCharFormat(bodyFormat);
+						QString text = token->charachters.text->toString();
+						if (text.contains(QLatin1Char('\n'))) {
+							QString space = generate_stacked_space(depth);
+							space.prepend(QLatin1Char('\n'));
+							QStringList lines = text.split(QLatin1Char('\n'));
+							for (int j = 0; j < lines.size(); j++) {
+								cursor.insertText(space);
+								cursor.insertText(lines.at(j));
+							}
+							space.chop(1);
+							cursor.insertText(space);
+						} else {
+							cursor.insertText(text);
+						}
+					}
+					lastType = token->type;
+					if (lastType == QXmlStreamReader::StartElement && token->startTag.empty)
+						lastType = QXmlStreamReader::EndElement;
+					delete token;
+				}
+				cursor.endEditBlock();
+				d->tokens.clear();
+			}
+			d->depth--;
+			break;
+		case QXmlStreamReader::Characters:
+			token = d->tokens.isEmpty() ? 0 : d->tokens.last();
+			if (token && token->type == QXmlStreamReader::StartElement && !token->startTag.empty) {
+				if (*token->startTag.name == QLatin1String("auth")
+						&& *token->startTag.xmlns == QLatin1String("urn:ietf:params:xml:ns:xmpp-sasl")) {
+					d->tokens << new StackToken(QLatin1String("<<Private data>>"));
+				} else {
+					d->tokens << new StackToken(d->reader);
+				}
+			}
+			break;
+		default:
+			break;
+		}
+	}
+//	qDebug() << d->reader.tokenString();
+//	if (d->reader.tokenType() == QXmlStreamReader::Invalid)
+//		dbg << d->reader.error() << d->reader.errorString();
+	if (!incoming && d->depth > 1) {
+		qFatal("outgoing depth %d on\n\"%s\"", d->depth,
+			   qPrintable(QString::fromUtf8(data, data.size())));
+	}
+}
+
+void XmlConsole::changeEvent(QEvent *e)
+{
+	QWidget::changeEvent(e);
+	switch (e->type()) {
+	case QEvent::LanguageChange:
+		m_ui->retranslateUi(this);
+		break;
+	default:
+		break;
+	}
+}
+
+void XmlConsole::onActionGroupTriggered(QAction *action)
+{
+	int type = action->data().toInt();
+	if (type >= 0x10) {
+		m_filter = (m_filter & 0xf) | type;
+		m_ui->lineEdit->setEnabled(type != 0x10);
+	} else {
+		m_filter = m_filter ^ type;
+	}
+	on_lineEdit_textChanged(m_ui->lineEdit->text());
+}
+
+void XmlConsole::on_lineEdit_textChanged(const QString &text)
+{
+	int filterType = m_filter & 0xf0;
+	JID filterJid = (filterType == ByJid) ? text : QString();
+    for (int i = 0; i < m_nodes.size(); i++) {
+		XmlNode &node = m_nodesi;
+		bool ok = true;
+		switch (filterType) {
+		case ByXmlns:
+			ok = node.xmlns.contains(text);
+			break;
+		case ByJid:
+			ok = node.jid.full() == filterJid.full() || node.jid.bare() == filterJid.full();
+			break;
+		case ByAllAttributes:
+			ok = node.attributes.contains(text);
+			break;
+		default:
+			break;
+		}
+		ok &= bool(node.type & m_filter);
+		node.block.setVisible(ok);
+		node.block.setLineCount(ok ? node.lineCount : 0);
+		//		qDebug() << node.block.lineCount();
+	}
+	QAbstractTextDocumentLayout *layout = m_ui->xmlBrowser->document()->documentLayout();
+	Q_ASSERT(qobject_cast<QPlainTextDocumentLayout*>(layout));
+	qobject_cast<QPlainTextDocumentLayout*>(layout)->requestUpdate();
+}
+
+void XmlConsole::on_saveButton_clicked()
+{
+    QString fileName = QFileDialog::getSaveFileName(this, tr("Save XMPP log to file"),
+	                                                QString(), tr("OpenDocument Format (*.odf);;HTML file (*.html);;Plain text (*.txt)"));
+	if (!fileName.isEmpty()) {
+		QTextDocumentWriter writer(fileName);
+		writer.write(m_ui->xmlBrowser->document());
+	}
+}

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/XmlConsole.h Added

@@ -0,0 +1,187 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Ruslan Nigmatullin <euroelessar@ya.ru>
+ *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *   Copyright 2011, Jeff Mitchell <jeff@tomahawk-player.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 XMLCONSOLE_H
+#define XMLCONSOLE_H
+
+#include <jreen/client.h>
+#include <jreen/jid.h>
+
+#include <QtGui/QWidget>
+#include <QtXml/QXmlStreamReader>
+#include <QtCore/QDateTime>
+#include <QtGui/QTextBlock>
+
+namespace Ui {
+class XmlConsole;
+}
+
+#include "accounts/AccountDllMacro.h"
+
+class ACCOUNTDLLEXPORT XmlConsole : public QWidget, public Jreen::XmlStreamHandler
+{
+    Q_OBJECT
+
+public:
+	XmlConsole(Jreen::Client* client, QWidget *parent = 0);
+	~XmlConsole();
+
+	virtual void handleStreamBegin();
+	virtual void handleStreamEnd();
+	virtual void handleIncomingData(const char *data, qint64 size);
+	virtual void handleOutgoingData(const char *data, qint64 size);
+
+protected:
+	void changeEvent(QEvent *e);
+private:
+	void stackProcess(const QByteArray &data, bool incoming);
+
+	struct XmlNode
+	{
+		enum Type
+		{
+			Iq = 1,
+			Presence = 2,
+			Message = 4,
+			Custom = 8
+		};
+		QDateTime time;
+		Type type;
+		bool incoming;
+		QSet<QString> xmlns;
+		Jreen::JID jid;
+		QSet<QString> attributes;
+		QTextBlock block;
+		int lineCount;
+	};
+	enum FilterType
+	{
+		Disabled = 0x10,
+		ByJid = 0x20,
+		ByXmlns = 0x30,
+		ByAllAttributes = 0x40
+	};
+
+	enum State
+	{
+		WaitingForStanza,
+		ReadFeatures,
+		ReadStanza,
+		ReadCustom
+	};
+
+	struct StackToken
+	{
+		StackToken(QXmlStreamReader &reader)
+		{
+			type = reader.tokenType();
+			if (type == QXmlStreamReader::StartElement) {
+				QStringRef tmp = reader.name();
+				startTag.namePointer = new QString(*tmp.string());
+				startTag.name = new QStringRef(startTag.namePointer, tmp.position(), tmp.length());
+				tmp = reader.namespaceUri();
+				startTag.xmlnsPointer = new QString(*tmp.string());
+				startTag.xmlns = new QStringRef(startTag.xmlnsPointer, tmp.position(), tmp.length());
+				startTag.attributes = new QXmlStreamAttributes(reader.attributes());
+				startTag.empty = false;
+			} else if (type == QXmlStreamReader::Characters) {
+				QStringRef tmp = reader.text();
+				charachters.textPointer = new QString(*tmp.string());
+				charachters.text = new QStringRef(charachters.textPointer, tmp.position(), tmp.length());
+			} else if (type == QXmlStreamReader::EndElement) {
+				QStringRef tmp = reader.name();
+				endTag.namePointer = new QString(*tmp.string());
+				endTag.name = new QStringRef(endTag.namePointer, tmp.position(), tmp.length());
+			}
+		}
+
+		StackToken(const QString &name)
+		{
+			type = QXmlStreamReader::Characters;
+			charachters.textPointer = new QString(name);
+			charachters.text = new QStringRef(charachters.textPointer);
+		}
+
+		~StackToken()
+		{
+			if (type == QXmlStreamReader::StartElement) {
+				delete startTag.namePointer;
+				delete startTag.name;
+				delete startTag.xmlnsPointer;
+				delete startTag.xmlns;
+				delete startTag.attributes;
+			} else if (type == QXmlStreamReader::Characters) {
+				delete charachters.textPointer;
+				delete charachters.text;
+			} else if (type == QXmlStreamReader::EndElement) {
+				delete endTag.namePointer;
+				delete endTag.name;
+			}
+		}
+
+		QXmlStreamReader::TokenType type;
+		union {
+			struct {
+				QString *namePointer;
+				QStringRef *name;
+				QString *xmlnsPointer;
+				QStringRef *xmlns;
+				QXmlStreamAttributes *attributes;
+				bool empty;
+			} startTag;
+			struct {
+				QString *textPointer;
+				QStringRef *text;
+			} charachters;
+			struct {
+				QString *namePointer;
+				QStringRef *name;
+			} endTag;
+		};
+	};
+
+	struct StackEnvironment
+	{
+		QXmlStreamReader reader;
+		State state;
+		int depth;
+		QList<StackToken*> tokens;
+		QColor bodyColor;
+		QColor tagColor;
+		QColor attributeColor;
+		QColor paramColor;
+	};
+
+	Ui::XmlConsole *m_ui;
+	Jreen::Client *m_client;
+	QList<XmlNode> m_nodes;
+	StackEnvironment m_stackIncoming;
+	StackEnvironment m_stackOutgoing;
+	QColor m_stackBracketsColor;
+	int m_filter;
+
+private slots:
+	void on_lineEdit_textChanged(const QString &);
+	void onActionGroupTriggered(QAction *action);
+	void on_saveButton_clicked();
+};
+
+
+#endif // XMLCONSOLE_H

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/XmlConsole.ui Changed

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/XmppSip.cpp Added

@@ -0,0 +1,1047 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "XmppSip.h"
+
+#include "config.h"
+
+#include "TomahawkXmppMessage.h"
+#include "TomahawkXmppMessageFactory.h"
+
+#include <jreen/jid.h>
+#include <jreen/capabilities.h>
+#include <jreen/vcardupdate.h>
+#include <jreen/vcard.h>
+#include <jreen/directconnection.h>
+#include <jreen/tcpconnection.h>
+#include <jreen/softwareversion.h>
+#include <jreen/iqreply.h>
+#include <jreen/logger.h>
+#include <jreen/tune.h>
+
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+
+#include <QtCore/QtPlugin>
+#include <QtCore/QStringList>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>
+
+#include <utils/TomahawkUtils.h>
+#include <utils/Logger.h>
+#include <accounts/AccountManager.h>
+#include <TomahawkSettings.h>
+
+#ifndef ENABLE_HEADLESS
+    #include <QtGui/QInputDialog>
+    #include <QtGui/QLineEdit>
+    #include <QtGui/QMessageBox>
+#endif
+
+#include <utils/TomahawkUtilsGui.h>
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+// instead of simply copying this function for another thirdparty lib
+// please make it a meta-function or a macro and put it in Logger.h. kthxbbq
+#define JREEN_LOG_INFIX "Jreen"
+#define TOMAHAWK_FEATURE QLatin1String( "tomahawk:sip:v1" )
+#define TOMAHAWK_CAP_NODE_NAME QLatin1String( "http://tomahawk-player.org/" )
+
+
+void
+JreenMessageHandler( QtMsgType type, const char *msg )
+{
+    switch ( type )
+    {
+        case QtDebugMsg:
+            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Debug: " <<  msg;
+            break;
+        case QtWarningMsg:
+            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Warning: " <<  msg;
+            break;
+        case QtCriticalMsg:
+            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Critical: " <<  msg;
+            break;
+        case QtFatalMsg:
+            tDebug( LOGTHIRDPARTY ).nospace() << JREEN_LOG_INFIX << ": " << "Fatal: " <<  msg;
+            abort();
+    }
+}
+
+
+XmppSipPlugin::XmppSipPlugin( Account* account )
+    : SipPlugin( account )
+    , m_state( Account::Disconnected )
+#ifndef ENABLE_HEADLESS
+    , m_menu( 0 )
+    , m_xmlConsole( 0 )
+    , m_pubSubManager( 0 )
+#endif
+{
+    Jreen::Logger::addHandler( JreenMessageHandler );
+
+    m_currentUsername = readUsername();
+    m_currentServer = readServer();
+    m_currentPassword = readPassword();
+    m_currentPort = readPort();
+
+    // setup JID object
+    Jreen::JID jid = Jreen::JID( readUsername() );
+
+    // general client setup
+    m_client = new Jreen::Client( jid, m_currentPassword );
+    setupClientHelper();
+
+    m_client->registerPayload( new TomahawkXmppMessageFactory );
+    m_currentResource = QString::fromAscii( "tomahawk%1" ).arg( QString::number( qrand() % 10000 ) );
+    m_client->setResource( m_currentResource );
+
+#ifndef ENABLE_HEADLESS
+    // instantiate XmlConsole
+    if( readXmlConsoleEnabled() )
+    {
+        m_xmlConsole = new XmlConsole( m_client );
+        m_xmlConsole->show();
+    }
+#endif
+
+    // add VCardUpdate extension to own presence
+    m_client->presence().addExtension( new Jreen::VCardUpdate() );
+
+    // initaliaze the roster
+    m_roster = new Jreen::SimpleRoster( m_client );
+
+#ifndef ENABLE_HEADLESS
+    // initialize the AvatarManager
+    m_avatarManager = new AvatarManager( m_client );
+#endif
+
+    // setup disco
+    m_client->disco()->setSoftwareVersion( "Tomahawk Player", TOMAHAWK_VERSION, CMAKE_SYSTEM );
+    m_client->disco()->addIdentity( Jreen::Disco::Identity( "client", "type", "tomahawk", "en" ) );
+    m_client->disco()->addFeature( TOMAHAWK_FEATURE );
+
+    // setup caps node
+    Jreen::Capabilities::Ptr caps = m_client->presence().payload<Jreen::Capabilities>();
+    caps->setNode( TOMAHAWK_CAP_NODE_NAME );
+
+    // print connection parameters
+    qDebug() << "Our JID set to:" << m_client->jid().full();
+    qDebug() << "Our Server set to:" << m_client->server();
+    qDebug() << "Our Port set to" << m_client->port();
+
+    // setup slots
+    connect( m_client, SIGNAL( serverFeaturesReceived( QSet<QString> ) ), SLOT( onConnect() ) );
+    connect( m_client, SIGNAL( disconnected( Jreen::Client::DisconnectReason ) ), SLOT( onDisconnect( Jreen::Client::DisconnectReason ) ) );
+    connect( m_client, SIGNAL( messageReceived( Jreen::Message ) ), SLOT( onNewMessage( Jreen::Message ) ) );
+
+    connect( m_client, SIGNAL( iqReceived( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
+
+    connect( m_roster, SIGNAL( presenceReceived( Jreen::RosterItem::Ptr, Jreen::Presence ) ),
+                         SLOT( onPresenceReceived( Jreen::RosterItem::Ptr, Jreen::Presence ) ) );
+    connect( m_roster, SIGNAL( subscriptionReceived( Jreen::RosterItem::Ptr, Jreen::Presence ) ),
+                         SLOT( onSubscriptionReceived( Jreen::RosterItem::Ptr, Jreen::Presence ) ) );
+
+#ifndef ENABLE_HEADLESS
+    connect( m_avatarManager, SIGNAL( newAvatar( QString ) ), SLOT( onNewAvatar( QString ) ) );
+#endif
+
+    m_pubSubManager = new Jreen::PubSub::Manager( m_client );
+    m_pubSubManager->addEntityType< Jreen::Tune >();
+
+    // Clear status
+    Jreen::Tune::Ptr tune( new Jreen::Tune() );
+    m_pubSubManager->publishItems( QList<Jreen::Payload::Ptr>() << tune, Jreen::JID() );
+}
+
+
+XmppSipPlugin::~XmppSipPlugin()
+{
+    //Note: the next two lines don't currently work, because the deletion wipes out internally posted events, need to talk to euro about a fix
+    Jreen::Tune::Ptr tune( new Jreen::Tune() );
+    m_pubSubManager->publishItems( QList<Jreen::Payload::Ptr>() << tune, Jreen::JID() );
+
+    delete m_pubSubManager;
+    delete m_avatarManager;
+    delete m_roster;
+#ifndef ENABLE_HEADLESS
+    delete m_xmlConsole;
+#endif
+    delete m_client;
+}
+
+
+InfoSystem::InfoPluginPtr
+XmppSipPlugin::infoPlugin()
+{
+    if ( m_infoPlugin.isNull() )
+        m_infoPlugin = QWeakPointer< Tomahawk::InfoSystem::XmppInfoPlugin >( new Tomahawk::InfoSystem::XmppInfoPlugin( this ) );
+
+    return InfoSystem::InfoPluginPtr( m_infoPlugin.data() );
+}
+
+
+#ifndef ENABLE_HEADLESS
+QMenu*
+XmppSipPlugin::menu()
+{
+    return m_menu;
+}
+#endif
+
+
+void
+XmppSipPlugin::connectPlugin()
+{
+    if ( m_client->isConnected() )
+    {
+        qDebug() << Q_FUNC_INFO << "Already connected to server, not connecting again...";
+        return;
+    }
+
+    if ( m_account->configuration().contains( "enforcesecure" ) && m_account->configuration().value( "enforcesecure" ).toBool() )
+    {
+        tLog() << Q_FUNC_INFO << "Enforcing secure connection...";
+        m_client->setFeatureConfig( Jreen::Client::Encryption, Jreen::Client::Force );
+    }
+
+    tDebug() << "Connecting to the Xmpp server..." << m_client->jid().full();
+
+    //FIXME: we're badly workarounding some missing reconnection api here, to be fixed soon
+    QTimer::singleShot( 1000, m_client, SLOT( connectToServer() ) );
+
+    if ( m_client->connection() )
+        connect( m_client->connection(), SIGNAL( error( Jreen::Connection::SocketError ) ), SLOT( onError( Jreen::Connection::SocketError ) ) );
+
+    m_state = Account::Connecting;
+    emit stateChanged( m_state );
+}
+
+
+void
+XmppSipPlugin::disconnectPlugin()
+{
+    if ( !m_client->isConnected() )
+    {
+        if ( m_state != Account::Disconnected ) // might be Connecting
+        {
+            m_state = Account::Disconnected;
+            emit stateChanged( m_state );
+        }
+        return;
+    }
+
+    //m_roster->deleteLater();
+    //m_roster = 0;
+    //m_room->deleteLater();
+    //m_room = 0;
+
+    m_peers.clear();
+
+    publishTune( QUrl(), Tomahawk::InfoSystem::InfoStringHash() );
+
+    m_client->disconnectFromServer( true );
+    m_state = Account::Disconnecting;
+    emit stateChanged( m_state );
+}
+
+
+void
+XmppSipPlugin::onConnect()
+{
+    // update jid resource, servers like gtalk use resource binding and may
+    // have changed our requested /resource
+    if ( m_client->jid().resource() != m_currentResource )
+    {
+        m_currentResource = m_client->jid().resource();
+        emit jidChanged( m_client->jid().full() );
+    }
+
+    // set presence to least valid value
+    m_client->setPresence( Jreen::Presence::XA, "Got Tomahawk? http://gettomahawk.com", -127 );
+    m_client->setPingInterval( 1000 );
+    m_roster->load();
+
+    // load XmppInfoPlugin
+    if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
+    {
+        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
+    }
+
+    //FIXME: this implementation is totally broken atm, so it's disabled to avoid harm :P
+    // join MUC with bare jid as nickname
+    //TODO: make the room a list of rooms and make that configurable
+    // QString mucNickname = QString( "tomahawk@conference.qutim.org/" ).append( QString( m_client->jid().bare() ).replace( "@", "-" ) );
+    //m_room = new Jreen::MUCRoom(m_client, Jreen::JID( mucNickname ) );
+    //m_room->setHistorySeconds(0);
+    //m_room->join();
+
+    // treat muc participiants like contacts
+    //connect( m_room, SIGNAL( messageReceived( Jreen::Message, bool ) ), this, SLOT( onNewMessage( Jreen::Message ) ) );
+    //connect( m_room, SIGNAL( presenceReceived( Jreen::Presence, const Jreen::MUCRoom::Participant* ) ), this, SLOT( onNewPresence( Jreen::Presence ) ) );
+
+    m_state = Account::Connected;
+    emit stateChanged( m_state );
+
+    addMenuHelper();
+}
+
+
+void
+XmppSipPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
+{
+    switch( reason )
+    {
+        case Jreen::Client::User:
+            break;
+
+        case Jreen::Client::AuthorizationError:
+            emit error( Account::AuthError, errorMessage( reason ) );
+            break;
+
+        case Jreen::Client::HostUnknown:
+        case Jreen::Client::ItemNotFound:
+        case Jreen::Client::RemoteStreamError:
+        case Jreen::Client::RemoteConnectionFailed:
+        case Jreen::Client::InternalServerError:
+        case Jreen::Client::SystemShutdown:
+        case Jreen::Client::Conflict:
+        case Jreen::Client::Unknown:
+        case Jreen::Client::NoCompressionSupport:
+        case Jreen::Client::NoEncryptionSupport:
+        case Jreen::Client::NoAuthorizationSupport:
+        case Jreen::Client::NoSupportedFeature:
+            emit error( Account::ConnectionError, errorMessage( reason ) );
+            break;
+
+        default:
+            qDebug() << "Not all Client::DisconnectReasons checked" << ( int ) reason;
+            Q_ASSERT( false );
+            break;
+    }
+    m_state = Account::Disconnected;
+    emit stateChanged( m_state );
+
+    removeMenuHelper();
+
+    Q_FOREACH( const Jreen::JID &peer, m_peers.keys() )
+    {
+        handlePeerStatus( peer, Jreen::Presence::Unavailable );
+    }
+
+    if ( !m_infoPlugin.isNull() )
+        Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
+}
+
+
+void
+XmppSipPlugin::onError( const Jreen::Connection::SocketError& e )
+{
+    tDebug() << "JABBER error:" << e;
+}
+
+
+QString
+XmppSipPlugin::errorMessage( Jreen::Client::DisconnectReason reason )
+{
+    switch( reason )
+    {
+        case Jreen::Client::User:
+            return tr( "User Interaction" );
+            break;
+        case Jreen::Client::HostUnknown:
+            return tr( "Host is unknown" );
+            break;
+        case Jreen::Client::ItemNotFound:
+            return tr( "Item not found" );
+            break;
+        case Jreen::Client::AuthorizationError:
+            return tr( "Authorization Error" );
+            break;
+        case Jreen::Client::RemoteStreamError:
+            return tr( "Remote Stream Error" );
+            break;
+        case Jreen::Client::RemoteConnectionFailed:
+            return tr( "Remote Connection failed" );
+            break;
+        case Jreen::Client::InternalServerError:
+            return tr( "Internal Server Error" );
+            break;
+        case Jreen::Client::SystemShutdown:
+            return tr( "System shutdown" );
+            break;
+        case Jreen::Client::Conflict:
+            return tr( "Conflict" );
+            break;
+        case Jreen::Client::NoCompressionSupport:
+            return tr( "No Compression Support" );
+            break;
+        case Jreen::Client::NoEncryptionSupport:
+            return tr( "No Encryption Support" );
+            break;
+        case Jreen::Client::NoAuthorizationSupport:
+            return tr( "No Authorization Support" );
+            break;
+        case Jreen::Client::NoSupportedFeature:
+            return tr( "No Supported Feature" );
+            break;
+        case Jreen::Client::Unknown:
+            return tr( "Unknown" );
+            break;
+
+        default:
+            qDebug() << "Not all Client::DisconnectReasons checked";
+            Q_ASSERT( false );
+            break;
+    }
+
+    m_state = Account::Disconnected;
+    emit stateChanged( m_state );
+
+    return QString();
+}
+
+
+void
+XmppSipPlugin::sendMsg( const QString& to, const SipInfo& info )
+{
+    qDebug() << Q_FUNC_INFO << to << info;
+
+    if ( !m_client )
+        return;
+
+    TomahawkXmppMessage *sipMessage;
+    if ( info.isVisible() )
+    {
+        sipMessage = new TomahawkXmppMessage( info.host(), info.port(), info.uniqname(), info.key() );
+    }
+    else
+        sipMessage = new TomahawkXmppMessage();
+
+    qDebug() << "Send sip messsage to" << to;
+    Jreen::IQ iq( Jreen::IQ::Set, to );
+    iq.addExtension( sipMessage );
+    Jreen::IQReply *reply = m_client->send( iq );
+    reply->setData( SipMessageSent );
+    connect( reply, SIGNAL( received( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
+}
+
+
+void
+XmppSipPlugin::broadcastMsg( const QString& msg )
+{
+}
+
+
+void
+XmppSipPlugin::addContact( const QString& jid, const QString& msg )
+{
+    // Add contact to the Tomahawk group on the roster
+    QString realJid = jid;
+    if ( !realJid.contains( '@' ) )
+        realJid += defaultSuffix();
+
+    m_roster->subscribe( realJid, msg, realJid, QStringList() << "Tomahawk" );
+}
+
+
+void
+XmppSipPlugin::showAddFriendDialog()
+{
+#ifndef ENABLE_HEADLESS
+    bool ok;
+    QString id = QInputDialog::getText( TomahawkUtils::tomahawkWindow(), tr( "Add Friend" ),
+                                        tr( "Enter Xmpp ID:" ), QLineEdit::Normal, "", &ok ).trimmed();
+
+    if ( !ok )
+        return;
+
+    qDebug() << "Attempting to add xmpp contact to roster:" << id;
+    addContact( id );
+#endif
+}
+
+
+void
+XmppSipPlugin::publishTune( const QUrl& url, const InfoSystem::InfoStringHash& trackInfo )
+{
+    if ( m_account->configuration().value("publishtracks").toBool() == false )
+    {
+        tDebug() << Q_FUNC_INFO << m_client->jid().full() << "Not publishing now playing info (disabled in account config)";
+        return;
+    }
+
+    if ( trackInfo.isEmpty() )
+    {
+        Jreen::Tune::Ptr tune( new Jreen::Tune() );
+        m_pubSubManager->publishItems( QList<Jreen::Payload::Ptr>() << tune, Jreen::JID() );
+    }
+
+    Jreen::Tune::Ptr tune( new Jreen::Tune() );
+
+    tune->setTitle( trackInfo.value( "title" ) );
+    tune->setArtist( trackInfo.value( "artist" ) );
+    tune->setLength( trackInfo.value( "duration" ).toInt() );
+    tune->setTrack( trackInfo.value( "albumpos" ) );
+
+    //TODO: provide a rating once available in Tomahawk
+    tune->setRating( 10 );
+
+    //TODO: it would be nice to set Spotify, Dilandau etc here, but not the jabber ids of friends
+    tune->setSource( "Tomahawk" );
+
+    tune->setUri( url );
+    tDebug() << Q_FUNC_INFO << "Setting URI of" << tune->uri().toString();
+
+    m_pubSubManager->publishItems( QList<Jreen::Payload::Ptr>() << tune, Jreen::JID() );
+}
+
+
+QString
+XmppSipPlugin::defaultSuffix() const
+{
+    return "@xmpp.org";
+}
+
+
+void
+XmppSipPlugin::showXmlConsole()
+{
+#ifndef ENABLE_HEADLESS
+   m_xmlConsole->show();
+#endif
+}
+
+
+void
+XmppSipPlugin::checkSettings()
+{
+    configurationChanged();
+}
+
+
+void
+XmppSipPlugin::configurationChanged()
+{
+    bool reconnect = false;
+
+    QString username, password, server;
+    int port;
+
+    username = readUsername();
+    password = readPassword();
+    server = readServer();
+    port = readPort();
+
+    if ( m_currentUsername != username )
+    {
+        m_currentUsername = username;
+        reconnect = true;
+    }
+    if ( m_currentPassword != password )
+    {
+        m_currentPassword = password;
+        reconnect = true;
+    }
+    if ( m_currentServer != server )
+    {
+        m_currentServer = server;
+        reconnect = true;
+    }
+    if ( m_currentPort != readPort() )
+    {
+        m_currentPort = port;
+        reconnect = true;
+    }
+
+    if ( !m_currentUsername.contains( '@' ) )
+    {
+        m_currentUsername += defaultSuffix();
+        QVariantHash credentials = m_account->credentials();
+        credentials "username"  = m_currentUsername;
+        m_account->setCredentials( credentials );
+        m_account->sync();
+    }
+
+    if ( reconnect )
+    {
+        qDebug() << Q_FUNC_INFO << "Reconnecting jreen plugin...";
+        disconnectPlugin();
+
+        setupClientHelper();
+
+        qDebug() << Q_FUNC_INFO << "Updated settings";
+        connectPlugin();
+    }
+}
+
+
+void
+XmppSipPlugin::setupClientHelper()
+{
+    m_client->setProxyFactory( TomahawkUtils::proxyFactory( true ) );
+    Jreen::JID jid = Jreen::JID( m_currentUsername );
+    m_client->setJID( jid );
+    m_client->setPassword( m_currentPassword );
+
+    if ( !m_currentServer.isEmpty() )
+    {
+        // set explicit server details
+        m_client->setServer( m_currentServer );
+        m_client->setPort( m_currentPort );
+    }
+    else
+    {
+        // let jreen find out server and port via jdns
+        m_client->setServer( jid.domain() );
+        m_client->setPort( -1 );
+    }
+}
+
+
+void
+XmppSipPlugin::addMenuHelper()
+{
+#ifndef ENABLE_HEADLESS
+    if ( !m_menu )
+    {
+        m_menu = new QMenu( QString( "%1 (" ).arg( friendlyName() ).append( readUsername() ).append(")" ) );
+
+        QAction* addFriendAction = m_menu->addAction( tr( "Add Friend..." ) );
+        connect( addFriendAction, SIGNAL( triggered() ), SLOT( showAddFriendDialog() ) );
+
+        if ( readXmlConsoleEnabled() )
+        {
+            QAction* showXmlConsoleAction = m_menu->addAction( tr( "XML Console..." ) );
+            connect( showXmlConsoleAction, SIGNAL( triggered() ), SLOT( showXmlConsole() ) );
+        }
+
+        emit addMenu( m_menu );
+    }
+#endif
+}
+
+
+void
+XmppSipPlugin::removeMenuHelper()
+{
+#ifndef ENABLE_HEADLESS
+    if ( m_menu )
+    {
+        emit removeMenu( m_menu );
+
+        delete m_menu;
+        m_menu = 0;
+    }
+#endif
+}
+
+
+void
+XmppSipPlugin::onNewMessage( const Jreen::Message& message )
+{
+    if ( m_state != Account::Connected )
+        return;
+
+    QString from = message.from().full();
+    QString msg = message.body();
+
+    if ( msg.isEmpty() )
+        return;
+
+    if ( message.subtype() == Jreen::Message::Error )
+    {
+        tDebug() << Q_FUNC_INFO << "Received error message from" << from << ", not answering... (Condition:"
+                 << ( message.error().isNull() ? -1 : message.error()->condition() ) << ")";
+        return;
+    }
+
+    SipInfo info = SipInfo::fromJson( msg );
+    if ( !info.isValid() )
+    {
+        QString to = from;
+        QString response = QString( tr( "I'm sorry -- I'm just an automatic presence used by Tomahawk Player"
+                                        " (http://gettomahawk.com). If you are getting this message, the person you"
+                                        " are trying to reach is probably not signed on, so please try again later!" ) );
+
+        // this is not a sip message, so we send it directly through the client
+        m_client->send( Jreen::Message ( Jreen::Message::Error, Jreen::JID( to ), response) );
+
+        emit msgReceived( from, msg );
+        return;
+    }
+
+    qDebug() << Q_FUNC_INFO << "From:" << message.from().full() << ":" << message.body();
+    emit sipInfoReceived( from, info );
+}
+
+
+void
+XmppSipPlugin::onPresenceReceived( const Jreen::RosterItem::Ptr& item, const Jreen::Presence& presence )
+{
+    Q_UNUSED(item);
+    if ( m_state != Account::Connected )
+        return;
+
+    Jreen::JID jid = presence.from();
+    QString fulljid( jid.full() );
+
+    qDebug() << Q_FUNC_INFO << "* New presence:" << fulljid << presence.subtype();
+
+    if ( jid == m_client->jid() )
+        return;
+
+    if ( presence.error() )
+    {
+        //qDebug() << Q_FUNC_INFO << fulljid << "Running tomahawk: no" << "presence error";
+        return;
+    }
+
+    // ignore anyone not Running tomahawk:
+    Jreen::Capabilities::Ptr caps = presence.payload<Jreen::Capabilities>();
+    if ( caps )
+    {
+        qDebug() << Q_FUNC_INFO << fulljid << "Running tomahawk: maybe" << "caps" << caps->node() << "requesting disco...";
+
+        // request disco features
+        QString node = caps->node() + '#' + caps->ver();
+
+        Jreen::IQ featuresIq( Jreen::IQ::Get, jid );
+        featuresIq.addExtension( new Jreen::Disco::Info( node ) );
+
+        Jreen::IQReply *reply = m_client->send( featuresIq );
+        reply->setData( RequestDisco );
+        connect( reply, SIGNAL( received( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
+    }
+    else if ( !caps )
+    {
+//        qDebug() << Q_FUNC_INFO << "Running tomahawk: no" << "no caps";
+        if ( presenceMeansOnline( m_peers jid  ) )
+            handlePeerStatus( jid, Jreen::Presence::Unavailable );
+    }
+}
+
+
+void
+XmppSipPlugin::onSubscriptionReceived( const Jreen::RosterItem::Ptr& item, const Jreen::Presence& presence )
+{
+    if ( m_state != Account::Connected )
+        return;
+
+    if ( item )
+        qDebug() << Q_FUNC_INFO << presence.from().full() << "subs" << item->subscription() << "ask" << item->ask();
+    else
+        qDebug() << Q_FUNC_INFO << "item empty";
+
+    // don't do anything if the contact is already subscribed to us
+    if ( presence.subtype() != Jreen::Presence::Subscribe ||
+       ( item && (item->subscription() == Jreen::RosterItem::From || item->subscription() == Jreen::RosterItem::Both ) ) )
+    {
+        return;
+    }
+
+    // check if the requester is already on the roster
+    if ( item &&
+       ( item->subscription() == Jreen::RosterItem::To || ( item->subscription() == Jreen::RosterItem::None && !item->ask().isEmpty() ) ) )
+    {
+        qDebug() << Q_FUNC_INFO << presence.from().bare() << "already on the roster so we assume ack'ing subscription request is okay...";
+        m_roster->allowSubscription( presence.from(), true );
+
+        return;
+    }
+
+#ifndef ENABLE_HEADLESS
+    // preparing the confirm box for the user
+    QMessageBox *confirmBox = new QMessageBox(
+                                QMessageBox::Question,
+                                tr( "Authorize User" ),
+                                QString( tr( "Do you want to add <b>%1</b> to your friend list?" ) ).arg( presence.from().bare() ),
+                                QMessageBox::Yes | QMessageBox::No,
+                                TomahawkUtils::tomahawkWindow()
+                              );
+
+    // add confirmBox to m_subscriptionConfirmBoxes
+    m_subscriptionConfirmBoxes.insert( presence.from(), confirmBox );
+
+    // display the box and wait for the answer
+    confirmBox->open( this, SLOT( onSubscriptionRequestConfirmed( int ) ) );
+#endif
+}
+
+
+void
+XmppSipPlugin::onSubscriptionRequestConfirmed( int result )
+{
+#ifndef ENABLE_HEADLESS
+    qDebug() << Q_FUNC_INFO << result;
+
+    QList< QMessageBox* > confirmBoxes = m_subscriptionConfirmBoxes.values();
+    Jreen::JID jid;
+
+    foreach ( QMessageBox* currentBox, confirmBoxes )
+    {
+        if ( currentBox == sender() )
+        {
+            jid = m_subscriptionConfirmBoxes.key( currentBox );
+        }
+    }
+
+    // we got an answer, deleting the box
+    m_subscriptionConfirmBoxes.remove( jid );
+    sender()->deleteLater();
+
+    QMessageBox::StandardButton allowSubscription = static_cast< QMessageBox::StandardButton >( result );
+    if ( allowSubscription == QMessageBox::Yes )
+    {
+        qDebug() << Q_FUNC_INFO << jid.bare() << "accepted by user, adding to roster";
+        addContact( jid, "" );
+    }
+    else
+    {
+        qDebug() << Q_FUNC_INFO << jid.bare() << "declined by user";
+    }
+
+    m_roster->allowSubscription( jid, allowSubscription == QMessageBox::Yes );
+#endif
+}
+
+
+void
+XmppSipPlugin::onNewIq( const Jreen::IQ& iq )
+{
+    if ( m_state != Account::Connected )
+        return;
+
+    Jreen::IQReply *reply = qobject_cast< Jreen::IQReply* >( sender() );
+    int context = reply ? reply->data().toInt() : NoContext;
+
+    if ( context == RequestDisco )
+    {
+//        qDebug() << Q_FUNC_INFO << "Received disco IQ...";
+        Jreen::Disco::Info *discoInfo = iq.payload< Jreen::Disco::Info >().data();
+        if ( !discoInfo )
+            return;
+
+        iq.accept();
+        Jreen::JID jid = iq.from();
+        Jreen::DataForm::Ptr form = discoInfo->form();
+
+        if ( discoInfo->features().contains( TOMAHAWK_FEATURE ) )
+        {
+            qDebug() << Q_FUNC_INFO << jid.full() << "Running tomahawk/feature enabled: yes";
+
+            // the actual presence doesn't matter, it just needs to be "online"
+            handlePeerStatus( jid, Jreen::Presence::Available );
+        }
+    }
+    else if ( context == RequestVersion)
+    {
+        Jreen::SoftwareVersion::Ptr softwareVersion = iq.payload<Jreen::SoftwareVersion>();
+        if ( softwareVersion )
+        {
+            QString versionString = QString( "%1 %2 %3" ).arg( softwareVersion->name(), softwareVersion->os(), softwareVersion->version() );
+            qDebug() << Q_FUNC_INFO << "Received software version for" << iq.from().full() << ":" << versionString;
+            emit softwareVersionReceived( iq.from().full(), versionString );
+        }
+    }
+    else if ( context == RequestedDisco )
+    {
+        qDebug() << "Sent IQ(Set), what should be happening here?";
+    }
+    else if( context == SipMessageSent )
+    {
+        qDebug() << "Sent SipMessage... what now?!";
+    }
+    /*else if(context == RequestedVCard )
+    {
+        qDebug() << "Requested VCard... what now?!";
+    }*/
+    else
+    {
+        TomahawkXmppMessage::Ptr sipMessage = iq.payload< TomahawkXmppMessage >();
+        if(sipMessage)
+        {
+            iq.accept();
+
+            qDebug() << Q_FUNC_INFO << "Got SipMessage ..."
+                     << "ip" << sipMessage->ip() << "port" << sipMessage->port() << "uniqname" << sipMessage->uniqname() << "key" << sipMessage->key() << "visible" << sipMessage->visible();
+
+            SipInfo info;
+            info.setVisible( sipMessage->visible() );
+            if ( sipMessage->visible() )
+            {
+                info.setHost( sipMessage->ip() );
+                info.setPort( sipMessage->port() );
+                info.setUniqname( sipMessage->uniqname() );
+                info.setKey( sipMessage->key() );
+            }
+
+            Q_ASSERT( info.isValid() );
+
+            qDebug() << Q_FUNC_INFO << "From:" << iq.from().full() << ":" << info;
+            emit sipInfoReceived( iq.from().full(), info );
+        }
+    }
+}
+
+
+bool
+XmppSipPlugin::presenceMeansOnline( Jreen::Presence::Type p )
+{
+    switch( p )
+    {
+        case Jreen::Presence::Invalid:
+        case Jreen::Presence::Unavailable:
+        case Jreen::Presence::Error:
+            return false;
+            break;
+
+        default:
+            return true;
+    }
+}
+
+
+void
+XmppSipPlugin::handlePeerStatus( const Jreen::JID& jid, Jreen::Presence::Type presenceType )
+{
+    QString fulljid = jid.full();
+
+    // "going offline" event
+    if ( !presenceMeansOnline( presenceType ) &&
+       ( !m_peers.contains( jid ) || presenceMeansOnline( m_peers.value( jid ) ) ) )
+    {
+        m_peers jid  = presenceType;
+        qDebug() << Q_FUNC_INFO << "* Peer goes offline:" << fulljid;
+
+        emit peerOffline( fulljid );
+        return;
+    }
+
+    // "coming online" event
+    if ( presenceMeansOnline( presenceType ) &&
+       ( !m_peers.contains( jid ) || !presenceMeansOnline( m_peers.value( jid ) ) ) )
+    {
+        m_peers jid  = presenceType;
+        qDebug() << Q_FUNC_INFO << "* Peer goes online:" << fulljid;
+
+        emit peerOnline( fulljid );
+
+#ifndef ENABLE_HEADLESS
+        if ( !m_avatarManager->avatar( jid.bare() ).isNull() )
+            onNewAvatar( jid.bare() );
+#endif
+
+        // request software version
+        Jreen::IQ versionIq( Jreen::IQ::Get, jid );
+        versionIq.addExtension( new Jreen::SoftwareVersion() );
+        Jreen::IQReply *reply = m_client->send( versionIq );
+        reply->setData( RequestVersion );
+        connect( reply, SIGNAL( received( Jreen::IQ ) ), SLOT( onNewIq( Jreen::IQ ) ) );
+
+        return;
+    }
+
+    //qDebug() << "Updating presence data for" << fulljid;
+    m_peers jid  = presenceType;
+}
+
+
+void
+XmppSipPlugin::onNewAvatar( const QString& jid )
+{
+#ifndef ENABLE_HEADLESS
+//    qDebug() << Q_FUNC_INFO << jid;
+    if ( m_state != Account::Connected )
+        return;
+
+    Q_ASSERT( !m_avatarManager->avatar( jid ).isNull() );
+
+    // find peers for the jid
+    QList< Jreen::JID > peers =  m_peers.keys();
+    foreach ( const Jreen::JID& peer, peers )
+    {
+        if ( peer.bare() == jid )
+        {
+            emit avatarReceived( peer.full(), m_avatarManager->avatar( jid ) );
+        }
+    }
+
+    if ( jid == m_client->jid().bare() )
+        // own avatar
+        emit avatarReceived( m_avatarManager->avatar( jid ) );
+    else
+        // someone else's avatar
+        emit avatarReceived( jid,  m_avatarManager->avatar( jid ) );
+#endif
+}
+
+
+bool
+XmppSipPlugin::readXmlConsoleEnabled()
+{
+    // HACK we want to allow xmlconsole to be set manually in the onfig file, which means we can't hide it in a QVariantHash
+    const bool xmlConsole = TomahawkSettings::instance()->value( QString( "accounts/%1/xmlconsole" ).arg( account()->accountId() ), false ).toBool();
+    return xmlConsole;
+}
+
+
+QString
+XmppSipPlugin::readUsername()
+{
+    QVariantHash credentials = m_account->credentials();
+    return credentials.contains( "username" ) ? credentials "username" .toString() : QString();
+}
+
+
+QString
+XmppSipPlugin::readPassword()
+{
+    QVariantHash credentials = m_account->credentials();
+    return credentials.contains( "password" ) ? credentials "password" .toString() : QString();
+}
+
+
+int
+XmppSipPlugin::readPort()
+{
+    QVariantHash configuration = m_account->configuration();
+    return configuration.contains( "port" ) ? configuration "port" .toInt() : 5222;
+}
+
+
+QString
+XmppSipPlugin::readServer()
+{
+    QVariantHash configuration = m_account->configuration();
+    return configuration.contains( "server" ) ? configuration "server" .toString() : QString();
+}
+
+
+Account::ConnectionState
+XmppSipPlugin::connectionState() const
+{
+    return m_state;
+}

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/sip/XmppSip.h Added

@@ -0,0 +1,155 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 XMPPSIP_H
+#define XMPPSIP_H
+
+#include "sip/SipPlugin.h"
+
+#include "AvatarManager.h"
+
+#ifndef ENABLE_HEADLESS
+    #include "XmlConsole.h"
+#endif
+
+#include <jreen/client.h>
+#include <jreen/disco.h>
+#include <jreen/message.h>
+#include <jreen/messagesession.h>
+#include <jreen/stanza.h>
+#include <jreen/jreen.h>
+#include <jreen/error.h>
+#include <jreen/presence.h>
+#include <jreen/vcard.h>
+#include <jreen/abstractroster.h>
+#include <jreen/connection.h>
+#include <jreen/mucroom.h>
+#include <jreen/pubsubmanager.h>
+
+#ifndef ENABLE_HEADLESS
+    #include <QtGui/QMessageBox>
+#endif
+
+#include "accounts/AccountDllMacro.h"
+
+#include "../XmppInfoPlugin.h"
+
+class ACCOUNTDLLEXPORT XmppSipPlugin : public SipPlugin
+{
+    Q_OBJECT
+
+friend class Tomahawk::InfoSystem::XmppInfoPlugin;
+
+public:
+    XmppSipPlugin( Tomahawk::Accounts::Account* account );
+    virtual ~XmppSipPlugin();
+
+    //FIXME: Make this more correct
+    virtual bool isValid() const { return true; }
+
+    Tomahawk::InfoSystem::InfoPluginPtr infoPlugin();
+
+#ifndef ENABLE_HEADLESS
+    virtual QMenu* menu();
+#endif
+
+    // used by XmppAccount to expose connection state and controls
+    Tomahawk::Accounts::Account::ConnectionState connectionState() const;
+
+signals:
+    void jidChanged( const QString& );
+
+    // Used by XmppAccount
+    void stateChanged( Tomahawk::Accounts::Account::ConnectionState state );
+    void error( int errorId, const QString& errorStr );
+
+public slots:
+    virtual void connectPlugin();
+    virtual void disconnectPlugin();
+    virtual void checkSettings();
+    virtual void configurationChanged();
+    virtual void sendMsg( const QString& peerId, const SipInfo& info );
+    virtual void addContact( const QString& peerId, const QString& msg = QString() );
+
+    void broadcastMsg( const QString& msg );
+    void showAddFriendDialog();
+    void publishTune( const QUrl& url, const Tomahawk::InfoSystem::InfoStringHash& trackInfo );
+
+protected:
+    virtual QString defaultSuffix() const;
+
+private slots:
+    void showXmlConsole();
+    void onConnect();
+    void onDisconnect( Jreen::Client::DisconnectReason reason );
+
+    void onPresenceReceived( const Jreen::RosterItem::Ptr& item, const Jreen::Presence& presence );
+    void onSubscriptionReceived( const Jreen::RosterItem::Ptr& item, const Jreen::Presence& presence );
+    void onSubscriptionRequestConfirmed( int result );
+
+    void onNewMessage( const Jreen::Message& message );
+    void onError( const Jreen::Connection::SocketError& e );
+    void onNewIq( const Jreen::IQ& iq );
+    void onNewAvatar( const QString& jid );
+
+private:
+    bool readXmlConsoleEnabled();
+    QString readUsername();
+    QString readPassword();
+    QString readServer();
+    int readPort();
+
+    QString errorMessage( Jreen::Client::DisconnectReason reason );
+    void setupClientHelper();
+    void addMenuHelper();
+    void removeMenuHelper();
+
+    bool presenceMeansOnline( Jreen::Presence::Type p );
+    void handlePeerStatus( const Jreen::JID& jid, Jreen::Presence::Type presenceType );
+
+    QString m_currentUsername;
+    QString m_currentPassword;
+    QString m_currentServer;
+    int m_currentPort;
+    QString m_currentResource;
+
+    QWeakPointer< Tomahawk::InfoSystem::XmppInfoPlugin > m_infoPlugin;
+    Tomahawk::Accounts::Account::ConnectionState m_state;
+
+    // sort out
+    Jreen::Client* m_client;
+
+    Jreen::MUCRoom* m_room;
+    Jreen::SimpleRoster* m_roster;
+    QHash< Jreen::JID, Jreen::Presence::Type > m_peers;
+
+#ifndef ENABLE_HEADLESS
+    QHash< Jreen::JID, QMessageBox* > m_subscriptionConfirmBoxes;
+    QMenu* m_menu;
+    XmlConsole* m_xmlConsole;
+#endif
+
+    enum IqContext { NoContext, RequestDisco, RequestedDisco, SipMessageSent, RequestedVCard, RequestVersion, RequestedVersion };
+    AvatarManager* m_avatarManager;
+    Jreen::PubSub::Manager* m_pubSubManager;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/accounts/xmpp/xmpp-icon.png Added

tomahawk-0.5.5.tar.bz2/src/accounts/zeroconf Added

tomahawk-0.5.5.tar.bz2/src/accounts/zeroconf/CMakeLists.txt Added

tomahawk-0.5.5.tar.bz2/src/accounts/zeroconf/ConfigWidget.ui Changed

tomahawk-0.5.5.tar.bz2/src/accounts/zeroconf/TomahawkZeroconf.h Added

@@ -0,0 +1,174 @@
+/* === 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
+ *   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 TOMAHAWKZCONF
+#define TOMAHAWKZCONF
+
+#define ZCONF_PORT 50210
+
+#include <QList>
+#include <QHostAddress>
+#include <QHostInfo>
+#include <QNetworkProxy>
+#include <QUdpSocket>
+#include <QTimer>
+
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "network/Servent.h"
+#include "accounts/AccountDllMacro.h"
+
+class Node : public QObject
+{
+Q_OBJECT
+
+public:
+    Node( const QString& i, const QString& n, int p )
+        : ip( i ), nid( n ), port( p )
+    {
+        qDebug() << Q_FUNC_INFO;
+    }
+
+    ~Node()
+    {
+        qDebug() << Q_FUNC_INFO;
+    }
+
+signals:
+    void tomahawkHostFound( const QString&, int, const QString&, const QString& );
+
+public slots:
+    void resolved( QHostInfo i )
+    {
+        qDebug() << Q_FUNC_INFO << "zeroconf-derived IP has resolved to name " << i.hostName();
+        if ( i.hostName().length() )
+            emit tomahawkHostFound( ip, port, i.hostName(), nid );
+        else
+            emit tomahawkHostFound( ip, port, "Unknown", nid );
+        this->deleteLater();
+    }
+
+    void resolve()
+    {
+        qDebug() << Q_FUNC_INFO << "Resolving zeroconf-derived IP " << ip;
+        QHostInfo::lookupHost( ip, this, SLOT( resolved( QHostInfo ) ) );
+    }
+
+private:
+    QString ip;
+    QString nid;
+    int port;
+};
+
+
+class ACCOUNTDLLEXPORT TomahawkZeroconf : public QObject
+{
+Q_OBJECT
+
+public:
+    TomahawkZeroconf( int port, QObject* parent = 0 )
+        : QObject( parent ), m_sock( this ), m_port( port )
+    {
+        qDebug() << Q_FUNC_INFO;
+        m_sock.setProxy( QNetworkProxy::NoProxy );
+        m_sock.bind( ZCONF_PORT, QUdpSocket::ShareAddress );
+        connect( &m_sock, SIGNAL( readyRead() ), this, SLOT( readPacket() ) );
+    }
+
+    virtual ~TomahawkZeroconf()
+    {
+        qDebug() << Q_FUNC_INFO;
+    }
+
+public slots:
+    void advertise()
+    {
+        qDebug() << "Advertising us on the LAN (both versions)";
+        // Keep newer versions first
+        QByteArray advert = QString( "TOMAHAWKADVERT:%1:%2:%3" )
+                            .arg( m_port )
+                            .arg( Database::instance()->impl()->dbid() )
+                            .arg( QHostInfo::localHostName() )
+                            .toAscii();
+        m_sock.writeDatagram( advert.data(), advert.size(),
+                              QHostAddress::Broadcast, ZCONF_PORT );
+        advert = QString( "TOMAHAWKADVERT:%1:%2" )
+                            .arg( m_port )
+                            .arg( Database::instance()->impl()->dbid() )
+                            .toAscii();
+        m_sock.writeDatagram( advert.data(), advert.size(),
+                              QHostAddress::Broadcast, ZCONF_PORT );
+    }
+
+signals:
+    // IP, port, name, session
+    void tomahawkHostFound( const QString&, int, const QString&, const QString& );
+
+private slots:
+    void readPacket()
+    {
+        if ( !m_sock.hasPendingDatagrams() )
+            return;
+
+        QByteArray datagram;
+        datagram.resize( m_sock.pendingDatagramSize() );
+        QHostAddress sender;
+        quint16 senderPort;
+        m_sock.readDatagram( datagram.data(), datagram.size(), &sender, &senderPort );
+        qDebug() << "DATAGRAM RCVD" << QString::fromAscii( datagram ) << sender;
+
+        // only process msgs originating on the LAN:
+        if ( datagram.startsWith( "TOMAHAWKADVERT:" ) &&
+            Servent::isIPWhitelisted( sender ) )
+        {
+            QStringList parts = QString::fromAscii( datagram ).split( ':' );
+            if ( parts.length() == 4 )
+            {
+                bool ok;
+                int port = parts.at(1).toInt( &ok );
+                if ( ok && Database::instance()->impl()->dbid() != parts.at( 2 ) )
+                {
+                    emit tomahawkHostFound( sender.toString(), port, parts.at( 3 ), parts.at( 2 ) );
+                }
+            }
+            else if ( parts.length() == 3 )
+            {
+                bool ok;
+                int port = parts.at(1).toInt( &ok );
+                if ( ok && Database::instance()->impl()->dbid() != parts.at( 2 ) )
+                {
+                    qDebug() << "ADVERT received:" << sender << port;
+                    Node *n = new Node( sender.toString(), parts.at( 2 ), port );
+                    connect( n,    SIGNAL( tomahawkHostFound( QString, int, QString, QString ) ),
+                             this, SIGNAL( tomahawkHostFound( QString, int, QString, QString ) ) );
+                    n->resolve();
+                }
+            }
+        }
+
+        if ( m_sock.hasPendingDatagrams() )
+            QTimer::singleShot( 0, this, SLOT( readPacket() ) );
+    }
+
+private:
+    QUdpSocket m_sock;
+    int m_port;
+};
+
+#endif
+

tomahawk-0.5.5.tar.bz2/src/accounts/zeroconf/Zeroconf.cpp Added

@@ -0,0 +1,143 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 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 "Zeroconf.h"
+
+#include <QtPlugin>
+
+#include <QtCore/QTimer>
+
+#include "TomahawkSettings.h"
+#include "utils/Logger.h"
+#include "ZeroconfAccount.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+ZeroconfPlugin::ZeroconfPlugin ( ZeroconfAccount* parent )
+    : SipPlugin( parent )
+    , m_zeroconf( 0 )
+    , m_state( Account::Disconnected )
+    , m_cachedNodes()
+{
+    qDebug() << Q_FUNC_INFO;
+    m_advertisementTimer.setInterval( 60000 );
+    m_advertisementTimer.setSingleShot( false );
+    connect( &m_advertisementTimer, SIGNAL( timeout() ), this, SLOT( advertise() ) );
+}
+
+ZeroconfPlugin::~ZeroconfPlugin() {}
+
+const QString
+ZeroconfPlugin::name() const
+{
+    return QString( MYNAME );
+}
+
+const QString
+ZeroconfPlugin::accountName() const
+{
+    return QString( MYNAME );
+}
+
+const QString
+ZeroconfPlugin::friendlyName() const
+{
+    return QString( MYNAME );
+}
+
+Account::ConnectionState
+ZeroconfPlugin::connectionState() const
+{
+    return m_state;
+}
+
+
+void
+ZeroconfPlugin::connectPlugin()
+{
+    delete m_zeroconf;
+    m_zeroconf = new TomahawkZeroconf( Servent::instance()->port(), this );
+    QObject::connect( m_zeroconf, SIGNAL( tomahawkHostFound( QString, int, QString, QString ) ),
+                                    SLOT( lanHostFound( QString, int, QString, QString ) ) );
+
+    advertise();
+    m_state = Account::Connected;
+
+    foreach( const QStringList& nodeSet, m_cachedNodes )
+    {
+        if ( !Servent::instance()->connectedToSession( nodeSet3 ) )
+            Servent::instance()->connectToPeer( nodeSet0, nodeSet1.toInt(), "whitelist", nodeSet2, nodeSet3 );
+    }
+    m_cachedNodes.clear();
+
+    m_advertisementTimer.start();
+}
+
+void
+ZeroconfPlugin::disconnectPlugin()
+{
+    m_advertisementTimer.stop();
+    m_state = Account::Disconnected;
+
+    delete m_zeroconf;
+    m_zeroconf = 0;
+}
+
+
+#ifndef ENABLE_HEADLESS
+QIcon
+ZeroconfPlugin::icon() const
+{
+    return account()->icon();
+}
+#endif
+
+
+void
+ZeroconfPlugin::advertise()
+{
+    m_zeroconf->advertise();
+}
+
+
+void
+ZeroconfPlugin::lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid )
+{
+    if ( sender() != m_zeroconf )
+        return;
+
+    qDebug() << "Found LAN host:" << host << port << nodeid;
+
+    if ( m_state != Account::Connected )
+    {
+        qDebug() << "Not online, so not connecting.";
+        QStringList nodeSet;
+        nodeSet << host << QString::number( port ) << name << nodeid;
+        m_cachedNodes.append( nodeSet );
+        return;
+    }
+
+    if ( !Servent::instance()->connectedToSession( nodeid ) )
+        Servent::instance()->connectToPeer( host, port, "whitelist", name, nodeid );
+    else
+        qDebug() << "Already connected to" << host;
+}
+

tomahawk-0.5.5.tar.bz2/src/accounts/zeroconf/Zeroconf.h Added

@@ -0,0 +1,84 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 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 ZEROCONF_H
+#define ZEROCONF_H
+
+#include "sip/SipPlugin.h"
+#include "accounts/Account.h"
+#include "TomahawkZeroconf.h"
+
+#include "../AccountDllMacro.h"
+
+#include <QtCore/QTimer>
+
+#define MYNAME "Local Network"
+
+namespace Tomahawk
+{
+namespace Accounts
+{
+
+class ZeroconfAccount;
+
+
+class ACCOUNTDLLEXPORT ZeroconfPlugin : public SipPlugin
+{
+    Q_OBJECT
+
+public:
+    ZeroconfPlugin( ZeroconfAccount* acc );
+
+    virtual ~ZeroconfPlugin();
+
+    virtual const QString name() const;
+    virtual const QString friendlyName() const;
+    virtual const QString accountName() const;
+    virtual Account::ConnectionState connectionState() const;
+    virtual bool isValid() const { return true; }
+#ifndef ENABLE_HEADLESS
+    virtual QIcon icon() const;
+#endif
+    virtual void checkSettings() {}
+    virtual void configurationChanged() {}
+
+public slots:
+    void connectPlugin();
+    void disconnectPlugin();
+
+    void advertise();
+
+    void sendMsg( const QString& peerId , const SipInfo&  ) {}
+    void broadcastMsg( const QString & ) {}
+    void addContact( const QString &, const QString&  ) {}
+
+private slots:
+    void lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid );
+
+private:
+    TomahawkZeroconf* m_zeroconf;
+    Account::ConnectionState m_state;
+    QVector<QStringList> m_cachedNodes;
+    QTimer m_advertisementTimer;
+};
+
+}
+}
+
+#endif

tomahawk-0.5.5.tar.bz2/src/accounts/zeroconf/ZeroconfAccount.cpp Added

@@ -0,0 +1,129 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 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 "ZeroconfAccount.h"
+
+#include "sip/SipPlugin.h"
+#include "Zeroconf.h"
+#include "Source.h"
+
+#include <QtCore/QtPlugin>
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+QPixmap* s_icon = 0;
+
+ZeroconfFactory::ZeroconfFactory()
+{
+#ifndef ENABLE_HEADLESS
+    if ( s_icon == 0 )
+        s_icon = new QPixmap( ":/zeroconf-icon.png" );
+#endif
+}
+
+
+ZeroconfFactory::~ZeroconfFactory()
+{
+    if ( s_icon )
+    {
+        delete s_icon;
+        s_icon = 0;
+    }
+}
+
+
+Account*
+ZeroconfFactory::createAccount( const QString& pluginId )
+{
+    return new ZeroconfAccount( pluginId.isEmpty() ? generateId( factoryId() ) : pluginId );
+}
+
+QPixmap
+ZeroconfFactory::icon() const
+{
+    return *s_icon;
+}
+
+
+ZeroconfAccount::ZeroconfAccount( const QString& accountId )
+    : Account( accountId )
+{
+    setAccountServiceName( "Local Network" );
+    setAccountFriendlyName( "Local Network" );
+
+    setTypes( SipType );
+}
+
+ZeroconfAccount::~ZeroconfAccount()
+{
+
+}
+
+QPixmap
+ZeroconfAccount::icon() const
+{
+    return *s_icon;
+}
+
+
+void
+ZeroconfAccount::authenticate()
+{
+    if ( !isAuthenticated() )
+        sipPlugin()->connectPlugin();
+}
+
+
+void
+ZeroconfAccount::deauthenticate()
+{
+    if ( isAuthenticated() )
+        sipPlugin()->disconnectPlugin();
+}
+
+
+bool
+ZeroconfAccount::isAuthenticated() const
+{
+    return connectionState() == Connected;
+}
+
+
+Account::ConnectionState
+ZeroconfAccount::connectionState() const
+{
+    if ( m_sipPlugin.isNull() )
+        return Disconnected;
+
+    // TODO can we get called before sipPlugin()?
+    return m_sipPlugin.data()->connectionState();
+}
+
+
+SipPlugin*
+ZeroconfAccount::sipPlugin()
+{
+    if ( m_sipPlugin.isNull() )
+        m_sipPlugin = QWeakPointer< ZeroconfPlugin >( new ZeroconfPlugin( this ) );
+
+    return m_sipPlugin.data();
+}
+
+
+Q_EXPORT_PLUGIN2( Tomahawk::Accounts::AccountFactory, Tomahawk::Accounts::ZeroconfFactory )

tomahawk-0.5.5.tar.bz2/src/accounts/zeroconf/ZeroconfAccount.h Added

@@ -0,0 +1,81 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 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 ZEROCONF_ACCOUNTS_H
+#define ZEROCONF_ACCOUNTS_H
+
+#include "Zeroconf.h"
+#include "accounts/Account.h"
+#include "../AccountDllMacro.h"
+
+class SipPlugin;
+
+namespace Tomahawk
+{
+namespace Accounts
+{
+
+class ACCOUNTDLLEXPORT ZeroconfFactory : public AccountFactory
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::Accounts::AccountFactory )
+public:
+    ZeroconfFactory();
+    virtual ~ZeroconfFactory();
+
+    virtual QString factoryId() const { return "zeroconfaccount"; }
+    virtual QString prettyName() const { return "Local Network"; }
+    QString description() const { return tr( "Automatically connect to Tomahawks on the local network" ); }
+    virtual bool isUnique() const { return true; }
+    AccountTypes types() const { return AccountTypes( SipType ); };
+#ifndef ENABLE_HEADLESS
+virtual QPixmap icon() const;
+#endif
+
+
+    virtual Account* createAccount ( const QString& pluginId = QString() );
+};
+
+class ACCOUNTDLLEXPORT ZeroconfAccount : public Account
+{
+    Q_OBJECT
+public:
+    ZeroconfAccount( const QString &accountId );
+    virtual ~ZeroconfAccount();
+
+    QPixmap icon() const;
+
+    void authenticate();
+    void deauthenticate();
+    bool isAuthenticated() const;
+    ConnectionState connectionState() const;
+
+    virtual Tomahawk::InfoSystem::InfoPluginPtr infoPlugin() { return Tomahawk::InfoSystem::InfoPluginPtr(); }
+    SipPlugin* sipPlugin();
+
+    QWidget* configurationWidget() { return 0; }
+    QWidget* aclWidget() { return 0; }
+
+private:
+    QWeakPointer< ZeroconfPlugin > m_sipPlugin;
+};
+
+}
+}
+
+#endif

tomahawk-0.5.5.tar.bz2/src/accounts/zeroconf/resources.qrc Changed

tomahawk-0.5.5.tar.bz2/src/accounts/zeroconf/zeroconf-icon.png Added

tomahawk-0.4.2.tar.bz2/src/breakpad/BreakPad.cpp -> tomahawk-0.5.5.tar.bz2/src/breakpad/BreakPad.cpp Changed

tomahawk-0.4.2.tar.bz2/src/breakpad/CrashReporter/CrashReporter.cpp -> tomahawk-0.5.5.tar.bz2/src/breakpad/CrashReporter/CrashReporter.cpp Changed

@@ -25,7 +25,7 @@
 #include <QDateTime>
 #include <QHttp>
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 
 #define LOGFILE TomahawkUtils::appLogDir().filePath( "Tomahawk.log" ).toLocal8Bit()
 #define RESPATH ":/data/"
@@ -36,7 +36,6 @@
     setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
 
     ui.setupUi( this );
-
     ui.logoLabel->setPixmap( QPixmap( RESPATH "icons/tomahawk-icon-128x128.png" ).scaled( QSize( 55, 55 ), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
     ui.progressBar->setRange( 0, 100 );
     ui.progressBar->setValue( 0 );
@@ -51,20 +50,11 @@
     ui.progressLabel->setIndent( 3 );
   #else
     ui.vboxLayout->setSpacing( 16 );
+    ui.hboxLayout1->setSpacing( 16 );
     ui.progressBar->setTextVisible( false );
     ui.progressLabel->setIndent( 1 );
     ui.bottomLabel->setDisabled( true );
     ui.bottomLabel->setIndent( 1 );
-
-    // adjust the spacer since we adjusted the spacing above
-    for ( int x = 0; x < ui.vboxLayout->count(); ++x )
-    {
-        if ( QSpacerItem* spacer = ui.vboxLayout->itemAt( x )->spacerItem() )
-        {
-            spacer->changeSize( 6, 2, QSizePolicy::Minimum, QSizePolicy::Fixed );
-            break;
-        }
-    }
   #endif //Q_WS_MAC
 
     m_http = new QHttp( "oops.tomahawk-player.org", 80, this );
@@ -76,9 +66,20 @@
     m_minidump = m_dir + '/' + args.value( 2 ) + ".dmp";
     m_product_name = args.value( 3 );
 
-    setFixedSize( sizeHint() );
+    //hide until "send report" has been clicked
+    ui.progressBar->setVisible( false );
+    ui.button->setVisible( false );
+    ui.progressLabel->setVisible( false );
+    connect( ui.sendButton, SIGNAL( clicked() ), SLOT( onSendButton() ) );
 
-    QTimer::singleShot( 0, this, SLOT( send() ) );
+    adjustSize();
+    setFixedSize( size() );
+}
+
+
+CrashReporter::~CrashReporter()
+{
+    delete m_http;
 }
 
 
@@ -184,3 +185,19 @@
     ui.progressLabel->setText( tr( "Failed to send crash info." ) );
     qDebug() << "Error:" << error << errorString;
 }
+
+
+void
+CrashReporter::onSendButton()
+{
+    ui.progressBar->setVisible( true );
+    ui.button->setVisible( true );
+    ui.progressLabel->setVisible( true );
+    ui.sendButton->setEnabled( false );
+    ui.dontSendButton->setEnabled( false );
+
+    adjustSize();
+    setFixedSize( size() );
+
+    QTimer::singleShot( 0, this, SLOT( send() ) );
+}

tomahawk-0.4.2.tar.bz2/src/breakpad/CrashReporter/CrashReporter.h -> tomahawk-0.5.5.tar.bz2/src/breakpad/CrashReporter/CrashReporter.h Changed

tomahawk-0.4.2.tar.bz2/src/breakpad/CrashReporter/CrashReporter.ui -> tomahawk-0.5.5.tar.bz2/src/breakpad/CrashReporter/CrashReporter.ui Changed

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>438</width>
-    <height>196</height>
+    <width>376</width>
+    <height>216</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -33,7 +33,7 @@
     <number>9</number>
    </property>
    <item>
-    <layout class="QHBoxLayout">
+    <layout class="QHBoxLayout" name="hboxLayout">
      <property name="spacing">
       <number>12</number>
      </property>
@@ -77,7 +77,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>&lt;p&gt;&lt;b&gt;Sorry!&lt;/b&gt;&amp;nbsp;Tomahawk crashed. Information about the crash is now being sent to Tomahawk HQ so that we can fix the bug.&lt;/p&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Sorry!&lt;/span&gt; Tomahawk crashed. Please tell us about it! Tomahawk has created an error report for you that can help improve the stability in the future. You can now send this report directly to the Tomahawk developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="textFormat">
         <enum>Qt::RichText</enum>
@@ -106,23 +106,41 @@
     </layout>
    </item>
    <item>
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>16</height>
-      </size>
+    <layout class="QHBoxLayout" name="hboxLayout1">
+     <property name="spacing">
+      <number>-1</number>
      </property>
-    </spacer>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="sendButton">
+       <property name="text">
+        <string>Send this report</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="dontSendButton">
+       <property name="text">
+        <string>Don't send</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
-    <layout class="QVBoxLayout">
+    <layout class="QVBoxLayout" name="vboxLayout1">
      <property name="spacing">
       <number>0</number>
      </property>
@@ -210,8 +228,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>424</x>
-     <y>154</y>
+     <x>426</x>
+     <y>203</y>
     </hint>
     <hint type="destinationlabel">
      <x>247</x>
@@ -219,5 +237,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>dontSendButton</sender>
+   <signal>clicked()</signal>
+   <receiver>CrashReporter</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>380</x>
+     <y>117</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>218</x>
+     <y>122</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>

tomahawk-0.5.5.tar.bz2/src/infoplugins Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/CMakeLists.txt Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/InfoPluginDllMacro.h Added

@@ -0,0 +1,33 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 INFOPLUGINDLLMACRO_H
+#define INFOPLUGINDLLMACRO_H
+
+#include <QtCore/qglobal.h>
+
+#ifndef INFOPLUGINDLLEXPORT
+# if defined (INFOPLUGINDLLEXPORT_PRO)
+#  define INFOPLUGINDLLEXPORT Q_DECL_EXPORT
+# else
+#  define INFOPLUGINDLLEXPORT Q_DECL_IMPORT
+# endif
+#endif
+
+#endif

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/CMakeLists.txt Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/charts Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/charts/CMakeLists.txt Added

@@ -0,0 +1,43 @@
+project( tomahawk )
+
+include( ${QT_USE_FILE} )
+add_definitions( ${QT_DEFINITIONS} )
+add_definitions( -DQT_PLUGIN )
+add_definitions( -DQT_SHARED )
+add_definitions( -DINFOPLUGINDLLEXPORT_PRO )
+
+set( chartsInfoPluginSources
+    ChartsPlugin.cpp
+)
+
+set( chartsInfoPluginHeaders
+    ChartsPlugin.h
+)
+
+include_directories(
+   ${QT_INCLUDE_DIR}
+)
+
+qt4_wrap_cpp( chartsInfoPluginMoc ${chartsInfoPluginHeaders} )
+add_library( tomahawk_infoplugin_charts SHARED ${chartsInfoPluginSources} ${chartsInfoPluginMoc} ${RC_SRCS} )
+
+IF( WIN32 )
+SET( OS_SPECIFIC_LINK_LIBRARIES
+        ${OS_SPECIFIC_LINK_LIBRARIES}
+        "winmm.dll"
+        "iphlpapi.a"
+)
+ENDIF( WIN32 )
+
+target_link_libraries( tomahawk_infoplugin_charts
+    ${TOMAHAWK_LIBRARIES}
+    ${QT_LIBRARIES}
+    ${OS_SPECIFIC_LINK_LIBRARIES}
+)
+
+IF( APPLE )
+#  SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
+ENDIF( APPLE )
+
+install( TARGETS tomahawk_infoplugin_charts DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/charts/ChartsPlugin.cpp Added

@@ -0,0 +1,653 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Casey Link <unnamedrambler@gmail.com>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "ChartsPlugin.h"
+
+#include <QDir>
+#include <QSettings>
+#include <QNetworkConfiguration>
+#include <QNetworkReply>
+#include <QtPlugin>
+
+#include "Album.h"
+#include "CountryUtils.h"
+#include "Typedefs.h"
+#include "audio/AudioEngine.h"
+#include "TomahawkSettings.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "utils/TomahawkCache.h"
+#include "Source.h"
+
+#define CHART_URL "http://charts.tomahawk-player.org/"
+//#define CHART_URL "http://localhost:8080/"
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+ChartsPlugin::ChartsPlugin()
+    : InfoPlugin()
+    , m_chartsFetchJobs( 0 )
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << QThread::currentThread();
+    /// If you add resource, update version aswell
+    m_chartVersion = "2.3";
+    m_supportedGetTypes <<  InfoChart << InfoChartCapabilities;
+}
+
+
+ChartsPlugin::~ChartsPlugin()
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << QThread::currentThread();
+}
+
+
+void
+ChartsPlugin::init()
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << QThread::currentThread();
+    QVariantList source_qvarlist = TomahawkUtils::Cache::instance()->getData( "ChartsPlugin", "chart_sources" ).toList();
+    foreach( const QVariant & source, source_qvarlist ) {
+        m_chartResources.append( source.toString() );
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "fetched source from cache" << source.toString();
+
+    }
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "total sources" << m_chartResources.size() << source_qvarlist.size();
+    if( m_chartResources.size() == 0 )
+        fetchChartSourcesList( true );
+}
+
+
+void
+ChartsPlugin::dataError( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    emit info( requestData, QVariant() );
+    return;
+}
+
+
+void
+ChartsPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    //qDebug() << Q_FUNC_INFO << requestData.caller;
+    //qDebug() << Q_FUNC_INFO << requestData.customData;
+
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    bool foundSource = false;
+
+    switch ( requestData.type )
+    {
+        case InfoChart:
+            /// We need something to check if the request is actually ment to go to this plugin
+            if ( !hash.contains( "chart_source" ) )
+            {
+                tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Hash did not contain required param!";
+                dataError( requestData );
+                break;
+            }
+            else
+            {
+                foreach( QString resource, m_chartResources )
+                {
+                    if( resource == hash"chart_source" )
+                    {
+                        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "get source" << resource;
+                        foundSource = true;
+                    }
+                }
+
+                if( !foundSource )
+                {
+                    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "no such source" << hash"chart_source" << "(" << m_chartResources.size() << " total sources)";
+                    dataError( requestData );
+                    break;
+                }
+
+            }
+            fetchChartFromCache( requestData );
+            break;
+
+        case InfoChartCapabilities:
+            fetchChartCapabilitiesFromCache( requestData );
+            break;
+        default:
+            dataError( requestData );
+    }
+}
+
+
+void
+ChartsPlugin::fetchChartFromCache( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Could not convert requestData to InfoStringHash!";
+        dataError( requestData );
+        return;
+    }
+
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+
+    /// Each request needs to contain both a id and source
+    if ( !hash.contains( "chart_id" ) && !hash.contains( "chart_source" ) )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Hash did not contain required params!";
+        dataError( requestData );
+        return;
+
+    }
+    /// Set the criterias for current chart
+    criteria"chart_id" = hash"chart_id";
+    criteria"chart_source" = hash"chart_source";
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Checking cache for " << hash"chart_id" << " from " << hash"chart_source";
+
+
+    emit getCachedInfo( criteria, 86400000, requestData );
+}
+
+void
+ChartsPlugin::fetchChartCapabilitiesFromCache( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Could not convert requestData to InfoStringHash!";
+        dataError( requestData );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria "InfoChartCapabilities"  = "chartsplugin";
+    criteria "InfoChartVersion"  = m_chartVersion;
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Checking cache for " << "InfoChartCapabilities" << m_chartVersion;
+    emit getCachedInfo( criteria, 864000000, requestData );
+}
+
+void
+ChartsPlugin::notInCacheSlot( QHash<QString, QString> criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    switch ( requestData.type )
+    {
+        case InfoChart:
+        {
+            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChart not in cache! Fetching...";
+            fetchChart( requestData, criteria"chart_source", criteria"chart_id" );
+            return;
+
+        }
+
+        case InfoChartCapabilities:
+        {
+            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChartCapabilities not in cache! Fetching...";
+            fetchChartSourcesList( false );
+            m_cachedRequests.append( requestData );
+
+            return;
+        }
+
+        default:
+        {
+            tLog() << Q_FUNC_INFO << "Couldn't figure out what to do with this type of request after cache miss";
+            emit info( requestData, QVariant() );
+            return;
+        }
+    }
+}
+
+void
+ChartsPlugin::fetchChartSourcesList( bool fetchOnlySourceList )
+{
+    QUrl url = QUrl( QString( CHART_URL "charts" ) );
+    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    reply->setProperty( "only_source_list", fetchOnlySourceList );
+
+
+    tDebug() << Q_FUNC_INFO << "fetching:" << url;
+    connect( reply, SIGNAL( finished() ), SLOT( chartSourcesList() ) );
+
+}
+
+void
+ChartsPlugin::chartSourcesList()
+{
+    tDebug( LOGVERBOSE )  << Q_FUNC_INFO << "Got chart sources list";
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+
+    if ( reply->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        const QVariantMap res = p.parse( reply, &ok ).toMap();
+        const QVariantList sources = res.value( "sources" ).toList();
+
+        if ( !ok )
+        {
+            tLog() << Q_FUNC_INFO << "Failed to parse sources" << p.errorString() << "On line" << p.errorLine();
+            return;
+        }
+
+        m_chartResources.clear();
+        foreach(const QVariant &source, sources) {
+            m_chartResources << source.toString();
+
+        }
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "storing sources in cache" << m_chartResources;
+        TomahawkUtils::Cache::instance()->putData( "ChartsPlugin", 172800000 /* 2 days */, "chart_sources", m_chartResources );
+        if( !reply->property("only_source_list" ).toBool() )
+            fetchAllChartSources();
+    }
+    else
+        tDebug() << Q_FUNC_INFO << "Encountered error fetching chart sources list";
+}
+
+void ChartsPlugin::fetchAllChartSources()
+{
+    if ( !m_chartResources.isEmpty() && m_allChartsMap.isEmpty() )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChart fetching source data";
+        foreach ( QString source, m_chartResources )
+        {
+            QUrl url = QUrl( QString( CHART_URL "charts/%1" ).arg( source ) );
+            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+            reply->setProperty( "chart_source", source);
+
+            tDebug() << Q_FUNC_INFO << "fetching:" << url;
+            connect( reply, SIGNAL( finished() ), SLOT( chartsList() ) );
+
+            m_chartsFetchJobs++;
+        }
+    }
+}
+
+void ChartsPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData, const QString& source, const QString& chart_id)
+{
+    /// Fetch the chart, we need source and id
+    QUrl url = QUrl( QString( CHART_URL "charts/%1/%2" ).arg( source ).arg( chart_id ) );
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "fetching: " << url;
+
+    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+
+    connect( reply, SIGNAL( finished() ), SLOT( chartReturned() ) );
+}
+
+
+
+void
+ChartsPlugin::chartsList()
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Got chart list result";
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+
+    if ( reply->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        const QVariantMap res = p.parse( reply, &ok ).toMap();
+
+        if ( !ok )
+        {
+            tLog() << "Failed to parse resources" << p.errorString() << "On line" << p.errorLine();
+
+            return;
+        }
+
+        /// Got types, append!
+        const QString source = reply->property("chart_source").toString();
+
+        // We'll populate charts with the data from the server
+        QVariantMap charts;
+        QString chartName;
+        QStringList defaultChain;
+        if ( source == "wearehunted" || source == "itunes" )
+        {
+            // Some charts can have an extra param, itunes has geo, WAH has emerging/mainstream
+            // Itunes has geographic-area based charts. So we build a breadcrumb of
+            // ITunes - Country - Albums - Top Chart Type
+            //                  - Tracks - Top Chart Type
+            // WeAreHunted has Mainstream/Emerging
+            // WeAreHunted - Type - Artists - Chart Type
+            //                    - Tracks  - Chart Type
+            QHash< QString, QVariantMap > extraType;
+            foreach( const QVariant& chartObj, res.values() )
+            {
+                if( !chartObj.toMap().isEmpty() )
+                {
+                    const QVariantMap chart = chartObj.toMap();
+                    const QString id = chart.value( "id" ).toString();
+                    const QString geo = chart.value( "geo" ).toString();
+                    QString name = chart.value( "genre" ).toString();
+                    const QString type = chart.value( "type" ).toString();
+                    const bool isDefault = ( chart.contains( "default" ) && chart "default" .toInt() == 1 );
+
+                    QString extra;
+                    if( !geo.isEmpty() )
+                    {
+
+                        if ( !m_cachedCountries.contains( geo ) )
+                        {
+                            QLocale l( QString( "en_%1" ).arg( geo ) );
+                            extra = Tomahawk::CountryUtils::fullCountryFromCode( geo );
+
+                            for ( int i = 1; i < extra.size(); i++ )
+                            {
+                                if ( extra.at( i ).isUpper() )
+                                {
+                                    extra.insert( i, " " );
+                                    i++;
+                                }
+                            }
+                            m_cachedCountries geo  = extra;
+                        }
+                        else
+                            extra = m_cachedCountries geo ;
+                    }
+                    else
+                        extra = chart.value( "extra" ).toString();
+
+                    if ( name.isEmpty() ) // not a specific chart, an all chart
+                        name = tr( "Top Overall" );
+
+                    InfoStringHash c;
+                    c "id"  = id;
+                    c "label"  = name;
+                    c "type"  = "album";
+                    if ( isDefault )
+                        c "default"  = "true";
+
+                    QList< Tomahawk::InfoSystem::InfoStringHash > extraTypeData = extraType extra  type .value< QList< Tomahawk::InfoSystem::InfoStringHash > >();
+                    extraTypeData.append( c );
+                    extraType extra  type  = QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( extraTypeData );
+
+                    if ( isDefault )
+                    {
+                        defaultChain.clear();
+                        defaultChain.append( extra );
+                        defaultChain.append( type );
+                        defaultChain.append( name );
+                    }
+                }
+                foreach( const QString& c, extraType.keys() )
+                {
+                    charts c  = extraType c ;
+//                    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "extraType has types:" << c;
+                }
+                if( source == "itunes" ){
+                    chartName = "iTunes";
+                }
+                if( source == "soundcloudwall" ){
+                    chartName = "SoundCloudWall";
+                }
+                if( source == "wearehunted" ){
+                    chartName = "WeAreHunted";
+                }
+
+            }
+
+        }
+        else
+        {
+            // We'll just build:
+            // Source - Album - Chart Type
+            // Source - Track - Chart Type
+            QList< InfoStringHash > albumCharts;
+            QList< InfoStringHash > trackCharts;
+            QList< InfoStringHash > artistCharts;
+
+            foreach( const QVariant& chartObj, res.values() )
+            {
+                if( !chartObj.toMap().isEmpty() ){
+                    const QVariantMap chart = chartObj.toMap();
+                    const QString type = chart.value( "type" ).toString();
+                    const bool isDefault = ( chart.contains( "default" ) && chart "default" .toInt() == 1 );
+
+                    InfoStringHash c;
+                    c "id"  = chart.value( "id" ).toString();
+                    if( chart.value( "genre").isValid() )
+                        c "label"  = chart.value( "genre" ).toString();
+                    else
+                        c "label"  = chart.value( "name" ).toString();
+                    if ( isDefault )
+                        c "default"  = "true";
+
+                    if ( type == "Album" )
+                    {
+                        c "type"  = "album";
+                        albumCharts.append( c );
+                    }
+                    else if ( type == "Track" )
+                    {
+                        c "type"  = "tracks";
+                        trackCharts.append( c );
+
+                    }else if ( type == "Artist" )
+                    {
+                        c "type"  = "artists";
+                        artistCharts.append( c );
+
+                    }
+
+                    if ( isDefault )
+                    {
+                        defaultChain.clear();
+                        defaultChain.append( type + "s" ); //UGLY but it's plural to the user, see below
+                        defaultChain.append( c "label"  );
+                    }
+                }
+                if( !artistCharts.isEmpty() )
+                    charts.insert( tr( "Artists" ), QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( artistCharts ) );
+                if( !albumCharts.isEmpty() )
+                    charts.insert( tr( "Albums" ), QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( albumCharts ) );
+                if( !trackCharts.isEmpty() )
+                    charts.insert( tr( "Tracks" ), QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( trackCharts ) );
+
+                /// @note For displaying purposes, upper the first letter
+                /// @note Remeber to lower it when fetching this!
+                chartName = source;
+                chartName0 = chartName0.toUpper();
+            }
+        }
+
+        /// Add the possible charts and its types to breadcrumb
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "ADDING CHART TO CHARTS:" << chartName;
+        QVariantMap defaultMap = m_allChartsMap.value( "defaults" ).value< QVariantMap >();
+        defaultMap source  = defaultChain;
+        m_allChartsMap "defaults"  = defaultMap;
+        m_allChartsMap "defaultSource"  = "itunes";
+        m_allChartsMap.insert( chartName , QVariant::fromValue< QVariantMap >( charts ) );
+
+    }
+    else
+    {
+        tLog() << "Error fetching charts:" << reply->errorString();
+    }
+
+    m_chartsFetchJobs--;
+    if ( !m_cachedRequests.isEmpty() && m_chartsFetchJobs == 0 )
+    {
+        foreach ( InfoRequestData request, m_cachedRequests )
+        {
+            emit info( request, m_allChartsMap );
+            // update cache
+            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Updating cache with " << m_allChartsMap.size() << "charts";
+            Tomahawk::InfoSystem::InfoStringHash criteria;
+            criteria "InfoChartCapabilities"  = "chartsplugin";
+            criteria "InfoChartVersion"  = m_chartVersion;
+            emit updateCache( criteria, 864000000, request.type, m_allChartsMap );
+        }
+        m_cachedRequests.clear();
+    }
+
+}
+
+void
+ChartsPlugin::chartReturned()
+{
+
+    /// Chart request returned something! Woho
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    QVariantMap returnedData;
+
+    if ( reply->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        QVariantMap res = p.parse( reply, &ok ).toMap();
+
+        if ( !ok )
+        {
+            tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
+            return;
+        }
+
+        /// SO we have a result, parse it!
+        QVariantList chartResponse = res.value( "list" ).toList();
+        QList< Tomahawk::InfoSystem::InfoStringHash > top_tracks;
+        QList< Tomahawk::InfoSystem::InfoStringHash > top_albums;
+        QStringList top_artists;
+
+        /// Deside what type, we need to handle it differently
+        /// @todo: We allready know the type, append it to breadcrumb hash
+
+        if( res.value( "type" ).toString() == "Album" )
+            setChartType( Album );
+        else if( res.value( "type" ).toString() == "Track" )
+            setChartType( Track );
+        else if( res.value( "type" ).toString() == "Artist" )
+            setChartType( Artist );
+        else
+            setChartType( None );
+
+
+//         qDebug() << "Got chart returned!" << res;
+        foreach ( QVariant chartR, chartResponse )
+        {
+            QString title, artist, album;
+            QVariantMap chartMap = chartR.toMap();
+
+            if ( !chartMap.isEmpty() )
+            {
+
+                title = chartMap.value( "track" ).toString();
+                album = chartMap.value( "album" ).toString();
+                artist = chartMap.value( "artist" ).toString();
+                /// Maybe we can use rank later on, to display something nice
+                /// rank = chartMap.value( "rank" ).toString();
+
+                if ( chartType() == Album )
+                {
+
+                    if ( album.isEmpty() && artist.isEmpty() ) // don't have enough...
+                    {
+                        tDebug( LOGVERBOSE )  << "Didn't get an artist and album name from chart, not enough to build a query on. Aborting" << title << album << artist;
+
+                    }
+                    else
+                    {
+
+                        Tomahawk::InfoSystem::InfoStringHash pair;
+                        pair"artist" = artist;
+                        pair"album" = album;
+                        top_albums.append( pair );
+
+                    }
+                }
+
+                else if ( chartType() == Track )
+                {
+
+                    if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
+                    {
+                        tDebug( LOGVERBOSE )  << "Didn't get an artist and track name from charts, not enough to build a query on. Aborting" << title << artist << album;
+
+                    }
+                    else
+                    {
+
+                        Tomahawk::InfoSystem::InfoStringHash pair;
+                        pair"artist" = artist;
+                        pair"track" = title;
+                        top_tracks.append( pair );
+
+                    }
+                }else if( chartType() == Artist )
+                {
+                    if ( artist.isEmpty() ) // don't have enough...
+                    {
+                        tDebug( LOGVERBOSE )  << "Didn't get an artist from charts, not enough to build a query on. Aborting" << artist;
+
+                    }
+                    else
+                    {
+                        top_artists.append( artist );
+                    }
+
+                }
+            }
+        }
+
+        if( chartType() == Artist )
+        {
+            tDebug() << "ChartsPlugin:" << "\tgot " << top_artists.size() << " artists";
+            returnedData "artists"  = QVariant::fromValue< QStringList >( top_artists );
+            returnedData "type"  = "artists";
+        }
+
+        if( chartType() == Track )
+        {
+            tDebug() << "ChartsPlugin:" << "\tgot " << top_tracks.size() << " tracks";
+            returnedData "tracks"  = QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( top_tracks );
+            returnedData "type"  = "tracks";
+        }
+
+        if( chartType() == Album )
+        {
+            tDebug() << "ChartsPlugin:" << "\tgot " << top_albums.size() << " albums";
+            returnedData "albums"  = QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( top_albums );
+            returnedData "type"  = "albums";
+        }
+
+        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+        emit info( requestData, returnedData );
+        // update cache
+        Tomahawk::InfoSystem::InfoStringHash criteria;
+        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+        criteria "chart_id"  = origData "chart_id" ;
+        criteria "chart_source"  = origData "chart_source" ;
+        emit updateCache( criteria, 86400000, requestData.type, returnedData );
+    }
+    else
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Network error in fetching chart:" << reply->url().toString();
+
+}
+
+}
+
+}
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::ChartsPlugin )
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/charts/ChartsPlugin.h Added

@@ -0,0 +1,117 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 ChartsPlugin_H
+#define ChartsPlugin_H
+
+#include "infoplugins/InfoPluginDllMacro.h"
+#include "infosystem/InfoSystem.h"
+#include "infosystem/InfoSystemWorker.h"
+#include <QNetworkReply>
+#include <QObject>
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT ChartsPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    ChartsPlugin();
+    virtual ~ChartsPlugin();
+
+    enum ChartType {
+        None =      0x00,
+        Track =     0x01,
+        Album =     0x02,
+        Artist =    0x04
+
+    };
+
+    void setChartType( ChartType type ) { m_chartType = type; }
+    ChartType chartType() const { return m_chartType; }
+
+protected slots:
+    virtual void init();
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+    {
+        Q_UNUSED( pushData );
+    }
+
+    /**
+     * Parses a QNetworkReply of a list of chart sources.
+     */
+    void chartSourcesList();
+
+    /**
+     * Parses a QNetworkReply of a list of charts for a particular source
+     */
+    void chartsList();
+
+    /**
+     * Parses a QNetworkReply for the chart data for a particular chart
+     */
+    void chartReturned();
+
+private:
+    /**
+     * Fetch list of chart sources (e.g., itunes, billboard)
+     * Populates the m_chartResources member.
+     */
+    void fetchChartSourcesList( bool fetchOnlySourceList );
+    /**
+     * Requests charts list for each chart source in m_chartResources
+     */
+    void fetchAllChartSources();
+    /**
+     * Fetches a specific chart from a particular source.
+     * Updates the cache.
+     */
+    void fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData, const QString& source, const QString& chart_id );
+
+    void fetchChartFromCache( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void fetchChartCapabilitiesFromCache( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void dataError( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    QStringList m_chartResources;
+    QString m_chartVersion;
+    QList< InfoStringHash > m_charts;
+    ChartType m_chartType;
+    QVariantMap m_allChartsMap;
+    uint m_chartsFetchJobs;
+    QList< InfoRequestData > m_cachedRequests;
+    QHash< QString, QString > m_cachedCountries;
+    QWeakPointer< QNetworkAccessManager > m_nam;
+};
+
+}
+
+}
+
+#endif // ChartsPlugin_H

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/discogs Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/discogs/DiscogsPlugin.cpp Added

@@ -0,0 +1,189 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012 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 "DiscogsPlugin.h"
+
+#include <QNetworkReply>
+#include <QDomDocument>
+#include <QtPlugin>
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "utils/Closure.h"
+#include <parser.h>
+
+using namespace Tomahawk::InfoSystem;
+
+
+DiscogsPlugin::DiscogsPlugin()
+    : InfoPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+    m_supportedGetTypes << Tomahawk::InfoSystem::InfoAlbumSongs;
+}
+
+
+DiscogsPlugin::~DiscogsPlugin() {}
+
+
+void
+DiscogsPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "artist" ) || !hash.contains( "album" ) )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    switch ( requestData.type )
+    {
+        case InfoAlbumSongs:
+        {
+
+            Tomahawk::InfoSystem::InfoStringHash criteria;
+            criteria"artist" = hash"artist";
+            criteria"album" = hash"album";
+
+            emit getCachedInfo( criteria, 2419200000, requestData );
+
+            break;
+        }
+
+        default:
+        {
+            Q_ASSERT( false );
+            break;
+        }
+    }
+}
+
+
+void
+DiscogsPlugin::notInCacheSlot( InfoStringHash criteria, InfoRequestData requestData )
+{
+    switch ( requestData.type )
+    {
+        case InfoAlbumSongs:
+        {
+            QString requestString( "http://api.discogs.com/database/search" );
+            QUrl url( requestString );
+            url.addQueryItem( "type", "release" );
+            url.addQueryItem( "release_title", criteria "album"  );
+            url.addQueryItem( "artist", criteria "artist"  );
+            QNetworkRequest req( url );
+            req.setRawHeader( "User-Agent", "TomahawkPlayer/1.0 +http://tomahawk-player.org" );
+            QNetworkReply* reply = TomahawkUtils::nam()->get( req );
+
+            NewClosure( reply, SIGNAL( finished() ),  this, SLOT( albumSearchSlot( Tomahawk::InfoSystem::InfoRequestData, QNetworkReply* ) ), requestData, reply );
+            break;
+        }
+
+        default:
+        {
+            Q_ASSERT( false );
+            break;
+        }
+    }
+}
+
+
+void
+DiscogsPlugin::albumSearchSlot( const InfoRequestData &requestData, QNetworkReply *reply )
+{
+    QJson::Parser p;
+    QVariantMap results = p.parse( reply ).toMap();
+
+    if ( !results.contains( "results" ) || results.value( "results" ).toList().isEmpty() )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    const QVariantMap result = results.value( "results" ).toList().first().toMap();
+    if ( !result.contains( "id" ) )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    const int id = result.value( "id" ).toInt();
+    QUrl url( QString( "http://api.discogs.com/release/%1" ).arg( id ) );
+    QNetworkRequest req( url );
+    req.setRawHeader( "User-Agent", "TomahawkPlayer/1.0 +http://tomahawk-player.org" );
+
+    QNetworkReply* reply2 = TomahawkUtils::nam()->get( req );
+    NewClosure( reply2, SIGNAL( finished() ),  this, SLOT( albumInfoSlot( Tomahawk::InfoSystem::InfoRequestData, QNetworkReply* ) ), requestData, reply2 );
+}
+
+
+void
+DiscogsPlugin::albumInfoSlot( const InfoRequestData& requestData, QNetworkReply* reply )
+{
+    QJson::Parser p;
+    QVariantMap results = p.parse( reply ).toMap();
+
+    if ( !results.contains( "resp" ) )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    const QVariantMap resp = results "resp" .toMap();
+    if ( !resp.contains( "release" ) )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    const QVariantMap release = resp "release" .toMap();
+    if ( !release.contains( "tracklist" ) || release "tracklist" .toList().isEmpty() )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    QStringList trackNameList;
+    foreach ( const QVariant& v, release "tracklist" .toList() )
+    {
+        const QVariantMap track = v.toMap();
+        if ( track.contains( "title" ) )
+            trackNameList << track "title" .toString();
+    }
+
+    QVariantMap returnedData;
+    returnedData"tracks" = trackNameList;
+
+    emit info( requestData, returnedData );
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()"artist";
+    criteria"album" = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()"album";
+
+    emit updateCache( criteria, 0, requestData.type, returnedData );
+}
+
+
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::DiscogsPlugin )

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/discogs/DiscogsPlugin.h Added

@@ -0,0 +1,63 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012 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 DISCOGS_PLUGIN_H
+#define DISCOGS_PLUGIN_H
+
+#include "Typedefs.h"
+#include "infosystem/InfoSystem.h"
+#include "infosystem/InfoSystemWorker.h"
+#include "infoplugins/InfoPluginDllMacro.h"
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT DiscogsPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    DiscogsPlugin();
+    virtual ~DiscogsPlugin();
+
+protected slots:
+    virtual void init() {}
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void notInCacheSlot( InfoStringHash criteria, InfoRequestData requestData );
+
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData ) {}
+private slots:
+    void albumSearchSlot( const Tomahawk::InfoSystem::InfoRequestData& , QNetworkReply* );
+    void albumInfoSlot( const Tomahawk::InfoSystem::InfoRequestData& , QNetworkReply* );
+
+private:
+    bool isValidTrackData( Tomahawk::InfoSystem::InfoRequestData requestData );
+};
+
+}
+
+}
+
+Q_DECLARE_METATYPE( QNetworkReply* )
+#endif

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/echonest Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/echonest/EchonestPlugin.cpp Added

@@ -0,0 +1,310 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "EchonestPlugin.h"
+#include <echonest/ArtistTypes.h>
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+#include <QNetworkConfiguration>
+#include <QtPlugin>
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+// for internal neatness
+
+EchonestPlugin::EchonestPlugin()
+    : InfoPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+    m_supportedGetTypes << Tomahawk::InfoSystem::InfoArtistBiography << Tomahawk::InfoSystem::InfoArtistFamiliarity << Tomahawk::InfoSystem::InfoArtistHotttness << Tomahawk::InfoSystem::InfoArtistTerms << Tomahawk::InfoSystem::InfoMiscTopTerms;
+}
+
+
+EchonestPlugin::~EchonestPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+EchonestPlugin::init()
+{
+    Echonest::Config::instance()->setNetworkAccessManager( TomahawkUtils::nam() );
+}
+
+
+void
+EchonestPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    switch ( requestData.type )
+    {
+        case Tomahawk::InfoSystem::InfoArtistBiography:
+            return getArtistBiography( requestData );
+        case Tomahawk::InfoSystem::InfoArtistFamiliarity:
+            return getArtistFamiliarity( requestData );
+        case Tomahawk::InfoSystem::InfoArtistHotttness:
+            return getArtistHotttnesss( requestData );
+        case Tomahawk::InfoSystem::InfoArtistTerms:
+            return getArtistTerms( requestData );
+        case Tomahawk::InfoSystem::InfoTrackEnergy:
+            return getSongProfile( requestData, "energy" );
+        case Tomahawk::InfoSystem::InfoMiscTopTerms:
+            return getMiscTopTerms( requestData );
+        default:
+        {
+            emit info( requestData, QVariant() );
+            return;
+        }
+    }
+}
+
+
+void
+EchonestPlugin::getSongProfile( const Tomahawk::InfoSystem::InfoRequestData &requestData, const QString &item )
+{
+    //WARNING: Totally not implemented yet
+    Q_UNUSED( item );
+
+    if( !isValidTrackData( requestData ) )
+        return;
+
+//     Track track( input.toString() );
+//     Artist artist( customData.input()->property("artistName").toString() );
+//     reply->setProperty("artist", QVariant::fromValue<Artist>(artist));
+//     reply->setProperty( "input", input );
+//     m_replyMapreply = customData;
+//     connect(reply, SIGNAL(finished()), SLOT(getArtistBiographySlot()));
+}
+
+
+void
+EchonestPlugin::getArtistBiography( const Tomahawk::InfoSystem::InfoRequestData &requestData )
+{
+    if( !isValidArtistData( requestData ) )
+        return;
+
+    Echonest::Artist artist( requestData.input.toString() );
+    QNetworkReply *reply = artist.fetchBiographies();
+    reply->setProperty( "artist", QVariant::fromValue< Echonest::Artist >( artist ) );
+    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+    connect( reply, SIGNAL( finished() ), SLOT( getArtistBiographySlot() ) );
+}
+
+
+void
+EchonestPlugin::getArtistFamiliarity( const Tomahawk::InfoSystem::InfoRequestData &requestData )
+{
+    if( !isValidArtistData( requestData ) )
+        return;
+
+    qDebug() << "Fetching artist familiarity!" << requestData.input;
+    Echonest::Artist artist( requestData.input.toString() );
+    QNetworkReply* reply = artist.fetchFamiliarity();
+    reply->setProperty( "artist", QVariant::fromValue< Echonest::Artist >( artist ) );
+    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+    connect( reply, SIGNAL( finished() ), SLOT( getArtistFamiliaritySlot() ) );
+}
+
+
+void
+EchonestPlugin::getArtistHotttnesss( const Tomahawk::InfoSystem::InfoRequestData &requestData )
+{
+    if( !isValidArtistData( requestData ) )
+        return;
+
+    Echonest::Artist artist( requestData.input.toString() );
+    QNetworkReply* reply = artist.fetchHotttnesss();
+    reply->setProperty( "artist", QVariant::fromValue< Echonest::Artist >( artist ) );
+    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+    connect( reply, SIGNAL( finished() ), SLOT( getArtistHotttnesssSlot() ) );
+}
+
+
+void
+EchonestPlugin::getArtistTerms( const Tomahawk::InfoSystem::InfoRequestData &requestData )
+{
+    if( !isValidArtistData( requestData ) )
+        return;
+
+    Echonest::Artist artist( requestData.input.toString() );
+    QNetworkReply* reply = artist.fetchTerms( Echonest::Artist::Weight );
+    reply->setProperty( "artist", QVariant::fromValue< Echonest::Artist >( artist ) );
+    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+    connect( reply, SIGNAL( finished() ), SLOT( getArtistTermsSlot() ) );
+}
+
+
+void
+EchonestPlugin::getMiscTopTerms( const Tomahawk::InfoSystem::InfoRequestData &requestData )
+{
+    QNetworkReply* reply = Echonest::Artist::topTerms( 20 );
+    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+    connect( reply, SIGNAL( finished() ), SLOT( getMiscTopSlot() ) );
+}
+
+
+void
+EchonestPlugin::getArtistBiographySlot()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    Echonest::Artist artist = artistFromReply( reply );
+    Echonest::BiographyList biographies = artist.biographies();
+    QVariantMap biographyMap;
+    Q_FOREACH( const Echonest::Biography& biography, biographies )
+    {
+        QVariantHash siteData;
+        siteData "site"  = biography.site();
+        siteData "url"  = biography.url().toString();
+        siteData "text"  = biography.text();
+        siteData "attribution"  = biography.license().attribution;
+        siteData "licensetype"  = biography.license().type;
+        siteData "attribution"  = biography.license().url.toString();
+        biographyMap biography.site()  = siteData;
+    }
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+    emit info( requestData, biographyMap );
+    reply->deleteLater();
+}
+
+
+void
+EchonestPlugin::getArtistFamiliaritySlot()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    Echonest::Artist artist = artistFromReply( reply );
+    qreal familiarity = artist.familiarity();
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+    emit info( requestData, familiarity );
+    reply->deleteLater();
+}
+
+
+void
+EchonestPlugin::getArtistHotttnesssSlot()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    Echonest::Artist artist = artistFromReply( reply );
+    qreal hotttnesss = artist.hotttnesss();
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+    emit info( requestData, hotttnesss );
+    reply->deleteLater();
+}
+
+
+void
+EchonestPlugin::getArtistTermsSlot()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    Echonest::Artist artist = artistFromReply( reply );
+    Echonest::TermList terms = artist.terms();
+    QVariantMap termsMap;
+    Q_FOREACH( const Echonest::Term& term, terms ) {
+        QVariantHash termHash;
+        termHash "weight"  = QString::number( term.weight() );
+        termHash "frequency"  = QString::number( term.frequency() );
+        termsMap term.name()  = termHash;
+    }
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+    emit info( requestData, termsMap );
+    reply->deleteLater();
+}
+
+
+void
+EchonestPlugin::getMiscTopSlot()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    Echonest::TermList terms = Echonest::Artist::parseTopTerms( reply );
+    QVariantMap termsMap;
+    Q_FOREACH( const Echonest::Term& term, terms ) {
+        QVariantHash termHash;
+        termHash "weight"  = QString::number( term.weight() );
+        termHash "frequency"  = QString::number( term.frequency() );
+        termsMap term.name()  = termHash;
+    }
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+    emit info( requestData, termsMap );
+    reply->deleteLater();
+}
+
+
+bool
+EchonestPlugin::isValidArtistData( const Tomahawk::InfoSystem::InfoRequestData &requestData )
+{
+    if ( requestData.input.isNull() || !requestData.input.isValid() || !requestData.input.canConvert< QString >() )
+    {
+        emit info( requestData, QVariant() );
+        return false;
+    }
+    QString artistName = requestData.input.toString();
+    if ( artistName.isEmpty() )
+    {
+        emit info( requestData, QVariant() );
+        return false;
+    }
+    return true;
+}
+
+
+bool
+EchonestPlugin::isValidTrackData( const Tomahawk::InfoSystem::InfoRequestData &requestData )
+{
+    if ( requestData.input.isNull() || !requestData.input.isValid() || !requestData.input.canConvert< QString >() )
+    {
+        emit info( requestData, QVariant() );
+        return false;
+    }
+    QString trackName = requestData.input.toString();
+    if ( trackName.isEmpty() )
+    {
+        emit info( requestData, QVariant() );
+        return false;
+    }
+    if ( !requestData.customData.contains( "artistName" ) || requestData.customData "artistName" .toString().isEmpty() )
+    {
+        emit info( requestData, QVariant() );
+        return false;
+    }
+    return true;
+}
+
+
+Echonest::Artist
+EchonestPlugin::artistFromReply( QNetworkReply* reply )
+{
+    Echonest::Artist artist = reply->property("artist").value<Echonest::Artist>();
+    try {
+        artist.parseProfile( reply );
+    } catch( const Echonest::ParseError& e ) {
+        qWarning() << "Caught parser error from echonest!" << e.what();
+    }
+    return artist;
+}
+
+} //ns InfoSystem
+
+} //ns Tomahawk
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::EchonestPlugin )
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/echonest/EchonestPlugin.h Added

@@ -0,0 +1,87 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 ECHONESTPLUGIN_H
+#define ECHONESTPLUGIN_H
+
+#include "infoplugins/InfoPluginDllMacro.h"
+#include "infosystem/InfoSystem.h"
+#include "infosystem/InfoSystemWorker.h"
+#include "echonest/Artist.h"
+
+#include <QObject>
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT EchonestPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    EchonestPlugin();
+    virtual ~EchonestPlugin();
+
+protected slots:
+    virtual void init();
+    
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+    {
+        Q_UNUSED( pushData );
+    }
+
+    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+    {
+        Q_UNUSED( criteria );
+        Q_UNUSED( requestData );
+    }
+
+private:
+    void getSongProfile( const Tomahawk::InfoSystem::InfoRequestData &requestData, const QString &item = QString() );
+    void getArtistBiography( const Tomahawk::InfoSystem::InfoRequestData &requestData );
+    void getArtistFamiliarity( const Tomahawk::InfoSystem::InfoRequestData &requestData );
+    void getArtistHotttnesss( const Tomahawk::InfoSystem::InfoRequestData &requestData );
+    void getArtistTerms( const Tomahawk::InfoSystem::InfoRequestData &requestData );
+    void getMiscTopTerms( const Tomahawk::InfoSystem::InfoRequestData &requestData );
+
+    bool isValidArtistData( const Tomahawk::InfoSystem::InfoRequestData &requestData );
+    bool isValidTrackData( const Tomahawk::InfoSystem::InfoRequestData &requestData );
+    Echonest::Artist artistFromReply( QNetworkReply* );
+
+private slots:
+    void getArtistBiographySlot();
+    void getArtistFamiliaritySlot();
+    void getArtistHotttnesssSlot();
+    void getArtistTermsSlot();
+    void getMiscTopSlot();
+};
+
+}
+
+}
+
+#endif // ECHONESTPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/hypem Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/hypem/CMakeLists.txt Added

@@ -0,0 +1,43 @@
+project( tomahawk )
+
+include( ${QT_USE_FILE} )
+add_definitions( ${QT_DEFINITIONS} )
+add_definitions( -DQT_PLUGIN )
+add_definitions( -DQT_SHARED )
+add_definitions( -DINFOPLUGINDLLEXPORT_PRO )
+
+set( hypemInfoPluginSources
+    HypemPlugin.cpp
+)
+
+set( hypemInfoPluginHeaders
+    HypemPlugin.h
+)
+
+include_directories(
+   ${QT_INCLUDE_DIR}
+)
+
+qt4_wrap_cpp( hypemInfoPluginMoc ${hypemInfoPluginHeaders} )
+add_library( tomahawk_infoplugin_hypem SHARED ${hypemInfoPluginSources} ${hypemInfoPluginMoc} ${RC_SRCS} )
+
+IF( WIN32 )
+SET( OS_SPECIFIC_LINK_LIBRARIES
+        ${OS_SPECIFIC_LINK_LIBRARIES}
+        "winmm.dll"
+        "iphlpapi.a"
+)
+ENDIF( WIN32 )
+
+target_link_libraries( tomahawk_infoplugin_hypem
+    ${TOMAHAWK_LIBRARIES}
+    ${QT_LIBRARIES}
+    ${OS_SPECIFIC_LINK_LIBRARIES}
+)
+
+IF( APPLE )
+#  SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
+ENDIF( APPLE )
+
+install( TARGETS tomahawk_infoplugin_hypem DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/hypem/HypemPlugin.cpp Added

@@ -0,0 +1,408 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "HypemPlugin.h"
+
+#include <QDir>
+#include <QSettings>
+#include <QCryptographicHash>
+#include <QNetworkConfiguration>
+#include <QNetworkReply>
+#include <QtPlugin>
+
+#include "Album.h"
+#include "Typedefs.h"
+#include "TomahawkSettings.h"
+#include "utils/TomahawkUtils.h"
+#include "infosystem/InfoSystemWorker.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+#define HYPEM_URL "http://hypem.com/playlist/"
+#define HYPEM_END_URL "json/1/data.js"
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+
+HypemPlugin::HypemPlugin()
+    : InfoPlugin()
+    , m_chartsFetchJobs( 0 )
+{
+
+    m_supportedGetTypes << InfoChart << InfoChartCapabilities;
+    m_types << "Artists" << "Tracks" << "Recent by Tag";
+
+    m_trackTypes    << "Last 3 Days"
+                    << "Last Week"
+                    << "No Remixes"
+                    << "On Twitter";
+
+    m_byTagTypes    << "Dance"
+                    << "Experimental"
+                    << "Electronic"
+                    << "Funk"
+                    << "Hip-hop"
+                    << "Indie"
+                    << "Instrumental"
+                    << "Post-punk"
+                    << "Rock"
+                    << "Singer-songwriter"
+                    << "Alternative"
+                    << "Pop"
+                    << "Female"
+                    << "Vocalist"
+                    << "Folk"
+                    << "Electro"
+                    << "Lo-fi"
+                    << "Psychedelic"
+                    << "Rap"
+                    << "British"
+                    << "Ambient"
+                    << "Dubstep"
+                    << "House"
+                    << "Chillwave"
+                    << "Dreampop"
+                    << "Shoegaze"
+                    << "Chillout"
+                    << "Soul"
+                    << "French"
+                    << "Acoustic"
+                    << "Canadian"
+                    << "60s"
+                    << "80s"
+                    << "Techno"
+                    << "Punk"
+                    << "New wave";
+}
+
+
+
+
+HypemPlugin::~HypemPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+HypemPlugin::init()
+{
+    chartTypes();
+}
+
+
+void
+HypemPlugin::dataError( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    emit info( requestData, QVariant() );
+    return;
+}
+
+
+void
+HypemPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    qDebug() << Q_FUNC_INFO << requestData.caller;
+    qDebug() << Q_FUNC_INFO << requestData.customData;
+
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+
+
+    switch ( requestData.type )
+    {
+
+        case InfoChart:
+            if ( !hash.contains( "chart_source" ) || hash"chart_source".toLower() != "hype machine" )
+            {
+                dataError( requestData );
+                break;
+            }
+            qDebug() << Q_FUNC_INFO << "InfoCHart req for" << hash"chart_source";
+            fetchChart( requestData );
+            break;
+
+        case InfoChartCapabilities:
+            fetchChartCapabilities( requestData );
+            break;
+        default:
+            dataError( requestData );
+    }
+}
+
+void
+HypemPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+
+    /// Each request needs to contain both a id and source
+    if ( !hash.contains( "chart_id" ) && !hash.contains( "chart_source" ) )
+    {
+        dataError( requestData );
+        return;
+
+    }
+    /// Set the criterias for current chart
+    criteria"chart_id" = hash"chart_id";
+    criteria"chart_source" = hash"chart_source";
+    /// @todo
+    /// set cache time based on wether requested type is 3day, lastweek or recent.
+    emit getCachedInfo( criteria, 86400000, requestData );
+}
+
+void
+HypemPlugin::fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    emit getCachedInfo( criteria, 0, requestData );
+}
+
+void
+HypemPlugin::notInCacheSlot( QHash<QString, QString> criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    tDebug( LOGVERBOSE ) << "HypemPlugin thread: " << QThread::currentThread() << ", InfoSystemWorker thread: " << Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data()->currentThread();
+    switch ( requestData.type )
+    {
+        case InfoChart:
+        {
+            /// Fetch the chart, we need source and id
+            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChart not in cache! Fetching...";
+            QUrl url = QUrl( QString( HYPEM_URL "%1/%2" ).arg( criteria"chart_id".toLower() ).arg(HYPEM_END_URL) );
+            qDebug() << Q_FUNC_INFO << "Getting chart url" << url;
+
+            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+            connect( reply, SIGNAL( finished() ), SLOT( chartReturned() ) );
+            return;
+
+
+        }
+
+        case InfoChartCapabilities:
+        {
+            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChartCapabilities not in cache! Fetching...";
+            if ( m_chartsFetchJobs > 0 )
+            {
+                qDebug() << Q_FUNC_INFO << "InfoChartCapabilities still fetching!";
+                m_cachedRequests.append( requestData );
+                return;
+            }
+
+            emit info( requestData, m_allChartsMap );
+            return;
+        }
+
+        default:
+        {
+            tLog() << Q_FUNC_INFO << "Couldn't figure out what to do with this type of request after cache miss";
+            emit info( requestData, QVariant() );
+            return;
+        }
+    }
+}
+
+
+void
+HypemPlugin::chartTypes()
+{
+    /// Get possible chart type for specificHypemPlugin: InfoChart types returned chart source
+    tDebug() << Q_FUNC_INFO << "Got hypem types";
+
+    QVariantMap charts;
+
+    foreach(QVariant types, m_types )
+    {
+        QList< InfoStringHash > chart_types;
+        QList< InfoStringHash > pop_charts;
+        InfoStringHash c;
+
+        if(types.toString() != "Artists")
+        {
+
+            if(types.toString() == "Tracks")
+            {
+
+                foreach(QVariant trackType, m_trackTypes)
+                {
+                    QString typeId;
+                    if(trackType.toString() == "Last 3 Days")
+                        typeId = "popular/3day";
+
+                    if(trackType.toString() == "Last Week")
+                        typeId = "popular/lastweek";
+
+                    if(trackType.toString() == "No Remixes")
+                        typeId = "popular/noremix";
+
+                    if(trackType.toString() == "On Twitter")
+                        typeId = "popular/twitter";
+
+                    c "id"  = typeId;
+                    c "label"  = trackType.toString();
+                    c "type"  = "tracks";
+                    pop_charts.append( c );
+                }
+
+                chart_types.append( pop_charts );
+
+            }
+            else if(types.toString() == "Recent by Tag")
+            {
+                foreach(QVariant tagTypes, m_byTagTypes)
+                {
+
+                    c "id"  = "tags/" + tagTypes.toString().toLower();
+                    c "label"  = tagTypes.toString();
+                    c "type"  = tagTypes.toString();
+                    chart_types.append( c );
+                }
+
+            }
+
+        }else
+        {
+            InfoStringHash c;
+            c "id"  = "popular/artists";
+            c "label"  = "Most Recent";
+            c "type"  = "artists";
+            chart_types.append( c );
+        }
+
+        charts.insert( types.toString(), QVariant::fromValue<QList< InfoStringHash > >( chart_types ) );
+    }
+
+
+    m_allChartsMap.insert( "Hype Machine", QVariant::fromValue<QVariantMap>( charts ) );
+    qDebug() << "HypemPlugin:Chartstype: " << m_allChartsMap;
+
+
+}
+
+void
+HypemPlugin::chartReturned()
+{
+
+    /// Chart request returned something! Woho
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    QString url = reply->url().toString();
+    QVariantMap returnedData;
+    if ( reply->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        QVariantMap res = p.parse( reply, &ok ).toMap();
+
+        if ( !ok )
+        {
+            tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
+            return;
+        }
+
+        /// SO we have a result, parse it!
+        QList< InfoStringHash > top_tracks;
+        QStringList top_artists;
+
+        if ( url.contains( "artists" ) )
+            setChartType( Artist );
+        else
+            setChartType( Track );
+
+        foreach ( QVariant result, res )
+        {
+            QString title, artist;
+            QVariantMap chartMap = result.toMap();
+
+            if ( !chartMap.isEmpty() )
+            {
+
+                title = chartMap.value( "title" ).toString();
+                artist = chartMap.value( "artist" ).toString();
+
+                if ( chartType() == Track )
+                {
+                    InfoStringHash pair;
+                    pair"artist" = artist;
+                    pair"track" = title;
+                    top_tracks << pair;
+                }
+
+
+                if ( chartType() == Artist )
+                    top_artists << artist;
+            }
+        }
+
+        if ( chartType() == Track )
+        {
+            tDebug() << "HypemPlugin:" << "\tgot " << top_tracks.size() << " tracks";
+            returnedData"tracks" = QVariant::fromValue( top_tracks );
+            returnedData"type" = "tracks";
+        }
+
+
+
+        if ( chartType() == Artist )
+        {
+            tDebug() << "HypemPlugin:" << "\tgot " << top_artists.size() << " artists";
+            returnedData"artists" = top_artists;
+            returnedData"type" = "artists";
+        }
+
+        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+
+        emit info( requestData, returnedData );
+        // update cache
+        Tomahawk::InfoSystem::InfoStringHash criteria;
+        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+        criteria "chart_id"  = origData "chart_id" ;
+        criteria "chart_source"  = origData "chart_source" ;
+        /// @todo
+        /// set cache time based on wether requested type is 3day, lastweek or recent.
+        emit updateCache( criteria, 86400000, requestData.type, returnedData );
+    }
+    else
+        qDebug() << "Network error in fetching chart:" << reply->url().toString();
+
+}
+
+}
+
+}
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::HypemPlugin )
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/hypem/HypemPlugin.h Added

@@ -0,0 +1,97 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 HYPEMPLUGIN_H
+#define HYPEMPLUGIN_H
+
+#include "infoplugins/InfoPluginDllMacro.h"
+#include "infosystem/InfoSystem.h"
+#include "infosystem/InfoSystemWorker.h"
+#include <QNetworkReply>
+#include <QObject>
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT HypemPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    HypemPlugin();
+    virtual ~HypemPlugin();
+
+    enum ChartType {
+        None =      0x00,
+        Track =     0x01,
+        Album =     0x02,
+        Artist =    0x04
+
+    };
+    void setChartType( ChartType type ) { m_chartType = type; }
+    ChartType chartType() const { return m_chartType; }
+
+public slots:
+    void chartReturned();
+    void chartTypes();
+
+protected slots:
+    virtual void init();
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+    {
+        Q_UNUSED( pushData );
+    }
+
+
+private:
+    void fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void dataError( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    QVariantList m_chartResources;
+    QList<InfoStringHash> m_charts;
+
+
+    ChartType m_chartType;
+    QVariantMap m_allChartsMap;
+    QVariantList m_types;
+    QVariantList m_popularTypes;
+    QVariantList m_trackTypes;
+    QVariantList m_byTagTypes;
+
+
+    uint m_chartsFetchJobs;
+    QList< InfoRequestData > m_cachedRequests;
+
+    QHash< QString, QString > m_cachedCountries;
+};
+
+}
+
+}
+
+#endif // HYPEMPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/musicbrainz Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.cpp Added

@@ -0,0 +1,308 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "MusicBrainzPlugin.h"
+
+#include <QNetworkReply>
+#include <QDomDocument>
+#include <QtPlugin>
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk::InfoSystem;
+
+
+MusicBrainzPlugin::MusicBrainzPlugin()
+    : InfoPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+    m_supportedGetTypes << Tomahawk::InfoSystem::InfoArtistReleases << Tomahawk::InfoSystem::InfoAlbumSongs;
+}
+
+
+MusicBrainzPlugin::~MusicBrainzPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+MusicBrainzPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "artist" ) )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    switch ( requestData.type )
+    {
+        case InfoArtistReleases:
+        {
+
+            Tomahawk::InfoSystem::InfoStringHash criteria;
+            criteria"artist" = hash"artist";
+
+            emit getCachedInfo( criteria, 2419200000, requestData );
+            break;
+        }
+
+        case InfoAlbumSongs:
+        {
+
+            Tomahawk::InfoSystem::InfoStringHash criteria;
+            criteria"artist" = hash"artist";
+            criteria"album" = hash"album";
+
+            emit getCachedInfo( criteria, 2419200000, requestData );
+
+            break;
+        }
+
+        default:
+        {
+            Q_ASSERT( false );
+            break;
+        }
+    }
+}
+
+
+void
+MusicBrainzPlugin::notInCacheSlot( InfoStringHash criteria, InfoRequestData requestData )
+{
+    switch ( requestData.type )
+    {
+        case InfoArtistReleases:
+        {
+            QString requestString( "http://musicbrainz.org/ws/2/artist" );
+            QUrl url( requestString );
+            url.addQueryItem( "query", criteria"artist" );
+            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+
+            connect( reply, SIGNAL( finished() ), SLOT( artistSearchSlot() ) );
+            break;
+        }
+
+        case InfoAlbumSongs:
+        {
+            QString requestString( "http://musicbrainz.org/ws/2/artist" );
+            QUrl url( requestString );
+            url.addQueryItem( "query", criteria"artist" );
+            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+
+            connect( reply, SIGNAL( finished() ), SLOT( albumSearchSlot() ) );
+            break;
+        }
+
+        default:
+        {
+            Q_ASSERT( false );
+            break;
+        }
+    }
+}
+
+
+void
+MusicBrainzPlugin::artistSearchSlot()
+{
+    QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
+    if ( !oldReply )
+        return; //timeout will handle it
+
+    QDomDocument doc;
+    doc.setContent( oldReply->readAll() );
+    QDomNodeList domNodeList = doc.elementsByTagName( "artist" );
+    if ( domNodeList.isEmpty() )
+    {
+        emit info( oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+        tDebug() << Q_FUNC_INFO << doc.toString();
+        return;
+    }
+
+    QString artist_id = domNodeList.at( 0 ).toElement().attribute( "id" );
+    QString requestString( "http://musicbrainz.org/ws/2/release?status=official&type=album|ep" );
+    QUrl url( requestString );
+    url.addQueryItem( "artist", artist_id );
+
+    QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    newReply->setProperty( "requestData", oldReply->property( "requestData" ) );
+    connect( newReply, SIGNAL( finished() ), SLOT( albumFoundSlot() ) );
+}
+
+
+void
+MusicBrainzPlugin::albumSearchSlot()
+{
+    QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
+    if ( !oldReply )
+        return; //timeout will handle it
+
+    QDomDocument doc;
+    doc.setContent( oldReply->readAll() );
+    QDomNodeList domNodeList = doc.elementsByTagName( "artist" );
+    if ( domNodeList.isEmpty() )
+    {
+        emit info( oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+        return;
+    }
+
+    QString artist_id = domNodeList.at( 0 ).toElement().attribute( "id" );
+    QString requestString( "http://musicbrainz.org/ws/2/release?status=official&type=album|ep" );
+    QUrl url( requestString );
+    url.addQueryItem( "artist", artist_id );
+
+    QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    newReply->setProperty( "requestData", oldReply->property( "requestData" ) );
+    connect( newReply, SIGNAL( finished() ), SLOT( tracksSearchSlot() ) );
+}
+
+
+void
+MusicBrainzPlugin::tracksSearchSlot()
+{
+    QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
+    if ( !oldReply )
+        return; //timeout will handle it
+
+    QDomDocument doc;
+    doc.setContent( oldReply->readAll() );
+    QDomNodeList domNodeList = doc.elementsByTagName( "release" );
+    if ( domNodeList.isEmpty() )
+    {
+        emit info( oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoRequestData requestData = oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+
+    QDomElement element;
+    for ( int i = 0; i < domNodeList.count(); i++ )
+    {
+        QDomNodeList albumNodeList = domNodeList.at( i ).toElement().elementsByTagName( "title" );
+        if ( albumNodeList.at( 0 ).toElement().text() == hash"album" )
+            element = domNodeList.at( i ).toElement();
+    }
+
+    if ( element.isNull() )
+    {
+        emit info( oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+        return;
+    }
+
+    QString release_id = element.attribute( "id" );
+    QString requestString = QString( "http://musicbrainz.org/ws/2/release/%1?inc=recordings" ).arg( release_id );
+    QUrl url( requestString );
+
+    QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    newReply->setProperty( "requestData", oldReply->property( "requestData" ) );
+    connect( newReply, SIGNAL( finished() ), SLOT( tracksFoundSlot() ) );
+}
+
+
+void
+MusicBrainzPlugin::albumFoundSlot()
+{
+    QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
+    if ( !reply )
+        return; //timeout will handle it
+
+    QDomDocument doc;
+    doc.setContent( reply->readAll() );
+    QDomNodeList domNodeList = doc.elementsByTagName( "title" );
+    if ( domNodeList.isEmpty() )
+    {
+        emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+        return;
+    }
+
+    QStringList albums;
+    for ( int i = 0; i < domNodeList.count(); i++ )
+    {
+        QString album = domNodeList.at( i ).toElement().text();
+        if ( !albums.contains( album ) )
+            albums << album;
+    }
+
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+    QVariantMap returnedData;
+    returnedData"albums" = albums;
+    emit info( requestData, returnedData );
+
+    Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = origData"artist";
+    emit updateCache( criteria, 0, requestData.type, returnedData );
+}
+
+
+void
+MusicBrainzPlugin::tracksFoundSlot()
+{
+    QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
+    if ( !reply )
+        return; //timeout will handle it
+
+    QDomDocument doc;
+    doc.setContent( reply->readAll() );
+    QDomNodeList domNodeList = doc.elementsByTagName( "recording" );
+    if ( domNodeList.isEmpty() )
+    {
+        emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+        return;
+    }
+
+    QStringList tracks;
+    for ( int i = 0; i < domNodeList.count(); i++ )
+    {
+        QDomNodeList trackNodeList = domNodeList.at( i ).toElement().elementsByTagName( "title" );
+
+        for ( int j = 0; j < trackNodeList.count(); j++ )
+        {
+            QString track = trackNodeList.at( j ).toElement().text();
+            if ( !tracks.contains( track ) )
+                tracks << track;
+        }
+    }
+
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+    QVariantMap returnedData;
+    returnedData"tracks" = tracks;
+    emit info( requestData, returnedData );
+
+    Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = origData"artist";
+    criteria"album" = origData"album";
+    emit updateCache( criteria, 0, requestData.type, returnedData );
+}
+
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::MusicBrainzPlugin )

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/musicbrainz/MusicBrainzPlugin.h Added

@@ -0,0 +1,68 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 MUSICBRAINZPLUGIN_H
+#define MUSICBRAINZPLUGIN_H
+
+#include "infosystem/InfoSystem.h"
+#include "infosystem/InfoSystemWorker.h"
+#include "infoplugins/InfoPluginDllMacro.h"
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT MusicBrainzPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    MusicBrainzPlugin();
+    virtual ~MusicBrainzPlugin();
+
+protected slots:
+    virtual void init() {}
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void notInCacheSlot( InfoStringHash criteria, InfoRequestData requestData );
+
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+    {
+        Q_UNUSED( pushData );
+    }
+
+
+private slots:
+    void artistSearchSlot();
+    void albumSearchSlot();
+    void tracksSearchSlot();
+
+    void albumFoundSlot();
+    void tracksFoundSlot();
+};
+
+}
+
+}
+
+#endif // MUSICBRAINZPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/musixmatch Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/musixmatch/MusixMatchPlugin.cpp Added

@@ -0,0 +1,155 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "MusixMatchPlugin.h"
+
+#include <QNetworkReply>
+#include <QDomDocument>
+#include <QtPlugin>
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk::InfoSystem;
+
+
+// for internal neatness
+
+MusixMatchPlugin::MusixMatchPlugin()
+    : InfoPlugin()
+    , m_apiKey( "61be4ea5aea7dd942d52b2f1311dd9fe" )
+{
+    tDebug() << Q_FUNC_INFO;
+    m_supportedGetTypes << Tomahawk::InfoSystem::InfoTrackLyrics;
+}
+
+
+MusixMatchPlugin::~MusixMatchPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+MusixMatchPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    tDebug() << Q_FUNC_INFO;
+    if( !isValidTrackData( requestData ) || requestData.type != Tomahawk::InfoSystem::InfoTrackLyrics )
+        return;
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+
+    QString artist = hash"artist";
+    QString track = hash"track";
+    if( artist.isEmpty() || track.isEmpty() )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+    tDebug() << "artist is " << artist << ", track is " << track;
+    QString requestString( "http://api.musixmatch.com/ws/1.1/track.search?format=xml&page_size=1&f_has_lyrics=1" );
+    QUrl url( requestString );
+    url.addQueryItem( "apikey", m_apiKey );
+    url.addQueryItem( "q_artist", artist );
+    url.addQueryItem( "q_track", track );
+    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+
+    connect( reply, SIGNAL( finished() ), SLOT( trackSearchSlot() ) );
+}
+
+
+bool
+MusixMatchPlugin::isValidTrackData( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    tDebug() << Q_FUNC_INFO;
+    
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        emit info( requestData, QVariant() );
+        tDebug() << "MusixMatchPlugin::isValidTrackData: Data null, invalid, or can't convert" << requestData.input.isNull() << requestData.input.isValid() << requestData.input.canConvert< QVariantMap >();
+        return false;
+    }
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+
+    if ( hash "track" .isEmpty() )
+    {
+        emit info( requestData, QVariant() );
+        tDebug() << "MusixMatchPlugin::isValidTrackData: Track name is empty";
+        return false;
+    }
+    if ( hash "artist" .isEmpty() )
+    {
+        emit info( requestData, QVariant() );
+        tDebug() << "MusixMatchPlugin::isValidTrackData: No artist name found";
+        return false;
+    }
+    return true;
+}
+
+
+void
+MusixMatchPlugin::trackSearchSlot()
+{
+    tDebug() << Q_FUNC_INFO;
+    QNetworkReply* oldReply = qobject_cast<QNetworkReply*>( sender() );
+    if ( !oldReply )
+        return; //timeout will handle it
+
+    QDomDocument doc;
+    doc.setContent(oldReply->readAll());
+    qDebug() << doc.toString();
+    QDomNodeList domNodeList = doc.elementsByTagName("track_id");
+    if ( domNodeList.isEmpty() )
+    {
+        emit info( oldReply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+        return;
+    }
+    QString track_id = domNodeList.at(0).toElement().text();
+    QString requestString( "http://api.musixmatch.com/ws/1.1/track.lyrics.get?track_id=%1&format=xml&apikey=%2" );
+    QUrl url( requestString );
+    url.addQueryItem( "apikey", m_apiKey );
+    url.addQueryItem( "track_id", track_id );
+    QNetworkReply* newReply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    newReply->setProperty( "requestData", oldReply->property( "requestData" ) );
+    connect( newReply, SIGNAL( finished() ), SLOT( trackLyricsSlot() ) );
+}
+
+
+void
+MusixMatchPlugin::trackLyricsSlot()
+{
+    tDebug() << Q_FUNC_INFO;
+    QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
+    if ( !reply )
+        return; //timeout will handle it
+
+    QDomDocument doc;
+    doc.setContent( reply->readAll() );
+    QDomNodeList domNodeList = doc.elementsByTagName( "lyrics_body" );
+    if ( domNodeList.isEmpty() )
+    {
+        emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+        return;
+    }
+    QString lyrics = domNodeList.at(0).toElement().text();
+    emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant( lyrics ) );
+}
+
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::MusixMatchPlugin )

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/musixmatch/MusixMatchPlugin.h Added

@@ -0,0 +1,73 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 MUSIXMATCHPLUGIN_H
+#define MUSIXMATCHPLUGIN_H
+
+#include "infosystem/InfoSystem.h"
+#include "infosystem/InfoSystemWorker.h"
+#include "infoplugins/InfoPluginDllMacro.h"
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT MusixMatchPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    MusixMatchPlugin();
+    virtual ~MusixMatchPlugin();
+
+public slots:
+    void trackSearchSlot();
+    void trackLyricsSlot();
+
+protected slots:
+    virtual void init() {}
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+    {
+        Q_UNUSED( pushData );
+    }
+
+virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+    {
+        Q_UNUSED( criteria );
+        Q_UNUSED( requestData );
+    }
+    
+private:
+    bool isValidTrackData( Tomahawk::InfoSystem::InfoRequestData requestData );
+    
+    QString m_apiKey;
+};
+
+}
+
+}
+
+#endif // MUSIXMATCHPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/newreleases Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/newreleases/NewReleasesPlugin.cpp Added

@@ -0,0 +1,376 @@
+#include "NewReleasesPlugin.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QSettings>
+#include <QtNetwork/QNetworkConfiguration>
+#include <QtNetwork/QNetworkReply>
+#include <QtPlugin>
+
+#include "Album.h"
+#include "CountryUtils.h"
+#include "Typedefs.h"
+#include "audio/AudioEngine.h"
+#include "TomahawkSettings.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "utils/TomahawkCache.h"
+#include "Source.h"
+
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+
+#define CHART_URL "http://charts.tomahawk-player.org/"
+//#define CHART_URL "http://localhost:8080/"
+
+using namespace Tomahawk::InfoSystem;
+
+bool newReleaseSort( const InfoStringHash& left, const InfoStringHash& right )
+{
+    if ( !left.contains( "date" ) || !right.contains( "date" ) )
+    {
+        return true;
+    }
+
+    const QDate lDate = QDate::fromString( left "date" , "yyyy-MM-dd" );
+    const QDate rDate = QDate::fromString( right "date" , "yyyy-MM-dd" );
+
+    return lDate > rDate;
+}
+
+
+NewReleasesPlugin::NewReleasesPlugin()
+    : InfoPlugin()
+    , m_nrFetchJobs ( 0 )
+{
+    m_nrVersion = "0";
+    m_supportedGetTypes << InfoNewReleaseCapabilities << InfoNewRelease;
+}
+
+NewReleasesPlugin::~NewReleasesPlugin()
+{
+    tDebug ( LOGVERBOSE ) << Q_FUNC_INFO;
+}
+
+void
+NewReleasesPlugin::init()
+{
+    QVariantList source_qvarlist = TomahawkUtils::Cache::instance()->getData( "NewReleasesPlugin", "nr_sources" ).toList();
+    foreach( const QVariant & source, source_qvarlist ) {
+        m_nrSources.append( source.toString() );
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "fetched source from cache" << source.toString();
+
+    }
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "total sources" << m_nrSources.size() << source_qvarlist.size();
+    if( m_nrSources.size() == 0 )
+        fetchNRSourcesList( true );
+}
+
+void NewReleasesPlugin::dataError ( InfoRequestData requestData )
+{
+    emit info ( requestData, QVariant() );
+    return;
+}
+
+void NewReleasesPlugin::getInfo ( InfoRequestData requestData )
+{
+//qDebug() << Q_FUNC_INFO << requestData.caller;
+    //qDebug() << Q_FUNC_INFO << requestData.customData;
+
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    bool foundSource = false;
+
+    switch ( requestData.type ) {
+    case InfoNewRelease:
+        /// We need something to check if the request is actually ment to go to this plugin
+        if ( !hash.contains ( "nr_source" ) ) {
+            tDebug ( LOGVERBOSE ) << Q_FUNC_INFO << "Hash did not contain required param!";
+            dataError ( requestData );
+            break;
+        } else {
+            foreach ( QString resource, m_nrSources ) {
+                if ( resource == hash"nr_source" ) {
+                    foundSource = true;
+                }
+            }
+
+            if ( !foundSource ) {
+                dataError ( requestData );
+                break;
+            }
+
+        }
+        fetchNRFromCache ( requestData );
+        break;
+
+    case InfoNewReleaseCapabilities:
+        fetchNRCapabilitiesFromCache ( requestData );
+        break;
+    default:
+        dataError ( requestData );
+    }
+}
+
+void NewReleasesPlugin::fetchNRFromCache ( InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() ) {
+        dataError ( requestData );
+        return;
+    }
+
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+
+    /// Each request needs to contain both a id and source
+    if ( !hash.contains ( "nr_id" ) && !hash.contains ( "nr_source" ) ) {
+        tDebug ( LOGVERBOSE ) << Q_FUNC_INFO << "Hash did not contain required params!";
+        dataError ( requestData );
+        return;
+
+    }
+    /// Set the criterias for current chart
+    criteria"nr_id" = hash"nr_id";
+    criteria"nr_source" = hash"nr_source";
+
+    emit getCachedInfo ( criteria, 86400000, requestData );
+}
+
+void NewReleasesPlugin::fetchNRCapabilitiesFromCache ( InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() ) {
+        tDebug ( LOGVERBOSE ) << Q_FUNC_INFO << "Could not convert requestData to InfoStringHash!";
+        dataError ( requestData );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria "InfoNewReleaseCapabilities"  = "newreleasesplugin";
+    criteria "InfoNewReleaseVersion"  = m_nrVersion;
+    emit getCachedInfo ( criteria, 864000000, requestData );
+}
+
+void NewReleasesPlugin::notInCacheSlot ( InfoStringHash criteria, InfoRequestData requestData )
+{
+    switch ( requestData.type ) {
+    case InfoNewRelease: {
+        tDebug ( LOGVERBOSE ) << Q_FUNC_INFO << "InfoNewRelease not in cache! Fetching...";
+        fetchNR ( requestData, criteria"nr_source", criteria"nr_id" );
+        return;
+
+    }
+
+    case InfoNewReleaseCapabilities: {
+        tDebug ( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChartCapabilities not in cache! Fetching...";
+        fetchNRSourcesList( false );
+        m_cachedRequests.append ( requestData );
+
+        return;
+    }
+
+    default: {
+        tLog() << Q_FUNC_INFO << "Couldn't figure out what to do with this type of request after cache miss";
+        emit info ( requestData, QVariant() );
+        return;
+    }
+    }
+}
+
+void NewReleasesPlugin::fetchNRSourcesList( bool fetchOnlySourcesList )
+{
+    QUrl url = QUrl ( QString ( CHART_URL "newreleases" ) );
+    QNetworkReply* reply = TomahawkUtils::nam()->get ( QNetworkRequest ( url ) );
+    reply->setProperty( "only_source_list", fetchOnlySourcesList );
+
+
+    tDebug() << "fetching:" << url;
+    connect ( reply, SIGNAL ( finished() ), SLOT ( nrSourcesList() ) );
+
+}
+
+void NewReleasesPlugin::nrSourcesList()
+{
+    tDebug ( LOGVERBOSE )  << "Got newreleases sources list";
+    QNetworkReply* reply = qobject_cast<QNetworkReply*> ( sender() );
+
+    if ( reply->error() == QNetworkReply::NoError ) {
+        QJson::Parser p;
+        bool ok;
+        const QVariantMap res = p.parse ( reply, &ok ).toMap();
+        const QVariantList sources = res.value ( "sources" ).toList();
+
+        if ( !ok ) {
+            tLog() << "Failed to parse sources" << p.errorString() << "On line" << p.errorLine();
+            return;
+        }
+
+        m_nrSources.clear();
+        foreach ( const QVariant &source, sources ) {
+            m_nrSources << source.toString();
+        }
+        TomahawkUtils::Cache::instance()->putData( "NewReleasesPlugin", 172800000 /* 2 days */, "nr_sources", m_nrSources );
+        if( !reply->property( "only_source_list" ).toBool() )
+            fetchAllNRSources();
+    }
+}
+
+void NewReleasesPlugin::fetchAllNRSources()
+{
+    if ( !m_nrSources.isEmpty() && m_allNRsMap.isEmpty() ) {
+        tDebug ( LOGVERBOSE ) << Q_FUNC_INFO << "InfoNewRelease fetching source data";
+        foreach ( QString source, m_nrSources ) {
+            QUrl url = QUrl ( QString ( CHART_URL "newreleases/%1" ).arg ( source ) );
+            QNetworkReply* reply = TomahawkUtils::nam()->get ( QNetworkRequest ( url ) );
+            reply->setProperty ( "nr_source", source );
+
+            tDebug() << "fetching:" << url;
+            connect ( reply, SIGNAL ( finished() ), SLOT ( nrList() ) );
+
+            m_nrFetchJobs++;
+        }
+    }
+}
+
+void NewReleasesPlugin::fetchNR ( InfoRequestData requestData, const QString& source, const QString& nr_id )
+{
+    /// Fetch the chart, we need source and id
+    QUrl url = QUrl ( QString ( CHART_URL "newreleases/%1/%2" ).arg ( source ).arg ( nr_id ) );
+    tDebug ( LOGVERBOSE ) << Q_FUNC_INFO << "fetching: " << url;
+
+    QNetworkReply* reply = TomahawkUtils::nam()->get ( QNetworkRequest ( url ) );
+    reply->setProperty ( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData > ( requestData ) );
+
+    connect ( reply, SIGNAL ( finished() ), SLOT ( nrReturned() ) );
+}
+
+void NewReleasesPlugin::nrList()
+{
+    tDebug ( LOGVERBOSE )  << "Got newreleases list result";
+    QNetworkReply* reply = qobject_cast<QNetworkReply*> ( sender() );
+
+    if ( reply->error() == QNetworkReply::NoError ) {
+        QJson::Parser p;
+        bool ok;
+        const QVariantMap res = p.parse ( reply, &ok ).toMap();
+
+        if ( !ok ) {
+            tLog() << "Failed to parse resources" << p.errorString() << "On line" << p.errorLine();
+
+            return;
+        }
+
+        /// Got types, append!
+        const QString source = reply->property ( "nr_source" ).toString();
+
+        // We'll populate newreleases with the data from the server
+        QVariantMap newreleases;
+        QString nrName;
+
+        // Building:
+        // Source - New Release
+        QList< InfoStringHash > albumNRs;
+
+        foreach ( const QVariant &nrObj, res.values() ) {
+            if ( !nrObj.toMap().isEmpty() ) {
+                const QVariantMap nrMap = nrObj.toMap();
+                const QString type = nrMap.value ( "type" ).toString();
+
+                InfoStringHash nr;
+                nr"id" = nrMap.value ( "id" ).toString();
+                nr"label" = nrMap.value ( "name" ).toString();
+                nr"date" = nrMap.value ( "date" ).toString();
+
+                if ( type == "Album" ) {
+                    nr "type"  = "album";
+                    albumNRs.append ( nr );
+                } else {
+                    tLog() << "Unknown newrelease type " << type;
+                    continue;
+                }
+
+            }
+        }
+
+        if ( !albumNRs.isEmpty() )
+            newreleases.insert ( tr ( "Albums" ), QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > > ( albumNRs ) );
+
+        /// @note For displaying purposes, upper the first letter
+        /// @note Remeber to lower it when fetching this!
+        nrName = source;
+        nrName0 = nrName0.toUpper();
+
+        tDebug ( LOGVERBOSE ) << Q_FUNC_INFO << "ADDING newrelease TO NRS:" << nrName;
+        QVariantMap defaultMap = m_allNRsMap.value ( "defaults" ).value< QVariantMap >();
+        m_allNRsMap.insert ( nrName, QVariant::fromValue< QVariantMap > ( newreleases ) );
+
+    } else {
+        tLog() << "Error fetching charts:" << reply->errorString();
+    }
+
+    m_nrFetchJobs--;
+    if ( !m_cachedRequests.isEmpty() && m_nrFetchJobs == 0 ) {
+        foreach ( InfoRequestData request, m_cachedRequests ) {
+            emit info ( request, m_allNRsMap );
+            // update cache
+            Tomahawk::InfoSystem::InfoStringHash criteria;
+            criteria "InfoNewReleaseCapabilities"  = "newreleasesplugin";
+            criteria "InfoNewReleaseVersion"  = m_nrVersion;
+            emit updateCache ( criteria, 864000000, request.type, m_allNRsMap );
+        }
+        m_cachedRequests.clear();
+    }
+}
+
+void NewReleasesPlugin::nrReturned()
+{
+    /// Chart request returned something! Woho
+    QNetworkReply* reply = qobject_cast<QNetworkReply*> ( sender() );
+    QVariantMap returnedData;
+
+    if ( reply->error() == QNetworkReply::NoError ) {
+        QJson::Parser p;
+        bool ok;
+        QVariantMap res = p.parse ( reply, &ok ).toMap();
+
+        if ( !ok ) {
+            tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
+            return;
+        }
+
+        /// SO we have a result, parse it!
+        QVariantList albumList = res.value ( "list" ).toList();
+        QList< Tomahawk::InfoSystem::InfoStringHash > newreleases;
+
+        foreach( const QVariant & albumObj, albumList ) {
+            QVariantMap albumMap = albumObj.toMap();
+            if(!albumMap.isEmpty()) {
+                const QString album = albumMap.value("album").toString();
+                const QString artist = albumMap.value("artist").toString();
+                const QString date = albumMap.value("date").toString();
+
+                Tomahawk::InfoSystem::InfoStringHash pair;
+                pair"artist" = artist;
+                pair"album" = album;
+                pair"date" = date;
+                newreleases.append( pair );
+            }
+        }
+
+        qSort( newreleases.begin(), newreleases.end(), newReleaseSort );
+
+//        tDebug() << "NewReleasesPlugin:" << "\tgot " << newreleases.size() << " albums";
+        returnedData "albums"  = QVariant::fromValue< QList< Tomahawk::InfoSystem::InfoStringHash > >( newreleases );
+        returnedData "type"  = "albums";
+        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+        emit info( requestData, returnedData );
+        // update cache
+        Tomahawk::InfoSystem::InfoStringHash criteria;
+        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+        criteria "nr_id"  = origData "nr_id" ;
+        criteria "nr_source"  = origData "nr_source" ;
+        emit updateCache( criteria, 86400000, requestData.type, returnedData );
+    } else
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Network error in fetching newrelease:" << reply->url().toString();
+}
+
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::NewReleasesPlugin )

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/newreleases/NewReleasesPlugin.h Added

@@ -0,0 +1,104 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Casey Link <unnamedrambler@gmail.com>
+ *
+ *   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 NEWRELEASESPLUGIN_H
+#define NEWRELEASESPLUGIN_H
+
+#include "infosystem/InfoSystem.h"
+#include "infosystem/InfoSystemWorker.h"
+#include "infoplugins/InfoPluginDllMacro.h"
+
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QObject>
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT NewReleasesPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    NewReleasesPlugin();
+    virtual ~NewReleasesPlugin();
+
+protected slots:
+    virtual void init();
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+    {
+        Q_UNUSED( pushData );
+    }
+
+    /**
+     * Parses a QNetworkReply of a list of newreleases sources.
+     */
+    void nrSourcesList();
+
+    /**
+     * Parses a QNetworkReply of a list of newreleases from a particular source
+     */
+    void nrList();
+
+    /**
+     * Parses a QNetworkReply for the newreleases data for a particular newrelease
+     */
+    void nrReturned();
+
+private:
+    /**
+     * Fetch list of newlreeases sources (e.g., rovi)
+     * Populates the m_nrSources member.
+     */
+    void fetchNRSourcesList( bool fetchOnlySourcesList );
+    /**
+     * Requests newrelease list for each source in m_chartSources
+     */
+    void fetchAllNRSources();
+    /**
+     * Fetches a specific newrelease from a particular source.
+     * Updates the cache.
+     */
+    void fetchNR( Tomahawk::InfoSystem::InfoRequestData requestData, const QString& source, const QString& nr_id );
+    void fetchNRFromCache( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void fetchNRCapabilitiesFromCache( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void dataError( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    QStringList m_nrSources;
+    QString m_nrVersion;
+    QList< InfoStringHash > m_newreleases;
+    //ChartType m_chartType;
+    QVariantMap m_allNRsMap;
+    uint m_nrFetchJobs;
+    QList< InfoRequestData > m_cachedRequests;
+    QHash< QString, QString > m_cachedCountries;
+    QWeakPointer< QNetworkAccessManager > m_nam;
+};
+
+}
+}
+
+#endif // NEWRELEASESPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/rovi Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/rovi/RoviPlugin.cpp Added

@@ -0,0 +1,197 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "RoviPlugin.h"
+
+#include <QDateTime>
+#include <QNetworkReply>
+#include <QtPlugin>
+
+#include <parser.h>
+#include "utils/Logger.h"
+
+using namespace Tomahawk::InfoSystem;
+
+
+RoviPlugin::RoviPlugin()
+    : InfoPlugin()
+{
+    m_supportedGetTypes << InfoAlbumSongs;
+
+    /*
+     *    Your API Key is 7jxr9zggt45h6rg2n4ss3mrj
+     *    Your secret is XUnYutaAW6
+     */
+    m_apiKey = "7jxr9zggt45h6rg2n4ss3mrj";
+    m_secret = "XUnYutaAW6";
+}
+
+
+RoviPlugin::~RoviPlugin()
+{
+}
+
+
+void
+RoviPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "artist" ) || !hash.contains( "album" ) )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = hash"artist";
+    criteria"album" = hash"album";
+
+    emit getCachedInfo( criteria, 0, requestData );
+}
+
+
+void
+RoviPlugin::notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    switch ( requestData.type )
+    {
+        case InfoAlbumSongs:
+        {
+            QUrl baseUrl = QUrl( "http://api.rovicorp.com/search/v2/music/search" );
+            baseUrl.addQueryItem( "query", QString( "%1 %2" ).arg( criteria "artist"  ).arg( criteria "album"  ) );
+            baseUrl.addQueryItem( "entitytype", "album" );
+            baseUrl.addQueryItem( "include", "album:tracks" );
+
+            QNetworkReply* reply = makeRequest( baseUrl );
+
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+            connect( reply, SIGNAL( finished() ), this, SLOT( albumLookupFinished() ) );
+            connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), this, SLOT( albumLookupError( QNetworkReply::NetworkError ) ) );
+            break;
+        }
+        default:
+        {
+            Q_ASSERT( false );
+            break;
+        }
+    }
+}
+
+
+void
+RoviPlugin::albumLookupError( QNetworkReply::NetworkError error )
+{
+    if ( error == QNetworkReply::NoError )
+        return;
+
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    Q_ASSERT( reply );
+
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+    emit info( requestData, QVariant() );
+
+}
+
+
+void
+RoviPlugin::albumLookupFinished()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    Q_ASSERT( reply );
+
+    if ( reply->error() != QNetworkReply::NoError )
+        return;
+
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+    QJson::Parser p;
+    bool ok;
+    QVariantMap response = p.parse( reply, &ok ).toMap();
+
+    if ( !ok || response.isEmpty() || !response.contains( "searchResponse" ) )
+    {
+        tLog() << "Error parsing JSON from Rovi!" << p.errorString() << response;
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    QVariantList resultList = response "searchResponse" .toMap().value( "results" ).toList();
+    if ( resultList.size() == 0 )
+    {
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    QVariantMap results = resultList.first().toMap();
+    QVariantList tracks = results "album" .toMap() "tracks" .toList();
+
+    if ( tracks.isEmpty() )
+    {
+        tLog() << "Error parsing JSON from Rovi!" << p.errorString() << response;
+        emit info( requestData, QVariant() );
+    }
+
+
+    QStringList trackNameList;
+    foreach ( const QVariant& track, tracks )
+    {
+        const QVariantMap trackData = track.toMap();
+        if ( trackData.contains( "title" ) )
+            trackNameList << trackData "title" .toString();
+    }
+
+    QVariantMap returnedData;
+    returnedData"tracks" = trackNameList;
+
+    emit info( requestData, returnedData );
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()"artist";
+    criteria"album" = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>()"album";
+
+    emit updateCache( criteria, 0, requestData.type, returnedData );
+}
+
+
+QNetworkReply*
+RoviPlugin::makeRequest( QUrl url )
+{
+    url.addQueryItem( "apikey", m_apiKey );
+    url.addEncodedQueryItem( "sig", generateSig() );
+
+    qDebug() << "Rovi request url:" << url.toString();
+    return TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+}
+
+
+QByteArray
+RoviPlugin::generateSig() const
+{
+    QByteArray raw = m_apiKey + m_secret + QString::number( QDateTime::currentMSecsSinceEpoch() / 1000 ).toLatin1();
+    return TomahawkUtils::md5( raw ).toLatin1();
+}
+
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::RoviPlugin )

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/rovi/RoviPlugin.h Added

@@ -0,0 +1,72 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 ROVIPLUGIN_H
+#define ROVIPLUGIN_H
+
+#include "infosystem/InfoSystem.h"
+#include "infoplugins/InfoPluginDllMacro.h"
+
+#include <QNetworkReply>
+
+class QNetworkAccessManager;
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT RoviPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    RoviPlugin();
+    virtual ~RoviPlugin();
+
+protected:
+    virtual void init() {}
+    
+    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+    {
+        Q_UNUSED( pushData );
+    }
+
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+private slots:
+    void albumLookupFinished();
+    void albumLookupError( QNetworkReply::NetworkError );
+private:
+    QNetworkReply* makeRequest( QUrl url );
+    QByteArray generateSig() const;
+
+    QByteArray m_apiKey;
+    QByteArray m_secret;
+};
+
+}
+
+}
+
+#endif // ROVIPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/spotify Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/spotify/SpotifyPlugin.cpp Added

@@ -0,0 +1,390 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "SpotifyPlugin.h"
+
+#include <QDir>
+#include <QSettings>
+#include <QCryptographicHash>
+#include <QNetworkConfiguration>
+#include <QNetworkReply>
+#include <QtPlugin>
+
+#include "Album.h"
+#include "Typedefs.h"
+#include "audio/AudioEngine.h"
+#include "TomahawkSettings.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "CountryUtils.h"
+#include "Source.h"
+
+#define SPOTIFY_API_URL "http://spotikea.tomahawk-player.org/"
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+
+using namespace Tomahawk::InfoSystem;
+
+
+SpotifyPlugin::SpotifyPlugin()
+    : InfoPlugin()
+    , m_chartsFetchJobs( 0 )
+{
+    m_supportedGetTypes << InfoChart << InfoChartCapabilities;
+
+}
+
+
+SpotifyPlugin::~SpotifyPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+SpotifyPlugin::dataError( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    emit info( requestData, QVariant() );
+    return;
+}
+
+
+void
+SpotifyPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    qDebug() << Q_FUNC_INFO << requestData.caller;
+    qDebug() << Q_FUNC_INFO << requestData.customData;
+
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+
+    switch ( requestData.type )
+    {
+        case InfoChart:
+            if ( !hash.contains( "chart_source" ) || hash"chart_source" != "spotify" )
+            {
+                dataError( requestData );
+                break;
+            }
+            qDebug() << Q_FUNC_INFO << "InfoCHart req for" << hash"chart_source";
+            fetchChart( requestData );
+            break;
+
+        case InfoChartCapabilities:
+            fetchChartCapabilities( requestData );
+            break;
+
+        default:
+            dataError( requestData );
+    }
+}
+
+
+void
+SpotifyPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    /// Each request needs to contain both a id and source
+    if ( !hash.contains( "chart_id" ) && !hash.contains( "chart_source" ) )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Hash did not contain required params!";
+        dataError( requestData );
+        return;
+    }
+    /// Set the criterias for current chart
+    criteria"chart_id" = hash"chart_id";
+    criteria"chart_source" = hash"chart_source";
+
+    emit getCachedInfo( criteria, 86400000 /* Expire chart cache in 1 day */, requestData );
+}
+
+
+void
+SpotifyPlugin::fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria "InfoChartCapabilities"  = "spotifyplugin";
+    emit getCachedInfo( criteria, 604800000, requestData );
+}
+
+
+void
+SpotifyPlugin::notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    switch ( requestData.type )
+    {
+        case InfoChart:
+        {
+            /// Fetch the chart, we need source and id
+            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChart not in cache! Fetching...";
+            QUrl url = QUrl( QString( SPOTIFY_API_URL "toplist/%1/" ).arg( criteria"chart_id" ) );
+            qDebug() << Q_FUNC_INFO << "Getting chart url" << url;
+
+            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+            connect( reply, SIGNAL( finished() ), SLOT( chartReturned() ) );
+            return;
+        }
+        case InfoChartCapabilities:
+        {
+            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "InfoChartCapabilities not in cache! Fetching...";
+
+            // we never need to re-fetch
+            if ( !m_allChartsMap.isEmpty() )
+                return;
+
+            /// We need to fetch possible types before they are asked for
+            tDebug() << "SpotifyPlugin: InfoChart fetching possible resources";
+
+            QUrl url = QUrl( QString( SPOTIFY_API_URL "toplist/charts" )  );
+            QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+            tDebug() << Q_FUNC_INFO << "fetching:" << url;
+            connect( reply, SIGNAL( finished() ), SLOT( chartTypes() ) );
+            m_chartsFetchJobs++;
+
+            if ( m_chartsFetchJobs > 0 )
+            {
+                qDebug() << Q_FUNC_INFO << "InfoChartCapabilities still fetching!";
+                m_cachedRequests.append( requestData );
+                return;
+            }
+
+            emit info( requestData, m_allChartsMap );
+            return;
+        }
+
+        default:
+        {
+            tLog() << Q_FUNC_INFO << "Couldn't figure out what to do with this type of request after cache miss";
+            emit info( requestData, QVariant() );
+            return;
+        }
+    }
+}
+
+
+void
+SpotifyPlugin::chartTypes()
+{
+    /// Get possible chart type for specificSpotifyPlugin: InfoChart types returned chart source
+    tDebug() << Q_FUNC_INFO << "Got spotifychart type result";
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+
+    if ( reply->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        const QVariantMap res = p.parse( reply, &ok ).toMap();
+        const QVariantMap chartObj = res;
+
+        if ( !ok )
+        {
+            tLog() << Q_FUNC_INFO << "Failed to parse resources" << p.errorString() << "On line" << p.errorLine();
+
+            return;
+        }
+
+        QVariantMap charts;
+        foreach( QVariant geos, chartObj.value( "Charts" ).toList().takeLast().toMap().value( "geo" ).toList() )
+        {
+           const QString geo = geos.toMap().value( "name" ).toString();
+           const QString geoId = geos.toMap().value( "id" ).toString();
+           QString country;
+
+           if( geo == "For me" )
+              continue; /// country = geo; Lets use this later, when we can get the spotify username from tomahawk
+           else if( geo == "Everywhere" )
+               country = geo;
+           else
+           {
+               QLocale l( QString( "en_%1" ).arg( geo ) );
+               country = Tomahawk::CountryUtils::fullCountryFromCode( geo );
+
+               for ( int i = 1; i < country.size(); i++ )
+               {
+                   if ( country.at( i ).isUpper() )
+                   {
+                       country.insert( i, " " );
+                       i++;
+                   }
+               }
+           }
+
+           QList< InfoStringHash > chart_types;
+           foreach( QVariant types, chartObj.value( "Charts" ).toList().takeFirst().toMap().value( "types" ).toList() )
+           {
+               QString type = types.toMap().value( "id" ).toString();
+               QString label = types.toMap().value( "name" ).toString();
+
+               InfoStringHash c;
+               c "id"  = type + "/" + geoId;
+               c "label"  = label;
+               c "type"  = type;
+
+               chart_types.append( c );
+           }
+
+           charts.insert( country.toUtf8(), QVariant::fromValue<QList< InfoStringHash > >( chart_types ) );
+        }
+
+        QVariantMap defaultMap;
+        defaultMap "spotify"  = QStringList() << "United States" << "Top Albums";
+        m_allChartsMap "defaults"  = defaultMap;
+        m_allChartsMap.insert( "Spotify", QVariant::fromValue<QVariantMap>( charts ) );
+    }
+    else
+    {
+        tLog() << Q_FUNC_INFO << "Error fetching charts:" << reply->errorString();
+    }
+
+    m_chartsFetchJobs--;
+    if ( !m_cachedRequests.isEmpty() && m_chartsFetchJobs == 0 )
+    {
+        foreach ( InfoRequestData request, m_cachedRequests )
+        {
+            emit info( request, m_allChartsMap );
+            Tomahawk::InfoSystem::InfoStringHash criteria;
+            criteria "InfoChartCapabilities"  = "spotifyplugin";
+            emit updateCache( criteria,604800000, request.type, m_allChartsMap );
+        }
+        m_cachedRequests.clear();
+    }
+}
+
+
+void
+SpotifyPlugin::chartReturned()
+{
+    /// Chart request returned something! Woho
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    QString url = reply->url().toString();
+    QVariantMap returnedData;
+    if ( reply->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        QVariantMap res = p.parse( reply, &ok ).toMap();
+
+        if ( !ok )
+        {
+            tLog() << "Failed to parse json from chart lookup:" << p.errorString() << "On line" << p.errorLine();
+            return;
+        }
+
+        /// SO we have a result, parse it!
+        QList< InfoStringHash > top_tracks;
+        QList< InfoStringHash > top_albums;
+        QStringList top_artists;
+
+        if( url.contains( "albums" ) )
+            setChartType( Album );
+        else if( url.contains( "tracks" ) )
+            setChartType( Track );
+        else if( url.contains( "artists" ) )
+            setChartType( Artist );
+        else
+            setChartType( None );
+
+        foreach( QVariant result, res.value( "toplist" ).toMap().value( "result" ).toList() )
+        {
+            QString title, artist;
+            QVariantMap chartMap = result.toMap();
+
+            if ( !chartMap.isEmpty() )
+            {
+                title = chartMap.value( "title" ).toString();
+                artist = chartMap.value( "artist" ).toString();
+
+                if( chartType() == Track )
+                {
+                    InfoStringHash pair;
+                    pair"artist" = artist;
+                    pair"track" = title;
+                    top_tracks << pair;
+
+                    qDebug() << "SpotifyChart type is track";
+                }
+
+                if( chartType() == Album )
+                {
+                    InfoStringHash pair;
+                    pair"artist" = artist;
+                    pair"album" = title;
+                    top_albums << pair;
+                    qDebug() << "SpotifyChart type is album";
+                }
+
+                if( chartType() == Artist )
+                {
+                    top_artists << chartMap.value( "name" ).toString();
+                    qDebug() << "SpotifyChart type is artist";
+                }
+            }
+        }
+
+        if( chartType() == Track )
+        {
+            tDebug() << "ChartsPlugin:" << "\tgot " << top_tracks.size() << " tracks";
+            returnedData"tracks" = QVariant::fromValue( top_tracks );
+            returnedData"type" = "tracks";
+        }
+
+        if( chartType() == Album )
+        {
+            tDebug() << "ChartsPlugin:" << "\tgot " << top_albums.size() << " albums";
+            returnedData"albums" = QVariant::fromValue( top_albums );
+            returnedData"type" = "albums";
+        }
+
+        if( chartType() == Artist )
+        {
+            tDebug() << "ChartsPlugin:" << "\tgot " << top_artists.size() << " artists";
+            returnedData"artists" = top_artists;
+            returnedData"type" = "artists";
+        }
+
+        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+        emit info( requestData, returnedData );
+
+        // update cache
+        Tomahawk::InfoSystem::InfoStringHash criteria;
+        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+        criteria "chart_id"  = origData "chart_id" ;
+        criteria "chart_source"  = origData "chart_source" ;
+        emit updateCache( criteria, 86400000, requestData.type, returnedData );
+    }
+    else
+        qDebug() << "Network error in fetching chart:" << reply->url().toString();
+}
+
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::SpotifyPlugin )

tomahawk-0.5.5.tar.bz2/src/infoplugins/generic/spotify/SpotifyPlugin.h Added

@@ -0,0 +1,86 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 SpotifyPlugin_H
+#define SpotifyPlugin_H
+
+#include "infosystem/InfoSystem.h"
+#include "infosystem/InfoSystemWorker.h"
+#include "infoplugins/InfoPluginDllMacro.h"
+
+#include <QNetworkReply>
+#include <QObject>
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT SpotifyPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    SpotifyPlugin();
+    virtual ~SpotifyPlugin();
+
+    enum ChartType {
+        None =      0x00,
+        Track =     0x01,
+        Album =     0x02,
+        Artist =    0x04
+
+    };
+ void setChartType( ChartType type ) { m_chartType = type; }
+ ChartType chartType() const { return m_chartType; }
+
+public slots:
+    void chartReturned();
+    void chartTypes();
+
+protected slots:
+    virtual void init() {}
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+    {
+        Q_UNUSED( pushData );
+    }
+
+private:
+    void fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void dataError( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+
+    ChartType m_chartType;
+    QVariantMap m_allChartsMap;
+    uint m_chartsFetchJobs;
+    QList< InfoRequestData > m_cachedRequests;
+};
+
+}
+
+}
+
+#endif // SpotifyPlugin_H

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/CMakeLists.txt Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/fdonotify Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.cpp Added

@@ -0,0 +1,175 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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/>.
+ */
+
+// Marked portions of this file are subject to the following copyright:
+/*
+ * Copyright (C) 2009 by Aurélien Gâteau <aurelien.gateau@canonical.com>
+ *
+ * This program 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 2, or (at your option)
+ * any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include "FdoNotifyPlugin.h"
+#include "utils/TomahawkUtils.h"
+#include "ImageConverter.h"
+
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusMessage>
+#include <QtGui/QImage>
+#include <QtPlugin>
+
+#include "utils/Logger.h"
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+FdoNotifyPlugin::FdoNotifyPlugin()
+    : InfoPlugin()
+    , m_nowPlayingId( 0 )
+{
+    qDebug() << Q_FUNC_INFO;
+    m_supportedPushTypes << InfoNotifyUser << InfoNowPlaying << InfoTrackUnresolved << InfoNowStopped;
+}
+
+
+FdoNotifyPlugin::~FdoNotifyPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+FdoNotifyPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+{
+    qDebug() << Q_FUNC_INFO;
+    QVariant inputData = pushData.infoPair.second;
+
+    switch ( pushData.type )
+    {
+        case Tomahawk::InfoSystem::InfoTrackUnresolved:
+            notifyUser( "The current track could not be resolved. Tomahawk will pick back up with the next resolvable track from this source." );
+            return;
+
+        case Tomahawk::InfoSystem::InfoNotifyUser:
+            notifyUser( pushData.infoPair.second.toString() );
+            return;
+
+        case Tomahawk::InfoSystem::InfoNowStopped:
+            notifyUser( "Tomahawk is stopped." );
+            return;
+
+        case Tomahawk::InfoSystem::InfoNowPlaying:
+            nowPlaying( pushData.infoPair.second );
+            return;
+
+        default:
+            return;
+    }
+
+}
+
+
+void
+FdoNotifyPlugin::notifyUser( const QString &messageText )
+{
+    QDBusMessage message = QDBusMessage::createMethodCall( "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications", "Notify" );
+    QList<QVariant> arguments;
+    arguments << QString( "Tomahawk" ); //app_name
+    arguments << quint32( 0 ); //notification_id
+    arguments << QString(); //app_icon
+    arguments << QString( "Tomahawk" ); //summary
+    arguments << QString( messageText ); //body
+    arguments << QStringList(); //actions
+    QVariantMap dict;
+    dict"desktop-entry" = QString( "tomahawk" );
+    dict "image_data"  = ImageConverter::variantForImage( QImage( RESPATH "icons/tomahawk-icon-128x128.png" ) );
+    arguments << dict; //hints
+    arguments << qint32( -1 ); //expire_timeout
+    message.setArguments( arguments );
+    QDBusConnection::sessionBus().send( message );
+}
+
+
+void
+FdoNotifyPlugin::nowPlaying( const QVariant &input )
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    if ( !input.canConvert< QVariantMap >() )
+        return;
+
+    QVariantMap map = input.toMap();
+
+    if ( !map.contains( "trackinfo" ) || !map "trackinfo" .canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+        return;
+
+    InfoStringHash hash = map "trackinfo" .value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "title" ) || !hash.contains( "artist" ) || !hash.contains( "album" ) )
+        return;
+
+    QString messageText = tr( "Tomahawk is playing \"%1\" by %2%3." )
+                        .arg( hash "title"  )
+                        .arg( hash "artist"  )
+                        .arg( hash "album" .isEmpty() ? QString() : QString( " %1" ).arg( tr( "on \"%1\"" ).arg( hash "album"  ) ) );
+
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "sending message" << messageText;
+
+    QDBusMessage message = QDBusMessage::createMethodCall( "org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications", "Notify" );
+    QList<QVariant> arguments;
+    arguments << QString( "Tomahawk" ); //app_name
+    arguments << m_nowPlayingId; //notification_id
+    arguments << QString(); //app_icon
+    arguments << QString( "Tomahawk" ); //summary
+    arguments << messageText; //body
+    arguments << QStringList(); //actions
+    QVariantMap dict;
+    dict"desktop-entry" = QString( "tomahawk" );
+    if ( map.contains( "coveruri" ) && map "coveruri" .canConvert< QString >() )
+        dict "image_data"  = ImageConverter::variantForImage( QImage( map "coveruri" .toString(), "PNG" ) );
+    else
+        dict "image_data"  = ImageConverter::variantForImage( QImage( RESPATH "icons/tomahawk-icon-128x128.png" ) );
+    arguments << dict; //hints
+    arguments << qint32( -1 ); //expire_timeout
+    message.setArguments( arguments );
+
+    const QDBusMessage &reply = QDBusConnection::sessionBus().call( message );
+    const QVariantList &list = reply.arguments();
+    if ( list.count() > 0 )
+        m_nowPlayingId = list.at( 0 ).toInt();
+}
+
+} //ns InfoSystem
+
+} //ns Tomahawk
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::FdoNotifyPlugin )

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/fdonotify/FdoNotifyPlugin.h Added

@@ -0,0 +1,69 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 FDONOTIFYPLUGIN_H
+#define FDONOTIFYPLUGIN_H
+
+#include "infoplugins/InfoPluginDllMacro.h"
+#include "infosystem/InfoSystem.h"
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT FdoNotifyPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    FdoNotifyPlugin();
+    virtual ~FdoNotifyPlugin();
+
+protected slots:
+    virtual void init() {}
+    
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+    {
+        Q_UNUSED( requestData );
+    }
+
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData );
+
+    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+    {
+        Q_UNUSED( criteria );
+        Q_UNUSED( requestData );
+    }
+
+private:
+    void notifyUser( const QString &messageText );
+
+    void nowPlaying( const QVariant &input );
+
+    quint32 m_nowPlayingId;
+};
+
+}
+
+}
+
+#endif // FDONOTIFYPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/fdonotify/ImageConverter.cpp Added

@@ -0,0 +1,110 @@
+/*
+   Copyright (C) 2009 by Aurélien Gâteau <aurelien.gateau@canonical.com>
+   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
+   
+   This program 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 2, or (at your option)
+   any later version.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+ */
+#include "ImageConverter.h"
+
+#include <QtDBus/QDBusArgument>
+#include <QtDBus/QDBusMetaType>
+#include <QtGui/QImage>
+
+#include "utils/Logger.h"
+
+namespace ImageConverter
+{
+
+/**
+ * A structure representing an image which can be marshalled to fit the
+ * notification spec.
+ */
+struct SpecImage
+{
+	int width, height, rowStride;
+	bool hasAlpha;
+	int bitsPerSample, channels;
+	QByteArray data;
+};
+
+QDBusArgument &operator<<(QDBusArgument &argument, const SpecImage &image)
+{
+	argument.beginStructure();
+	argument << image.width << image.height << image.rowStride << image.hasAlpha;
+	argument << image.bitsPerSample << image.channels << image.data;
+	argument.endStructure();
+	return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, SpecImage &image)
+{
+	argument.beginStructure();
+	argument >> image.width >> image.height >> image.rowStride >> image.hasAlpha;
+	argument >> image.bitsPerSample >> image.channels >> image.data;
+	argument.endStructure();
+	return argument;
+}
+
+} // namespace
+
+// This must be before the QVariant::fromValue below (#211726)
+Q_DECLARE_METATYPE(ImageConverter::SpecImage)
+
+namespace ImageConverter
+{
+QVariant variantForImage(const QImage &_image)
+{
+	qDBusRegisterMetaType<SpecImage>();
+
+	QImage image = _image.convertToFormat(QImage::Format_ARGB32);
+
+	int rowStride = image.width() * 4;
+
+	// Notification spec stores pixels in R,G,B,A order, regardless of
+	// endianess
+	// Qt represents pixels as 32 bit unsigned int. So the order depend on
+	// endianess:
+	// - In big endian the order is A,R,G,B
+	// - In little endian the order is B,G,R,A
+	QByteArray data;
+	data.resize(rowStride * image.height());
+	char* dst = data.data();
+	for (int y=0; y<image.height(); ++y) {
+		QRgb* src = (QRgb*)image.scanLine(y);
+		QRgb* end = src + image.width();
+		for (;src != end; ++src) {
+			// Probably slow, but free of endianess issues
+			*dst++ = qRed(*src);
+			*dst++ = qGreen(*src);
+			*dst++ = qBlue(*src);
+			*dst++ = qAlpha(*src);
+		}
+	}
+
+	SpecImage specImage;
+	specImage.width = image.width();
+	specImage.height = image.height();
+	specImage.rowStride = rowStride;
+	specImage.hasAlpha = true;
+	specImage.bitsPerSample = 8;
+	specImage.channels = 4;
+	specImage.data = data;
+
+	return QVariant::fromValue(specImage);
+}
+
+} // namespace
+

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/fdonotify/ImageConverter.h Added

@@ -0,0 +1,37 @@
+/*
+   Copyright (C) 2009 by Aurélien Gâteau <aurelien.gateau@canonical.com>
+   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
+   
+   This program 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 2, or (at your option)
+   any later version.
+
+   This program 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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+ */
+#ifndef IMAGECONVERTER_H
+#define IMAGECONVERTER_H
+
+class QVariant;
+class QImage;
+
+namespace ImageConverter
+{
+
+/**
+ * Returns a variant representing an image using the format describe in the
+ * galago spec
+ */
+QVariant variantForImage(const QImage &image);
+
+} // namespace
+
+#endif /* IMAGECONVERTER_H */

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/mpris Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/mpris/MprisPlugin.cpp Added

@@ -0,0 +1,602 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 <QApplication>
+#include <QImage>
+#include <QtDBus/QtDBus>
+#include <QtPlugin>
+
+#include "audio/AudioEngine.h"
+#include "infosystem/InfoSystemWorker.h"
+#include "Album.h"
+#include "Artist.h"
+#include "Result.h"
+#include "TomahawkSettings.h"
+#include "GlobalActionManager.h"
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+#include "audio/AudioEngine.h"
+#include "Source.h"
+
+#include "MprisPlugin.h"
+#include "MprisPluginRootAdaptor.h"
+#include "MprisPluginPlayerAdaptor.h"
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+static QString s_mpInfoIdentifier = QString( "MPRISPLUGIN" );
+
+MprisPlugin::MprisPlugin()
+    : InfoPlugin()
+{
+    // init
+    m_playbackStatus = "Stopped";
+
+    // Types of pushInfo we care about
+    m_supportedPushTypes << InfoNowPlaying << InfoNowPaused << InfoNowResumed << InfoNowStopped;
+}
+
+
+MprisPlugin::~MprisPlugin()
+{
+}
+
+
+void
+MprisPlugin::init()
+{
+    // DBus connection
+    new MprisPluginRootAdaptor( this );
+    new MprisPluginPlayerAdaptor( this );
+    QDBusConnection dbus = QDBusConnection::sessionBus();
+    dbus.registerObject( "/org/mpris/MediaPlayer2", this );
+    dbus.registerService( "org.mpris.MediaPlayer2.tomahawk" );
+
+    // Listen to volume changes
+    connect( AudioEngine::instance(), SIGNAL( volumeChanged( int ) ),
+                                        SLOT( onVolumeChanged( int ) ) );
+
+    // When the playlist changes, signals for several properties are sent
+    connect( AudioEngine::instance(), SIGNAL( playlistChanged( Tomahawk::playlistinterface_ptr ) ),
+                                        SLOT( onPlaylistChanged( Tomahawk::playlistinterface_ptr ) ) );
+
+    // When a track is added or removed, CanGoNext updated signal is sent
+    Tomahawk::playlistinterface_ptr playlist = AudioEngine::instance()->playlist();
+    if ( !playlist.isNull() )
+    {
+        connect( playlist.data(), SIGNAL( trackCountChanged( unsigned int ) ),
+                                    SLOT( onTrackCountChanged( unsigned int ) ) );
+    }
+
+    // Connect to AudioEngine's seeked signal
+    connect( AudioEngine::instance(), SIGNAL( seeked( qint64 ) ),
+                                        SLOT( onSeeked( qint64 ) ) );
+}
+
+
+// org.mpris.MediaPlayer2
+
+bool
+MprisPlugin::canQuit() const
+{
+    return true;
+}
+
+
+bool
+MprisPlugin::canRaise() const
+{
+    return false;
+}
+
+
+bool
+MprisPlugin::hasTrackList() const
+{
+    return false;
+}
+
+
+QString
+MprisPlugin::identity() const
+{
+    return QString( "Tomahawk" );
+}
+
+
+QString
+MprisPlugin::desktopEntry() const
+{
+    return QString( "tomahawk" );
+}
+
+
+QStringList
+MprisPlugin::supportedUriSchemes() const
+{
+    QStringList uriSchemes;
+    uriSchemes << "tomahawk" << "spotify";
+    return uriSchemes;
+}
+
+
+QStringList
+MprisPlugin::supportedMimeTypes() const
+{
+    return QStringList();
+}
+
+
+void
+MprisPlugin::Raise()
+{
+}
+
+
+void
+MprisPlugin::Quit()
+{
+    QApplication::quit();
+}
+
+
+// org.mpris.MediaPlayer2.Player
+
+bool
+MprisPlugin::canControl() const
+{
+    return true;
+}
+
+
+bool
+MprisPlugin::canGoNext() const
+{
+    return AudioEngine::instance()->canGoNext();
+}
+
+
+bool
+MprisPlugin::canGoPrevious() const
+{
+    return AudioEngine::instance()->canGoPrevious();
+}
+
+
+bool
+MprisPlugin::canPause() const
+{
+    return AudioEngine::instance()->currentTrack();
+}
+
+
+bool
+MprisPlugin::canPlay() const
+{
+    // If there is a currently playing track, or if there is a playlist with at least 1 track, you can hit play
+    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
+    return AudioEngine::instance()->currentTrack() || ( !p.isNull() && p->trackCount() );
+}
+
+
+bool
+MprisPlugin::canSeek() const
+{
+    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
+    if ( p.isNull() )
+        return false;
+    return p->seekRestrictions() != PlaylistModes::NoSeek;
+
+}
+
+
+QString
+MprisPlugin::loopStatus() const
+{
+    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
+    if ( p.isNull() )
+        return "None";
+    PlaylistModes::RepeatMode mode = p->repeatMode();
+    switch( mode )
+    {
+        case PlaylistModes::RepeatOne:
+            return "Track";
+            break;
+        case PlaylistModes::RepeatAll:
+            return "Playlist";
+            break;
+        case PlaylistModes::NoRepeat:
+            return "None";
+            break;
+        default:
+            return "None";
+            break;
+    }
+
+    return QString( "None" );
+}
+
+
+void
+MprisPlugin::setLoopStatus( const QString& value )
+{
+    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
+    if ( p.isNull() )
+        return;
+    if ( value == "Track" )
+        p->setRepeatMode( PlaylistModes::RepeatOne );
+    else if ( value == "Playlist" )
+        p->setRepeatMode( PlaylistModes::RepeatAll );
+    else if ( value == "None" )
+        p->setRepeatMode( PlaylistModes::NoRepeat );
+}
+
+
+double
+MprisPlugin::maximumRate() const
+{
+    return 1.0;
+}
+
+
+QVariantMap
+MprisPlugin::metadata() const
+{
+    QVariantMap metadataMap;
+    Tomahawk::result_ptr track = AudioEngine::instance()->currentTrack();
+    if ( track )
+    {
+        metadataMap.insert( "mpris:trackid", QVariant::fromValue(QDBusObjectPath(QString( "/track/" ) + track->id().replace( "-", "" ))) );
+        metadataMap.insert( "mpris:length", static_cast<qlonglong>(track->duration()) * 1000000 );
+        metadataMap.insert( "xesam:album", track->album()->name() );
+        metadataMap.insert( "xesam:artist", QStringList( track->artist()->name() ) );
+        metadataMap.insert( "xesam:title", track->track() );
+
+        // Only return art if tempfile exists, and if its name contains the same "artist_album_tomahawk_cover.png"
+        if ( !m_coverTempFile.isEmpty() )
+        {
+            QFile coverFile( m_coverTempFile );
+            if ( coverFile.exists() && coverFile.fileName().contains( track->artist()->name() + "_" + track->album()->name() + "_tomahawk_cover.png" ) )
+                metadataMap.insert( "mpris:artUrl", QString( QUrl::fromLocalFile( m_coverTempFile ).toEncoded() ) );
+        }
+    }
+
+    return metadataMap;
+}
+
+
+double
+MprisPlugin::minimumRate() const
+{
+    return 1.0;
+}
+
+
+QString
+MprisPlugin::playbackStatus() const
+{
+    return m_playbackStatus;
+}
+
+
+qlonglong
+MprisPlugin::position() const
+{
+    // Convert Tomahawk's milliseconds to microseconds
+    return (qlonglong) ( AudioEngine::instance()->currentTime() * 1000 );
+}
+
+
+double
+MprisPlugin::rate() const
+{
+    return 1.0;
+}
+
+
+void
+MprisPlugin::setRate( double value )
+{
+    Q_UNUSED( value );
+}
+
+
+bool
+MprisPlugin::shuffle() const
+{
+    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
+    if ( p.isNull() )
+        return false;
+    return p->shuffled();
+}
+
+
+void
+MprisPlugin::setShuffle( bool value )
+{
+    Tomahawk::playlistinterface_ptr p = AudioEngine::instance()->playlist();
+    if ( p.isNull() )
+        return;
+    return p->setShuffled( value );
+}
+
+
+double
+MprisPlugin::volume() const
+{
+    return static_cast<double>(AudioEngine::instance()->volume()) / 100.0;
+}
+
+
+void
+MprisPlugin::setVolume( double value )
+{
+    AudioEngine::instance()->setVolume( value * 100 );
+}
+
+
+void
+MprisPlugin::Next()
+{
+    AudioEngine::instance()->next();
+}
+
+
+void
+MprisPlugin::OpenUri( const QString& Uri )
+{
+    if ( Uri.contains( "tomahawk://" ) )
+        GlobalActionManager::instance()->parseTomahawkLink( Uri );
+    else if ( Uri.contains( "spotify:" ) )
+        GlobalActionManager::instance()->openSpotifyLink( Uri );
+}
+
+
+void
+MprisPlugin::Pause()
+{
+    AudioEngine::instance()->pause();
+}
+
+
+void
+MprisPlugin::Play()
+{
+    AudioEngine::instance()->play();
+}
+
+
+void
+MprisPlugin::PlayPause()
+{
+    AudioEngine::instance()->playPause();
+}
+
+
+void
+MprisPlugin::Previous()
+{
+    AudioEngine::instance()->previous();
+}
+
+
+void
+MprisPlugin::Seek( qlonglong Offset )
+{
+    if ( !canSeek() )
+        return;
+
+    qlonglong seekTime = position() + Offset;
+    if ( seekTime < 0 )
+        AudioEngine::instance()->seek( 0 );
+    else if ( seekTime > AudioEngine::instance()->currentTrackTotalTime()*1000 )
+        Next();
+    // seekTime is in microseconds, but we work internally in milliseconds
+    else
+        AudioEngine::instance()->seek( (qint64) ( seekTime / 1000 ) );
+
+}
+
+
+void
+MprisPlugin::SetPosition( const QDBusObjectPath& TrackId, qlonglong Position )
+{
+    if ( !canSeek() )
+        return;
+
+    if ( TrackId.path() != QString( "/track/" ) + AudioEngine::instance()->currentTrack()->id().replace( "-", "" ) )
+        return;
+
+    if ( ( Position < 0) || ( Position > AudioEngine::instance()->currentTrackTotalTime()*1000 )  )
+        return;
+
+    AudioEngine::instance()->seek( (qint64) (Position / 1000 ) );
+
+}
+
+
+void
+MprisPlugin::Stop()
+{
+    AudioEngine::instance()->stop();
+}
+
+
+// InfoPlugin Methods
+void
+MprisPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+{
+    bool isPlayingInfo = false;
+
+    switch ( pushData.type )
+    {
+        case InfoNowPlaying:
+          isPlayingInfo = true;
+          audioStarted( pushData.infoPair.second );
+          break;
+        case InfoNowPaused:
+          isPlayingInfo = true;
+          audioPaused();
+          break;
+        case InfoNowResumed:
+          isPlayingInfo = true;
+          audioResumed( pushData.infoPair.second );
+          break;
+        case InfoNowStopped:
+          isPlayingInfo = true;
+          audioStopped();
+          break;
+
+        default:
+          break;
+    }
+
+    if ( isPlayingInfo )
+        notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "PlaybackStatus" );
+}
+
+
+void
+MprisPlugin::stateChanged( AudioState newState, AudioState oldState )
+{
+    Q_UNUSED( newState );
+    Q_UNUSED( oldState );
+}
+
+
+/** Audio state slots */
+void
+MprisPlugin::audioStarted( const QVariant& input )
+{
+    if ( !input.canConvert< QVariantMap >() )
+        return;
+
+    QVariantMap map = input.toMap();
+
+    if ( !map.contains( "trackinfo" ) || !map "trackinfo" .canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+        return;
+
+    InfoStringHash hash = map "trackinfo" .value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "title" ) || !hash.contains( "artist" ) || !hash.contains( "album" ) )
+        return;
+
+    m_playbackStatus = "Playing";
+
+    if ( map.contains( "coveruri" ) )
+        m_coverTempFile = map "coveruri" .toString();
+
+    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "Metadata" );
+}
+
+
+void
+MprisPlugin::audioFinished( const QVariant& input )
+{
+    Q_UNUSED( input );
+}
+
+
+void
+MprisPlugin::audioStopped()
+{
+    m_playbackStatus = "Stopped";
+}
+
+
+void
+MprisPlugin::audioPaused()
+{
+    m_playbackStatus = "Paused";
+}
+
+
+void
+MprisPlugin::audioResumed( const QVariant& input )
+{
+    audioStarted( input );
+}
+
+
+void
+MprisPlugin::onVolumeChanged( int volume )
+{
+    Q_UNUSED( volume );
+    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "Volume" );
+}
+
+
+void
+MprisPlugin::onPlaylistChanged( Tomahawk::playlistinterface_ptr playlist )
+{
+    disconnect( this, SLOT( onTrackCountChanged( unsigned int ) ) );
+
+    if ( !playlist.isNull() )
+        connect( playlist.data(), SIGNAL( trackCountChanged( unsigned int ) ),
+            SLOT( onTrackCountChanged( unsigned int ) ) );
+
+    // Notify relevant changes
+    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "LoopStatus" );
+    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "Shuffle" );
+    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanSeek" );
+    onTrackCountChanged( 0 );
+}
+
+
+void
+MprisPlugin::onTrackCountChanged( unsigned int tracks )
+{
+    Q_UNUSED( tracks );
+    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanGoNext" );
+    notifyPropertyChanged( "org.mpris.MediaPlayer2.Player", "CanGoPrevious" );
+
+}
+
+
+void
+MprisPlugin::onSeeked( qint64 ms )
+{
+    qlonglong us = (qlonglong) ( ms*1000 );
+    emit Seeked( us );
+}
+
+
+void
+MprisPlugin::notifyPropertyChanged( const QString& interface, const QString& propertyName )
+{
+    QDBusMessage signal = QDBusMessage::createSignal(
+        "/org/mpris/MediaPlayer2",
+        "org.freedesktop.DBus.Properties",
+        "PropertiesChanged" );
+    signal << interface;
+    QVariantMap changedProps;
+    changedProps.insert(propertyName, property(propertyName.toAscii()));
+    signal << changedProps;
+    signal << QStringList();
+    QDBusConnection::sessionBus().send(signal);
+}
+
+} //ns InfoSystem
+
+} //ns Tomahawk
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::MprisPlugin )

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/mpris/MprisPlugin.h Added

@@ -0,0 +1,183 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 MPRISPLUGIN_H
+#define MPRISPLUGIN_H
+
+#include "audio/AudioEngine.h"
+#include "infosystem/InfoSystem.h"
+#include "infoplugins/InfoPluginDllMacro.h"
+
+#include <QObject>
+#include <QVariant>
+#include <QtDBus/QtDBus>
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class INFOPLUGINDLLEXPORT MprisPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    MprisPlugin();
+    virtual ~MprisPlugin();
+
+    // MPRIS DBus Methods
+
+    // org.mpris.MediaPlayer2
+
+    Q_PROPERTY( bool CanQuit READ canQuit )
+    bool canQuit() const;
+
+    Q_PROPERTY( bool CanRaise READ canRaise )
+    bool canRaise() const;
+
+    Q_PROPERTY( QString DesktopEntry READ desktopEntry )
+    QString desktopEntry() const;
+
+    Q_PROPERTY( bool HasTrackList READ hasTrackList )
+    bool hasTrackList() const;
+
+    Q_PROPERTY( QString Identity READ identity )
+    QString identity() const;
+
+    Q_PROPERTY( QStringList SupportedMimeTypes READ supportedMimeTypes )
+    QStringList supportedMimeTypes() const;
+
+    Q_PROPERTY( QStringList SupportedUriSchemes READ supportedUriSchemes )
+    QStringList supportedUriSchemes() const;
+
+    // org.mpris.MediaPlayer2.Player
+
+    Q_PROPERTY( bool CanControl READ canControl )
+    bool canControl() const;
+
+    Q_PROPERTY( bool CanGoNext READ canGoNext )
+    bool canGoNext() const;
+
+    Q_PROPERTY( bool CanGoPrevious READ canGoPrevious )
+    bool canGoPrevious() const;
+
+    Q_PROPERTY( bool CanPause READ canPause )
+    bool canPause() const;
+
+    Q_PROPERTY( bool CanPlay READ canPlay )
+    bool canPlay() const;
+
+    Q_PROPERTY( bool CanSeek READ canSeek )
+    bool canSeek() const;
+
+    Q_PROPERTY( QString LoopStatus READ loopStatus WRITE setLoopStatus )
+    QString loopStatus() const;
+    void setLoopStatus( const QString& value );
+
+    Q_PROPERTY( double MaximumRate READ maximumRate )
+    double maximumRate() const;
+
+    Q_PROPERTY( QVariantMap Metadata READ metadata )
+    QVariantMap metadata() const;
+
+    Q_PROPERTY( double MinimumRate READ minimumRate )
+    double minimumRate() const;
+
+    Q_PROPERTY( QString PlaybackStatus READ playbackStatus )
+    QString playbackStatus() const;
+
+    Q_PROPERTY( qlonglong Position READ position )
+    qlonglong position() const;
+
+    Q_PROPERTY( double Rate READ rate WRITE setRate )
+    double rate() const;
+    void setRate( double value );
+
+    Q_PROPERTY( bool Shuffle READ shuffle WRITE setShuffle )
+    bool shuffle() const;
+    void setShuffle( bool value );
+
+    Q_PROPERTY( double Volume READ volume WRITE setVolume )
+    double volume() const;
+    void setVolume( double value );
+
+public slots:
+    virtual void notInCacheSlot( const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+    {
+        Q_UNUSED( criteria );
+        Q_UNUSED( requestData );
+    }
+
+    // org.mpris.MediaPlayer2
+    void Raise();
+    void Quit();
+
+    // org.mpris.MediaPlayer2.Player
+    void Next();
+    void OpenUri( const QString& Uri );
+    void Pause();
+    void Play();
+    void PlayPause();
+    void Previous();
+    void Seek( qlonglong Offset );
+    void SetPosition( const QDBusObjectPath& TrackId, qlonglong Position );
+    void Stop();
+
+protected slots:
+    virtual void init();
+    
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+    {
+        Q_UNUSED( requestData );
+    }
+    void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData );
+
+private slots:
+    void stateChanged( AudioState newState, AudioState oldState );
+    void onVolumeChanged( int volume );
+    void onPlaylistChanged( Tomahawk::playlistinterface_ptr );
+    void onTrackCountChanged( unsigned int tracks );
+    void onSeeked( qint64 ms );
+
+signals:
+    void Seeked( qlonglong Position );
+
+private:
+    // Get Info
+
+    // Push Info
+    void audioStarted( const QVariant& input );
+    void audioFinished( const QVariant& input );
+    void audioStopped();
+    void audioPaused();
+    void audioResumed( const QVariant& input );
+
+    // DBus
+    void notifyPropertyChanged( const QString& interface, const QString& propertyName );
+    QString m_playbackStatus;
+    QString m_coverTempFile;
+};
+
+};
+
+}
+
+#endif // MPRISPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/mpris/MprisPluginPlayerAdaptor.cpp Added

@@ -0,0 +1,205 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
+ * Command line was: qdbusxml2cpp -a mprispluginplayeradaptor -c MprisPluginPlayerAdaptor MprisPluginPlayerAdaptor.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#include "MprisPluginPlayerAdaptor.h"
+#include <QtCore/QMetaObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
+/*
+ * Implementation of adaptor class MprisPluginPlayerAdaptor
+ */
+
+MprisPluginPlayerAdaptor::MprisPluginPlayerAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+    // constructor
+    setAutoRelaySignals(true);
+}
+
+MprisPluginPlayerAdaptor::~MprisPluginPlayerAdaptor()
+{
+    // destructor
+}
+
+bool MprisPluginPlayerAdaptor::canControl() const
+{
+    // get the value of property CanControl
+    return qvariant_cast< bool >(parent()->property("CanControl"));
+}
+
+bool MprisPluginPlayerAdaptor::canGoNext() const
+{
+    // get the value of property CanGoNext
+    return qvariant_cast< bool >(parent()->property("CanGoNext"));
+}
+
+bool MprisPluginPlayerAdaptor::canGoPrevious() const
+{
+    // get the value of property CanGoPrevious
+    return qvariant_cast< bool >(parent()->property("CanGoPrevious"));
+}
+
+bool MprisPluginPlayerAdaptor::canPause() const
+{
+    // get the value of property CanPause
+    return qvariant_cast< bool >(parent()->property("CanPause"));
+}
+
+bool MprisPluginPlayerAdaptor::canPlay() const
+{
+    // get the value of property CanPlay
+    return qvariant_cast< bool >(parent()->property("CanPlay"));
+}
+
+bool MprisPluginPlayerAdaptor::canSeek() const
+{
+    // get the value of property CanSeek
+    return qvariant_cast< bool >(parent()->property("CanSeek"));
+}
+
+QString MprisPluginPlayerAdaptor::loopStatus() const
+{
+    // get the value of property LoopStatus
+    return qvariant_cast< QString >(parent()->property("LoopStatus"));
+}
+
+void MprisPluginPlayerAdaptor::setLoopStatus(const QString &value)
+{
+    // set the value of property LoopStatus
+    parent()->setProperty("LoopStatus", qVariantFromValue(value));
+}
+
+double MprisPluginPlayerAdaptor::maximumRate() const
+{
+    // get the value of property MaximumRate
+    return qvariant_cast< double >(parent()->property("MaximumRate"));
+}
+
+QVariantMap MprisPluginPlayerAdaptor::metadata() const
+{
+    // get the value of property Metadata
+    return qvariant_cast< QVariantMap >(parent()->property("Metadata"));
+}
+
+double MprisPluginPlayerAdaptor::minimumRate() const
+{
+    // get the value of property MinimumRate
+    return qvariant_cast< double >(parent()->property("MinimumRate"));
+}
+
+QString MprisPluginPlayerAdaptor::playbackStatus() const
+{
+    // get the value of property PlaybackStatus
+    return qvariant_cast< QString >(parent()->property("PlaybackStatus"));
+}
+
+qlonglong MprisPluginPlayerAdaptor::position() const
+{
+    // get the value of property Position
+    return qvariant_cast< qlonglong >(parent()->property("Position"));
+}
+
+double MprisPluginPlayerAdaptor::rate() const
+{
+    // get the value of property Rate
+    return qvariant_cast< double >(parent()->property("Rate"));
+}
+
+void MprisPluginPlayerAdaptor::setRate(double value)
+{
+    // set the value of property Rate
+    parent()->setProperty("Rate", qVariantFromValue(value));
+}
+
+bool MprisPluginPlayerAdaptor::shuffle() const
+{
+    // get the value of property Shuffle
+    return qvariant_cast< bool >(parent()->property("Shuffle"));
+}
+
+void MprisPluginPlayerAdaptor::setShuffle(bool value)
+{
+    // set the value of property Shuffle
+    parent()->setProperty("Shuffle", qVariantFromValue(value));
+}
+
+double MprisPluginPlayerAdaptor::volume() const
+{
+    // get the value of property Volume
+    return qvariant_cast< double >(parent()->property("Volume"));
+}
+
+void MprisPluginPlayerAdaptor::setVolume(double value)
+{
+    // set the value of property Volume
+    parent()->setProperty("Volume", qVariantFromValue(value));
+}
+
+void MprisPluginPlayerAdaptor::Next()
+{
+    // handle method call org.mpris.MediaPlayer2.Player.Next
+    QMetaObject::invokeMethod(parent(), "Next");
+}
+
+void MprisPluginPlayerAdaptor::OpenUri(const QString &Uri)
+{
+    // handle method call org.mpris.MediaPlayer2.Player.OpenUri
+    QMetaObject::invokeMethod(parent(), "OpenUri", Q_ARG(QString, Uri));
+}
+
+void MprisPluginPlayerAdaptor::Pause()
+{
+    // handle method call org.mpris.MediaPlayer2.Player.Pause
+    QMetaObject::invokeMethod(parent(), "Pause");
+}
+
+void MprisPluginPlayerAdaptor::Play()
+{
+    // handle method call org.mpris.MediaPlayer2.Player.Play
+    QMetaObject::invokeMethod(parent(), "Play");
+}
+
+void MprisPluginPlayerAdaptor::PlayPause()
+{
+    // handle method call org.mpris.MediaPlayer2.Player.PlayPause
+    QMetaObject::invokeMethod(parent(), "PlayPause");
+}
+
+void MprisPluginPlayerAdaptor::Previous()
+{
+    // handle method call org.mpris.MediaPlayer2.Player.Previous
+    QMetaObject::invokeMethod(parent(), "Previous");
+}
+
+void MprisPluginPlayerAdaptor::Seek(qlonglong Offset)
+{
+    qDebug() << Q_FUNC_INFO;
+    // handle method call org.mpris.MediaPlayer2.Player.Seek
+    QMetaObject::invokeMethod(parent(), "Seek", Q_ARG(qlonglong, Offset));
+}
+
+void MprisPluginPlayerAdaptor::SetPosition(const QDBusObjectPath &TrackId, qlonglong Position)
+{
+    qDebug() << Q_FUNC_INFO;
+    // handle method call org.mpris.MediaPlayer2.Player.SetPosition
+    QMetaObject::invokeMethod(parent(), "SetPosition", Q_ARG(QDBusObjectPath, TrackId), Q_ARG(qlonglong, Position));
+}
+
+void MprisPluginPlayerAdaptor::Stop()
+{
+    // handle method call org.mpris.MediaPlayer2.Player.Stop
+    QMetaObject::invokeMethod(parent(), "Stop");
+}
+

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/mpris/MprisPluginPlayerAdaptor.h Added

@@ -0,0 +1,140 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
+ * Command line was: qdbusxml2cpp -a mprispluginplayeradaptor -c MprisPluginPlayerAdaptor MprisPluginPlayerAdaptor.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#ifndef MPRISPLUGINPLAYERADAPTOR_H_1313089554
+#define MPRISPLUGINPLAYERADAPTOR_H_1313089554
+
+#include <QtCore/QObject>
+#include <QtDBus/QtDBus>
+
+class QByteArray;
+template<class T> class QList;
+template<class Key, class Value> class QMap;
+class QString;
+class QStringList;
+class QVariant;
+
+/*
+ * Adaptor class for interface org.mpris.MediaPlayer2.Player
+ */
+class MprisPluginPlayerAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.mpris.MediaPlayer2.Player")
+    Q_CLASSINFO("D-Bus Introspection", ""
+"  <interface name=\"org.mpris.MediaPlayer2.Player\">\n"
+"    <method name=\"Next\"/>\n"
+"    <method name=\"Previous\"/>\n"
+"    <method name=\"Pause\"/>\n"
+"    <method name=\"PlayPause\"/>\n"
+"    <method name=\"Stop\"/>\n"
+"    <method name=\"Play\"/>\n"
+"    <method name=\"Seek\">\n"
+"      <arg direction=\"in\" type=\"x\" name=\"Offset\"/>\n"
+"    </method>\n"
+"    <method name=\"SetPosition\">\n"
+"      <arg direction=\"in\" type=\"o\" name=\"TrackId\"/>\n"
+"      <arg direction=\"in\" type=\"x\" name=\"Position\"/>\n"
+"    </method>\n"
+"    <method name=\"OpenUri\">\n"
+"      <arg direction=\"in\" type=\"s\" name=\"Uri\"/>\n"
+"    </method>\n"
+"    <signal name=\"Seeked\">\n"
+"      <arg direction=\"out\" type=\"x\" name=\"Position\"/>\n"
+"    </signal>\n"
+"    <property access=\"read\" type=\"s\" name=\"PlaybackStatus\"/>\n"
+"    <property access=\"readwrite\" type=\"s\" name=\"LoopStatus\"/>\n"
+"    <property access=\"readwrite\" type=\"d\" name=\"Rate\"/>\n"
+"    <property access=\"readwrite\" type=\"b\" name=\"Shuffle\"/>\n"
+"    <property access=\"read\" type=\"a{sv}\" name=\"Metadata\">\n"
+"      <annotation value=\"QVariantMap\" name=\"com.trolltech.QtDBus.QtTypeName\"/>\n"
+"    </property>\n"
+"    <property access=\"readwrite\" type=\"d\" name=\"Volume\"/>\n"
+"    <property access=\"read\" type=\"x\" name=\"Position\"/>\n"
+"    <property access=\"read\" type=\"d\" name=\"MinimumRate\"/>\n"
+"    <property access=\"read\" type=\"d\" name=\"MaximumRate\"/>\n"
+"    <property access=\"read\" type=\"b\" name=\"CanGoNext\"/>\n"
+"    <property access=\"read\" type=\"b\" name=\"CanGoPrevious\"/>\n"
+"    <property access=\"read\" type=\"b\" name=\"CanPlay\"/>\n"
+"    <property access=\"read\" type=\"b\" name=\"CanPause\"/>\n"
+"    <property access=\"read\" type=\"b\" name=\"CanSeek\"/>\n"
+"    <property access=\"read\" type=\"b\" name=\"CanControl\"/>\n"
+"  </interface>\n"
+        "")
+public:
+    MprisPluginPlayerAdaptor(QObject *parent);
+    virtual ~MprisPluginPlayerAdaptor();
+
+public: // PROPERTIES
+    Q_PROPERTY(bool CanControl READ canControl)
+    bool canControl() const;
+
+    Q_PROPERTY(bool CanGoNext READ canGoNext)
+    bool canGoNext() const;
+
+    Q_PROPERTY(bool CanGoPrevious READ canGoPrevious)
+    bool canGoPrevious() const;
+
+    Q_PROPERTY(bool CanPause READ canPause)
+    bool canPause() const;
+
+    Q_PROPERTY(bool CanPlay READ canPlay)
+    bool canPlay() const;
+
+    Q_PROPERTY(bool CanSeek READ canSeek)
+    bool canSeek() const;
+
+    Q_PROPERTY(QString LoopStatus READ loopStatus WRITE setLoopStatus)
+    QString loopStatus() const;
+    void setLoopStatus(const QString &value);
+
+    Q_PROPERTY(double MaximumRate READ maximumRate)
+    double maximumRate() const;
+
+    Q_PROPERTY(QVariantMap Metadata READ metadata)
+    QVariantMap metadata() const;
+
+    Q_PROPERTY(double MinimumRate READ minimumRate)
+    double minimumRate() const;
+
+    Q_PROPERTY(QString PlaybackStatus READ playbackStatus)
+    QString playbackStatus() const;
+
+    Q_PROPERTY(qlonglong Position READ position)
+    qlonglong position() const;
+
+    Q_PROPERTY(double Rate READ rate WRITE setRate)
+    double rate() const;
+    void setRate(double value);
+
+    Q_PROPERTY(bool Shuffle READ shuffle WRITE setShuffle)
+    bool shuffle() const;
+    void setShuffle(bool value);
+
+    Q_PROPERTY(double Volume READ volume WRITE setVolume)
+    double volume() const;
+    void setVolume(double value);
+
+public Q_SLOTS: // METHODS
+    void Next();
+    void OpenUri(const QString &Uri);
+    void Pause();
+    void Play();
+    void PlayPause();
+    void Previous();
+    void Seek(qlonglong Offset);
+    void SetPosition(const QDBusObjectPath &TrackId, qlonglong Position);
+    void Stop();
+Q_SIGNALS: // SIGNALS
+    void Seeked(qlonglong Position);
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/mpris/MprisPluginPlayerAdaptor.xml Changed

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/mpris/MprisPluginRootAdaptor.cpp Added

@@ -0,0 +1,92 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
+ * Command line was: qdbusxml2cpp -a mprispluginrootadaptor -c MprisPluginRootAdaptor MprisPluginRootAdaptor.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * Do not edit! All changes made to it will be lost.
+ */
+
+#include "MprisPluginRootAdaptor.h"
+#include <QtCore/QMetaObject>
+#include <QtCore/QByteArray>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QVariant>
+
+/*
+ * Implementation of adaptor class MprisPluginRootAdaptor
+ */
+
+MprisPluginRootAdaptor::MprisPluginRootAdaptor(QObject *parent)
+    : QDBusAbstractAdaptor(parent)
+{
+    // constructor
+    setAutoRelaySignals(true);
+}
+
+MprisPluginRootAdaptor::~MprisPluginRootAdaptor()
+{
+    // destructor
+}
+
+bool MprisPluginRootAdaptor::canQuit() const
+{
+    // get the value of property CanQuit
+    return qvariant_cast< bool >(parent()->property("CanQuit"));
+}
+
+bool MprisPluginRootAdaptor::canRaise() const
+{
+    qDebug() << Q_FUNC_INFO;
+    // get the value of property CanRaise
+    bool ret = qvariant_cast< bool >(parent()->property("CanRaise"));
+    qDebug() << "ret: " << ret;
+    return ret;
+}
+
+QString MprisPluginRootAdaptor::desktopEntry() const
+{
+    // get the value of property DesktopEntry
+    return qvariant_cast< QString >(parent()->property("DesktopEntry"));
+}
+
+bool MprisPluginRootAdaptor::hasTrackList() const
+{
+    // get the value of property HasTrackList
+    return qvariant_cast< bool >(parent()->property("HasTrackList"));
+}
+
+QString MprisPluginRootAdaptor::identity() const
+{
+    // get the value of property Identity
+    return qvariant_cast< QString >(parent()->property("Identity"));
+}
+
+QStringList MprisPluginRootAdaptor::supportedMimeTypes() const
+{
+    // get the value of property SupportedMimeTypes
+    return qvariant_cast< QStringList >(parent()->property("SupportedMimeTypes"));
+}
+
+QStringList MprisPluginRootAdaptor::supportedUriSchemes() const
+{
+    // get the value of property SupportedUriSchemes
+    return qvariant_cast< QStringList >(parent()->property("SupportedUriSchemes"));
+}
+
+void MprisPluginRootAdaptor::Quit()
+{
+    // handle method call org.mpris.MediaPlayer2.Quit
+    QMetaObject::invokeMethod(parent(), "Quit");
+}
+
+void MprisPluginRootAdaptor::Raise()
+{
+    // handle method call org.mpris.MediaPlayer2.Raise
+    QMetaObject::invokeMethod(parent(), "Raise");
+}
+

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/mpris/MprisPluginRootAdaptor.h Added

@@ -0,0 +1,77 @@
+/*
+ * This file was generated by qdbusxml2cpp version 0.7
+ * Command line was: qdbusxml2cpp -a mprispluginrootadaptor -c MprisPluginRootAdaptor MprisPluginRootAdaptor.xml
+ *
+ * qdbusxml2cpp is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * This is an auto-generated file.
+ * This file may have been hand-edited. Look for HAND-EDIT comments
+ * before re-generating it.
+ */
+
+#ifndef MPRISPLUGINROOTADAPTOR_H_1312900930
+#define MPRISPLUGINROOTADAPTOR_H_1312900930
+
+#include <QtCore/QObject>
+#include <QtDBus/QtDBus>
+
+class QByteArray;
+template<class T> class QList;
+template<class Key, class Value> class QMap;
+class QString;
+class QStringList;
+class QVariant;
+
+/*
+ * Adaptor class for interface org.mpris.MediaPlayer2
+ */
+class MprisPluginRootAdaptor: public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.mpris.MediaPlayer2")
+    Q_CLASSINFO("D-Bus Introspection", ""
+"  <interface name=\"org.mpris.MediaPlayer2\">\n"
+"    <method name=\"Raise\"/>\n"
+"    <method name=\"Quit\"/>\n"
+"    <property access=\"read\" type=\"b\" name=\"CanQuit\"/>\n"
+"    <property access=\"read\" type=\"b\" name=\"CanRaise\"/>\n"
+"    <property access=\"read\" type=\"b\" name=\"HasTrackList\"/>\n"
+"    <property access=\"read\" type=\"s\" name=\"Identity\"/>\n"
+"    <property access=\"read\" type=\"s\" name=\"DesktopEntry\"/>\n"
+"    <property access=\"read\" type=\"as\" name=\"SupportedUriSchemes\"/>\n"
+"    <property access=\"read\" type=\"as\" name=\"SupportedMimeTypes\"/>\n"
+"  </interface>\n"
+        "")
+public:
+    MprisPluginRootAdaptor(QObject *parent);
+    virtual ~MprisPluginRootAdaptor();
+
+public: // PROPERTIES
+    Q_PROPERTY(bool CanQuit READ canQuit)
+    bool canQuit() const;
+
+    Q_PROPERTY(bool CanRaise READ canRaise)
+    bool canRaise() const;
+
+    Q_PROPERTY(QString DesktopEntry READ desktopEntry)
+    QString desktopEntry() const;
+
+    Q_PROPERTY(bool HasTrackList READ hasTrackList)
+    bool hasTrackList() const;
+
+    Q_PROPERTY(QString Identity READ identity)
+    QString identity() const;
+
+    Q_PROPERTY(QStringList SupportedMimeTypes READ supportedMimeTypes)
+    QStringList supportedMimeTypes() const;
+
+    Q_PROPERTY(QStringList SupportedUriSchemes READ supportedUriSchemes)
+    QStringList supportedUriSchemes() const;
+
+public Q_SLOTS: // METHODS
+    void Quit();
+    void Raise();
+Q_SIGNALS: // SIGNALS
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/infoplugins/linux/mpris/MprisPluginRootAdaptor.xml Changed

tomahawk-0.5.5.tar.bz2/src/infoplugins/mac Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/mac/CMakeLists.txt Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/mac/adium Added

tomahawk-0.5.5.tar.bz2/src/infoplugins/mac/adium/Adium.h Added

@@ -0,0 +1,26 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 ADIUM_TOMAHAWK_H
+#define ADIUM_TOMAHAWK_H
+#include <string>
+
+void script( const char* status );
+
+#endif

tomahawk-0.5.5.tar.bz2/src/infoplugins/mac/adium/Adium.mm Added

@@ -0,0 +1,32 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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/>.
+ */
+
+#import <Foundation/Foundation.h>
+#import <ScriptingBridge/ScriptingBridge.h>
+#import "Adium.h"
+
+void
+script( const char* status )
+{
+    NSString *stat = NSString stringWithUTF8String:status;
+    NSAppleScript *appleScript = NSAppleScript alloc initWithSource:stat;
+    NSDictionary *errorDictionary;
+    NSAppleEventDescriptor *eventDescriptor = appleScript executeAndReturnError:&errorDictionary;
+    appleScript release;
+}

tomahawk-0.5.5.tar.bz2/src/infoplugins/mac/adium/AdiumPlugin.cpp Added

@@ -0,0 +1,220 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 <string.h>
+
+#include <QtPlugin>
+#include <QTimer>
+
+#include "infosystem/InfoSystemWorker.h"
+#include "Artist.h"
+#include "Result.h"
+#include "TomahawkSettings.h"
+#include "GlobalActionManager.h"
+#include "utils/Logger.h"
+
+#include "AdiumPlugin.h"
+#include "Adium.h"
+
+QString adium_beforeStatus;
+QString adium_afterStatus;
+
+static void setStatus(const QString &status)
+{
+    // The command that updates the status
+    QString scriptqstr;
+    scriptqstr.append(adium_beforeStatus);
+    scriptqstr.append(status);
+    scriptqstr.append(adium_afterStatus);
+
+    const char* scriptstr = scriptqstr.toUtf8();
+    script( scriptstr );
+}
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+AdiumPlugin::AdiumPlugin()
+    : InfoPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    adium_beforeStatus = "if appIsRunning(\"Adium\") then\n";
+    adium_beforeStatus.append("tell application \"Adium\"\n");
+    adium_beforeStatus.append("set the status message of every account to \"");
+
+    adium_afterStatus.append("\"\nend tell\n");
+    adium_afterStatus.append("end if\n");
+    adium_afterStatus.append("on appIsRunning(appName)\n");
+    adium_afterStatus.append("tell application \"System Events\" to (name of processes) contains appName\n");
+    adium_afterStatus.append("end appIsRunning\n");
+
+    m_supportedPushTypes << InfoNowPlaying << InfoNowPaused << InfoNowResumed << InfoNowStopped;
+
+    m_active = TomahawkSettings::instance()->nowPlayingEnabled();
+
+    connect( TomahawkSettings::instance(), SIGNAL( changed() ),
+                                             SLOT( settingsChanged() ), Qt::QueuedConnection );
+
+    m_pauseTimer = new QTimer( this );
+    m_pauseTimer->setSingleShot( true );
+    connect( m_pauseTimer, SIGNAL( timeout() ),
+             this, SLOT( clearStatus() ) );
+}
+
+
+AdiumPlugin::~AdiumPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+    if( m_active )
+      setStatus( "" );
+}
+
+
+void
+AdiumPlugin::clearStatus()
+{
+    qDebug() << Q_FUNC_INFO;
+    setStatus( "" );
+}
+
+
+void
+AdiumPlugin::settingsChanged()
+{
+    m_active = TomahawkSettings::instance()->nowPlayingEnabled();
+}
+
+
+void
+AdiumPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+{
+    qDebug() << Q_FUNC_INFO;
+
+    if( !m_active )
+        return;
+
+    switch ( pushData.type )
+    {
+        case InfoNowPlaying:
+          audioStarted( pushData.infoPair );
+          break;
+        case InfoNowPaused:
+          audioPaused();
+          return;
+        case InfoNowResumed:
+          audioResumed( pushData.infoPair );
+          break;
+        case InfoNowStopped:
+          audioStopped();
+          break;
+
+        default:
+          return;
+    }
+
+    // Stop the pause timer always, unless pausing of course
+    m_pauseTimer->stop();
+}
+
+
+/** Audio state slots */
+void
+AdiumPlugin::audioStarted( const Tomahawk::InfoSystem::PushInfoPair pushInfoPair )
+{
+    if ( !pushInfoPair.second.canConvert< QVariantMap >() )
+        return;
+
+    QVariantMap map = pushInfoPair.second.toMap();
+
+    if ( map.contains( "private" ) && map "private"  == TomahawkSettings::FullyPrivate )
+        return;
+
+    if ( !map.contains( "trackinfo" ) || !map "trackinfo" .canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+        return;
+
+    InfoStringHash hash = map "trackinfo" .value< Tomahawk::InfoSystem::InfoStringHash >();
+
+    if ( !hash.contains( "title" ) || !hash.contains( "artist" ) )
+        return;
+
+    m_currentTitle = hash"title";
+    m_currentArtist = hash"artist";
+
+    // Request a short URL
+    m_currentLongUrl = GlobalActionManager::instance()->openLink( hash.value( "title" ), hash.value( "artist" ), hash.value( "album" ) );
+
+    QUrl shortUrl = m_currentLongUrl;
+    if ( pushInfoPair.first.contains( "shortUrl" ) )
+        shortUrl = pushInfoPair.first "shortUrl" .toUrl();
+
+    QString nowPlaying = "";
+    nowPlaying.append( m_currentArtist );
+    nowPlaying.append(" - ");
+    nowPlaying.append( m_currentTitle );
+    nowPlaying.replace( "\"", "\\\"" );  // Escape quotes, or Applescript gets confused
+
+    // We failed to get the short URL, just update the status with the metadata
+    if( ( m_currentLongUrl.toString() == "" ) )
+    {
+        setStatus( nowPlaying );
+        return;
+    }
+
+    // Add the short URL
+    nowPlaying.append( " " );
+    nowPlaying.append( shortUrl.toEncoded() );
+    setStatus( nowPlaying );
+}
+
+void
+AdiumPlugin::audioFinished( const QVariant &input )
+{
+    //qDebug() << Q_FUNC_INFO;
+}
+
+void
+AdiumPlugin::audioStopped()
+{
+    qDebug() << Q_FUNC_INFO;
+    setStatus( "" );
+}
+
+void
+AdiumPlugin::audioPaused()
+{
+    qDebug() << Q_FUNC_INFO;
+    m_pauseTimer->start( 60 * 1000 );
+}
+
+void
+AdiumPlugin::audioResumed( const Tomahawk::InfoSystem::PushInfoPair pushInfoPair )
+{
+    qDebug() << Q_FUNC_INFO;
+    audioStarted( pushInfoPair );
+}
+
+} //ns InfoSystem
+
+} //ns Tomahawk
+
+Q_EXPORT_PLUGIN2( Tomahawk::InfoSystem::InfoPlugin, Tomahawk::InfoSystem::AdiumPlugin )

tomahawk-0.5.5.tar.bz2/src/infoplugins/mac/adium/AdiumPlugin.h Added

@@ -0,0 +1,92 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 ADIUMPLUGIN_H
+#define ADIUMPLUGIN_H
+
+#include "infoplugins/InfoPluginDllMacro.h"
+#include "infosystem/InfoSystem.h"
+
+#include <QNetworkAccessManager>
+#include <QObject>
+#include <QVariant>
+#include <QWeakPointer>
+
+class QTimer;
+
+namespace Tomahawk {
+
+namespace InfoSystem {
+
+class INFOPLUGINDLLEXPORT AdiumPlugin : public InfoPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES( Tomahawk::InfoSystem::InfoPlugin )
+
+public:
+    AdiumPlugin();
+    virtual ~AdiumPlugin();
+
+protected slots:
+    virtual void init() {}
+    
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+    {
+        Q_UNUSED( requestData );
+    }
+
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData );
+
+public slots:
+    virtual void notInCacheSlot( const Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+    {
+        Q_UNUSED( criteria );
+        Q_UNUSED( requestData );
+    }
+
+private slots:
+    void clearStatus();
+    void settingsChanged();
+
+private:
+    void audioStarted( const Tomahawk::InfoSystem::PushInfoPair pushInfoPair );
+    void audioFinished( const QVariant &input );
+    void audioStopped();
+    void audioPaused();
+    void audioResumed( const Tomahawk::InfoSystem::PushInfoPair pushInfoPair );
+
+    bool m_active;
+    QString m_beforeStatus;
+    QString m_afterStatus;
+
+    QString m_currentTitle;
+    QString m_currentArtist;
+    QUrl m_currentLongUrl;
+
+    QTimer* m_pauseTimer;
+    QWeakPointer<QNetworkAccessManager> m_nam;
+
+};
+
+
+}
+
+}
+
+#endif // ADIUMPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/AclRegistry.cpp Added

@@ -0,0 +1,338 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "AclRegistry.h"
+
+#include <QThread>
+#include <QVariant>
+
+#include "TomahawkSettings.h"
+#include "TomahawkApp.h"
+#include "Source.h"
+
+#ifndef ENABLE_HEADLESS
+    #include "accounts/AccountManager.h"
+    #include "accounts/Account.h"
+    #include "jobview/AclJobItem.h"
+    #include "jobview/JobStatusView.h"
+    #include "jobview/JobStatusModel.h"
+#endif
+
+#include "utils/Logger.h"
+
+
+QDataStream& operator<<( QDataStream &out, const ACLRegistry::User &user )
+{
+    out << ACLUSERVERSION;
+    out << user.uuid;
+    out << user.friendlyName;
+    out << user.knownDbids.length();
+    foreach( QString knownDbid, user.knownDbids )
+        out << knownDbid;
+    out << user.knownAccountIds.length();
+    foreach( QString knownAccount, user.knownAccountIds )
+        out << knownAccount;
+    out << (int)( user.acl );
+    return out;
+}
+
+QDataStream& operator>>( QDataStream &in, ACLRegistry::User &user )
+{
+    int ver;
+    in >> ver;
+    if ( ver == ACLUSERVERSION )
+    {
+        in >> user.uuid;
+        in >> user.friendlyName;
+        int dbidsLength;
+        in >> dbidsLength;
+        QString knownDbid;
+        for ( int i = 0; i < dbidsLength; i++ )
+        {
+            in >> knownDbid;
+            user.knownDbids << knownDbid;
+        }
+        int accountsLength;
+        in >> accountsLength;
+        QString knownAccountId;
+        for ( int i = 0; i < accountsLength; i++ )
+        {
+            in >> knownAccountId;
+            user.knownAccountIds << knownAccountId;
+        }
+        int aclIn;
+        in >> aclIn;
+        user.acl = (ACLRegistry::ACL)( aclIn );
+    }
+    return in;
+}
+
+
+ACLRegistry* ACLRegistry::s_instance = 0;
+
+ACLRegistry*
+ACLRegistry::instance()
+{
+    if( !s_instance )
+        new ACLRegistry();
+    return s_instance;
+}
+
+
+ACLRegistry::ACLRegistry( QObject* parent )
+    : QObject( parent )
+    , m_jobCount( 0 )
+{
+    s_instance = this;
+    qRegisterMetaType< ACLRegistry::ACL >( "ACLRegistry::ACL" );
+    qRegisterMetaType< ACLRegistry::User >( "ACLRegistry::User" );
+    qRegisterMetaTypeStreamOperators< ACLRegistry::User >( "ACLRegistry::User" );
+    load();
+}
+
+
+ACLRegistry::~ACLRegistry()
+{
+}
+
+
+ACLRegistry::ACL
+ACLRegistry::isAuthorizedUser( const QString& dbid, const QString &username, ACLRegistry::ACL globalType, bool skipEmission )
+{
+    tLog() << Q_FUNC_INFO;
+    if ( QThread::currentThread() != TOMAHAWK_APPLICATION::instance()->thread() )
+    {
+        if ( !skipEmission )
+            QMetaObject::invokeMethod( this, "isAuthorizedUser", Qt::QueuedConnection, Q_ARG( const QString&, dbid ), Q_ARG( const QString &, username ), Q_ARG( ACLRegistry::ACL, globalType ), Q_ARG( bool, skipEmission ) );
+        return ACLRegistry::NotFound;
+    }
+
+#ifndef ENABLE_HEADLESS
+    if ( Tomahawk::Accounts::AccountManager::instance() )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Checking account friendly names against" << username;
+        Tomahawk::Accounts::AccountManager* accountManager = Tomahawk::Accounts::AccountManager::instance();
+        QList< Tomahawk::Accounts::Account* > accounts = accountManager->accounts();
+        foreach( Tomahawk::Accounts::Account* account, accounts )
+        {
+            if ( !( account->types() & Tomahawk::Accounts::SipType ) )
+                continue;
+            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Checking against account friendly name" << account->accountFriendlyName();
+            if ( account->accountFriendlyName() == username )
+            {
+                if ( !skipEmission )
+                    emit aclResult( dbid, username, ACLRegistry::Stream );
+                return ACLRegistry::Stream;
+            }
+        }
+    }
+#endif
+    
+    bool found = false;
+    QMutableListIterator< ACLRegistry::User > i( m_cache );
+    while ( i.hasNext() )
+    {
+        ACLRegistry::User user = i.next();
+        foreach ( QString knowndbid, user.knownDbids )
+        {
+            if ( dbid == knowndbid )
+            {
+                if ( !user.knownAccountIds.contains( username ) )
+                    user.knownAccountIds.append( username );
+                found = true;
+            }
+        }
+
+        foreach ( QString knownaccountid, user.knownAccountIds )
+        {
+            if ( username == knownaccountid )
+            {
+                if ( !user.knownDbids.contains( dbid ) )
+                    user.knownDbids.append( dbid );
+                found = true;
+            }
+        }
+
+        if ( found )
+        {
+            if ( !skipEmission )
+                emit aclResult( dbid, username, user.acl );
+            i.setValue( user );
+            return user.acl;
+        }
+    }
+
+    if ( skipEmission )
+        return ACLRegistry::NotFound;
+
+    // User was not found, create a new user entry
+    ACLRegistry::User user;
+    user.knownDbids.append( dbid );
+    user.knownAccountIds.append( username );
+    if ( globalType != ACLRegistry::NotFound )
+        user.acl = globalType;
+#ifdef ENABLE_HEADLESS
+    user.acl = ACLRegistry::Stream;
+#else
+    if ( !TomahawkUtils::headless() )
+    {
+        getUserDecision( user, username );
+        return ACLRegistry::NotFound;
+    }
+    else
+        user.acl = ACLRegistry::Stream;
+#endif
+
+    m_cache.append( user );
+    save();
+    emit aclResult( dbid, username, user.acl );
+    return user.acl;
+}
+
+
+#ifndef ENABLE_HEADLESS
+
+void
+ACLRegistry::getUserDecision( ACLRegistry::User user, const QString &username )
+{
+    if ( TomahawkUtils::headless() )
+        return;
+    
+    tLog() << Q_FUNC_INFO;
+    AclJobItem* job = new AclJobItem( user, username );
+    m_jobQueue.enqueue( job );
+    QTimer::singleShot( 0, this, SLOT( queueNextJob() ) );
+}
+
+
+void
+ACLRegistry::userDecision( ACLRegistry::User user )
+{
+    if ( TomahawkUtils::headless() )
+        return;
+    
+    tLog() << Q_FUNC_INFO;
+    m_cache.append( user );
+    save();
+    emit aclResult( user.knownDbids.first(), user.knownAccountIds.first(), user.acl );
+
+    m_jobCount--;
+    if ( !m_jobQueue.isEmpty() )
+        QTimer::singleShot( 0, this, SLOT( queueNextJob() ) );
+}
+
+
+void
+ACLRegistry::queueNextJob()
+{
+    if ( TomahawkUtils::headless() )
+        return;
+    
+    if ( QThread::currentThread() != TOMAHAWK_APPLICATION::instance()->thread() )
+    {
+        QMetaObject::invokeMethod( this, "queueNextJob", Qt::QueuedConnection );
+        return;
+    }
+    tLog() << Q_FUNC_INFO << "jobCount = " << m_jobCount;
+    tLog() << Q_FUNC_INFO << "jobQueue size = " << m_jobQueue.length();
+    if ( m_jobCount != 0 )
+        return;
+
+    if ( !m_jobQueue.isEmpty() )
+    {
+        AclJobItem* job = m_jobQueue.dequeue();
+        ACLRegistry::User user = job->user();
+        bool found = false;
+        foreach( QString dbid, user.knownDbids )
+        {
+            ACLRegistry::ACL acl = isAuthorizedUser( dbid, job->username(), ACLRegistry::NotFound, true );
+            if ( acl != ACLRegistry::NotFound )
+            {
+                tLog() << Q_FUNC_INFO << "Found existing acl entry for = " << user.knownAccountIds.first();
+                found = true;
+                break;
+            }
+        }
+        if ( found )
+        {
+            tLog() << Q_FUNC_INFO << "deleting job, already have ACL for " << user.knownAccountIds.first();
+            delete job;
+            QTimer::singleShot( 0, this, SLOT( queueNextJob() ) );
+            return;
+        }
+        else
+        {
+            tLog() << Q_FUNC_INFO << "activating job for user" << user.knownAccountIds.first();
+            m_jobCount++;
+            JobStatusView::instance()->model()->addJob( job );
+            connect( job, SIGNAL( userDecision( ACLRegistry::User ) ), this, SLOT( userDecision( ACLRegistry::User ) ) );
+        }
+    }
+}
+
+#endif
+
+
+void
+ACLRegistry::load()
+{
+    tLog() << Q_FUNC_INFO;
+    QVariantList entryList = TomahawkSettings::instance()->aclEntries();
+    foreach ( QVariant entry, entryList )
+    {
+        if ( !entry.isValid() || !entry.canConvert< ACLRegistry::User >() )
+        {
+            tLog() << Q_FUNC_INFO << "entry is invalid";
+            continue;
+        }
+        tLog() << Q_FUNC_INFO << "loading entry";
+        ACLRegistry::User entryUser = entry.value< ACLRegistry::User >();
+        if ( entryUser.knownAccountIds.empty() || entryUser.knownDbids.empty() )
+        {
+            tLog() << Q_FUNC_INFO << "user known account/dbids is empty";
+            continue;
+        }
+        m_cache.append( entryUser );
+    }
+}
+
+
+void
+ACLRegistry::save()
+{
+    tLog() << Q_FUNC_INFO;
+    QVariantList entryList;
+    foreach ( ACLRegistry::User user, m_cache )
+    {
+        tLog() << Q_FUNC_INFO << "user is " << user.uuid << " with known name " << user.knownAccountIds.first();
+        QVariant val = QVariant::fromValue< ACLRegistry::User >( user );
+        if ( val.isValid() )
+            entryList.append( val );
+    }
+    TomahawkSettings::instance()->setAclEntries( entryList );
+}
+
+
+void
+ACLRegistry::wipeEntries()
+{
+    tLog() << Q_FUNC_INFO;
+    m_cache.clear();
+    save();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/AclRegistry.h Added

@@ -0,0 +1,137 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWK_ACLREGISTRY_H
+#define TOMAHAWK_ACLREGISTRY_H
+
+#include <QObject>
+#include <QString>
+#include <QHash>
+#include <QTimer>
+#include <QMutex>
+#include <QVariant>
+#include <QQueue>
+#include <QStringList>
+#include <QUuid>
+
+#include "HeadlessCheck.h"
+#include "DllMacro.h"
+
+#define ACLUSERVERSION 1
+
+class AclJobItem;
+
+class DLLEXPORT ACLRegistry : public QObject
+{
+    Q_OBJECT
+
+public:
+
+    static ACLRegistry* instance();
+
+    enum ACL {
+        NotFound = 0,
+        Deny = 1,
+        Read = 2,
+        Stream = 3
+    };
+
+    struct User {
+        QString uuid;
+        QString friendlyName;
+        QStringList knownDbids;
+        QStringList knownAccountIds;
+        ACLRegistry::ACL acl;
+
+        User()
+            : uuid( QUuid::createUuid().toString() )
+            , friendlyName()
+            , knownDbids()
+            , knownAccountIds()
+            , acl( ACLRegistry::NotFound )
+            {}
+
+        ~User()
+            {}
+
+        User( QString p_uuid, QString p_friendlyName, QStringList p_knownDbids, QStringList p_knownAccountIds, ACLRegistry::ACL p_acl )
+            : uuid( p_uuid )
+            , friendlyName( p_friendlyName )
+            , knownDbids( p_knownDbids )
+            , knownAccountIds( p_knownAccountIds )
+            , acl( p_acl )
+            {}
+
+        User( const User &other )
+            : uuid( other.uuid )
+            , friendlyName( other.friendlyName )
+            , knownDbids( other.knownDbids )
+            , knownAccountIds( other.knownAccountIds )
+            , acl( other.acl )
+            {}
+    };
+
+    ACLRegistry( QObject *parent = 0 );
+    ~ACLRegistry();
+
+signals:
+    void aclResult( QString nodeid, QString username, ACLRegistry::ACL peerStatus );
+
+public slots:
+    /**
+     * @brief Checks if peer is authorized; optionally, can authorize peer with given type if not found
+     *
+     * @param dbid DBID of peer
+     * @param globalType Global ACL to store if peer not found; if ACLRegistry::NotFound, does not store the peer Defaults to ACLRegistry::NotFound.
+     * @param username If not empty, will store the given username along with the new ACL value. Defaults to QString().
+     * @return ACLRegistry::ACL
+     **/
+    ACLRegistry::ACL isAuthorizedUser( const QString &dbid, const QString &username, ACLRegistry::ACL globalType = ACLRegistry::NotFound, bool skipEmission = false );
+    void wipeEntries();
+    
+#ifndef ENABLE_HEADLESS
+    void getUserDecision( ACLRegistry::User user, const QString &username );
+    
+private slots:
+    void userDecision( ACLRegistry::User user );
+    void queueNextJob();
+#endif
+
+private:
+    /**
+     * @brief Saves the cache.
+     *
+     * @return void
+     **/
+    void save();
+
+    void load();
+
+    QList< ACLRegistry::User > m_cache;
+
+    static ACLRegistry* s_instance;
+
+    QQueue< AclJobItem* > m_jobQueue;
+    int m_jobCount;
+};
+
+Q_DECLARE_METATYPE( ACLRegistry::ACL );
+Q_DECLARE_METATYPE( ACLRegistry::User );
+
+#endif // TOMAHAWK_ACLREGISTRY_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/ActionCollection.cpp Added

@@ -0,0 +1,156 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2012,      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 "ActionCollection.h"
+#include "TomahawkSettings.h"
+#include "audio/AudioEngine.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+ActionCollection* ActionCollection::s_instance = 0;
+ActionCollection* ActionCollection::instance()
+{
+    return s_instance;
+}
+
+
+ActionCollection::ActionCollection( QObject* parent )
+    : QObject( parent )
+{
+    s_instance = this;
+    initActions();
+}
+
+
+ActionCollection::~ActionCollection()
+{
+    s_instance = 0;
+    foreach( QString key, m_actionCollection.keys() )
+        delete m_actionCollection key ;
+}
+
+
+void
+ActionCollection::initActions()
+{
+    QAction *latchOn = new QAction( tr( "&Listen Along" ), this );
+    latchOn->setIcon( QIcon( RESPATH "images/headphones-sidebar.png" ) );
+    m_actionCollection "latchOn"  = latchOn;
+    QAction *latchOff = new QAction( tr( "Stop &Listening Along" ), this );
+    latchOff->setIcon( QIcon( RESPATH "images/headphones-off.png" ) );
+    m_actionCollection "latchOff"  = latchOff;
+
+    QAction *realtimeFollowingAlong = new QAction( tr( "&Follow in real-time" ), this );
+    realtimeFollowingAlong->setCheckable( true );
+    m_actionCollection "realtimeFollowingAlong"  = realtimeFollowingAlong;
+
+    bool isPublic = TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening;
+    QAction *privacyToggle = new QAction( ( isPublic ? tr( "&Listen Privately" ) : tr( "&Listen Publicly" ) ), this );
+    privacyToggle->setIcon( QIcon( RESPATH "images/private-listening.png" ) );
+    privacyToggle->setIconVisibleInMenu( isPublic );
+    m_actionCollection "togglePrivacy"  = privacyToggle;
+    connect( m_actionCollection "togglePrivacy" , SIGNAL( triggered() ), SLOT( togglePrivateListeningMode() ), Qt::UniqueConnection );
+
+    m_actionCollection "loadPlaylist"  = new QAction( tr( "&Load Playlist" ), this );
+    m_actionCollection "renamePlaylist"  = new QAction( tr( "&Rename Playlist" ), this );
+    m_actionCollection "copyPlaylist"  = new QAction( tr( "&Copy Playlist Link" ), this );
+    m_actionCollection "playPause"  = new QAction( tr( "&Play" ), this );
+    m_actionCollection "stop"  = new QAction( tr( "&Stop" ), this );
+    m_actionCollection "previousTrack"  = new QAction( tr( "&Previous Track" ), this );
+    m_actionCollection "nextTrack"  = new QAction( tr( "&Next Track" ), this );
+    m_actionCollection "quit"  = new QAction( tr( "&Quit" ), this );
+
+    // connect actions to AudioEngine
+    AudioEngine *ae = AudioEngine::instance();
+    connect( m_actionCollection "playPause" ,     SIGNAL( triggered() ), ae,   SLOT( playPause() ), Qt::UniqueConnection );
+    connect( m_actionCollection "stop" ,          SIGNAL( triggered() ), ae,   SLOT( stop() ),      Qt::UniqueConnection );
+    connect( m_actionCollection "previousTrack" , SIGNAL( triggered() ), ae,   SLOT( previous() ),  Qt::UniqueConnection );
+    connect( m_actionCollection "nextTrack" ,     SIGNAL( triggered() ), ae,   SLOT( next() ),      Qt::UniqueConnection );
+}
+
+
+void
+ActionCollection::addAction( ActionCollection::ActionDestination category, QAction* action, QObject* notify )
+{
+    QList< QAction* > actions = m_categoryActions.value( category );
+    actions.append( action );
+    m_categoryActions category  = actions;
+
+    if ( notify )
+        m_actionNotifiers action  = notify;
+}
+
+
+QAction*
+ActionCollection::getAction( const QString& name )
+{
+    return m_actionCollection.value( name, 0 );
+}
+
+
+QObject*
+ActionCollection::actionNotifier( QAction* action )
+{
+    return m_actionNotifiers.value( action, 0 );
+}
+
+
+QList< QAction* >
+ActionCollection::getAction( ActionCollection::ActionDestination category )
+{
+    return m_categoryActions.value( category );
+}
+
+
+void
+ActionCollection::removeAction( QAction* action )
+{
+    removeAction( action, LocalPlaylists );
+}
+
+
+void
+ActionCollection::removeAction( QAction* action, ActionCollection::ActionDestination category )
+{
+    QList< QAction* > actions = m_categoryActions.value( category );
+    actions.removeAll( action );
+    m_categoryActions category  = actions;
+
+    m_actionNotifiers.remove( action );
+}
+
+
+void
+ActionCollection::togglePrivateListeningMode()
+{
+    tDebug() << Q_FUNC_INFO;
+    if ( TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening )
+        TomahawkSettings::instance()->setPrivateListeningMode( TomahawkSettings::FullyPrivate );
+    else
+        TomahawkSettings::instance()->setPrivateListeningMode( TomahawkSettings::PublicListening );
+
+    QAction *privacyToggle = m_actionCollection "togglePrivacy" ;
+    bool isPublic = TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening;
+    privacyToggle->setText( ( isPublic ? tr( "&Listen Privately" ) : tr( "&Listen Publicly" ) ) );
+    privacyToggle->setIconVisibleInMenu( isPublic );
+
+    emit privacyModeChanged();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/ActionCollection.h Added

@@ -0,0 +1,90 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>>
+ *   Copyright 2012,      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 TOMAHAWKACTIONCOLLECTION_H
+#define TOMAHAWKACTIONCOLLECTION_H
+
+#include "DllMacro.h"
+
+#include <QtGui/QAction>
+
+class DLLEXPORT ActionCollection : public QObject
+{
+    Q_OBJECT
+
+public:
+    // Categories for custom-registered actions
+    enum ActionDestination {
+//         Tracks, TODO
+        LocalPlaylists = 0
+    };
+
+    static ActionCollection* instance();
+
+    ActionCollection( QObject *parent );
+    ~ActionCollection();
+
+    void initActions();
+
+    QAction* getAction( const QString& name );
+    QList< QAction* > getAction( ActionDestination category );
+    QObject* actionNotifier( QAction* );
+
+    /**
+     * Add an action for a specific category. The action will show up
+     *  where the relevant category is displayed.
+     *
+     *  e.g. if you register a Playlist action, it will be shown when
+     *       there is a context menu shown for a playlist.
+     *
+     * When the QAction* is shown, it will have a "payload" property that is set
+     *  to the <specific type> that is being shown.
+     *
+     * Additionally you can pass a QObject* that will be notified before the given
+     *  action is shown. The slot "aboutToShow( QAction*, <specific type> ) will be called,
+     *
+     *
+     * <specific type> corresponds to the category: playlist_ptr for Playlists, etc.
+     *
+     * The Action Collection takes ownership of the action. It's time to let go.
+     */
+    void addAction( ActionDestination category, QAction* action, QObject* notify = 0 );
+
+    /**
+     * Remove an action from one or all specific categories
+     */
+    void removeAction( QAction* action );
+    void removeAction( QAction* action, ActionDestination category );
+
+public slots:
+    void togglePrivateListeningMode();
+
+signals:
+    void privacyModeChanged();
+
+private:
+    static ActionCollection* s_instance;
+
+    QHash< QString, QAction* > m_actionCollection;
+    QHash< ActionDestination, QList< QAction* > > m_categoryActions;
+    QHash< QAction*, QObject* > m_actionNotifiers;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Album.cpp Added

@@ -0,0 +1,246 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "Album.h"
+
+#include "Artist.h"
+#include "AlbumPlaylistInterface.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "Query.h"
+#include "Source.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+Album::~Album()
+{
+    m_ownRef.clear();
+
+#ifndef ENABLE_HEADLESS
+    delete m_cover;
+#endif
+}
+
+
+album_ptr
+Album::get( const Tomahawk::artist_ptr& artist, const QString& name, bool autoCreate )
+{
+    if ( !Database::instance() || !Database::instance()->impl() )
+        return album_ptr();
+
+    int albid = Database::instance()->impl()->albumId( artist->id(), name, autoCreate );
+    if ( albid < 1 && autoCreate )
+        return album_ptr();
+
+    return Album::get( albid, name, artist );
+}
+
+
+album_ptr
+Album::get( unsigned int id, const QString& name, const Tomahawk::artist_ptr& artist )
+{
+    static QHash< unsigned int, album_ptr > s_albums;
+    static QMutex s_mutex;
+
+    QMutexLocker lock( &s_mutex );
+    if ( s_albums.contains( id ) )
+    {
+        return s_albums.value( id );
+    }
+
+    album_ptr a = album_ptr( new Album( id, name, artist ), &QObject::deleteLater );
+    a->setWeakRef( a.toWeakRef() );
+
+    if ( id > 0 )
+        s_albums.insert( id, a );
+
+    return a;
+}
+
+
+Album::Album( unsigned int id, const QString& name, const Tomahawk::artist_ptr& artist )
+    : QObject()
+    , m_id( id )
+    , m_name( name )
+    , m_artist( artist )
+    , m_coverLoaded( false )
+    , m_coverLoading( false )
+#ifndef ENABLE_HEADLESS
+    , m_cover( 0 )
+#endif
+{
+    m_sortname = DatabaseImpl::sortname( name );
+}
+
+
+void
+Album::onTracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection )
+{
+    emit tracksAdded( playlistInterface( mode, collection )->tracks(), mode, collection );
+}
+
+
+artist_ptr
+Album::artist() const
+{
+    return m_artist;
+}
+
+
+#ifndef ENABLE_HEADLESS
+QPixmap
+Album::cover( const QSize& size, bool forceLoad ) const
+{
+    if ( !m_coverLoaded && !m_coverLoading )
+    {
+        if ( !forceLoad )
+            return QPixmap();
+
+        Tomahawk::InfoSystem::InfoStringHash trackInfo;
+        trackInfo"artist" = artist()->name();
+        trackInfo"album" = name();
+
+        Tomahawk::InfoSystem::InfoRequestData requestData;
+        requestData.caller = infoid();
+        requestData.type = Tomahawk::InfoSystem::InfoAlbumCoverArt;
+        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
+        requestData.customData = QVariantMap();
+
+        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 ) ) );
+
+        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+
+        m_coverLoading = true;
+    }
+
+    if ( !m_cover && !m_coverBuffer.isEmpty() )
+    {
+        m_cover = new QPixmap();
+        m_cover->loadFromData( m_coverBuffer );
+    }
+
+    if ( m_cover && !m_cover->isNull() && !size.isEmpty() )
+    {
+        if ( m_coverCache.contains( size.width() ) )
+        {
+            return m_coverCache.value( size.width() );
+        }
+
+        QPixmap scaledCover;
+        scaledCover = m_cover->scaled( size, Qt::KeepAspectRatio, Qt::SmoothTransformation );
+        m_coverCache.insert( size.width(), scaledCover );
+        return scaledCover;
+    }
+
+    if ( m_cover )
+        return *m_cover;
+    else
+        return QPixmap();
+}
+#endif
+
+
+void
+Album::infoSystemInfo( const Tomahawk::InfoSystem::InfoRequestData& requestData, const QVariant& output )
+{
+    if ( requestData.caller != infoid() ||
+         requestData.type != Tomahawk::InfoSystem::InfoAlbumCoverArt )
+    {
+        return;
+    }
+
+    if ( output.isNull() )
+    {
+        m_coverLoaded = true;
+    }
+    else if ( output.isValid() )
+    {
+        QVariantMap returnedData = output.value< QVariantMap >();
+        const QByteArray ba = returnedData"imgbytes".toByteArray();
+        if ( ba.length() )
+        {
+            m_coverBuffer = ba;
+        }
+
+        m_coverLoaded = true;
+        emit coverChanged();
+    }
+}
+
+
+void
+Album::infoSystemFinished( const QString& target )
+{
+    if ( target != infoid() )
+        return;
+
+    disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                this, SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
+
+    disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ),
+                this, SLOT( infoSystemFinished( QString ) ) );
+
+    m_coverLoading = false;
+
+    emit updated();
+}
+
+
+Tomahawk::playlistinterface_ptr
+Album::playlistInterface( ModelMode mode, const Tomahawk::collection_ptr& collection )
+{
+    playlistinterface_ptr pli = m_playlistInterface mode  collection ;
+
+    if ( pli.isNull() )
+    {
+        pli = Tomahawk::playlistinterface_ptr( new Tomahawk::AlbumPlaylistInterface( this, mode, collection ) );
+        connect( pli.data(), SIGNAL( tracksLoaded( Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                               SLOT( onTracksLoaded( Tomahawk::ModelMode, Tomahawk::collection_ptr ) ) );
+
+        m_playlistInterface mode  collection  = pli;
+    }
+
+    return pli;
+}
+
+
+QList<Tomahawk::query_ptr>
+Album::tracks( ModelMode mode, const Tomahawk::collection_ptr& collection )
+{
+    return playlistInterface( mode, collection )->tracks();
+}
+
+
+QString
+Album::infoid() const
+{
+    if ( m_uuid.isEmpty() )
+        m_uuid = uuid();
+
+    return m_uuid;
+}
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Album.h Added

@@ -0,0 +1,107 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWKALBUM_H
+#define TOMAHAWKALBUM_H
+
+#include "config.h"
+
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+#ifndef ENABLE_HEADLESS
+    #include <QtGui/QPixmap>
+#endif
+
+#include "Typedefs.h"
+#include "PlaylistInterface.h"
+#include "DllMacro.h"
+#include "Collection.h"
+#include "infosystem/InfoSystem.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT Album : public QObject
+{
+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 );
+
+    explicit Album( unsigned int id, const QString& name, const Tomahawk::artist_ptr& artist );
+    virtual ~Album();
+
+    unsigned int id() const { return m_id; }
+    QString name() const { return m_name; }
+    QString sortname() const { return m_sortname; }
+
+    artist_ptr artist() const;
+#ifndef ENABLE_HEADLESS
+    QPixmap cover( const QSize& size, bool forceLoad = true ) const;
+#endif
+    bool coverLoaded() const { return m_coverLoaded; }
+
+    QList<Tomahawk::query_ptr> tracks( ModelMode mode = Mixed, const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr() );
+    Tomahawk::playlistinterface_ptr playlistInterface( ModelMode mode, const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr() );
+
+    QWeakPointer< Tomahawk::Album > weakRef() { return m_ownRef; }
+    void setWeakRef( QWeakPointer< Tomahawk::Album > weakRef ) { m_ownRef = weakRef; }
+
+signals:
+    void tracksAdded( const QList<Tomahawk::query_ptr>& tracks, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
+    void updated();
+    void coverChanged();
+
+private slots:
+    void onTracksLoaded(Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
+
+    void infoSystemInfo( const Tomahawk::InfoSystem::InfoRequestData& requestData, const QVariant& output );
+    void infoSystemFinished( const QString& target );
+
+private:
+    Q_DISABLE_COPY( Album )
+    QString infoid() const;
+
+    unsigned int m_id;
+    QString m_name;
+    QString m_sortname;
+
+    artist_ptr m_artist;
+    QByteArray m_coverBuffer;
+
+    bool m_coverLoaded;
+    mutable bool m_coverLoading;
+    mutable QString m_uuid;
+
+#ifndef ENABLE_HEADLESS
+    mutable QPixmap* m_cover;
+    mutable QHash< int, QPixmap > m_coverCache;
+#endif
+
+    QHash< Tomahawk::ModelMode, QHash< Tomahawk::collection_ptr, Tomahawk::playlistinterface_ptr > > m_playlistInterface;
+
+    QWeakPointer< Tomahawk::Album > m_ownRef;
+};
+
+} // ns
+
+Q_DECLARE_METATYPE( Tomahawk::album_ptr )
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/AlbumPlaylistInterface.cpp Added

@@ -0,0 +1,237 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "AlbumPlaylistInterface.h"
+
+#include "Artist.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "database/DatabaseCommand_AllTracks.h"
+#include "Pipeline.h"
+#include "Query.h"
+#include "Source.h"
+#include "SourceList.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+AlbumPlaylistInterface::AlbumPlaylistInterface( Tomahawk::Album* album, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection )
+    : Tomahawk::PlaylistInterface()
+    , m_currentItem( 0 )
+    , m_currentTrack( 0 )
+    , m_infoSystemLoaded( false )
+    , m_databaseLoaded( false )
+    , m_mode( mode )
+    , m_collection( collection )
+    , m_album( QWeakPointer< Tomahawk::Album >( album ) )
+{
+}
+
+
+AlbumPlaylistInterface::~AlbumPlaylistInterface()
+{
+    m_album.clear();
+}
+
+
+Tomahawk::result_ptr
+AlbumPlaylistInterface::siblingItem( int itemsAway )
+{
+    int p = m_currentTrack;
+    p += itemsAway;
+
+    if ( p < 0 )
+        return Tomahawk::result_ptr();
+
+    if ( p >= m_queries.count() )
+        return Tomahawk::result_ptr();
+
+    if ( !m_queries.at( p )->numResults() )
+        return siblingItem( itemsAway + 1 );
+
+    m_currentTrack = p;
+    m_currentItem = m_queries.at( p )->results().first();
+    return m_currentItem;
+}
+
+
+result_ptr
+AlbumPlaylistInterface::currentItem() const
+{
+    return m_currentItem;
+}
+
+
+bool
+AlbumPlaylistInterface::hasNextItem()
+{
+    int p = m_currentTrack;
+    p++;
+    if ( p < 0 || p >= m_queries.count() )
+        return false;
+
+    return true;
+}
+
+
+QList< Tomahawk::query_ptr >
+AlbumPlaylistInterface::tracks()
+{
+    if ( m_queries.isEmpty() && m_album )
+    {
+        if ( ( m_mode == Mixed || m_mode == InfoSystemMode ) && !m_infoSystemLoaded )
+        {
+            Tomahawk::InfoSystem::InfoStringHash artistInfo;
+            artistInfo"artist" = m_album.data()->artist()->name();
+            artistInfo"album" = m_album.data()->name();
+
+            Tomahawk::InfoSystem::InfoRequestData requestData;
+            requestData.caller = id();
+            requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
+            requestData.type = Tomahawk::InfoSystem::InfoAlbumSongs;
+            requestData.timeoutMillis = 0;
+            requestData.allSources = true;
+            Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+
+            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 ) ) );
+        }
+        else if ( m_mode == DatabaseMode && !m_databaseLoaded )
+        {
+            DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection );
+            cmd->setAlbum( m_album );
+            cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
+
+            connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
+                            SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) );
+
+            Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+        }
+    }
+
+    return m_queries;
+}
+
+
+void
+AlbumPlaylistInterface::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
+{
+    if ( requestData.caller != id() )
+        return;
+
+    switch ( requestData.type )
+    {
+        case Tomahawk::InfoSystem::InfoAlbumSongs:
+        {
+            QVariantMap returnedData = output.value< QVariantMap >();
+            if ( !returnedData.isEmpty() )
+            {
+                Tomahawk::InfoSystem::InfoStringHash inputInfo;
+                inputInfo = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+
+                QStringList tracks = returnedData "tracks" .toStringList();
+                QList<query_ptr> ql;
+
+                //TODO: Figure out how to do this with a multi-disk album without breaking the
+                //      current behaviour. I just know too little about InfoSystem to deal with
+                //      it right now, I've only taken the liberty of adding Query::setDiscNumber
+                //      which should make this easier. --Teo 11/2011
+                unsigned int trackNo = 1;
+
+                foreach ( const QString& trackName, tracks )
+                {
+                    query_ptr query = Query::get( inputInfo "artist" , trackName, inputInfo "album"  );
+                    query->setAlbumPos( trackNo++ );
+                    ql << query;
+                }
+                Pipeline::instance()->resolve( ql );
+
+                m_queries << ql;
+            }
+
+            break;
+        }
+
+        default:
+        {
+            Q_ASSERT( false );
+            break;
+        }
+    }
+
+    if ( !m_queries.isEmpty() )
+    {
+        infoSystemFinished( id() );
+    }
+}
+
+
+void
+AlbumPlaylistInterface::infoSystemFinished( const QString& infoId )
+{
+    if ( infoId != id() )
+        return;
+
+    m_infoSystemLoaded = true;
+    disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                this, SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
+    disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ),
+                this, SLOT( infoSystemFinished( QString ) ) );
+
+    if ( m_queries.isEmpty() && m_mode == Mixed )
+    {
+        DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection );
+        cmd->setAlbum( m_album );
+        //this takes discnumber into account as well
+        cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
+
+        connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
+                        SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) );
+
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+    }
+    else
+    {
+        m_finished = true;
+        emit tracksLoaded( m_mode, m_collection );
+    }
+}
+
+
+void
+AlbumPlaylistInterface::onTracksLoaded( const QList< query_ptr >& tracks )
+{
+    if ( m_collection.isNull() )
+    {
+        m_databaseLoaded = true;
+        m_queries << filterTracks( tracks );
+    }
+    else
+        m_queries << tracks;
+
+    m_finished = true;
+    emit tracksLoaded( m_mode, m_collection );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/AlbumPlaylistInterface.h Added

@@ -0,0 +1,85 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWKALBUMPLAYLISTINTERFACE_H
+#define TOMAHAWKALBUMPLAYLISTINTERFACE_H
+
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+
+#include "Album.h"
+#include "Typedefs.h"
+#include "PlaylistInterface.h"
+#include "infosystem/InfoSystem.h"
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT AlbumPlaylistInterface : public Tomahawk::PlaylistInterface
+{
+Q_OBJECT
+
+public:
+    AlbumPlaylistInterface( Tomahawk::Album* album, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
+    virtual ~AlbumPlaylistInterface();
+
+    QList<Tomahawk::query_ptr> tracks();
+
+    virtual int trackCount() const { return m_queries.count(); }
+    virtual int unfilteredTrackCount() const { return m_queries.count(); }
+
+    virtual Tomahawk::result_ptr siblingItem( int itemsAway );
+
+    virtual bool hasNextItem();
+    virtual Tomahawk::result_ptr currentItem() const;
+
+    virtual PlaylistModes::RepeatMode repeatMode() const { return PlaylistModes::NoRepeat; }
+    virtual bool shuffled() const { return false; }
+
+    virtual void setRepeatMode( PlaylistModes::RepeatMode ) {}
+    virtual void setShuffled( bool ) {}
+
+    virtual void setFilter( const QString& /*pattern*/ ) {}
+
+signals:
+    void tracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
+
+private slots:
+    void onTracksLoaded( const QList< Tomahawk::query_ptr >& tracks );
+    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void infoSystemFinished( const QString& infoId );
+
+private:
+    QList< Tomahawk::query_ptr > m_queries;
+    result_ptr m_currentItem;
+    unsigned int m_currentTrack;
+
+    bool m_infoSystemLoaded;
+    bool m_databaseLoaded;
+
+    Tomahawk::ModelMode m_mode;
+    Tomahawk::collection_ptr m_collection;
+
+    QWeakPointer< Tomahawk::Album > m_album;
+};
+
+}; // ns
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Artist.cpp Added

@@ -0,0 +1,488 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "Artist.h"
+
+#include "ArtistPlaylistInterface.h"
+#include "Collection.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "database/DatabaseCommand_AllAlbums.h"
+#include "database/DatabaseCommand_TrackStats.h"
+#include "Source.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+Artist::~Artist()
+{
+    m_ownRef.clear();
+
+#ifndef ENABLE_HEADLESS
+    delete m_cover;
+#endif
+}
+
+
+artist_ptr
+Artist::get( const QString& name, bool autoCreate )
+{
+    if ( !Database::instance() || !Database::instance()->impl() )
+        return artist_ptr();
+
+    int artid = Database::instance()->impl()->artistId( name, autoCreate );
+    if ( artid < 1 && autoCreate )
+        return artist_ptr();
+
+    return Artist::get( artid, name );
+}
+
+
+artist_ptr
+Artist::get( unsigned int id, const QString& name )
+{
+    static QHash< unsigned int, artist_ptr > s_artists;
+    static QMutex s_mutex;
+
+    QMutexLocker lock( &s_mutex );
+    if ( s_artists.contains( id ) )
+    {
+        return s_artists.value( id );
+    }
+
+    artist_ptr a = artist_ptr( new Artist( id, name ), &QObject::deleteLater );
+    a->setWeakRef( a.toWeakRef() );
+
+    if ( id > 0 )
+        s_artists.insert( id, a );
+
+    return a;
+}
+
+
+Artist::Artist( unsigned int id, const QString& name )
+    : QObject()
+    , m_id( id )
+    , m_name( name )
+    , m_coverLoaded( false )
+    , m_coverLoading( false )
+    , m_simArtistsLoaded( false )
+    , m_biographyLoaded( false )
+    , m_infoJobs( 0 )
+#ifndef ENABLE_HEADLESS
+    , m_cover( 0 )
+#endif
+{
+    m_sortname = DatabaseImpl::sortname( name, true );
+}
+
+
+void
+Artist::onTracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection )
+{
+    emit tracksAdded( playlistInterface( mode, collection )->tracks(), mode, collection );
+}
+
+
+QList<album_ptr>
+Artist::albums( ModelMode mode, const Tomahawk::collection_ptr& collection ) const
+{
+    artist_ptr artist = m_ownRef.toStrongRef();
+
+    bool dbLoaded = m_albumsLoaded.value( DatabaseMode );
+    const bool infoLoaded = m_albumsLoaded.value( InfoSystemMode );
+    if ( !collection.isNull() )
+        dbLoaded = false;
+
+    if ( ( mode == DatabaseMode || mode == Mixed ) && !dbLoaded )
+    {
+        DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( collection, artist );
+        cmd->setData( QVariant( collection.isNull() ) );
+
+        connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
+                        SLOT( onAlbumsFound( QList<Tomahawk::album_ptr>, QVariant ) ) );
+
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+    }
+
+    if ( ( mode == InfoSystemMode || mode == Mixed ) && !infoLoaded )
+    {
+        Tomahawk::InfoSystem::InfoStringHash artistInfo;
+        artistInfo"artist" = name();
+
+        Tomahawk::InfoSystem::InfoRequestData requestData;
+        requestData.caller = infoid();
+        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
+        requestData.type = Tomahawk::InfoSystem::InfoArtistReleases;
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                 SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                 SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                 SIGNAL( finished( QString ) ),
+                 SLOT( infoSystemFinished( QString ) ), Qt::UniqueConnection );
+
+        m_infoJobs++;
+        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+    }
+
+    if ( !collection.isNull() )
+        return QList<album_ptr>();
+
+    switch ( mode )
+    {
+        case DatabaseMode:
+            return m_databaseAlbums;
+        case InfoSystemMode:
+            return m_officialAlbums;
+        default:
+            return m_databaseAlbums + m_officialAlbums;
+    }
+}
+
+
+QList<Tomahawk::artist_ptr>
+Artist::similarArtists() const
+{
+    if ( !m_simArtistsLoaded )
+    {
+        Tomahawk::InfoSystem::InfoStringHash artistInfo;
+        artistInfo"artist" = name();
+
+        Tomahawk::InfoSystem::InfoRequestData requestData;
+        requestData.caller = infoid();
+        requestData.customData = QVariantMap();
+
+        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
+        requestData.type = Tomahawk::InfoSystem::InfoArtistSimilars;
+        requestData.requestId = TomahawkUtils::infosystemRequestId();
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                SIGNAL( finished( QString ) ),
+                SLOT( infoSystemFinished( QString ) ), Qt::UniqueConnection );
+
+        m_infoJobs++;
+        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+    }
+
+    return m_similarArtists;
+}
+
+
+QString
+Artist::biography() const
+{
+    if ( !m_biographyLoaded )
+    {
+        Tomahawk::InfoSystem::InfoRequestData requestData;
+        requestData.caller = infoid();
+        requestData.customData = QVariantMap();
+
+        requestData.input = name();
+        requestData.type = Tomahawk::InfoSystem::InfoArtistBiography;
+        requestData.requestId = TomahawkUtils::infosystemRequestId();
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                SIGNAL( finished( QString ) ),
+                SLOT( infoSystemFinished( QString ) ), Qt::UniqueConnection );
+
+        m_infoJobs++;
+        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+    }
+
+    return m_biography;
+}
+
+
+void
+Artist::loadStats()
+{
+    artist_ptr a = m_ownRef.toStrongRef();
+
+    DatabaseCommand_TrackStats* cmd = new DatabaseCommand_TrackStats( a );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+}
+
+
+QList< Tomahawk::PlaybackLog >
+Artist::playbackHistory( const Tomahawk::source_ptr& source ) const
+{
+    QList< Tomahawk::PlaybackLog > history;
+
+    foreach ( const PlaybackLog& log, m_playbackHistory )
+    {
+        if ( source.isNull() || log.source == source )
+        {
+            history << log;
+        }
+    }
+
+    return history;
+}
+
+
+void
+Artist::setPlaybackHistory( const QList< Tomahawk::PlaybackLog >& playbackData )
+{
+    m_playbackHistory = playbackData;
+    emit statsLoaded();
+}
+
+
+unsigned int
+Artist::playbackCount( const source_ptr& source )
+{
+    unsigned int count = 0;
+    foreach ( const PlaybackLog& log, m_playbackHistory )
+    {
+        if ( source.isNull() || log.source == source )
+            count++;
+    }
+
+    return count;
+}
+
+
+void
+Artist::onAlbumsFound( const QList< album_ptr >& albums, const QVariant& data )
+{
+    if ( data.toBool() )
+    {
+        m_databaseAlbums << albums;
+        m_albumsLoaded.insert( DatabaseMode, true );
+    }
+
+    emit albumsAdded( albums, DatabaseMode );
+}
+
+
+void
+Artist::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
+{
+    if ( requestData.caller != infoid() )
+        return;
+
+    QVariantMap returnedData = output.value< QVariantMap >();
+    switch ( requestData.type )
+    {
+        case Tomahawk::InfoSystem::InfoArtistReleases:
+        {
+            QStringList albumNames = returnedData "albums" .toStringList();
+            Tomahawk::InfoSystem::InfoStringHash inputInfo;
+            inputInfo = requestData.input.value< InfoSystem::InfoStringHash >();
+
+            QList< album_ptr > albums;
+            foreach ( const QString& albumName, albumNames )
+            {
+                Tomahawk::album_ptr album = Tomahawk::Album::get( m_ownRef.toStrongRef(), albumName, false );
+                m_officialAlbums << album;
+                albums << album;
+            }
+
+            m_albumsLoaded.insert( InfoSystemMode, true );
+            if ( m_officialAlbums.count() )
+                emit albumsAdded( albums, InfoSystemMode );
+
+            break;
+        }
+
+        case Tomahawk::InfoSystem::InfoArtistImages:
+        {
+            if ( output.isNull() )
+            {
+                m_coverLoaded = true;
+            }
+            else if ( output.isValid() )
+            {
+                const QByteArray ba = returnedData"imgbytes".toByteArray();
+                if ( ba.length() )
+                {
+                    m_coverBuffer = ba;
+                }
+
+                m_coverLoaded = true;
+                emit coverChanged();
+            }
+
+            break;
+        }
+
+        case InfoSystem::InfoArtistSimilars:
+        {
+            const QStringList artists = returnedData"artists".toStringList();
+            foreach ( const QString& artist, artists )
+            {
+                m_similarArtists << Artist::get( artist );
+            }
+
+            m_simArtistsLoaded = true;
+            emit similarArtistsLoaded();
+
+            break;
+        }
+
+        case InfoSystem::InfoArtistBiography:
+        {
+            QVariantMap bmap = output.toMap();
+
+            foreach ( const QString& source, bmap.keys() )
+            {
+                if ( source == "last.fm" )
+                    m_biography = bmap source .toHash() "text" .toString();
+            }
+
+            m_biographyLoaded = true;
+            emit biographyLoaded();
+
+            break;
+        }
+
+        default:
+            Q_ASSERT( false );
+    }
+}
+
+
+void
+Artist::infoSystemFinished( QString target )
+{
+    Q_UNUSED( target );
+
+    if ( target != infoid() )
+        return;
+
+    if ( --m_infoJobs == 0 )
+    {
+        disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                    this, SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
+
+        disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ),
+                    this, SLOT( infoSystemFinished( QString ) ) );
+    }
+
+    m_coverLoading = false;
+
+    emit updated();
+}
+
+
+#ifndef ENABLE_HEADLESS
+QPixmap
+Artist::cover( const QSize& size, bool forceLoad ) const
+{
+    if ( !m_coverLoaded && !m_coverLoading )
+    {
+        if ( !forceLoad )
+            return QPixmap();
+
+        Tomahawk::InfoSystem::InfoStringHash trackInfo;
+        trackInfo"artist" = name();
+
+        Tomahawk::InfoSystem::InfoRequestData requestData;
+        requestData.caller = infoid();
+        requestData.type = Tomahawk::InfoSystem::InfoArtistImages;
+        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
+        requestData.customData = QVariantMap();
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                SIGNAL( finished( QString ) ),
+                SLOT( infoSystemFinished( QString ) ), Qt::UniqueConnection );
+
+        m_infoJobs++;
+        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+
+        m_coverLoading = true;
+    }
+
+    if ( !m_cover && !m_coverBuffer.isEmpty() )
+    {
+        m_cover = new QPixmap();
+        m_cover->loadFromData( m_coverBuffer );
+        m_coverBuffer.clear();
+    }
+
+    if ( m_cover && !m_cover->isNull() && !size.isEmpty() )
+    {
+        if ( m_coverCache.contains( size.width() ) )
+        {
+            return m_coverCache.value( size.width() );
+        }
+
+        QPixmap scaledCover;
+        scaledCover = m_cover->scaled( size, Qt::KeepAspectRatio, Qt::SmoothTransformation );
+        m_coverCache.insert( size.width(), scaledCover );
+        return scaledCover;
+    }
+
+    if ( m_cover )
+        return *m_cover;
+    else
+        return QPixmap();
+}
+#endif
+
+
+Tomahawk::playlistinterface_ptr
+Artist::playlistInterface( ModelMode mode, const Tomahawk::collection_ptr& collection )
+{
+    playlistinterface_ptr pli = m_playlistInterface mode  collection ;
+
+    if ( pli.isNull() )
+    {
+        pli = Tomahawk::playlistinterface_ptr( new Tomahawk::ArtistPlaylistInterface( this, mode, collection ) );
+        connect( pli.data(), SIGNAL( tracksLoaded( Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                               SLOT( onTracksLoaded( Tomahawk::ModelMode, Tomahawk::collection_ptr ) ) );
+
+        m_playlistInterface mode  collection  = pli;
+    }
+
+    return pli;
+}
+
+
+QList<Tomahawk::query_ptr>
+Artist::tracks( ModelMode mode, const Tomahawk::collection_ptr& collection )
+{
+    return playlistInterface( mode, collection )->tracks();
+}
+
+
+QString
+Artist::infoid() const
+{
+    if ( m_uuid.isEmpty() )
+        m_uuid = uuid();
+
+    return m_uuid;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Artist.h Added

@@ -0,0 +1,132 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWKARTIST_H
+#define TOMAHAWKARTIST_H
+
+#include "config.h"
+
+#include <QtCore/QObject>
+#ifndef ENABLE_HEADLESS
+    #include <QtGui/QPixmap>
+#endif
+
+#include "Typedefs.h"
+#include "DllMacro.h"
+#include "Query.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT Artist : public QObject
+{
+Q_OBJECT
+
+public:
+    static artist_ptr get( const QString& name, bool autoCreate = false );
+    static artist_ptr get( unsigned int id, const QString& name );
+
+    explicit Artist( unsigned int id, const QString& name );
+    virtual ~Artist();
+
+    unsigned int id() const { return m_id; }
+    QString name() const { return m_name; }
+    QString sortname() const { return m_sortname; }
+
+    QList<Tomahawk::album_ptr> albums( ModelMode mode = Mixed, const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr() ) const;
+    QList<Tomahawk::artist_ptr> similarArtists() const;
+
+    QList<Tomahawk::query_ptr> tracks( ModelMode mode = Mixed, const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr() );
+    Tomahawk::playlistinterface_ptr playlistInterface( ModelMode mode, const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr() );
+
+    void loadStats();
+    QList< Tomahawk::PlaybackLog > playbackHistory( const Tomahawk::source_ptr& source = Tomahawk::source_ptr() ) const;
+    void setPlaybackHistory( const QList< Tomahawk::PlaybackLog >& playbackData );
+    unsigned int playbackCount( const Tomahawk::source_ptr& source = Tomahawk::source_ptr() );
+    
+    QString biography() const;
+
+#ifndef ENABLE_HEADLESS
+    QPixmap cover( const QSize& size, bool forceLoad = true ) const;
+#endif
+    bool coverLoaded() const { return m_coverLoaded; }
+
+    Tomahawk::playlistinterface_ptr playlistInterface();
+
+    QWeakPointer< Tomahawk::Artist > weakRef() { return m_ownRef; }
+    void setWeakRef( QWeakPointer< Tomahawk::Artist > weakRef ) { m_ownRef = weakRef; }
+
+signals:
+    void tracksAdded( const QList<Tomahawk::query_ptr>& tracks, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
+    void albumsAdded( const QList<Tomahawk::album_ptr>& albums, Tomahawk::ModelMode mode );
+
+    void updated();
+    void coverChanged();
+    void similarArtistsLoaded();
+    void biographyLoaded();
+    void statsLoaded();
+
+private slots:
+    void onTracksLoaded(Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
+    void onAlbumsFound( const QList<Tomahawk::album_ptr>& albums, const QVariant& data );
+
+    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void infoSystemFinished( QString target );
+
+private:
+    Artist();
+    QString infoid() const;
+
+    unsigned int m_id;
+    QString m_name;
+    QString m_sortname;
+
+    bool m_coverLoaded;
+    mutable bool m_coverLoading;
+    QHash<Tomahawk::ModelMode, bool> m_albumsLoaded;
+    bool m_simArtistsLoaded;
+    bool m_biographyLoaded;
+
+    mutable QString m_uuid;
+    mutable int m_infoJobs;
+
+    QList<Tomahawk::album_ptr> m_databaseAlbums;
+    QList<Tomahawk::album_ptr> m_officialAlbums;
+    QList<Tomahawk::artist_ptr> m_similarArtists;
+    QString m_biography;
+
+    bool m_playbackHistoryLoaded;
+    QList< PlaybackLog > m_playbackHistory;
+
+    mutable QByteArray m_coverBuffer;
+#ifndef ENABLE_HEADLESS
+    mutable QPixmap* m_cover;
+    mutable QHash< int, QPixmap > m_coverCache;
+#endif
+
+    QHash< Tomahawk::ModelMode, QHash< Tomahawk::collection_ptr, Tomahawk::playlistinterface_ptr > > m_playlistInterface;
+    
+    QWeakPointer< Tomahawk::Artist > m_ownRef;
+};
+
+} // ns
+
+Q_DECLARE_METATYPE( Tomahawk::artist_ptr )
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/ArtistPlaylistInterface.cpp Added

@@ -0,0 +1,234 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "ArtistPlaylistInterface.h"
+
+#include "Artist.h"
+#include "Collection.h"
+#include "Query.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_AllTracks.h"
+#include "Source.h"
+#include "Pipeline.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+ArtistPlaylistInterface::ArtistPlaylistInterface( Tomahawk::Artist* artist, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection )
+    : Tomahawk::PlaylistInterface()
+    , m_currentItem( 0 )
+    , m_currentTrack( 0 )
+    , m_infoSystemLoaded( false )
+    , m_databaseLoaded( false )
+    , m_mode( mode )
+    , m_collection( collection )
+    , m_artist( QWeakPointer< Tomahawk::Artist >( artist ) )
+{
+}
+
+
+ArtistPlaylistInterface::~ArtistPlaylistInterface()
+{
+    m_artist.clear();
+}
+
+
+Tomahawk::result_ptr
+ArtistPlaylistInterface::siblingItem( int itemsAway )
+{
+    int p = m_currentTrack;
+    p += itemsAway;
+
+    if ( p < 0 )
+        return Tomahawk::result_ptr();
+
+    if ( p >= m_queries.count() )
+        return Tomahawk::result_ptr();
+
+    if ( !m_queries.at( p )->numResults() )
+        return siblingItem( itemsAway + 1 );
+
+    m_currentTrack = p;
+    m_currentItem = m_queries.at( p )->results().first();
+    return m_currentItem;
+}
+
+
+bool
+ArtistPlaylistInterface::hasNextItem()
+{
+    int p = m_currentTrack;
+    p++;
+    if ( p < 0 || p >= m_queries.count() )
+        return false;
+
+    return true;
+}
+
+
+result_ptr
+ArtistPlaylistInterface::currentItem() const
+{
+    return m_currentItem;
+}
+
+
+QList<Tomahawk::query_ptr>
+ArtistPlaylistInterface::tracks()
+{
+    if ( m_queries.isEmpty() && m_artist )
+    {
+        if ( ( m_mode == Mixed || m_mode == InfoSystemMode ) && !m_infoSystemLoaded )
+        {
+            Tomahawk::InfoSystem::InfoStringHash artistInfo;
+            artistInfo"artist" = m_artist.data()->name();
+
+            Tomahawk::InfoSystem::InfoRequestData requestData;
+            requestData.caller = id();
+            requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
+            requestData.type = Tomahawk::InfoSystem::InfoArtistSongs;
+            requestData.timeoutMillis = 0;
+            requestData.allSources = true;
+            Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+
+            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 ) ) );
+        }
+        else if ( m_mode == DatabaseMode && !m_databaseLoaded )
+        {
+            DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection );
+            cmd->setArtist( m_artist );
+            cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
+
+            connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
+                            SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) );
+
+            Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+        }
+    }
+
+    return m_queries;
+}
+
+
+void
+ArtistPlaylistInterface::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
+{
+    if ( requestData.caller != id() )
+        return;
+
+    switch ( requestData.type )
+    {
+        case Tomahawk::InfoSystem::InfoArtistSongs:
+        {
+            QVariantMap returnedData = output.value< QVariantMap >();
+            if ( !returnedData.isEmpty() )
+            {
+                Tomahawk::InfoSystem::InfoStringHash inputInfo;
+                inputInfo = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+
+                QStringList tracks = returnedData "tracks" .toStringList();
+                QList<query_ptr> ql;
+
+                //TODO: Figure out how to do this with a multi-disk album without breaking the
+                //      current behaviour. I just know too little about InfoSystem to deal with
+                //      it right now, I've only taken the liberty of adding Query::setDiscNumber
+                //      which should make this easier. --Teo 11/2011
+                unsigned int trackNo = 1;
+
+                foreach ( const QString& trackName, tracks )
+                {
+                    query_ptr query = Query::get( inputInfo "artist" , trackName, inputInfo "album"  );
+                    query->setAlbumPos( trackNo++ );
+                    ql << query;
+                }
+                Pipeline::instance()->resolve( ql );
+
+                m_queries << ql;
+            }
+
+            break;
+        }
+
+        default:
+        {
+            Q_ASSERT( false );
+            break;
+        }
+    }
+
+    if ( !m_queries.isEmpty() )
+        infoSystemFinished( id() );
+}
+
+
+void
+ArtistPlaylistInterface::infoSystemFinished( const QString &infoId )
+{
+    if ( infoId != id() )
+        return;
+
+    m_infoSystemLoaded = true;
+
+    disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                this, SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
+    disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ),
+                this, SLOT( infoSystemFinished( QString) ) );
+
+    if ( m_queries.isEmpty() && m_mode == Mixed )
+    {
+        DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection );
+        cmd->setArtist( m_artist );
+        //this takes discnumber into account as well
+        cmd->setSortOrder( DatabaseCommand_AllTracks::AlbumPosition );
+
+        connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
+                        SLOT( onTracksLoaded( QList<Tomahawk::query_ptr> ) ) );
+
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+    }
+    else
+    {
+        m_finished = true;
+        emit tracksLoaded( m_mode, m_collection );
+    }
+}
+
+
+void
+ArtistPlaylistInterface::onTracksLoaded( const QList< query_ptr >& tracks )
+{
+    if ( m_collection.isNull() )
+    {
+        m_databaseLoaded = true;
+        m_queries << filterTracks( tracks );
+    }
+    else
+        m_queries << tracks;
+
+    m_finished = true;
+    emit tracksLoaded( m_mode, m_collection );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/ArtistPlaylistInterface.h Added

@@ -0,0 +1,86 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWKARTISTPLAYLISTINTERFACE_H
+#define TOMAHAWKARTISTPLAYLISTINTERFACE_H
+
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+
+#include "Artist.h"
+#include "Typedefs.h"
+#include "PlaylistInterface.h"
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT ArtistPlaylistInterface : public Tomahawk::PlaylistInterface
+{
+Q_OBJECT
+
+public:
+    ArtistPlaylistInterface( Tomahawk::Artist* artist, Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
+    virtual ~ArtistPlaylistInterface();
+
+    virtual QList<Tomahawk::query_ptr> tracks();
+
+    virtual int trackCount() const { return m_queries.count(); }
+    virtual int unfilteredTrackCount() const { return m_queries.count(); }
+
+    virtual Tomahawk::result_ptr siblingItem( int itemsAway );
+
+    virtual bool hasNextItem();
+    virtual Tomahawk::result_ptr currentItem() const;
+
+    virtual PlaylistModes::RepeatMode repeatMode() const { return PlaylistModes::NoRepeat; }
+    virtual bool shuffled() const { return false; }
+
+    virtual void setRepeatMode( PlaylistModes::RepeatMode ) {}
+    virtual void setShuffled( bool ) {}
+
+    virtual void setFilter( const QString& /*pattern*/ ) {}
+
+signals:
+    void tracksLoaded( Tomahawk::ModelMode mode, const Tomahawk::collection_ptr& collection );
+
+private slots:
+    void onTracksLoaded( const QList< Tomahawk::query_ptr >& tracks );
+    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void infoSystemFinished( const QString& infoId );
+
+private:
+    Q_DISABLE_COPY( ArtistPlaylistInterface )
+
+    QList< Tomahawk::query_ptr > m_queries;
+    result_ptr m_currentItem;
+    unsigned int m_currentTrack;
+
+    bool m_infoSystemLoaded;
+    bool m_databaseLoaded;
+
+    Tomahawk::ModelMode m_mode;
+    Tomahawk::collection_ptr m_collection;
+
+    QWeakPointer< Tomahawk::Artist > m_artist;
+};
+
+}; // ns
+
+#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/AtticaManager.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/AtticaManager.cpp Changed

@@ -18,33 +18,61 @@
 
 #include "AtticaManager.h"
 
-#include "utils/tomahawkutils.h"
+#include "utils/TomahawkUtils.h"
 #include "TomahawkSettingsGui.h"
-#include "pipeline.h"
+#include "Pipeline.h"
+#include "Source.h"
+#include "config.h"
 
 #include <attica/downloaditem.h>
-#include <quazip.h>
-#include <quazipfile.h>
 
+#include <QCoreApplication>
 #include <QNetworkReply>
 #include <QTemporaryFile>
 #include <QDir>
 #include <QTimer>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QDomNode>
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
+#include "accounts/ResolverAccount.h"
+#include "accounts/AccountManager.h"
+#include "utils/BinaryInstallerHelper.h"
+#include "utils/Closure.h"
 
 using namespace Attica;
 
 AtticaManager* AtticaManager::s_instance = 0;
 
 
+// Sort binary resolvers above script resolvers, and script resolvers by download count
+bool
+resolverSort( const Attica::Content& first, const Attica::Content& second )
+{
+    if ( !first.attribute( "typeid" ).isEmpty() && second.attribute( "typeid" ).isEmpty() )
+        return true;
+
+    return first.downloads() > second.downloads();
+}
+
+
 AtticaManager::AtticaManager( QObject* parent )
     : QObject( parent )
+    , m_manager( Attica::ProviderManager::ProviderFlags( Attica::ProviderManager::DisablePlugins ) )
+    , m_resolverJobsLoaded( 0 )
 {
     connect( &m_manager, SIGNAL( providerAdded( Attica::Provider ) ), this, SLOT( providerAdded( Attica::Provider ) ) );
 
     // resolvers
-    m_manager.addProviderFile( QUrl( "http://bakery.tomahawk-player.org/resolvers/providers.xml" ) );
+//    m_manager.addProviderFile( QUrl( "http://bakery.tomahawk-player.org/resolvers/providers.xml" ) );
+    
+    const QString url = QString( "%1/resolvers/providers.xml?version=%2" ).arg( hostname() ).arg( TomahawkUtils::appFriendlyVersion() );
+    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( QUrl( url ) ) );
+    NewClosure( reply, SIGNAL( finished() ), this, SLOT( providerFetched( QNetworkReply* ) ), reply );
+    connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), this, SLOT( providerError( QNetworkReply::NetworkError ) ) );
+
+//     m_manager.addProviderFile( QUrl( "http://lycophron/resolvers/providers.xml" ) );
 
     qRegisterMetaType< Attica::Content >( "Attica::Content" );
 }
@@ -53,9 +81,24 @@
 AtticaManager::~AtticaManager()
 {
     savePixmapsToCache();
+
+
+    foreach( const QString& id, m_resolverStates.keys() )
+    {
+        if ( !m_resolverStates id .pixmap )
+            continue;
+
+        delete m_resolverStates id .pixmap;
+    }
 }
 
 
+QString
+AtticaManager::hostname() const
+{
+    return "http://bakery.tomahawk-player.org";
+}
+
 void
 AtticaManager::loadPixmapsFromCache()
 {
@@ -133,6 +176,20 @@
 }
 
 
+Content
+AtticaManager::resolverForId( const QString& id ) const
+{
+    foreach ( const Attica::Content& c, m_resolvers )
+    {
+        if ( c.id() == id )
+            return c;
+    }
+
+    return Content();
+}
+
+
+
 AtticaManager::ResolverState
 AtticaManager::resolverState ( const Content& resolver ) const
 {
@@ -196,15 +253,85 @@
 }
 
 
+bool
+AtticaManager::hasCustomAccountForAttica( const QString &id ) const
+{
+    return m_customAccounts.keys().contains( id );
+}
+
+
+Tomahawk::Accounts::Account*
+AtticaManager::customAccountForAttica( const QString &id ) const
+{
+    return m_customAccounts.value( id );
+}
+
+
+void
+AtticaManager::registerCustomAccount( const QString &atticaId, Tomahawk::Accounts::Account *account )
+{
+    m_customAccounts.insert( atticaId, account );
+}
+
+
+AtticaManager::Resolver
+AtticaManager::resolverData(const QString &atticaId) const
+{
+    return m_resolverStates.value( atticaId );
+}
+
+
+void
+AtticaManager::providerError( QNetworkReply::NetworkError err )
+{
+    // So those who care know
+    emit resolversLoaded( Content::List() );
+}
+
+
+void
+AtticaManager::providerFetched( QNetworkReply* reply )
+{
+    Q_ASSERT( reply );
+    if ( !reply )
+        return;
+
+    m_manager.addProviderFromXml( reply->readAll() );
+}
+
+
 void
 AtticaManager::providerAdded( const Provider& provider )
 {
     if ( provider.name() == "Tomahawk Resolvers" )
     {
         m_resolverProvider = provider;
+        m_resolvers.clear();
+
+        m_resolverStates = TomahawkSettingsGui::instanceGui()->atticaResolverStates();
+
+        ListJob<Category>* job = m_resolverProvider.requestCategories();
+        connect( job, SIGNAL( finished( Attica::BaseJob* ) ), this, SLOT( categoriesReturned( Attica::BaseJob* ) ) );
+        job->start();
+    }
+}
+
+
+void
+AtticaManager::categoriesReturned( BaseJob* j )
+{
+    ListJob< Category >* job = static_cast< ListJob< Category >* >( j );
+
+    Category::List categories = job->itemList();
+    foreach ( const Category& category, categories )
+    {
+        ListJob< Content >* job = m_resolverProvider.searchContents( Category::List() << category, QString(), Provider::Downloads, 0, 50 );
+
+        if ( category.name() == "Resolver" )
+            connect( job, SIGNAL( finished( Attica::BaseJob* ) ), this, SLOT( resolversList( Attica::BaseJob* ) ) );
+        else if ( category.name() == "BinaryResolver" )
+            connect( job, SIGNAL( finished( Attica::BaseJob* ) ), this, SLOT( binaryResolversList( Attica::BaseJob* ) ) );
 
-        ListJob< Content >* job = m_resolverProvider.searchContents( Category::List(), QString(), Provider::Downloads, 0, 30 );
-        connect( job, SIGNAL( finished( Attica::BaseJob* ) ), this, SLOT( resolversList( Attica::BaseJob* ) ) );
         job->start();
     }
 }
@@ -215,8 +342,28 @@
 {
     ListJob< Content >* job = static_cast< ListJob< Content >* >( j );
 
-    m_resolvers = job->itemList();
-    m_resolverStates = TomahawkSettingsGui::instanceGui()->atticaResolverStates();
+    m_resolvers.append( job->itemList() );
+
+    // Sanity check. if any resolvers are installed that don't exist on the hd, remove them.
+    foreach ( const QString& rId, m_resolverStates.keys() )
+    {
+        if ( m_resolverStates rId .state == Installed ||
+             m_resolverStates rId .state == NeedsUpgrade )
+        {
+            if ( m_resolverStates rId .binary )
+                continue;
+
+            // Guess location on disk
+            QDir dir( QString( "%1/atticaresolvers/%2" ).arg( TomahawkUtils::appDataDir().absolutePath() ).arg( rId ) );
+            if ( !dir.exists() )
+            {
+                // Uh oh
+                qWarning() << "Found attica resolver marked as installed that didn't exist on disk! Setting to uninstalled: " << rId << dir.absolutePath();
+                m_resolverStates rId .state = Uninstalled;
+                TomahawkSettingsGui::instanceGui()->setAtticaResolverState( rId, Uninstalled );
+            }
+        }
+    }
 
     // load icon cache from disk, and fetch any we are missing
     loadPixmapsFromCache();
@@ -236,6 +383,66 @@
     }
 
     syncServerData();
+
+    if ( ++m_resolverJobsLoaded == 2 )
+    {
+        qSort( m_resolvers.begin(), m_resolvers.end(), resolverSort );
+        emit resolversLoaded( m_resolvers );
+    }
+}
+
+
+void
+AtticaManager::binaryResolversList( BaseJob* j )
+{
+    ListJob< Content >* job = static_cast< ListJob< Content >* >( j );
+
+    Content::List binaryResolvers = job->itemList();
+
+    // NOTE: No binary support for linux distros
+    QString platform;
+#if defined(Q_OS_MAC)
+    platform = "osx";
+#elif defined(Q_OS_WIN)
+    platform = "win";
+#elif defined(Q_OS_LINUX) && defined(__GNUC__) && defined(__x86_64__)
+    platform = "linux-x64";
+#elif defined(Q_OS_LINUX) // Horrible assumption here...
+    platform = "linux-x86";
+#endif
+
+    // Override if no binary resolvers were requested
+#ifndef WITH_BINARY_ATTICA
+    platform = QString();
+#endif
+
+    foreach ( const Content& c, binaryResolvers )
+    {
+        if ( !c.attribute( "typeid" ).isEmpty() && c.attribute( "typeid" ) == platform )
+        {
+            // We have a binary resolver for this platform
+            qDebug() << "WE GOT A BINARY RESOLVER:" << c.id() << c.name() << c.attribute( "signature" );
+            m_resolvers.append( c );
+            if ( !m_resolverStates.contains( c.id() ) )
+            {
+                Resolver r;
+                r.binary = true;
+                m_resolverStates.insert( c.id(), r );
+            }
+            else if ( m_resolverStates c.id() .binary != true )
+            { // HACK workaround... why is this not set in the first place sometimes? Migration issue?
+                m_resolverStates c.id() .binary = true;
+            }
+
+
+        }
+    }
+
+    if ( ++m_resolverJobsLoaded == 2 )
+    {
+        qSort( m_resolvers.begin(), m_resolvers.end(), resolverSort );
+        emit resolversLoaded( m_resolvers );
+    }
 }
 
 
@@ -299,10 +506,25 @@
 
 
 void
-AtticaManager::installResolver( const Content& resolver, bool autoEnable )
+AtticaManager::installResolver( const Content& resolver, bool autoCreate )
+{
+    doInstallResolver( resolver, autoCreate, 0 );
+}
+
+
+void
+AtticaManager::installResolverWithHandler( const Content& resolver, Tomahawk::Accounts::AtticaResolverAccount* handler )
+{
+    doInstallResolver( resolver, false, handler );
+}
+
+
+void AtticaManager::doInstallResolver( const Content& resolver, bool autoCreate, Tomahawk::Accounts::AtticaResolverAccount* handler )
 {
     Q_ASSERT( !resolver.id().isNull() );
 
+    emit startedInstalling( resolver.id() );
+
     if ( m_resolverStates resolver.id() .state != Upgrading )
         m_resolverStates resolver.id() .state = Installing;
 
@@ -310,12 +532,15 @@
     m_resolverStates resolver.id() .version = resolver.version();
     emit resolverStateChanged( resolver.id() );
 
-    ItemJob< DownloadItem >* job = m_resolverProvider.downloadLink( resolver.id() );
-    connect( job, SIGNAL( finished( Attica::BaseJob* ) ), this, SLOT( resolverDownloadFinished( Attica::BaseJob* ) ) );
-    job->setProperty( "resolverId", resolver.id() );
-    job->setProperty( "autoEnable", autoEnable );
-
-    job->start();
+//    ItemJob< DownloadItem >* job = m_resolverProvider.downloadLink( resolver.id() );
+    QUrl url( QString( "%1/resolvers/v1/content/download/%2/1" ).arg( hostname() ).arg( resolver.id() ) );
+    url.addQueryItem( "tomahawkversion", TomahawkUtils::appFriendlyVersion() );
+    QNetworkReply* r = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    NewClosure( r, SIGNAL( finished() ), this, SLOT( resolverDownloadFinished( QNetworkReply* ) ), r );
+    r->setProperty( "resolverId", resolver.id() );
+    r->setProperty( "createAccount", autoCreate );
+    r->setProperty( "handler", QVariant::fromValue< QObject* >( handler ) );
+    r->setProperty( "binarySignature", resolver.attribute("signature"));
 }
 
 
@@ -328,33 +553,58 @@
     if ( !m_resolverStates.contains( resolver.id() ) || m_resolverStates resolver.id() .state != NeedsUpgrade )
         return;
 
-    const bool enabled = TomahawkSettings::instance()->enabledScriptResolvers().contains( m_resolverStates resolver.id() .scriptPath );
     m_resolverStates resolver.id() .state = Upgrading;
     emit resolverStateChanged( resolver.id() );
 
     uninstallResolver( resolver );
-    installResolver( resolver, enabled );
+    installResolver( resolver, false );
 }
 
 
 void
-AtticaManager::resolverDownloadFinished ( BaseJob* j )
+AtticaManager::resolverDownloadFinished ( QNetworkReply *j )
 {
-    ItemJob< DownloadItem >* job = static_cast< ItemJob< DownloadItem >* >( j );
+    Q_ASSERT( j );
+    if ( !j )
+        return;
 
-    if ( job->metadata().error() == Attica::Metadata::NoError )
+    if ( j->error() == QNetworkReply::NoError )
     {
-        DownloadItem item = job->result();
-        QUrl url = item.url();
-        // download the resolver itself :)
-        QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
-        connect( reply, SIGNAL( finished() ), this, SLOT( payloadFetched() ) );
-        reply->setProperty( "resolverId", job->property( "resolverId" ) );
-        reply->setProperty( "autoEnable", job->property( "autoEnable" ) );
+        QDomDocument doc;
+        doc.setContent( j );
+
+       const QDomNodeList nodes = doc.documentElement().elementsByTagName( "downloadlink" );
+       if ( nodes.length() < 1 )
+       {
+           tLog() << "Found no download link for resolver:" << doc.toString();
+           return;
+       }
+
+       QUrl url( nodes.item( 0 ).toElement().text() );
+       // download the resolver itself :)
+       tDebug() << "Downloading resolver from url:" << url.toString();
+
+       const QDomNodeList signatures = doc.documentElement().elementsByTagName( "signature" );
+
+       // Use the original signature provided
+       QString signature = j->property( "binarySignature" ).toString();
+       if ( signatures.size() > 0 )
+       {
+            // THis download has an overriding signature. Take that one instead
+           const QString sig = signatures.item( 0 ).toElement().text();
+           tLog() << "Found overridden signature in binary download:" << sig;
+           signature = sig;
+       }
+       QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+       connect( reply, SIGNAL( finished() ), this, SLOT( payloadFetched() ) );
+       reply->setProperty( "resolverId", j->property( "resolverId" ) );
+       reply->setProperty( "createAccount", j->property( "createAccount" ) );
+       reply->setProperty( "handler", j->property( "handler" ) );
+       reply->setProperty( "binarySignature", signature );
     }
     else
     {
-        tLog() << "Failed to do resolver download job!" << job->metadata().error();
+        tLog() << "Failed to do resolver download job!" << j->errorString() << j->error();
     }
 }
 
@@ -365,116 +615,97 @@
     QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
     Q_ASSERT( reply );
 
+    bool installedSuccessfully = false;
+    const QString resolverId = reply->property( "resolverId" ).toString();
+
     // we got a zip file, save it to a temporary file, then unzip it to our destination data dir
     if ( reply->error() == QNetworkReply::NoError )
     {
-        QTemporaryFile f( QDir::tempPath() + QDir::separator() + "tomahawkattica_XXXXXX.zip" );
-        if ( !f.open() )
+        QTemporaryFile* f = new QTemporaryFile( QDir::tempPath() + QDir::separator() + "tomahawkattica_XXXXXX.zip" );
+        if ( !f->open() )
         {
-            tLog() << "Failed to write zip file to temp file:" << f.fileName();
+            tLog() << "Failed to write zip file to temp file:" << f->fileName();
             return;
         }
-        f.write( reply->readAll() );
-        f.close();
-
-        QString resolverId = reply->property( "resolverId" ).toString();
-        QDir dir( extractPayload( f.fileName(), resolverId ) );
-        QString resolverPath = dir.absoluteFilePath( m_resolverStates resolverId .scriptPath );
+        f->write( reply->readAll() );
+        f->close();
 
-        if ( !resolverPath.isEmpty() )
+        if ( m_resolverStates resolverId .binary )
+        {
+            // First ensure the signature matches. If we can't verify it, abort!
+            const QString signature = reply->property( "binarySignature" ).toString();
+            // Must have a signature for binary resolvers...
+            Q_ASSERT( !signature.isEmpty() );
+            if ( signature.isEmpty() )
+                return;
+            if ( !TomahawkUtils::verifyFile( f->fileName(), signature ) )
+            {
+                qWarning() << "FILE SIGNATURE FAILED FOR BINARY RESOLVER! WARNING! :" << f->fileName() << signature;
+            }
+            else
+            {
+                TomahawkUtils::extractBinaryResolver( f->fileName(), new BinaryInstallerHelper( f, resolverId, reply->property( "createAccount" ).toBool(), this ) );
+                // Don't emit success or failed yet, helper will do that.
+                return;
+            }
+        }
+        else
         {
-            // update with absolute, not relative, path
-            m_resolverStates resolverId .scriptPath = resolverPath;
+            QDir dir( TomahawkUtils::extractScriptPayload( f->fileName(), resolverId ) );
+            QString resolverPath = dir.absoluteFilePath( m_resolverStates resolverId .scriptPath );
 
-            const bool autoEnable = reply->property( "autoEnable" ).toBool();
+            if ( !resolverPath.isEmpty() )
+            {
+                // update with absolute, not relative, path
+                m_resolverStates resolverId .scriptPath = resolverPath;
+
+                Tomahawk::Accounts::AtticaResolverAccount* handlerAccount = qobject_cast< Tomahawk::Accounts::AtticaResolverAccount* >( reply->property( "handler" ).value< QObject* >() );
+                const bool createAccount = reply->property( "createAccount" ).toBool();
+                if ( handlerAccount )
+                {
+                    handlerAccount->setPath( resolverPath );
+                    Tomahawk::Accounts::AccountManager::instance()->enableAccount( handlerAccount );
+                }
+                else if ( createAccount )
+                {
+                    // Do the install / add to tomahawk
+                    Tomahawk::Accounts::Account* resolver = Tomahawk::Accounts::ResolverAccountFactory::createFromPath( resolverPath, "resolveraccount", true );
+                    Tomahawk::Accounts::AccountManager::instance()->addAccount( resolver );
+                    TomahawkSettings::instance()->addAccount( resolver->accountId() );
+                }
 
-            // Do the install / add to tomahawk
-            Tomahawk::Pipeline::instance()->addScriptResolver( resolverPath, autoEnable );
-            m_resolverStates resolverId .state = Installed;
-            TomahawkSettingsGui::instanceGui()->setAtticaResolverStates( m_resolverStates );
-            emit resolverInstalled( resolverId );
-            emit resolverStateChanged( resolverId );
+                installedSuccessfully = true;
+            }
         }
+
+        delete f;
     }
     else
     {
         tLog() << "Failed to download attica payload...:" << reply->errorString();
     }
-}
-
 
-QString
-AtticaManager::extractPayload( const QString& filename, const QString& resolverId ) const
-{
-    // uses QuaZip to extract the temporary zip file to the user's tomahawk data/resolvers directory
-    QuaZip zipFile( filename );
-    if ( !zipFile.open( QuaZip::mdUnzip ) )
-    {
-        tLog() << "Failed to QuaZip open:" << zipFile.getZipError();
-        return QString();
-    }
 
-    if ( !zipFile.goToFirstFile() )
+    if ( installedSuccessfully )
     {
-        tLog() << "Failed to go to first file in zip archive: " << zipFile.getZipError();
-        return QString();
+        m_resolverStates resolverId .state = Installed;
+        TomahawkSettingsGui::instanceGui()->setAtticaResolverStates( m_resolverStates );
+        emit resolverInstalled( resolverId );
+        emit resolverStateChanged( resolverId );
     }
-
-    QDir resolverDir = TomahawkUtils::appDataDir();
-    if ( !resolverDir.mkpath( QString( "atticaresolvers/%1" ).arg( resolverId ) ) )
+    else
     {
-        tLog() << "Failed to mkdir resolver save dir: " << TomahawkUtils::appDataDir().absoluteFilePath( QString( "atticaresolvers/%1" ).arg( resolverId ) );
-        return QString();
+        emit resolverInstallationFailed( resolverId );
     }
-    resolverDir.cd( QString( "atticaresolvers/%1" ).arg( resolverId ) );
-    tDebug() << "Installing resolver to:" << resolverDir.absolutePath();
-
-    QuaZipFile fileInZip( &zipFile );
-    do
-    {
-        QuaZipFileInfo info;
-        zipFile.getCurrentFileInfo( &info );
-
-        if ( !fileInZip.open( QIODevice::ReadOnly ) )
-        {
-            tLog() << "Failed to open file inside zip archive:" << info.name << zipFile.getZipName() << "with error:" << zipFile.getZipError();
-            continue;
-        }
-
-        QFile out( resolverDir.absoluteFilePath( fileInZip.getActualFileName() ) );
-
-        QStringList parts = fileInZip.getActualFileName().split( "/" );
-        if ( parts.size() > 1 )
-        {
-            QStringList dirs = parts.mid( 0, parts.size() - 1 );
-            QString dirPath = dirs.join( "/" ); // QDir translates / to \ internally if necessary
-            resolverDir.mkpath( dirPath );
-        }
-
-        // make dir if there is one needed
-        QDir d( fileInZip.getActualFileName() );
-
-        tDebug() << "Writing to output file..." << out.fileName();
-        if ( !out.open( QIODevice::WriteOnly ) )
-        {
-            tLog() << "Failed to open resolver extract file:" << out.errorString() << info.name;
-            continue;
-        }
-
-
-        out.write( fileInZip.readAll() );
-        out.close();
-        fileInZip.close();
-
-    } while ( zipFile.goToNextFile() );
-
-    return resolverDir.absolutePath();
 }
 
 
 void
 AtticaManager::uninstallResolver( const QString& pathToResolver )
 {
+    // when is this used? find and fix
+    Q_ASSERT(false);
+
     // User manually removed a resolver not through attica dialog, simple remove
     QRegExp r( ".*(^/*)/contents/code/main.js" );
     r.indexIn( pathToResolver );
@@ -508,7 +739,6 @@
         TomahawkSettingsGui::instanceGui()->setAtticaResolverState( resolver.id(), Uninstalled );
     }
 
-    Tomahawk::Pipeline::instance()->removeScriptResolver( pathFromId( resolver.id() ) );
     doResolverRemove( resolver.id() );
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/AtticaManager.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/AtticaManager.h Changed

@@ -24,14 +24,22 @@
 #include <QObject>
 #include <QHash>
 #include <QPixmap>
+#include <QNetworkReply>
 
-#include "dllmacro.h"
+#include "DllMacro.h"
+#include "accounts/Account.h"
 
-#ifdef LIBATTICA_FOUND
 #include <attica/provider.h>
 #include <attica/providermanager.h>
 #include <attica/content.h>
-#endif
+
+namespace Tomahawk {
+namespace Accounts {
+class AtticaResolverAccount;
+}
+}
+
+class BinaryInstallerHelper;
 
 class DLLEXPORT AtticaManager : public QObject
 {
@@ -51,13 +59,16 @@
         int userRating; // 0-100
         ResolverState state;
         QPixmap* pixmap;
+        bool binary;
 
         // internal
         bool pixmapDirty;
 
-        Resolver( const QString& v, const QString& path, int userR, ResolverState s )
-            : version( v ), scriptPath( path ), userRating( userR ), state( s ), pixmap( 0 ), pixmapDirty( false ) {}
-        Resolver() : userRating( -1 ), state( Uninstalled ), pixmap( 0 ), pixmapDirty( false ) {}
+        Resolver( const QString& v, const QString& path, int userR, ResolverState s, bool isBinary )
+            : version( v ), scriptPath( path ), userRating( userR ), state( s ), pixmap( 0 ), binary( isBinary ), pixmapDirty( false )
+        {
+        }
+        Resolver() : userRating( -1 ), state( Uninstalled ), pixmap( 0 ), binary( false ), pixmapDirty( false ) {}
     };
 
     typedef QHash< QString, AtticaManager::Resolver > StateHash;
@@ -71,18 +82,13 @@
     }
 
     explicit AtticaManager ( QObject* parent = 0 );
-#ifdef LIBATTICA_FOUND
-
     virtual ~AtticaManager();
-#else
-    virtual ~AtticaManager() {}
-#endif
-
-#ifdef LIBATTICA_FOUND
 
     bool resolversLoaded() const;
 
     Attica::Content::List resolvers() const;
+    Attica::Content resolverForId( const QString& id ) const;
+
     ResolverState resolverState( const Attica::Content& resolver ) const;
     QPixmap iconForResolver( const Attica::Content& id ); // Looks up in icon cache
 
@@ -93,21 +99,40 @@
     void uploadRating( const Attica::Content& c );
     bool userHasRated( const Attica::Content& c ) const;
 
+    /**
+      If the resolver coming from libattica has a native custom c++ account
+      as well. For example the last.fm & spotify accounts.
+      */
+    bool hasCustomAccountForAttica( const QString& id ) const;
+    Tomahawk::Accounts::Account* customAccountForAttica( const QString& id ) const;
+    void registerCustomAccount( const QString& atticaId, Tomahawk::Accounts::Account* account );
+
+    AtticaManager::Resolver resolverData( const QString& atticaId ) const;
+
 public slots:
-    void installResolver( const Attica::Content& resolver, bool autoEnable = true );
+    void installResolver( const Attica::Content& resolver, bool autoCreateAccount = true );
+    void installResolverWithHandler( const Attica::Content& resolver, Tomahawk::Accounts::AtticaResolverAccount* handler );
+
     void upgradeResolver( const Attica::Content& resolver );
 
 signals:
-    void resolversReloaded( const Attica::Content::List& resolvers );
+    void resolversLoaded( const Attica::Content::List& resolvers );
 
     void resolverStateChanged( const QString& resolverId );
     void resolverInstalled( const QString& resolverId );
     void resolverUninstalled( const QString& resolverId );
+    void resolverInstallationFailed( const QString& resolverId );
+
+    void startedInstalling( const QString& resolverId );
 
 private slots:
+    void providerFetched( QNetworkReply* reply );
+    void providerError( QNetworkReply::NetworkError );
     void providerAdded( const Attica::Provider& );
+    void categoriesReturned( Attica::BaseJob* );
     void resolversList( Attica::BaseJob* );
-    void resolverDownloadFinished( Attica::BaseJob* );
+    void binaryResolversList( Attica::BaseJob* );
+    void resolverDownloadFinished( QNetworkReply* );
     void payloadFetched();
 
     void loadPixmapsFromCache();
@@ -117,21 +142,37 @@
     void syncServerData();
 
 private:
-    QString extractPayload( const QString& filename, const QString& resolverId ) const;
     void doResolverRemove( const QString& id ) const;
+    void doInstallResolver(  const Attica::Content& resolver, bool autoCreate, Tomahawk::Accounts::AtticaResolverAccount* handler );
+    QString hostname() const;
 
     Attica::ProviderManager m_manager;
 
     Attica::Provider m_resolverProvider;
     Attica::Content::List m_resolvers;
     StateHash m_resolverStates;
-#endif
+
+    int m_resolverJobsLoaded;
+    QMap< QString, Tomahawk::Accounts::Account* > m_customAccounts;
 
     static AtticaManager* s_instance;
+
+    friend class ::BinaryInstallerHelper;
 };
 
-#ifdef LIBATTICA_FOUND
-Q_DECLARE_METATYPE( Attica::Content );
-#endif
+class DLLEXPORT CustomAtticaAccount : public Tomahawk::Accounts::Account
+{
+    Q_OBJECT
+public:
+    virtual ~CustomAtticaAccount() {}
 
+    virtual Attica::Content atticaContent() const = 0;
+
+protected:
+    // No, you can't.
+    CustomAtticaAccount( const QString& id ) : Tomahawk::Accounts::Account( id ) {}
+};
+
+Q_DECLARE_METATYPE( Attica::Content );
+Q_DECLARE_METATYPE( QNetworkReply* );
 #endif // ATTICAMANAGER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/CMakeLists.txt -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/CMakeLists.txt Changed

@@ -6,6 +6,10 @@
 SET( QT_USE_QTXML TRUE )
 SET( QT_USE_QTUITOOLS TRUE )
 
+IF( UNIX AND NOT APPLE )
+  SET( QT_USE_QTDBUS TRUE )
+ENDIF( UNIX AND NOT APPLE )
+
 include( ${QT_USE_FILE} )
 
 add_definitions( ${QT_DEFINITIONS} )
@@ -13,15 +17,14 @@
 add_definitions( -DDLLEXPORT_PRO )
 add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
 
-
 set( libGuiSources
-    actioncollection.cpp
+    ActionCollection.cpp
 
-    contextmenu.cpp
-    dropjob.cpp
-    globalactionmanager.cpp
-    viewpage.cpp
-    viewmanager.cpp
+    ContextMenu.cpp
+    DropJob.cpp
+    GlobalActionManager.cpp
+    ViewPage.cpp
+    ViewManager.cpp
     LatchManager.cpp
     TomahawkSettingsGui.cpp
 
@@ -35,47 +38,40 @@
     jobview/JobStatusView.cpp
     jobview/JobStatusModel.cpp
     jobview/JobStatusDelegate.cpp
+    jobview/JobStatusItem.cpp
+    jobview/AclJobItem.cpp
     jobview/PipelineStatusItem.cpp
     jobview/TransferStatusItem.cpp
     jobview/LatchedStatusItem.cpp
     jobview/ErrorStatusMessage.cpp
     jobview/IndexingJobItem.cpp
 
-    infobar/infobar.cpp
-
-    playlist/treemodel.cpp
-    playlist/treeproxymodel.cpp
-    playlist/treeproxymodelplaylistinterface.cpp
-    playlist/treeheader.cpp
-    playlist/treeitemdelegate.cpp
-    playlist/collectionproxymodel.cpp
-    playlist/collectionproxymodelplaylistinterface.cpp
-    playlist/collectionflatmodel.cpp
-    playlist/collectionview.cpp
-    playlist/playlistmodel.cpp
-    playlist/playlistproxymodel.cpp
-    playlist/playlistproxymodelplaylistinterface.cpp
-    playlist/playlistview.cpp
-    playlist/playlistitemdelegate.cpp
-    playlist/queueproxymodel.cpp
-    playlist/queueproxymodelplaylistinterface.cpp
-    playlist/queueview.cpp
-    playlist/trackmodel.cpp
-    playlist/trackmodelitem.cpp
-    playlist/trackproxymodel.cpp
-    playlist/trackproxymodelplaylistinterface.cpp
-    playlist/trackview.cpp
-    playlist/trackheader.cpp
-    playlist/treemodelitem.cpp
-    playlist/albumitem.cpp
-    playlist/albummodel.cpp
-    playlist/albumproxymodel.cpp
-    playlist/albumproxymodelplaylistinterface.cpp
-    playlist/albumitemdelegate.cpp
-    playlist/albumview.cpp
-    playlist/artistview.cpp
-    playlist/customplaylistview.cpp
+    infobar/InfoBar.cpp
+
+    playlist/TreeModel.cpp
+    playlist/TreeProxyModel.cpp
+    playlist/TreeProxyModelPlaylistInterface.cpp
+    playlist/TreeItemDelegate.cpp
+    playlist/PlaylistModel.cpp
+    playlist/PlaylistView.cpp
+    playlist/PlaylistItemDelegate.cpp
+    playlist/QueueProxyModel.cpp
+    playlist/QueueView.cpp
+    playlist/PlayableModel.cpp
+    playlist/PlayableProxyModel.cpp
+    playlist/PlayableProxyModelPlaylistInterface.cpp
+    playlist/TrackView.cpp
+    playlist/AlbumModel.cpp
+    playlist/GridItemDelegate.cpp
+    playlist/GridView.cpp
+    playlist/TreeView.cpp
+    playlist/CustomPlaylistView.cpp
     playlist/ViewHeader.cpp
+    playlist/RecentlyAddedModel.cpp
+    playlist/RecentlyPlayedModel.cpp
+    playlist/PlaylistLargeItemDelegate.cpp
+    playlist/PlaylistChartItemDelegate.cpp
+    playlist/PlayableItem.cpp
 
     playlist/dynamic/DynamicPlaylist.cpp
     playlist/dynamic/DynamicView.cpp
@@ -90,310 +86,190 @@
     playlist/dynamic/widgets/MiscControlWidgets.cpp
     playlist/dynamic/widgets/CollapsibleControls.cpp
     playlist/dynamic/widgets/DynamicSetupWidget.cpp
-    playlist/dynamic/widgets/LoadingSpinner.cpp
 
-    playlist/topbar/topbar.cpp
-    playlist/topbar/clearbutton.cpp
-    playlist/topbar/searchlineedit.cpp
-    playlist/topbar/lineedit.cpp
-    playlist/topbar/searchbutton.cpp
+    playlist/topbar/TopBar.cpp
+    playlist/topbar/ClearButton.cpp
+    playlist/topbar/SearchLineEdit.cpp
+    playlist/topbar/LineEdit.cpp
+    playlist/topbar/SearchButton.cpp
 
     ExternalResolverGui.cpp
-    resolvers/scriptresolver.cpp
-    resolvers/qtscriptresolver.cpp
-
-    sip/SipModel.cpp
-
-    utils/widgetdragfilter.cpp
-    utils/xspfgenerator.cpp
-    utils/jspfloader.cpp
-    utils/spotifyparser.cpp
-    utils/m3uloader.cpp
-    utils/itunesparser.cpp
-    utils/rdioparser.cpp
-    utils/shortenedlinkparser.cpp
-    utils/stylehelper.cpp
-    utils/dropjobnotifier.cpp
-    utils/proxystyle.cpp
-    utils/tomahawkutilsgui.cpp
-    utils/closure.cpp
-
-    widgets/checkdirtree.cpp
-    widgets/querylabel.cpp
-    widgets/imagebutton.cpp
-    widgets/animatedsplitter.cpp
-    widgets/elidedlabel.cpp
-    widgets/newplaylistwidget.cpp
-    widgets/searchwidget.cpp
+    resolvers/ScriptResolver.cpp
+    resolvers/QtScriptResolver.cpp
+
+    utils/WidgetDragFilter.cpp
+    utils/XspfGenerator.cpp
+    utils/JspfLoader.cpp
+    utils/SpotifyParser.cpp
+    utils/M3uLoader.cpp
+    utils/ItunesParser.cpp
+    utils/RdioParser.cpp
+    utils/ShortenedLinkParser.cpp
+    utils/StyleHelper.cpp
+    utils/DropJobNotifier.cpp
+    utils/ProxyStyle.cpp
+    utils/TomahawkUtilsGui.cpp
+    utils/Closure.cpp
+    utils/PixmapDelegateFader.cpp
+    utils/SmartPointerList.h
+    utils/AnimatedSpinner.cpp
+    utils/BinaryInstallerHelper.cpp
+    utils/BinaryExtractWorker.cpp
+    utils/SharedTimeLine.cpp
+
+    widgets/AnimatedCounterLabel.cpp
+    widgets/CheckDirTree.cpp
+    widgets/QueryLabel.cpp
+    widgets/ImageButton.cpp
+    widgets/AnimatedSplitter.cpp
+    widgets/ElidedLabel.cpp
+    widgets/NewPlaylistWidget.cpp
+    widgets/SearchWidget.cpp
     widgets/SeekSlider.cpp
-    widgets/playlisttypeselectordlg.cpp
-    widgets/welcomewidget.cpp
-    widgets/whatshotwidget.cpp
+    widgets/PlaylistTypeSelectorDialog.cpp
+    widgets/WelcomeWidget.cpp
+    widgets/WhatsHotWidget.cpp
+    widgets/NewReleasesWidget.cpp
     widgets/ChartDataLoader.cpp
     widgets/RecentlyPlayedPlaylistsModel.cpp
     widgets/RecentPlaylistsModel.cpp
     widgets/OverlayButton.cpp
-    widgets/overlaywidget.cpp
+    widgets/OverlayWidget.cpp
     widgets/HeaderLabel.cpp
     widgets/HeaderWidget.cpp
-    widgets/combobox.cpp
+    widgets/ComboBox.cpp
     widgets/ToggleButton.cpp
+    widgets/FadingPixmap.cpp
     widgets/SocialPlaylistWidget.cpp
-    widgets/infowidgets/sourceinfowidget.cpp
+    widgets/infowidgets/SourceInfoWidget.cpp
     widgets/infowidgets/ArtistInfoWidget.cpp
     widgets/infowidgets/AlbumInfoWidget.cpp
+    widgets/infowidgets/TrackInfoWidget.cpp
     widgets/Breadcrumb.cpp
     widgets/BreadcrumbButton.cpp
 )
 
 IF(QCA2_FOUND)
-    set( libGuiSources ${libGuiSources} utils/groovesharkparser.cpp )
-ENDIF(QCA2_FOUND)
-
-set( libGuiHeaders
-    actioncollection.h
-
-    contextmenu.h
-    dropjob.h
-    viewmanager.h
-    globalactionmanager.h
-    LatchManager.h
-    TomahawkSettingsGui.h
-
-    context/ContextPage.h
-    context/ContextWidget.h
-    context/pages/TopTracksContext.h
-    context/pages/RelatedArtistsContext.h
-    context/pages/WikipediaContext.h
-    context/pages/WebContext.h
-
-    infobar/infobar.h
-
-    playlist/topbar/topbar.h
-    playlist/topbar/clearbutton.h
-    playlist/topbar/searchlineedit.h
-    playlist/topbar/lineedit.h
-    playlist/topbar/lineedit_p.h
-    playlist/topbar/searchbutton.h
-
-    playlist/treemodel.h
-    playlist/treeproxymodel.h
-    playlist/treeproxymodelplaylistinterface.h
-    playlist/treeheader.h
-    playlist/treeitemdelegate.h
-    playlist/collectionproxymodel.h
-    playlist/collectionproxymodelplaylistinterface.h
-    playlist/collectionflatmodel.h
-    playlist/collectionview.h
-    playlist/playlistmodel.h
-    playlist/playlistproxymodel.h
-    playlist/playlistproxymodelplaylistinterface.h
-    playlist/playlistview.h
-    playlist/playlistitemdelegate.h
-    playlist/queueproxymodel.h
-    playlist/queueproxymodelplaylistinterface.h
-    playlist/queueview.h
-    playlist/trackmodel.h
-    playlist/trackmodelitem.h
-    playlist/trackproxymodel.h
-    playlist/trackproxymodelplaylistinterface.h
-    playlist/trackview.h
-    playlist/trackheader.h
-    playlist/treemodelitem.h
-    playlist/albumitem.h
-    playlist/albummodel.h
-    playlist/albumproxymodel.h
-    playlist/albumproxymodelplaylistinterface.h
-    playlist/albumitemdelegate.h
-    playlist/albumview.h
-    playlist/artistview.h
-    playlist/customplaylistview.h
-    playlist/ViewHeader.h
-
-    playlist/dynamic/DynamicPlaylist.h
-    playlist/dynamic/GeneratorInterface.h
-    playlist/dynamic/DynamicView.h
-    playlist/dynamic/DynamicModel.h
-    playlist/dynamic/echonest/EchonestGenerator.h
-    playlist/dynamic/echonest/EchonestControl.h
-    playlist/dynamic/echonest/EchonestSteerer.h
-    playlist/dynamic/widgets/DynamicWidget.h
-    playlist/dynamic/widgets/DynamicControlWrapper.h
-    playlist/dynamic/widgets/DynamicControlList.h
-    playlist/dynamic/widgets/ReadOrWriteWidget.h
-    playlist/dynamic/widgets/MiscControlWidgets.h
-    playlist/dynamic/widgets/CollapsibleControls.h
-    playlist/dynamic/widgets/DynamicSetupWidget.h
-    playlist/dynamic/widgets/LoadingSpinner.h
-
-    ExternalResolverGui.h
-    resolvers/scriptresolver.h
-    resolvers/qtscriptresolver.h
-
-    sip/SipModel.h
-
-    utils/widgetdragfilter.h
-    utils/xspfgenerator.h
-    utils/jspfloader.h
-    utils/spotifyparser.h
-    utils/m3uloader.h
-    utils/itunesparser.h
-    utils/rdioparser.h
-    utils/shortenedlinkparser.h
-    utils/dropjobnotifier.h
-    utils/closure.h
-
-    widgets/checkdirtree.h
-    widgets/querylabel.h
-    widgets/animatedcounterlabel.h
-    widgets/imagebutton.h
-    widgets/animatedsplitter.h
-    widgets/elidedlabel.h
-    widgets/newplaylistwidget.h
-    widgets/searchwidget.h
-    widgets/SeekSlider.h
-    widgets/playlisttypeselectordlg.h
-    widgets/welcomewidget.h
-    widgets/whatshotwidget.h
-    widgets/whatshotwidget_p.h
-    widgets/ChartDataLoader.h
-    widgets/RecentlyPlayedPlaylistsModel.h
-    widgets/RecentPlaylistsModel.h
-    widgets/OverlayButton.h
-    widgets/overlaywidget.h
-    widgets/HeaderLabel.h
-    widgets/HeaderWidget.h
-    widgets/combobox.h
-    widgets/ToggleButton.h
-    widgets/SocialPlaylistWidget.h
-    widgets/infowidgets/sourceinfowidget.h
-    widgets/infowidgets/ArtistInfoWidget.h
-    widgets/infowidgets/ArtistInfoWidget_p.h
-    widgets/infowidgets/AlbumInfoWidget.h
-    widgets/Breadcrumb.h
-    widgets/BreadcrumbButton.h
-
-    jobview/JobStatusView.h
-    jobview/JobStatusModel.h
-    jobview/JobStatusDelegate.h
-    jobview/JobStatusItem.h
-    jobview/PipelineStatusItem.h
-    jobview/TransferStatusItem.h
-    jobview/LatchedStatusItem.h
-    jobview/ErrorStatusMessage.h
-    jobview/IndexingJobItem.h
-
-    thirdparty/Qocoa/qsearchfield.h
-)
-
-IF(QCA2_FOUND)
-    set( libGuiHeaders ${libGuiHeaders} utils/groovesharkparser.h )
+    set( libGuiSources ${libGuiSources} utils/GroovesharkParser.cpp )
+    set( libGuiHeaders ${libGuiHeaders} utils/GroovesharkParser.h )
 ENDIF(QCA2_FOUND)
 
 set( libSources
-    tomahawksettings.cpp
-    sourcelist.cpp
-    pipeline.cpp
-
-    aclsystem.cpp
-    artist.cpp
-    artistplaylistinterface.cpp
-    album.cpp
-    albumplaylistinterface.cpp
-    collection.cpp
-    playlist.cpp
-    playlistplaylistinterface.cpp
-    resolver.cpp
+    TomahawkSettings.cpp
+    SourceList.cpp
+    Pipeline.cpp
+
+    AclRegistry.cpp
+    Artist.cpp
+    ArtistPlaylistInterface.cpp
+    Album.cpp
+    AlbumPlaylistInterface.cpp
+    Collection.cpp
+    FuncTimeout.cpp
+    Playlist.cpp
+    PlaylistPlaylistInterface.cpp
+    Resolver.cpp
     ExternalResolver.cpp
-    query.cpp
-    result.cpp
-    source.cpp
-    sourceplaylistinterface.cpp
-    playlistinterface.cpp
+    Query.cpp
+    Result.cpp
+    Source.cpp
+    SourcePlaylistInterface.cpp
+    PlaylistInterface.cpp
 
     EchonestCatalogSynchronizer.cpp
 
+    accounts/AccountManager.cpp
+    accounts/Account.cpp
+    accounts/AccountModel.cpp
+    accounts/AccountModelFilterProxy.cpp
+    accounts/ResolverAccount.cpp
+    accounts/AccountDelegate.cpp
+    accounts/DelegateConfigWrapper.cpp
+    accounts/AccountFactoryWrapper.cpp
+    accounts/AccountFactoryWrapperDelegate.cpp
+
+    accounts/spotify/SpotifyAccount.cpp
+    accounts/spotify/SpotifyAccountConfig.cpp
+    accounts/spotify/SpotifyPlaylistUpdater.cpp
+    accounts/spotify/SpotifyInfoPlugin.cpp
+
+    accounts/lastfm/LastFmAccount.cpp
+    accounts/lastfm/LastFmConfig.cpp
+    accounts/lastfm/LastFmInfoPlugin.cpp
+
     sip/SipPlugin.cpp
     sip/SipHandler.cpp
-    sip/sipinfo.cpp
-
-    audio/audioengine.cpp
-
-
-    database/database.cpp
-    database/fuzzyindex.cpp
-    database/databasecollection.cpp
-    database/localcollection.cpp
-    database/databaseworker.cpp
-    database/databaseimpl.cpp
-    database/databaseresolver.cpp
-    database/databasecommand.cpp
-    database/databasecommandloggable.cpp
-    database/databasecommand_resolve.cpp
-    database/databasecommand_allartists.cpp
-    database/databasecommand_allalbums.cpp
-    database/databasecommand_alltracks.cpp
-    database/databasecommand_addfiles.cpp
-    database/databasecommand_deletefiles.cpp
-    database/databasecommand_dirmtimes.cpp
-    database/databasecommand_filemtimes.cpp
-    database/databasecommand_loadfiles.cpp
-    database/databasecommand_logplayback.cpp
-    database/databasecommand_addsource.cpp
-    database/databasecommand_sourceoffline.cpp
-    database/databasecommand_collectionstats.cpp
-    database/databasecommand_loadplaylistentries.cpp
-    database/databasecommand_modifyplaylist.cpp
-    database/databasecommand_playbackhistory.cpp
-    database/databasecommand_setplaylistrevision.cpp
-    database/databasecommand_loadallplaylists.cpp
-    database/databasecommand_loadallsortedplaylists.cpp
-    database/databasecommand_loadallsources.cpp
-    database/databasecommand_createplaylist.cpp
-    database/databasecommand_deleteplaylist.cpp
-    database/databasecommand_renameplaylist.cpp
-    database/databasecommand_loadops.cpp
-    database/databasecommand_updatesearchindex.cpp
-    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
-    database/databasecommand_addclientauth.cpp
-    database/databasecommand_clientauthvalid.cpp
-    database/databasecommand_socialaction.cpp
-    database/databasecommand_loadsocialactions.cpp
-    database/databasecommand_genericselect.cpp
-    database/databasecommand_setcollectionattributes.cpp
-    database/databasecommand_collectionattributes.cpp
-    database/databasecommand_trackattributes.cpp
-    database/databasecommand_settrackattributes.cpp
-    database/database.cpp
-
-    infosystem/infosystem.cpp
-    infosystem/infosystemcache.cpp
-    infosystem/infosystemworker.cpp
-
-    infosystem/infoplugins/generic/echonestplugin.cpp
-    infosystem/infoplugins/generic/lastfmplugin.cpp
-    infosystem/infoplugins/generic/chartsplugin.cpp
-    infosystem/infoplugins/generic/spotifyPlugin.cpp
-    infosystem/infoplugins/generic/hypemPlugin.cpp
-    infosystem/infoplugins/generic/musixmatchplugin.cpp
-    infosystem/infoplugins/generic/musicbrainzPlugin.cpp
-    infosystem/infoplugins/generic/RoviPlugin.cpp
-
-    network/bufferiodevice.cpp
-    network/msgprocessor.cpp
-    network/streamconnection.cpp
-    network/dbsyncconnection.cpp
-    network/remotecollection.cpp
-    network/portfwdthread.cpp
-    network/servent.cpp
-    network/connection.cpp
-    network/controlconnection.cpp
+    sip/SipInfo.cpp
+
+    audio/AudioEngine.cpp
+
+    database/Database.cpp
+    database/FuzzyIndex.cpp
+    database/DatabaseCollection.cpp
+    database/LocalCollection.cpp
+    database/DatabaseWorker.cpp
+    database/DatabaseImpl.cpp
+    database/DatabaseResolver.cpp
+    database/DatabaseCommand.cpp
+    database/DatabaseCommandLoggable.cpp
+    database/DatabaseCommand_Resolve.cpp
+    database/DatabaseCommand_AllArtists.cpp
+    database/DatabaseCommand_AllAlbums.cpp
+    database/DatabaseCommand_AllTracks.cpp
+    database/DatabaseCommand_AddFiles.cpp
+    database/DatabaseCommand_DeleteFiles.cpp
+    database/DatabaseCommand_DirMtimes.cpp
+    database/DatabaseCommand_FileMTimes.cpp
+    database/DatabaseCommand_LoadFiles.cpp
+    database/DatabaseCommand_LogPlayback.cpp
+    database/DatabaseCommand_AddSource.cpp
+    database/DatabaseCommand_SourceOffline.cpp
+    database/DatabaseCommand_CollectionStats.cpp
+    database/DatabaseCommand_TrackStats.cpp
+    database/DatabaseCommand_LoadPlaylistEntries.cpp
+    database/DatabaseCommand_ModifyPlaylist.cpp
+    database/DatabaseCommand_PlaybackHistory.cpp
+    database/DatabaseCommand_SetPlaylistRevision.cpp
+    database/DatabaseCommand_LoadAllPlaylists.cpp
+    database/DatabaseCommand_LoadAllSortedPlaylists.cpp
+    database/DatabaseCommand_LoadAllSources.cpp
+    database/DatabaseCommand_CreatePlaylist.cpp
+    database/DatabaseCommand_DeletePlaylist.cpp
+    database/DatabaseCommand_RenamePlaylist.cpp
+    database/DatabaseCommand_LoadOps.cpp
+    database/DatabaseCommand_UpdateSearchIndex.cpp
+    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
+    database/DatabaseCommand_AddClientAuth.cpp
+    database/DatabaseCommand_ClientAuthValid.cpp
+    database/DatabaseCommand_SocialAction.cpp
+    database/DatabaseCommand_LoadSocialActions.cpp
+    database/DatabaseCommand_GenericSelect.cpp
+    database/DatabaseCommand_SetCollectionAttributes.cpp
+    database/DatabaseCommand_CollectionAttributes.cpp
+    database/DatabaseCommand_TrackAttributes.cpp
+    database/DatabaseCommand_SetTrackAttributes.cpp
+    database/Database.cpp
+    database/TomahawkSqlQuery.cpp
+
+    infosystem/InfoSystem.cpp
+    infosystem/InfoSystemCache.cpp
+    infosystem/InfoSystemWorker.cpp
+
+    network/BufferIoDevice.cpp
+    network/MsgProcessor.cpp
+    network/StreamConnection.cpp
+    network/DbSyncConnection.cpp
+    network/RemoteCollection.cpp
+    network/PortFwdThread.cpp
+    network/Servent.cpp
+    network/Connection.cpp
+    network/ControlConnection.cpp
 
     playlist/PlaylistUpdaterInterface.cpp
     playlist/dynamic/DynamicPlaylist.cpp
@@ -413,10 +289,12 @@
     taghandlers/mp4tag.cpp
     taghandlers/oggtag.cpp
 
-    utils/tomahawkutils.cpp
-    utils/logger.cpp
-    utils/qnr_iodevicestream.cpp
-    utils/xspfloader.cpp
+    utils/TomahawkUtils.cpp
+    utils/Logger.cpp
+    utils/Qnr_IoDeviceStream.cpp
+    utils/XspfLoader.cpp
+    utils/TomahawkCache.cpp
+    utils/GuiHelpers.cpp
 
     thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp
     thirdparty/kdsingleapplicationguard/kdsharedmemorylocker.cpp
@@ -424,170 +302,36 @@
     thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
 )
 
-set( libHeaders
-    tomahawksettings.h
-    sourcelist.h
-    pipeline.h
-    functimeout.h
-
-    playlistinterface.h
-
-    aclsystem.h
-    collection.h
-    query.h
-    resolver.h
-    ExternalResolver.h
-    result.h
-    source.h
-    sourceplaylistinterface.h
-
-    artist.h
-    artistplaylistinterface.h
-    album.h
-    albumplaylistinterface.h
-    playlist.h
-    playlistplaylistinterface.h
-
-    viewpage.h
-
-    EchonestCatalogSynchronizer.h
-
-    sip/SipPlugin.h
-    sip/SipHandler.h
-    sip/sipinfo.h
-
-    audio/audioengine.h
-
-    database/database.h
-    database/fuzzyindex.h
-    database/databaseworker.h
-    database/databaseimpl.h
-    database/databaseresolver.h
-    database/databasecommand.h
-    database/databasecommandloggable.h
-    database/databasecommand_resolve.h
-    database/databasecommand_allartists.h
-    database/databasecommand_allalbums.h
-    database/databasecommand_alltracks.h
-    database/databasecommand_addfiles.h
-    database/databasecommand_deletefiles.h
-    database/databasecommand_dirmtimes.h
-    database/databasecommand_filemtimes.h
-    database/databasecommand_loadfiles.h
-    database/databasecommand_logplayback.h
-    database/databasecommand_addsource.h
-    database/databasecommand_sourceoffline.h
-    database/databasecommand_collectionstats.h
-    database/databasecommand_loadplaylistentries.h
-    database/databasecommand_modifyplaylist.h
-    database/databasecommand_playbackhistory.h
-    database/databasecommand_setplaylistrevision.h
-    database/databasecommand_loadallplaylists.h
-    database/databasecommand_loadallsortedplaylists.h
-    database/databasecommand_loadallsources.h
-    database/databasecommand_createplaylist.h
-    database/databasecommand_deleteplaylist.h
-    database/databasecommand_renameplaylist.h
-    database/databasecommand_loadops.h
-    database/databasecommand_updatesearchindex.h
-    database/databasecollection.h
-    database/localcollection.h
-    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
-    database/databasecommand_addclientauth.h
-    database/databasecommand_clientauthvalid.h
-    database/databasecommand_socialaction.h
-    database/databasecommand_loadsocialactions.h
-    database/databasecommand_genericselect.h
-    database/databasecommand_setcollectionattributes.h
-    database/databasecommand_collectionattributes.h
-    database/databasecommand_trackattributes.h
-    database/databasecommand_settrackattributes.h
-
-    infosystem/infosystem.h
-    infosystem/infosystem.h
-    infosystem/infosystemworker.h
-    infosystem/infosystemcache.h
-
-    infosystem/infoplugins/generic/echonestplugin.h
-    infosystem/infoplugins/generic/lastfmplugin.h
-    infosystem/infoplugins/generic/chartsplugin.h
-    infosystem/infoplugins/generic/spotifyPlugin.h
-    infosystem/infoplugins/generic/hypemPlugin.h
-    infosystem/infoplugins/generic/musixmatchplugin.h
-    infosystem/infoplugins/generic/musicbrainzPlugin.h
-    infosystem/infoplugins/generic/RoviPlugin.h
-
-    network/bufferiodevice.h
-    network/msgprocessor.h
-    network/remotecollection.h
-    network/streamconnection.h
-    network/dbsyncconnection.h
-    network/servent.h
-    network/connection.h
-    network/controlconnection.h
-    network/portfwdthread.h
-
-    playlist/PlaylistUpdaterInterface.h
-    playlist/dynamic/DynamicPlaylist.h
-    playlist/dynamic/GeneratorInterface.h
-    playlist/dynamic/GeneratorFactory.h
-    playlist/XspfUpdater.h
-    playlist/dynamic/database/DatabaseGenerator.h
-    playlist/dynamic/database/DatabaseControl.h
-    playlist/dynamic/DynamicControl.h
-
-    thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h
-
-    utils/tomahawkutilsgui.h
-    utils/xspfloader.h
-    utils/qnr_iodevicestream.h
-)
-
-set( libHeaders_NoMOC
-    infosystem/infoplugins/unix/imageconverter.h
-
-    taghandlers/tag.h
-    taghandlers/apetag.h
-    taghandlers/asftag.h
-    taghandlers/id3v1tag.h
-    taghandlers/id3v2tag.h
-    taghandlers/mp4tag.h
-    taghandlers/oggtag.h
-
-    utils/tomahawkutils.h
-)
-
 set( libUI ${libUI}
-    widgets/playlisttypeselectordlg.ui
-    widgets/newplaylistwidget.ui
-    widgets/searchwidget.ui
-    widgets/welcomewidget.ui
-    widgets/whatshotwidget.ui
+    widgets/PlaylistTypeSelectorDialog.ui
+    widgets/NewPlaylistWidget.ui
+    widgets/SearchWidget.ui
+    widgets/WelcomeWidget.ui
+    widgets/WhatsHotWidget.ui
+    widgets/NewReleasesWidget.ui
     widgets/SocialPlaylistWidget.ui
-    widgets/infowidgets/sourceinfowidget.ui
+    widgets/infowidgets/SourceInfoWidget.ui
     widgets/infowidgets/ArtistInfoWidget.ui
     widgets/infowidgets/AlbumInfoWidget.ui
-    playlist/topbar/topbar.ui
-    playlist/queueview.ui
+    widgets/infowidgets/TrackInfoWidget.ui
+    playlist/topbar/TopBar.ui
+    playlist/QueueView.ui
     context/ContextWidget.ui
-    infobar/infobar.ui
+    infobar/InfoBar.ui
+    accounts/AccountFactoryWrapper.ui
+    accounts/spotify/SpotifyAccountConfig.ui
+    accounts/lastfm/LastFmConfig.ui
 )
 
 include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/.. ..
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${QT_INCLUDE_DIR}
     ${QJSON_INCLUDE_DIR}
-    ${LIBECHONEST_INCLUDE_DIR}
-    ${LIBECHONEST_INCLUDE_DIR}/..
+    ${ECHONEST_INCLUDE_DIR}
+    ${LIBLASTFM_INCLUDE_DIRS}
+    ${LIBLASTFM_INCLUDE_DIRS}/..
     ${CLUCENE_INCLUDE_DIRS}
     ${PHONON_INCLUDES}
-    ${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src
 
     playlist
 
@@ -607,19 +351,6 @@
 ENDIF(LIBATTICA_FOUND)
 
 IF( UNIX AND NOT APPLE )
-    LIST(APPEND libGuiSources
-      infosystem/infoplugins/unix/mprispluginrootadaptor.cpp
-      infosystem/infoplugins/unix/mprispluginplayeradaptor.cpp
-      infosystem/infoplugins/unix/mprisplugin.cpp
-      infosystem/infoplugins/unix/fdonotifyplugin.cpp
-      infosystem/infoplugins/unix/imageconverter.cpp )
-
-    LIST(APPEND libGuiHeaders
-      infosystem/infoplugins/unix/mprispluginrootadaptor.h
-      infosystem/infoplugins/unix/mprispluginplayeradaptor.h
-      infosystem/infoplugins/unix/mprisplugin.h
-      infosystem/infoplugins/unix/fdonotifyplugin.h )
-
     IF( BUILD_GUI AND X11_FOUND )
         INCLUDE_DIRECTORIES( ${THIRDPARTY_DIR}/libqnetwm )
         SET( libSources ${libSources} ${THIRDPARTY_DIR}/libqnetwm/libqnetwm/netwm.cpp )
@@ -648,47 +379,44 @@
     FIND_LIBRARY( SCRIPTINGBRIDGE_LIBRARY ScriptingBridge )
     MARK_AS_ADVANCED( COREAUDIO_LIBRARY COREFOUNDATION_LIBRARY FOUNDATION_LIBRARY SCRIPTINGBRIDGE_LIBRARY )
 
+    SET( CMAKE_SHARED_LINKER_FLAGS "-headerpad_max_install_names ${CMAKE_SHARED_LINKER_FLAGS}" )
+
     SET( libSources ${libSources}
-      infosystem/infoplugins/mac/adium.mm
-      infosystem/infoplugins/mac/adiumplugin.cpp
-      utils/tomahawkutils_mac.mm
+      utils/TomahawkUtils_Mac.mm
+      mac/FileHelpers.mm
       thirdparty/Qocoa/qsearchfield_mac.mm )
 
-    SET_SOURCE_FILES_PROPERTIES(utils/tomahawkutils_mac.mm PROPERTIES COMPILE_FLAGS "-fvisibility=default")
-
-    SET( libHeaders ${libHeaders}
-      infosystem/infoplugins/mac/adium.h
-      infosystem/infoplugins/mac/adiumplugin.h )
+    SET_SOURCE_FILES_PROPERTIES(utils/TomahawkUtils_Mac.mm PROPERTIES COMPILE_FLAGS "-fvisibility=default")
 
     SET( OS_SPECIFIC_LINK_LIBRARIES
         ${OS_SPECIFIC_LINK_LIBRARIES}
         # System
         ${COREAUDIO_LIBRARY}
         ${COREFOUNDATION_LIBRARY}
-	${FOUNDATION_LIBRARY}
+        ${FOUNDATION_LIBRARY}
 	${SCRIPTINGBRIDGE_LIBRARY}
 
         /System/Library/Frameworks/AppKit.framework
+        /System/Library/Frameworks/Security.framework
     )
 ELSE( APPLE )
     SET( libGuiSources ${libGuiSources} thirdparty/Qocoa/qsearchfield.cpp )
 ENDIF( APPLE )
 
 IF(LIBLASTFM_FOUND)
-    SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 )
+    SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${LIBLASTFM_LIBRARIES} )
 ENDIF(LIBLASTFM_FOUND)
 
 IF(BUILD_GUI)
     LIST(APPEND libSources ${libGuiSources} )
-    LIST(APPEND libHeaders ${libGuiHeaders} )
 ENDIF()
 
 qt4_wrap_ui( libUI_H ${libUI} )
-qt4_wrap_cpp( libMoc ${libHeaders} )
 
-SET( libSources ${libSources} ${libUI_H} ${libHeaders_NoMOC} )
+SET( libSources ${libSources} ${libUI_H} )
 
-ADD_LIBRARY( tomahawklib SHARED ${libSources} ${libMoc} )
+ADD_LIBRARY( tomahawklib SHARED ${libSources})
+set_target_properties(tomahawklib PROPERTIES AUTOMOC TRUE)
 
 IF(QCA2_FOUND)
     SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
@@ -698,6 +426,10 @@
     SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${LIBATTICA_LIBRARIES} ${QuaZip_LIBRARIES} )
 ENDIF(LIBATTICA_FOUND)
 
+IF( UNIX AND NOT APPLE )
+    SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${QT_QTDBUS_LIBRARY} )
+ENDIF( UNIX AND NOT APPLE )
+
 TARGET_LINK_LIBRARIES( tomahawklib
     # Thirdparty shipped with tomahawk
     ${LIBPORTFWD_LIBRARIES}
@@ -707,11 +439,15 @@
     ${PHONON_LIBS}
     ${TAGLIB_LIBRARIES}
     ${CLUCENE_LIBRARIES}
-    ${LIBECHONEST_LIBRARY}
+    ${ECHONEST_LIBRARIES}
     ${QT_QTSQL_LIBRARY}
     ${QT_QTUITOOLS_LIBRARY}
     ${QT_QTGUI_LIBRARY}
+    ${QT_QTWEBKIT_LIBRARY}
     ${QT_QTSCRIPT_LIBRARY}
+    ${QT_QTNETWORK_LIBRARY}
+    ${QT_QTXML_LIBRARY}
+    ${QT_QTCORE_LIBRARY}
     ${OS_SPECIFIC_LINK_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
     ${LINK_LIBRARIES}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Collection.cpp Added

@@ -0,0 +1,257 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "Collection.h"
+
+#include <QMetaObject>
+#include <QGenericArgument>
+
+#include "Source.h"
+
+#include "utils/Logger.h"
+#include <PlaylistUpdaterInterface.h>
+
+using namespace Tomahawk;
+
+
+Collection::Collection( const source_ptr& source, const QString& name, QObject* parent )
+    : QObject( parent )
+    , m_name( name )
+    , m_lastmodified( 0 )
+    , m_changed( false )
+    , m_source( source )
+{
+    qDebug() << Q_FUNC_INFO << name << source->friendlyName();
+
+    connect( source.data(), SIGNAL( synced() ), SLOT( onSynced() ) );
+}
+
+
+Collection::~Collection()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+QString
+Collection::name() const
+{
+    return m_name;
+}
+
+
+const
+source_ptr& Collection::source() const
+{
+    return m_source;
+}
+
+
+void
+Collection::addPlaylist( const Tomahawk::playlist_ptr& p )
+{
+    if ( m_playlists.contains( p->guid() ) )
+        return;
+
+    QList<playlist_ptr> toadd;
+    toadd << p;
+    m_playlists.insert( p->guid(), p );
+
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+                            << "from source id" << source()->id()
+                            << "numplaylists:" << m_playlists.count();*/
+    emit playlistsAdded( toadd );
+}
+
+
+void
+Collection::addAutoPlaylist( const Tomahawk::dynplaylist_ptr& p )
+{
+    QList<dynplaylist_ptr> toadd;
+    toadd << p;
+    m_autoplaylists.insert( p->guid(), p );
+
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+                            << "from source id" << source()->id()
+                            << "numplaylists:" << m_playlists.count();*/
+    emit autoPlaylistsAdded( toadd );
+}
+
+
+void
+Collection::addStation( const dynplaylist_ptr& s )
+{
+    QList<dynplaylist_ptr> toadd;
+    toadd << s;
+    m_stations.insert( s->guid(), s );
+
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+                            << "from source id" << source()->id()
+                            << "numplaylists:" << m_playlists.count();*/
+    emit stationsAdded( toadd );
+}
+
+
+void
+Collection::deletePlaylist( const Tomahawk::playlist_ptr& p )
+{
+    QList<playlist_ptr> todelete;
+    todelete << p;
+    m_playlists.remove( p->guid() );
+
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+                            << "from source id" << source()->id()
+                            << "numplaylists:" << m_playlists.count();*/
+    emit playlistsDeleted( todelete );
+}
+
+
+void
+Collection::deleteAutoPlaylist( const Tomahawk::dynplaylist_ptr& p )
+{
+    QList<dynplaylist_ptr> todelete;
+    todelete << p;
+    m_autoplaylists.remove( p->guid() );
+
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+                            << "from source id" << source()->id()
+                            << "numplaylists:" << m_playlists.count();*/
+    emit autoPlaylistsDeleted( todelete );
+}
+
+
+void
+Collection::deleteStation( const dynplaylist_ptr& s )
+{
+    QList<dynplaylist_ptr> todelete;
+    todelete << s;
+    m_stations.remove( s->guid() );
+
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+                            << "from source id" << source()->id()
+                            << "numplaylists:" << m_playlists.count();*/
+    emit stationsDeleted( todelete );
+}
+
+
+Tomahawk::playlist_ptr
+Collection::playlist( const QString& guid )
+{
+    return m_playlists.value( guid, Tomahawk::playlist_ptr() );
+}
+
+
+Tomahawk::dynplaylist_ptr
+Collection::autoPlaylist( const QString& guid )
+{
+    return m_autoplaylists.value( guid, Tomahawk::dynplaylist_ptr() );
+}
+
+
+Tomahawk::dynplaylist_ptr
+Collection::station( const QString& guid )
+{
+    return m_stations.value( guid, Tomahawk::dynplaylist_ptr() );
+}
+
+
+void
+Collection::setPlaylists( const QList<Tomahawk::playlist_ptr>& plists )
+{
+    foreach ( const playlist_ptr& p, plists )
+    {
+//        qDebug() << "Batch inserting playlist:" << p->guid();
+        m_playlists.insert( p->guid(), p );
+        if ( !m_source.isNull() && m_source->isLocal() )
+            PlaylistUpdaterInterface::loadForPlaylist( p );
+    }
+    emit playlistsAdded( plists );
+}
+
+
+void
+Collection::setAutoPlaylists( const QList< Tomahawk::dynplaylist_ptr >& plists )
+{
+    foreach ( const dynplaylist_ptr& p, plists )
+    {
+//        qDebug() << "Batch inserting dynamic playlist:" << p->guid();
+        m_autoplaylists.insert( p->guid(), p );
+    }
+    emit autoPlaylistsAdded( plists );
+}
+
+
+void
+Collection::setStations( const QList< dynplaylist_ptr >& stations )
+{
+    foreach ( const dynplaylist_ptr& s, stations )
+    {
+//        qDebug() << "Batch inserting station:" << s->guid();
+        m_stations.insert( s->guid(), s );
+    }
+    emit autoPlaylistsAdded( stations );
+}
+
+
+void
+Collection::setTracks( const QList<unsigned int>& ids )
+{
+    tDebug() << Q_FUNC_INFO << ids.count() << name();
+
+    m_changed = true;
+    emit tracksAdded( ids );
+}
+
+
+void
+Collection::delTracks( const QList<unsigned int>& ids )
+{
+    tDebug() << Q_FUNC_INFO << ids.count() << name();
+
+    m_changed = true;
+    emit tracksRemoved( ids );
+}
+
+
+void
+Collection::onSynced()
+{
+    tDebug() << Q_FUNC_INFO << m_changed;
+    if ( m_changed )
+    {
+        m_changed = false;
+        emit changed();
+    }
+}
+
+
+void
+Collection::moveAutoToStation( const QString& guid )
+{
+    if ( m_autoplaylists.contains( guid ) )
+        m_stations.insert( guid, m_autoplaylists.take( guid ) );
+}
+
+
+void
+Collection::moveStationToAuto( const QString& guid )
+{
+    if ( m_stations.contains( guid ) )
+        m_autoplaylists.insert( guid, m_stations.take( guid ) );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Collection.h Added

@@ -0,0 +1,132 @@
+/* === 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
+ *   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/>.
+ */
+
+/*
+    The collection  - acts as container for someones music library
+    load() -> async populate by calling addArtists etc,
+    then finishedLoading() is emitted.
+    then use artists() etc to get the data.
+*/
+
+#ifndef TOMAHAWK_COLLECTION_H
+#define TOMAHAWK_COLLECTION_H
+
+#include <QHash>
+#include <QDir>
+#include <QList>
+#include <QSharedPointer>
+
+#include "Typedefs.h"
+#include "FuncTimeout.h"
+#include "Playlist.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
+
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT Collection : public QObject
+{
+Q_OBJECT
+
+public:
+    Collection( const source_ptr& source, const QString& name, QObject* parent = 0 );
+    virtual ~Collection();
+
+    virtual QString name() const;
+
+    virtual void loadPlaylists() { qDebug() << Q_FUNC_INFO; }
+    virtual void loadAutoPlaylists() { qDebug() << Q_FUNC_INFO; }
+    virtual void loadStations() { qDebug() << Q_FUNC_INFO; }
+
+    virtual Tomahawk::playlist_ptr playlist( const QString& guid );
+    virtual Tomahawk::dynplaylist_ptr autoPlaylist( const QString& guid );
+    virtual Tomahawk::dynplaylist_ptr station( const QString& guid );
+
+    virtual void addPlaylist( const Tomahawk::playlist_ptr& p );
+    virtual void deletePlaylist( const Tomahawk::playlist_ptr& p );
+
+    virtual void addAutoPlaylist( const Tomahawk::dynplaylist_ptr& p );
+    virtual void deleteAutoPlaylist( const Tomahawk::dynplaylist_ptr& p );
+
+    virtual void addStation( const Tomahawk::dynplaylist_ptr& s );
+    virtual void deleteStation( const Tomahawk::dynplaylist_ptr& s );
+
+    virtual QList< Tomahawk::playlist_ptr > playlists() { return m_playlists.values(); }
+    virtual QList< Tomahawk::dynplaylist_ptr > autoPlaylists() { return m_autoplaylists.values(); }
+    virtual QList< Tomahawk::dynplaylist_ptr > stations() { return m_stations.values(); }
+
+    const source_ptr& source() const;
+    unsigned int lastmodified() const { return m_lastmodified; }
+
+signals:
+    void tracksAdded( const QList<unsigned int>& fileids );
+    void tracksRemoved( const QList<unsigned int>& fileids );
+
+    void playlistsAdded( const QList<Tomahawk::playlist_ptr>& );
+    void playlistsDeleted( const QList<Tomahawk::playlist_ptr>& );
+
+    void autoPlaylistsAdded( const QList<Tomahawk::dynplaylist_ptr>& );
+    void autoPlaylistsDeleted( const QList<Tomahawk::dynplaylist_ptr>& );
+
+    void stationsAdded( const QList<Tomahawk::dynplaylist_ptr>& );
+    void stationsDeleted( const QList<Tomahawk::dynplaylist_ptr>& );
+
+    void changed();
+
+public slots:
+    virtual void addTracks( const QList<QVariant>& newitems ) = 0;
+    virtual void removeTracks( const QDir& dir ) = 0;
+
+    void setPlaylists( const QList<Tomahawk::playlist_ptr>& plists );
+    void setAutoPlaylists( const QList< Tomahawk::dynplaylist_ptr >& autoplists );
+    void setStations( const QList< Tomahawk::dynplaylist_ptr >& stations );
+
+    void setTracks( const QList<unsigned int>& fileids );
+    void delTracks( const QList<unsigned int>& fileids );
+
+protected:
+    QString m_name;
+    unsigned int m_lastmodified; // unix time of last change to collection
+
+private slots:
+    void onSynced();
+
+private:
+    bool m_changed;
+
+    source_ptr m_source;
+    QHash< QString, Tomahawk::playlist_ptr > m_playlists;
+    QHash< QString, Tomahawk::dynplaylist_ptr > m_autoplaylists;
+    QHash< QString, Tomahawk::dynplaylist_ptr > m_stations;
+
+    // HACK see line 99 in the dbcmd for why we need this for backwards-compatibility
+    void moveAutoToStation( const QString& guid );
+    void moveStationToAuto( const QString& guid );
+    friend class ::DatabaseCommand_SetDynamicPlaylistRevision;
+};
+
+}; // ns
+
+inline uint qHash( const QSharedPointer<Tomahawk::Collection>& key )
+{
+    return qHash( (void *)key.data() );
+}
+
+#endif // TOMAHAWK_COLLECTION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/ContextMenu.cpp Added

@@ -0,0 +1,325 @@
+
+/* === 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
+ *   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 "ContextMenu.h"
+
+#include "GlobalActionManager.h"
+#include "PlaylistView.h"
+#include "ViewManager.h"
+#include "Query.h"
+#include "Source.h"
+#include "Artist.h"
+#include "Album.h"
+#include "utils/Logger.h"
+#include "audio/AudioEngine.h"
+
+using namespace Tomahawk;
+
+
+ContextMenu::ContextMenu( QWidget* parent )
+    : QMenu( parent )
+    , m_loveAction( 0 )
+{
+    m_sigmap = new QSignalMapper( this );
+    connect( m_sigmap, SIGNAL( mapped( int ) ), SLOT( onTriggered( int ) ) );
+
+    m_supportedActions = ActionPlay | ActionQueue | ActionCopyLink | ActionLove | ActionStopAfter | ActionPage;
+}
+
+
+ContextMenu::~ContextMenu()
+{
+}
+
+
+void
+ContextMenu::clear()
+{
+    QMenu::clear();
+
+    m_queries.clear();
+    m_albums.clear();
+    m_artists.clear();
+}
+
+
+unsigned int
+ContextMenu::itemCount() const
+{
+   return m_queries.count() + m_artists.count() + m_albums.count();
+}
+
+
+void
+ContextMenu::setQueries( const QList<Tomahawk::query_ptr>& queries )
+{
+    if ( queries.isEmpty() )
+        return;
+
+    QMenu::clear();
+    m_queries.clear();
+    m_queries << queries;
+
+    if ( m_supportedActions & ActionPlay && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "&Play" ) ), ActionPlay );
+
+    if ( m_supportedActions & ActionQueue )
+        m_sigmap->setMapping( addAction( tr( "Add to &Queue" ) ), ActionQueue );
+
+    if ( m_supportedActions & ActionStopAfter && itemCount() == 1 )
+    {
+        if ( AudioEngine::instance()->stopAfterTrack() == queries.first() )
+            m_sigmap->setMapping( addAction( tr( "Continue Playback after this &Track" ) ), ActionStopAfter );
+        else
+            m_sigmap->setMapping( addAction( tr( "Stop Playback after this &Track" ) ), ActionStopAfter );
+    }
+
+    addSeparator();
+
+    if ( m_supportedActions & ActionLove && itemCount() == 1 )
+    {
+        m_loveAction = addAction( tr( "&Love" ) );
+        m_sigmap->setMapping( m_loveAction, ActionLove );
+
+        connect( queries.first().data(), SIGNAL( socialActionsLoaded() ), SLOT( onSocialActionsLoaded() ) );
+        onSocialActionsLoaded();
+    }
+
+    if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "&Copy Track Link" ) ), ActionCopyLink );
+
+    if ( m_supportedActions & ActionPage && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "&Show Track Page" ) ), ActionPage );
+
+    addSeparator();
+
+    if ( m_supportedActions & ActionDelete )
+        m_sigmap->setMapping( addAction( queries.count() > 1 ? tr( "&Delete Items" ) : tr( "&Delete Item" ) ), ActionDelete );
+
+    foreach ( QAction* action, actions() )
+    {
+        connect( action, SIGNAL( triggered() ), m_sigmap, SLOT( map() ) );
+    }
+}
+
+
+void
+ContextMenu::setQuery( const Tomahawk::query_ptr& query )
+{
+    if ( query.isNull() )
+        return;
+
+    QList<query_ptr> queries;
+    queries << query;
+    setQueries( queries );
+}
+
+
+void
+ContextMenu::setAlbums( const QList<Tomahawk::album_ptr>& albums )
+{
+    if ( albums.isEmpty() )
+        return;
+
+    QMenu::clear();
+    m_albums.clear();
+    m_albums << albums;
+
+/*    if ( m_supportedActions & ActionPlay && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "Show &Album Page" ) ), ActionPlay );*/
+
+    if ( m_supportedActions & ActionQueue )
+        m_sigmap->setMapping( addAction( tr( "Add to &Queue" ) ), ActionQueue );
+
+    if ( m_supportedActions & ActionPage && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "&Show Album Page" ) ), ActionPage );
+
+    //m_sigmap->setMapping( addAction( tr( "&Add to Playlist" ) ), ActionAddToPlaylist );
+
+    addSeparator();
+
+    if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "Copy Album &Link" ) ), ActionCopyLink );
+
+    foreach ( QAction* action, actions() )
+    {
+        connect( action, SIGNAL( triggered() ), m_sigmap, SLOT( map() ) );
+    }
+}
+
+
+void
+ContextMenu::setAlbum( const Tomahawk::album_ptr& album )
+{
+    QList<album_ptr> albums;
+    albums << album;
+    setAlbums( albums );
+}
+
+
+void
+ContextMenu::setArtists( const QList<Tomahawk::artist_ptr>& artists )
+{
+    if ( artists.isEmpty() )
+        return;
+
+    QMenu::clear();
+    m_artists.clear();
+    m_artists << artists;
+
+/*    if ( m_supportedActions & ActionPlay && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "Show &Artist Page" ) ), ActionPlay );*/
+
+    if ( m_supportedActions & ActionQueue )
+        m_sigmap->setMapping( addAction( tr( "Add to &Queue" ) ), ActionQueue );
+
+    if ( m_supportedActions & ActionPage && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "&Show Artist Page" ) ), ActionPage );
+
+    //m_sigmap->setMapping( addAction( tr( "&Add to Playlist" ) ), ActionAddToPlaylist );
+
+    addSeparator();
+
+    if ( m_supportedActions & ActionCopyLink && itemCount() == 1 )
+        m_sigmap->setMapping( addAction( tr( "Copy Artist &Link" ) ), ActionCopyLink );
+
+    foreach ( QAction* action, actions() )
+    {
+        connect( action, SIGNAL( triggered() ), m_sigmap, SLOT( map() ) );
+    }
+}
+
+
+void
+ContextMenu::setArtist( const Tomahawk::artist_ptr& artist )
+{
+    QList<artist_ptr> artists;
+    artists << artist;
+    setArtists( artists );
+}
+
+
+void
+ContextMenu::onTriggered( int action )
+{
+    switch ( action )
+    {
+        case ActionQueue:
+            addToQueue();
+            break;
+
+        case ActionCopyLink:
+            copyLink();
+            break;
+
+        case ActionPage:
+            openPage();
+            break;
+
+        case ActionLove:
+            m_queries.first()->setLoved( !m_queries.first()->loved() );
+            break;
+
+        case ActionStopAfter:
+            if ( m_queries.first()->equals( AudioEngine::instance()->stopAfterTrack() ) )
+                AudioEngine::instance()->setStopAfterTrack( query_ptr() );
+            else
+                AudioEngine::instance()->setStopAfterTrack( m_queries.first() );
+            break;
+
+        default:
+            emit triggered( action );
+    }
+}
+
+
+
+void
+ContextMenu::addToQueue()
+{
+    foreach ( const query_ptr& query, m_queries )
+    {
+        ViewManager::instance()->queue()->model()->appendQuery( query );
+    }
+    foreach ( const artist_ptr& artist, m_artists )
+    {
+        ViewManager::instance()->queue()->model()->appendArtist( artist );
+    }
+    foreach ( const album_ptr& album, m_albums )
+    {
+        ViewManager::instance()->queue()->model()->appendAlbum( album );
+    }
+
+    ViewManager::instance()->showQueue();
+}
+
+
+void
+ContextMenu::copyLink()
+{
+    if ( m_queries.count() )
+    {
+        GlobalActionManager::instance()->copyToClipboard( m_queries.first() );
+    }
+    else if ( m_albums.count() )
+    {
+        GlobalActionManager::instance()->copyOpenLink( m_albums.first() );
+    }
+    else if ( m_artists.count() )
+    {
+        GlobalActionManager::instance()->copyOpenLink( m_artists.first() );
+    }
+}
+
+
+void
+ContextMenu::openPage()
+{
+    if ( m_queries.count() )
+    {
+        ViewManager::instance()->show( m_queries.first() );
+    }
+    else if ( m_artists.count() )
+    {
+        ViewManager::instance()->show( m_artists.first() );
+    }
+    else if ( m_albums.count() )
+    {
+        ViewManager::instance()->show( m_albums.first() );
+    }
+}
+
+
+void
+ContextMenu::onSocialActionsLoaded()
+{
+    if ( m_queries.isEmpty() || m_queries.first().isNull() )
+        return;
+
+    if ( m_loveAction && m_queries.first()->loved() )
+    {
+        m_loveAction->setText( tr( "Un-&Love" ) );
+        m_loveAction->setIcon( QIcon( RESPATH "images/not-loved.png" ) );
+    }
+    else if ( m_loveAction )
+    {
+        m_loveAction->setText( tr( "&Love" ) );
+        m_loveAction->setIcon( QIcon( RESPATH "images/loved.png" ) );
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/ContextMenu.h Added

@@ -0,0 +1,91 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 CONTEXTMENU_H
+#define CONTEXTMENU_H
+
+#include <QtCore/QSignalMapper>
+#include <QtGui/QMenu>
+
+#include "Typedefs.h"
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT ContextMenu : public QMenu
+{
+Q_OBJECT
+
+public:
+    enum MenuActions
+    {
+       ActionPlay =         1,
+       ActionQueue =        2,
+       ActionDelete =       4,
+       ActionCopyLink =     8,
+       ActionLove =         16,
+       ActionStopAfter =    32,
+       ActionPage =         64
+    };
+
+    explicit ContextMenu( QWidget* parent = 0 );
+    virtual ~ContextMenu();
+
+    int supportedActions() const { return m_supportedActions; }
+    void setSupportedActions( int actions ) { m_supportedActions = actions; }
+
+    void setQuery( const Tomahawk::query_ptr& query );
+    void setQueries( const QList<Tomahawk::query_ptr>& queries );
+
+    void setArtist( const Tomahawk::artist_ptr& artist );
+    void setArtists( const QList<Tomahawk::artist_ptr>& artists );
+
+    void setAlbum( const Tomahawk::album_ptr& album );
+    void setAlbums( const QList<Tomahawk::album_ptr>& albums );
+
+    void clear();
+
+    unsigned int itemCount() const;
+
+signals:
+    void triggered( int action );
+
+private slots:
+    void onTriggered( int action );
+    void copyLink();
+    void openPage();
+    void addToQueue();
+
+    void onSocialActionsLoaded();
+
+private:
+    QSignalMapper* m_sigmap;
+    int m_supportedActions;
+
+    QAction* m_loveAction;
+
+    QList<Tomahawk::query_ptr> m_queries;
+    QList<Tomahawk::artist_ptr> m_artists;
+    QList<Tomahawk::album_ptr> m_albums;
+};
+
+}; // ns
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/CountryUtils.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/DllMacro.h Added

@@ -0,0 +1,33 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ * 
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 DLLMACRO_H
+#define DLLMACRO_H
+
+#include <QtCore/qglobal.h>
+
+#ifndef DLLEXPORT
+# if defined (DLLEXPORT_PRO)
+#  define DLLEXPORT Q_DECL_EXPORT
+# else
+#  define DLLEXPORT Q_DECL_IMPORT
+# endif
+#endif
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/DropJob.cpp Added

@@ -0,0 +1,824 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Michael Zanetti <mzanetti@kde.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011-2012, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2011-2012, Christian Muehlhaeuser <muesli@tomahawk-player.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 "DropJob.h"
+
+#include "Artist.h"
+#include "Album.h"
+#include "Source.h"
+
+#include "utils/SpotifyParser.h"
+#include "utils/ItunesParser.h"
+#include "utils/RdioParser.h"
+#include "utils/M3uLoader.h"
+#include "utils/ShortenedLinkParser.h"
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+#include "GlobalActionManager.h"
+#include "utils/XspfLoader.h"
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+#include "Pipeline.h"
+
+#ifdef QCA2_FOUND
+#include "utils/GroovesharkParser.h"
+#endif //QCA2_FOUND
+
+
+using namespace Tomahawk;
+
+bool DropJob::s_canParseSpotifyPlaylists = false;
+static QString s_dropJobInfoId = "dropjob";
+
+DropJob::DropJob( QObject *parent )
+    : QObject( parent )
+    , m_queryCount( 0 )
+    , m_onlyLocal( false )
+    , m_getWholeArtists( false )
+    , m_getWholeAlbums( false )
+    , m_top10( false )
+    , m_dropAction( Default )
+{
+}
+
+
+DropJob::~DropJob()
+{
+    qDebug() << "destryong DropJob";
+}
+
+
+/// QMIMEDATA HANDLING
+
+QStringList
+DropJob::mimeTypes()
+{
+    QStringList mimeTypes;
+    mimeTypes << "application/tomahawk.query.list"
+              << "application/tomahawk.plentry.list"
+              << "application/tomahawk.result.list"
+              << "application/tomahawk.result"
+              << "application/tomahawk.metadata.artist"
+              << "application/tomahawk.metadata.album"
+              << "application/tomahawk.mixed"
+              << "text/plain"
+              << "text/uri-list";
+
+    return mimeTypes;
+}
+
+
+bool
+DropJob::acceptsMimeData( const QMimeData* data, DropJob::DropTypes acceptedType, DropJob::DropAction acceptedAction )
+{
+    Q_UNUSED( acceptedAction );
+
+    if ( data->hasFormat( "application/tomahawk.query.list" )
+        || data->hasFormat( "application/tomahawk.plentry.list" )
+        || data->hasFormat( "application/tomahawk.result.list" )
+        || data->hasFormat( "application/tomahawk.result" )
+        || data->hasFormat( "application/tomahawk.mixed" )
+        || data->hasFormat( "application/tomahawk.metadata.album" )
+        || data->hasFormat( "application/tomahawk.metadata.artist" ) )
+    {
+        return true;
+    }
+
+    // check plain text url types
+    if ( !data->hasFormat( "text/plain" ) )
+        if ( !data->hasFormat( "text/uri-list" ) )
+            return false;
+
+
+    const QString url = data->data( "text/plain" );
+    if ( acceptedType.testFlag( Playlist ) )
+    {
+        if ( url.contains( "xspf" ) )
+            return true;
+
+        if ( url.contains( "m3u" ) )
+            return true;
+
+        if ( data->data( "text/uri-list" ).contains( "xspf" ) )
+            return true;
+
+        if ( data->data( "text/uri-list" ).contains( "m3u" ) )
+            return true;
+
+        // Not the most elegant
+        if ( url.contains( "spotify" ) && url.contains( "playlist" ) && s_canParseSpotifyPlaylists )
+            return true;
+
+        if ( url.contains( "grooveshark.com" ) && url.contains( "playlist" ) )
+            return true;
+    }
+
+    if ( acceptedType.testFlag( Track ) )
+    {
+        if ( url.contains( "m3u" ) )
+            return true;
+
+        if ( data->data( "text/uri-list" ).contains( "m3u" ) )
+            return true;
+
+        if ( url.contains( "itunes" ) && url.contains( "album" ) ) // YES itunes is fucked up and song links have album/ in the url.
+            return true;
+
+        if ( url.contains( "spotify" ) && url.contains( "track" ) )
+            return true;
+
+        if ( url.contains( "rdio.com" ) && ( ( ( url.contains( "track" ) && url.contains( "artist" ) && url.contains( "album" ) )
+                                               || url.contains( "playlists" )  ) ) )
+            return true;
+    }
+
+    if ( acceptedType.testFlag( Album ) )
+    {
+        if ( url.contains( "itunes" ) && url.contains( "album" ) ) // YES itunes is fucked up and song links have album/ in the url.
+            return true;
+        if ( url.contains( "spotify" ) && url.contains( "album" ) )
+            return true;
+        if ( url.contains( "rdio.com" ) && ( url.contains( "artist" ) && url.contains( "album" ) && !url.contains( "track" ) )  )
+            return true;
+    }
+
+    if ( acceptedType.testFlag( Artist ) )
+    {
+        if ( url.contains( "itunes" ) && url.contains( "artist" ) ) // YES itunes is fucked up and song links have album/ in the url.
+            return true;
+        if ( url.contains( "spotify" ) && url.contains( "artist" ) )
+            return true;
+        if ( url.contains( "rdio.com" ) && ( url.contains( "artist" ) && !url.contains( "album" ) && !url.contains( "track" ) )  )
+            return true;
+    }
+
+    // We whitelist certain url-shorteners since they do some link checking. Often playable (e.g. spotify) links hide behind them,
+    // so we do an extra level of lookup
+    if ( ShortenedLinkParser::handlesUrl( url ) )
+        return true;
+
+    return false;
+}
+
+
+bool
+DropJob::isDropType( DropJob::DropType desired, const QMimeData* data )
+{
+    const QString url = data->data( "text/plain" );
+    if ( desired == Playlist )
+    {
+        if( url.contains( "xspf" ) || data->data( "text/uri-list").contains( "xspf" ) )
+            return true;
+
+        if( url.contains( "m3u" ) || data->data( "text/uri-list").contains( "m3u" ) )
+            return true;
+
+        // Not the most elegant
+        if ( url.contains( "spotify" ) && url.contains( "playlist" ) && s_canParseSpotifyPlaylists )
+            return true;
+
+        if ( url.contains( "rdio.com" ) && url.contains( "people" ) && url.contains( "playlist" ) )
+            return true;
+#ifdef QCA2_FOUND
+        if ( url.contains( "grooveshark.com" ) && url.contains( "playlist" ) )
+            return true;
+#endif //QCA2_FOUND
+        if ( ShortenedLinkParser::handlesUrl( url ) )
+            return true;
+    }
+
+    return false;
+}
+
+
+void
+DropJob::setGetWholeArtists( bool getWholeArtists )
+{
+    m_getWholeArtists = getWholeArtists;
+}
+
+
+void
+DropJob::setGetWholeAlbums( bool getWholeAlbums )
+{
+    m_getWholeAlbums = getWholeAlbums;
+}
+
+
+void
+DropJob::tracksFromMimeData( const QMimeData* data, bool allowDuplicates, bool onlyLocal, bool top10 )
+{
+    m_allowDuplicates = allowDuplicates;
+    m_onlyLocal = onlyLocal;
+    m_top10 = top10;
+
+    parseMimeData( data );
+
+    if ( m_queryCount == 0 )
+    {
+        if ( onlyLocal )
+            removeRemoteSources();
+
+        if ( !allowDuplicates )
+            removeDuplicates();
+
+        emit tracks( m_resultList );
+        deleteLater();
+    }
+}
+
+
+void
+DropJob::parseMimeData( const QMimeData* data )
+{
+    QList< query_ptr > results;
+
+    if ( data->hasFormat( "application/tomahawk.query.list" ) )
+        results = tracksFromQueryList( data );
+    else if ( data->hasFormat( "application/tomahawk.result.list" ) )
+        results = tracksFromResultList( data );
+    else if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
+        results = tracksFromAlbumMetaData( data );
+    else if ( data->hasFormat( "application/tomahawk.metadata.artist" ) )
+        results = tracksFromArtistMetaData( data );
+    else if ( data->hasFormat( "application/tomahawk.mixed" ) )
+        tracksFromMixedData( data );
+    else if ( data->hasFormat( "text/plain" ) && !data->data( "text/plain" ).isEmpty() )
+    {
+        const QString plainData = QString::fromUtf8( data->data( "text/plain" ) );
+        handleAllUrls( plainData );
+
+    }
+    else if ( data->hasFormat( "text/uri-list" ) )
+    {
+        const QString plainData = QString::fromUtf8( data->data( "text/uri-list" ).trimmed() );
+        handleAllUrls( plainData );
+    }
+
+    m_resultList.append( results );
+}
+
+
+QList< query_ptr >
+DropJob::tracksFromQueryList( const QMimeData* data )
+{
+    QList< query_ptr > queries;
+    QByteArray itemData = data->data( "application/tomahawk.query.list" );
+    QDataStream stream( &itemData, QIODevice::ReadOnly );
+
+    while ( !stream.atEnd() )
+    {
+        qlonglong qptr;
+        stream >> qptr;
+
+        query_ptr* query = reinterpret_cast<query_ptr*>(qptr);
+        if ( query && !query->isNull() )
+        {
+            tDebug() << "Dropped query item:" << query->data()->toString();
+
+            if ( m_top10 )
+            {
+                queries << getTopTen( query->data()->artist() );
+            }
+            else if ( m_getWholeArtists )
+            {
+                queries << getArtist( query->data()->artist() );
+            }
+            else if ( m_getWholeAlbums )
+            {
+                queries << getAlbum( query->data()->artist(), query->data()->album() );
+            }
+            else
+            {
+                queries << *query;
+            }
+        }
+    }
+
+    return queries;
+}
+
+
+QList< query_ptr >
+DropJob::tracksFromResultList( const QMimeData* data )
+{
+    QList< query_ptr > queries;
+    QByteArray itemData = data->data( "application/tomahawk.result.list" );
+    QDataStream stream( &itemData, QIODevice::ReadOnly );
+
+    while ( !stream.atEnd() )
+    {
+        qlonglong qptr;
+        stream >> qptr;
+
+        result_ptr* result = reinterpret_cast<result_ptr*>(qptr);
+        if ( result && !result->isNull() )
+        {
+            tDebug() << "Dropped result item:" << result->data()->artist()->name() << "-" << result->data()->track();
+            query_ptr q = result->data()->toQuery();
+
+            if ( m_top10 )
+            {
+                getTopTen( q->artist() );
+            }
+            else if ( m_getWholeArtists )
+            {
+                queries << getArtist( q->artist() );
+            }
+            else if ( m_getWholeAlbums )
+            {
+                queries << getAlbum( q->artist(), q->album() );
+            }
+            else
+            {
+                queries << q;
+            }
+        }
+    }
+
+    return queries;
+}
+
+
+QList< query_ptr >
+DropJob::tracksFromAlbumMetaData( const QMimeData *data )
+{
+    QList<query_ptr> queries;
+    QByteArray itemData = data->data( "application/tomahawk.metadata.album" );
+    QDataStream stream( &itemData, QIODevice::ReadOnly );
+
+    while ( !stream.atEnd() )
+    {
+        QString artist;
+        stream >> artist;
+        QString album;
+        stream >> album;
+
+        if ( m_top10 )
+            queries << getTopTen( artist );
+        else if ( m_getWholeArtists )
+            queries << getArtist( artist );
+        else
+            queries << getAlbum( artist, album );
+    }
+
+    return queries;
+}
+
+
+QList< query_ptr >
+DropJob::tracksFromArtistMetaData( const QMimeData *data )
+{
+    QList<query_ptr> queries;
+    QByteArray itemData = data->data( "application/tomahawk.metadata.artist" );
+    QDataStream stream( &itemData, QIODevice::ReadOnly );
+
+    while ( !stream.atEnd() )
+    {
+        QString artist;
+        stream >> artist;
+
+        if ( !m_top10 )
+        {
+            queries << getArtist( artist );
+        }
+        else
+        {
+            queries << getTopTen( artist );
+        }
+    }
+    return queries;
+}
+
+
+void
+DropJob::tracksFromMixedData( const QMimeData *data )
+{
+    QByteArray itemData = data->data( "application/tomahawk.mixed" );
+    QDataStream stream( &itemData, QIODevice::ReadOnly );
+    QString mimeType;
+
+    while ( !stream.atEnd() )
+    {
+        stream >> mimeType;
+
+        QByteArray singleData;
+        QDataStream singleStream( &singleData, QIODevice::WriteOnly );
+
+        QMimeData singleMimeData;
+        if ( mimeType == "application/tomahawk.query.list" ) 
+        {
+            qlonglong query;
+            stream >> query;
+            singleStream << query;
+        }
+        else if ( mimeType == "application/tomahawk.result.list" )
+        {
+            qlonglong result;
+            stream >> result;
+            singleStream << result;
+        }
+        else if ( mimeType == "application/tomahawk.metadata.album" )
+        {
+            QString artist;
+            stream >> artist;
+            singleStream << artist;
+            QString album;
+            stream >> album;
+            singleStream << album;
+        }
+        else if ( mimeType == "application/tomahawk.metadata.artist" )
+        {
+            QString artist;
+            stream >> artist;
+            singleStream << artist;
+        }
+
+        singleMimeData.setData( mimeType, singleData );
+        parseMimeData( &singleMimeData );
+    }
+}
+
+
+void
+DropJob::handleM3u( const QString& fileUrls )
+{
+    tDebug() << Q_FUNC_INFO << "Got M3U playlist!" << fileUrls;
+    QStringList urls = fileUrls.split( QRegExp( "\n" ), QString::SkipEmptyParts );
+
+    if ( dropAction() == Default )
+        setDropAction( Create );
+
+    tDebug() << "Got a M3U playlist url to parse!" << urls;
+    M3uLoader* m = new M3uLoader( urls, dropAction() == Create, this );
+
+    if ( dropAction() == Append )
+    {
+        tDebug() << Q_FUNC_INFO << "Trying to append contents from" << urls;
+        connect( m, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
+        m_queryCount++;
+    }
+    m->parse();
+}
+
+
+void
+DropJob::handleXspfs( const QString& fileUrls )
+{
+    tDebug() << Q_FUNC_INFO << "Got XSPF playlist!" << fileUrls;
+    bool error = false;
+    QStringList urls = fileUrls.split( QRegExp( "\n" ), QString::SkipEmptyParts );
+
+    if ( dropAction() == Default )
+        setDropAction( Create );
+
+    foreach ( const QString& url, urls )
+    {
+        XSPFLoader* l = 0;
+        QFile xspfFile( QUrl::fromUserInput( url ).toLocalFile() );
+
+        if ( xspfFile.exists() )
+        {
+            l = new XSPFLoader(  dropAction() == Create, this );
+            tDebug( LOGINFO ) << "Loading local XSPF" << xspfFile.fileName();
+            l->load( xspfFile );
+        }
+        else if ( QUrl( url ).isValid() )
+        {
+            l = new XSPFLoader(  dropAction() == Create, this );
+            tDebug( LOGINFO ) << "Loading remote XSPF" << url;
+            l->load( QUrl( url ) );
+        }
+        else
+        {
+            error = true;
+            tLog() << "Failed to load or parse dropped XSPF";
+        }
+
+        if ( dropAction() == Append && !error && l )
+        {
+            qDebug() << Q_FUNC_INFO << "Trying to append XSPF";
+            connect( l, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
+            m_queryCount++;
+        }
+    }
+}
+
+
+void
+DropJob::handleSpotifyUrls( const QString& urlsRaw )
+{
+    QStringList urls = urlsRaw.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
+    qDebug() << "Got spotify browse uris!" << urls;
+
+    /// Lets allow parsing all spotify uris here, if parse server is not available
+    /// fallback to spotify metadata for tracks /hugo
+    if ( dropAction() == Default )
+        setDropAction( Create );
+
+    tDebug() << "Got a spotify browse uri in dropjob!" << urls;
+    SpotifyParser* spot = new SpotifyParser( urls, dropAction() == Create, this );
+    spot->setSingleMode( false );
+
+    /// This currently supports draging and dropping a spotify playlist and artist
+    if ( dropAction() == Append )
+    {
+        tDebug() << Q_FUNC_INFO << "Asking for spotify browse contents from" << urls;
+        connect( spot, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
+        m_queryCount++;
+    }
+}
+
+
+void
+DropJob::handleRdioUrls( const QString& urlsRaw )
+{
+    QStringList urls = urlsRaw.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
+    qDebug() << "Got Rdio urls!" << urls;
+
+    if ( dropAction() == Default )
+        setDropAction( Create );
+
+    RdioParser* rdio = new RdioParser( this );
+    connect( rdio, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
+
+    m_queryCount++;
+    rdio->setCreatePlaylist( dropAction() == Create  );
+    rdio->parse( urls );
+}
+
+
+void
+DropJob::handleGroovesharkUrls ( const QString& urlsRaw )
+{
+#ifdef QCA2_FOUND
+    QStringList urls = urlsRaw.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
+    tDebug() << "Got Grooveshark urls!" << urls;
+
+    if ( dropAction() == Default )
+        setDropAction( Create );
+
+    GroovesharkParser* groove = new GroovesharkParser( urls, dropAction() == Create, this );
+    connect( groove, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
+
+    if ( dropAction() == Append )
+    {
+        tDebug() << Q_FUNC_INFO << "Asking for grooveshark contents from" << urls;
+        connect( groove, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
+        m_queryCount++;
+    }
+#else
+    tLog() << "Tomahawk compiled without QCA support, cannot use groovesharkparser";
+#endif
+}
+
+
+void
+DropJob::handleAllUrls( const QString& urls )
+{
+    if ( urls.contains( "xspf" ) )
+        handleXspfs( urls );
+    else if ( urls.contains( "m3u" ) )
+        handleM3u( urls );
+    else if ( urls.contains( "spotify" ) /// Handle all the spotify uris on internal server, if not avail. fallback to spotify
+              && ( urls.contains( "playlist" ) || urls.contains( "artist" ) || urls.contains( "album" ) || urls.contains( "track" ) )
+              && s_canParseSpotifyPlaylists )
+        handleSpotifyUrls( urls );
+    else if ( urls.contains( "rdio.com" ) )
+        handleRdioUrls( urls );
+#ifdef QCA2_FOUND
+    else if ( urls.contains( "grooveshark.com" ) )
+        handleGroovesharkUrls( urls );
+#endif
+    else
+        handleTrackUrls ( urls );
+}
+
+
+void
+DropJob::handleTrackUrls( const QString& urls )
+{
+    if ( urls.contains( "itunes.apple.com") )
+    {
+        QStringList tracks = urls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
+
+        tDebug() << "Got a list of itunes urls!" << tracks;
+        ItunesParser* itunes = new ItunesParser( tracks, this );
+        connect( itunes, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
+        m_queryCount++;
+    }
+    else if ( urls.contains( "open.spotify.com/track") || urls.contains( "spotify:track" ) )
+    {
+        QStringList tracks = urls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
+
+        tDebug() << "Got a list of spotify urls!" << tracks;
+        SpotifyParser* spot = new SpotifyParser( tracks, this );
+        connect( spot, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
+        m_queryCount++;
+    }
+    else if ( urls.contains( "rdio.com" ) )
+    {
+        QStringList tracks = urls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
+
+        tDebug() << "Got a list of rdio urls!" << tracks;
+        RdioParser* rdio = new RdioParser( this );
+        connect( rdio, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( onTracksAdded( QList< Tomahawk::query_ptr > ) ) );
+        m_queryCount++;
+
+        rdio->parse( tracks );
+    }
+    else if ( ShortenedLinkParser::handlesUrl( urls ) )
+    {
+        QStringList tracks = urls.split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
+
+        tDebug() << "Got a list of shortened urls!" << tracks;
+        ShortenedLinkParser* parser = new ShortenedLinkParser( tracks, this );
+        connect( parser, SIGNAL( urls( QStringList ) ), this, SLOT( expandedUrls( QStringList ) ) );
+        m_queryCount++;
+    }
+}
+
+
+void
+DropJob::expandedUrls( QStringList urls )
+{
+    m_queryCount--;
+    handleAllUrls( urls.join( "\n" ) );
+}
+
+
+void
+DropJob::onTracksAdded( const QList<Tomahawk::query_ptr>& tracksList )
+{
+    tDebug() << Q_FUNC_INFO << tracksList.count();
+    
+/*    if ( results.isEmpty() )
+    {
+        const QString which = album.isEmpty() ? "artist" : "album";
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "No tracks found for given %1" ).arg( which ), 5 ) );
+    }*/
+
+    if ( !m_dropJob.isEmpty() )
+    {
+        m_dropJob.takeFirst()->setFinished();
+    }
+
+    m_resultList.append( tracksList );
+
+    if ( --m_queryCount == 0 )
+    {
+/*        if ( m_onlyLocal )
+            removeRemoteSources();
+
+        if ( !m_allowDuplicates )
+            removeDuplicates();*/
+
+        emit tracks( m_resultList );
+        deleteLater();
+    }
+}
+
+
+void
+DropJob::removeDuplicates()
+{
+    QList< Tomahawk::query_ptr > list;
+    foreach ( const Tomahawk::query_ptr& item, m_resultList )
+    {
+        bool contains = false;
+        Q_ASSERT( !item.isNull() );
+        if ( item.isNull() )
+        {
+            m_resultList.removeOne( item );
+            continue;
+        }
+        
+        foreach( const Tomahawk::query_ptr &tmpItem, list )
+        {
+            if ( tmpItem.isNull() )
+            {
+                list.removeOne( tmpItem );
+                continue;
+            }
+            
+            if ( item->album() == tmpItem->album()
+                 && item->artist() == tmpItem->artist()
+                 && item->track() == tmpItem->track() )
+            {
+                if ( item->playable() && !tmpItem->playable() )
+                    list.replace( list.indexOf( tmpItem ), item );
+
+                contains = true;
+                break;
+            }
+        }
+        if ( !contains )
+            list.append( item );
+    }
+
+    m_resultList = list;
+}
+
+
+void
+DropJob::removeRemoteSources()
+{
+    QList< Tomahawk::query_ptr > list;
+    foreach ( const Tomahawk::query_ptr& item, m_resultList )
+    {
+        Q_ASSERT( !item.isNull() );
+        if ( item.isNull() )
+        {
+            m_resultList.removeOne( item );
+            continue;
+        }
+        
+        bool hasLocalSource = false;
+        foreach ( const Tomahawk::result_ptr& result, item->results() )
+        {
+            if ( !result->collection().isNull() && !result->collection()->source().isNull() &&
+                 !result->collection()->source().isNull() && result->collection()->source()->isLocal() )
+                hasLocalSource = true;
+        }
+        if ( hasLocalSource )
+            list.append( item );
+    }
+    m_resultList = list;
+}
+
+
+QList< query_ptr >
+DropJob::getArtist( const QString &artist, Tomahawk::ModelMode mode )
+{
+    artist_ptr artistPtr = Artist::get( artist );
+    if ( artistPtr->playlistInterface( Mixed )->tracks().isEmpty() )
+    {
+        m_artistsToKeep.insert( artistPtr );
+
+        connect( artistPtr.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                                     SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ) );
+
+        m_dropJob << new DropJobNotifier( QPixmap( RESPATH "images/album-icon.png" ), Album );
+        JobStatusView::instance()->model()->addJob( m_dropJob.last() );
+
+        m_queryCount++;
+    }
+
+    return artistPtr->playlistInterface( Mixed )->tracks();
+}
+
+
+QList< query_ptr >
+DropJob::getAlbum( const QString& artist, const QString& album )
+{
+    artist_ptr artistPtr = Artist::get( artist );
+    album_ptr albumPtr = Album::get( artistPtr, album );
+
+    if ( albumPtr.isNull() )
+        return QList< query_ptr >();
+
+    //FIXME: should check tracksLoaded()
+    if ( albumPtr->playlistInterface( Mixed )->tracks().isEmpty() )
+    {
+        // For albums that don't exist until this moment, we are the main shared pointer holding on.
+        // fetching the tracks is asynchronous, so the resulting signal is queued. when we go out of scope we delete
+        // the artist_ptr which means we never get the signal delivered. so we hold on to the album pointer till we're done
+        m_albumsToKeep.insert( albumPtr );
+
+        connect( albumPtr.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                                    SLOT( onTracksAdded( QList<Tomahawk::query_ptr> ) ) );
+
+        m_dropJob << new DropJobNotifier( QPixmap( RESPATH "images/album-icon.png" ), Album );
+        JobStatusView::instance()->model()->addJob( m_dropJob.last() );
+
+        m_queryCount++;
+    }
+
+    return albumPtr->playlistInterface( Mixed )->tracks();
+}
+
+
+QList< query_ptr >
+DropJob::getTopTen( const QString& artist )
+{
+    return getArtist( artist, Tomahawk::InfoSystemMode );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/DropJob.h Added

@@ -0,0 +1,157 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Michael Zanetti <mzanetti@kde.org>
+ *   Copyright 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 DROPJOB_H
+#define DROPJOB_H
+
+#include "Query.h"
+
+#include <QObject>
+#include <QStringList>
+#include <QMimeData>
+
+namespace Tomahawk {
+class DropJobNotifier;
+}
+
+
+class DLLEXPORT DropJob : public QObject
+{
+    Q_OBJECT
+public:
+    explicit DropJob( QObject *parent = 0 );
+    ~DropJob();
+
+    /**
+     * QMimeData helpers
+     *
+     *  Call this to parse the tracks in a QMimeData object to query_ptrs. This will parse internal tomahawk
+     *   data as well as all other formats supported (spotify, etc).
+     *
+     * Connect to tracks( QList< query_ptr> ); for the extracted tracks.
+     */
+
+    enum DropType {
+        None =      0x00,
+        Playlist =  0x01,
+        Track =     0x02,
+        Album =     0x04,
+        Artist =    0x08,
+
+        All =       0xFF
+    };
+    Q_DECLARE_FLAGS(DropTypes, DropType)
+
+    enum DropAction {
+        Default = 0,
+        Append,
+        Create,
+        Move
+    };
+
+    /**
+     * Returns if the caller should accept this mimetype.
+     *
+     * \param data The mimetype object to check
+     * \param type The type of drop content to accept
+     * \param action What action is requested from the content, if not all data types support all actions
+     */
+    static bool acceptsMimeData( const QMimeData* data, DropJob::DropTypes type = All, DropAction action = Append );
+
+    /**
+     * Return if the drop is primarily of the given type. Does not auto-convert (e.g. if the drop is of type playlist,
+     *  even thougha playlist can be converted into tracks, this will return true only for the Playlist drop type).
+     *
+     * TODO Only implemented for Playlist atm. Extend when you need it.
+     */
+    static bool isDropType( DropJob::DropType desired, const QMimeData* data );
+
+    static QStringList mimeTypes();
+
+    /// Set the drop types that should be extracted from this drop
+    void setDropTypes( DropTypes types ) { m_dropTypes = types; }
+
+    /// Set the action that the drop should do. For example, if dropping a playlist, Create will create a new playlist but Append will generate the raw tracks
+    void setDropAction( DropAction action ) { m_dropAction = action; }
+
+    DropTypes dropTypes() const { return m_dropTypes; }
+    DropAction dropAction() const { return m_dropAction; }
+
+    /**
+     * Begin the parsing of the mime data. The resulting tracks are exposed in the various signals
+     */
+    void parseMimeData( const QMimeData* data );
+
+    void setGetWholeArtists( bool getWholeArtists );
+    void setGetWholeAlbums( bool getWholeAlbums );
+    void tracksFromMimeData( const QMimeData* data, bool allowDuplicates = false, bool onlyLocal = false, bool top10 = false );
+    void handleXspfs( const QString& files );
+    void handleM3u( const QString& urls );
+    void handleSpotifyUrls( const QString& urls );
+    void handleRdioUrls( const QString& urls );
+    void handleGroovesharkUrls( const QString& urls );
+
+    static bool canParseSpotifyPlaylists() { return s_canParseSpotifyPlaylists; }
+    static void setCanParseSpotifyPlaylists( bool parseable ) { s_canParseSpotifyPlaylists = parseable; }
+
+signals:
+    /// QMimeData parsing results
+    void tracks( const QList< Tomahawk::query_ptr >& tracks );
+
+private slots:
+    void expandedUrls( QStringList );
+    void onTracksAdded( const QList<Tomahawk::query_ptr>& );
+
+private:
+    /// handle parsing mime data
+    void handleAllUrls( const QString& urls );
+    void handleTrackUrls( const QString& urls );
+    QList< Tomahawk::query_ptr > tracksFromQueryList( const QMimeData* d );
+    QList< Tomahawk::query_ptr > tracksFromResultList( const QMimeData* d );
+    QList< Tomahawk::query_ptr > tracksFromArtistMetaData( const QMimeData* d );
+    QList< Tomahawk::query_ptr > tracksFromAlbumMetaData( const QMimeData* d );
+    void tracksFromMixedData( const QMimeData* d );
+
+    QList< Tomahawk::query_ptr > getArtist( const QString& artist, Tomahawk::ModelMode mode = Tomahawk::Mixed );
+    QList< Tomahawk::query_ptr > getAlbum( const QString& artist, const QString& album );
+    QList< Tomahawk::query_ptr > getTopTen( const QString& artist );
+
+    void removeDuplicates();
+    void removeRemoteSources();
+
+    int m_queryCount;
+    bool m_allowDuplicates;
+    bool m_onlyLocal;
+    bool m_getWholeArtists;
+    bool m_getWholeAlbums;
+    bool m_top10;
+    DropTypes m_dropTypes;
+    DropAction m_dropAction;
+
+    QList<Tomahawk::DropJobNotifier*> m_dropJob;
+
+    QList< Tomahawk::query_ptr > m_resultList;
+    QSet< Tomahawk::album_ptr > m_albumsToKeep;
+    QSet< Tomahawk::artist_ptr > m_artistsToKeep;
+
+    static bool s_canParseSpotifyPlaylists;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(DropJob::DropTypes)
+#endif // DROPJOB_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/EchonestCatalogSynchronizer.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/EchonestCatalogSynchronizer.cpp Changed

@@ -18,14 +18,15 @@
 
 #include "EchonestCatalogSynchronizer.h"
 
-#include "collection.h"
-#include "database/database.h"
-#include "database/databasecommand_genericselect.h"
-#include "database/databasecommand_setcollectionattributes.h"
-#include "database/databasecommand_loadfiles.h"
-#include "tomahawksettings.h"
-#include "sourcelist.h"
-#include "query.h"
+#include "Collection.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "database/DatabaseCommand_GenericSelect.h"
+#include "database/DatabaseCommand_SetCollectionAttributes.h"
+#include "database/DatabaseCommand_LoadFiles.h"
+#include "TomahawkSettings.h"
+#include "SourceList.h"
+#include "Query.h"
 
 #include <echonest/CatalogUpdateEntry.h>
 #include <echonest/Config.h>
@@ -134,13 +135,14 @@
 EchonestCatalogSynchronizer::uploadDb()
 {
     // create two catalogs: uuid_song, and uuid_artist.
-    QNetworkReply* r =  Echonest::Catalog::create( QString( "%1_song" ).arg( Database::instance()->dbid() ), Echonest::CatalogTypes::Song );
+    QNetworkReply* r =  Echonest::Catalog::create( QString( "%1_song" ).arg( Database::instance()->impl()->dbid() ), Echonest::CatalogTypes::Song );
     connect( r, SIGNAL( finished() ), this, SLOT( songCreateFinished() ) );
 
 //     r =  Echonest::Catalog::create( QString( "%1_artist" ).arg( Database::instance()->dbid() ), Echonest::CatalogTypes::Artist );
 //     connect( r, SIGNAL( finished() ), this, SLOT( artistCreateFinished() ) );
 }
 
+
 void
 EchonestCatalogSynchronizer::songCreateFinished()
 {

tomahawk-0.4.2.tar.bz2/src/libtomahawk/EchonestCatalogSynchronizer.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/EchonestCatalogSynchronizer.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/ExternalResolver.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/ExternalResolver.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/ExternalResolver.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/ExternalResolver.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/ExternalResolverGui.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/ExternalResolverGui.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/ExternalResolverGui.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/ExternalResolverGui.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/FuncTimeout.cpp Added

@@ -0,0 +1,47 @@
+/* === 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
+ *   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 "FuncTimeout.h"
+
+#include <QTimer>
+
+
+using namespace Tomahawk;
+
+
+FuncTimeout::FuncTimeout( int ms, boost::function< void() > func, QObject* besafe )
+    : m_func( func )
+    , m_watch( QWeakPointer< QObject >( besafe ) )
+{
+    //qDebug() << Q_FUNC_INFO;
+    QTimer::singleShot( ms, this, SLOT( exec() ) );
+}
+
+
+FuncTimeout::~FuncTimeout()
+{
+}
+
+
+void FuncTimeout::exec()
+{
+    if( !m_watch.isNull() )
+        m_func();
+    this->deleteLater();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/FuncTimeout.h Added

@@ -0,0 +1,59 @@
+/* === 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
+ *   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 FUNCTIMEOUT_H
+#define FUNCTIMEOUT_H
+
+#include <QObject>
+#include <QWeakPointer>
+
+#include "boost/function.hpp"
+#include "boost/bind.hpp"
+
+#include "DllMacro.h"
+
+/*
+    I want to do:
+        QTimer::singleShot(1000, this, SLOT(doSomething(x)));
+    instead, I'm doing:
+        new FuncTimeout(1000, boost::bind(&MyClass::doSomething, this, x));
+
+ */
+namespace Tomahawk
+{
+
+class DLLEXPORT FuncTimeout : public QObject
+{
+Q_OBJECT
+
+public:
+    FuncTimeout( int ms, boost::function<void()> func, QObject* besafe );
+
+    ~FuncTimeout();
+
+public slots:
+    void exec();
+
+private:
+    boost::function<void()> m_func;
+    QWeakPointer< QObject > m_watch;
+};
+
+}; // ns
+
+#endif // FUNCTIMEOUT_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/GlobalActionManager.cpp Added

@@ -0,0 +1,1414 @@
+/*
+    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
+    Copyright (C) 2011, Jeff Mitchell <jeff@tomahawk-player.org>
+    Copyright (C) 2011-2012, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+
+    This program 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "GlobalActionManager.h"
+
+#include "Artist.h"
+#include "Album.h"
+#include "SourceList.h"
+#include "Pipeline.h"
+#include "TomahawkSettings.h"
+#include "audio/AudioEngine.h"
+#include "database/LocalCollection.h"
+#include "playlist/dynamic/GeneratorInterface.h"
+
+#include "echonest/Playlist.h"
+
+#include "utils/XspfLoader.h"
+#include "utils/XspfGenerator.h"
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+
+#include "utils/JspfLoader.h"
+#include "utils/SpotifyParser.h"
+#include "utils/ShortenedLinkParser.h"
+#include "utils/RdioParser.h"
+
+#ifndef ENABLE_HEADLESS
+    #include "ViewManager.h"
+    #include "playlist/topbar/TopBar.h"
+    #include "playlist/PlaylistView.h"
+    #include "widgets/SearchWidget.h"
+
+    #include <QtGui/QApplication>
+    #include <QtGui/QClipboard>
+#endif
+
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkConfiguration>
+#include <QtNetwork/QNetworkProxy>
+
+#include <QtCore/QMimeData>
+#include <QtCore/QUrl>
+
+
+GlobalActionManager* GlobalActionManager::s_instance = 0;
+
+using namespace Tomahawk;
+
+
+GlobalActionManager*
+GlobalActionManager::instance()
+{
+    if ( !s_instance )
+        s_instance = new GlobalActionManager;
+
+    return s_instance;
+}
+
+
+GlobalActionManager::GlobalActionManager( QObject* parent )
+    : QObject( parent )
+{
+}
+
+
+GlobalActionManager::~GlobalActionManager()
+{
+}
+
+
+QUrl
+GlobalActionManager::openLinkFromQuery( const query_ptr& query ) const
+{
+    QString title = query->displayQuery()->track();
+    QString artist = query->displayQuery()->artist();
+    QString album = query->displayQuery()->album();
+
+    return openLink( title, artist, album );
+}
+
+
+QUrl
+GlobalActionManager::copyOpenLink( const artist_ptr& artist ) const
+{
+    const QUrl link( QString( "%1/artist/%2" ).arg( hostname() ).arg( artist->name() ) );
+
+    QClipboard* cb = QApplication::clipboard();
+    QByteArray data = percentEncode( link );
+    cb->setText( data );
+
+    return link;
+}
+
+
+QUrl
+GlobalActionManager::copyOpenLink( const album_ptr& album ) const
+{
+    const QUrl link = QUrl::fromUserInput( QString( "%1/album/%2/%3" ).arg( hostname() ).arg( album->artist().isNull() ? QString() : album->artist()->name() ).arg( album->name() ) );
+
+    QClipboard* cb = QApplication::clipboard();
+    QByteArray data = percentEncode( link );
+
+    cb->setText( data );
+
+    return link;
+}
+
+
+QUrl
+GlobalActionManager::openLink( const QString& title, const QString& artist, const QString& album ) const
+{
+    QUrl link( QString( "%1/open/track/" ).arg( hostname() ) );
+
+    if ( !artist.isEmpty() )
+        link.addQueryItem( "artist", artist );
+    if ( !title.isEmpty() )
+        link.addQueryItem( "title", title );
+    if ( !album.isEmpty() )
+        link.addQueryItem( "album", album );
+
+    return link;
+}
+
+
+void
+GlobalActionManager::shortenLink( const QUrl& url, const QVariant& callbackObj )
+{
+    tDebug() << Q_FUNC_INFO << "callbackObj is valid: " << ( callbackObj.isValid() ? "true" : "false" );
+    if ( QThread::currentThread() != thread() )
+    {
+        qDebug() << "Reinvoking in correct thread:" << Q_FUNC_INFO;
+        QMetaObject::invokeMethod( this, "shortenLink", Qt::QueuedConnection, Q_ARG( QUrl, url ), Q_ARG( QVariant, callbackObj ) );
+        return;
+    }
+
+    QNetworkRequest request;
+    request.setUrl( url );
+
+    QNetworkReply *reply = TomahawkUtils::nam()->get( request );
+    if ( callbackObj.isValid() )
+        reply->setProperty( "callbackobj", callbackObj );
+    connect( reply, SIGNAL( finished() ), SLOT( shortenLinkRequestFinished() ) );
+    connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), SLOT( shortenLinkRequestError( QNetworkReply::NetworkError ) ) );
+}
+
+
+#ifndef ENABLE_HEADLESS
+
+void
+GlobalActionManager::getShortLink( const playlist_ptr& pl )
+{
+    QVariantMap m;
+    m "title"  = pl->title();
+    m "creator"  = pl->author().isNull() ? "" : pl->author()->friendlyName();
+    QVariantList tracks;
+    foreach( const plentry_ptr& pl, pl->entries() )
+    {
+        if ( pl->query().isNull() )
+            continue;
+
+        QVariantMap track;
+        track "title"  = pl->query()->track();
+        track "creator"  = pl->query()->artist();
+        track "album"  = pl->query()->album();
+
+        tracks << track;
+    }
+    m "track"  = tracks;
+
+    QVariantMap jspf;
+    jspf"playlist" = m;
+
+    QJson::Serializer s;
+    QByteArray msg = s.serialize( jspf );
+
+    // No built-in Qt facilities for doing a FORM POST. So we build the payload ourselves...
+    const QByteArray boundary = "----------------------------2434992cccab";
+    QByteArray data( QByteArray( "--" + boundary + "\r\n" ) );
+    data += "Content-Disposition: form-data; name=\"data\"; filename=\"playlist.jspf\"\r\n";
+    data += "Content-Type: application/octet-stream\r\n\r\n";
+    data += msg;
+    data += "\r\n\r\n";
+    data += "--" + boundary + "--\r\n\r\n";
+
+    const QUrl url( QString( "%1/p/").arg( hostname() ) );
+    QNetworkRequest req( url );
+    req.setHeader( QNetworkRequest::ContentTypeHeader, QString( "multipart/form-data; boundary=%1" ).arg( QString::fromLatin1( boundary ) ) );
+    QNetworkReply *reply = TomahawkUtils::nam()->post( req, data );
+
+    connect( reply, SIGNAL( finished() ), SLOT( postShortenFinished() ) );
+    connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ), SLOT( shortenLinkRequestError( QNetworkReply::NetworkError ) ) );
+}
+
+
+QString
+GlobalActionManager::copyPlaylistToClipboard( const dynplaylist_ptr& playlist )
+{
+    QUrl link( QString( "%1/%2/create/" ).arg( hostname() ).arg( playlist->mode() == OnDemand ? "station" : "autoplaylist" ) );
+
+    if ( playlist->generator()->type() != "echonest" )
+    {
+        tLog() << "Only echonest generators are supported";
+        return QString();
+    }
+
+    link.addEncodedQueryItem( "type", "echonest" );
+    link.addQueryItem( "title", playlist->title() );
+
+    QList< dyncontrol_ptr > controls = playlist->generator()->controls();
+    foreach ( const dyncontrol_ptr& c, controls )
+    {
+        if ( c->selectedType() == "Artist" )
+        {
+            if ( c->match().toInt() == Echonest::DynamicPlaylist::ArtistType )
+                link.addQueryItem( "artist_limitto", c->input() );
+            else
+                link.addQueryItem( "artist", c->input() );
+        }
+        else if ( c->selectedType() == "Artist Description" )
+        {
+            link.addQueryItem( "description", c->input() );
+        }
+        else
+        {
+            QString name = c->selectedType().toLower().replace( " ", "_" );
+            Echonest::DynamicPlaylist::PlaylistParam p = static_cast< Echonest::DynamicPlaylist::PlaylistParam >( c->match().toInt() );
+            // if it is a max, set that too
+            if ( p == Echonest::DynamicPlaylist::MaxTempo || p == Echonest::DynamicPlaylist::MaxDuration || p == Echonest::DynamicPlaylist::MaxLoudness
+               || p == Echonest::DynamicPlaylist::MaxDanceability || p == Echonest::DynamicPlaylist::MaxEnergy || p == Echonest::DynamicPlaylist::ArtistMaxFamiliarity
+               || p == Echonest::DynamicPlaylist::ArtistMaxHotttnesss || p == Echonest::DynamicPlaylist::SongMaxHotttnesss || p == Echonest::DynamicPlaylist::ArtistMaxLatitude
+               || p == Echonest::DynamicPlaylist::ArtistMaxLongitude )
+                name += "_max";
+
+            link.addQueryItem( name, c->input() );
+        }
+    }
+
+    QClipboard* cb = QApplication::clipboard();
+    QByteArray data = percentEncode( link );
+    cb->setText( data );
+
+    return link.toString();
+}
+
+
+void
+GlobalActionManager::savePlaylistToFile( const playlist_ptr& playlist, const QString& filename )
+{
+    XSPFGenerator* g = new XSPFGenerator( playlist, this );
+    g->setProperty( "filename", filename );
+
+    connect( g, SIGNAL( generated( QByteArray ) ), this, SLOT( xspfCreated( QByteArray ) ) );
+}
+
+
+void
+GlobalActionManager::xspfCreated( const QByteArray& xspf )
+{
+    QString filename = sender()->property( "filename" ).toString();
+
+    QFile f( filename );
+    if ( !f.open( QIODevice::WriteOnly ) )
+    {
+        qWarning() << "Failed to open file to save XSPF:" << filename;
+        return;
+    }
+
+    f.write( xspf );
+    f.close();
+
+    sender()->deleteLater();
+}
+
+
+void
+GlobalActionManager::copyToClipboard( const query_ptr& query )
+{
+    m_clipboardLongUrl = openLinkFromQuery( query );
+    shortenLink( m_clipboardLongUrl );
+}
+
+
+bool
+GlobalActionManager::parseTomahawkLink( const QString& urlIn )
+{
+    QString url = urlIn;
+    if ( urlIn.startsWith( "http://toma.hk" ) )
+        url.replace( "http://toma.hk/", "tomahawk://" );
+
+    if ( url.contains( "tomahawk://" ) )
+    {
+        QString cmd = url.mid( 11 );
+        cmd.replace( "%2B", "%20" );
+        tLog() << "Parsing tomahawk link command" << cmd;
+
+        QString cmdType = cmd.split( "/" ).first();
+        QUrl u = QUrl::fromEncoded( cmd.toUtf8() );
+
+        // for backwards compatibility
+        if ( cmdType == "load" )
+        {
+            if ( u.hasQueryItem( "xspf" ) )
+            {
+                QUrl xspf = QUrl::fromUserInput( u.queryItemValue( "xspf" ) );
+                XSPFLoader* l = new XSPFLoader( true, this );
+                tDebug() << "Loading spiff:" << xspf.toString();
+                l->load( xspf );
+                connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), ViewManager::instance(), SLOT( show( Tomahawk::playlist_ptr ) ) );
+
+                return true;
+            }
+            else if ( u.hasQueryItem( "jspf" ) )
+            {
+                QUrl jspf = QUrl::fromUserInput( u.queryItemValue( "jspf" ) );
+                JSPFLoader* l = new JSPFLoader( true, this );
+
+                tDebug() << "Loading jspiff:" << jspf.toString();
+                l->load( jspf );
+                connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), ViewManager::instance(), SLOT( show( Tomahawk::playlist_ptr ) ) );
+
+                return true;
+            }
+        }
+
+        if ( cmdType == "playlist" )
+        {
+            return handlePlaylistCommand( u );
+        }
+        else if ( cmdType == "collection" )
+        {
+            return handleCollectionCommand( u );
+        }
+        else if ( cmdType == "queue" )
+        {
+            return handleQueueCommand( u );
+        }
+        else if ( cmdType == "station" )
+        {
+            return handleStationCommand( u );
+        }
+        else if ( cmdType == "autoplaylist" )
+        {
+            return handleAutoPlaylistCommand( u );
+        }
+        else if ( cmdType == "search" )
+        {
+            return handleSearchCommand( u );
+        }
+        else if ( cmdType == "play" )
+        {
+            return handlePlayCommand( u );
+        }
+        else if ( cmdType == "bookmark" )
+        {
+            return handlePlayCommand( u );
+        }
+        else if ( cmdType == "open" )
+        {
+            return handleOpenCommand( u );
+        }
+        else if ( cmdType == "view" )
+        {
+            return handleViewCommand( u );
+        }
+        else if ( cmdType == "import" )
+        {
+            return handleImportCommand( u );
+        }
+        else
+        {
+            tLog() << "Tomahawk link not supported, command not known!" << cmdType << u.path();
+            return false;
+        }
+    }
+    else
+    {
+        tLog() << "Not a tomahawk:// link!";
+        return false;
+    }
+}
+
+
+bool
+GlobalActionManager::handlePlaylistCommand( const QUrl& url )
+{
+    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
+    if ( parts.isEmpty() )
+    {
+        tLog() << "No specific playlist command:" << url.toString();
+        return false;
+    }
+
+    if ( parts 0  == "import" )
+    {
+        if ( !url.hasQueryItem( "xspf" ) && !url.hasQueryItem( "jspf") )
+        {
+            tDebug() << "No xspf or jspf to load...";
+            return false;
+        }
+        if ( url.hasQueryItem( "xspf" ) )
+        {
+            createPlaylistFromUrl( "xspf", url.queryItemValue( "xspf" ), url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString() );
+            return true;
+        }
+        else if ( url.hasQueryItem( "jspf" ) )
+        {
+            createPlaylistFromUrl( "jspf", url.queryItemValue( "jspf" ), url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString() );
+            return true;
+        }
+    }
+    else if ( parts  0  == "new" )
+    {
+        if ( !url.hasQueryItem( "title" ) )
+        {
+            tLog() << "New playlist command needs a title...";
+            return false;
+        }
+        playlist_ptr pl = Playlist::create( SourceList::instance()->getLocal(), uuid(), url.queryItemValue( "title" ), QString(), QString(), false );
+        ViewManager::instance()->show( pl );
+    }
+    else if ( parts 0  == "add" )
+    {
+        if ( !url.hasQueryItem( "playlistid" ) || !url.hasQueryItem( "title" ) || !url.hasQueryItem( "artist" ) )
+        {
+            tLog() << "Add to playlist command needs playlistid, track, and artist..." << url.toString();
+            return false;
+        }
+        // TODO implement. Let the user select what playlist to add to
+        return false;
+    }
+
+    return false;
+}
+
+
+bool
+GlobalActionManager::handleImportCommand( const QUrl& url )
+{
+    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
+    if ( parts.size() < 1 )
+        return false;
+
+    if ( parts 0  == "playlist" )
+    {
+        if ( url.hasQueryItem( "xspf" ) )
+        {
+            createPlaylistFromUrl( "xspf", url.queryItemValue( "xspf" ), url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString() );
+            return true;
+        }
+        else if ( url.hasQueryItem( "jspf" ) )
+        {
+            createPlaylistFromUrl( "jspf", url.queryItemValue( "jspf" ), url.hasQueryItem( "title" ) ? url.queryItemValue( "title" ) : QString() );
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+void
+GlobalActionManager::createPlaylistFromUrl( const QString& type, const QString &url, const QString& title )
+{
+    if ( type == "xspf" )
+    {
+        QUrl xspf = QUrl::fromUserInput( url );
+        XSPFLoader* l= new XSPFLoader( true, this );
+        l->setOverrideTitle( title );
+        l->load( xspf );
+        connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), this, SLOT( playlistCreatedToShow( Tomahawk::playlist_ptr) ) );
+    }
+    else if ( type == "jspf" )
+    {
+        QUrl jspf = QUrl::fromUserInput( url );
+        JSPFLoader* l= new JSPFLoader( true, this );
+        l->setOverrideTitle( title );
+        l->load( jspf );
+        connect( l, SIGNAL( ok( Tomahawk::playlist_ptr ) ), this, SLOT( playlistCreatedToShow( Tomahawk::playlist_ptr) ) );
+    }
+}
+
+
+void
+GlobalActionManager::playlistCreatedToShow( const playlist_ptr& pl )
+{
+    connect( pl.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistReadyToShow() ) );
+    pl->setProperty( "sharedptr", QVariant::fromValue<Tomahawk::playlist_ptr>( pl ) );
+}
+
+
+void
+GlobalActionManager::playlistReadyToShow()
+{
+    playlist_ptr pl = sender()->property( "sharedptr" ).value<Tomahawk::playlist_ptr>();
+    if ( !pl.isNull() )
+        ViewManager::instance()->show( pl );
+
+    disconnect( sender(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistReadyToShow() ) );
+}
+
+
+bool
+GlobalActionManager::handleCollectionCommand( const QUrl& url )
+{
+    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
+    if ( parts.isEmpty() )
+    {
+        tLog() << "No specific collection command:" << url.toString();
+        return false;
+    }
+
+    if ( parts 0  == "add" )
+    {
+        // TODO implement
+    }
+
+    return false;
+}
+
+
+bool
+GlobalActionManager::handleOpenCommand( const QUrl& url )
+{
+    QStringList parts = url.path().split( "/" ).mid( 1 );
+    if ( parts.isEmpty() )
+    {
+        tLog() << "No specific type to open:" << url.toString();
+        return false;
+    }
+    // TODO user configurable in the UI
+    return doQueueAdd( parts, url.queryItems() );
+}
+
+
+void
+GlobalActionManager::handleOpenTrack( const query_ptr& q )
+{
+    ViewManager::instance()->queue()->model()->appendQuery( q );
+    ViewManager::instance()->showQueue();
+
+    if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() )
+    {
+        connect( q.data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( waitingForResolved( bool ) ) );
+        m_waitingToPlay = q;
+    }
+}
+
+
+void
+GlobalActionManager::handleOpenTracks( const QList< query_ptr >& queries )
+{
+    if ( queries.isEmpty() )
+        return;
+
+    ViewManager::instance()->queue()->model()->appendQueries( queries );
+    ViewManager::instance()->showQueue();
+
+    if ( !AudioEngine::instance()->isPlaying() && !AudioEngine::instance()->isPaused() )
+    {
+        connect( queries.first().data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( waitingForResolved( bool ) ) );
+        m_waitingToPlay = queries.first();
+    }
+}
+
+
+void
+GlobalActionManager::handlePlayTrack( const query_ptr& qry )
+{
+    playNow( qry );
+}
+
+
+bool
+GlobalActionManager::handleQueueCommand( const QUrl& url )
+{
+    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
+    if ( parts.isEmpty() )
+    {
+        tLog() << "No specific queue command:" << url.toString();
+        return false;
+    }
+
+    if ( parts 0  == "add" )
+    {
+        doQueueAdd( parts.mid( 1 ), url.queryItems() );
+    }
+    else
+    {
+        tLog() << "Only queue/add/track is support at the moment, got:" << parts;
+        return false;
+    }
+
+    return false;
+}
+
+
+bool
+GlobalActionManager::doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems )
+{
+    if ( parts.size() && parts 0  == "track" )
+    {
+        if ( queueSpotify( parts, queryItems ) )
+            return true;
+        else if ( queueRdio( parts, queryItems ) )
+            return true;
+
+        QPair< QString, QString > pair;
+        QString title, artist, album, urlStr;
+        foreach ( pair, queryItems )
+        {
+            pair.second = pair.second.replace( "+", " " ); // QUrl::queryItems doesn't decode + to a space :(
+            if ( pair.first == "title" )
+                title = pair.second;
+            else if ( pair.first == "artist" )
+                artist = pair.second;
+            else if ( pair.first == "album" )
+                album = pair.second;
+            else if ( pair.first == "url" )
+                urlStr = pair.second;
+        }
+
+        if ( !title.isEmpty() || !artist.isEmpty() || !album.isEmpty() )
+        {
+            // an individual; query to add to queue
+            query_ptr q = Query::get( artist, title, album, uuid(), false );
+            if ( q.isNull() )
+                return false;
+
+            if ( !urlStr.isEmpty() )
+                q->setResultHint( urlStr );
+            Pipeline::instance()->resolve( q );
+
+            handleOpenTrack( q );
+            return true;
+        }
+        else
+        { // a list of urls to add to the queue
+            foreach ( pair, queryItems )
+            {
+                if ( pair.first != "url" )
+                    continue;
+                QUrl track = QUrl::fromUserInput( pair.second );
+                //FIXME: isLocalFile is Qt 4.8
+                if ( track.toString().startsWith( "file://" ) )
+                {
+                    // it's local, so we see if it's in the DB and load it if so
+                    // TODO
+                }
+                else
+                { // give it a web result hint
+                    QFileInfo info( track.path() );
+                    query_ptr q = Query::get( QString(), info.baseName(), QString(), uuid(), false );
+                    if ( q.isNull() )
+                        continue;
+
+                    q->setResultHint( track.toString() );
+                    Pipeline::instance()->resolve( q );
+
+                    ViewManager::instance()->queue()->model()->appendQuery( q );
+                    ViewManager::instance()->showQueue();
+                }
+                return true;
+            }
+        }
+    }
+    else if ( parts.size() && parts 0  == "playlist" )
+    {
+        QString xspfUrl, jspfUrl;
+        for ( int i = 0; i < queryItems.size(); i++ )
+        {
+            const QPair< QString, QString > queryItem = queryItems.at( i );
+            if ( queryItem.first == "xspf" )
+            {
+                xspfUrl = queryItem.second;
+                break;
+            }
+            else if ( queryItem.first == "jspf" )
+            {
+                jspfUrl = queryItem.second;
+                break;
+            }
+        }
+
+        if ( !xspfUrl.isEmpty() )
+        {
+            XSPFLoader* loader = new XSPFLoader( false, false, this );
+            connect( loader, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( handleOpenTracks( QList< Tomahawk::query_ptr > ) ) );
+            loader->load( QUrl( xspfUrl ) );
+            loader->setAutoDelete( true );
+
+            return true;
+        }
+        else if ( !jspfUrl.isEmpty() )
+        {
+            JSPFLoader* loader = new JSPFLoader( false, this );
+            connect( loader, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( handleOpenTracks( QList< Tomahawk::query_ptr > ) ) );
+            loader->load( QUrl( jspfUrl ) );
+            loader->setAutoDelete( true );
+
+            return true;
+        }
+    }
+    return false;
+}
+
+
+bool
+GlobalActionManager::queueSpotify( const QStringList& , const QList< QPair< QString, QString > >& queryItems )
+{
+    QString url;
+
+    QPair< QString, QString > pair;
+    foreach ( pair, queryItems )
+    {
+        if ( pair.first == "spotifyURL" )
+            url = pair.second;
+        else if ( pair.first == "spotifyURI" )
+            url = pair.second;
+    }
+
+    if ( url.isEmpty() )
+        return false;
+
+    openSpotifyLink( url );
+
+    return true;
+}
+
+
+bool
+GlobalActionManager::queueRdio( const QStringList& , const QList< QPair< QString, QString > >& queryItems )
+{
+    QString url;
+
+    QPair< QString, QString > pair;
+    foreach ( pair, queryItems )
+    {
+        if ( pair.first == "rdioURL" )
+            url = pair.second;
+        else if ( pair.first == "rdioURI" )
+            url = pair.second;
+    }
+
+    if ( url.isEmpty() )
+        return false;
+
+    openRdioLink( url );
+
+    return true;
+}
+
+
+bool
+GlobalActionManager::handleSearchCommand( const QUrl& url )
+{
+    // open the super collection and set this as the search filter
+    QString queryStr;
+    if ( url.hasQueryItem( "query" ) )
+        queryStr = url.queryItemValue( "query" );
+    else
+    {
+        QStringList query;
+        if ( url.hasQueryItem( "artist" ) )
+            query << url.queryItemValue( "artist" );
+        if ( url.hasQueryItem( "album" ) )
+            query << url.queryItemValue( "album" );
+        if ( url.hasQueryItem( "title" ) )
+            query << url.queryItemValue( "title" );
+        queryStr = query.join( " " );
+    }
+
+    if ( queryStr.trimmed().isEmpty() )
+        return false;
+
+    ViewManager::instance()->show( new SearchWidget( queryStr.trimmed() ) );
+
+    return true;
+}
+
+bool
+GlobalActionManager::handleViewCommand( const QUrl& url )
+{
+    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
+    if ( parts.isEmpty() ) {
+        tLog() << "No specific view command:" << url.toString();
+        return false;
+    }
+
+    if ( parts 0  == "artist" )
+    {
+        const QString artist = url.queryItemValue( "name" );
+        if ( artist.isEmpty() )
+        {
+            tLog() << "Not artist supplied for view/artist command.";
+            return false;
+        }
+        artist_ptr artistPtr = Artist::get( artist );
+        if ( !artistPtr.isNull() )
+            ViewManager::instance()->show( artistPtr );
+
+        return true;
+    }
+    else if ( parts 0  == "album" )
+    {
+        const QString artist = url.queryItemValue( "artist" );
+        const QString album = url.queryItemValue( "name" );
+        if ( artist.isEmpty() || album.isEmpty() )
+        {
+            tLog() << "Not artist or album supplied for view/artist command:" << url;
+            return false;
+        }
+        album_ptr albumPtr = Album::get( Artist::get( artist, false ), album, false );
+        if ( !albumPtr.isNull() )
+            ViewManager::instance()->show( albumPtr );
+
+        return true;
+    }
+
+    return false;
+}
+
+
+bool
+GlobalActionManager::handleAutoPlaylistCommand( const QUrl& url )
+{
+    return !loadDynamicPlaylist( url, false ).isNull();
+}
+
+
+Tomahawk::dynplaylist_ptr
+GlobalActionManager::loadDynamicPlaylist( const QUrl& url, bool station )
+{
+    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
+    if ( parts.isEmpty() )
+    {
+        tLog() << "No specific station command:" << url.toString();
+        return Tomahawk::dynplaylist_ptr();
+    }
+
+    if ( parts 0  == "create" )
+    {
+        if ( !url.hasQueryItem( "title" ) || !url.hasQueryItem( "type" ) )
+        {
+            tLog() << "Station create command needs title and type..." << url.toString();
+            return Tomahawk::dynplaylist_ptr();
+        }
+        QString title = url.queryItemValue( "title" );
+        QString type = url.queryItemValue( "type" );
+        GeneratorMode m = Static;
+        if ( station )
+            m = OnDemand;
+
+        dynplaylist_ptr pl = DynamicPlaylist::create( SourceList::instance()->getLocal(), uuid(), title, QString(), QString(), m, false, type );
+        pl->setMode( m );
+        QList< dyncontrol_ptr > controls;
+        QPair< QString, QString > param;
+        foreach ( param, url.queryItems() )
+        {
+            if ( param.first == "artist" )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Artist" );
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistRadioType ) );
+                controls << c;
+            }
+            else if ( param.first == "artist_limitto" )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Artist" );
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistType ) );
+                controls << c;
+            }
+            else if ( param.first == "description" )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Artist Description" );
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistDescriptionType ) );
+                controls << c;
+            }
+            else if ( param.first == "variety" )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Variety" );
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Variety ) );
+                controls << c;
+            }
+            else if ( param.first.startsWith( "tempo" ) )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Tempo" );
+                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinTempo + extra ) );
+                controls << c;
+            }
+            else if ( param.first.startsWith( "duration" ) )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Duration" );
+                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinDuration + extra ) );
+                controls << c;
+            }
+            else if ( param.first.startsWith( "loudness" ) )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Loudness" );
+                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinLoudness + extra ) );
+                controls << c;
+            }
+            else if ( param.first.startsWith( "danceability" ) )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Danceability" );
+                int extra = param.first.endsWith( "_max" ) ? 1 : 0;
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinDanceability + extra ) );
+                controls << c;
+            }
+            else if ( param.first.startsWith( "energy" ) )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Energy" );
+                int extra = param.first.endsWith( "_max" ) ? 1 : 0;
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::MinEnergy + extra ) );
+                controls << c;
+            }
+            else if ( param.first.startsWith( "artist_familiarity" ) )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Artist Familiarity" );
+                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinFamiliarity + extra ) );
+                controls << c;
+            }
+            else if ( param.first.startsWith( "artist_hotttnesss" ) )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Artist Hotttnesss" );
+                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinHotttnesss + extra ) );
+                controls << c;
+            }
+            else if ( param.first.startsWith( "song_hotttnesss" ) )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Song Hotttnesss" );
+                int extra = param.first.endsWith( "_max" ) ? -1 : 0;
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::SongMinHotttnesss + extra ) );
+                controls << c;
+            }
+            else if ( param.first.startsWith( "longitude" ) )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Longitude" );
+                int extra = param.first.endsWith( "_max" ) ? 1 : 0;
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinLongitude + extra ) );
+                controls << c;
+            }
+            else if ( param.first.startsWith( "latitude" ) )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Latitude" );
+                int extra = param.first.endsWith( "_max" ) ? 1 : 0;
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::ArtistMinLatitude + extra ) );
+                controls << c;
+            }
+            else if ( param.first == "key" )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Key" );
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Key ) );
+                controls << c;
+            }
+            else if ( param.first == "mode" )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Mode" );
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Mode ) );
+                controls << c;
+            }
+            else if ( param.first == "mood" )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Mood" );
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Mood ) );
+                controls << c;
+            }
+            else if ( param.first == "style" )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Style" );
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::Style ) );
+                controls << c;
+            }
+            else if ( param.first == "song" )
+            {
+                dyncontrol_ptr c = pl->generator()->createControl( "Song" );
+                c->setInput( param.second );
+                c->setMatch( QString::number( (int)Echonest::DynamicPlaylist::SongRadioType ) );
+                controls << c;
+            }
+        }
+
+        if ( m == OnDemand )
+            pl->createNewRevision( uuid(), pl->currentrevision(), type, controls );
+        else
+            pl->createNewRevision( uuid(), pl->currentrevision(), type, controls, pl->entries() );
+
+        ViewManager::instance()->show( pl );
+        return pl;
+    }
+
+    return Tomahawk::dynplaylist_ptr();
+}
+
+
+bool
+GlobalActionManager::handleStationCommand( const QUrl& url )
+{
+    return !loadDynamicPlaylist( url, true ).isNull();
+}
+
+
+bool
+GlobalActionManager::handlePlayCommand( const QUrl& url )
+{
+    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
+    if ( parts.isEmpty() )
+    {
+        tLog() << "No specific play command:" << url.toString();
+        return false;
+    }
+
+    if ( parts 0  == "track" )
+    {
+        if ( playSpotify( url ) )
+            return true;
+        else if ( playRdio( url ) )
+            return true;
+
+        QPair< QString, QString > pair;
+        QString title, artist, album, urlStr;
+        foreach ( pair, url.queryItems() )
+        {
+            if ( pair.first == "title" )
+                title = pair.second;
+            else if ( pair.first == "artist" )
+                artist = pair.second;
+            else if ( pair.first == "album" )
+                album = pair.second;
+            else if ( pair.first == "url" )
+                urlStr = pair.second;
+        }
+
+        query_ptr q = Query::get( artist, title, album );
+        if ( q.isNull() )
+            return false;
+
+        if ( !urlStr.isEmpty() )
+            q->setResultHint( urlStr );
+
+        playNow( q );
+        return true;
+    }
+
+    return false;
+}
+
+
+bool
+GlobalActionManager::playSpotify( const QUrl& url )
+{
+    if ( !url.hasQueryItem( "spotifyURI" ) && !url.hasQueryItem( "spotifyURL" ) )
+        return false;
+
+    QString spotifyUrl = url.hasQueryItem( "spotifyURI" ) ? url.queryItemValue( "spotifyURI" ) : url.queryItemValue( "spotifyURL" );
+    SpotifyParser* p = new SpotifyParser( spotifyUrl, this );
+    connect( p, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( playOrQueueNow( Tomahawk::query_ptr ) ) );
+
+    return true;
+}
+
+void
+GlobalActionManager::playNow( const query_ptr& q )
+{
+
+    Pipeline::instance()->resolve( q, true );
+
+    m_waitingToPlay = q;
+    q->setProperty( "playNow", true );
+    connect( q.data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( waitingForResolved( bool ) ) );
+}
+
+
+void
+GlobalActionManager::playOrQueueNow( const query_ptr& q )
+{
+    Pipeline::instance()->resolve( q, true );
+
+    m_waitingToPlay = q;
+    connect( q.data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( waitingForResolved( bool ) ) );
+}
+
+
+bool
+GlobalActionManager::playRdio( const QUrl& url )
+{
+    if ( !url.hasQueryItem( "rdioURI" ) && !url.hasQueryItem( "rdioURL" ) )
+        return false;
+
+    QString rdioUrl = url.hasQueryItem( "rdioURI" ) ? url.queryItemValue( "spotifyURI" ) : url.queryItemValue( "rdioURL" );
+    RdioParser* p = new RdioParser( this );
+    p->parse( rdioUrl );
+    connect( p, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( playOrQueueNow( Tomahawk::query_ptr ) ) );
+
+    return true;
+}
+
+#endif
+
+
+bool GlobalActionManager::handleBookmarkCommand(const QUrl& url)
+{
+    QStringList parts = url.path().split( "/" ).mid( 1 ); // get the rest of the command
+    if ( parts.isEmpty() )
+    {
+        tLog() << "No specific bookmark command:" << url.toString();
+        return false;
+    }
+
+    if ( parts 0  == "track" )
+    {
+        QPair< QString, QString > pair;
+        QString title, artist, album, urlStr;
+        foreach ( pair, url.queryItems() )
+        {
+            if ( pair.first == "title" )
+                title = pair.second;
+            else if ( pair.first == "artist" )
+                artist = pair.second;
+            else if ( pair.first == "album" )
+                album = pair.second;
+            else if ( pair.first == "url" )
+                urlStr = pair.second;
+        }
+        query_ptr q = Query::get( artist, title, album );
+        if ( q.isNull() )
+            return false;
+
+        if ( !urlStr.isEmpty() )
+            q->setResultHint( urlStr );
+        Pipeline::instance()->resolve( q );
+
+        // now we add it to the special "bookmarks" playlist, creating it if it doesn't exist. if nothing is playing, start playing the track
+        QSharedPointer< LocalCollection > col = SourceList::instance()->getLocal()->collection().dynamicCast< LocalCollection >();
+        playlist_ptr bookmarkpl = col->bookmarksPlaylist();
+        if ( bookmarkpl.isNull() )
+        {
+            // create it and do the deed then
+            m_waitingToBookmark = q;
+            col->createBookmarksPlaylist();
+            connect( col.data(), SIGNAL( bookmarkPlaylistCreated( Tomahawk::playlist_ptr ) ), this, SLOT( bookmarkPlaylistCreated( Tomahawk::playlist_ptr ) ), Qt::UniqueConnection );
+        }
+        else
+        {
+            doBookmark( bookmarkpl, q );
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+
+void
+GlobalActionManager::shortenLinkRequestFinished()
+{
+    qDebug() << Q_FUNC_INFO;
+    QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
+    bool error = false;
+
+    // NOTE: this should never happen
+    if ( !reply )
+    {
+        emit shortLinkReady( QUrl( "" ), QUrl( "" ), QVariantMap() );
+        return;
+    }
+
+    QVariant callbackObj;
+    if ( reply->property( "callbackobj" ).isValid() )
+        callbackObj = reply->property( "callbackobj" );
+
+    // Check for the redirect attribute, as this should be the shortened link
+    QVariant urlVariant = reply->attribute( QNetworkRequest::RedirectionTargetAttribute );
+
+    // NOTE: this should never happen
+    if ( urlVariant.isNull() || !urlVariant.isValid() )
+        error = true;
+
+    QUrl longUrl = reply->request().url();
+    QUrl shortUrl = urlVariant.toUrl();
+
+    // NOTE: this should never happen
+    if ( !shortUrl.isValid() )
+        error = true;
+
+#ifndef ENABLE_HEADLESS
+    // Success!  Here is the short link
+    if ( m_clipboardLongUrl == reply->request().url() )
+    {
+        QClipboard* cb = QApplication::clipboard();
+
+        QByteArray data = percentEncode( error ? longUrl : shortUrl );
+        cb->setText( data );
+
+        m_clipboardLongUrl.clear();
+    }
+    else
+#endif
+    {
+        if ( !error )
+            emit shortLinkReady( longUrl, shortUrl, callbackObj );
+        else
+            emit shortLinkReady( longUrl, longUrl, callbackObj );
+    }
+
+    reply->deleteLater();
+}
+
+
+#ifndef ENABLE_HEADLESS
+
+void
+GlobalActionManager::postShortenFinished()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    Q_ASSERT( reply );
+    const QByteArray raw = reply->readAll();
+    qDebug() << "GOT REPLYL" << raw;
+
+    const QUrl url = QUrl::fromUserInput( raw );
+    qDebug() << "GOT POSTED SHORT URL:" << url.toString();
+    QClipboard* cb = QApplication::clipboard();
+
+    const QByteArray data = percentEncode( url );
+    cb->setText( data );
+
+    reply->deleteLater();
+}
+
+#endif
+
+
+void
+GlobalActionManager::shortenLinkRequestError( QNetworkReply::NetworkError error )
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "Network Error: " << error;
+
+    QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
+
+    // NOTE: this should never happen
+    if ( !reply )
+    {
+        emit shortLinkReady( QUrl( "" ), QUrl( "" ), QVariantMap() );
+        return;
+    }
+
+    QVariantMap callbackMap;
+    if ( reply->property( "callbackMap" ).canConvert< QVariantMap >() && !reply->property( "callbackMap" ).toMap().isEmpty() )
+        callbackMap = reply->property( "callbackMap" ).toMap();
+    reply->deleteLater();
+    emit shortLinkReady( QUrl( "" ), QUrl( "" ), callbackMap );
+}
+
+
+void
+GlobalActionManager::bookmarkPlaylistCreated( const playlist_ptr& pl )
+{
+    Q_ASSERT( !m_waitingToBookmark.isNull() );
+    doBookmark( pl, m_waitingToBookmark );
+}
+
+
+void
+GlobalActionManager::doBookmark( const playlist_ptr& pl, const query_ptr& q )
+{
+    plentry_ptr e( new PlaylistEntry );
+    e->setGuid( uuid() );
+
+    e->setDuration( q->displayQuery()->duration() );
+    e->setLastmodified( 0 );
+    QString annotation = "";
+    if ( !q->property( "annotation" ).toString().isEmpty() )
+        annotation = q->property( "annotation" ).toString();
+    e->setAnnotation( annotation );
+    e->setQuery( q );
+
+    pl->createNewRevision( uuid(), pl->currentrevision(), QList< plentry_ptr >( pl->entries() ) << e );
+    connect( pl.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( showPlaylist() ) );
+
+    m_toShow = pl;
+
+    m_waitingToBookmark.clear();
+}
+
+
+#ifndef ENABLE_HEADLESS
+
+void
+GlobalActionManager::showPlaylist()
+{
+    if ( m_toShow.isNull() )
+        return;
+
+    ViewManager::instance()->show( m_toShow );
+
+    m_toShow.clear();
+}
+
+
+void
+GlobalActionManager::waitingForResolved( bool /* success */ )
+{
+    if ( m_waitingToPlay.data() != sender() )
+    {
+        m_waitingToPlay.clear();
+        return;
+    }
+
+    if ( !m_waitingToPlay.isNull() && m_waitingToPlay->playable() )
+    {
+        // play it!
+//         AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() );
+        if ( sender() && sender()->property( "playNow" ).toBool() )
+        {
+            if ( !AudioEngine::instance()->playlist().isNull() )
+                AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() );
+            else
+            {
+                ViewManager::instance()->queue()->model()->appendQuery( m_waitingToPlay );
+                AudioEngine::instance()->play();
+            }
+        }
+        else
+            AudioEngine::instance()->play();
+
+        m_waitingToPlay.clear();
+    }
+}
+
+
+/// SPOTIFY URL HANDLING
+
+bool
+GlobalActionManager::openSpotifyLink( const QString& link )
+{
+    SpotifyParser* spot = new SpotifyParser( link, this );
+    connect( spot, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( handleOpenTrack( Tomahawk::query_ptr ) ) );
+
+    return true;
+}
+
+
+bool
+GlobalActionManager::openRdioLink( const QString& link )
+{
+    RdioParser* rdio = new RdioParser( this );
+    connect( rdio, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( handleOpenTrack( Tomahawk::query_ptr ) ) );
+    rdio->parse( link );
+
+    return true;
+}
+
+#endif
+
+
+QString
+GlobalActionManager::hostname() const
+{
+    return QString( "http://toma.hk" );
+}
+
+
+QByteArray
+GlobalActionManager::percentEncode (const QUrl &url ) const
+{
+    QByteArray data = url.toEncoded();
+
+    data.replace( "'", "%27" ); // QUrl doesn't encode ', which it doesn't have to. Some apps don't like ' though, and want %27. Both are valid.
+    data.replace( "%20", "+" );
+    data.replace( "&", "%26" );
+
+    return data;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/GlobalActionManager.h Added

@@ -0,0 +1,141 @@
+/*
+    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
+
+    This program 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+#ifndef GLOBALACTIONMANAGER_H
+#define GLOBALACTIONMANAGER_H
+
+#include "Query.h"
+#include "Playlist.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
+#include "DllMacro.h"
+
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QObject>
+#include <QUrl>
+#include <QWeakPointer>
+
+
+/**
+ * Handles global actions such as parsing and creation of links, mime data handling, etc
+ */
+class DLLEXPORT GlobalActionManager : public QObject
+{
+    Q_OBJECT
+public:
+    static GlobalActionManager* instance();
+    virtual ~GlobalActionManager();
+
+    QUrl openLinkFromQuery( const Tomahawk::query_ptr& query ) const;
+
+    QUrl copyOpenLink( const Tomahawk::artist_ptr& artist ) const;
+    QUrl copyOpenLink( const Tomahawk::album_ptr& album ) const;
+
+    QUrl openLink( const QString& title, const QString& artist, const QString& album ) const;
+
+public slots:
+    void shortenLink( const QUrl& url, const QVariant &callbackObj = QVariant() );
+    
+#ifndef ENABLE_HEADLESS
+
+    /// Takes a spotify link and performs the default open action on it
+    bool openSpotifyLink( const QString& link );
+
+    /// Takes a spotify link and performs the default open action on it
+    bool openRdioLink( const QString& link );
+
+    void copyToClipboard( const Tomahawk::query_ptr& query );
+    QString copyPlaylistToClipboard( const Tomahawk::dynplaylist_ptr& playlist );
+    void savePlaylistToFile( const Tomahawk::playlist_ptr& playlist, const QString& filename );
+
+    bool parseTomahawkLink( const QString& link );
+    void getShortLink( const Tomahawk::playlist_ptr& playlist );
+    void waitingForResolved( bool );
+
+    Tomahawk::dynplaylist_ptr loadDynamicPlaylist( const QUrl& url, bool station );
+
+    void handleOpenTrack( const Tomahawk::query_ptr& qry );
+    void handleOpenTracks( const QList< Tomahawk::query_ptr >& queries );
+
+    void handlePlayTrack( const Tomahawk::query_ptr& qry );
+#endif
+
+signals:
+    void shortLinkReady( const QUrl& longUrl, const QUrl& shortUrl, const QVariant& callbackObj );
+
+private slots:
+    void shortenLinkRequestFinished();
+    void shortenLinkRequestError( QNetworkReply::NetworkError );
+
+    void bookmarkPlaylistCreated( const Tomahawk::playlist_ptr& pl );
+
+#ifndef ENABLE_HEADLESS
+    void postShortenFinished();
+    void showPlaylist();
+
+    void playlistCreatedToShow( const Tomahawk::playlist_ptr& pl );
+    void playlistReadyToShow();
+
+    void xspfCreated( const QByteArray& xspf );
+    
+    void playOrQueueNow( const Tomahawk::query_ptr& );
+    void playNow( const Tomahawk::query_ptr& );
+#endif
+
+private:
+    explicit GlobalActionManager( QObject* parent = 0 );
+    void doBookmark( const Tomahawk::playlist_ptr& pl, const Tomahawk::query_ptr& q );
+
+    /// handle opening of urls
+#ifndef ENABLE_HEADLESS
+    bool handlePlaylistCommand( const QUrl& url );
+    bool handleViewCommand( const QUrl& url );
+    bool handleStationCommand( const QUrl& url );
+    bool handleSearchCommand( const QUrl& url );
+    bool handleQueueCommand( const QUrl& url );
+    bool handleAutoPlaylistCommand( const QUrl& url );
+    bool handleImportCommand( const QUrl& url );
+    bool doQueueAdd( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
+    
+    bool playSpotify( const QUrl& url );
+    bool queueSpotify( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
+    bool playRdio( const QUrl& url );
+    bool queueRdio( const QStringList& parts, const QList< QPair< QString, QString > >& queryItems );
+#endif
+
+    bool handleCollectionCommand( const QUrl& url );
+    bool handlePlayCommand( const QUrl& url );
+    bool handleBookmarkCommand( const QUrl& url );
+    bool handleOpenCommand( const QUrl& url );
+
+    void createPlaylistFromUrl( const QString& type, const QString& url, const QString& title );
+
+    QString hostname() const;
+
+    inline QByteArray percentEncode( const QUrl& url ) const;
+
+    Tomahawk::playlist_ptr m_toShow;
+    Tomahawk::query_ptr m_waitingToBookmark;
+    Tomahawk::query_ptr m_waitingToPlay;
+    QUrl m_clipboardLongUrl;
+
+    static GlobalActionManager* s_instance;
+};
+
+#endif // GLOBALACTIONMANAGER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/LatchManager.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/LatchManager.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/LatchManager.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/LatchManager.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Pipeline.cpp Added

@@ -0,0 +1,551 @@
+/* === 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
+ *   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 "Pipeline.h"
+
+#include <QMutexLocker>
+
+#include "FuncTimeout.h"
+#include "database/Database.h"
+#include "ExternalResolver.h"
+#include "resolvers/ScriptResolver.h"
+#include "resolvers/QtScriptResolver.h"
+#include "Source.h"
+
+#include "utils/Logger.h"
+
+#include "boost/bind.hpp"
+
+#define DEFAULT_CONCURRENT_QUERIES 4
+#define MAX_CONCURRENT_QUERIES 16
+#define CLEANUP_TIMEOUT 5 * 60 * 1000
+#define MINSCORE 0.5
+
+using namespace Tomahawk;
+
+Pipeline* Pipeline::s_instance = 0;
+
+
+Pipeline*
+Pipeline::instance()
+{
+    return s_instance;
+}
+
+
+Pipeline::Pipeline( QObject* parent )
+    : QObject( parent )
+    , m_running( false )
+{
+    s_instance = this;
+
+    m_maxConcurrentQueries = qBound( DEFAULT_CONCURRENT_QUERIES, QThread::idealThreadCount(), MAX_CONCURRENT_QUERIES );
+    tDebug() << Q_FUNC_INFO << "Using" << m_maxConcurrentQueries << "threads";
+
+    m_temporaryQueryTimer.setInterval( CLEANUP_TIMEOUT );
+    connect( &m_temporaryQueryTimer, SIGNAL( timeout() ), SLOT( onTemporaryQueryTimer() ) );
+}
+
+
+Pipeline::~Pipeline()
+{
+    tDebug() << Q_FUNC_INFO;
+    m_running = false;
+
+    // stop script resolvers
+    foreach ( QWeakPointer< ExternalResolver > r, m_scriptResolvers )
+        if ( !r.isNull() )
+            r.data()->deleteLater();
+
+    m_scriptResolvers.clear();
+}
+
+
+void
+Pipeline::databaseReady()
+{
+    connect( Database::instance(), SIGNAL( indexReady() ), this, SLOT( start() ), Qt::QueuedConnection );
+    Database::instance()->loadIndex();
+}
+
+
+void
+Pipeline::start()
+{
+    tDebug() << Q_FUNC_INFO << "Shunting this many pending queries:" << m_queries_pending.size();
+    m_running = true;
+
+    shuntNext();
+}
+
+
+void
+Pipeline::stop()
+{
+    m_running = false;
+}
+
+
+void
+Pipeline::removeResolver( Resolver* r )
+{
+    QMutexLocker lock( &m_mut );
+
+    tDebug() << "Removed resolver:" << r->name();
+    m_resolvers.removeAll( r );
+    emit resolverRemoved( r );
+}
+
+
+void
+Pipeline::addResolver( Resolver* r )
+{
+    QMutexLocker lock( &m_mut );
+
+    tDebug() << "Adding resolver" << r->name();
+    m_resolvers.append( r );
+    emit resolverAdded( r );
+}
+
+
+void
+Pipeline::addExternalResolverFactory( ResolverFactoryFunc resolverFactory )
+{
+    m_resolverFactories << resolverFactory;
+}
+
+
+Tomahawk::ExternalResolver*
+Pipeline::addScriptResolver( const QString& path )
+{
+    ExternalResolver* res = 0;
+
+    foreach ( ResolverFactoryFunc factory, m_resolverFactories )
+    {
+        res = factory( path );
+        if ( !res )
+            continue;
+
+        m_scriptResolvers << QWeakPointer< ExternalResolver >( res );
+
+        break;
+    }
+
+    return res;
+}
+
+
+void
+Pipeline::stopScriptResolver( const QString& path )
+{
+    foreach ( QWeakPointer< ExternalResolver > res, m_scriptResolvers )
+    {
+        if ( res.data()->filePath() == path )
+            res.data()->stop();
+    }
+}
+
+
+void
+Pipeline::removeScriptResolver( const QString& scriptPath )
+{
+    QWeakPointer< ExternalResolver > r;
+    foreach ( QWeakPointer< ExternalResolver > res, m_scriptResolvers )
+    {
+        if ( res.isNull() )
+            continue;
+
+        if ( res.data()->filePath() == scriptPath )
+            r = res;
+    }
+    m_scriptResolvers.removeAll( r );
+
+    if ( !r.isNull() )
+    {
+        r.data()->stop();
+        r.data()->deleteLater();
+    }
+}
+
+
+ExternalResolver*
+Pipeline::resolverForPath( const QString& scriptPath )
+{
+    foreach ( QWeakPointer< ExternalResolver > res, m_scriptResolvers )
+    {
+        if ( res.data()->filePath() == scriptPath )
+            return res.data();
+    }
+    return 0;
+}
+
+
+void
+Pipeline::resolve( const QList<query_ptr>& qlist, bool prioritized, bool temporaryQuery )
+{
+    {
+        QMutexLocker lock( &m_mut );
+
+        int i = 0;
+        foreach ( const query_ptr& q, qlist )
+        {
+            if ( q->resolvingFinished() )
+                continue;
+            if ( m_qidsState.contains( q->id() ) )
+                continue;
+            if ( m_queries_pending.contains( q ) )
+            {
+                if ( prioritized )
+                {
+                    m_queries_pending.insert( i++, m_queries_pending.takeAt( m_queries_pending.indexOf( q ) ) );
+                }
+                continue;
+            }
+
+            if ( !m_qids.contains( q->id() ) )
+                m_qids.insert( q->id(), q );
+
+            if ( prioritized )
+                m_queries_pending.insert( i++, q );
+            else
+                m_queries_pending << q;
+
+            if ( temporaryQuery )
+            {
+                m_queries_temporary << q;
+
+                if ( m_temporaryQueryTimer.isActive() )
+                    m_temporaryQueryTimer.stop();
+                m_temporaryQueryTimer.start();
+            }
+        }
+    }
+
+    shuntNext();
+}
+
+
+void
+Pipeline::resolve( const query_ptr& q, bool prioritized, bool temporaryQuery )
+{
+    if ( q.isNull() )
+        return;
+
+    QList< query_ptr > qlist;
+    qlist << q;
+    resolve( qlist, prioritized, temporaryQuery );
+}
+
+
+void
+Pipeline::resolve( QID qid, bool prioritized, bool temporaryQuery )
+{
+    resolve( query( qid ), prioritized, temporaryQuery );
+}
+
+
+void
+Pipeline::reportResults( QID qid, const QList< result_ptr >& results )
+{
+    if ( !m_running )
+        return;
+
+    if ( !m_qids.contains( qid ) )
+    {
+        tDebug() << "Result arrived too late for:" << qid;
+        return;
+    }
+    const query_ptr& q = m_qids.value( qid );
+
+    Q_ASSERT( !q.isNull() );
+    if ( q.isNull() )
+        return;
+    
+    QList< result_ptr > cleanResults;
+    foreach ( const result_ptr& r, results )
+    {
+        if ( r.isNull() )
+            continue;
+        
+        float score = q->howSimilar( r );
+        r->setScore( score );
+        if ( !q->isFullTextQuery() && score < MINSCORE )
+            continue;
+
+        cleanResults << r;
+    }
+
+    if ( !cleanResults.isEmpty() )
+    {
+        q->addResults( cleanResults );
+        foreach ( const result_ptr& r, cleanResults )
+        {
+            m_rids.insert( r->id(), r );
+        }
+
+        if ( q->solved() && !q->isFullTextQuery() )
+        {
+            setQIDState( q, 0 );
+            return;
+        }
+    }
+
+    decQIDState( q );
+}
+
+
+void
+Pipeline::reportAlbums( QID qid, const QList< album_ptr >& albums )
+{
+    if ( !m_running )
+        return;
+
+    if ( !m_qids.contains( qid ) )
+    {
+        tDebug() << "Albums arrived too late for:" << qid;
+        return;
+    }
+    const query_ptr& q = m_qids.value( qid );
+    Q_ASSERT( q->isFullTextQuery() );
+
+    QList< album_ptr > cleanAlbums;
+    foreach ( const album_ptr& r, albums )
+    {
+//        float score = q->howSimilar( r );
+
+        cleanAlbums << r;
+    }
+
+    if ( !cleanAlbums.isEmpty() )
+    {
+        q->addAlbums( cleanAlbums );
+    }
+}
+
+
+void
+Pipeline::reportArtists( QID qid, const QList< artist_ptr >& artists )
+{
+    if ( !m_running )
+        return;
+
+    if ( !m_qids.contains( qid ) )
+    {
+        tDebug() << "Artists arrived too late for:" << qid;
+        return;
+    }
+    const query_ptr& q = m_qids.value( qid );
+    Q_ASSERT( q->isFullTextQuery() );
+
+    QList< artist_ptr > cleanArtists;
+    foreach ( const artist_ptr& r, artists )
+    {
+//        float score = q->howSimilar( r );
+
+        cleanArtists << r;
+    }
+
+    if ( !cleanArtists.isEmpty() )
+    {
+        q->addArtists( cleanArtists );
+    }
+}
+
+
+void
+Pipeline::shuntNext()
+{
+    if ( !m_running )
+        return;
+
+    unsigned int rc;
+    query_ptr q;
+    {
+        QMutexLocker lock( &m_mut );
+
+        rc = m_resolvers.count();
+        if ( m_queries_pending.isEmpty() )
+        {
+            if ( m_qidsState.isEmpty() )
+                emit idle();
+            return;
+        }
+
+        // Check if we are ready to dispatch more queries
+        if ( m_qidsState.count() >= m_maxConcurrentQueries )
+            return;
+
+        /*
+            Since resolvers are async, we now dispatch to the highest weighted ones
+            and after timeout, dispatch to next highest etc, aborting when solved
+        */
+        q = m_queries_pending.takeFirst();
+        q->setCurrentResolver( 0 );
+    }
+
+    setQIDState( q, rc );
+}
+
+
+void
+Pipeline::timeoutShunt( const query_ptr& q )
+{
+    if ( !m_running )
+        return;
+
+    // are we still waiting for a timeout?
+    if ( m_qidsTimeout.contains( q->id() ) )
+    {
+        decQIDState( q );
+    }
+}
+
+
+void
+Pipeline::shunt( const query_ptr& q )
+{
+    if ( !m_running )
+        return;
+
+    Resolver* r = 0;
+    if ( !q->resolvingFinished() )
+        r = nextResolver( q );
+
+    if ( r )
+    {
+        tLog( LOGVERBOSE ) << "Dispatching to resolver" << r->name() << q->toString() << q->solved() << q->id();
+
+        q->setCurrentResolver( r );
+        r->resolve( q );
+        emit resolving( q );
+
+        if ( r->timeout() > 0 )
+        {
+            m_qidsTimeout.insert( q->id(), true );
+            new FuncTimeout( r->timeout(), boost::bind( &Pipeline::timeoutShunt, this, q ), this );
+        }
+    }
+    else
+    {
+        // we get here if we disable a resolver while a query is resolving
+        setQIDState( q, 0 );
+        return;
+    }
+
+    shuntNext();
+}
+
+
+Tomahawk::Resolver*
+Pipeline::nextResolver( const Tomahawk::query_ptr& query ) const
+{
+    Resolver* newResolver = 0;
+
+    foreach ( Resolver* r, m_resolvers )
+    {
+        if ( query->resolvedBy().contains( r ) )
+            continue;
+
+        if ( !newResolver )
+        {
+            newResolver = r;
+            continue;
+        }
+
+        if ( r->weight() > newResolver->weight() )
+            newResolver = r;
+    }
+
+    return newResolver;
+}
+
+
+void
+Pipeline::setQIDState( const Tomahawk::query_ptr& query, int state )
+{
+    QMutexLocker lock( &m_mut );
+
+    if ( m_qidsTimeout.contains( query->id() ) )
+        m_qidsTimeout.remove( query->id() );
+
+    if ( state > 0 )
+    {
+        m_qidsState.insert( query->id(), state );
+
+        new FuncTimeout( 0, boost::bind( &Pipeline::shunt, this, query ), this );
+    }
+    else
+    {
+        m_qidsState.remove( query->id() );
+        query->onResolvingFinished();
+
+        if ( !m_queries_temporary.contains( query ) )
+            m_qids.remove( query->id() );
+
+        new FuncTimeout( 0, boost::bind( &Pipeline::shuntNext, this ), this );
+    }
+}
+
+
+int
+Pipeline::incQIDState( const Tomahawk::query_ptr& query )
+{
+    QMutexLocker lock( &m_mut );
+
+    int state = 1;
+    if ( m_qidsState.contains( query->id() ) )
+    {
+        state = m_qidsState.value( query->id() ) + 1;
+    }
+    m_qidsState.insert( query->id(), state );
+
+    return state;
+}
+
+
+int
+Pipeline::decQIDState( const Tomahawk::query_ptr& query )
+{
+    int state = 0;
+    {
+        QMutexLocker lock( &m_mut );
+
+        if ( !m_qidsState.contains( query->id() ) )
+            return 0;
+
+        state = m_qidsState.value( query->id() ) - 1;
+    }
+
+    setQIDState( query, state );
+    return state;
+}
+
+
+void
+Pipeline::onTemporaryQueryTimer()
+{
+    QMutexLocker lock( &m_mut );
+    tDebug() << Q_FUNC_INFO;
+    m_temporaryQueryTimer.stop();
+
+    for ( int i = m_queries_temporary.count() - 1; i >= 0; i-- )
+    {
+        query_ptr q = m_queries_temporary.takeAt( i );
+        m_qids.remove( q->id() );
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Pipeline.h Added

@@ -0,0 +1,134 @@
+/* === 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
+ *   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 PIPELINE_H
+#define PIPELINE_H
+
+#include "Typedefs.h"
+#include "Query.h"
+
+#include <QObject>
+#include <QList>
+#include <QMap>
+#include <QMutex>
+#include <QTimer>
+
+#include <boost/function.hpp>
+
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+class Resolver;
+class ExternalResolver;
+typedef boost::function<Tomahawk::ExternalResolver*(QString)> ResolverFactoryFunc;
+
+class DLLEXPORT Pipeline : public QObject
+{
+Q_OBJECT
+
+public:
+    static Pipeline* instance();
+
+    explicit Pipeline( QObject* parent = 0 );
+    virtual ~Pipeline();
+
+    bool isRunning() const { return m_running; }
+
+    unsigned int pendingQueryCount() const { return m_queries_pending.count(); }
+    unsigned int activeQueryCount() const { return m_qidsState.count(); }
+
+    void reportResults( QID qid, const QList< result_ptr >& results );
+    void reportAlbums( QID qid, const QList< album_ptr >& albums );
+    void reportArtists( QID qid, const QList< artist_ptr >& artists );
+
+    void addExternalResolverFactory( ResolverFactoryFunc resolverFactory );
+    Tomahawk::ExternalResolver* addScriptResolver( const QString& scriptPath );
+    void stopScriptResolver( const QString& scriptPath );
+    void removeScriptResolver( const QString& scriptPath );
+    QList< QWeakPointer< ExternalResolver > > scriptResolvers() const { return m_scriptResolvers; }
+    Tomahawk::ExternalResolver* resolverForPath( const QString& scriptPath );
+
+    void addResolver( Resolver* r );
+    void removeResolver( Resolver* r );
+
+    query_ptr query( const QID& qid ) const
+    {
+        return m_qids.value( qid );
+    }
+
+    result_ptr result( const RID& rid ) const
+    {
+        return m_rids.value( rid );
+    }
+
+public slots:
+    void resolve( const query_ptr& q, bool prioritized = true, bool temporaryQuery = false );
+    void resolve( const QList<query_ptr>& qlist, bool prioritized = true, bool temporaryQuery = false );
+    void resolve( QID qid, bool prioritized = true, bool temporaryQuery = false );
+
+    void start();
+    void stop();
+    void databaseReady();
+
+signals:
+    void idle();
+    void resolving( const Tomahawk::query_ptr& query );
+
+    void resolverAdded( Tomahawk::Resolver* );
+    void resolverRemoved( Tomahawk::Resolver* );
+
+private slots:
+    void timeoutShunt( const query_ptr& q );
+    void shunt( const query_ptr& q );
+    void shuntNext();
+
+    void onTemporaryQueryTimer();
+
+private:
+    Tomahawk::Resolver* nextResolver( const Tomahawk::query_ptr& query ) const;
+
+    void setQIDState( const Tomahawk::query_ptr& query, int state );
+    int incQIDState( const Tomahawk::query_ptr& query );
+    int decQIDState( const Tomahawk::query_ptr& query );
+
+    QList< Resolver* > m_resolvers;
+    QList< QWeakPointer<Tomahawk::ExternalResolver> > m_scriptResolvers;
+    QList< ResolverFactoryFunc > m_resolverFactories;
+    QMap< QID, bool > m_qidsTimeout;
+    QMap< QID, unsigned int > m_qidsState;
+    QMap< QID, query_ptr > m_qids;
+    QMap< RID, result_ptr > m_rids;
+
+    QMutex m_mut; // for m_qids, m_rids
+
+    // store queries here until DB index is loaded, then shunt them all
+    QList< query_ptr > m_queries_pending;
+    // store temporary queries here and clean up after timeout threshold
+    QList< query_ptr > m_queries_temporary;
+
+    int m_maxConcurrentQueries;
+    bool m_running;
+    QTimer m_temporaryQueryTimer;
+
+    static Pipeline* s_instance;
+};
+
+}; //ns
+
+#endif // PIPELINE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Playlist.cpp Added

@@ -0,0 +1,722 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "Playlist.h"
+
+#include <QtXml/QDomDocument>
+#include <QtXml/QDomElement>
+
+#include "database/Database.h"
+#include "database/DatabaseCommand_LoadPlaylistEntries.h"
+#include "database/DatabaseCommand_SetPlaylistRevision.h"
+#include "database/DatabaseCommand_CreatePlaylist.h"
+#include "database/DatabaseCommand_DeletePlaylist.h"
+#include "database/DatabaseCommand_RenamePlaylist.h"
+
+#include "TomahawkSettings.h"
+#include "Pipeline.h"
+#include "Source.h"
+#include "SourceList.h"
+#include "PlaylistPlaylistInterface.h"
+
+#include "utils/Logger.h"
+#include "PlaylistUpdaterInterface.h"
+
+using namespace Tomahawk;
+
+
+PlaylistEntry::PlaylistEntry() {}
+PlaylistEntry::~PlaylistEntry() {}
+
+
+void
+PlaylistEntry::setQueryVariant( const QVariant& v )
+{
+    QVariantMap m = v.toMap();
+
+    QString artist = m.value( "artist" ).toString();
+    QString album = m.value( "album" ).toString();
+    QString track = m.value( "track" ).toString();
+
+    m_query = Tomahawk::Query::get( artist, track, album );
+}
+
+
+QVariant
+PlaylistEntry::queryVariant() const
+{
+    return m_query->toVariant();
+}
+
+
+void
+PlaylistEntry::setQuery( const Tomahawk::query_ptr& q )
+{
+    m_query = q;
+}
+
+
+const Tomahawk::query_ptr&
+PlaylistEntry::query() const
+{
+    return m_query;
+}
+
+
+source_ptr
+PlaylistEntry::lastSource() const
+{
+    return m_lastsource;
+}
+
+
+void
+PlaylistEntry::setLastSource( source_ptr s )
+{
+    m_lastsource = s;
+}
+
+
+Playlist::Playlist( const source_ptr& author )
+    : m_source( author )
+    , m_lastmodified( 0 )
+{
+}
+
+
+// used when loading from DB:
+Playlist::Playlist( const source_ptr& src,
+                    const QString& currentrevision,
+                    const QString& title,
+                    const QString& info,
+                    const QString& creator,
+                    uint createdOn,
+                    bool shared,
+                    int lastmod,
+                    const QString& guid )
+    : QObject()
+    , m_source( src )
+    , m_currentrevision( currentrevision )
+    , m_guid( guid == "" ? uuid() : guid )
+    , m_title( title )
+    , m_info( info )
+    , m_creator( creator )
+    , m_lastmodified( lastmod )
+    , m_createdOn( createdOn )
+    , m_shared( shared )
+{
+    init();
+}
+
+
+Playlist::Playlist( const source_ptr& author,
+                    const QString& guid,
+                    const QString& title,
+                    const QString& info,
+                    const QString& creator,
+                    bool shared,
+                    const QList< Tomahawk::plentry_ptr >& entries )
+    : QObject()
+    , m_source( author )
+    , m_guid( guid )
+    , m_title( title )
+    , m_info ( info )
+    , m_creator( creator )
+    , m_lastmodified( 0 )
+    , m_createdOn( 0 ) // will be set by db command
+    , m_shared( shared )
+    , m_initEntries( entries )
+{
+    init();
+}
+
+
+void
+Playlist::init()
+{
+    m_busy = false;
+    m_deleted = false;
+    m_locallyChanged = false;
+    connect( Pipeline::instance(), SIGNAL( idle() ), SLOT( onResolvingFinished() ) );
+}
+
+
+Playlist::~Playlist()
+{
+}
+
+
+playlist_ptr
+Playlist::create( const source_ptr& author,
+                  const QString& guid,
+                  const QString& title,
+                  const QString& info,
+                  const QString& creator,
+                  bool shared,
+                  const QList<Tomahawk::query_ptr>& queries )
+{
+    QList< plentry_ptr > entries;
+    foreach( const Tomahawk::query_ptr& query, queries )
+    {
+        plentry_ptr p( new PlaylistEntry );
+        p->setGuid( uuid() );
+        p->setDuration( query->duration() );
+        p->setLastmodified( 0 );
+        QString annotation = "";
+        if ( !query->property( "annotation" ).toString().isEmpty() )
+            annotation = query->property( "annotation" ).toString();
+        p->setAnnotation( annotation );
+        p->setQuery( query );
+
+        entries << p;
+    }
+
+    playlist_ptr playlist( new Playlist( author, guid, title, info, creator, shared, entries ), &QObject::deleteLater );
+
+    // save to DB in the background
+    // Watch for the created() signal if you need to be sure it's written.
+    //
+    // When a playlist is created it will reportCreated(), adding it to the
+    // collection it belongs to and emitting the appropriate signal.
+    // When we create a new playlist for the local Source.here we call reportCreated()
+    // immediately, so the GUI can reflect the new playlist without waiting for the DB sync
+    //
+    // When createplaylist DBOPs come from peers, the postCommitHook will call
+    // reportCreated for us automatically, which should cause new playlists to be added to the GUI.
+
+    DatabaseCommand_CreatePlaylist* cmd = new DatabaseCommand_CreatePlaylist( author, playlist );
+    connect( cmd, SIGNAL( finished() ), playlist.data(), SIGNAL( created() ) );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+    playlist->reportCreated( playlist );
+
+    return playlist;
+}
+
+
+playlist_ptr
+Playlist::load( const QString& guid )
+{
+    playlist_ptr p;
+
+    foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() )
+    {
+        p = source->collection()->playlist( guid );
+        if ( !p.isNull() )
+            return p;
+    }
+
+    return p;
+}
+
+
+void
+Playlist::remove( const playlist_ptr& playlist )
+{
+    playlist->aboutToBeDeleted( playlist );
+
+    TomahawkSettings *s = TomahawkSettings::instance();
+    s->removePlaylistSettings( playlist->guid() );
+
+    DatabaseCommand_DeletePlaylist* cmd = new DatabaseCommand_DeletePlaylist( playlist->author(), playlist->guid() );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+}
+
+
+void
+Playlist::rename( const QString& title )
+{
+    DatabaseCommand_RenamePlaylist* cmd = new DatabaseCommand_RenamePlaylist( author(), guid(), title );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+}
+
+
+void
+Playlist::setTitle( const QString& title )
+{
+    if ( title == m_title )
+        return;
+
+    const QString oldTitle = m_title;
+    m_title = title;
+
+    emit changed();
+    emit renamed( m_title, oldTitle );
+}
+
+
+void
+Playlist::reportCreated( const playlist_ptr& self )
+{
+    Q_ASSERT( self.data() == this );
+    m_source->collection()->addPlaylist( self );
+}
+
+
+void
+Playlist::reportDeleted( const Tomahawk::playlist_ptr& self )
+{
+    Q_ASSERT( self.data() == this );
+    if ( !m_updaters.isEmpty() )
+    {
+        foreach( PlaylistUpdaterInterface* updater, m_updaters )
+            updater->remove();
+    }
+
+    m_deleted = true;
+    m_source->collection()->deletePlaylist( self );
+
+    emit deleted( self );
+}
+
+
+void
+Playlist::addUpdater( PlaylistUpdaterInterface* updater )
+{
+    m_updaters << updater;
+
+    connect( updater, SIGNAL( changed() ), this, SIGNAL( changed() ), Qt::UniqueConnection );
+    connect( updater, SIGNAL( destroyed( QObject* ) ), this, SIGNAL( changed() ), Qt::QueuedConnection );
+
+    emit changed();
+}
+
+
+void
+Playlist::removeUpdater( PlaylistUpdaterInterface* updater )
+{
+    m_updaters.removeAll( updater );
+
+    disconnect( updater, SIGNAL( changed() ), this, SIGNAL( changed() ) );
+    disconnect( updater, SIGNAL( destroyed( QObject* ) ), this, SIGNAL( changed() ) );
+
+    emit changed();
+}
+
+
+void
+Playlist::loadRevision( const QString& rev )
+{
+//    qDebug() << Q_FUNC_INFO << currentrevision() << rev << m_title;
+
+    setBusy( true );
+    DatabaseCommand_LoadPlaylistEntries* cmd =
+            new DatabaseCommand_LoadPlaylistEntries( rev.isEmpty() ? currentrevision() : rev );
+
+    connect( cmd, SIGNAL( done( const QString&,
+                                const QList<QString>&,
+                                const QList<QString>&,
+                                bool,
+                                const QMap< QString, Tomahawk::plentry_ptr >&,
+                                bool ) ),
+                    SLOT( setRevision( const QString&,
+                                       const QList<QString>&,
+                                       const QList<QString>&,
+                                       bool,
+                                       const QMap< QString, Tomahawk::plentry_ptr >&,
+                                       bool ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+//public, model can call this if user changes a playlist:
+void
+Playlist::createNewRevision( const QString& newrev, const QString& oldrev, const QList< plentry_ptr >& entries )
+{
+    tDebug() << Q_FUNC_INFO << newrev << oldrev << entries.count();
+    Q_ASSERT( m_source->isLocal() || newrev == oldrev );
+
+    if ( busy() )
+    {
+        m_revisionQueue.enqueue( RevisionQueueItem( newrev, oldrev, entries, oldrev == currentrevision() ) );
+        return;
+    }
+
+    if ( newrev != oldrev )
+        setBusy( true );
+
+    // calc list of newly added entries:
+    QList<plentry_ptr> added = newEntries( entries );
+    QStringList orderedguids;
+    qDebug() << "Inserting ordered GUIDs:";
+    foreach( const plentry_ptr& p, entries )
+    {
+        qDebug() << p->guid() << p->query()->track() << p->query()->artist();
+        orderedguids << p->guid();
+    }
+
+    foreach( const plentry_ptr& p, added )
+        qDebug() << p->guid();
+
+    // source making the change (local user in this case)
+    source_ptr author = SourceList::instance()->getLocal();
+    // command writes new rev to DB and calls setRevision, which emits our signal
+    DatabaseCommand_SetPlaylistRevision* cmd =
+            new DatabaseCommand_SetPlaylistRevision( author,
+                                                     guid(),
+                                                     newrev,
+                                                     oldrev,
+                                                     orderedguids,
+                                                     added,
+                                                     entries );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+Playlist::updateEntries( const QString& newrev, const QString& oldrev, const QList< plentry_ptr >& entries )
+{
+    tDebug() << Q_FUNC_INFO << newrev << oldrev << entries.count();
+    Q_ASSERT( m_source->isLocal() || newrev == oldrev );
+
+    if ( busy() )
+    {
+        m_updateQueue.enqueue( RevisionQueueItem( newrev, oldrev, entries, oldrev == currentrevision() ) );
+        return;
+    }
+
+    if ( newrev != oldrev )
+        setBusy( true );
+
+    QStringList orderedguids;
+    foreach( const plentry_ptr& p, m_entries )
+        orderedguids << p->guid();
+
+    qDebug() << "Updating playlist metadata:" << entries;
+    DatabaseCommand_SetPlaylistRevision* cmd =
+    new DatabaseCommand_SetPlaylistRevision( SourceList::instance()->getLocal(),
+                                             guid(),
+                                             newrev,
+                                             oldrev,
+                                             orderedguids,
+                                             entries );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+// private, called when we loadRevision, or by our friend class DatabaseCommand_SetPlaylistRevision
+// used to save new revision data (either originating locally, or via network msg for syncing)
+void
+Playlist::setRevision( const QString& rev,
+                       const QList<QString>& neworderedguids,
+                       const QList<QString>& oldorderedguids,
+                       bool is_newest_rev,
+                       const QMap< QString, Tomahawk::plentry_ptr >& addedmap,
+                       bool applied )
+{
+    if ( QThread::currentThread() != thread() )
+    {
+        QMetaObject::invokeMethod( this,
+                                   "setRevision",
+                                   Qt::BlockingQueuedConnection,
+                                   Q_ARG( QString, rev ),
+                                   Q_ARG( QList<QString>, neworderedguids ),
+                                   Q_ARG( QList<QString>, oldorderedguids ),
+                                   Q_ARG( bool, is_newest_rev ),
+                                   QGenericArgument( "QMap< QString,Tomahawk::plentry_ptr >", (const void*)&addedmap ),
+                                   Q_ARG( bool, applied )
+                                 );
+        return;
+    }
+
+    PlaylistRevision pr = setNewRevision( rev, neworderedguids, oldorderedguids, is_newest_rev, addedmap );
+
+    Q_ASSERT( applied );
+    if ( applied )
+        m_currentrevision = rev;
+    pr.applied = applied;
+
+    foreach( const plentry_ptr& entry, m_entries )
+    {
+        connect( entry->query().data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ),
+                 SLOT( onResultsFound( QList<Tomahawk::result_ptr> ) ), Qt::UniqueConnection );
+    }
+
+    setBusy( false );
+
+    if ( m_initEntries.count() && currentrevision().isEmpty() )
+    {
+        // add initial tracks
+        createNewRevision( uuid(), currentrevision(), m_initEntries );
+        m_initEntries.clear();
+    }
+    else
+        emit revisionLoaded( pr );
+
+    checkRevisionQueue();
+}
+
+
+PlaylistRevision
+Playlist::setNewRevision( const QString& rev,
+                          const QList<QString>& neworderedguids,
+                          const QList<QString>& oldorderedguids,
+                          bool is_newest_rev,
+                          const QMap< QString, Tomahawk::plentry_ptr >& addedmap )
+{
+    Q_UNUSED( oldorderedguids );
+    Q_UNUSED( is_newest_rev );
+
+    // build up correctly ordered new list of plentry_ptrs from
+    // existing ones, and the ones that have been added
+    QMap<QString, plentry_ptr> entriesmap;
+    foreach ( const plentry_ptr& p, m_entries )
+    {
+        qDebug() << p->guid() << p->query()->track() << p->query()->artist();
+        entriesmap.insert( p->guid(), p );
+    }
+
+
+    // re-build m_entries from neworderedguids. plentries come either from the old m_entries OR addedmap.
+    m_entries.clear();
+
+    foreach ( const QString& id, neworderedguids )
+    {
+        if ( entriesmap.contains( id ) )
+        {
+            m_entries.append( entriesmap.value( id ) );
+        }
+        else if ( addedmap.contains( id ) )
+        {
+            m_entries.append( addedmap.value( id ) );
+        }
+        else
+        {
+            tDebug() << "id:" << id;
+            tDebug() << "newordered:" << neworderedguids.count() << neworderedguids;
+            tDebug() << "entriesmap:" << entriesmap.count() << entriesmap;
+            tDebug() << "addedmap:" << addedmap.count() << addedmap;
+            tDebug() << "m_entries" << m_entries;
+
+            tLog() << "Playlist error for playlist with guid" << guid() << "from source" << author()->friendlyName();
+            Q_ASSERT( false ); // XXX
+        }
+    }
+
+    PlaylistRevision pr;
+    pr.oldrevisionguid = m_currentrevision;
+    pr.revisionguid = rev;
+    pr.added = addedmap.values();
+    pr.newlist = m_entries;
+
+    return pr;
+}
+
+
+source_ptr
+Playlist::author() const
+{
+    return m_source;
+}
+
+
+void
+Playlist::resolve()
+{
+    QList< query_ptr > qlist;
+    foreach( const plentry_ptr& p, m_entries )
+    {
+        qlist << p->query();
+    }
+
+    Pipeline::instance()->resolve( qlist );
+}
+
+
+void
+Playlist::onResultsFound( const QList<Tomahawk::result_ptr>& results )
+{
+    Q_UNUSED( results );
+    m_locallyChanged = true;
+}
+
+
+void
+Playlist::onResolvingFinished()
+{
+    if ( m_locallyChanged && !m_deleted )
+    {
+        m_locallyChanged = false;
+        createNewRevision( currentrevision(), currentrevision(), m_entries );
+    }
+}
+
+
+void
+Playlist::addEntry( const query_ptr& query, const QString& oldrev )
+{
+    QList<query_ptr> queries;
+    queries << query;
+
+    addEntries( queries, oldrev );
+}
+
+
+void
+Playlist::addEntries( const QList<query_ptr>& queries, const QString& oldrev )
+{
+    QList<plentry_ptr> el = entriesFromQueries( queries );
+
+    const int prevSize = m_entries.size();
+
+    QString newrev = uuid();
+    createNewRevision( newrev, oldrev, el );
+
+
+    // We are appending at end, so notify listeners.
+    // PlaylistModel also emits during appends, but since we call
+    // createNewRevision, it reloads instead of appends.
+    const QList<plentry_ptr> added = el.mid( prevSize );
+    qDebug() << "Playlist got" << queries.size() << "tracks added, emitting tracksInserted with:" << added.size() << "at pos:" << prevSize - 1;
+    emit tracksInserted( added, prevSize );
+}
+
+
+void
+Playlist::insertEntries( const QList< query_ptr >& queries, const int position, const QString& oldrev )
+{
+    QList<plentry_ptr> toInsert = entriesFromQueries( queries, true );
+    QList<plentry_ptr> entries = m_entries;
+
+    Q_ASSERT( position <= m_entries.size() );
+    if ( position > m_entries.size() )
+    {
+        qWarning() << "ERROR trying to insert tracks past end of playlist! Appending!!";
+        addEntries( queries, oldrev );
+        return;
+    }
+
+    for ( int i = toInsert.size()-1; i >= 0; --i )
+        entries.insert( position, toInsert.at(i) );
+
+    createNewRevision( uuid(), oldrev, entries );
+
+    // We are appending at end, so notify listeners.
+    // PlaylistModel also emits during appends, but since we call
+    // createNewRevision, it reloads instead of appends.
+    qDebug() << "Playlist got" << toInsert.size() << "tracks added, emitting tracksInserted at pos:" << position;
+    emit tracksInserted( toInsert, position );
+}
+
+
+QList<plentry_ptr>
+Playlist::entriesFromQueries( const QList<Tomahawk::query_ptr>& queries, bool clearFirst )
+{
+    QList<plentry_ptr> el;
+    if ( !clearFirst )
+        el = entries();
+
+    foreach( const query_ptr& query, queries )
+    {
+        plentry_ptr e( new PlaylistEntry() );
+        e->setGuid( uuid() );
+
+        e->setDuration( query->displayQuery()->duration() );
+        e->setLastmodified( 0 );
+        QString annotation = "";
+        if ( !query->property( "annotation" ).toString().isEmpty() )
+            annotation = query->property( "annotation" ).toString();
+        e->setAnnotation( annotation ); // FIXME
+        e->setQuery( query );
+
+        el << e;
+    }
+    return el;
+}
+
+
+QList< plentry_ptr >
+Playlist::newEntries( const QList< plentry_ptr >& entries )
+{
+    QSet<QString> currentguids;
+    foreach( const plentry_ptr& p, m_entries )
+        currentguids.insert( p->guid() ); // could be cached as member?
+
+    // calc list of newly added entries:
+    QList<plentry_ptr> added;
+    foreach( const plentry_ptr& p, entries )
+    {
+        if ( !currentguids.contains( p->guid() ) )
+            added << p;
+    }
+    return added;
+}
+
+
+void
+Playlist::setBusy( bool b )
+{
+    m_busy = b;
+    emit changed();
+}
+
+
+void
+Playlist::checkRevisionQueue()
+{
+    if ( !m_revisionQueue.isEmpty() )
+    {
+        RevisionQueueItem item = m_revisionQueue.dequeue();
+
+        if ( item.oldRev != currentrevision() && item.applyToTip )
+        {
+            // this was applied to the then-latest, but the already-running operation changed it so it's out of date now. fix it
+            if ( item.oldRev == item.newRev )
+            {
+                checkRevisionQueue();
+                return;
+            }
+
+            item.oldRev = currentrevision();
+        }
+        createNewRevision( item.newRev, item.oldRev, item.entries );
+    }
+    if ( !m_updateQueue.isEmpty() )
+    {
+        RevisionQueueItem item = m_updateQueue.dequeue();
+
+        if ( item.oldRev != currentrevision() && item.applyToTip )
+        {
+            // this was applied to the then-latest, but the already-running operation changed it so it's out of date now. fix it
+            if ( item.oldRev == item.newRev )
+            {
+                checkRevisionQueue();
+                return;
+            }
+
+            item.oldRev = currentrevision();
+        }
+        updateEntries( item.newRev, item.oldRev, item.entries );
+    }
+}
+
+
+Tomahawk::playlistinterface_ptr
+Playlist::playlistInterface()
+{
+    if ( m_playlistInterface.isNull() )
+    {
+        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::PlaylistPlaylistInterface( this ) );
+    }
+
+    return m_playlistInterface;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Playlist.h Added

@@ -0,0 +1,319 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011920-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 PLAYLIST_H
+#define PLAYLIST_H
+
+#include <QObject>
+#include <QList>
+#include <QVariant>
+#include <QSharedPointer>
+#include <QQueue>
+
+#include "Typedefs.h"
+#include "Result.h"
+#include "PlaylistInterface.h"
+#include "playlist/PlaylistUpdaterInterface.h"
+#include "Query.h"
+
+#include "DllMacro.h"
+
+class DatabaseCommand_LoadAllPlaylists;
+class DatabaseCommand_LoadAllSortedPlaylists;
+class DatabaseCommand_SetPlaylistRevision;
+class DatabaseCommand_CreatePlaylist;
+class PlaylistModel;
+
+namespace Tomahawk
+{
+
+class PlaylistUpdaterInterface;
+
+class DLLEXPORT PlaylistEntry : public QObject
+{
+Q_OBJECT
+Q_PROPERTY( QString guid              READ guid         WRITE setGuid )
+Q_PROPERTY( QString annotation        READ annotation   WRITE setAnnotation )
+Q_PROPERTY( unsigned int duration     READ duration     WRITE setDuration )
+Q_PROPERTY( unsigned int lastmodified READ lastmodified WRITE setLastmodified )
+Q_PROPERTY( QVariant query            READ queryVariant WRITE setQueryVariant )
+
+public:
+    PlaylistEntry();
+    virtual ~PlaylistEntry();
+
+    bool isValid() const { return !m_query.isNull(); }
+
+    void setQuery( const Tomahawk::query_ptr& q );
+    const Tomahawk::query_ptr& query() const;
+
+    void setQueryVariant( const QVariant& v );
+    QVariant queryVariant() const;
+
+    QString guid() const { return m_guid; }
+    void setGuid( const QString& s ) { m_guid = s; }
+
+    QString annotation() const { return m_annotation; }
+    void setAnnotation( const QString& s ) { m_annotation = s; }
+
+    QString resultHint() const { return m_resulthint; }
+    void setResultHint( const QString& s ) { m_resulthint= s; }
+
+    unsigned int duration() const { return m_duration; }
+    void setDuration( unsigned int i ) { m_duration = i; }
+
+    unsigned int lastmodified() const { return m_lastmodified; }
+    void setLastmodified( unsigned int i ) { m_lastmodified = i; }
+
+    source_ptr lastSource() const;
+    void setLastSource( source_ptr s );
+
+private:
+    QString m_guid;
+    Tomahawk::query_ptr m_query;
+    QString m_annotation;
+    unsigned int m_duration;
+    unsigned int m_lastmodified;
+    source_ptr   m_lastsource;
+    QString      m_resulthint;
+};
+
+
+struct PlaylistRevision
+{
+    QString revisionguid;
+    QString oldrevisionguid;
+    QList<plentry_ptr> newlist;
+    QList<plentry_ptr> added;
+    QList<plentry_ptr> removed;
+    bool applied; // false if conflict
+};
+
+struct RevisionQueueItem
+{
+public:
+    QString newRev;
+    QString oldRev;
+    QList< plentry_ptr > entries;
+    bool applyToTip;
+
+    RevisionQueueItem( const QString& nRev, const QString& oRev, const QList< plentry_ptr >& e, bool latest ) :
+        newRev( nRev ), oldRev( oRev), entries( e ), applyToTip( latest ) {}
+};
+
+
+class DLLEXPORT Playlist : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY( QString guid            READ guid               WRITE setGuid )
+    Q_PROPERTY( QString currentrevision READ currentrevision    WRITE setCurrentrevision )
+    Q_PROPERTY( QString title           READ title              WRITE setTitle )
+    Q_PROPERTY( QString info            READ info               WRITE setInfo )
+    Q_PROPERTY( QString creator         READ creator            WRITE setCreator )
+    Q_PROPERTY( unsigned int createdon  READ createdOn          WRITE setCreatedOn )
+    Q_PROPERTY( bool    shared          READ shared             WRITE setShared )
+
+friend class ::DatabaseCommand_LoadAllPlaylists;
+friend class ::DatabaseCommand_LoadAllSortedPlaylists;
+friend class ::DatabaseCommand_SetPlaylistRevision;
+friend class ::DatabaseCommand_CreatePlaylist;
+friend class DynamicPlaylist;
+friend class ::PlaylistModel;
+
+public:
+    virtual ~Playlist();
+
+    static Tomahawk::playlist_ptr load( const QString& guid );
+
+    // one CTOR is private, only called by DatabaseCommand_LoadAllPlaylists
+    static Tomahawk::playlist_ptr create( const source_ptr& author,
+                                          const QString& guid,
+                                          const QString& title,
+                                          const QString& info,
+                                          const QString& creator,
+                                          bool shared,
+                                          const QList<Tomahawk::query_ptr>& queries = QList<Tomahawk::query_ptr>() );
+
+    static void remove( const playlist_ptr& playlist );
+    void rename( const QString& title );
+
+    virtual void loadRevision( const QString& rev = "" );
+
+    source_ptr author() const;
+    QString currentrevision() const   { return m_currentrevision; }
+    QString title() const             { return m_title; }
+    QString info() const              { return m_info; }
+    QString creator() const           { return m_creator; }
+    QString guid() const              { return m_guid; }
+    bool shared() const               { return m_shared; }
+    unsigned int lastmodified() const { return m_lastmodified; }
+    uint createdOn() const            { return m_createdOn; }
+
+    bool busy() const { return m_busy; }
+
+    const QList< plentry_ptr >& entries() { return m_entries; }
+    virtual void addEntry( const Tomahawk::query_ptr& query, const QString& oldrev );
+    virtual void addEntries( const QList<Tomahawk::query_ptr>& queries, const QString& oldrev );
+    virtual void insertEntries( const QList<Tomahawk::query_ptr>& queries, const int position, const QString& oldrev );
+
+    // <IGNORE hack="true">
+    // these need to exist and be public for the json serialization stuff
+    // you SHOULD NOT call them.  They are used for an alternate CTOR method from json.
+    // maybe friend QObjectHelper and make them private?
+    explicit Playlist( const source_ptr& author );
+    void setCurrentrevision( const QString& s ) { m_currentrevision = s; }
+    void setInfo( const QString& s )            { m_info = s; }
+    void setCreator( const QString& s )         { m_creator = s; }
+    void setGuid( const QString& s )            { m_guid = s; }
+    void setShared( bool b )                    { m_shared = b; }
+    void setCreatedOn( uint createdOn )         { m_createdOn = createdOn; }
+    void setTitle( const QString& s );
+    // </IGNORE>
+
+
+    QList<plentry_ptr> entriesFromQueries( const QList<Tomahawk::query_ptr>& queries, bool clearFirst = false );
+
+    void addUpdater( PlaylistUpdaterInterface* updater );
+    void removeUpdater( PlaylistUpdaterInterface* updater );
+    QList<PlaylistUpdaterInterface*> updaters() const { return m_updaters; }
+
+    Tomahawk::playlistinterface_ptr playlistInterface();
+
+signals:
+    /// emitted when the playlist revision changes (whenever the playlist changes)
+    void revisionLoaded( Tomahawk::PlaylistRevision );
+
+    /// watch for this to see when newly created playlist is synced to DB (if you care)
+    void created();
+
+    /// renamed etc.
+    void changed();
+    void renamed( const QString& newTitle, const QString& oldTitle );
+
+    /**
+     *   delete command is scheduled but not completed. Do not call remove() again once this
+     *   is emitted.
+     */
+    void aboutToBeDeleted( const Tomahawk::playlist_ptr& pl );
+
+    /// was deleted, eh?
+    void deleted( const Tomahawk::playlist_ptr& pl );
+
+    /// Notification for tracks being inserted at a specific point
+    /// Contiguous range from startPosition
+    void tracksInserted( const QList< Tomahawk::plentry_ptr >& tracks, int startPosition );
+
+    /// Notification for tracks being removed from playlist
+    void tracksRemoved( const QList< Tomahawk::query_ptr >& tracks );
+
+    /// Notification for tracks being moved in a playlist. List is of new tracks, and new position of first track
+    /// Contiguous range from startPosition
+    void tracksMoved( const QList< Tomahawk::plentry_ptr >& tracks, int startPosition );
+
+public slots:
+    // want to update the playlist from the model?
+    // generate a newrev using uuid() and call this:
+    void createNewRevision( const QString& newrev, const QString& oldrev, const QList< plentry_ptr >& entries );
+
+    // Want to update some metadata of a plentry_ptr? this gets you a new revision too.
+    // entries should be <= entries(), with changed metadata.
+    void updateEntries( const QString& newrev, const QString& oldrev, const QList< plentry_ptr >& entries );
+
+
+    void reportCreated( const Tomahawk::playlist_ptr& self );
+    void reportDeleted( const Tomahawk::playlist_ptr& self );
+
+    void setRevision( const QString& rev,
+                      const QList<QString>& neworderedguids,
+                      const QList<QString>& oldorderedguids,
+                      bool is_newest_rev,
+                      const QMap< QString, Tomahawk::plentry_ptr >& addedmap,
+                      bool applied );
+
+    void resolve();
+
+protected:
+    // called from loadAllPlaylists DB cmd:
+    explicit Playlist( const source_ptr& src,
+                       const QString& currentrevision,
+                       const QString& title,
+                       const QString& info,
+                       const QString& creator,
+                       uint createdOn,
+                       bool shared,
+                       int lastmod,
+                       const QString& guid = "" ); // populate db
+
+    // called when creating new playlist
+    explicit Playlist( const source_ptr& author,
+                       const QString& guid,
+                       const QString& title,
+                       const QString& info,
+                       const QString& creator,
+                       bool shared,
+                       const QList< Tomahawk::plentry_ptr >& entries = QList< Tomahawk::plentry_ptr >() );
+
+    QList< plentry_ptr > newEntries( const QList< plentry_ptr >& entries );
+    PlaylistRevision setNewRevision( const QString& rev,
+                                     const QList<QString>& neworderedguids,
+                                     const QList<QString>& oldorderedguids,
+                                     bool is_newest_rev,
+                                     const QMap< QString, Tomahawk::plentry_ptr >& addedmap );
+
+
+private slots:
+    void onResultsFound( const QList<Tomahawk::result_ptr>& results );
+    void onResolvingFinished();
+
+private:
+    Playlist();
+    void init();
+
+    void setBusy( bool b );
+    void checkRevisionQueue();
+
+    source_ptr m_source;
+    QString m_currentrevision;
+    QString m_guid, m_title, m_info, m_creator;
+    unsigned int m_lastmodified;
+    unsigned int m_createdOn;
+    bool m_shared;
+
+    QList< plentry_ptr > m_initEntries;
+    QList< plentry_ptr > m_entries;
+
+    QQueue<RevisionQueueItem> m_revisionQueue;
+    QQueue<RevisionQueueItem> m_updateQueue;
+
+    QList<PlaylistUpdaterInterface*> m_updaters;
+
+    bool m_locallyChanged;
+    bool m_deleted;
+    bool m_busy;
+
+    Tomahawk::playlistinterface_ptr m_playlistInterface;
+};
+
+}
+
+Q_DECLARE_METATYPE( QSharedPointer< Tomahawk::Playlist > )
+Q_DECLARE_METATYPE( QList< QSharedPointer< Tomahawk::PlaylistEntry > > )
+
+#endif // PLAYLIST_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/PlaylistInterface.cpp Added

@@ -0,0 +1,91 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "PlaylistInterface.h"
+#include "utils/Logger.h"
+#include "Result.h"
+#include "Pipeline.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+
+
+PlaylistInterface::PlaylistInterface ()
+    : QObject()
+    , m_latchMode( PlaylistModes::StayOnSong )
+    , m_finished( false )
+{
+    m_id = uuid();
+}
+
+
+PlaylistInterface::~PlaylistInterface()
+{
+}
+
+
+result_ptr
+PlaylistInterface::previousItem()
+{
+     return siblingItem( -1 );
+}
+
+
+result_ptr
+PlaylistInterface::nextItem()
+{
+     return siblingItem( 1 );
+}
+
+
+QList<Tomahawk::query_ptr>
+PlaylistInterface::filterTracks( const QList<Tomahawk::query_ptr>& queries )
+{
+    QList<Tomahawk::query_ptr> result;
+
+    for ( int i = 0; i < queries.count(); i++ )
+    {
+        bool picked = true;
+        const query_ptr q1 = queries.at( i );
+
+        for ( int j = 0; j < result.count(); j++ )
+        {
+            if ( !picked )
+                break;
+
+            const query_ptr& q2 = result.at( j );
+
+            if ( q1->track() == q2->track() )
+            {
+                picked = false;
+            }
+        }
+
+        if ( picked )
+        {
+            query_ptr q = Query::get( q1->artist(), q1->track(), q1->album(), uuid(), false );
+            q->setAlbumPos( q1->results().first()->albumpos() );
+            q->setDiscNumber( q1->discnumber() );
+            result << q;
+        }
+    }
+
+    Pipeline::instance()->resolve( result );
+    return result;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/PlaylistInterface.h Added

@@ -0,0 +1,109 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 PLAYLISTINTERFACE_H
+#define PLAYLISTINTERFACE_H
+
+#include <QtCore/QModelIndex>
+
+#include "Typedefs.h"
+#include "DllMacro.h"
+#include "utils/Logger.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT PlaylistInterface : public QObject
+{
+Q_OBJECT
+
+public:
+    explicit PlaylistInterface();
+    virtual ~PlaylistInterface();
+
+    const QString id() { return m_id; }
+
+    virtual QList< Tomahawk::query_ptr > tracks() = 0;
+    virtual bool isFinished() const { return m_finished; }
+
+    virtual int unfilteredTrackCount() const = 0;
+    virtual int trackCount() const = 0;
+
+    virtual Tomahawk::result_ptr currentItem() const = 0;
+    virtual Tomahawk::result_ptr previousItem();
+    virtual bool hasNextItem() { return true; }
+    virtual Tomahawk::result_ptr nextItem();
+    virtual Tomahawk::result_ptr siblingItem( int itemsAway ) = 0;
+
+    virtual PlaylistModes::RepeatMode repeatMode() const = 0;
+
+    virtual bool shuffled() const = 0;
+
+    virtual PlaylistModes::ViewMode viewMode() const { return PlaylistModes::Unknown; }
+
+    virtual PlaylistModes::SeekRestrictions seekRestrictions() const { return PlaylistModes::NoSeekRestrictions; }
+    virtual PlaylistModes::SkipRestrictions skipRestrictions() const { return PlaylistModes::NoSkipRestrictions; }
+
+    virtual PlaylistModes::RetryMode retryMode() const { return PlaylistModes::NoRetry; }
+    virtual quint32 retryInterval() const { return 30000; }
+
+    virtual PlaylistModes::LatchMode latchMode() const { return m_latchMode; }
+    virtual void setLatchMode( PlaylistModes::LatchMode latchMode ) { m_latchMode = latchMode; }
+
+    virtual QString filter() const { return m_filter; }
+    virtual void setFilter( const QString& pattern ) { m_filter = pattern; }
+
+    virtual void reset() {}
+
+    //TODO: Get rid of the next two functions once all playlsitinterfaces are factored out
+    // Some playlist interfaces can wrap other interfaces. When checking for top-level
+    // equality (say, to compare the currently playing interface) this might be needed
+    virtual bool hasChildInterface( Tomahawk::playlistinterface_ptr ) { return false; }
+
+public slots:
+    virtual void setRepeatMode( PlaylistModes::RepeatMode mode ) = 0;
+    virtual void setShuffled( bool enabled ) = 0;
+
+signals:
+    void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode );
+    void shuffleModeChanged( bool enabled );
+    void trackCountChanged( unsigned int tracks );
+    void sourceTrackCountChanged( unsigned int tracks );
+    void latchModeChanged( Tomahawk::PlaylistModes::LatchMode mode );
+    void nextTrackReady();
+
+protected:
+    virtual QList<Tomahawk::query_ptr> filterTracks( const QList<Tomahawk::query_ptr>& queries );
+
+    PlaylistModes::LatchMode m_latchMode;
+    bool m_finished;
+
+private:
+    Q_DISABLE_COPY( PlaylistInterface )
+
+private:
+    QString m_id;
+    QString m_filter;
+};
+
+}
+
+Q_DECLARE_METATYPE( Tomahawk::playlistinterface_ptr )
+
+#endif // PLAYLISTINTERFACE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/PlaylistPlaylistInterface.cpp Added

@@ -0,0 +1,65 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "PlaylistPlaylistInterface.h"
+
+#include "Playlist.h"
+#include "SourceList.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+PlaylistPlaylistInterface::PlaylistPlaylistInterface( Tomahawk::Playlist* playlist )
+    : Tomahawk::PlaylistInterface()
+    , m_playlist( playlist )
+{
+}
+
+
+PlaylistPlaylistInterface::~PlaylistPlaylistInterface()
+{
+    m_playlist.clear();
+}
+
+
+int
+PlaylistPlaylistInterface::unfilteredTrackCount() const
+{
+    return ( m_playlist.isNull() ? 0 : m_playlist.data()->entries().count() );
+}
+
+
+int
+PlaylistPlaylistInterface::trackCount() const
+{
+    return ( m_playlist.isNull() ? 0 : m_playlist.data()->entries().count() );
+}
+
+
+QList< Tomahawk::query_ptr >
+PlaylistPlaylistInterface::tracks()
+{
+    QList<Tomahawk::query_ptr> queries;
+    foreach( const plentry_ptr& p, ( m_playlist.isNull() ? QList< Tomahawk::plentry_ptr >() : m_playlist.data()->entries() ) )
+        queries << p->query();
+
+    return queries;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/PlaylistPlaylistInterface.h Added

@@ -0,0 +1,75 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 PLAYLISTPLAYLISTINTERFACE_H
+#define PLAYLISTPLAYLISTINTERFACE_H
+
+#include <QObject>
+#include <QList>
+#include <QSharedPointer>
+
+#include "Typedefs.h"
+#include "Result.h"
+#include "PlaylistInterface.h"
+#include "Query.h"
+
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT PlaylistPlaylistInterface : public Tomahawk::PlaylistInterface
+{
+Q_OBJECT
+
+public:
+    PlaylistPlaylistInterface( Tomahawk::Playlist* playlist );
+    virtual ~PlaylistPlaylistInterface();
+
+    virtual QList<Tomahawk::query_ptr> tracks();
+
+    virtual int unfilteredTrackCount() const;
+    virtual int trackCount() const;
+
+    virtual bool hasNextItem() { return false; }
+    virtual Tomahawk::result_ptr currentItem() const { return m_currentItem; }
+
+    virtual Tomahawk::result_ptr siblingItem( int /*itemsAway*/ ) { return result_ptr(); }
+
+    virtual PlaylistModes::RepeatMode repeatMode() const { return PlaylistModes::NoRepeat; }
+    virtual bool shuffled() const { return false; }
+
+    virtual void setFilter( const QString& /*pattern*/ ) {}
+
+public slots:
+    virtual void setRepeatMode( PlaylistModes::RepeatMode ) {}
+    virtual void setShuffled( bool ) {}
+
+private:
+    PlaylistPlaylistInterface();
+    Q_DISABLE_COPY( PlaylistPlaylistInterface )
+
+    QWeakPointer< Tomahawk::Playlist > m_playlist;
+
+    result_ptr m_currentItem;
+};
+
+}
+
+#endif // PLAYLISTPLAYLISTINTERFACE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Query.cpp Added

@@ -0,0 +1,934 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "Query.h"
+
+#include <QtAlgorithms>
+
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "database/DatabaseCommand_LogPlayback.h"
+#include "database/DatabaseCommand_LoadPlaylistEntries.h"
+#include "database/DatabaseCommand_LoadSocialActions.h"
+#include "database/DatabaseCommand_SocialAction.h"
+#include "database/DatabaseCommand_TrackStats.h"
+#include "Album.h"
+#include "Collection.h"
+#include "Pipeline.h"
+#include "Resolver.h"
+#include "SourceList.h"
+#include "audio/AudioEngine.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+SocialAction::SocialAction() {}
+SocialAction::~SocialAction() {}
+
+SocialAction& SocialAction::operator=( const SocialAction& other )
+{
+    action = other.action;
+    value = other.value;
+    timestamp = other.timestamp;
+    source = other.source;
+
+    return *this;
+}
+
+
+SocialAction::SocialAction( const SocialAction& other )
+{
+    *this = other;
+}
+
+
+PlaybackLog::PlaybackLog() {}
+PlaybackLog::~PlaybackLog() {}
+
+PlaybackLog& PlaybackLog::operator=( const PlaybackLog& other )
+{
+    source = other.source;
+    timestamp = other.timestamp;
+    secsPlayed = other.secsPlayed;
+
+    return *this;
+}
+
+
+PlaybackLog::PlaybackLog( const PlaybackLog& other )
+{
+    *this = other;
+}
+
+
+query_ptr
+Query::get( const QString& artist, const QString& track, const QString& album, const QID& qid, bool autoResolve )
+{
+    if (  artist.trimmed().isEmpty() || track.trimmed().isEmpty() )
+        return query_ptr();
+
+    if ( qid.isEmpty() )
+        autoResolve = false;
+
+    query_ptr q = query_ptr( new Query( artist, track, album, qid, autoResolve ), &QObject::deleteLater );
+    q->setWeakRef( q.toWeakRef() );
+
+    if ( autoResolve )
+        Pipeline::instance()->resolve( q );
+
+    return q;
+}
+
+
+query_ptr
+Query::get( const QString& query, const QID& qid )
+{
+    Q_ASSERT( !query.trimmed().isEmpty() );
+
+    query_ptr q = query_ptr( new Query( query, qid ), &QObject::deleteLater );
+    q->setWeakRef( q.toWeakRef() );
+
+    if ( !qid.isEmpty() )
+        Pipeline::instance()->resolve( q );
+
+    return q;
+}
+
+
+Query::Query( const QString& artist, const QString& track, const QString& album, const QID& qid, bool autoResolve )
+    : m_qid( qid )
+    , m_artist( artist )
+    , m_album( album )
+    , m_track( track )
+    , m_socialActionsLoaded( false )
+    , m_simTracksLoaded( false )
+    , m_lyricsLoaded( false )
+    , m_infoJobs( 0 )
+{
+    init();
+
+    if ( autoResolve )
+    {
+        connect( Database::instance(), SIGNAL( indexReady() ), SLOT( refreshResults() ), Qt::QueuedConnection );
+    }
+
+    connect( Pipeline::instance(), SIGNAL( resolverAdded( Tomahawk::Resolver* ) ), SLOT( onResolverAdded() ), Qt::QueuedConnection );
+}
+
+
+Query::Query( const QString& query, const QID& qid )
+    : m_qid( qid )
+    , m_fullTextQuery( query )
+{
+    init();
+
+    if ( !qid.isEmpty() )
+    {
+        connect( Database::instance(), SIGNAL( indexReady() ), SLOT( refreshResults() ), Qt::QueuedConnection );
+    }
+}
+
+
+Query::~Query()
+{
+    QMutexLocker lock( &m_mutex );
+    m_ownRef.clear();
+    m_results.clear();
+}
+
+
+void
+Query::init()
+{
+    m_resolveFinished = false;
+    m_solved = false;
+    m_playable = false;
+    m_duration = -1;
+    m_albumpos = 0;
+    m_discnumber = 0;
+
+    updateSortNames();
+}
+
+
+void
+Query::updateSortNames()
+{
+    if ( isFullTextQuery() )
+    {
+        m_artistSortname = DatabaseImpl::sortname( m_fullTextQuery, true );
+        m_composerSortname = DatabaseImpl::sortname( m_composer, true );
+        m_albumSortname = DatabaseImpl::sortname( m_fullTextQuery );
+        m_trackSortname = m_albumSortname;
+    }
+    else
+    {
+        m_artistSortname = DatabaseImpl::sortname( m_artist, true );
+        m_composerSortname = DatabaseImpl::sortname( m_composer, true );
+        m_albumSortname = DatabaseImpl::sortname( m_album );
+        m_trackSortname = DatabaseImpl::sortname( m_track );
+    }
+}
+
+
+query_ptr
+Query::displayQuery() const
+{
+    if ( !results().isEmpty() )
+        return results().first()->toQuery();
+
+    return m_ownRef.toStrongRef();
+}
+
+
+void
+Query::addResults( const QList< Tomahawk::result_ptr >& newresults )
+{
+    {
+        QMutexLocker lock( &m_mutex );
+
+/*        const QStringList smt = AudioEngine::instance()->supportedMimeTypes();
+        foreach ( const Tomahawk::result_ptr& result, newresults )
+        {
+            if ( !smt.contains( result->mimetype() ) )
+            {
+                tDebug() << "Won't accept result, unsupported mimetype" << result->toString() << result->mimetype();
+            }
+            else
+                m_results.append( result );
+        }*/
+
+        m_results << newresults;
+        qStableSort( m_results.begin(), m_results.end(), Query::resultSorter );
+
+        // hook up signals, and check solved status
+        foreach( const result_ptr& rp, newresults )
+        {
+            connect( rp.data(), SIGNAL( statusChanged() ), SLOT( onResultStatusChanged() ) );
+        }
+    }
+
+    checkResults();
+    emit resultsAdded( newresults );
+    emit resultsChanged();
+}
+
+
+void
+Query::addAlbums( const QList< Tomahawk::album_ptr >& newalbums )
+{
+    {
+        QMutexLocker lock( &m_mutex );
+        m_albums << newalbums;
+    }
+
+    emit albumsAdded( newalbums );
+}
+
+
+void
+Query::addArtists( const QList< Tomahawk::artist_ptr >& newartists )
+{
+    {
+        QMutexLocker lock( &m_mutex );
+        m_artists << newartists;
+    }
+
+    emit artistsAdded( newartists );
+}
+
+
+void
+Query::refreshResults()
+{
+    if ( m_resolveFinished )
+    {
+        m_resolveFinished = false;
+        query_ptr q = m_ownRef.toStrongRef();
+        if ( q )
+            Pipeline::instance()->resolve( q );
+    }
+}
+
+
+void
+Query::onResultStatusChanged()
+{
+    {
+        QMutexLocker lock( &m_mutex );
+        if ( m_results.count() )
+            qStableSort( m_results.begin(), m_results.end(), Query::resultSorter );
+    }
+
+    checkResults();
+    emit resultsChanged();
+}
+
+
+void
+Query::removeResult( const Tomahawk::result_ptr& result )
+{
+    {
+        QMutexLocker lock( &m_mutex );
+        m_results.removeAll( result );
+    }
+
+    emit resultsRemoved( result );
+    checkResults();
+    emit resultsChanged();
+}
+
+
+void
+Query::onResolvingFinished()
+{
+    tDebug( LOGVERBOSE ) << "Finished resolving:" << toString();
+    if ( !m_resolveFinished )
+    {
+        m_resolveFinished = true;
+        m_resolvers.clear();
+
+        emit resolvingFinished( m_solved );
+    }
+}
+
+
+void
+Query::onResolverAdded()
+{
+    if ( !solved() )
+    {
+        refreshResults();
+    }
+}
+
+
+QList< result_ptr >
+Query::results() const
+{
+    QMutexLocker lock( &m_mutex );
+    return m_results;
+}
+
+
+unsigned int
+Query::numResults() const
+{
+    QMutexLocker lock( &m_mutex );
+    return m_results.length();
+}
+
+
+QID
+Query::id() const
+{
+    if ( m_qid.isEmpty() )
+    {
+        m_qid = uuid();
+    }
+
+    return m_qid;
+}
+
+
+void
+Query::setPlayedBy( const Tomahawk::source_ptr& source, unsigned int playtime )
+{
+    m_playedBy.first = source;
+    m_playedBy.second = playtime;
+}
+
+
+bool
+Query::resultSorter( const result_ptr& left, const result_ptr& right )
+{
+    const float ls = left->score();
+    const float rs = right->score();
+
+    if ( ls == rs )
+    {
+        if ( !left->collection().isNull() && left->collection()->source()->isLocal() )
+            return true;
+        else
+            return false;
+    }
+
+    return ls > rs;
+}
+
+
+void
+Query::setCurrentResolver( Tomahawk::Resolver* resolver )
+{
+    m_resolvers << resolver;
+}
+
+
+Tomahawk::Resolver*
+Query::currentResolver() const
+{
+    int x = m_resolvers.count();
+    while ( --x )
+    {
+        QWeakPointer< Resolver > r = m_resolvers.at( x );
+        if ( r.isNull() )
+            continue;
+
+        return r.data();
+    }
+
+    return 0;
+}
+
+
+void
+Query::clearResults()
+{
+    foreach( const result_ptr& rp, m_results )
+    {
+        removeResult( rp );
+    }
+}
+
+
+void
+Query::checkResults()
+{
+    bool playable = false;
+    bool solved = false;
+
+    {
+        QMutexLocker lock( &m_mutex );
+
+        // hook up signals, and check solved status
+        foreach( const result_ptr& rp, m_results )
+        {
+            if ( rp->score() > 0.0 && rp->collection().isNull() )
+            {
+                playable = true;
+            }
+            else if ( !rp->collection().isNull() && rp->collection()->source()->isOnline() )
+            {
+                playable = true;
+            }
+
+            if ( rp->score() > 0.99 )
+            {
+                solved = true;
+            }
+
+            if ( playable )
+                break;
+        }
+    }
+
+    if ( m_solved && !solved )
+    {
+        refreshResults();
+    }
+
+    if ( m_playable != playable )
+    {
+        m_playable = playable;
+        emit playableStateChanged( m_playable );
+    }
+    if ( m_solved != solved )
+    {
+        m_solved = solved;
+        emit solvedStateChanged( m_solved );
+    }
+}
+
+
+bool
+Query::equals( const Tomahawk::query_ptr& other ) const
+{
+    if ( other.isNull() )
+        return false;
+
+    return ( artist() == other->artist() &&
+             album() == other->album() &&
+             track() == other->track() );
+}
+
+
+QVariant
+Query::toVariant() const
+{
+    QVariantMap m;
+    m.insert( "artist", artist() );
+    m.insert( "album", album() );
+    m.insert( "track", track() );
+    m.insert( "duration", duration() );
+    m.insert( "qid", id() );
+
+    return m;
+}
+
+
+QString
+Query::toString() const
+{
+    if ( !isFullTextQuery() )
+        return QString( "Query(%1, %2 - %3)" ).arg( id() ).arg( artist() ).arg( track() );
+    else
+        return QString( "Query(%1, Fulltext: %2)" ).arg( id() ).arg( fullTextQuery() );
+}
+
+
+// TODO make clever (ft. featuring live (stuff) etc)
+float
+Query::howSimilar( const Tomahawk::result_ptr& r )
+{
+    Q_ASSERT( !r->artist().isNull() );
+    Q_ASSERT( !r->album().isNull() );
+    if ( r->artist().isNull() || r->album().isNull() )
+        return 0.0;
+    
+    // result values
+    const QString rArtistname = r->artist()->sortname();
+    const QString rAlbumname  = r->album()->sortname();
+    const QString rTrackname  = DatabaseImpl::sortname( r->track() );
+
+    // normal edit distance
+    int artdist = TomahawkUtils::levenshtein( m_artistSortname, rArtistname );
+    int albdist = TomahawkUtils::levenshtein( m_albumSortname, rAlbumname );
+    int trkdist = TomahawkUtils::levenshtein( m_trackSortname, rTrackname );
+
+    // max length of name
+    int mlart = qMax( m_artistSortname.length(), rArtistname.length() );
+    int mlalb = qMax( m_albumSortname.length(), rAlbumname.length() );
+    int mltrk = qMax( m_trackSortname.length(), rTrackname.length() );
+
+    // distance scores
+    float dcart = (float)( mlart - artdist ) / mlart;
+    float dcalb = (float)( mlalb - albdist ) / mlalb;
+    float dctrk = (float)( mltrk - trkdist ) / mltrk;
+
+    if ( isFullTextQuery() )
+    {
+        const QString artistTrackname = DatabaseImpl::sortname( fullTextQuery() );
+        const QString rArtistTrackname  = DatabaseImpl::sortname( r->artist()->name() + " " + r->track() );
+
+        int atrdist = TomahawkUtils::levenshtein( artistTrackname, rArtistTrackname );
+        int mlatr = qMax( artistTrackname.length(), rArtistTrackname.length() );
+        float dcatr = (float)( mlatr - atrdist ) / mlatr;
+
+        float res = qMax( dcart, dcalb );
+        res = qMax( res, dcatr );
+        return qMax( res, dctrk );
+    }
+    else
+    {
+        // don't penalize for missing album name
+        if ( m_albumSortname.isEmpty() )
+            dcalb = 1.0;
+
+        // weighted, so album match is worth less than track title
+        float combined = ( dcart * 4 + dcalb + dctrk * 5 ) / 10;
+        return combined;
+    }
+}
+
+
+QPair< Tomahawk::source_ptr, unsigned int >
+Query::playedBy() const
+{
+    return m_playedBy;
+}
+
+
+void
+Query::loadStats()
+{
+    query_ptr q = m_ownRef.toStrongRef();
+
+    DatabaseCommand_TrackStats* cmd = new DatabaseCommand_TrackStats( q );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+}
+
+
+QList< Tomahawk::PlaybackLog >
+Query::playbackHistory( const Tomahawk::source_ptr& source ) const
+{
+    QList< Tomahawk::PlaybackLog > history;
+
+    foreach ( const PlaybackLog& log, m_playbackHistory )
+    {
+        if ( source.isNull() || log.source == source )
+        {
+            history << log;
+        }
+    }
+
+    return history;
+}
+
+
+void
+Query::setPlaybackHistory( const QList< Tomahawk::PlaybackLog >& playbackData )
+{
+    m_playbackHistory = playbackData;
+    emit statsLoaded();
+}
+
+
+unsigned int
+Query::playbackCount( const source_ptr& source )
+{
+    unsigned int count = 0;
+    foreach ( const PlaybackLog& log, m_playbackHistory )
+    {
+        if ( source.isNull() || log.source == source )
+            count++;
+    }
+
+    return count;
+}
+
+
+void
+Query::loadSocialActions()
+{
+    if ( m_socialActionsLoaded )
+        return;
+
+    m_socialActionsLoaded = true;
+    query_ptr q = m_ownRef.toStrongRef();
+
+    DatabaseCommand_LoadSocialActions* cmd = new DatabaseCommand_LoadSocialActions( q );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+}
+
+
+void
+Query::setAllSocialActions( const QList< SocialAction >& socialActions )
+{
+    m_allSocialActions = socialActions;
+    parseSocialActions();
+
+    emit socialActionsLoaded();
+}
+
+
+QList< SocialAction >
+Query::allSocialActions() const
+{
+    return m_allSocialActions;
+}
+
+
+void
+Query::parseSocialActions()
+{
+    QListIterator< Tomahawk::SocialAction > it( m_allSocialActions );
+    unsigned int highestTimestamp = 0;
+
+    while ( it.hasNext() )
+    {
+        Tomahawk::SocialAction socialAction;
+        socialAction = it.next();
+        if ( socialAction.timestamp.toUInt() > highestTimestamp && socialAction.source->isLocal() )
+        {
+            m_currentSocialActions socialAction.action.toString()  = socialAction.value.toBool();
+        }
+    }
+}
+
+
+bool
+Query::loved()
+{
+    if ( m_socialActionsLoaded )
+    {
+        return m_currentSocialActions "Love" .toBool();
+    }
+    else
+    {
+        loadSocialActions();
+    }
+
+    return false;
+}
+
+
+void
+Query::setLoved( bool loved )
+{
+    query_ptr q = m_ownRef.toStrongRef();
+    if ( q )
+    {
+        m_currentSocialActions "Love"  = loved;
+
+        QVariantMap loveInfo;
+        Tomahawk::InfoSystem::InfoStringHash trackInfo;
+        trackInfo"title" = track();
+        trackInfo"artist" = artist();
+        trackInfo"album" = album();
+
+        loveInfo "trackinfo"  = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
+
+        Tomahawk::InfoSystem::InfoPushData pushData ( id(),
+                                                      ( loved ? Tomahawk::InfoSystem::InfoLove : Tomahawk::InfoSystem::InfoUnLove ),
+                                                      loveInfo,
+                                                      Tomahawk::InfoSystem::PushShortUrlFlag );
+
+        Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
+
+        DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction( q, QString( "Love" ), loved ? QString( "true" ) : QString( "false" ) );
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+
+        emit socialActionsLoaded();
+    }
+}
+
+
+QString
+Query::socialActionDescription( const QString& action, DescriptionMode mode ) const
+{
+    QString desc;
+    QList< Tomahawk::SocialAction > socialActions = allSocialActions();
+
+    QStringList actionSources;
+    int loveTotal = 0;
+    foreach ( const Tomahawk::SocialAction& sa, socialActions )
+    {
+        if ( sa.action == action )
+        {
+            if ( actionSources.contains( sa.source->friendlyName() ) )
+                continue;
+            actionSources << sa.source->friendlyName();
+            loveTotal++;
+        }
+    }
+
+    actionSources.clear();
+    int loveCounter = 0;
+    foreach ( const Tomahawk::SocialAction& sa, socialActions )
+    {
+        if ( sa.action == action )
+        {
+            if ( actionSources.contains( sa.source->friendlyName() ) )
+                continue;
+            actionSources << sa.source->friendlyName();
+
+            if ( ++loveCounter > 3 )
+                continue;
+            else if ( loveCounter > 1 )
+            {
+                if ( loveCounter == loveTotal )
+                    desc += tr( " and " );
+                else
+                    desc += ", ";
+            }
+
+            if ( sa.source->isLocal() )
+            {
+                if ( loveCounter == 1 )
+                    desc += "<b>" + tr( "You" ) + "</b>";
+                else
+                    desc += "<b>" + tr( "you" ) + "</b>";
+            }
+            else
+                desc += "<b>" + sa.source->friendlyName() + "</b>";
+        }
+    }
+    if ( loveCounter > 0 )
+    {
+        if ( loveCounter > 3 )
+            desc += " " + tr( "and" ) + " <b>" + tr( "%n other(s)", "", loveCounter - 3 ) + "</b>";
+
+        if ( mode == Short )
+            desc = "<b>" + tr( "%1 people" ).arg( loveCounter ) + "</b>";
+
+        desc += " " + tr( "loved this track" ); //FIXME: more action descs required
+    }
+
+    return desc;
+}
+
+
+#ifndef ENABLE_HEADLESS
+QPixmap
+Query::cover( const QSize& size, bool forceLoad ) const
+{
+    if ( m_albumPtr.isNull() )
+    {
+        m_artistPtr = Artist::get( artist(), false );
+        m_albumPtr = Album::get( m_artistPtr, album(), false );
+        connect( m_artistPtr.data(), SIGNAL( updated() ), SIGNAL( updated() ), Qt::UniqueConnection );
+        connect( m_artistPtr.data(), SIGNAL( coverChanged() ), SIGNAL( coverChanged() ), Qt::UniqueConnection );
+        connect( m_albumPtr.data(), SIGNAL( updated() ), SIGNAL( updated() ), Qt::UniqueConnection );
+        connect( m_albumPtr.data(), SIGNAL( coverChanged() ), SIGNAL( coverChanged() ), Qt::UniqueConnection );
+    }
+
+    m_albumPtr->cover( size, forceLoad );
+    if ( m_albumPtr->coverLoaded() )
+    {
+        if ( !m_albumPtr->cover( size ).isNull() )
+            return m_albumPtr->cover( size );
+
+        return m_artistPtr->cover( size, forceLoad );
+    }
+
+    return QPixmap();
+}
+
+
+bool
+Query::coverLoaded() const
+{
+    if ( m_albumPtr.isNull() )
+        return false;
+
+    if ( m_albumPtr->coverLoaded() && !m_albumPtr->cover( QSize( 0, 0 ) ).isNull() )
+        return true;
+
+    return m_artistPtr->coverLoaded();
+}
+
+#endif
+
+
+QList<Tomahawk::query_ptr>
+Query::similarTracks() const
+{
+    if ( !m_simTracksLoaded )
+    {
+        Tomahawk::InfoSystem::InfoStringHash trackInfo;
+        trackInfo"artist" = artist();
+        trackInfo"track" = track();
+
+        Tomahawk::InfoSystem::InfoRequestData requestData;
+        requestData.caller = id();
+        requestData.customData = QVariantMap();
+
+        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
+        requestData.type = Tomahawk::InfoSystem::InfoTrackSimilars;
+        requestData.requestId = TomahawkUtils::infosystemRequestId();
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                 SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                 SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                 SIGNAL( finished( QString ) ),
+                 SLOT( infoSystemFinished( QString ) ), Qt::UniqueConnection );
+
+        m_infoJobs++;
+        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+    }
+
+    return m_similarTracks;
+}
+
+
+QStringList
+Query::lyrics() const
+{
+    if ( !m_lyricsLoaded )
+    {
+        Tomahawk::InfoSystem::InfoStringHash trackInfo;
+        trackInfo"artist" = artist();
+        trackInfo"track" = track();
+
+        Tomahawk::InfoSystem::InfoRequestData requestData;
+        requestData.caller = id();
+        requestData.customData = QVariantMap();
+
+        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
+        requestData.type = Tomahawk::InfoSystem::InfoTrackLyrics;
+        requestData.requestId = TomahawkUtils::infosystemRequestId();
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                 SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                 SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
+
+        connect( Tomahawk::InfoSystem::InfoSystem::instance(),
+                 SIGNAL( finished( QString ) ),
+                 SLOT( infoSystemFinished( QString ) ), Qt::UniqueConnection );
+
+        m_infoJobs++;
+        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+    }
+
+    return m_lyrics;
+}
+
+
+void
+Query::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
+{
+    if ( requestData.caller != id() )
+        return;
+
+    QVariantMap returnedData = output.value< QVariantMap >();
+    switch ( requestData.type )
+    {
+        case InfoSystem::InfoTrackLyrics:
+        {
+            m_lyrics = output.value< QVariant >().toString().split( "\n" );
+
+            m_lyricsLoaded = true;
+            emit lyricsLoaded();
+            break;
+        }
+
+        case InfoSystem::InfoTrackSimilars:
+        {
+            const QStringList artists = returnedData"artists".toStringList();
+            const QStringList tracks = returnedData"tracks".toStringList();
+
+            for ( int i = 0; i < tracks.count() && i < 50; i++ )
+            {
+                m_similarTracks << Query::get( artists.at( i ), tracks.at( i ), QString(), uuid(), false );
+            }
+            Pipeline::instance()->resolve( m_similarTracks );
+
+            m_simTracksLoaded = true;
+            emit similarTracksLoaded();
+
+            break;
+        }
+
+        default:
+            Q_ASSERT( false );
+    }
+}
+
+
+void
+Query::infoSystemFinished( QString target )
+{
+    if ( target != id() )
+        return;
+
+    if ( --m_infoJobs == 0 )
+    {
+        disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+                    this, SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
+
+        disconnect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ),
+                    this, SLOT( infoSystemFinished( QString ) ) );
+    }
+
+    emit updated();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Query.h Added

@@ -0,0 +1,280 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 QUERY_H
+#define QUERY_H
+
+#include <QObject>
+#include <QMutex>
+#include <QList>
+#include <QVariant>
+
+#include "Typedefs.h"
+#include "Result.h"
+#include "infosystem/InfoSystem.h"
+
+#include "DllMacro.h"
+
+class DatabaseCommand_LogPlayback;
+class DatabaseCommand_PlaybackHistory;
+class DatabaseCommand_LoadPlaylistEntries;
+
+namespace Tomahawk
+{
+
+class Resolver;
+
+struct SocialAction
+{
+    QVariant action;
+    QVariant value;
+    QVariant timestamp;
+    Tomahawk::source_ptr source;
+
+    // Make explicit so compiler won't auto-generate, since destructor of
+    // source_ptr is not defined yet (only typedef included in header)
+    SocialAction();
+    ~SocialAction();
+    SocialAction& operator=( const SocialAction& other );
+    SocialAction( const SocialAction& other );
+};
+
+struct PlaybackLog
+{
+    Tomahawk::source_ptr source;
+    unsigned int timestamp;
+    unsigned int secsPlayed;
+
+    // Make explicit so compiler won't auto-generate, since destructor of
+    // source_ptr is not defined yet (only typedef included in header)
+    PlaybackLog();
+    ~PlaybackLog();
+    PlaybackLog& operator=( const PlaybackLog& other );
+    PlaybackLog( const PlaybackLog& other );
+};
+
+
+class DLLEXPORT Query : public QObject
+{
+Q_OBJECT
+
+friend class ::DatabaseCommand_LogPlayback;
+friend class ::DatabaseCommand_PlaybackHistory;
+friend class ::DatabaseCommand_LoadPlaylistEntries;
+friend class Pipeline;
+
+public:
+    enum DescriptionMode
+    { Detailed = 0, Short = 1 };
+
+    static query_ptr get( const QString& artist, const QString& track, const QString& album, const QID& qid = QString(), bool autoResolve = true );
+    static query_ptr get( const QString& query, const QID& qid );
+
+    virtual ~Query();
+
+    /// returns list of all results so far
+    QList< result_ptr > results() const;
+
+    /// how many results found so far?
+    unsigned int numResults() const;
+
+    QID id() const;
+
+    /// sorter for list of results
+    static bool resultSorter( const result_ptr& left, const result_ptr& right );
+
+    /// true when a perfect result has been found (score of 1.0)
+    bool solved() const { return m_solved; }
+    /// true when any result has been found (score may be less than 1.0)
+    bool playable() const { return m_playable; }
+
+    QString fullTextQuery() const { return m_fullTextQuery; }
+    bool isFullTextQuery() const { return !m_fullTextQuery.isEmpty(); }
+    bool resolvingFinished() const { return m_resolveFinished; }
+    float howSimilar( const Tomahawk::result_ptr& r );
+
+    QPair< Tomahawk::source_ptr, unsigned int > playedBy() const;
+    Tomahawk::Resolver* currentResolver() const;
+    QList< QWeakPointer< Tomahawk::Resolver > > resolvedBy() const { return m_resolvers; }
+
+    void setArtist( const QString& artist ) { m_artist = artist; updateSortNames(); }
+    void setComposer( const QString& composer ) { m_composer = composer; updateSortNames(); }
+    void setAlbum( const QString& album ) { m_album = album; updateSortNames(); }
+    void setTrack( const QString& track ) { m_track = track; updateSortNames(); }
+    void setResultHint( const QString& resultHint ) { m_resultHint = resultHint; }
+    void setDuration( int duration ) { m_duration = duration; }
+    void setAlbumPos( unsigned int albumpos ) { m_albumpos = albumpos; }
+    void setDiscNumber( unsigned int discnumber ) { m_discnumber = discnumber; }
+
+    bool equals( const Tomahawk::query_ptr& other ) const;
+
+    QVariant toVariant() const;
+    QString toString() const;
+
+    QString resultHint() const { return m_resultHint; }
+    QString artistSortname() const { return m_artistSortname; }
+    QString composerSortname() const { return m_composerSortname; }
+    QString albumSortname() const { return m_albumSortname; }
+    QString trackSortname() const { return m_trackSortname; }
+
+    QString artist() const { return m_artist; }
+    QString composer() const { return m_composer; }
+    QString album() const { return m_album; }
+    QString track() const { return m_track; }
+    int duration() const { return m_duration; }
+    unsigned int albumpos() const { return m_albumpos; }
+    unsigned int discnumber() const { return m_discnumber; }
+
+    query_ptr displayQuery() const;
+
+#ifndef ENABLE_HEADLESS
+    QPixmap cover( const QSize& size, bool forceLoad = true ) const;
+#endif
+    bool coverLoaded() const;
+
+    void setResolveFinished( bool resolved ) { m_resolveFinished = resolved; }
+    void setPlayedBy( const Tomahawk::source_ptr& source, unsigned int playtime );
+
+    void setLoved( bool loved );
+    bool loved();
+
+    void loadStats();
+    QList< Tomahawk::PlaybackLog > playbackHistory( const Tomahawk::source_ptr& source = Tomahawk::source_ptr() ) const;
+    void setPlaybackHistory( const QList< Tomahawk::PlaybackLog >& playbackData );
+    unsigned int playbackCount( const Tomahawk::source_ptr& source = Tomahawk::source_ptr() );
+
+    void loadSocialActions();
+    QList< Tomahawk::SocialAction > allSocialActions() const;
+    void setAllSocialActions( const QList< Tomahawk::SocialAction >& socialActions );
+    QString socialActionDescription( const QString& action, DescriptionMode mode ) const;
+
+    QList<Tomahawk::query_ptr> similarTracks() const;
+    QStringList lyrics() const;
+
+    QWeakPointer< Tomahawk::Query > weakRef() { return m_ownRef; }
+    void setWeakRef( QWeakPointer< Tomahawk::Query > weakRef ) { m_ownRef = weakRef; }
+
+signals:
+    void resultsAdded( const QList<Tomahawk::result_ptr>& );
+    void resultsRemoved( const Tomahawk::result_ptr& );
+
+    void albumsAdded( const QList<Tomahawk::album_ptr>& );
+    void artistsAdded( const QList<Tomahawk::artist_ptr>& );
+
+    void resultsChanged();
+    void solvedStateChanged( bool state );
+    void playableStateChanged( bool state );
+    void resolvingFinished( bool hasResults );
+
+    void coverChanged();
+
+    void socialActionsLoaded();
+    void statsLoaded();
+    void similarTracksLoaded();
+    void lyricsLoaded();
+
+    void updated();
+
+public slots:
+    /// (indirectly) called by resolver plugins when results are found
+    void addResults( const QList< Tomahawk::result_ptr >& );
+    void removeResult( const Tomahawk::result_ptr& );
+
+    void addAlbums( const QList< Tomahawk::album_ptr >& );
+    void addArtists( const QList< Tomahawk::artist_ptr >& );
+
+    void onResolvingFinished();
+    void onResolverAdded();
+
+private slots:
+    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void infoSystemFinished( QString target );
+
+    void onResultStatusChanged();
+    void refreshResults();
+
+private:
+    Query();
+    explicit Query( const QString& artist, const QString& track, const QString& album, const QID& qid, bool autoResolve );
+    explicit Query( const QString& query, const QID& qid );
+
+    void init();
+
+    void setCurrentResolver( Tomahawk::Resolver* resolver );
+    void clearResults();
+    void checkResults();
+
+    void updateSortNames();
+
+    void parseSocialActions();
+
+    QList< Tomahawk::artist_ptr > m_artists;
+    QList< Tomahawk::album_ptr > m_albums;
+    QList< Tomahawk::result_ptr > m_results;
+    bool m_solved;
+    bool m_playable;
+    bool m_resolveFinished;
+    mutable QID m_qid;
+
+    QString m_artistSortname;
+    QString m_composerSortname;
+    QString m_albumSortname;
+    QString m_trackSortname;
+
+    QString m_artist;
+    QString m_composer;
+    QString m_album;
+    QString m_track;
+    QString m_fullTextQuery;
+
+    int m_duration;
+    unsigned int m_albumpos;
+    unsigned int m_discnumber;
+    QString m_resultHint;
+
+    mutable Tomahawk::artist_ptr m_artistPtr;
+    mutable Tomahawk::album_ptr m_albumPtr;
+
+    QPair< Tomahawk::source_ptr, unsigned int > m_playedBy;
+    QList< QWeakPointer< Tomahawk::Resolver > > m_resolvers;
+
+    mutable QMutex m_mutex;
+    QWeakPointer< Tomahawk::Query > m_ownRef;
+
+    bool m_playbackHistoryLoaded;
+    QList< PlaybackLog > m_playbackHistory;
+
+    bool m_socialActionsLoaded;
+    QHash< QString, QVariant > m_currentSocialActions;
+    QList< SocialAction > m_allSocialActions;
+
+    bool m_simTracksLoaded;
+    QList<Tomahawk::query_ptr> m_similarTracks;
+
+    bool m_lyricsLoaded;
+    QStringList m_lyrics;
+
+    mutable int m_infoJobs;
+};
+
+}; //ns
+
+Q_DECLARE_METATYPE( Tomahawk::query_ptr );
+
+#endif // QUERY_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Resolver.cpp Added

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Resolver.h Added

@@ -0,0 +1,57 @@
+/* === 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
+ *   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 RESOLVER_H
+#define RESOLVER_H
+
+#include <QObject>
+
+#include "Query.h"
+
+#include "DllMacro.h"
+
+// implement this if you can resolve queries to content
+
+/*
+    Weight: 1-100, 100 being the best
+    Timeout: some millisecond value, after which we try the next highest
+             weighted resolver
+
+*/
+
+namespace Tomahawk
+{
+
+class DLLEXPORT Resolver : public QObject
+{
+Q_OBJECT
+
+public:
+    Resolver() {}
+
+    virtual QString name() const = 0;
+    virtual unsigned int weight() const = 0;
+    virtual unsigned int timeout() const = 0;
+
+public slots:
+    virtual void resolve( const Tomahawk::query_ptr& query ) = 0;
+};
+
+}; //ns
+
+#endif // RESOLVER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Result.cpp Added

@@ -0,0 +1,311 @@
+/* === 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
+ *   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 "Result.h"
+
+#include "Album.h"
+#include "Collection.h"
+#include "Resolver.h"
+#include "Source.h"
+#include "Pipeline.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_Resolve.h"
+#include "database/DatabaseCommand_AllTracks.h"
+#include "database/DatabaseCommand_AddFiles.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+static QHash< QString, QWeakPointer< Result > > s_results;
+static QMutex s_mutex;
+
+
+Tomahawk::result_ptr
+Result::get( const QString& url )
+{
+    QMutexLocker lock( &s_mutex );
+    if ( s_results.contains( url ) )
+    {
+        return s_results.value( url );
+    }
+
+    result_ptr r = result_ptr( new Result( url ), &Result::deleteLater );
+    s_results.insert( url, r );
+
+    return r;
+}
+
+
+bool
+Result::isCached( const QString& url )
+{
+    QMutexLocker lock( &s_mutex );
+    return ( s_results.contains( url ) );
+}
+
+
+Result::Result( const QString& url )
+    : QObject()
+    , m_url( url )
+    , m_duration( 0 )
+    , m_bitrate( 0 )
+    , m_size( 0 )
+    , m_albumpos( 0 )
+    , m_modtime( 0 )
+    , m_discnumber( 0 )
+    , m_year( 0 )
+    , m_score( 0 )
+    , m_trackId( 0 )
+    , m_fileId( 0 )
+{
+    connect( Pipeline::instance(), SIGNAL( resolverRemoved( Tomahawk::Resolver* ) ), SLOT( onResolverRemoved( Tomahawk::Resolver* ) ), Qt::QueuedConnection );
+}
+
+
+Result::~Result()
+{
+}
+
+
+void
+Result::deleteLater()
+{
+    QMutexLocker lock( &s_mutex );
+
+    if ( s_results.contains( m_url ) )
+    {
+        s_results.remove( m_url );
+    }
+
+    QObject::deleteLater();
+}
+
+
+void
+Result::onResolverRemoved( Tomahawk::Resolver* resolver )
+{
+    if ( m_resolvedBy.data() == resolver )
+    {
+        m_resolvedBy.clear();
+        emit statusChanged();
+    }
+}
+
+
+artist_ptr
+Result::artist() const
+{
+    return m_artist;
+}
+
+
+artist_ptr
+Result::composer() const
+{
+    return m_composer;
+}
+
+
+album_ptr
+Result::album() const
+{
+    return m_album;
+}
+
+
+collection_ptr
+Result::collection() const
+{
+    return m_collection;
+}
+
+
+float
+Result::score() const
+{
+    if ( isOnline() )
+        return m_score;
+    else
+        return 0.0;
+}
+
+
+RID
+Result::id() const
+{
+    if ( m_rid.isEmpty() )
+        m_rid = uuid();
+
+    return m_rid;
+}
+
+
+bool
+Result::isOnline() const
+{
+    if ( !collection().isNull() )
+    {
+        return collection()->source()->isOnline();
+    }
+    else
+    {
+        return !m_resolvedBy.isNull();
+    }
+}
+
+
+QVariant
+Result::toVariant() const
+{
+    QVariantMap m;
+    m.insert( "artist", artist()->name() );
+    m.insert( "album", album()->name() );
+    m.insert( "track", track() );
+    m.insert( "source", friendlySource() );
+    m.insert( "mimetype", mimetype() );
+    m.insert( "size", size() );
+    m.insert( "bitrate", bitrate() );
+    m.insert( "duration", duration() );
+    m.insert( "score", score() );
+    m.insert( "sid", id() );
+    m.insert( "discnumber", discnumber() );
+    m.insert( "albumpos", albumpos() );
+
+    if ( !composer().isNull() )
+        m.insert( "composer", composer()->name() );
+
+    return m;
+}
+
+
+QString
+Result::toString() const
+{
+    return QString( "Result(%1) %2\t%3 - %4  %5" ).arg( id() ).arg( score() ).arg( artist().isNull() ? QString() : artist()->name() ).arg( track() ).arg( url() );
+}
+
+
+Tomahawk::query_ptr
+Result::toQuery()
+{
+    if ( m_query.isNull() )
+    {
+        m_query = Tomahawk::Query::get( artist()->name(), track(), album()->name() );
+
+        if ( m_query.isNull() )
+            return query_ptr();
+
+        m_query->setAlbumPos( albumpos() );
+        m_query->setDiscNumber( discnumber() );
+        m_query->setDuration( duration() );
+        if ( !composer().isNull() )
+            m_query->setComposer( composer()->name() );
+
+        QList<Tomahawk::result_ptr> rl;
+        rl << Result::get( m_url );
+
+        m_query->addResults( rl );
+        m_query->setResolveFinished( true );
+    }
+
+    return m_query;
+}
+
+
+void
+Result::updateAttributes()
+{
+    if ( m_attributes.contains( "releaseyear" ) )
+    {
+        m_year = m_attributes.value( "releaseyear" ).toInt();
+    }
+}
+
+
+void
+Result::onOnline()
+{
+    emit statusChanged();
+}
+
+
+void
+Result::onOffline()
+{
+    emit statusChanged();
+}
+
+
+void
+Result::setArtist( const Tomahawk::artist_ptr& artist )
+{
+    m_artist = artist;
+}
+
+
+void
+Result::setComposer( const Tomahawk::artist_ptr &composer )
+{
+    m_composer = composer;
+}
+
+
+void
+Result::setAlbum( const Tomahawk::album_ptr& album )
+{
+    m_album = album;
+}
+
+
+void
+Result::setCollection( const Tomahawk::collection_ptr& collection )
+{
+    m_collection = collection;
+    connect( m_collection->source().data(), SIGNAL( online() ), SLOT( onOnline() ), Qt::QueuedConnection );
+    connect( m_collection->source().data(), SIGNAL( offline() ), SLOT( onOffline() ), Qt::QueuedConnection );
+}
+
+
+QString
+Result::friendlySource() const
+{
+    if ( collection().isNull() )
+    {
+        return m_friendlySource;
+    }
+    else
+        return collection()->source()->friendlyName();
+}
+
+
+Tomahawk::Resolver*
+Result::resolvedBy() const
+{
+    if ( m_resolvedBy.isNull() )
+        return 0;
+
+    return m_resolvedBy.data();
+}
+
+
+void
+Result::setResolvedBy( Tomahawk::Resolver* resolver )
+{
+    m_resolvedBy = QWeakPointer< Tomahawk::Resolver >( resolver );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Result.h Added

@@ -0,0 +1,156 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 RESULT_H
+#define RESULT_H
+
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QVariant>
+
+#include "Typedefs.h"
+
+#include "DllMacro.h"
+
+class DatabaseCommand_Resolve;
+class DatabaseCommand_AllTracks;
+class DatabaseCommand_AddFiles;
+class DatabaseCommand_LoadFile;
+
+namespace Tomahawk
+{
+
+class Resolver;
+
+class DLLEXPORT Result : public QObject
+{
+Q_OBJECT
+
+friend class ::DatabaseCommand_Resolve;
+friend class ::DatabaseCommand_AllTracks;
+friend class ::DatabaseCommand_AddFiles;
+friend class ::DatabaseCommand_LoadFile;
+
+public:
+    static Tomahawk::result_ptr get( const QString& url );
+    static bool isCached( const QString& url );
+    virtual ~Result();
+
+    QVariant toVariant() const;
+    QString toString() const;
+    Tomahawk::query_ptr toQuery();
+
+    Tomahawk::Resolver* resolvedBy() const;
+    void setResolvedBy( Tomahawk::Resolver* resolver );
+
+    float score() const;
+    RID id() const;
+    bool isOnline() const;
+
+    collection_ptr collection() const;
+    Tomahawk::artist_ptr artist() const;
+    Tomahawk::album_ptr album() const;
+    Tomahawk::artist_ptr composer() const;
+    QString track() const { return m_track; }
+    QString url() const { return m_url; }
+    QString mimetype() const { return m_mimetype; }
+    QString friendlySource() const;
+
+    unsigned int duration() const { return m_duration; }
+    unsigned int bitrate() const { return m_bitrate; }
+    unsigned int size() const { return m_size; }
+    unsigned int albumpos() const { return m_albumpos; }
+    unsigned int modificationTime() const { return m_modtime; }
+    int year() const { return m_year; }
+    unsigned int discnumber() const { return m_discnumber; }
+
+    void setScore( float score ) { m_score = score; }
+    void setTrackId( unsigned int id ) { m_trackId = id; }
+    void setFileId( unsigned int id ) { m_fileId = id; }
+    void setRID( RID id ) { m_rid = id; }
+    void setCollection( const Tomahawk::collection_ptr& collection );
+    void setFriendlySource( const QString& s ) { m_friendlySource = s; }
+    void setArtist( const Tomahawk::artist_ptr& artist );
+    void setAlbum( const Tomahawk::album_ptr& album );
+    void setComposer( const Tomahawk::artist_ptr& composer );
+    void setTrack( const QString& track ) { m_track = track; }
+    void setMimetype( const QString& mimetype ) { m_mimetype = mimetype; }
+    void setDuration( unsigned int duration ) { m_duration = duration; }
+    void setBitrate( unsigned int bitrate ) { m_bitrate = bitrate; }
+    void setSize( unsigned int size ) { m_size = size; }
+    void setAlbumPos( unsigned int albumpos ) { m_albumpos = albumpos; }
+    void setModificationTime( unsigned int modtime ) { m_modtime = modtime; }
+    void setYear( unsigned int year ) { m_year = year; }
+    void setDiscNumber( unsigned int discnumber ) { m_discnumber = discnumber; }
+
+    QVariantMap attributes() const { return m_attributes; }
+    void setAttributes( const QVariantMap& map ) { m_attributes = map; updateAttributes(); }
+
+    unsigned int trackId() const { return m_trackId; }
+    unsigned int fileId() const { return m_fileId; }
+
+public slots:
+    void deleteLater();
+
+signals:
+    // emitted when the collection this result comes from is going offline/online:
+    void statusChanged();
+
+private slots:
+    void onOffline();
+    void onOnline();
+    
+    void onResolverRemoved( Tomahawk::Resolver* resolver );
+
+private:
+    // private constructor
+    explicit Result( const QString& url );
+    explicit Result();
+
+    void updateAttributes();
+
+    mutable RID m_rid;
+    collection_ptr m_collection;
+    Tomahawk::query_ptr m_query;
+    QWeakPointer< Tomahawk::Resolver > m_resolvedBy;
+
+    Tomahawk::artist_ptr m_artist;
+    Tomahawk::album_ptr m_album;
+    Tomahawk::artist_ptr m_composer;
+    QString m_track;
+    QString m_url;
+    QString m_mimetype;
+    QString m_friendlySource;
+
+    unsigned int m_duration;
+    unsigned int m_bitrate;
+    unsigned int m_size;
+    unsigned int m_albumpos;
+    unsigned int m_modtime;
+    unsigned int m_discnumber;
+    int m_year;
+    float m_score;
+
+    QVariantMap m_attributes;
+    unsigned int m_trackId, m_fileId;
+};
+
+} //ns
+
+#endif // RESULT_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Source.cpp Added

@@ -0,0 +1,561 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "Source.h"
+
+#include "Collection.h"
+#include "SourceList.h"
+#include "SourcePlaylistInterface.h"
+
+#include "accounts/AccountManager.h"
+#include "network/ControlConnection.h"
+#include "database/DatabaseCommand_AddSource.h"
+#include "database/DatabaseCommand_CollectionStats.h"
+#include "database/DatabaseCommand_SourceOffline.h"
+#include "database/DatabaseCommand_UpdateSearchIndex.h"
+#include "database/Database.h"
+
+#include <QCoreApplication>
+#include <QBuffer>
+
+#include "utils/TomahawkCache.h"
+#include "database/DatabaseCommand_SocialAction.h"
+
+#ifndef ENABLE_HEADLESS
+    #include "utils/TomahawkUtilsGui.h"
+#endif
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+Source::Source( int id, const QString& username )
+    : QObject()
+    , m_isLocal( false )
+    , m_online( false )
+    , m_username( username )
+    , m_id( id )
+    , m_updateIndexWhenSynced( false )
+    , m_avatarUpdated( true )
+    , m_state( DBSyncConnection::UNKNOWN )
+    , m_cc( 0 )
+    , m_commandCount( 0 )
+    , m_avatar( 0 )
+    , m_fancyAvatar( 0 )
+{
+    m_scrubFriendlyName = qApp->arguments().contains( "--demo" );
+
+    if ( id == 0 )
+        m_isLocal = true;
+
+    m_currentTrackTimer.setSingleShot( true );
+    connect( &m_currentTrackTimer, SIGNAL( timeout() ), this, SLOT( trackTimerFired() ) );
+
+    if ( m_isLocal )
+    {
+        connect( Accounts::AccountManager::instance(), SIGNAL( connected( Tomahawk::Accounts::Account* ) ), SLOT( setOnline() ) );
+        connect( Accounts::AccountManager::instance(), SIGNAL( disconnected( Tomahawk::Accounts::Account* ) ), SLOT( setOffline() ) );
+    }
+}
+
+
+Source::~Source()
+{
+    qDebug() << Q_FUNC_INFO << friendlyName();
+    delete m_avatar;
+    delete m_fancyAvatar;
+}
+
+
+void
+Source::setControlConnection( ControlConnection* cc )
+{
+    m_cc = cc;
+    if ( cc )
+        connect( cc, SIGNAL( finished() ), SLOT( setOffline() ), Qt::QueuedConnection );
+}
+
+
+collection_ptr
+Source::collection() const
+{
+    if( m_collections.length() )
+        return m_collections.first();
+
+    collection_ptr tmp;
+    return tmp;
+}
+
+
+void
+Source::setStats( const QVariantMap& m )
+{
+    m_stats = m;
+    emit stats( m_stats );
+    emit stateChanged();
+}
+
+
+QString
+Source::friendlyName() const
+{
+    if ( m_friendlyname.isEmpty() )
+        return m_username;
+
+    //TODO: this is a terrible assumption, help me clean this up, mighty muesli!
+    if ( m_friendlyname.contains( "@conference." ) )
+        return QString( m_friendlyname ).remove( 0, m_friendlyname.lastIndexOf( "/" ) + 1 ).append( " via MUC" );
+
+    if ( m_friendlyname.contains( "/" ) )
+        return m_friendlyname.left( m_friendlyname.indexOf( "/" ) );
+
+    return m_friendlyname;
+}
+
+
+#ifndef ENABLE_HEADLESS
+void
+Source::setAvatar( const QPixmap& avatar )
+{
+    delete m_avatar;
+    m_avatar = new QPixmap( avatar );
+    m_fancyAvatar = 0;
+
+    QByteArray ba;
+    QBuffer buffer( &ba );
+    buffer.open( QIODevice::WriteOnly );
+    avatar.save( &buffer, "PNG" );
+
+    TomahawkUtils::Cache::instance()->putData( "Sources", 7776000000 /* 90 days */, m_username, ba );
+    m_avatarUpdated = true;
+}
+
+
+QPixmap
+Source::avatar( AvatarStyle style, const QSize& size )
+{
+    if ( !m_avatar && m_avatarUpdated )
+    {
+        m_avatar = new QPixmap();
+        QByteArray ba = TomahawkUtils::Cache::instance()->getData( "Sources", m_username ).toByteArray();
+
+        if ( ba.count() )
+            m_avatar->loadFromData( ba );
+        if ( m_avatar->isNull() )
+        {
+            delete m_avatar;
+            m_avatar = 0;
+        }
+        m_avatarUpdated = false;
+    }
+
+    if ( style == FancyStyle && m_avatar && !m_fancyAvatar )
+        m_fancyAvatar = new QPixmap( TomahawkUtils::createAvatarFrame( QPixmap( *m_avatar ) ) );
+
+    QPixmap pixmap;
+    if ( style == Original && m_avatar )
+        pixmap = *m_avatar;
+    else if ( style == FancyStyle && m_fancyAvatar )
+        pixmap = *m_fancyAvatar;
+
+    if ( !pixmap.isNull() && !size.isEmpty() )
+    {
+        if ( m_coverCache.contains( size.width() ) )
+        {
+            return m_coverCache.value( size.width() );
+        }
+
+        QPixmap scaledCover;
+        scaledCover = pixmap.scaled( size, Qt::KeepAspectRatio, Qt::SmoothTransformation );
+        m_coverCache.insert( size.width(), scaledCover );
+        return scaledCover;
+    }
+
+    return pixmap;
+}
+#endif
+
+
+void
+Source::setFriendlyName( const QString& fname )
+{
+    if ( fname.isEmpty() )
+        return;
+
+    m_friendlyname = fname;
+    if ( m_scrubFriendlyName )
+    {
+        if ( m_friendlyname.indexOf( "@" ) > 0 )
+            m_friendlyname = m_friendlyname.split( "@" ).first();
+    }
+}
+
+
+void
+Source::addCollection( const collection_ptr& c )
+{
+    Q_ASSERT( m_collections.length() == 0 ); // only 1 source supported atm
+    m_collections.append( c );
+    emit collectionAdded( c );
+}
+
+
+void
+Source::removeCollection( const collection_ptr& c )
+{
+    Q_ASSERT( m_collections.length() == 1 && m_collections.first() == c ); // only 1 source supported atm
+    m_collections.removeAll( c );
+    emit collectionRemoved( c );
+}
+
+
+void
+Source::setOffline()
+{
+    qDebug() << Q_FUNC_INFO << friendlyName();
+    if ( !m_online )
+        return;
+
+    m_online = false;
+    emit offline();
+
+    if ( !isLocal() )
+    {
+        m_currentTrack.clear();
+        emit stateChanged();
+
+        m_cc = 0;
+        DatabaseCommand_SourceOffline* cmd = new DatabaseCommand_SourceOffline( id() );
+        Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
+    }
+}
+
+
+void
+Source::setOnline()
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << friendlyName();
+    if ( m_online )
+        return;
+
+    m_online = true;
+    emit online();
+
+    if ( !isLocal() )
+    {
+        // ensure username is in the database
+        DatabaseCommand_addSource* cmd = new DatabaseCommand_addSource( m_username, friendlyName() );
+        connect( cmd, SIGNAL( done( unsigned int, QString ) ),
+                        SLOT( dbLoaded( unsigned int, const QString& ) ) );
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+    }
+}
+
+
+void
+Source::dbLoaded( unsigned int id, const QString& fname )
+{
+    m_id = id;
+    setFriendlyName( fname );
+
+    emit syncedWithDatabase();
+}
+
+
+void
+Source::scanningProgress( unsigned int files )
+{
+    if ( files )
+        m_textStatus = tr( "Scanning (%L1 tracks)" ).arg( files );
+    else
+        m_textStatus = tr( "Scanning" );
+
+    emit stateChanged();
+}
+
+
+void
+Source::scanningFinished( unsigned int files )
+{
+    Q_UNUSED( files );
+
+    m_textStatus = QString();
+
+    if ( m_updateIndexWhenSynced )
+    {
+        m_updateIndexWhenSynced = false;
+        updateTracks();
+    }
+
+    emit stateChanged();
+    emit synced();
+}
+
+
+void
+Source::onStateChanged( DBSyncConnection::State newstate, DBSyncConnection::State oldstate, const QString& info )
+{
+    Q_UNUSED( oldstate );
+
+    QString msg;
+    switch( newstate )
+    {
+        case DBSyncConnection::CHECKING:
+        {
+            msg = tr( "Checking" );
+            break;
+        }
+        case DBSyncConnection::FETCHING:
+        {
+            msg = tr( "Syncing" );
+            break;
+        }
+        case DBSyncConnection::PARSING:
+        {
+            msg = tr( "Importing" );
+            break;
+        }
+        case DBSyncConnection::SCANNING:
+        {
+            msg = tr( "Scanning (%L1 tracks)" ).arg( info );
+            break;
+        }
+        case DBSyncConnection::SYNCED:
+        {
+            msg = QString();
+            break;
+        }
+
+        default:
+            msg = QString();
+    }
+
+    m_state = newstate;
+    m_textStatus = msg;
+    emit stateChanged();
+}
+
+
+unsigned int
+Source::trackCount() const
+{
+    return m_stats.value( "numfiles" ).toUInt();
+}
+
+
+Tomahawk::playlistinterface_ptr
+Source::playlistInterface()
+{
+    if ( m_playlistInterface.isNull() )
+    {
+        Tomahawk::source_ptr source = SourceList::instance()->get( id() );
+        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::SourcePlaylistInterface( source.data() ) );
+    }
+
+    return m_playlistInterface;
+}
+
+
+void
+Source::onPlaybackStarted( const Tomahawk::query_ptr& query, unsigned int duration )
+{
+    tLog( LOGVERBOSE ) << Q_FUNC_INFO << query->toString();
+
+    m_currentTrack = query;
+    m_currentTrackTimer.start( duration * 1000 + 900000 ); // duration comes in seconds
+
+    if ( m_playlistInterface.isNull() )
+        playlistInterface();
+
+    emit playbackStarted( query );
+    emit stateChanged();
+}
+
+
+void
+Source::onPlaybackFinished( const Tomahawk::query_ptr& query )
+{
+    tDebug() << Q_FUNC_INFO << query->toString();
+    emit playbackFinished( query );
+
+    m_currentTrack.clear();
+    emit stateChanged();
+}
+
+
+void
+Source::trackTimerFired()
+{
+    m_currentTrack.clear();
+    emit stateChanged();
+}
+
+
+QString
+Source::lastCmdGuid() const
+{
+    QMutexLocker lock( &m_cmdMutex );
+    return m_lastCmdGuid;
+}
+
+
+void
+Source::addCommand( const QSharedPointer<DatabaseCommand>& command )
+{
+    QMutexLocker lock( &m_cmdMutex );
+
+    m_cmds << command;
+    if ( !command->singletonCmd() )
+        m_lastCmdGuid = command->guid();
+
+    m_commandCount = m_cmds.count();
+}
+
+
+void
+Source::executeCommands()
+{
+    if ( QThread::currentThread() != thread() )
+    {
+        QMetaObject::invokeMethod( this, "executeCommands", Qt::QueuedConnection );
+        return;
+    }
+
+    bool commandsAvail = false;
+    {
+        QMutexLocker lock( &m_cmdMutex );
+        commandsAvail = !m_cmds.isEmpty();
+    }
+
+    if ( commandsAvail )
+    {
+        QMutexLocker lock( &m_cmdMutex );
+        QList< QSharedPointer<DatabaseCommand> > cmdGroup;
+        QSharedPointer<DatabaseCommand> cmd = m_cmds.takeFirst();
+        while ( cmd->groupable() )
+        {
+            cmdGroup << cmd;
+            if ( !m_cmds.isEmpty() && m_cmds.first()->groupable() && m_cmds.first()->commandname() == cmd->commandname() )
+                cmd = m_cmds.takeFirst();
+            else
+                break;
+        }
+
+        // return here when the last command finished
+        connect( cmd.data(), SIGNAL( finished() ), SLOT( executeCommands() ) );
+
+        if ( cmdGroup.count() )
+        {
+            Database::instance()->enqueue( cmdGroup );
+        }
+        else
+        {
+            Database::instance()->enqueue( cmd );
+        }
+
+        int percentage = ( float( m_commandCount - m_cmds.count() ) / (float)m_commandCount ) * 100.0;
+        m_textStatus = tr( "Saving (%1%)" ).arg( percentage );
+        emit stateChanged();
+    }
+    else
+    {
+        if ( m_updateIndexWhenSynced )
+        {
+            m_updateIndexWhenSynced = false;
+            updateTracks();
+        }
+
+        m_textStatus = QString();
+        m_state = DBSyncConnection::SYNCED;
+
+        emit commandsFinished();
+        emit stateChanged();
+        emit synced();
+    }
+}
+
+
+void
+Source::reportSocialAttributesChanged( DatabaseCommand_SocialAction* action )
+{
+    Q_ASSERT( action );
+
+    emit socialAttributesChanged( action->action() );
+
+    if ( action->action() == "latchOn" )
+    {
+        const source_ptr to = SourceList::instance()->get( action->comment() );
+        if ( !to.isNull() )
+            emit latchedOn( to );
+    }
+    else if ( action->action() == "latchOff" )
+    {
+        const source_ptr from = SourceList::instance()->get( action->comment() );
+        if ( !from.isNull() )
+            emit latchedOff( from );
+    }
+}
+
+
+void
+Source::updateTracks()
+{
+    {
+        DatabaseCommand* cmd = new DatabaseCommand_UpdateSearchIndex();
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+    }
+
+    {
+        // Re-calculate local db stats
+        DatabaseCommand_CollectionStats* cmd = new DatabaseCommand_CollectionStats( SourceList::instance()->get( id() ) );
+        connect( cmd, SIGNAL( done( QVariantMap ) ), SLOT( setStats( QVariantMap ) ), Qt::QueuedConnection );
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+    }
+}
+
+
+void
+Source::updateIndexWhenSynced()
+{
+    m_updateIndexWhenSynced = true;
+}
+
+
+QString
+Source::textStatus() const
+{
+    if ( !m_textStatus.isEmpty() )
+        return m_textStatus;
+
+    if ( !currentTrack().isNull() )
+    {
+        return currentTrack()->artist() + " - " + currentTrack()->track();
+    }
+
+    // do not use isOnline() here - it will always return true for the local source
+    if ( m_online )
+    {
+        return tr( "Online" );
+    }
+    else
+    {
+        return tr( "Offline" );
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Source.h Added

@@ -0,0 +1,173 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 SOURCE_H
+#define SOURCE_H
+
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QVariantMap>
+
+#include "Typedefs.h"
+#include "network/DbSyncConnection.h"
+#include "Collection.h"
+#include "Query.h"
+
+#include "DllMacro.h"
+
+class ControlConnection;
+class DatabaseCommand_LogPlayback;
+class DatabaseCommand_SocialAction;
+class DatabaseCommand_UpdateSearchIndex;
+class DatabaseCommand_DeleteFiles;
+class MusicScanner;
+
+namespace Tomahawk
+{
+
+class DLLEXPORT Source : public QObject
+{
+Q_OBJECT
+
+friend class ::DBSyncConnection;
+friend class ::ControlConnection;
+friend class ::DatabaseCommand_LogPlayback;
+friend class ::DatabaseCommand_SocialAction;
+friend class ::DatabaseCommand_AddFiles;
+friend class ::DatabaseCommand_DeleteFiles;
+friend class ::MusicScanner;
+
+public:
+    enum AvatarStyle { Original, FancyStyle };
+
+    explicit Source( int id, const QString& username = QString() );
+    virtual ~Source();
+
+    bool isLocal() const { return m_isLocal; }
+    bool isOnline() const { return m_online || m_isLocal; }
+
+    QString userName() const { return m_username; }
+    QString friendlyName() const;
+    void setFriendlyName( const QString& fname );
+
+#ifndef ENABLE_HEADLESS
+    void setAvatar( const QPixmap& avatar );
+    QPixmap avatar( AvatarStyle style = Original, const QSize& size = QSize() );
+#endif
+
+    collection_ptr collection() const;
+    void addCollection( const Tomahawk::collection_ptr& c );
+    void removeCollection( const Tomahawk::collection_ptr& c );
+
+    int id() const { return m_id; }
+    ControlConnection* controlConnection() const { return m_cc; }
+    void setControlConnection( ControlConnection* cc );
+
+    void scanningProgress( unsigned int files );
+    void scanningFinished( unsigned int files );
+
+    unsigned int trackCount() const;
+
+    Tomahawk::query_ptr currentTrack() const { return m_currentTrack; }
+    QString textStatus() const;
+    DBSyncConnection::State state() const { return m_state; }
+
+    Tomahawk::playlistinterface_ptr playlistInterface();
+
+signals:
+    void syncedWithDatabase();
+    void synced();
+
+    void online();
+    void offline();
+
+    void collectionAdded( const collection_ptr& collection );
+    void collectionRemoved( const collection_ptr& collection );
+
+    void stats( const QVariantMap& );
+    void usernameChanged( const QString& );
+
+    void playbackStarted( const Tomahawk::query_ptr& query );
+    void playbackFinished( const Tomahawk::query_ptr& query );
+
+    void stateChanged();
+    void commandsFinished();
+
+    void socialAttributesChanged( const QString& action );
+
+    void latchedOn( const Tomahawk::source_ptr& to );
+    void latchedOff( const Tomahawk::source_ptr& from );
+
+public slots:
+    void setStats( const QVariantMap& m );
+
+private slots:
+    void dbLoaded( unsigned int id, const QString& fname );
+    QString lastCmdGuid() const;
+    void updateIndexWhenSynced();
+
+    void setOffline();
+    void setOnline();
+
+    void onStateChanged( DBSyncConnection::State newstate, DBSyncConnection::State oldstate, const QString& info );
+
+    void onPlaybackStarted( const Tomahawk::query_ptr& query, unsigned int duration );
+    void onPlaybackFinished( const Tomahawk::query_ptr& query );
+    void trackTimerFired();
+
+    void executeCommands();
+    void addCommand( const QSharedPointer<DatabaseCommand>& command );
+
+private:
+    void updateTracks();
+    void reportSocialAttributesChanged( DatabaseCommand_SocialAction* action );
+
+    QList< QSharedPointer<Collection> > m_collections;
+    QVariantMap m_stats;
+
+    bool m_isLocal;
+    bool m_online;
+    QString m_username;
+    QString m_friendlyname;
+    int m_id;
+    bool m_scrubFriendlyName;
+    bool m_updateIndexWhenSynced;
+    bool m_avatarUpdated;
+
+    Tomahawk::query_ptr m_currentTrack;
+    QString m_textStatus;
+    DBSyncConnection::State m_state;
+    QTimer m_currentTrackTimer;
+
+    ControlConnection* m_cc;
+    QList< QSharedPointer<DatabaseCommand> > m_cmds;
+    int m_commandCount;
+    QString m_lastCmdGuid;
+    mutable QMutex m_cmdMutex;
+
+    mutable QPixmap* m_avatar;
+    mutable QPixmap* m_fancyAvatar;
+    mutable QHash< int, QPixmap > m_coverCache;
+
+    Tomahawk::playlistinterface_ptr m_playlistInterface;
+};
+
+} //ns
+
+#endif // SOURCE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/SourceList.cpp Added

@@ -0,0 +1,252 @@
+/* === 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
+ *   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 "SourceList.h"
+
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "database/DatabaseCommand_LoadAllSources.h"
+#include "network/RemoteCollection.h"
+#include "network/ControlConnection.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+SourceList* SourceList::s_instance = 0;
+
+
+SourceList*
+SourceList::instance()
+{
+    if ( !s_instance )
+    {
+        s_instance = new SourceList();
+    }
+
+    return s_instance;
+}
+
+
+SourceList::SourceList( QObject* parent )
+    : QObject( parent )
+    , m_isReady( false )
+{
+}
+
+
+const source_ptr&
+SourceList::getLocal()
+{
+    return m_local;
+}
+
+
+void
+SourceList::setWebSource( const source_ptr& websrc )
+{
+    m_dummy = websrc;
+}
+
+
+const
+source_ptr SourceList::webSource() const
+{
+    return m_dummy;
+}
+
+
+void
+SourceList::loadSources()
+{
+    DatabaseCommand_LoadAllSources* cmd = new DatabaseCommand_LoadAllSources();
+
+    connect( cmd, SIGNAL( done( QList<Tomahawk::source_ptr> ) ),
+                    SLOT( setSources( QList<Tomahawk::source_ptr> ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+SourceList::setSources( const QList<Tomahawk::source_ptr>& sources )
+{
+    {
+        QMutexLocker lock( &m_mut );
+
+        m_isReady = true;
+        foreach( const source_ptr& src, sources )
+        {
+            add( src );
+        }
+
+        tLog() << Q_FUNC_INFO << "- Total sources now:" << m_sources.size();
+    }
+
+    emit ready();
+}
+
+
+void
+SourceList::setLocal( const Tomahawk::source_ptr& localSrc )
+{
+    Q_ASSERT( localSrc->isLocal() );
+    Q_ASSERT( m_local.isNull() );
+
+    {
+        QMutexLocker lock( &m_mut );
+        m_sources.insert( localSrc->userName(), localSrc );
+        m_local = localSrc;
+    }
+
+
+    connect( localSrc.data(), SIGNAL( latchedOn( Tomahawk::source_ptr ) ), this, SLOT( latchedOn( Tomahawk::source_ptr ) ) );
+    connect( localSrc.data(), SIGNAL( latchedOff( Tomahawk::source_ptr ) ), this, SLOT( latchedOff( Tomahawk::source_ptr ) ) );
+    emit sourceAdded( localSrc );
+}
+
+
+void
+SourceList::add( const source_ptr& source )
+{
+    Q_ASSERT( m_isReady );
+
+//    qDebug() << "Adding to sources:" << source->userName() << source->id();
+    m_sources.insert( source->userName(), source );
+
+    if ( source->id() > 0 )
+        m_sources_id2name.insert( source->id(), source->userName() );
+    connect( source.data(), SIGNAL( syncedWithDatabase() ), SLOT( sourceSynced() ) );
+
+    collection_ptr coll( new RemoteCollection( source ) );
+    source->addCollection( coll );
+
+    connect( source.data(), SIGNAL( latchedOn( Tomahawk::source_ptr ) ), this, SLOT( latchedOn( Tomahawk::source_ptr ) ) );
+    connect( source.data(), SIGNAL( latchedOff( Tomahawk::source_ptr ) ), this, SLOT( latchedOff( Tomahawk::source_ptr ) ) );
+    emit sourceAdded( source );
+}
+
+
+void
+SourceList::removeAllRemote()
+{
+    foreach( const source_ptr& s, m_sources )
+    {
+        qDebug() << "Disconnecting" << s->friendlyName() << s->isLocal() << s->controlConnection() << s->isOnline();
+        if ( !s->isLocal() && s->controlConnection() )
+        {
+            s->controlConnection()->shutdown( true );
+        }
+    }
+}
+
+
+QList<source_ptr>
+SourceList::sources( bool onlyOnline ) const
+{
+    QMutexLocker lock( &m_mut );
+
+    QList< source_ptr > sources;
+    foreach( const source_ptr& src, m_sources )
+    {
+        if ( !onlyOnline || src->controlConnection() )
+            sources << src;
+    }
+
+    return sources;
+}
+
+
+source_ptr
+SourceList::get( int id ) const
+{
+    QMutexLocker lock( &m_mut );
+
+    if ( id == 0 )
+        return m_local;
+    else
+        return m_sources.value( m_sources_id2name.value( id ) );
+}
+
+
+source_ptr
+SourceList::get( const QString& username, const QString& friendlyName, bool autoCreate )
+{
+    QMutexLocker lock( &m_mut );
+
+    source_ptr source;
+    if ( Database::instance()->impl()->dbid() == username )
+    {
+        return m_local;
+    }
+
+    if ( !m_sources.contains( username ) )
+    {
+        if ( autoCreate )
+        {
+            Q_ASSERT( !friendlyName.isEmpty() );
+            source = source_ptr( new Source( -1, username ) );
+            source->setFriendlyName( friendlyName );
+            add( source );
+        }
+    }
+    else
+    {
+        source = m_sources.value( username );
+        source->setFriendlyName( friendlyName );
+    }
+
+    return source;
+}
+
+
+void
+SourceList::sourceSynced()
+{
+    Source* src = qobject_cast< Source* >( sender() );
+
+    m_sources_id2name.insert( src->id(), src->userName() );
+}
+
+
+unsigned int
+SourceList::count() const
+{
+    QMutexLocker lock( &m_mut );
+    return m_sources.size();
+}
+
+void
+SourceList::latchedOff( const source_ptr& to )
+{
+    Source* s = qobject_cast< Source* >( sender() );
+    const source_ptr source = m_sources s->userName() ;
+
+    emit sourceLatchedOff( source, to );
+}
+
+void
+SourceList::latchedOn( const source_ptr& to )
+{
+
+    Source* s = qobject_cast< Source* >( sender() );
+    const source_ptr source = m_sources s->userName() ;
+
+    emit sourceLatchedOn( source, to );
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/SourceList.h Added

@@ -0,0 +1,87 @@
+/* === 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
+ *   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 SOURCELIST_H
+#define SOURCELIST_H
+
+#include <QObject>
+#include <QMutex>
+#include <QMap>
+
+#include "Typedefs.h"
+#include "Source.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT SourceList : public QObject
+{
+Q_OBJECT
+
+public:
+    static SourceList* instance();
+
+    explicit SourceList( QObject* parent = 0 );
+
+    bool isReady() const { return m_isReady; }
+
+    const Tomahawk::source_ptr& getLocal();
+    void setLocal( const Tomahawk::source_ptr& localSrc );
+
+    void setWebSource( const Tomahawk::source_ptr& websrc );
+    const Tomahawk::source_ptr webSource() const;
+
+    void loadSources();
+    void removeAllRemote();
+
+    QList<Tomahawk::source_ptr> sources( bool onlyOnline = false ) const;
+    unsigned int count() const;
+
+    Tomahawk::source_ptr get( const QString& username, const QString& friendlyName = QString(), bool autoCreate = false );
+    Tomahawk::source_ptr get( int id ) const;
+
+signals:
+    void ready();
+
+    void sourceAdded( const Tomahawk::source_ptr& );
+    void sourceRemoved( const Tomahawk::source_ptr& );
+
+    void sourceLatchedOn( const Tomahawk::source_ptr& from, const Tomahawk::source_ptr& to );
+    void sourceLatchedOff( const Tomahawk::source_ptr& from, const Tomahawk::source_ptr& to );
+
+private slots:
+    void setSources( const QList<Tomahawk::source_ptr>& sources );
+    void sourceSynced();
+
+    void latchedOn( const Tomahawk::source_ptr& );
+    void latchedOff( const Tomahawk::source_ptr& );
+
+private:
+    void add( const Tomahawk::source_ptr& source );
+
+    QMap< QString, Tomahawk::source_ptr > m_sources;
+    QMap< int, QString > m_sources_id2name;
+
+    bool m_isReady;
+    Tomahawk::source_ptr m_local;
+    Tomahawk::source_ptr m_dummy;
+    mutable QMutex m_mut; // mutable so const methods can use a lock
+
+    static SourceList* s_instance;
+};
+
+#endif // SOURCELIST_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/SourcePlaylistInterface.cpp Added

@@ -0,0 +1,160 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "SourcePlaylistInterface.h"
+
+#include "Source.h"
+#include "Pipeline.h"
+#include "audio/AudioEngine.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+SourcePlaylistInterface::SourcePlaylistInterface( Tomahawk::Source *source, Tomahawk::PlaylistModes::LatchMode latchMode )
+    : PlaylistInterface()
+    , m_source( source )
+    , m_currentItem( 0 )
+    , m_gotNextItem( false )
+{
+    setLatchMode( latchMode );
+
+    if ( !m_source.isNull() )
+        connect( m_source.data(), SIGNAL( playbackStarted( const Tomahawk::query_ptr& ) ), SLOT( onSourcePlaybackStarted( const Tomahawk::query_ptr& ) ) );
+
+    if ( AudioEngine::instance() )
+        connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( audioPaused() ) );
+}
+
+
+SourcePlaylistInterface::~SourcePlaylistInterface()
+{
+    m_source.clear();
+}
+
+
+Tomahawk::result_ptr
+SourcePlaylistInterface::siblingItem( int itemsAway )
+{
+    Q_UNUSED( itemsAway );
+    return nextItem();
+}
+
+
+Tomahawk::result_ptr
+SourcePlaylistInterface::nextItem()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+    if ( !sourceValid() )
+    {
+        tDebug( LOGEXTRA ) << Q_FUNC_INFO << " Source no longer valid";
+        m_currentItem = Tomahawk::result_ptr();
+        return m_currentItem;
+    }
+    else if ( !hasNextItem() )
+    {
+        tDebug( LOGEXTRA ) << Q_FUNC_INFO << " This song was already fetched or the source isn't playing anything";
+        return Tomahawk::result_ptr();
+    }
+
+    m_gotNextItem = false;
+
+    if ( m_source.data()->currentTrack()->numResults() )
+        m_currentItem = m_source.data()->currentTrack()->results().first();
+    else
+        m_currentItem = result_ptr();
+
+    return m_currentItem;
+}
+
+
+result_ptr
+SourcePlaylistInterface::currentItem() const
+{
+    return m_currentItem;
+}
+
+
+bool
+SourcePlaylistInterface::sourceValid()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+    if ( m_source.isNull() || m_source.data()->currentTrack().isNull() )
+        return false;
+
+    return true;
+}
+
+
+bool
+SourcePlaylistInterface::hasNextItem()
+{
+    if ( !sourceValid() )
+        return false;
+
+    return m_gotNextItem;
+}
+
+
+QList<Tomahawk::query_ptr>
+SourcePlaylistInterface::tracks()
+{
+    QList<Tomahawk::query_ptr> tracks;
+    return tracks; // FIXME (with what?)
+}
+
+
+QWeakPointer< Tomahawk::Source >
+SourcePlaylistInterface::source() const
+{
+    return m_source;
+}
+
+
+void
+SourcePlaylistInterface::reset()
+{
+    if ( m_currentItem.isNull() )
+        m_gotNextItem = false;
+    else
+        m_gotNextItem = true;
+}
+
+
+void
+SourcePlaylistInterface::onSourcePlaybackStarted( const Tomahawk::query_ptr& query )
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+    connect( query.data(), SIGNAL( resolvingFinished( bool ) ), SLOT( resolvingFinished( bool ) ) );
+    Pipeline::instance()->resolve( query );
+    m_gotNextItem = false;
+}
+
+
+void
+SourcePlaylistInterface::resolvingFinished( bool hasResults )
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO << " and has results? : " << (hasResults ? "true" : "false");
+    if ( hasResults )
+    {
+        m_gotNextItem = true;
+        emit nextTrackReady();
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/SourcePlaylistInterface.h Added

@@ -0,0 +1,85 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWKSOURCEPLAYLISTINTERFACE_H
+#define TOMAHAWKSOURCEPLAYLISTINTERFACE_H
+
+#include <QObject>
+#include <QSharedPointer>
+
+#include "Typedefs.h"
+#include "PlaylistInterface.h"
+
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT SourcePlaylistInterface : public Tomahawk::PlaylistInterface
+{
+Q_OBJECT
+
+public:
+    SourcePlaylistInterface( Tomahawk::Source *source, Tomahawk::PlaylistModes::LatchMode latchMode = PlaylistModes::StayOnSong );
+    virtual ~SourcePlaylistInterface();
+
+    QList<Tomahawk::query_ptr> tracks();
+
+    virtual int trackCount() const { return 1; }
+    virtual int unfilteredTrackCount() const { return 1; }
+
+    virtual Tomahawk::result_ptr siblingItem( int itemsAway );
+    virtual bool sourceValid();
+    virtual bool hasNextItem();
+    virtual Tomahawk::result_ptr nextItem();
+    virtual Tomahawk::result_ptr currentItem() const;
+
+    virtual PlaylistModes::RepeatMode repeatMode() const { return PlaylistModes::NoRepeat; }
+    virtual PlaylistModes::SeekRestrictions seekRestrictions() const { return PlaylistModes::NoSeek; }
+    virtual PlaylistModes::SkipRestrictions skipRestrictions() const { return PlaylistModes::NoSkipBackwards; }
+    virtual PlaylistModes::RetryMode retryMode() const { return PlaylistModes::Retry; }
+    virtual quint32 retryInterval() const { return 5000; }
+
+    virtual void setLatchMode( PlaylistModes::LatchMode latchMode ) { m_latchMode = latchMode; emit latchModeChanged( latchMode ); }
+
+    virtual bool shuffled() const { return false; }
+    virtual void setFilter( const QString& /*pattern*/ ) {}
+
+    virtual QWeakPointer< Tomahawk::Source > source() const;
+
+    virtual void reset();
+
+public slots:
+    virtual void setRepeatMode( PlaylistModes::RepeatMode ) {}
+    virtual void setShuffled( bool ) {}
+    virtual void audioPaused() { setLatchMode( PlaylistModes::StayOnSong ); }
+
+private slots:
+    void onSourcePlaybackStarted( const Tomahawk::query_ptr& query );
+    void resolvingFinished( bool hasResults );
+
+private:
+    QWeakPointer< Tomahawk::Source > m_source;
+    Tomahawk::result_ptr m_currentItem;
+    bool m_gotNextItem;
+};
+
+}; // ns
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/TomahawkSettings.cpp Added

@@ -0,0 +1,1345 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "TomahawkSettings.h"
+
+#include <QDir>
+
+#include "Source.h"
+#include "sip/SipHandler.h"
+#include "PlaylistInterface.h"
+
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+
+#include "database/DatabaseCommand_UpdateSearchIndex.h"
+#include "database/Database.h"
+#include "PlaylistUpdaterInterface.h"
+
+using namespace Tomahawk;
+
+TomahawkSettings* TomahawkSettings::s_instance = 0;
+
+
+inline QDataStream&
+operator<<(QDataStream& out, const SerializedUpdaters& updaters)
+{
+    out <<  TOMAHAWK_SETTINGS_VERSION;
+    out << (quint32)updaters.count();
+    SerializedUpdaters::const_iterator iter = updaters.begin();
+    int count = 0;
+    for ( ; iter != updaters.end(); ++iter )
+    {
+        out << iter.key() << iter->type << iter->customData;
+        count++;
+    }
+    Q_ASSERT( count == updaters.count() );
+    return out;
+}
+
+
+inline QDataStream&
+operator>>(QDataStream& in, SerializedUpdaters& updaters)
+{
+    quint32 count = 0, version = 0;
+    in >> version;
+    in >> count;
+
+    for ( uint i = 0; i < count; i++ )
+    {
+        QString key, type;
+        QVariantHash customData;
+        in >> key;
+        in >> type;
+        in >> customData;
+        updaters.insert( key, SerializedUpdater( type, customData ) );
+    }
+
+    return in;
+}
+
+
+TomahawkSettings*
+TomahawkSettings::instance()
+{
+    return s_instance;
+}
+
+
+TomahawkSettings::TomahawkSettings( QObject* parent )
+    : QSettings( parent )
+{
+    s_instance = this;
+
+    #ifdef Q_OS_LINUX
+        QFile file( fileName() );
+        file.setPermissions( file.permissions() & ~( QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther ) );
+    #endif
+
+    if ( !contains( "configversion" ) )
+    {
+        setValue( "configversion", TOMAHAWK_SETTINGS_VERSION );
+        doInitialSetup();
+    }
+    else if ( value( "configversion" ).toUInt() != TOMAHAWK_SETTINGS_VERSION )
+    {
+        qDebug() << "Config version outdated, old:" << value( "configversion" ).toUInt()
+                 << "new:" << TOMAHAWK_SETTINGS_VERSION
+                 << "Doing upgrade, if any, and backing up";
+
+//         QString newname = QString( "%1.v%2" ).arg( dbname ).arg( version );
+        if ( format() == IniFormat ||
+             ( format() == NativeFormat
+#ifdef Q_OS_WIN
+               && false
+#endif
+             ) )
+        {
+            qDebug() << "Backing up old ini-style config file";
+            const QString path = fileName();
+            const QString newname = path + QString( ".v%1" ).arg( value( "configversion" ).toString() );
+            QFile::copy( path, newname );
+
+        }
+        int current = value( "configversion" ).toUInt();
+        while ( current < TOMAHAWK_SETTINGS_VERSION )
+        {
+            doUpgrade( current, current + 1 );
+
+            current++;
+        }
+        // insert upgrade code here as required
+        setValue( "configversion", TOMAHAWK_SETTINGS_VERSION );
+    }
+
+    // Ensure last.fm and spotify accounts always exist
+    QString spotifyAcct, lastfmAcct;
+    foreach ( const QString& acct, value( "accounts/allaccounts" ).toStringList() )
+    {
+        if ( acct.startsWith( "lastfmaccount_" ) )
+            lastfmAcct = acct;
+        else if ( acct.startsWith( "spotifyaccount_" ) )
+            spotifyAcct = acct;
+    }
+
+    if ( spotifyAcct.isEmpty() )
+        createSpotifyAccount();
+    if ( lastfmAcct.isEmpty() )
+        createLastFmAccount();
+}
+
+
+TomahawkSettings::~TomahawkSettings()
+{
+    s_instance = 0;
+}
+
+
+void
+TomahawkSettings::doInitialSetup()
+{
+    // by default we add a local network resolver
+    addAccount( "sipzeroconf_autocreated" );
+
+    createLastFmAccount();
+    createSpotifyAccount();
+}
+
+
+void
+TomahawkSettings::createLastFmAccount()
+{
+    // Add a last.fm account for scrobbling and infosystem
+    const QString accountKey = QString( "lastfmaccount_%1" ).arg( QUuid::createUuid().toString().mid( 1, 8 ) );
+    addAccount( accountKey );
+
+    beginGroup( "accounts/" + accountKey );
+    setValue( "enabled", false );
+    setValue( "autoconnect", true );
+    setValue( "types", QStringList() << "ResolverType" << "StatusPushType" );
+    endGroup();
+
+    QStringList allAccounts = value( "accounts/allaccounts" ).toStringList();
+    allAccounts << accountKey;
+    setValue( "accounts/allaccounts", allAccounts );
+}
+
+
+void
+TomahawkSettings::createSpotifyAccount()
+{
+    const QString accountKey = QString( "spotifyaccount_%1" ).arg( QUuid::createUuid().toString().mid( 1, 8 ) );
+    beginGroup( "accounts/" + accountKey );
+    setValue( "enabled", false );
+    setValue( "types", QStringList() << "ResolverType" );
+    setValue( "credentials", QVariantHash() );
+    setValue( "configuration", QVariantHash() );
+    setValue( "accountfriendlyname", "Spotify" );
+    endGroup();
+
+    QStringList allAccounts = value( "accounts/allaccounts" ).toStringList();
+    allAccounts << accountKey;
+    setValue( "accounts/allaccounts", allAccounts );
+}
+
+
+void
+TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
+{
+    Q_UNUSED( newVersion );
+
+    if ( oldVersion == 1 )
+    {
+        qDebug() << "Migrating config from verson 1 to 2: script resolver config name";
+        if( contains( "script/resolvers" ) ) {
+            setValue( "script/loadedresolvers", value( "script/resolvers" ) );
+            remove( "script/resolvers" );
+        }
+    }
+    else if ( oldVersion == 2 )
+    {
+        qDebug() << "Migrating config from version 2 to 3: Converting jabber and twitter accounts to new SIP Factory approach";
+        // migrate old accounts to new system. only jabber and twitter, and max one each. create a new plugin for each if needed
+        // not pretty as we hardcode a plugin id and assume that we know how the config layout is, but hey, this is migration after all
+        if ( contains( "jabber/username" ) && contains( "jabber/password" ) )
+        {
+            QString sipName = "sipjabber";
+            if ( value( "jabber/username" ).toString().contains( "@gmail" ) )
+                sipName = "sipgoogle";
+
+            setValue( QString( "%1_legacy/username" ).arg( sipName ), value( "jabber/username" ) );
+            setValue( QString( "%1_legacy/password" ).arg( sipName ), value( "jabber/password" ) );
+            setValue( QString( "%1_legacy/autoconnect" ).arg( sipName ), value( "jabber/autoconnect" ) );
+            setValue( QString( "%1_legacy/port" ).arg( sipName ), value( "jabber/port" ) );
+            setValue( QString( "%1_legacy/server" ).arg( sipName ), value( "jabber/server" ) );
+
+            addSipPlugin( QString( "%1_legacy" ).arg( sipName ) );
+
+            remove( "jabber/username" );
+            remove( "jabber/password" );
+            remove( "jabber/autoconnect" );
+            remove( "jabber/server" );
+            remove( "jabber/port" );
+        }
+        if ( contains( "twitter/ScreenName" ) && contains( "twitter/OAuthToken" ) )
+        {
+            setValue( "siptwitter_legacy/ScreenName", value( "twitter/ScreenName" ) );
+            setValue( "siptwitter_legacy/OAuthToken", value( "twitter/OAuthToken" ) );
+            setValue( "siptwitter_legacy/OAuthTokenSecret", value( "twitter/OAuthTokenSecret" ) );
+            setValue( "siptwitter_legacy/CachedFriendsSinceID", value( "twitter/CachedFriendsSinceID" ) );
+            setValue( "siptwitter_legacy/CachedMentionsSinceID", value( "twitter/CachedMentionsSinceID" ) );
+            setValue( "siptwitter_legacy/CachedDirectMessagesSinceID", value( "twitter/CachedDirectMessagesSinceID" ) );
+            setValue( "siptwitter_legacy/CachedPeers", value( "twitter/CachedPeers" ) );
+            setValue( "siptwitter_legacy/AutoConnect", value( "jabber/autoconnect" ) );
+
+            addSipPlugin( "siptwitter_legacy" );
+            remove( "twitter/ScreenName" );
+            remove( "twitter/OAuthToken" );
+            remove( "twitter/OAuthTokenSecret" );
+            remove( "twitter/CachedFriendsSinceID" );
+            remove( "twitter/CachedMentionsSinceID" );
+            remove( "twitter/CachedDirectMessagesSinceID" );
+        }
+        // create a zeroconf plugin too
+        addSipPlugin( "sipzeroconf_legacy" );
+    }
+    else if ( oldVersion == 3 )
+    {
+        if ( contains( "script/atticaresolverstates" ) )
+        {
+            // Do messy binary upgrade. remove attica resolvers :(
+            setValue( "script/atticaresolverstates", QVariant() );
+
+            QDir resolverDir = TomahawkUtils::appDataDir();
+            if ( !resolverDir.cd( QString( "atticaresolvers" ) ) )
+                return;
+
+            QStringList toremove;
+            QStringList resolvers = resolverDir.entryList( QDir::Dirs | QDir::NoDotAndDotDot );
+            QStringList listedResolvers = value( "script/resolvers" ).toStringList();
+            QStringList enabledResolvers = value( "script/loadedresolvers" ).toStringList();
+            foreach ( const QString& resolver, resolvers )
+            {
+                foreach ( const QString& r, listedResolvers )
+                {
+                    if ( r.contains( resolver ) )
+                    {
+                        tDebug() << "Deleting listed resolver:" << r;
+                        listedResolvers.removeAll( r );
+                    }
+                }
+                foreach ( const QString& r, enabledResolvers )
+                {
+                    if ( r.contains( resolver ) )
+                    {
+                        tDebug() << "Deleting enabled resolver:" << r;
+                        enabledResolvers.removeAll( r );
+                    }
+                }
+            }
+            setValue( "script/resolvers", listedResolvers );
+            setValue( "script/loadedresolvers", enabledResolvers );
+            tDebug() << "UPGRADING AND DELETING:" << resolverDir.absolutePath();
+            TomahawkUtils::removeDirectory( resolverDir.absolutePath() );
+        }
+    }
+    else if ( oldVersion == 4 || oldVersion == 5 )
+    {
+        // 0.3.0 contained a bug which prevent indexing local files. Force a reindex.
+        QTimer::singleShot( 0, this, SLOT( updateIndex() ) );
+    }
+    else if ( oldVersion == 6 )
+    {
+        // Migrate to accounts from sipplugins.
+        // collect old connected and enabled sip plugins
+        const QStringList allSip = sipPlugins();
+        const QStringList enabledSip = enabledSipPlugins();
+
+        QStringList accounts;
+        foreach ( const QString& sipPlugin, allSip )
+        {
+            const QStringList parts = sipPlugin.split( "_" );
+            Q_ASSERT( parts.size() == 2 );
+
+            const QString pluginName = parts 0 ;
+            const QString pluginId = parts 1 ;
+
+            // new key, <plugin>account_<id>
+            QString rawpluginname = pluginName;
+            rawpluginname.replace( "sip", "" );
+            if ( rawpluginname.contains( "jabber" ) )
+                rawpluginname.replace( "jabber", "xmpp" );
+
+            QString accountKey = QString( "%1account_%2" ).arg( rawpluginname ).arg( pluginId );
+
+            if ( pluginName == "sipjabber" || pluginName == "sipgoogle" )
+            {
+                QVariantHash credentials;
+                credentials "username"  = value( sipPlugin + "/username" );
+                credentials "password"  = value( sipPlugin + "/password" );
+
+                QVariantHash configuration;
+                configuration "port"  = value( sipPlugin + "/port" );
+                configuration "server"  = value( sipPlugin + "/server" );
+
+                setValue( QString( "accounts/%1/credentials" ).arg( accountKey ), credentials );
+                setValue( QString( "accounts/%1/configuration" ).arg( accountKey ), configuration );
+                setValue( QString( "accounts/%1/accountfriendlyname" ).arg( accountKey ), value( sipPlugin + "/username" ) );
+
+            }
+            else if ( pluginName == "siptwitter" )
+            {
+                // Only port twitter plugin if there's a valid twitter config
+                if ( value( sipPlugin + "/oauthtokensecret" ).toString().isEmpty() &&
+                     value( sipPlugin + "/oauthtoken" ).toString().isEmpty() &&
+                     value( sipPlugin + "/screenname" ).toString().isEmpty() )
+                    continue;
+
+                QVariantHash credentials;
+                credentials "oauthtoken"  = value( sipPlugin + "/oauthtoken" );
+                credentials "oauthtokensecret"  = value( sipPlugin + "/oauthtokensecret" );
+                credentials "username"  = value( sipPlugin + "/screenname" );
+
+                QVariantHash configuration;
+                configuration "cachedfriendssinceid"  = value( sipPlugin + "/cachedfriendssinceid" );
+                configuration "cacheddirectmessagessinceid"  = value( sipPlugin + "/cacheddirectmessagessinceid" );
+                configuration "cachedpeers"  = value( sipPlugin + "/cachedpeers" );
+                qDebug() << "FOUND CACHED PEERS:" << value( sipPlugin + "/cachedpeers" ).toHash();
+                configuration "cachedmentionssinceid"  = value( sipPlugin + "/cachedmentionssinceid" );
+                configuration "saveddbid"  = value( sipPlugin + "/saveddbid" );
+
+                setValue( QString( "accounts/%1/credentials" ).arg( accountKey ), credentials );
+                setValue( QString( "accounts/%1/configuration" ).arg( accountKey ), configuration );
+                setValue( QString( "accounts/%1/accountfriendlyname" ).arg( accountKey ), "@" + value( sipPlugin + "/screenname" ).toString() );
+                sync();
+            }
+            else if ( pluginName == "sipzeroconf" )
+            {
+                setValue( QString( "accounts/%1/accountfriendlyname" ).arg( accountKey ), "Local Network" );
+            }
+
+            beginGroup( "accounts/" + accountKey );
+            setValue( "enabled", enabledSip.contains( sipPlugin ) == true );
+            setValue( "autoconnect", true );
+            setValue( "acl", QVariantHash() );
+            setValue( "types", QStringList() << "SipType" );
+            endGroup();
+            accounts << accountKey;
+
+            remove( sipPlugin );
+        }
+        remove( "sip" );
+
+        // Migrate all resolvers from old resolvers settings to new accounts system
+        const QStringList allResolvers = value( "script/resolvers" ).toStringList();
+        const QStringList enabledResolvers = value( "script/loadedresolvers" ).toStringList();
+
+        foreach ( const QString& resolver, allResolvers )
+        {
+            // We handle last.fm resolvers differently.
+            if ( resolver.contains( "lastfm" ) )
+                continue;
+
+            const QString accountKey = QString( "resolveraccount_%1" ).arg( QUuid::createUuid().toString().mid( 1, 8 ) );
+            accounts << accountKey;
+
+            beginGroup( "accounts/" + accountKey );
+            setValue( "accountfriendlyname", resolver );
+            setValue( "enabled", enabledResolvers.contains( resolver ) == true );
+            setValue( "autoconnect", true );
+            setValue( "types", QStringList() << "ResolverType" );
+
+            QVariantHash configuration;
+            configuration "path"  = resolver;
+
+            // reasonably ugly check for attica resolvers
+            if ( resolver.contains( "atticaresolvers" ) && resolver.contains( "code" ) )
+            {
+                setValue( "atticaresolver", true );
+
+                QFileInfo info( resolver );
+                configuration "atticaId"  = info.baseName();
+            }
+
+            setValue( "configuration", configuration );
+            endGroup();
+
+        }
+
+        // Add a Last.Fm account since we now moved the infoplugin into the account
+        const QString accountKey = QString( "lastfmaccount_%1" ).arg( QUuid::createUuid().toString().mid( 1, 8 ) );
+        accounts << accountKey;
+        const QString lfmUsername = value( "lastfm/username" ).toString();
+        const QString lfmPassword = value( "lastfm/password" ).toString();
+        const bool scrobble = value( "lastfm/enablescrobbling", false ).toBool();
+        beginGroup( "accounts/" + accountKey );
+        bool hasLastFmEnabled = false;
+        foreach ( const QString& r, enabledResolvers )
+        {
+            if ( r.contains( "lastfm" ) )
+            {
+                hasLastFmEnabled = true;
+                break;
+            }
+        }
+        setValue( "enabled", hasLastFmEnabled );
+        setValue( "autoconnect", true );
+        setValue( "types", QStringList() << "ResolverType" << "StatusPushType" );
+        QVariantHash credentials;
+        credentials "username"  = lfmUsername;
+        credentials "password"  = lfmPassword;
+        credentials "session"  = value( "lastfm/session" ).toString();
+        setValue( "credentials", credentials );
+        QVariantHash configuration;
+        configuration "scrobble"  = scrobble;
+        setValue( "configuration", configuration );
+        endGroup();
+
+        remove( "lastfm" );
+
+        remove( "script/resolvers" );
+        remove( "script/loadedresolvers" );
+
+        setValue( "accounts/allaccounts", accounts );
+    }
+    else if ( oldVersion == 7 )
+    {
+        // Upgrade spotify resolver to standalone account, if one exists
+        beginGroup( "accounts" );
+        QStringList allAccounts = value( "allaccounts" ).toStringList();
+        foreach ( const QString& account, allAccounts )
+        {
+            if ( account.startsWith( "resolveraccount_" ) && value( QString( "%1/accountfriendlyname" ).arg( account ) ).toString().endsWith( "spotify_tomahawkresolver" ) )
+            {
+                // This is a spotify resolver, convert!
+                const QVariantHash configuration = value( QString( "%1/configuration" ).arg( account ) ).toHash();
+                const bool enabled = value( QString( "%1/enabled" ).arg( account ) ).toBool();
+                const bool autoconnect = value( QString( "%1/autoconnect" ).arg( account ) ).toBool();
+
+                qDebug() << "Migrating Spotify resolver from legacy resolver type, path is:" << configuration "path" .toString();
+
+                remove( account );
+
+                // Create new account
+                QString newAccount = account;
+                newAccount.replace( "resolveraccount_", "spotifyaccount_" );
+                beginGroup( newAccount );
+                setValue( "enabled", enabled );
+                setValue( "autoconnect", autoconnect );
+                setValue( "types", QStringList() << "ResolverType" );
+                setValue( "accountfriendlyname", "Spotify" );
+                setValue( "configuration", configuration );
+                endGroup();
+
+                allAccounts.replace( allAccounts.indexOf( account ), newAccount );
+            }
+        }
+
+        setValue( "allaccounts", allAccounts );
+        endGroup();
+    }
+    else if ( oldVersion == 8 )
+    {
+        // Some users got duplicate accounts for some reason, so make them unique if we can
+        QSet< QString > uniqueFriendlyNames;
+        beginGroup("accounts");
+        const QStringList accounts = childGroups();
+        QStringList allAccounts = value( "allaccounts" ).toStringList();
+
+//        qDebug() << "Got accounts to migrate:" << accounts;
+        foreach ( const QString& account, accounts )
+        {
+            if ( !allAccounts.contains( account ) ) // orphan
+            {
+                qDebug() << "Found account not in allaccounts list!" << account << "is a dup!";
+                remove( account );
+                continue;
+            }
+
+            const QString friendlyName = value( QString( "%1/accountfriendlyname" ).arg( account ) ).toString();
+            if ( !uniqueFriendlyNames.contains( friendlyName ) )
+            {
+                uniqueFriendlyNames.insert( friendlyName );
+                continue;
+            }
+            else
+            {
+                // Duplicate..?
+                qDebug() << "Found duplicate account friendly name:" << account << friendlyName << "is a dup!";
+                remove( account );
+                allAccounts.removeAll( account );
+            }
+        }
+        qDebug() << "Ended up with all accounts list:" << allAccounts << "and all accounts:" << childGroups();
+        setValue( "allaccounts", allAccounts );
+        endGroup();
+    }
+    else if ( oldVersion == 9 )
+    {
+        // Upgrade single-updater-per-playlist to list-per-playlist
+        beginGroup( "playlistupdaters" );
+        const QStringList playlists = childGroups();
+
+        SerializedUpdaters updaters;
+        foreach ( const QString& playlist, playlists )
+        {
+            beginGroup( playlist );
+            const QString type = value( "type" ).toString();
+
+            QVariantHash extraData;
+            foreach ( const QString& key, childKeys() )
+            {
+                if ( key == "type" )
+                    continue;
+
+                extraData key  = value( key );
+            }
+
+            updaters.insert( playlist, SerializedUpdater( type, extraData ) );
+
+            endGroup();
+        }
+
+        endGroup();
+        remove( "playlistupdaters" );
+
+        setValue( "playlists/updaters", QVariant::fromValue< SerializedUpdaters >( updaters ) );
+
+    }
+    else if ( oldVersion == 11 )
+    {
+        // If the user doesn't have a spotify account, create one, since now it
+        // is like the last.fm account and always exists
+        QStringList allAccounts = value( "accounts/allaccounts" ).toStringList();
+        QString acct;
+        foreach ( const QString& account, allAccounts )
+        {
+            if ( account.startsWith( "spotifyaccount_" ) )
+            {
+                acct = account;
+                break;
+            }
+        }
+
+        if ( !acct.isEmpty() )
+        {
+            beginGroup( "accounts/" + acct );
+            QVariantHash conf = value( "configuration" ).toHash();
+            foreach ( const QString& key, conf.keys() )
+                qDebug() << key << conf key .toString();
+            endGroup();
+        }
+        else
+        {
+            createSpotifyAccount();
+        }
+    }
+}
+
+
+void
+TomahawkSettings::setAcceptedLegalWarning( bool accept )
+{
+    setValue( "acceptedLegalWarning", accept );
+}
+
+
+bool
+TomahawkSettings::acceptedLegalWarning() const
+{
+    return value( "acceptedLegalWarning", false ).toBool();
+}
+
+
+void
+TomahawkSettings::setInfoSystemCacheVersion( uint version )
+{
+    setValue( "infosystemcacheversion", version );
+}
+
+
+uint
+TomahawkSettings::infoSystemCacheVersion() const
+{
+    return value( "infosystemcacheversion", 3 ).toUInt();
+}
+
+
+QString
+TomahawkSettings::storageCacheLocation() const
+{
+    return QDir::tempPath() + "/tomahawk/";
+}
+
+
+QStringList
+TomahawkSettings::scannerPaths() const
+{
+    QString musicLocation;
+
+#if defined(Q_WS_X11)
+    musicLocation = QDir::homePath() + QLatin1String("/Music");
+#endif
+
+    return value( "scanner/paths", musicLocation ).toStringList();
+}
+
+
+void
+TomahawkSettings::setScannerPaths( const QStringList& paths )
+{
+    setValue( "scanner/paths", paths );
+}
+
+
+bool
+TomahawkSettings::hasScannerPaths() const
+{
+    //FIXME: After enough time, remove this hack
+    return contains( "scanner/paths" ) || contains( "scannerpath" ) || contains( "scannerpaths" );
+}
+
+
+uint
+TomahawkSettings::scannerTime() const
+{
+    return value( "scanner/intervaltime", 60 ).toUInt();
+}
+
+
+void
+TomahawkSettings::setScannerTime( uint time )
+{
+    setValue( "scanner/intervaltime", time );
+}
+
+
+bool
+TomahawkSettings::watchForChanges() const
+{
+    return value( "scanner/watchforchanges", false ).toBool();
+}
+
+
+void
+TomahawkSettings::setWatchForChanges( bool watch )
+{
+    setValue( "scanner/watchforchanges", watch );
+}
+
+
+bool
+TomahawkSettings::httpEnabled() const
+{
+    return value( "network/http", true ).toBool();
+}
+
+
+void
+TomahawkSettings::setHttpEnabled( bool enable )
+{
+    setValue( "network/http", enable );
+}
+
+
+bool
+TomahawkSettings::crashReporterEnabled() const
+{
+    return value( "ui/crashReporter", true ).toBool();
+}
+
+
+void
+TomahawkSettings::setCrashReporterEnabled( bool enable )
+{
+    setValue( "ui/crashReporter", enable );
+}
+
+
+unsigned int
+TomahawkSettings::volume() const
+{
+    return value( "audio/volume", 75 ).toUInt();
+}
+
+
+void
+TomahawkSettings::setVolume( unsigned int volume )
+{
+    setValue( "audio/volume", volume );
+}
+
+
+QString
+TomahawkSettings::proxyHost() const
+{
+    return value( "network/proxy/host", QString() ).toString();
+}
+
+
+void
+TomahawkSettings::setProxyHost( const QString& host )
+{
+    setValue( "network/proxy/host", host );
+}
+
+
+QString
+TomahawkSettings::proxyNoProxyHosts() const
+{
+    return value( "network/proxy/noproxyhosts", QString() ).toString();
+}
+
+
+void
+TomahawkSettings::setProxyNoProxyHosts( const QString& hosts )
+{
+    setValue( "network/proxy/noproxyhosts", hosts );
+}
+
+
+qulonglong
+TomahawkSettings::proxyPort() const
+{
+    return value( "network/proxy/port", 1080 ).toULongLong();
+}
+
+
+void
+TomahawkSettings::setProxyPort( const qulonglong port )
+{
+    setValue( "network/proxy/port", port );
+}
+
+
+QString
+TomahawkSettings::proxyUsername() const
+{
+    return value( "network/proxy/username", QString() ).toString();
+}
+
+
+void
+TomahawkSettings::setProxyUsername( const QString& username )
+{
+    setValue( "network/proxy/username", username );
+}
+
+
+QString
+TomahawkSettings::proxyPassword() const
+{
+    return value( "network/proxy/password", QString() ).toString();
+}
+
+
+void
+TomahawkSettings::setProxyPassword( const QString& password )
+{
+    setValue( "network/proxy/password", password );
+}
+
+
+QNetworkProxy::ProxyType
+TomahawkSettings::proxyType() const
+{
+    return static_cast< QNetworkProxy::ProxyType>( value( "network/proxy/type", QNetworkProxy::NoProxy ).toInt() );
+}
+
+
+void
+TomahawkSettings::setProxyType( const QNetworkProxy::ProxyType type )
+{
+    setValue( "network/proxy/type", static_cast< uint >( type ) );
+}
+
+
+bool
+TomahawkSettings::proxyDns() const
+{
+    return value( "network/proxy/dns", false ).toBool();
+}
+
+
+void
+TomahawkSettings::setProxyDns( bool lookupViaProxy )
+{
+    setValue( "network/proxy/dns", lookupViaProxy );
+}
+
+
+QVariantList
+TomahawkSettings::aclEntries() const
+{
+    QVariant retVal = value( "acl/entries", QVariantList() );
+    if ( retVal.isValid() && retVal.canConvert< QVariantList >() )
+        return retVal.toList();
+
+    return QVariantList();
+}
+
+
+void
+TomahawkSettings::setAclEntries( const QVariantList &entries )
+{
+    tDebug() << "Setting entries";
+    setValue( "acl/entries", entries );
+    sync();
+    tDebug() << "Done setting entries";
+}
+
+
+QByteArray
+TomahawkSettings::mainWindowGeometry() const
+{
+    return value( "ui/mainwindow/geometry" ).toByteArray();
+}
+
+
+void
+TomahawkSettings::setMainWindowGeometry( const QByteArray& geom )
+{
+    setValue( "ui/mainwindow/geometry", geom );
+}
+
+
+QByteArray
+TomahawkSettings::mainWindowState() const
+{
+    return value( "ui/mainwindow/state" ).toByteArray();
+}
+
+
+void
+TomahawkSettings::setMainWindowState( const QByteArray& state )
+{
+    setValue( "ui/mainwindow/state", state );
+}
+
+
+QByteArray
+TomahawkSettings::mainWindowSplitterState() const
+{
+    return value( "ui/mainwindow/splitterState" ).toByteArray();
+}
+
+
+void
+TomahawkSettings::setMainWindowSplitterState( const QByteArray& state )
+{
+    setValue( "ui/mainwindow/splitterState", state );
+}
+
+
+bool
+TomahawkSettings::verboseNotifications() const
+{
+    return value( "ui/notifications/verbose", false ).toBool();
+}
+
+
+void
+TomahawkSettings::setVerboseNotifications( bool notifications )
+{
+    setValue( "ui/notifications/verbose", notifications );
+}
+
+
+bool
+TomahawkSettings::showOfflineSources() const
+{
+    return value( "collection/sources/showoffline", false ).toBool();
+}
+
+
+void
+TomahawkSettings::setShowOfflineSources( bool show )
+{
+    setValue( "collection/sources/showoffline", show );
+}
+
+
+bool
+TomahawkSettings::enableEchonestCatalogs() const
+{
+    return value( "collection/enable_catalogs", false ).toBool();
+}
+
+
+void
+TomahawkSettings::setEnableEchonestCatalogs( bool enable )
+{
+    setValue( "collection/enable_catalogs", enable );
+}
+
+
+QByteArray
+TomahawkSettings::playlistColumnSizes( const QString& playlistid ) const
+{
+    return value( QString( "ui/playlist/%1/columnSizes" ).arg( playlistid ) ).toByteArray();
+}
+
+
+void
+TomahawkSettings::setPlaylistColumnSizes( const QString& playlistid, const QByteArray& state )
+{
+    setValue( QString( "ui/playlist/%1/columnSizes" ).arg( playlistid ), state );
+}
+
+
+bool
+TomahawkSettings::shuffleState( const QString& playlistid ) const
+{
+    return value( QString( "ui/playlist/%1/shuffleState" ).arg( playlistid )).toBool();
+}
+
+
+void
+TomahawkSettings::setShuffleState( const QString& playlistid, bool state)
+{
+    setValue( QString( "ui/playlist/%1/shuffleState" ).arg( playlistid ), state );
+}
+
+
+void
+TomahawkSettings::removePlaylistSettings( const QString& playlistid )
+{
+    remove( QString( "ui/playlist/%1/shuffleState" ).arg( playlistid ) );
+    remove( QString( "ui/playlist/%1/repeatMode" ).arg( playlistid ) );
+}
+
+
+void
+TomahawkSettings::setRepeatMode( const QString& playlistid, Tomahawk::PlaylistModes::RepeatMode mode )
+{
+    setValue( QString( "ui/playlist/%1/repeatMode" ).arg( playlistid ), (int)mode );
+}
+
+
+Tomahawk::PlaylistModes::RepeatMode
+TomahawkSettings::repeatMode( const QString& playlistid )
+{
+    return (PlaylistModes::RepeatMode)value( QString( "ui/playlist/%1/repeatMode" ).arg( playlistid )).toInt();
+}
+
+
+QStringList
+TomahawkSettings::recentlyPlayedPlaylistGuids( unsigned int amount ) const
+{
+    QStringList p = value( "playlists/recentlyPlayed" ).toStringList();
+
+    while ( amount && p.count() > (int)amount )
+        p.removeAt( 0 );
+
+    return p;
+}
+
+
+void
+TomahawkSettings::appendRecentlyPlayedPlaylist( const QString& playlistguid, int sourceId )
+{
+    QStringList playlist_guids = value( "playlists/recentlyPlayed" ).toStringList();
+
+    playlist_guids.removeAll( playlistguid );
+    playlist_guids.append( playlistguid );
+
+    setValue( "playlists/recentlyPlayed", playlist_guids );
+
+    emit recentlyPlayedPlaylistAdded( playlistguid, sourceId );
+}
+
+
+QString
+TomahawkSettings::bookmarkPlaylist() const
+{
+    return value( "playlists/bookmark", QString() ).toString();
+}
+
+
+void
+TomahawkSettings::setBookmarkPlaylist( const QString& guid )
+{
+    setValue( "playlists/bookmark", guid );
+}
+
+
+QStringList
+TomahawkSettings::sipPlugins() const
+{
+    return value( "sip/allplugins", QStringList() ).toStringList();
+}
+
+
+void
+TomahawkSettings::setSipPlugins( const QStringList& plugins )
+{
+    setValue( "sip/allplugins", plugins );
+}
+
+
+QStringList
+TomahawkSettings::enabledSipPlugins() const
+{
+    return value( "sip/enabledplugins", QStringList() ).toStringList();
+}
+
+
+void
+TomahawkSettings::setEnabledSipPlugins( const QStringList& list )
+{
+    setValue( "sip/enabledplugins", list );
+}
+
+
+void
+TomahawkSettings::enableSipPlugin( const QString& pluginId )
+{
+    QStringList list = enabledSipPlugins();
+    list << pluginId;
+    setEnabledSipPlugins( list );
+}
+
+
+void
+TomahawkSettings::disableSipPlugin( const QString& pluginId )
+{
+    QStringList list = enabledSipPlugins();
+    list.removeAll( pluginId );
+    setEnabledSipPlugins( list );
+}
+
+
+void
+TomahawkSettings::addSipPlugin( const QString& pluginId, bool enable )
+{
+    QStringList list = sipPlugins();
+    list << pluginId;
+    setSipPlugins( list );
+
+    if ( enable )
+        enableSipPlugin( pluginId );
+}
+
+
+void
+TomahawkSettings::removeSipPlugin( const QString& pluginId )
+{
+    QStringList list = sipPlugins();
+    list.removeAll( pluginId );
+    setSipPlugins( list );
+
+    if( enabledSipPlugins().contains( pluginId ) )
+        disableSipPlugin( pluginId );
+}
+
+
+QStringList
+TomahawkSettings::accounts() const
+{
+    QStringList accounts = value( "accounts/allaccounts", QStringList() ).toStringList();
+    accounts.removeDuplicates();
+
+    return accounts;
+}
+
+
+void
+TomahawkSettings::setAccounts( const QStringList& accountIds )
+{
+    QStringList accounts = accountIds;
+    accounts.removeDuplicates();
+
+    setValue( "accounts/allaccounts", accounts );
+}
+
+
+void
+TomahawkSettings::addAccount( const QString& accountId )
+{
+    QStringList list = accounts();
+    list << accountId;
+    setAccounts( list );
+}
+
+
+void
+TomahawkSettings::removeAccount( const QString& accountId )
+{
+    QStringList list = accounts();
+    list.removeAll( accountId );
+    setAccounts( list );
+}
+
+
+TomahawkSettings::ExternalAddressMode
+TomahawkSettings::externalAddressMode()
+{
+    if ( value( "network/prefer-static-host-and-port", false ).toBool() )
+    {
+        remove( "network/prefer-static-host-and-port" );
+        setValue( "network/external-address-mode", TomahawkSettings::Static );
+    }
+    return (TomahawkSettings::ExternalAddressMode) value( "network/external-address-mode", TomahawkSettings::Upnp ).toInt();
+}
+
+
+void
+TomahawkSettings::setExternalAddressMode( ExternalAddressMode externalAddressMode )
+{
+    setValue( "network/external-address-mode", externalAddressMode );
+}
+
+
+QString
+TomahawkSettings::externalHostname() const
+{
+    return value( "network/external-hostname" ).toString();
+}
+
+
+void
+TomahawkSettings::setExternalHostname(const QString& externalHostname)
+{
+    setValue( "network/external-hostname", externalHostname );
+}
+
+
+int
+TomahawkSettings::defaultPort() const
+{
+    return 50210;
+}
+
+
+int
+TomahawkSettings::externalPort() const
+{
+    return value( "network/external-port", 50210 ).toInt();
+}
+
+
+void
+TomahawkSettings::setExternalPort(int externalPort)
+{
+    if ( externalPort == 0 )
+        setValue( "network/external-port", 50210);
+    else
+        setValue( "network/external-port", externalPort);
+}
+
+
+QString
+TomahawkSettings::xmppBotServer() const
+{
+    return value( "xmppBot/server", QString() ).toString();
+}
+
+
+void
+TomahawkSettings::setXmppBotServer( const QString& server )
+{
+    setValue( "xmppBot/server", server );
+}
+
+
+QString
+TomahawkSettings::xmppBotJid() const
+{
+    return value( "xmppBot/jid", QString() ).toString();
+}
+
+
+void
+TomahawkSettings::setXmppBotJid( const QString& component )
+{
+    setValue( "xmppBot/jid", component );
+}
+
+
+QString
+TomahawkSettings::xmppBotPassword() const
+{
+    return value( "xmppBot/password", QString() ).toString();
+}
+
+
+void
+TomahawkSettings::setXmppBotPassword( const QString& password )
+{
+    setValue( "xmppBot/password", password );
+}
+
+
+int
+TomahawkSettings::xmppBotPort() const
+{
+    return value( "xmppBot/port", -1 ).toInt();
+}
+
+
+void
+TomahawkSettings::setXmppBotPort( const int port )
+{
+    setValue( "xmppBot/port", port );
+}
+
+
+QString
+TomahawkSettings::scriptDefaultPath() const
+{
+    return value( "script/defaultpath", QDir::homePath() ).toString();
+}
+
+
+void
+TomahawkSettings::setScriptDefaultPath( const QString& path )
+{
+    setValue( "script/defaultpath", path );
+}
+
+
+QString
+TomahawkSettings::playlistDefaultPath() const
+{
+    return value( "playlists/defaultpath", QDir::homePath() ).toString();
+}
+
+
+void
+TomahawkSettings::setPlaylistDefaultPath( const QString& path )
+{
+    setValue( "playlists/defaultpath", path );
+}
+
+
+bool
+TomahawkSettings::nowPlayingEnabled() const
+{
+    return value( "adium/enablenowplaying", false ).toBool();
+}
+
+
+void
+TomahawkSettings::setNowPlayingEnabled( bool enable )
+{
+    setValue( "adium/enablenowplaying", enable );
+}
+
+
+TomahawkSettings::PrivateListeningMode
+TomahawkSettings::privateListeningMode() const
+{
+    return ( TomahawkSettings::PrivateListeningMode ) value( "privatelisteningmode", TomahawkSettings::PublicListening ).toInt();
+}
+
+
+void
+TomahawkSettings::setPrivateListeningMode( TomahawkSettings::PrivateListeningMode mode )
+{
+    setValue( "privatelisteningmode", mode );
+}
+
+
+void
+TomahawkSettings::updateIndex()
+{
+    DatabaseCommand* cmd = new DatabaseCommand_UpdateSearchIndex();
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+QString
+TomahawkSettings::importXspfPath() const
+{
+    if ( contains( "importXspfPath" ) )
+        return value( "importXspfPath" ).toString();
+    else
+        return QDir::homePath();
+}
+
+
+void
+TomahawkSettings::setImportXspfPath( const QString& path )
+{
+    setValue( "importXspfPath", path );
+}
+
+
+SerializedUpdaters
+TomahawkSettings::playlistUpdaters() const
+{
+    return value( "playlists/updaters" ).value< SerializedUpdaters >();
+}
+
+
+void
+TomahawkSettings::setPlaylistUpdaters( const SerializedUpdaters& updaters )
+{
+    setValue( "playlists/updaters", QVariant::fromValue< SerializedUpdaters >( updaters ) );
+}
+
+
+void
+TomahawkSettings::registerCustomSettingsHandlers()
+{
+    qRegisterMetaType< Tomahawk::SerializedUpdater >( "Tomahawk::SerializedUpdater" );
+    qRegisterMetaType< Tomahawk::SerializedUpdaters >( "Tomahawk::SerializedUpdaters" );
+    qRegisterMetaTypeStreamOperators< Tomahawk::SerializedUpdaters >( "Tomahawk::SerializedUpdaters" );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/TomahawkSettings.h Added

@@ -0,0 +1,229 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012  Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWK_SETTINGS_H
+#define TOMAHAWK_SETTINGS_H
+
+#include "DllMacro.h"
+#include "Typedefs.h"
+
+#include <QSettings>
+#include <QtNetwork/QNetworkProxy>
+#include <QStringList>
+
+#define TOMAHAWK_SETTINGS_VERSION 12
+
+/**
+ * Convenience wrapper around QSettings for tomahawk-specific config
+ */
+class DLLEXPORT TomahawkSettings : public QSettings
+{
+Q_OBJECT
+
+public:
+    static TomahawkSettings* instance();
+
+    explicit TomahawkSettings( QObject* parent = 0 );
+    virtual ~TomahawkSettings();
+
+    void applyChanges() { emit changed(); }
+
+    /// General settings
+    virtual QString storageCacheLocation() const;
+
+    virtual QStringList scannerPaths() const; /// QDesktopServices::MusicLocation in TomahawkSettingsGui
+    void setScannerPaths( const QStringList& paths );
+    bool hasScannerPaths() const;
+    uint scannerTime() const;
+    void setScannerTime( uint time );
+
+    uint infoSystemCacheVersion() const;
+    void setInfoSystemCacheVersion( uint version );
+
+    bool watchForChanges() const;
+    void setWatchForChanges( bool watch );
+
+    bool acceptedLegalWarning() const;
+    void setAcceptedLegalWarning( bool accept );
+
+    /// UI settings
+    QByteArray mainWindowGeometry() const;
+    void setMainWindowGeometry( const QByteArray& geom );
+
+    QByteArray mainWindowState() const;
+    void setMainWindowState( const QByteArray& state );
+
+    QByteArray mainWindowSplitterState() const;
+    void setMainWindowSplitterState( const QByteArray& state );
+
+    bool verboseNotifications() const;
+    void setVerboseNotifications( bool notifications );
+
+    // Collection Stuff
+    bool showOfflineSources() const;
+    void setShowOfflineSources( bool show );
+
+    bool enableEchonestCatalogs() const;
+    void setEnableEchonestCatalogs( bool enable );
+
+    /// Audio stuff
+    unsigned int volume() const;
+    void setVolume( unsigned int volume );
+
+    /// Playlist stuff
+    QByteArray playlistColumnSizes( const QString& playlistid ) const;
+    void setPlaylistColumnSizes( const QString& playlistid, const QByteArray& state );
+
+    QStringList recentlyPlayedPlaylistGuids( unsigned int amount = 0 ) const;
+    void appendRecentlyPlayedPlaylist( const QString& playlistGuid, int sourceId );
+
+    bool shuffleState( const QString& playlistid ) const;
+    void setShuffleState( const QString& playlistid, bool state );
+    Tomahawk::PlaylistModes::RepeatMode repeatMode( const QString& playlistid );
+    void setRepeatMode( const QString& playlistid, Tomahawk::PlaylistModes::RepeatMode mode );
+
+    // remove shuffle state and repeat state
+    void removePlaylistSettings( const QString& playlistid );
+
+    /// SIP plugins
+    // all plugins we know about. loaded, unloaded, enabled, disabled.
+    void setSipPlugins( const QStringList& plugins );
+    QStringList sipPlugins() const;
+
+    // just the enabled sip plugins.
+    void setEnabledSipPlugins( const QStringList& list );
+    QStringList enabledSipPlugins() const;
+    void enableSipPlugin( const QString& pluginId );
+    void disableSipPlugin( const QString& pluginId );
+
+    void addSipPlugin( const QString& pluginId, bool enable = true );
+    void removeSipPlugin( const QString& pluginId );
+
+    void setAccounts( const QStringList& accountIds );
+    QStringList accounts() const;
+    void addAccount( const QString& accountId );
+    void removeAccount( const QString& accountId );
+
+
+    void setBookmarkPlaylist( const QString& guid );
+    QString bookmarkPlaylist() const;
+
+    /// Network settings
+    enum ExternalAddressMode { Lan, Upnp, Static };
+    ExternalAddressMode externalAddressMode();
+    void setExternalAddressMode( ExternalAddressMode externalAddressMode );
+
+    bool httpEnabled() const; /// true by default
+    void setHttpEnabled( bool enable );
+
+    bool crashReporterEnabled() const; /// true by default
+    void setCrashReporterEnabled( bool enable );
+
+    QString externalHostname() const;
+    void setExternalHostname( const QString& externalHostname );
+
+    int defaultPort() const;
+    int externalPort() const;
+    void setExternalPort( int externalPort );
+
+    QString proxyHost() const;
+    void setProxyHost( const QString &host );
+
+    QString proxyNoProxyHosts() const;
+    void setProxyNoProxyHosts( const QString &hosts );
+
+    qulonglong proxyPort() const;
+    void setProxyPort( const qulonglong port );
+
+    QString proxyUsername() const;
+    void setProxyUsername( const QString &username );
+
+    QString proxyPassword() const;
+    void setProxyPassword( const QString &password );
+
+    QNetworkProxy::ProxyType proxyType() const;
+    void setProxyType( const QNetworkProxy::ProxyType type );
+
+    bool proxyDns() const;
+    void setProxyDns( bool lookupViaProxy );
+
+    /// ACL settings
+    QVariantList aclEntries() const;
+    void setAclEntries( const QVariantList &entries );
+
+    /// XMPP Component Settings
+    QString xmppBotServer() const;
+    void setXmppBotServer( const QString &server );
+
+    QString xmppBotJid() const;
+    void setXmppBotJid( const QString &component );
+
+    QString xmppBotPassword() const;
+    void setXmppBotPassword( const QString &password );
+
+    int xmppBotPort() const;
+    void setXmppBotPort( const int port );
+
+    QString scriptDefaultPath() const;
+    void setScriptDefaultPath( const QString& path );
+    QString playlistDefaultPath() const;
+    void setPlaylistDefaultPath( const QString& path );
+
+    // Now-Playing Settings
+    // For now, just Adium. Soon, the world!
+    bool nowPlayingEnabled() const; // false by default
+    void setNowPlayingEnabled( bool enable );
+
+    enum PrivateListeningMode
+    {
+        PublicListening,
+        NoLogPlayback,
+        FullyPrivate
+    };
+    PrivateListeningMode privateListeningMode() const;
+    void setPrivateListeningMode( PrivateListeningMode mode );
+
+    void setImportXspfPath( const QString& path );
+    QString importXspfPath() const;
+
+    Tomahawk::SerializedUpdaters playlistUpdaters() const;
+    void setPlaylistUpdaters( const Tomahawk::SerializedUpdaters& updaters );
+
+    static void registerCustomSettingsHandlers();
+
+signals:
+    void changed();
+    void recentlyPlayedPlaylistAdded( const QString& playlistId, int sourceId  );
+
+private slots:
+    void updateIndex();
+
+private:
+    void doInitialSetup();
+    void createLastFmAccount();
+    void createSpotifyAccount();
+    void doUpgrade( int oldVersion, int newVersion );
+
+    static TomahawkSettings* s_instance;
+};
+
+Q_DECLARE_METATYPE( TomahawkSettings::PrivateListeningMode );
+
+#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/TomahawkSettingsGui.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/TomahawkSettingsGui.cpp Changed

@@ -19,31 +19,18 @@
 #include "TomahawkSettingsGui.h"
 
 #include <QDesktopServices>
-#include "settingsdialog.h"
-
-// #include <QDir>
-//
-// #include "sip/SipHandler.h"
-// #include "playlistinterface.h"
-//
-// #include "utils/logger.h"
-// #include "utils/tomahawkutils.h"
-//
-// #include "database/databasecommand_updatesearchindex.h"
-// #include "database/database.h"
-
-#define VERSION 5
+#include "SettingsDialog.h"
 
 using namespace Tomahawk;
 
 inline QDataStream& operator<<(QDataStream& out, const AtticaManager::StateHash& states)
 {
-    out <<  VERSION;
+    out <<  TOMAHAWK_SETTINGS_VERSION;
     out << (quint32)states.count();
     foreach( const QString& key, states.keys() )
     {
         AtticaManager::Resolver resolver = states key ;
-        out << key << resolver.version << resolver.scriptPath << (qint32)resolver.state << resolver.userRating;
+        out << key << resolver.version << resolver.scriptPath << (qint32)resolver.state << resolver.userRating << resolver.binary;
     }
     return out;
 }
@@ -51,23 +38,30 @@
 
 inline QDataStream& operator>>(QDataStream& in, AtticaManager::StateHash& states)
 {
-    quint32 count = 0, version = 0;
-    in >> version;
+    quint32 count = 0, configVersion = 0;
+    in >> configVersion;
     in >> count;
     for ( uint i = 0; i < count; i++ )
     {
         QString key, version, scriptPath;
         qint32 state, userRating;
+        bool binary = false;
         in >> key;
         in >> version;
         in >> scriptPath;
         in >> state;
         in >> userRating;
-        states key  = AtticaManager::Resolver( version, scriptPath, userRating, (AtticaManager::ResolverState)state );
+        if ( configVersion > 10 )
+        {
+            // V11 includes 'bool binary' flag
+            in >> binary;
+        }
+        states key  = AtticaManager::Resolver( version, scriptPath, userRating, (AtticaManager::ResolverState)state, binary );
     }
     return in;
 }
 
+
 TomahawkSettingsGui*
 TomahawkSettingsGui::instanceGui()
 {
@@ -78,8 +72,6 @@
 TomahawkSettingsGui::TomahawkSettingsGui( QObject* parent )
     : TomahawkSettings( parent )
 {
-    qRegisterMetaType< AtticaManager::StateHash >( "AtticaManager::StateHash" );
-    qRegisterMetaTypeStreamOperators<AtticaManager::StateHash>("AtticaManager::StateHash");
 }
 
 
@@ -91,7 +83,7 @@
 QString
 TomahawkSettingsGui::storageCacheLocation() const
 {
-    return QDesktopServices::storageLocation( QDesktopServices::CacheLocation ) + "/InfoSystemCache/";
+    return QDesktopServices::storageLocation( QDesktopServices::CacheLocation );
 }
 
 
@@ -118,12 +110,14 @@
     sync();
 }
 
+
 AtticaManager::StateHash
 TomahawkSettingsGui::atticaResolverStates() const
 {
     return value( "script/atticaresolverstates" ).value< AtticaManager::StateHash >();
 }
 
+
 void
 TomahawkSettingsGui::setAtticaResolverStates( const AtticaManager::StateHash states )
 {
@@ -138,3 +132,11 @@
     resolvers.remove( resolver );
     setValue( "script/atticaresolverstates", QVariant::fromValue< AtticaManager::StateHash >( resolvers ) );
 }
+
+
+void
+TomahawkSettingsGui::registerCustomSettingsHandlers()
+{
+    qRegisterMetaType< AtticaManager::StateHash >( "AtticaManager::StateHash" );
+    qRegisterMetaTypeStreamOperators<AtticaManager::StateHash>("AtticaManager::StateHash");
+}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/TomahawkSettingsGui.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/TomahawkSettingsGui.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/Typedefs.h Added

@@ -0,0 +1,222 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TYPEDEFS_H
+#define TYPEDEFS_H
+
+#include <QSharedPointer>
+#include <QUuid>
+#include <QPair>
+#include <QPersistentModelIndex>
+#include <boost/function.hpp>
+
+//template <typename T> class QSharedPointer;
+
+namespace Tomahawk
+{
+    class Artist;
+    class Album;
+    class Collection;
+    class Playlist;
+    class PlaylistEntry;
+    class PlaylistInterface;
+    class DynamicPlaylist;
+    class Query;
+    class Result;
+    class Source;
+    class DynamicControl;
+    class GeneratorInterface;
+
+    typedef QSharedPointer<Collection> collection_ptr;
+    typedef QSharedPointer<Playlist> playlist_ptr;
+    typedef QSharedPointer<PlaylistEntry> plentry_ptr;
+    typedef QSharedPointer<PlaylistInterface> playlistinterface_ptr;
+    typedef QSharedPointer<DynamicPlaylist> dynplaylist_ptr;
+    typedef QSharedPointer<Query> query_ptr;
+    typedef QSharedPointer<Result> result_ptr;
+    typedef QSharedPointer<Source> source_ptr;
+    typedef QSharedPointer<Artist> artist_ptr;
+    typedef QSharedPointer<Album> album_ptr;
+
+    typedef QSharedPointer<DynamicControl> dyncontrol_ptr;
+    typedef QSharedPointer<GeneratorInterface> geninterface_ptr;
+
+    // let's keep these typesafe, they are different kinds of GUID:
+    typedef QString QID; //query id
+    typedef QString RID; //result id
+
+    enum GeneratorMode
+    {
+        OnDemand = 0,
+        Static
+    };
+
+    enum ModelMode
+    {
+        Mixed = 0,
+        DatabaseMode,
+        InfoSystemMode,
+    };
+
+    class ExternalResolver;
+    typedef boost::function<Tomahawk::ExternalResolver*(QString)> ResolverFactoryFunc;
+
+    namespace PlaylistModes {
+        enum RepeatMode { NoRepeat, RepeatOne, RepeatAll };
+        enum ViewMode { Unknown, Tree, Flat, Album };
+        enum SeekRestrictions { NoSeekRestrictions, NoSeek };
+        enum SkipRestrictions { NoSkipRestrictions, NoSkipForwards, NoSkipBackwards, NoSkip };
+        enum RetryMode { NoRetry, Retry };
+        enum LatchMode { StayOnSong, RealTime };
+    }
+
+
+    struct SerializedUpdater {
+        QString type;
+        QVariantHash customData;
+
+        SerializedUpdater( const QString& t, const QVariantHash cd = QVariantHash() ) : type( t ), customData( cd ) {}
+        SerializedUpdater() {}
+    };
+
+    typedef QMultiHash< QString, SerializedUpdater > SerializedUpdaters;
+    typedef QList< SerializedUpdater > SerializedUpdaterList;
+
+
+    namespace InfoSystem
+    {
+        enum InfoType
+        {
+            // as items are saved in cache, mark them here to not change them
+            InfoNoInfo = 0, //WARNING: *ALWAYS* keep this first!
+            InfoTrackID = 1,
+            InfoTrackArtist = 2,
+            InfoTrackAlbum = 3,
+            InfoTrackGenre = 4,
+            InfoTrackComposer = 5,
+            InfoTrackDate = 6,
+            InfoTrackNumber = 7,
+            InfoTrackDiscNumber = 8,
+            InfoTrackBitRate = 9,
+            InfoTrackLength = 10,
+            InfoTrackSampleRate = 11,
+            InfoTrackFileSize = 12,
+            InfoTrackBPM = 13,
+            InfoTrackReplayGain = 14,
+            InfoTrackReplayPeakGain = 15,
+            InfoTrackLyrics = 16,
+            InfoTrackLocation = 17,
+            InfoTrackProfile = 18,
+            InfoTrackEnergy = 19,
+            InfoTrackDanceability = 20,
+            InfoTrackTempo = 21,
+            InfoTrackLoudness = 22,
+            InfoTrackSimilars = 23, // cached -- do not change
+
+            InfoArtistID = 25,
+            InfoArtistName = 26,
+            InfoArtistBiography = 27,
+            InfoArtistImages = 28, //cached -- do not change
+            InfoArtistBlog = 29,
+            InfoArtistFamiliarity = 30,
+            InfoArtistHotttness = 31,
+            InfoArtistSongs = 32, //cached -- do not change
+            InfoArtistSimilars = 33, //cached -- do not change
+            InfoArtistNews = 34,
+            InfoArtistProfile = 35,
+            InfoArtistReviews = 36,
+            InfoArtistTerms = 37,
+            InfoArtistLinks = 38,
+            InfoArtistVideos = 39,
+            InfoArtistReleases = 40,
+
+            InfoAlbumID = 42,
+            InfoAlbumCoverArt = 43, //cached -- do not change
+            InfoAlbumName = 44,
+            InfoAlbumArtist = 45,
+            InfoAlbumDate = 46,
+            InfoAlbumGenre = 47,
+            InfoAlbumComposer = 48,
+            InfoAlbumSongs = 49,
+
+            /** \var Tomahawk::InfoSystem::InfoType Tomahawk::InfoSystem::InfoType::InfoChartCapabilities
+            * Documentation for InfoChartCapabilities
+            *
+            * Clients of this InfoType expect a QVariant
+            *
+            */
+            InfoChartCapabilities = 50,
+            /**
+            * Documentation for InfoChartArtists
+            */
+            InfoChart = 51,
+
+            InfoNewReleaseCapabilities = 52,
+            InfoNewRelease = 53,
+
+            InfoMiscTopHotttness = 60,
+            InfoMiscTopTerms = 61,
+
+            InfoSubmitNowPlaying = 70,
+            InfoSubmitScrobble = 71,
+
+            InfoNowPlaying = 80,
+            InfoNowPaused = 81,
+            InfoNowResumed = 82,
+            InfoNowStopped = 83,
+            InfoTrackUnresolved = 84,
+
+            InfoLove = 90,
+            InfoUnLove = 91,
+            InfoShareTrack = 92,
+
+            InfoNotifyUser = 100,
+
+            InfoLastInfo = 101 //WARNING: *ALWAYS* keep this last!
+        };
+
+        class InfoPlugin;
+
+        typedef QMap< InfoType, QVariant > InfoTypeMap;
+        typedef QMap< InfoType, uint > InfoTimeoutMap;
+        typedef QHash< QString, QString > InfoStringHash;
+        typedef QPair< QVariantMap, QVariant > PushInfoPair;
+
+        typedef QWeakPointer< InfoPlugin > InfoPluginPtr;
+    }
+}; // ns
+
+typedef int AudioErrorCode;
+typedef int AudioState;
+typedef QList< QPair< QString, QString > > PairList;
+
+// creates 36char ascii guid without {} around it
+inline static QString uuid()
+{
+    // kinda lame, but
+    QString q = QUuid::createUuid();
+    q.remove( 0, 1 );
+    q.chop( 1 );
+    return q;
+}
+
+Q_DECLARE_METATYPE( QModelIndex )
+Q_DECLARE_METATYPE( QPersistentModelIndex )
+
+#endif // TYPEDEFS_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/ViewManager.cpp Added

@@ -0,0 +1,1096 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "ViewManager.h"
+
+#include <QVBoxLayout>
+#include <QMetaMethod>
+
+#include "audio/AudioEngine.h"
+#include "context/ContextWidget.h"
+#include "infobar/InfoBar.h"
+#include "topbar/TopBar.h"
+
+#include "TreeModel.h"
+#include "PlaylistModel.h"
+#include "PlaylistView.h"
+#include "PlayableProxyModel.h"
+#include "PlayableModel.h"
+#include "TreeView.h"
+#include "GridView.h"
+#include "AlbumModel.h"
+#include "SourceList.h"
+#include "TomahawkSettings.h"
+
+#include "CustomPlaylistView.h"
+#include "PlaylistLargeItemDelegate.h"
+#include "RecentlyPlayedModel.h"
+#include "dynamic/widgets/DynamicWidget.h"
+
+#include "widgets/NewReleasesWidget.h"
+#include "widgets/WelcomeWidget.h"
+#include "widgets/WhatsHotWidget.h"
+#include "widgets/infowidgets/SourceInfoWidget.h"
+#include "widgets/infowidgets/ArtistInfoWidget.h"
+#include "widgets/infowidgets/AlbumInfoWidget.h"
+#include "widgets/infowidgets/TrackInfoWidget.h"
+#include "widgets/NewPlaylistWidget.h"
+#include "widgets/AnimatedSplitter.h"
+
+#include "utils/Logger.h"
+
+#define FILTER_TIMEOUT 280
+
+using namespace Tomahawk;
+
+ViewManager* ViewManager::s_instance = 0;
+
+
+ViewManager*
+ViewManager::instance()
+{
+    return s_instance;
+}
+
+
+ViewManager::ViewManager( QObject* parent )
+    : QObject( parent )
+    , m_widget( new QWidget() )
+    , m_welcomeWidget( new WelcomeWidget() )
+    , m_whatsHotWidget( new WhatsHotWidget() )
+    , m_newReleasesWidget( new NewReleasesWidget() )
+    , m_topLovedWidget( 0 )
+    , m_recentPlaysWidget( 0 )
+    , m_currentPage( 0 )
+    , m_currentMode( PlaylistModes::Tree )
+    , m_loaded( false )
+{
+    s_instance = this;
+
+    m_widget->setLayout( new QVBoxLayout() );
+    m_infobar = new InfoBar();
+    m_stack = new QStackedWidget();
+
+    m_contextWidget = new ContextWidget();
+
+    m_widget->layout()->addWidget( m_infobar );
+    m_widget->layout()->addWidget( m_stack );
+    m_widget->layout()->addWidget( m_contextWidget );
+
+    m_superCollectionView = new TreeView();
+    m_superCollectionModel = new TreeModel( m_superCollectionView );
+    m_superCollectionView->setTreeModel( m_superCollectionModel );
+    m_superCollectionView->setShowModes( false );
+//    m_superCollectionView->proxyModel()->setShowOfflineResults( false );
+
+    m_superGridView = new GridView();
+    m_superAlbumModel = new AlbumModel( m_superGridView );
+    m_superGridView->setPlayableModel( m_superAlbumModel );
+
+    m_stack->setContentsMargins( 0, 0, 0, 0 );
+    m_widget->setContentsMargins( 0, 0, 0, 0 );
+    m_widget->layout()->setContentsMargins( 0, 0, 0, 0 );
+    m_widget->layout()->setMargin( 0 );
+    m_widget->layout()->setSpacing( 0 );
+
+    connect( AudioEngine::instance(), SIGNAL( playlistChanged( Tomahawk::playlistinterface_ptr ) ), this, SLOT( playlistInterfaceChanged( Tomahawk::playlistinterface_ptr ) ) );
+
+    connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( applyFilter() ) );
+    connect( m_infobar, SIGNAL( filterTextChanged( QString ) ), SLOT( setFilter( QString ) ) );
+
+    connect( this, SIGNAL( tomahawkLoaded() ), m_whatsHotWidget, SLOT( fetchData() ) );
+    connect( this, SIGNAL( tomahawkLoaded() ), m_newReleasesWidget, SLOT( fetchData() ) );
+    connect( this, SIGNAL( tomahawkLoaded() ), m_welcomeWidget, SLOT( loadData() ) );
+
+/*    connect( m_infobar, SIGNAL( flatMode() ), SLOT( setTableMode() ) );
+    connect( m_infobar, SIGNAL( artistMode() ), SLOT( setTreeMode() ) );
+    connect( m_infobar, SIGNAL( albumMode() ), SLOT( setAlbumMode() ) );*/
+}
+
+
+ViewManager::~ViewManager()
+{
+    saveCurrentPlaylistSettings();
+    delete m_whatsHotWidget;
+    delete m_newReleasesWidget;
+    delete m_welcomeWidget;
+    delete m_topLovedWidget;
+    delete m_recentPlaysWidget;
+    delete m_contextWidget;
+    delete m_widget;
+}
+
+
+PlaylistView*
+ViewManager::createPageForPlaylist( const playlist_ptr& pl )
+{
+    PlaylistView* view = new PlaylistView();
+    PlaylistModel* model = new PlaylistModel();
+    view->setPlaylistModel( model );
+    model->loadPlaylist( pl );
+    pl->resolve();
+
+    m_playlistViews.insert( pl, view );
+    return view;
+}
+
+
+playlist_ptr
+ViewManager::playlistForPage( ViewPage* page ) const
+{
+    playlist_ptr p;
+    if ( dynamic_cast< PlaylistView* >( page ) && dynamic_cast< PlaylistView* >( page )->playlistModel() &&
+        !dynamic_cast< PlaylistView* >( page )->playlistModel()->playlist().isNull() )
+    {
+        p = dynamic_cast< PlaylistView* >( page )->playlistModel()->playlist();
+    }
+    else if ( dynamic_cast< DynamicWidget* >( page ) )
+        p = dynamic_cast< DynamicWidget* >( page )->playlist();
+
+    return p;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::show( const Tomahawk::playlist_ptr& playlist )
+{
+    PlaylistView* view;
+
+    if ( !m_playlistViews.contains( playlist ) || m_playlistViews.value( playlist ).isNull() )
+    {
+        view = createPageForPlaylist( playlist );
+    }
+    else
+    {
+        view = m_playlistViews.value( playlist ).data();
+    }
+
+    setPage( view );
+
+    emit numSourcesChanged( SourceList::instance()->count() );
+
+    return view;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::show( const Tomahawk::dynplaylist_ptr& playlist )
+{
+    if ( !m_dynamicWidgets.contains( playlist ) || m_dynamicWidgets.value( playlist ).isNull() )
+    {
+       m_dynamicWidgets playlist  = new Tomahawk::DynamicWidget( playlist, m_stack );
+
+       playlist->resolve();
+    }
+
+    setPage( m_dynamicWidgets.value( playlist ).data() );
+
+/*    if ( playlist->mode() == Tomahawk::OnDemand )
+        hideQueue();
+    else
+        showQueue();*/
+
+    emit numSourcesChanged( SourceList::instance()->count() );
+
+    return m_dynamicWidgets.value( playlist ).data();
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::show( const Tomahawk::artist_ptr& artist )
+{
+    ArtistInfoWidget* swidget;
+    if ( !m_artistViews.contains( artist ) || m_artistViews.value( artist ).isNull() )
+    {
+        swidget = new ArtistInfoWidget( artist );
+        m_artistViews.insert( artist, swidget );
+    }
+    else
+    {
+        swidget = m_artistViews.value( artist ).data();
+    }
+
+    setPage( swidget );
+    return swidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::show( const Tomahawk::album_ptr& album )
+{
+    AlbumInfoWidget* swidget;
+    if ( !m_albumViews.contains( album ) || m_albumViews.value( album ).isNull() )
+    {
+        swidget = new AlbumInfoWidget( album );
+        m_albumViews.insert( album, swidget );
+    }
+    else
+    {
+        swidget = m_albumViews.value( album ).data();
+    }
+
+    setPage( swidget );
+    return swidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::show( const Tomahawk::query_ptr& query )
+{
+    TrackInfoWidget* swidget;
+    if ( !m_trackViews.contains( query ) || m_trackViews.value( query ).isNull() )
+    {
+        swidget = new TrackInfoWidget( query );
+        m_trackViews.insert( query, swidget );
+    }
+    else
+    {
+        swidget = m_trackViews.value( query ).data();
+    }
+
+    setPage( swidget );
+    return swidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::show( const Tomahawk::collection_ptr& collection )
+{
+    qDebug() << Q_FUNC_INFO << m_currentMode;
+    m_currentCollection = collection;
+    ViewPage* shown = 0;
+    if ( m_currentMode == PlaylistModes::Flat )
+    {
+/*        CollectionView* view;
+        if ( !m_collectionViews.contains( collection ) || m_collectionViews.value( collection ).isNull() )
+        {
+            view = new CollectionView();
+            CollectionFlatModel* model = new CollectionFlatModel();
+            view->setPlayableModel( model );
+
+            model->addCollection( collection );
+
+            m_collectionViews.insert( collection, view );
+        }
+        else
+        {
+            view = m_collectionViews.value( collection ).data();
+        }
+
+        shown = view;
+        setPage( view );*/
+    }
+
+    if ( m_currentMode == PlaylistModes::Tree )
+    {
+        TreeView* view;
+        if ( !m_treeViews.contains( collection ) || m_treeViews.value( collection ).isNull() )
+        {
+            view = new TreeView();
+            TreeModel* model = new TreeModel();
+            view->setTreeModel( model );
+
+            if ( collection && collection->source()->isLocal() )
+                view->setEmptyTip( tr( "After you have scanned your music collection you will find your tracks right here." ) );
+            else
+                view->setEmptyTip( tr( "This collection is empty." ) );
+
+            model->addCollection( collection );
+
+            m_treeViews.insert( collection, view );
+        }
+        else
+        {
+            view = m_treeViews.value( collection ).data();
+        }
+
+        shown = view;
+        setPage( view );
+    }
+
+    if ( m_currentMode == PlaylistModes::Album )
+    {
+        GridView* aview;
+        if ( !m_collectionGridViews.contains( collection ) || m_collectionGridViews.value( collection ).isNull() )
+        {
+            aview = new GridView();
+            AlbumModel* amodel = new AlbumModel( aview );
+            aview->setPlayableModel( amodel );
+            amodel->addCollection( collection );
+
+            m_collectionGridViews.insert( collection, aview );
+        }
+        else
+        {
+            aview = m_collectionGridViews.value( collection ).data();
+        }
+
+        shown = aview;
+        setPage( aview );
+    }
+
+    emit numSourcesChanged( 1 );
+
+    return shown;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::show( const Tomahawk::source_ptr& source )
+{
+    SourceInfoWidget* swidget;
+    if ( !m_sourceViews.contains( source ) || m_sourceViews.value( source ).isNull() )
+    {
+        swidget = new SourceInfoWidget( source );
+        m_sourceViews.insert( source, swidget );
+    }
+    else
+    {
+        swidget = m_sourceViews.value( source ).data();
+    }
+
+    setPage( swidget );
+    return swidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::show( ViewPage* page )
+{
+    setPage( page );
+
+    return page;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::showSuperCollection()
+{
+    if ( m_superCollections.isEmpty() )
+        m_superCollectionModel->addAllCollections();
+
+    foreach( const Tomahawk::source_ptr& source, SourceList::instance()->sources() )
+    {
+        if ( !m_superCollections.contains( source->collection() ) )
+        {
+            m_superCollections.append( source->collection() );
+//            m_superAlbumModel->addCollection( source->collection() );
+        }
+    }
+
+    m_superCollectionModel->setTitle( tr( "SuperCollection" ) );
+    m_superCollectionModel->setDescription( tr( "Combined libraries of all your online friends" ) );
+    m_superAlbumModel->setTitle( tr( "All available albums" ) );
+
+    ViewPage* shown = 0;
+    if ( m_currentMode == PlaylistModes::Tree )
+    {
+        shown = m_superCollectionView;
+        setPage( m_superCollectionView );
+    }
+    else if ( m_currentMode == PlaylistModes::Flat )
+    {
+        shown = m_superCollectionView;
+        setPage( m_superCollectionView );
+    }
+    else if ( m_currentMode == PlaylistModes::Album )
+    {
+        shown = m_superGridView;
+        setPage( m_superGridView );
+    }
+
+    emit numSourcesChanged( m_superCollections.count() );
+
+    return shown;
+}
+
+
+void
+ViewManager::playlistInterfaceChanged( Tomahawk::playlistinterface_ptr interface )
+{
+    playlist_ptr pl = playlistForInterface( interface );
+    if ( !pl.isNull() )
+    {
+        TomahawkSettings::instance()->appendRecentlyPlayedPlaylist( pl->guid(), pl->author()->id() );
+    }
+    else
+    {
+        pl = dynamicPlaylistForInterface( interface );
+        if ( !pl.isNull() )
+            TomahawkSettings::instance()->appendRecentlyPlayedPlaylist( pl->guid(), pl->author()->id() );
+    }
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::showWelcomePage()
+{
+    return show( m_welcomeWidget );
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::showWhatsHotPage()
+{
+    return show( m_whatsHotWidget );
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::showNewReleasesPage()
+{
+    return show( m_newReleasesWidget );
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::showTopLovedPage()
+{
+    if ( !m_topLovedWidget )
+    {
+        CustomPlaylistView* view = new CustomPlaylistView( CustomPlaylistView::TopLovedTracks, source_ptr(), m_widget );
+        PlaylistLargeItemDelegate* del = new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::LovedTracks, view, view->proxyModel() );
+        connect( del, SIGNAL( updateIndex( QModelIndex ) ), view, SLOT( update( QModelIndex ) ) );
+        view->setItemDelegate( del );
+
+        m_topLovedWidget = view;
+    }
+
+    return show( m_topLovedWidget );
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::showRecentPlaysPage()
+{
+    if ( !m_recentPlaysWidget )
+    {
+        PlaylistView* pv = new PlaylistView( m_widget );
+
+        RecentlyPlayedModel* raModel = new RecentlyPlayedModel( pv );
+        raModel->setTitle( tr( "Recently Played Tracks" ) );
+        raModel->setDescription( tr( "Recently played tracks from all your friends" ) );
+        raModel->setStyle( PlayableModel::Large );
+
+        PlaylistLargeItemDelegate* del = new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::RecentlyPlayed, pv, pv->proxyModel() );
+        connect( del, SIGNAL( updateIndex( QModelIndex ) ), pv, SLOT( update( QModelIndex ) ) );
+        pv->setItemDelegate( del );
+
+        pv->setPlaylistModel( raModel );
+        raModel->setSource( source_ptr() );
+
+        m_recentPlaysWidget = pv;
+    }
+
+    return show( m_recentPlaysWidget );
+}
+
+
+void
+ViewManager::setTableMode()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    m_currentMode = PlaylistModes::Flat;
+
+    if ( isSuperCollectionVisible() )
+        showSuperCollection();
+    else
+        show( m_currentCollection );
+}
+
+
+void
+ViewManager::setTreeMode()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    m_currentMode = PlaylistModes::Tree;
+
+    if ( isSuperCollectionVisible() )
+        showSuperCollection();
+    else
+        show( m_currentCollection );
+}
+
+
+void
+ViewManager::setAlbumMode()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    m_currentMode = PlaylistModes::Album;
+
+    if ( isSuperCollectionVisible() )
+        showSuperCollection();
+    else
+        show( m_currentCollection );
+}
+
+
+void
+ViewManager::setFilter( const QString& filter )
+{
+    m_filter = filter;
+
+    m_filterTimer.stop();
+    m_filterTimer.setInterval( FILTER_TIMEOUT );
+    m_filterTimer.setSingleShot( true );
+    m_filterTimer.start();
+}
+
+
+void
+ViewManager::applyFilter()
+{
+    if ( currentPlaylistInterface() && currentPlaylistInterface()->filter() != m_filter )
+        currentPlaylistInterface()->setFilter( m_filter );
+}
+
+
+void
+ViewManager::historyBack()
+{
+    if ( !m_pageHistoryBack.count() )
+        return;
+
+    ViewPage* page = m_pageHistoryBack.takeLast();
+
+    if ( m_currentPage )
+    {
+        m_pageHistoryFwd << m_currentPage;
+        tDebug() << "Moved to forward history:" << m_currentPage->widget()->metaObject()->className();
+    }
+
+    tDebug() << "Showing page after moving backwards in history:" << page->widget()->metaObject()->className();
+    setPage( page, false );
+}
+
+
+void
+ViewManager::historyForward()
+{
+    if ( !m_pageHistoryFwd.count() )
+        return;
+
+    ViewPage* page = m_pageHistoryFwd.takeLast();
+
+    if ( m_currentPage )
+    {
+        m_pageHistoryBack << m_currentPage;
+        tDebug() << "Moved to backward history:" << m_currentPage->widget()->metaObject()->className();
+    }
+
+    tDebug() << "Showing page after moving forwards in history:" << page->widget()->metaObject()->className();
+    setPage( page, false );
+}
+
+
+QList<ViewPage*>
+ViewManager::historyPages() const
+{
+    return m_pageHistoryBack + m_pageHistoryFwd;
+}
+
+
+void
+ViewManager::destroyPage( ViewPage* page )
+{
+    if ( !page )
+        return;
+
+    tDebug() << Q_FUNC_INFO << "Deleting page:" << page->title();
+    if ( historyPages().contains( page ) )
+    {
+        m_pageHistoryBack.removeAll( page );
+        m_pageHistoryFwd.removeAll( page );
+
+        emit historyBackAvailable( m_pageHistoryBack.count() );
+        emit historyForwardAvailable( m_pageHistoryFwd.count() );
+
+        delete page;
+    }
+
+    if ( m_currentPage == page )
+    {
+        m_currentPage = 0;
+
+        historyBack();
+    }
+}
+
+
+void
+ViewManager::setPage( ViewPage* page, bool trackHistory )
+{
+    if ( !page )
+        return;
+    if ( page == m_currentPage )
+        return;
+
+    // save the old playlist shuffle state in config before we change playlists
+    saveCurrentPlaylistSettings();
+    unlinkPlaylist();
+
+    if ( m_stack->indexOf( page->widget() ) < 0 )
+    {
+        m_stack->addWidget( page->widget() );
+    }
+
+    if ( m_currentPage && trackHistory )
+    {
+        m_pageHistoryBack << m_currentPage;
+        m_pageHistoryFwd.clear();
+    }
+    m_currentPage = page;
+
+    emit historyBackAvailable( m_pageHistoryBack.count() );
+    emit historyForwardAvailable( m_pageHistoryFwd.count() );
+
+    qDebug() << "View page shown:" << page->title();
+    emit viewPageActivated( page );
+
+    if ( page->isTemporaryPage() )
+        emit tempPageActivated( page );
+
+    if ( AudioEngine::instance()->state() == AudioEngine::Stopped )
+        AudioEngine::instance()->setPlaylist( page->playlistInterface() );
+
+    // UGH!
+    if ( QObject* obj = dynamic_cast< QObject* >( currentPage() ) )
+    {
+        // if the signal exists (just to hide the qobject runtime warning...)
+        if( obj->metaObject()->indexOfSignal( "descriptionChanged(QString)" ) > -1 )
+            connect( obj, SIGNAL( descriptionChanged( QString ) ), m_infobar, SLOT( setDescription( QString ) ), Qt::UniqueConnection );
+
+        if( obj->metaObject()->indexOfSignal( "descriptionChanged(Tomahawk::artist_ptr)" ) > -1 )
+            connect( obj, SIGNAL( descriptionChanged( Tomahawk::artist_ptr ) ), m_infobar, SLOT( setDescription( Tomahawk::artist_ptr ) ), Qt::UniqueConnection );
+
+        if( obj->metaObject()->indexOfSignal( "descriptionChanged(Tomahawk::album_ptr)" ) > -1 )
+            connect( obj, SIGNAL( descriptionChanged( Tomahawk::album_ptr ) ), m_infobar, SLOT( setDescription( Tomahawk::album_ptr ) ), Qt::UniqueConnection );
+
+        if( obj->metaObject()->indexOfSignal( "longDescriptionChanged(QString)" ) > -1 )
+            connect( obj, SIGNAL( longDescriptionChanged( QString ) ), m_infobar, SLOT( setLongDescription( QString ) ), Qt::UniqueConnection );
+
+        if( obj->metaObject()->indexOfSignal( "nameChanged(QString)" ) > -1 )
+            connect( obj, SIGNAL( nameChanged( QString ) ), m_infobar, SLOT( setCaption( QString ) ), Qt::UniqueConnection );
+
+        if( obj->metaObject()->indexOfSignal( "pixmapChanged(QPixmap)" ) > -1 )
+            connect( obj, SIGNAL( pixmapChanged( QPixmap ) ), m_infobar, SLOT( setPixmap( QPixmap ) ), Qt::UniqueConnection );
+
+        if( obj->metaObject()->indexOfSignal( "destroyed(QWidget*)" ) > -1 )
+            connect( obj, SIGNAL( destroyed( QWidget* ) ), SLOT( onWidgetDestroyed( QWidget* ) ), Qt::UniqueConnection );
+    }
+
+    m_stack->setCurrentWidget( page->widget() );
+
+    updateView();
+}
+
+
+bool
+ViewManager::isNewPlaylistPageVisible() const
+{
+    return dynamic_cast< NewPlaylistWidget* >( currentPage() ) != 0;
+}
+
+
+void
+ViewManager::unlinkPlaylist()
+{
+    if ( currentPlaylistInterface() )
+    {
+        disconnect( currentPlaylistInterface().data(), SIGNAL( sourceTrackCountChanged( unsigned int ) ),
+                    this,                                 SIGNAL( numTracksChanged( unsigned int ) ) );
+
+        disconnect( currentPlaylistInterface().data(), SIGNAL( trackCountChanged( unsigned int ) ),
+                    this,                                 SIGNAL( numShownChanged( unsigned int ) ) );
+
+        disconnect( currentPlaylistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ),
+                    this,                                 SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
+
+        disconnect( currentPlaylistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ),
+                    this,                                 SIGNAL( shuffleModeChanged( bool ) ) );
+    }
+}
+
+
+void
+ViewManager::saveCurrentPlaylistSettings()
+{
+    TomahawkSettings* s = TomahawkSettings::instance();
+    Tomahawk::playlist_ptr pl = playlistForInterface( currentPlaylistInterface() );
+
+    if ( !pl.isNull() ) {
+        s->setShuffleState(  pl->guid(), currentPlaylistInterface()->shuffled() );
+        s->setRepeatMode( pl->guid(), currentPlaylistInterface()->repeatMode() );
+    } else {
+        Tomahawk::dynplaylist_ptr dynPl = dynamicPlaylistForInterface( currentPlaylistInterface() );
+        if ( !dynPl.isNull() ) {
+            s->setShuffleState( dynPl->guid(), currentPlaylistInterface()->shuffled() );
+            s->setRepeatMode( dynPl->guid(), currentPlaylistInterface()->repeatMode() );
+        }
+    }
+}
+
+
+void
+ViewManager::updateView()
+{
+    if ( currentPlaylistInterface() )
+    {
+        connect( currentPlaylistInterface().data(), SIGNAL( sourceTrackCountChanged( unsigned int ) ),
+                                                    SIGNAL( numTracksChanged( unsigned int ) ) );
+
+        connect( currentPlaylistInterface().data(), SIGNAL( trackCountChanged( unsigned int ) ),
+                                                    SIGNAL( numShownChanged( unsigned int ) ) );
+
+        connect( currentPlaylistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ),
+                                                    SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
+
+        connect( currentPlaylistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ),
+                                                    SIGNAL( shuffleModeChanged( bool ) ) );
+
+        m_infobar->setFilter( currentPlaylistInterface()->filter() );
+    }
+
+    if ( currentPage()->showStatsBar() && currentPlaylistInterface() )
+    {
+        emit numTracksChanged( currentPlaylistInterface()->unfilteredTrackCount() );
+
+        if ( !currentPlaylistInterface()->filter().isEmpty() )
+            emit numShownChanged( currentPlaylistInterface()->trackCount() );
+        else
+            emit numShownChanged( currentPlaylistInterface()->unfilteredTrackCount() );
+
+        emit repeatModeChanged( currentPlaylistInterface()->repeatMode() );
+        emit shuffleModeChanged( currentPlaylistInterface()->shuffled() );
+        emit modeChanged( currentPlaylistInterface()->viewMode() );
+    }
+
+/*    if ( currentPage()->queueVisible() )
+        showQueue();
+    else
+        hideQueue();*/
+
+    emit statsAvailable( currentPage()->showStatsBar() );
+    emit modesAvailable( currentPage()->showModes() );
+    emit filterAvailable( currentPage()->showFilter() );
+
+/*    if ( !currentPage()->showStatsBar() && !currentPage()->showModes() && !currentPage()->showFilter() )
+        m_topbar->setVisible( false );
+    else
+        m_topbar->setVisible( true );*/
+
+    m_infobar->setVisible( currentPage()->showInfoBar() );
+    m_infobar->setCaption( currentPage()->title() );
+
+    m_infobar->setUpdaters( currentPage()->updaters() );
+
+    switch( currentPage()->descriptionType() )
+    {
+        case ViewPage::TextType:
+            m_infobar->setDescription( currentPage()->description() );
+            break;
+        case ViewPage::ArtistType:
+            m_infobar->setDescription( currentPage()->descriptionArtist() );
+            break;
+        case ViewPage::AlbumType:
+            m_infobar->setDescription( currentPage()->descriptionAlbum() );
+            break;
+
+    }
+    m_infobar->setLongDescription( currentPage()->longDescription() );
+    m_infobar->setPixmap( currentPage()->pixmap() );
+
+    // turn on shuffle/repeat mode for the new playlist view if specified in config
+    loadCurrentPlaylistSettings();
+}
+
+
+void
+ViewManager::loadCurrentPlaylistSettings()
+{
+    TomahawkSettings* s = TomahawkSettings::instance();
+    Tomahawk::playlist_ptr pl = playlistForInterface( currentPlaylistInterface() );
+
+    if ( !pl.isNull() )
+    {
+        currentPlaylistInterface()->setShuffled( s->shuffleState( pl->guid() ));
+        currentPlaylistInterface()->setRepeatMode( s->repeatMode( pl->guid() ));
+    }
+    else
+    {
+        Tomahawk::dynplaylist_ptr dynPl = dynamicPlaylistForInterface( currentPlaylistInterface() );
+        if ( !dynPl.isNull() )
+        {
+            currentPlaylistInterface()->setShuffled( s->shuffleState( dynPl->guid() ));
+        }
+    }
+}
+
+
+void
+ViewManager::onWidgetDestroyed( QWidget* widget )
+{
+    tDebug() << "Destroyed child:" << widget << widget->metaObject()->className();
+
+    bool resetWidget = ( m_stack->currentWidget() == widget );
+
+    QList< Tomahawk::ViewPage* > p = historyPages();
+    for ( int i = 0; i < p.count(); i++ )
+    {
+        ViewPage* page = p.at( i );
+        if ( page->widget() != widget )
+            continue;
+
+        if ( !playlistForInterface( page->playlistInterface() ).isNull() )
+        {
+            m_playlistViews.remove( playlistForInterface( page->playlistInterface() ) );
+        }
+        if ( !dynamicPlaylistForInterface( page->playlistInterface() ).isNull() )
+        {
+            m_dynamicWidgets.remove( dynamicPlaylistForInterface( page->playlistInterface() ) );
+        }
+
+        m_pageHistoryBack.removeAll( page );
+        m_pageHistoryFwd.removeAll( page );
+    }
+
+    m_stack->removeWidget( widget );
+
+    if ( resetWidget )
+    {
+        m_currentPage = 0;
+        historyBack();
+    }
+}
+
+
+void
+ViewManager::setRepeatMode( Tomahawk::PlaylistModes::RepeatMode mode )
+{
+    if ( currentPlaylistInterface() )
+        currentPlaylistInterface()->setRepeatMode( mode );
+}
+
+
+void
+ViewManager::setShuffled( bool enabled )
+{
+    if ( currentPlaylistInterface() )
+        currentPlaylistInterface()->setShuffled( enabled );
+}
+
+
+void
+ViewManager::createPlaylist( const Tomahawk::source_ptr& src, const QVariant& contents )
+{
+    Tomahawk::playlist_ptr p = Tomahawk::playlist_ptr( new Tomahawk::Playlist( src ) );
+    QJson::QObjectHelper::qvariant2qobject( contents.toMap(), p.data() );
+    p->reportCreated( p );
+}
+
+
+void
+ViewManager::createDynamicPlaylist( const Tomahawk::source_ptr& src, const QVariant& contents )
+{
+    Tomahawk::dynplaylist_ptr p = Tomahawk::dynplaylist_ptr( new Tomahawk::DynamicPlaylist( src, contents.toMap().value( "type", QString() ).toString()  ) );
+    QJson::QObjectHelper::qvariant2qobject( contents.toMap(), p.data() );
+    p->reportCreated( p );
+}
+
+
+void
+ViewManager::setTomahawkLoaded()
+{
+    m_loaded = true;
+    emit tomahawkLoaded();
+}
+
+
+ViewPage*
+ViewManager::pageForDynPlaylist(const dynplaylist_ptr& pl) const
+{
+    return m_dynamicWidgets.value( pl ).data();
+}
+
+
+ViewPage*
+ViewManager::pageForPlaylist(const playlist_ptr& pl) const
+{
+    return m_playlistViews.value( pl ).data();
+}
+
+
+ViewPage*
+ViewManager::pageForInterface( Tomahawk::playlistinterface_ptr interface ) const
+{
+    QList< Tomahawk::ViewPage* > pages = historyPages();
+
+    for ( int i = 0; i < pages.count(); i++ )
+    {
+        ViewPage* page = pages.at( i );
+        if ( page->playlistInterface() == interface )
+            return page;
+        if ( page->playlistInterface() && page->playlistInterface()->hasChildInterface( interface ) )
+            return page;
+    }
+
+    return 0;
+}
+
+
+Tomahawk::playlistinterface_ptr
+ViewManager::currentPlaylistInterface() const
+{
+    if ( currentPage() )
+        return currentPage()->playlistInterface();
+    else
+        return Tomahawk::playlistinterface_ptr();
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::currentPage() const
+{
+    return m_currentPage;
+}
+
+
+Tomahawk::playlist_ptr
+ViewManager::playlistForInterface( Tomahawk::playlistinterface_ptr interface ) const
+{
+    foreach ( QWeakPointer<PlaylistView> view, m_playlistViews.values() )
+    {
+        if ( !view.isNull() && view.data()->playlistInterface() == interface )
+        {
+            return m_playlistViews.key( view );
+        }
+    }
+
+    return Tomahawk::playlist_ptr();
+}
+
+
+Tomahawk::dynplaylist_ptr
+ViewManager::dynamicPlaylistForInterface( Tomahawk::playlistinterface_ptr interface ) const
+{
+    foreach ( QWeakPointer<DynamicWidget> view, m_dynamicWidgets.values() )
+    {
+        if ( !view.isNull() && view.data()->playlistInterface() == interface )
+        {
+            return m_dynamicWidgets.key( view );
+        }
+    }
+
+    return Tomahawk::dynplaylist_ptr();
+}
+
+
+Tomahawk::collection_ptr
+ViewManager::collectionForInterface( Tomahawk::playlistinterface_ptr interface ) const
+{
+    foreach ( QWeakPointer<GridView> view, m_collectionGridViews.values() )
+    {
+        if ( view.data()->playlistInterface() == interface )
+        {
+            return m_collectionGridViews.key( view );
+        }
+    }
+
+    return collection_ptr();
+}
+
+
+bool
+ViewManager::isSuperCollectionVisible() const
+{
+    return ( currentPage() != 0 &&
+           ( currentPage()->playlistInterface() == m_superCollectionView->playlistInterface() ||
+             currentPage()->playlistInterface() == m_superGridView->playlistInterface() ) );
+}
+
+
+void
+ViewManager::showCurrentTrack()
+{
+    ViewPage* page = pageForInterface( AudioEngine::instance()->currentTrackPlaylist() );
+
+    if ( page )
+    {
+        setPage( page );
+        page->jumpToCurrentTrack();
+
+        // reset the correct mode, if the user has changed it since
+
+        if ( dynamic_cast< TrackView* >( page ) )
+            m_currentMode = PlaylistModes::Flat;
+        else if ( dynamic_cast< GridView* >( page ) )
+            m_currentMode = PlaylistModes::Album;
+        else if ( dynamic_cast< TreeView* >( page ) )
+            m_currentMode = PlaylistModes::Tree;
+        else
+            return;
+
+        emit modeChanged( (PlaylistModes::ViewMode)m_currentMode );
+    }
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::welcomeWidget() const
+{
+    return m_welcomeWidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::whatsHotWidget() const
+{
+    return m_whatsHotWidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::newReleasesWidget() const
+{
+    return m_newReleasesWidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::topLovedWidget() const
+{
+    return m_topLovedWidget;
+}
+
+
+Tomahawk::ViewPage*
+ViewManager::recentPlaysWidget() const
+{
+    return m_recentPlaysWidget;
+}
+
+
+TreeView*
+ViewManager::superCollectionView() const
+{
+    return m_superCollectionView;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/ViewManager.h Added

@@ -0,0 +1,241 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 PLAYLISTMANAGER_H
+#define PLAYLISTMANAGER_H
+
+#include <QObject>
+#include <QHash>
+#include <QStackedWidget>
+
+#include "Artist.h"
+#include "Collection.h"
+#include "PlaylistInterface.h"
+#include "playlist/QueueView.h"
+#include "ViewPage.h"
+
+#include "DllMacro.h"
+
+class AnimatedSplitter;
+class AlbumModel;
+class GridView;
+class AlbumInfoWidget;
+class ArtistInfoWidget;
+class TreeView;
+class CollectionModel;
+class ContextWidget;
+class PlaylistModel;
+class PlaylistView;
+class TrackProxyModel;
+class TrackModel;
+class TreeProxyModel;
+class TreeModel;
+class TrackView;
+class SourceInfoWidget;
+class InfoBar;
+class TopBar;
+class TrackInfoWidget;
+class NewReleasesWidget;
+class WelcomeWidget;
+class WhatsHotWidget;
+class QPushButton;
+
+namespace Tomahawk
+{
+    class DynamicWidget;
+}
+
+class DLLEXPORT ViewManager : public QObject
+{
+Q_OBJECT
+
+public:
+    static ViewManager* instance();
+
+    explicit ViewManager( QObject* parent = 0 );
+    virtual ~ViewManager();
+
+    QWidget* widget() const { return m_widget; }
+    InfoBar* infobar() const { return m_infobar; }
+    ContextWidget* context() const { return m_contextWidget; }
+
+    PlaylistView* queue() const { return m_queue->queue(); }
+    void setQueue( QueueView* queue ) { m_queue = queue; }
+
+    bool isSuperCollectionVisible() const;
+    bool isNewPlaylistPageVisible() const;
+
+    Tomahawk::playlistinterface_ptr currentPlaylistInterface() const;
+    Tomahawk::ViewPage* currentPage() const;
+    Tomahawk::ViewPage* pageForInterface( Tomahawk::playlistinterface_ptr plInterface ) const;
+
+    Tomahawk::ViewPage* show( Tomahawk::ViewPage* page );
+
+    Tomahawk::ViewPage* welcomeWidget() const;
+    Tomahawk::ViewPage* whatsHotWidget() const;
+    Tomahawk::ViewPage* newReleasesWidget() const;
+    Tomahawk::ViewPage* topLovedWidget() const;
+    Tomahawk::ViewPage* recentPlaysWidget() const;
+    TreeView* superCollectionView() const;
+
+    /// Get the view page for the given item. Not pretty...
+    Tomahawk::ViewPage* pageForPlaylist( const Tomahawk::playlist_ptr& pl ) const;
+    Tomahawk::ViewPage* pageForDynPlaylist( const Tomahawk::dynplaylist_ptr& pl ) const;
+
+    /// Get a playlist (or dynamic playlist ) from a ViewPage* if the page is PlaylistView or DynamicWidget.
+    /// Lives here but used by SourcesModel
+    Tomahawk::playlist_ptr playlistForPage( Tomahawk::ViewPage* ) const;
+
+    // only use this is you need to create a playlist and show it directly and want it to be
+    // linked to the sidebar. call it right after creating the playlist
+    PlaylistView* createPageForPlaylist( const Tomahawk::playlist_ptr& pl );
+
+    bool isTomahawkLoaded() const { return m_loaded; }
+
+signals:
+    void numSourcesChanged( unsigned int sources );
+    void numTracksChanged( unsigned int tracks );
+    void numArtistsChanged( unsigned int artists );
+    void numShownChanged( unsigned int shown );
+
+    void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode );
+    void shuffleModeChanged( bool enabled );
+
+    void statsAvailable( bool b );
+    void modesAvailable( bool b );
+    void filterAvailable( bool b );
+    void modeChanged( Tomahawk::PlaylistModes::ViewMode mode );
+
+    void playClicked();
+    void pauseClicked();
+
+    void tempPageActivated( Tomahawk::ViewPage* );
+    void viewPageActivated( Tomahawk::ViewPage* );
+
+    void showQueueRequested();
+    void hideQueueRequested();
+
+    void tomahawkLoaded();
+    
+    void historyBackAvailable( bool avail );
+    void historyForwardAvailable( bool avail );
+
+public slots:
+    Tomahawk::ViewPage* showSuperCollection();
+    Tomahawk::ViewPage* showWelcomePage();
+    Tomahawk::ViewPage* showWhatsHotPage();
+    Tomahawk::ViewPage* showNewReleasesPage();
+    Tomahawk::ViewPage* showTopLovedPage();
+    Tomahawk::ViewPage* showRecentPlaysPage();
+    void showCurrentTrack();
+
+    // Returns the shown viewpage
+    Tomahawk::ViewPage* show( const Tomahawk::playlist_ptr& playlist );
+    Tomahawk::ViewPage* show( const Tomahawk::dynplaylist_ptr& playlist );
+    Tomahawk::ViewPage* show( const Tomahawk::artist_ptr& artist );
+    Tomahawk::ViewPage* show( const Tomahawk::album_ptr& album );
+    Tomahawk::ViewPage* show( const Tomahawk::query_ptr& query );
+    Tomahawk::ViewPage* show( const Tomahawk::collection_ptr& collection );
+    Tomahawk::ViewPage* show( const Tomahawk::source_ptr& source );
+
+    void historyBack();
+    void historyForward();
+    
+    QList< Tomahawk::ViewPage* > historyPages() const;
+    void destroyPage( Tomahawk::ViewPage* page );
+
+    void showQueue() { emit showQueueRequested(); }
+    void hideQueue() { emit hideQueueRequested(); }
+
+    void setTreeMode();
+    void setTableMode();
+    void setAlbumMode();
+
+    void setRepeatMode( Tomahawk::PlaylistModes::RepeatMode mode );
+    void setShuffled( bool enabled );
+
+    void playlistInterfaceChanged( Tomahawk::playlistinterface_ptr );
+
+    // called by the playlist creation dbcmds
+    void createPlaylist( const Tomahawk::source_ptr& src, const QVariant& contents );
+    void createDynamicPlaylist( const Tomahawk::source_ptr& src, const QVariant& contents );
+
+    void setTomahawkLoaded();
+
+private slots:
+    void setFilter( const QString& filter );
+    void applyFilter();
+
+    void onWidgetDestroyed( QWidget* widget );
+
+private:
+    void setPage( Tomahawk::ViewPage* page, bool trackHistory = true );
+    void updateView();
+    void unlinkPlaylist();
+    void saveCurrentPlaylistSettings();
+    void loadCurrentPlaylistSettings();
+
+    Tomahawk::playlist_ptr playlistForInterface( Tomahawk::playlistinterface_ptr plInterface ) const;
+    Tomahawk::dynplaylist_ptr dynamicPlaylistForInterface( Tomahawk::playlistinterface_ptr plInterface ) const;
+    Tomahawk::collection_ptr collectionForInterface( Tomahawk::playlistinterface_ptr plInterface ) const;
+
+    QWidget* m_widget;
+    InfoBar* m_infobar;
+    ContextWidget* m_contextWidget;
+    QStackedWidget* m_stack;
+    AnimatedSplitter* m_splitter;
+
+    AlbumModel* m_superAlbumModel;
+    GridView* m_superGridView;
+    TreeModel* m_superCollectionModel;
+    TreeView* m_superCollectionView;
+    QueueView* m_queue;
+    WelcomeWidget* m_welcomeWidget;
+    WhatsHotWidget* m_whatsHotWidget;
+    NewReleasesWidget* m_newReleasesWidget;
+    Tomahawk::ViewPage* m_topLovedWidget;
+    Tomahawk::ViewPage* m_recentPlaysWidget;
+
+    QList< Tomahawk::collection_ptr > m_superCollections;
+
+    QHash< Tomahawk::dynplaylist_ptr, QWeakPointer<Tomahawk::DynamicWidget> > m_dynamicWidgets;
+    QHash< Tomahawk::collection_ptr, QWeakPointer<TreeView> > m_treeViews;
+    QHash< Tomahawk::collection_ptr, QWeakPointer<GridView> > m_collectionGridViews;
+    QHash< Tomahawk::artist_ptr, QWeakPointer<ArtistInfoWidget> > m_artistViews;
+    QHash< Tomahawk::album_ptr, QWeakPointer<AlbumInfoWidget> > m_albumViews;
+    QHash< Tomahawk::query_ptr, QWeakPointer<TrackInfoWidget> > m_trackViews;
+    QHash< Tomahawk::playlist_ptr, QWeakPointer<PlaylistView> > m_playlistViews;
+    QHash< Tomahawk::source_ptr, QWeakPointer<SourceInfoWidget> > m_sourceViews;
+
+    QList<Tomahawk::ViewPage*> m_pageHistoryBack;
+    QList<Tomahawk::ViewPage*> m_pageHistoryFwd;
+    Tomahawk::ViewPage* m_currentPage;
+
+    Tomahawk::collection_ptr m_currentCollection;
+    int m_currentMode;
+
+    QTimer m_filterTimer;
+    QString m_filter;
+
+    bool m_loaded;
+
+    static ViewManager* s_instance;
+};
+
+#endif // PLAYLISTMANAGER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/ViewPage.cpp Added

tomahawk-0.5.5.tar.bz2/src/libtomahawk/ViewPage.h Added

@@ -0,0 +1,89 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 VIEWPAGE_H
+#define VIEWPAGE_H
+
+#include "Typedefs.h"
+#include "PlaylistInterface.h"
+#include "Artist.h"
+#include "Album.h"
+#include "utils/TomahawkUtils.h"
+#include "playlist/PlaylistUpdaterInterface.h"
+
+#include <QtGui/QPixmap>
+
+namespace Tomahawk
+{
+
+
+class DLLEXPORT ViewPage
+{
+public:
+    enum DescriptionType {
+        TextType = 0,
+        ArtistType = 1,
+        AlbumType = 2
+    };
+
+    ViewPage() {}
+    virtual ~ViewPage() {}
+
+    virtual QWidget* widget() = 0;
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const = 0;
+
+    virtual QString title() const = 0;
+
+    virtual DescriptionType descriptionType() { return TextType; }
+    virtual QString description() const = 0;
+    virtual Tomahawk::artist_ptr descriptionArtist() const { return Tomahawk::artist_ptr(); }
+    virtual Tomahawk::album_ptr descriptionAlbum() const { return Tomahawk::album_ptr(); }
+
+    virtual QString longDescription() const { return QString(); }
+    virtual QPixmap pixmap() const { return QPixmap( RESPATH "icons/tomahawk-icon-128x128.png" ); }
+
+    virtual bool showStatsBar() const { return true; }
+    virtual bool showInfoBar() const { return true; }
+    virtual bool showModes() const { return false; }
+    virtual bool showFilter() const { return false; }
+    virtual bool queueVisible() const { return true; }
+
+    virtual bool jumpToCurrentTrack() = 0;
+
+    virtual bool isTemporaryPage() const { return false; }
+    virtual bool isBeingPlayed() const { return false; }
+
+    virtual QList<PlaylistUpdaterInterface*> updaters() const { return QList<PlaylistUpdaterInterface*>(); }
+
+    /** subclasses implementing ViewPage can emit the following signals:
+     * nameChanged( const QString& )
+     * descriptionChanged( const QString& )
+     * descriptionChanged( const Tomahawk::artist_ptr& artist )
+     * descriptionChanged( const Tomahawk::album_ptr& album )
+     * longDescriptionChanged( const QString& )
+     * pixmapChanged( const QPixmap& )
+     * destroyed( QWidget* widget );
+     *
+     * See DynamicWidget for an example
+     */
+};
+
+}; // ns
+
+#endif //VIEWPAGE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/Account.cpp Added

@@ -0,0 +1,215 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 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 "Account.h"
+
+#include "TomahawkSettings.h"
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+QString
+accountTypeToString( AccountType type )
+{
+    switch ( type )
+    {
+        case SipType:
+            return QObject::tr( "Friend Finders" );
+        case ResolverType:
+            return QObject::tr( "Music Finders" );
+        case InfoType:
+        case StatusPushType:
+            return QObject::tr( "Status Updaters" );
+        case NoType:
+            return QString();
+    }
+
+    return QString();
+}
+
+
+Account::Account( const QString& accountId )
+    : QObject()
+    , m_enabled( false )
+    , m_accountId( accountId )
+{
+    connect( this, SIGNAL( error( int, QString ) ), this, SLOT( onError( int,QString ) ) );
+    connect( this, SIGNAL( connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ) , this, SLOT( onConnectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ) );
+
+    loadFromConfig( accountId );
+}
+
+
+Account::~Account()
+{
+}
+
+
+#ifndef ENABLE_HEADLESS
+
+QWidget*
+Account::configurationWidget()
+{
+    return 0;
+}
+
+
+QWidget*
+Account::aclWidget()
+{
+    return 0;
+}
+
+
+QPixmap
+Account::icon() const
+{
+    return QPixmap();
+}
+
+#endif
+
+
+void
+Account::authenticate()
+{
+    return;
+}
+
+
+void
+Account::deauthenticate()
+{
+    return;
+}
+
+
+bool
+Account::isAuthenticated() const
+{
+    return false;
+}
+
+
+void
+Account::onError( int errorCode, const QString& error )
+{
+    Q_UNUSED( errorCode );
+
+    QMutexLocker locker( &m_mutex );
+    m_cachedError = error;
+}
+
+
+void
+Account::onConnectionStateChanged( Account::ConnectionState )
+{
+    m_cachedError.clear();
+}
+
+
+void
+Account::syncConfig()
+{
+    TomahawkSettings* s = TomahawkSettings::instance();
+    s->beginGroup( "accounts/" + m_accountId );
+    s->setValue( "accountfriendlyname", m_accountFriendlyName );
+    s->setValue( "enabled", m_enabled );
+    s->setValue( "credentials", m_credentials );
+    s->setValue( "configuration", m_configuration );
+    s->setValue( "acl", m_acl );
+    s->setValue( "types", m_types );
+    s->endGroup();
+    s->sync();
+}
+
+
+void
+Account::loadFromConfig( const QString& accountId )
+{
+    m_accountId = accountId;
+    TomahawkSettings* s = TomahawkSettings::instance();
+    s->beginGroup( "accounts/" + m_accountId );
+    m_accountFriendlyName = s->value( "accountfriendlyname", QString() ).toString();
+    m_enabled = s->value( "enabled", false ).toBool();
+    m_credentials = s->value( "credentials", QVariantHash() ).toHash();
+    m_configuration = s->value( "configuration", QVariantHash() ).toHash();
+    m_acl = s->value( "acl", QVariantMap() ).toMap();
+    m_types = s->value( "types", QStringList() ).toStringList();
+    s->endGroup();
+}
+
+
+void
+Account::removeFromConfig()
+{
+    TomahawkSettings* s = TomahawkSettings::instance();
+    s->beginGroup( "accounts/" + m_accountId );
+    s->remove( "accountfriendlyname" );
+    s->remove( "enabled" );
+    s->remove( "credentials" );
+    s->remove( "configuration" );
+    s->remove( "acl" );
+    s->remove( "types" );
+    s->endGroup();
+    s->remove( "accounts/" + m_accountId );
+}
+
+
+void
+Account::setTypes( AccountTypes types )
+{
+    QMutexLocker locker( &m_mutex );
+    m_types = QStringList();
+    if ( types & InfoType )
+        m_types << "InfoType";
+    if ( types & SipType )
+        m_types << "SipType";
+    if ( types & ResolverType )
+        m_types << "ResolverType";
+    if ( types & StatusPushType )
+        m_types << "StatusPushType";
+    syncConfig();
+}
+
+
+AccountTypes
+Account::types() const
+{
+    QMutexLocker locker( &m_mutex );
+    AccountTypes types;
+    if ( m_types.contains( "InfoType" ) )
+        types |= InfoType;
+    if ( m_types.contains( "SipType" ) )
+        types |= SipType;
+    if ( m_types.contains( "ResolverType" ) )
+        types |= ResolverType;
+    if ( m_types.contains( "StatusPushType" ) )
+        types |= StatusPushType;
+
+    return types;
+}
+
+
+}
+
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/Account.h Added

@@ -0,0 +1,199 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 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 ACCOUNT_H
+#define ACCOUNT_H
+
+#include <QtCore/QObject>
+#include <QtCore/QVariantMap>
+#include <QtGui/QWidget>
+#include <QtGui/QIcon>
+#include <QtCore/QString>
+#include <QtCore/QUuid>
+#include <QMutex>
+
+#include "Typedefs.h"
+#include "DllMacro.h"
+
+// #include "libtomahawk/infosystem/InfoSystem.h"
+
+class SipPlugin;
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+enum AccountType
+{
+    NoType = 0x00,
+
+    InfoType = 0x01,
+    SipType = 0x02,
+    ResolverType = 0x04,
+    StatusPushType = 0x08
+};
+
+DLLEXPORT QString accountTypeToString( AccountType type );
+
+Q_DECLARE_FLAGS(AccountTypes, AccountType);
+
+inline QString generateId( const QString &factoryId )
+{
+    QString uniq = QUuid::createUuid().toString().mid( 1, 8 );
+    return factoryId + "_" + uniq;
+}
+
+class DLLEXPORT Account : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum AuthErrorCode { AuthError, ConnectionError };
+    enum ConnectionState { Disconnected, Connecting, Connected, Disconnecting };
+
+    explicit Account( const QString &accountId );
+    virtual ~Account();
+
+    QString accountServiceName() const { QMutexLocker locker( &m_mutex ); return m_accountServiceName; } // e.g. "Twitter", "Last.fm"
+    QString accountFriendlyName() const { QMutexLocker locker( &m_mutex ); return m_accountFriendlyName; } // e.g. screen name on the service, JID, etc.
+    bool enabled() const { QMutexLocker locker( &m_mutex ); return m_enabled; }
+    QString accountId() const { QMutexLocker locker( &m_mutex ); return m_accountId; }
+
+    QVariantHash configuration() const { QMutexLocker locker( &m_mutex ); return m_configuration; }
+
+    /**
+     * Configuration widgets can have a "dataError( bool )" signal to enable/disable the OK button in their wrapper dialogs.
+     */
+#ifndef ENABLE_HEADLESS
+    virtual QWidget* configurationWidget() = 0;
+    virtual QWidget* aboutWidget() { return 0; }
+    virtual QWidget* aclWidget() = 0;
+    virtual QPixmap icon() const = 0;
+#endif
+
+    virtual void saveConfig() {} // called when the widget has been edited. save values from config widget, call sync() to write to disk account generic settings
+
+    QVariantHash credentials() const { QMutexLocker locker( &m_mutex ); return m_credentials; }
+
+    QVariantMap acl() const { QMutexLocker locker( &m_mutex ); return m_acl; }
+
+    virtual ConnectionState connectionState() const = 0;
+    virtual bool isAuthenticated() const = 0;
+
+    virtual QString errorMessage() const { QMutexLocker locker( &m_mutex ); return m_cachedError; }
+
+    virtual Tomahawk::InfoSystem::InfoPluginPtr infoPlugin() = 0;
+    virtual SipPlugin* sipPlugin() = 0;
+
+    // Some accounts cannot be enabled if authentication fails. Return true after failing to authenticate
+    // if this is the case, and the account will not be enabled
+    virtual bool preventEnabling() const { return false; }
+
+    AccountTypes types() const;
+
+    void setAccountServiceName( const QString &serviceName ) { QMutexLocker locker( &m_mutex ); m_accountServiceName = serviceName; }
+    void setAccountFriendlyName( const QString &friendlyName )  { QMutexLocker locker( &m_mutex ); m_accountFriendlyName = friendlyName; }
+    void setEnabled( bool enabled ) { QMutexLocker locker( &m_mutex ); m_enabled = enabled; }
+    void setAccountId( const QString &accountId )  { QMutexLocker locker( &m_mutex ); m_accountId = accountId; }
+    void setCredentials( const QVariantHash &credentialHash ) { QMutexLocker locker( &m_mutex ); m_credentials = credentialHash; }
+    void setConfiguration( const QVariantHash &configuration ) { QMutexLocker locker( &m_mutex ); m_configuration = configuration; }
+    void setAcl( const QVariantMap &acl ) { QMutexLocker locker( &m_mutex ); m_acl = acl; }
+    void setTypes( AccountTypes types );
+
+    void sync() { QMutexLocker locker( &m_mutex ); syncConfig(); };
+
+    /**
+     * Removes all the settings held in the config file for this account instance
+     *
+     * Re-implement if you have saved additional files or config settings outside the built-in ones
+     */
+    virtual void removeFromConfig();
+
+public slots:
+    virtual void authenticate() = 0;
+    virtual void deauthenticate() = 0;
+
+signals:
+    void error( int errorId, const QString& errorStr );
+    void connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState state );
+
+    void configurationChanged();
+
+protected:
+    virtual void loadFromConfig( const QString &accountId );
+    virtual void syncConfig();
+
+private slots:
+    void onConnectionStateChanged( Tomahawk::Accounts::Account::ConnectionState );
+    void onError( int, const QString& );
+
+private:
+    QString m_accountServiceName;
+    QString m_accountFriendlyName;
+    QString m_cachedError;
+    bool m_enabled;
+    QString m_accountId;
+    QVariantHash m_credentials;
+    QVariantHash m_configuration;
+    QVariantMap m_acl;
+    QStringList m_types;
+    mutable QMutex m_mutex;
+};
+
+class DLLEXPORT AccountFactory : public QObject
+{
+    Q_OBJECT
+public:
+    AccountFactory() {}
+    virtual ~AccountFactory() {}
+
+    // display name for plugin
+    virtual QString prettyName() const = 0;
+    // internal name
+    virtual QString factoryId() const = 0;
+    // description to be shown when user views a list of account types
+    virtual QString description() const = 0;
+    // if the user can create multiple
+    virtual bool isUnique() const { return false; }
+
+    virtual QPixmap icon() const { return QPixmap(); }
+    virtual bool allowUserCreation() const { return true; }
+
+    // What are the supported types for accounts this factory creates?
+    virtual AccountTypes types() const = 0;
+
+    virtual Account* createAccount( const QString& accountId = QString() ) = 0;
+
+    /// If this resolver type accepts this path on disk (For general and special resolver accounts)
+    virtual bool acceptsPath( const QString& ) const { return false; }
+    virtual Account* createFromPath( const QString& ) { return 0; }
+};
+
+};
+
+};
+
+Q_DECLARE_INTERFACE( Tomahawk::Accounts::AccountFactory, "tomahawk.AccountFactory/1.0" )
+
+Q_DECLARE_METATYPE( Tomahawk::Accounts::Account* )
+Q_DECLARE_METATYPE( QList< Tomahawk::Accounts::Account* > )
+Q_DECLARE_METATYPE( Tomahawk::Accounts::AccountTypes )
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountDelegate.cpp Added

@@ -0,0 +1,744 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011-2012  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 "AccountDelegate.h"
+
+#include <QApplication>
+#include <QPainter>
+#include <QMouseEvent>
+
+#include "accounts/AccountModel.h"
+#include "accounts/Account.h"
+#include "accounts/AccountManager.h"
+
+#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "utils/AnimatedSpinner.h"
+#include "utils/Closure.h"
+#include "Source.h"
+
+#define CHILD_ACCOUNT_HEIGHT 24
+
+#define PADDING 4
+#define PADDING_BETWEEN_STARS 2
+#define STAR_SIZE 12
+
+#ifdef Q_OS_MAC
+#define ROW_HEIGHT_MULTIPLIER 4.9
+#else
+#define ROW_HEIGHT_MULTIPLIER 5.7
+#endif
+
+#define ICONSIZE 40
+#define WRENCH_SIZE 24
+#define SMALL_WRENCH_SIZE 16
+#define STATUS_ICON_SIZE 13
+#define CHECK_LEFT_EDGE 8
+#define REMOVE_ICON_SIZE 12
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+AccountDelegate::AccountDelegate( QObject* parent )
+    : QStyledItemDelegate ( parent )
+    , m_accountRowHeight( -1 )
+    , m_model( 0 )
+{
+    m_defaultCover.load( RESPATH "images/sipplugin-online.png" );
+    m_ratingStarPositive.load( RESPATH "images/starred.png" );
+    m_ratingStarNegative.load( RESPATH "images/star-unstarred.png" );
+    m_onHoverStar.load( RESPATH "images/star-hover.png" );
+    m_onlineIcon.load( RESPATH "images/sipplugin-online.png" );
+    m_offlineIcon.load( RESPATH "images/sipplugin-offline.png" );
+    m_removeIcon.load( RESPATH "images/list-remove.png" );
+
+    m_ratingStarPositive = m_ratingStarPositive.scaled( STAR_SIZE, STAR_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
+    m_ratingStarNegative = m_ratingStarNegative.scaled( STAR_SIZE, STAR_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
+    m_onlineIcon = m_onlineIcon.scaled( STATUS_ICON_SIZE, STATUS_ICON_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
+    m_offlineIcon = m_offlineIcon.scaled( STATUS_ICON_SIZE, STATUS_ICON_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
+    m_onHoverStar = m_onHoverStar.scaled( STAR_SIZE, STAR_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
+    m_removeIcon = m_removeIcon.scaled( REMOVE_ICON_SIZE, REMOVE_ICON_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation );
+
+    m_defaultCover = m_defaultCover.scaled( ICONSIZE, ICONSIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation );
+
+}
+
+
+QSize
+AccountDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    AccountModel::RowType rowType = static_cast< AccountModel::RowType >( index.data( AccountModel::RowTypeRole ).toInt() );
+    if ( m_accountRowHeight < 0 )
+    {
+        // Haven't calculated normal item height yet, do it once and save it
+        QStyleOptionViewItemV4 opt( option );
+        initStyleOption( &opt, index );
+        m_accountRowHeight = ROW_HEIGHT_MULTIPLIER * opt.fontMetrics.height();
+    }
+
+    if ( rowType == AccountModel::TopLevelAccount || rowType == AccountModel::UniqueFactory || rowType == AccountModel::CustomAccount )
+    {
+
+        return QSize( 200, m_accountRowHeight );
+    }
+    else if ( rowType == AccountModel::TopLevelFactory )
+    {
+        // Make more space for each account we have to show.
+        AccountFactory* fac = qobject_cast< AccountFactory* >( index.data( AccountModel::AccountData ).value< QObject* >() );
+        if ( fac->isUnique() )
+            return QSize( 200, m_accountRowHeight );
+
+        const QList< Account* > accts = index.data( AccountModel::ChildrenOfFactoryRole ).value< QList< Tomahawk::Accounts::Account* > >();
+        const QSize s = QSize( 200, m_accountRowHeight + 12 * accts.size()-1 );
+
+        if ( s != m_sizeHints index  )
+            const_cast< AccountDelegate* >( this )->sizeHintChanged( index ); // FU KTHBBQ
+
+        m_sizeHints index  = s;
+        return s;
+    }
+
+    return QSize();
+}
+
+
+void
+AccountDelegate::paint ( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, index );
+
+    // draw the background
+    const QWidget* w = opt.widget;
+    QStyle* style = w ? w->style() : QApplication::style();
+    style->drawPrimitive( QStyle::PE_PanelItemViewItem, &opt, painter, w );
+
+    painter->setRenderHint( QPainter::Antialiasing );
+
+    if ( m_model == 0 || m_model != index.model() )
+        m_model = const_cast<QAbstractItemModel*>( index.model() );
+
+    QFont titleFont = opt.font;
+    titleFont.setBold( true );
+    titleFont.setPointSize( titleFont.pointSize() + 2 );
+    const QFontMetrics titleMetrics( titleFont );
+
+    QFont authorFont = opt.font;
+    authorFont.setItalic( true );
+    authorFont.setPointSize( authorFont.pointSize() - 1 );
+#ifdef Q_OS_MAC
+    authorFont.setPointSize( authorFont.pointSize() - 1 );
+#endif
+    const QFontMetrics authorMetrics( authorFont );
+
+    QFont descFont = authorFont;
+    descFont.setItalic( false );
+    const QFontMetrics descMetrics( descFont );
+
+    QFont installFont = opt.font;
+    installFont.setPointSize( installFont.pointSize() - 1 );
+    const QFontMetrics installMetrics( descFont );
+
+    const int height = opt.rect.height();
+    const int center = height / 2 + opt.rect.top();
+
+    // Left account enable/disable checkbox
+    const AccountModel::RowType rowType = static_cast< AccountModel::RowType >( index.data( AccountModel::RowTypeRole ).toInt() );
+    int leftEdge = PADDING;
+    // draw checkbox first
+    const int checkboxYPos = ( center ) - ( WRENCH_SIZE / 2 );
+    QRect checkRect = QRect( leftEdge, checkboxYPos, WRENCH_SIZE, WRENCH_SIZE );
+    QStyleOptionViewItemV4 opt2 = opt;
+    opt2.rect = checkRect;
+
+    if ( !m_loadingSpinners.contains( index ) )
+    {
+        drawCheckBox( opt2, painter, opt.widget );
+    }
+    else
+    {
+        Q_ASSERT( m_loadingSpinners index  );
+        if ( m_loadingSpinners index  )
+        {
+            const QPixmap pm = m_loadingSpinnersindex->pixmap();
+            painter->drawPixmap( checkRect, pm );
+        }
+    }
+
+
+    leftEdge += WRENCH_SIZE + PADDING / 2;
+
+    // Pixmap
+    QPixmap p = index.data( Qt::DecorationRole ).value< QPixmap >();
+    QRect pixmapRect( leftEdge + PADDING, center - ICONSIZE/2, ICONSIZE, ICONSIZE );
+    if ( p.isNull() ) // default image... TODO
+        p = m_defaultCover;
+    else
+        p = p.scaled( pixmapRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation );
+
+    painter->drawPixmap( pixmapRect, p );
+
+    // Draw config wrench if there is one
+    const bool hasConfigWrench = index.data( AccountModel::HasConfig ).toBool();
+    int rightEdge = opt.rect.right();
+    m_cachedConfigRects index  = QRect();
+    if ( hasConfigWrench )
+    {
+        const QRect confRect = QRect( rightEdge - 2*PADDING - WRENCH_SIZE, center - WRENCH_SIZE / 2, WRENCH_SIZE, WRENCH_SIZE );
+        QStyleOptionToolButton topt;
+        topt.rect = confRect;
+        topt.pos = confRect.topLeft();
+
+        drawConfigWrench( painter, opt, topt );
+
+        m_cachedConfigRects index  = confRect;
+        rightEdge = confRect.left();
+
+    }
+
+    // Draw individual accounts and add account button for factories
+    m_cachedButtonRects index  = QRect();
+
+    bool canDelete = index.data( AccountModel::CanDeleteRole ) .toBool();
+    if ( rowType == Tomahawk::Accounts::AccountModel::TopLevelFactory )
+    {
+        const QList< Account* > accts = index.data( AccountModel::ChildrenOfFactoryRole ).value< QList< Tomahawk::Accounts::Account* > >();
+
+        QRect btnRect;
+        const QString btnText = tr( "Add Account" );
+        const int btnWidth = installMetrics.width( btnText ) + 2*PADDING;
+
+        if ( accts.isEmpty() )
+        {
+            Q_ASSERT( !hasConfigWrench );
+
+            // Draw button in center of row
+            btnRect= QRect( opt.rect.right() - PADDING - btnWidth, center - ( installMetrics.height() + 4 ) / 2, btnWidth, installMetrics.height() + 2*PADDING );
+            rightEdge = btnRect.left();
+        }
+        else
+        {
+            painter->save();
+            painter->setFont( installFont );
+            rightEdge = drawAccountList( painter, opt, accts, rightEdge );
+            painter->restore();
+
+            btnRect = QRect( opt.rect.right() - PADDING - btnWidth, opt.rect.bottom() - installMetrics.height() - 3*PADDING,  btnWidth, installMetrics.height() + 2*PADDING );
+#ifdef Q_WS_MAC
+            btnRect.adjust( -4, 0, 4, 0 );
+#endif
+        }
+
+        leftEdge = btnRect.left();
+        m_cachedButtonRects index  = btnRect;
+
+        painter->save();
+        painter->setPen( opt.palette.color( QPalette::Active, QPalette::AlternateBase ) );
+
+        drawRoundedButton( painter, btnRect );
+
+        painter->setFont( installFont );
+        painter->drawText( btnRect, Qt::AlignCenter, btnText );
+        painter->restore();
+    }
+    else if ( rowType == AccountModel::UniqueFactory )
+    {
+        // Display as usual, except if it has an account, show the status.
+        const QList< Account* > accts = index.data( AccountModel::ChildrenOfFactoryRole ).value< QList< Tomahawk::Accounts::Account* > >();
+        if ( !accts.isEmpty() )
+        {
+            Q_ASSERT( accts.size() == 1 );
+
+            rightEdge = drawStatus( painter, QPointF( rightEdge, center - painter->fontMetrics().height()/2 ), accts.first(), true );
+        }
+
+    }
+    else if ( canDelete )
+    {
+        const QString btnText = tr( "Remove" );
+        const int btnWidth = installMetrics.width( btnText ) + 2*PADDING;
+        QRect btnRect;
+
+        if ( hasConfigWrench )
+            btnRect = QRect( opt.rect.right() - PADDING - btnWidth, opt.rect.bottom() - installMetrics.height() - 3*PADDING,  btnWidth, installMetrics.height() + 2*PADDING );
+        else
+            btnRect = QRect( opt.rect.right() - PADDING - btnWidth, center - ( installMetrics.height() + 4 ) / 2, btnWidth, installMetrics.height() + 2*PADDING );
+
+#ifdef Q_WS_MAC
+        btnRect.adjust( -4, 0, 4, 0 );
+
+        if ( hasConfigWrench )
+            btnRect.moveTop( btnRect.top() + 2 );
+#endif
+        leftEdge = btnRect.left();
+        m_cachedButtonRects index  = btnRect;
+
+        painter->save();
+        painter->setPen( opt.palette.color( QPalette::Active, QPalette::AlternateBase ) );
+
+        drawRoundedButton( painter, btnRect, true );
+
+        painter->setFont( installFont );
+        painter->drawText( btnRect, Qt::AlignCenter, btnText );
+        painter->restore();
+    }
+
+    // Draw the title and description
+    // title
+    QString title = index.data( Qt::DisplayRole ).toString();
+    const int rightTitleEdge = rightEdge - PADDING;
+    const int leftTitleEdge = pixmapRect.right() + PADDING;
+    painter->setFont( titleFont );
+    QRect textRect;
+    const bool canRate = index.data( AccountModel::CanRateRole ).toBool();
+    if ( canRate )
+    {
+        textRect = QRect( leftTitleEdge, opt.rect.top() + PADDING, rightTitleEdge - leftTitleEdge, painter->fontMetrics().height() );
+    }
+    else
+    {
+        textRect = QRect( leftTitleEdge, opt.rect.top() + PADDING, rightTitleEdge - leftTitleEdge, center - opt.rect.top() - PADDING );
+    }
+    painter->drawText( textRect, Qt::AlignVCenter | Qt::AlignLeft, title );
+
+    // author
+    QString author = index.data( AccountModel::AuthorRole ).toString();
+    int runningBottom = textRect.bottom();
+    if ( !author.isEmpty() && canRate )
+    {
+        painter->save();
+        painter->setFont( authorFont );
+        painter->setPen( QColor( Qt::gray ).darker( 150 ) );
+        const int authorWidth = authorMetrics.width( author );
+        const QRect authorRect( textRect.left(),  textRect.bottom() + PADDING/2, authorWidth + 6, authorMetrics.height() );
+        painter->drawText( authorRect, Qt::AlignLeft | Qt::AlignVCenter, author );
+        painter->restore();
+
+        runningBottom = authorRect.bottom();
+    }
+
+    // description
+    QString desc = index.data( AccountModel::DescriptionRole ).toString();
+    const int descWidth = rightEdge - leftTitleEdge - PADDING;
+    painter->setFont( descFont );
+    const QRect descRect( leftTitleEdge, runningBottom + PADDING, descWidth, painter->fontMetrics().height() );
+    desc = painter->fontMetrics().elidedText( desc, Qt::ElideRight, descWidth );
+    painter->drawText( descRect, Qt::AlignLeft | Qt::TextWordWrap | Qt::AlignTop, desc );
+    runningBottom = descRect.bottom();
+
+    if ( index.data( AccountModel::CanRateRole ).toBool() )
+    {
+        // rating stars
+        const int rating = index.data( AccountModel::RatingRole ).toInt();
+
+//         int runningEdge = opt.rect.right() - 2*PADDING - ratingWidth;
+        int runningEdge = textRect.left();
+//         int starsTop = opt.rect.bottom() - 3*PADDING - m_ratingStarNegative.height();
+        int starsTop = runningBottom + PADDING;
+        for ( int i = 1; i < 6; i++ )
+        {
+            QRect r( runningEdge, starsTop, m_ratingStarPositive.width(), m_ratingStarPositive.height() );
+//             QRect r( runningEdge, opt.rect.top() + PADDING, m_ratingStarPositive.width(), m_ratingStarPositive.height() );
+            if ( i == 1 )
+                m_cachedStarRects index  = r;
+
+            const bool userHasRated = index.data( AccountModel::UserHasRatedRole ).toBool();
+            if ( !userHasRated && // Show on-hover animation if the user hasn't rated it yet, and is hovering over it
+                 m_hoveringOver > -1 &&
+                 m_hoveringItem == index )
+            {
+                if ( i <= m_hoveringOver ) // positive star
+                    painter->drawPixmap( r, m_onHoverStar );
+                else
+                    painter->drawPixmap( r, m_ratingStarNegative );
+            }
+            else
+            {
+                if ( i <= rating ) // positive or rated star
+                {
+                    if ( userHasRated )
+                        painter->drawPixmap( r, m_onHoverStar );
+                    else
+                        painter->drawPixmap( r, m_ratingStarPositive );
+                }
+                else
+                    painter->drawPixmap( r, m_ratingStarNegative );
+            }
+            runningEdge += m_ratingStarPositive.width() + PADDING_BETWEEN_STARS;
+        }
+
+        // downloaded num times
+        QString count = tr( "%1 downloads" ).arg( index.data( AccountModel::DownloadCounterRole ).toInt() );
+        painter->setFont( descFont );
+        const int countW = painter->fontMetrics().width( count );
+        const QRect countRect( runningEdge + 50, starsTop, countW, painter->fontMetrics().height() );
+        count = painter->fontMetrics().elidedText( count, Qt::ElideRight, rightEdge - PADDING - countRect.left() );
+        painter->drawText( countRect, Qt::AlignLeft, count );
+        //         runningEdge = authorRect.x();
+    }
+
+    // Title and description!
+    return;
+}
+
+
+int
+AccountDelegate::drawAccountList( QPainter* painter, QStyleOptionViewItemV4& opt, const QList< Account* > accts, int rightEdge ) const
+{
+    // list each account name, and show the online, offline icon
+    const int textHeight = painter->fontMetrics().height() + 1;
+    const int mid = opt.rect.bottom() - opt.rect.height() / 2;
+    int runningRightEdge = rightEdge;
+    int current = 0;
+
+    int leftOfAccounts = rightEdge;
+
+    if ( accts.size() % 2 == 1 )
+    {
+        // If there's an odd number, the center one is centered
+        current = mid - ((textHeight + PADDING/2) * (accts.size()/2) ) - textHeight / 2;
+    }
+    else
+    {
+        // Even number, center between the middle ones
+        current = mid - ((textHeight + PADDING/2) * (accts.size()/2) );
+    }
+
+    for ( int i = 0; i < accts.size(); i++ )
+    {
+        // draw lightbulb and text
+        runningRightEdge = drawStatus( painter, QPointF( rightEdge - PADDING, current), accts.at( i ) );
+
+        const QString label = accts.at( i )->accountFriendlyName();
+        const QPoint textTopLeft( runningRightEdge - PADDING - painter->fontMetrics().width( label ), current);
+        painter->drawText( QRect( textTopLeft, QSize( painter->fontMetrics().width( label ) + 1, textHeight ) ), label );
+
+        current += textHeight + PADDING/2;
+
+        leftOfAccounts = qMin( leftOfAccounts, textTopLeft.x() );
+    }
+
+    return leftOfAccounts;
+}
+
+
+bool
+AccountDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
+{
+    if ( event->type() != QEvent::MouseButtonPress &&
+         event->type() != QEvent::MouseButtonRelease &&
+         event->type() != QEvent::MouseButtonDblClick &&
+         event->type() != QEvent::MouseMove )
+        return false;
+
+    if ( event->type() == QEvent::MouseButtonPress )
+    {
+        // Show the config wrench as depressed on click
+        QMouseEvent* me = static_cast< QMouseEvent* >( event );
+        if ( me->button() == Qt::LeftButton && m_cachedConfigRects.contains( index ) && m_cachedConfigRects index .contains( me->pos() ) )
+        {
+            m_configPressed = index;
+
+            const AccountModel::RowType rowType = static_cast< AccountModel::RowType >( index.data( AccountModel::RowTypeRole ).toInt() );
+            if ( rowType == AccountModel::TopLevelAccount ||
+                 rowType == AccountModel::CustomAccount )
+            {
+                Account* acct = qobject_cast< Account* >( index.data( AccountModel::AccountData ).value< QObject* >() );
+                Q_ASSERT( acct ); // Should not be showing a config wrench if there is no account!
+
+                emit openConfig( acct );
+            }
+            else if ( rowType == AccountModel::TopLevelFactory )
+            {
+                AccountFactory* fac = qobject_cast< AccountFactory* >( index.data( AccountModel::AccountData ).value< QObject* >() );
+                Q_ASSERT( fac ); // Should not be showing a config wrench if there is no account!
+                emit openConfig( fac );
+            }
+            else if ( rowType == AccountModel::UniqueFactory )
+            {
+                const QList< Account* > accts = index.data( AccountModel::ChildrenOfFactoryRole ).value< QList< Tomahawk::Accounts::Account* > >();
+
+                Q_ASSERT( !accts.isEmpty() ); // If there's no account, why is there a config widget for this factory?
+                Q_ASSERT( accts.size() == 1 );
+                emit openConfig( accts.first() );
+            }
+            return true;
+        }
+    } else if ( event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonDblClick )
+    {
+        QMouseEvent* me = static_cast< QMouseEvent* >( event );
+        if ( m_configPressed.isValid() )
+            emit update( m_configPressed );
+
+        m_configPressed = QModelIndex();
+
+        if ( checkRectForIndex( option, index ).contains( me->pos() ) )
+        {
+            // Check box for this row
+
+            // eat the double click events inside the check rect
+            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, AccountModel::CheckboxClickedRole );
+        }
+        else if ( m_cachedButtonRects.contains( index ) && m_cachedButtonRects index .contains( me->pos() ) )
+        {
+            // Install/create/etc button for this row
+            model->setData( index, true, AccountModel::CustomButtonRole );
+        }
+    }
+
+    if ( m_cachedStarRects.contains( index ) )
+    {
+        QRect fullStars = m_cachedStarRects index ;
+        const int starsWidth = 5 * ( m_ratingStarPositive.width() + PADDING_BETWEEN_STARS );
+        fullStars.setWidth( starsWidth );
+
+        QMouseEvent* me = static_cast< QMouseEvent* >( event );
+
+        if ( fullStars.contains( me->pos() ) )
+        {
+            const int eachStar = starsWidth / 5;
+            const int clickOffset = me->pos().x() - fullStars.x();
+            const int whichStar = (clickOffset / eachStar) + 1;
+
+            if ( event->type() == QEvent::MouseButtonRelease )
+            {
+                model->setData( index, whichStar, AccountModel::RatingRole );
+            }
+            else if ( event->type() == QEvent::MouseMove )
+            {
+                // 0-indexed
+                m_hoveringOver = whichStar;
+                m_hoveringItem = index;
+            }
+
+            return true;
+        }
+    }
+
+    if ( m_hoveringOver > -1 )
+    {
+        emit update( m_hoveringItem );
+        m_hoveringOver = -1;
+        m_hoveringItem = QPersistentModelIndex();
+    }
+    return false;
+}
+
+
+void
+AccountDelegate::drawRoundedButton( QPainter* painter, const QRect& btnRect, bool red ) const
+{
+    if ( !red )
+        TomahawkUtils::drawRoundedButton( painter, btnRect, QColor(54, 127, 211), QColor(43, 104, 182), QColor(34, 85, 159), QColor(35, 79, 147) );
+    else
+        TomahawkUtils::drawRoundedButton( painter, btnRect, QColor(206, 63, 63), QColor(170, 52, 52), QColor(150, 50, 50), QColor(130, 40, 40) );
+}
+
+
+int
+AccountDelegate::drawStatus( QPainter* painter, const QPointF& rightTopEdge, Account* acct, bool drawText ) const
+{
+    QPixmap p;
+    QString statusText;
+
+    const Account::ConnectionState state = acct->connectionState();
+    if ( state == Account::Connected )
+    {
+        p = m_onlineIcon;
+        statusText = tr( "Online" );
+    }
+    else if ( state == Account::Connecting )
+    {
+        p = m_offlineIcon;
+        statusText = tr( "Connecting..." );
+    }
+    else
+    {
+        p = m_offlineIcon;
+        statusText = tr( "Offline" );
+    }
+
+    const int yPos = rightTopEdge.y();
+    const QRect connectIconRect( rightTopEdge.x() - STATUS_ICON_SIZE, yPos, STATUS_ICON_SIZE, STATUS_ICON_SIZE );
+
+    if ( state == Account::Connecting )
+    {
+        if ( !m_connectingSpinners.contains( acct ) )
+        {
+            AnimatedSpinner* anim = new AnimatedSpinner( connectIconRect.size(), true );
+            _detail::Closure* closure = new _detail::Closure( anim, SIGNAL( requestUpdate() ), const_cast<AccountDelegate*>(this), SLOT( doUpdateIndexWithAccount( Tomahawk::Accounts::Account* ) ), C_ARG( Tomahawk::Accounts::Account*, acct ) );
+            closure->setAutoDelete( false );
+
+            m_connectingSpinners acct  = anim;
+        }
+
+        const QPixmap pm = m_connectingSpinnersacct->pixmap();
+        painter->drawPixmap( connectIconRect, pm );
+    }
+    else
+    {
+        if ( m_connectingSpinners.contains( acct ) )
+            delete m_connectingSpinners.take( acct );
+
+        painter->drawPixmap( connectIconRect, p );
+    }
+
+
+    int leftEdge = connectIconRect.x();
+    if ( drawText )
+    {
+        int width = painter->fontMetrics().width( statusText );
+        int statusTextX = connectIconRect.x() - PADDING - width;
+        painter->drawText( QRect( statusTextX, yPos, width, painter->fontMetrics().height() ), statusText );
+
+        leftEdge = statusTextX;
+    }
+
+    return leftEdge;
+}
+
+
+void
+AccountDelegate::drawCheckBox( QStyleOptionViewItemV4& opt, QPainter* p, const QWidget* w ) const
+{
+    QStyle* style = w ? w->style() : QApplication::style();
+    opt.checkState == Qt::Checked ? opt.state |= QStyle::State_On : opt.state |= QStyle::State_Off;
+    style->drawPrimitive( QStyle::PE_IndicatorViewItemCheck, &opt, p, w );
+}
+
+
+void
+AccountDelegate::drawConfigWrench ( QPainter* painter, QStyleOptionViewItemV4& opt, QStyleOptionToolButton& topt ) const
+{
+    const QWidget* w = opt.widget;
+    QStyle* style = w ? w->style() : QApplication::style();
+
+    // draw it the same size as the check belox
+    topt.font = opt.font;
+    topt.icon = QIcon( RESPATH "images/configure.png" );
+    topt.iconSize = QSize( 14, 14 );
+    topt.subControls = QStyle::SC_ToolButton;
+    topt.activeSubControls = QStyle::SC_None;
+    topt.features = QStyleOptionToolButton::None;
+    bool pressed = ( m_configPressed == opt.index );
+    topt.state = pressed ? QStyle::State_On : QStyle::State_Raised;
+    if( opt.state & QStyle::State_MouseOver || pressed )
+        topt.state |= QStyle::State_HasFocus;
+    style->drawComplexControl( QStyle::CC_ToolButton, &topt, painter, w );
+}
+
+
+
+QRect
+AccountDelegate::checkRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const
+{
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, idx );
+
+    // Top level item, return the corresponding rect
+    const int ypos = ( opt.rect.top() + opt.rect.height() / 2 ) - ( WRENCH_SIZE / 2 );
+    const QRect checkRect = QRect( PADDING, ypos, WRENCH_SIZE, WRENCH_SIZE );
+
+    return checkRect;
+
+}
+
+void
+AccountDelegate::startInstalling( const QPersistentModelIndex& idx )
+{
+    qDebug() << "START INSTALLING:" << idx.data( Qt::DisplayRole ).toString();
+    QStyleOptionViewItemV4 opt;
+    initStyleOption( &opt, idx );
+
+    AnimatedSpinner* anim = new AnimatedSpinner( checkRectForIndex( opt, idx ).size(), true );
+    _detail::Closure* closure = NewClosure( anim, SIGNAL( requestUpdate() ), this, SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), idx );
+    closure->setAutoDelete( false );
+
+    m_loadingSpinners idx  = anim;
+
+    update( idx );
+}
+
+
+void
+AccountDelegate::doneInstalling ( const QPersistentModelIndex& idx )
+{
+    qDebug() << "STOP INSTALLING:" << idx.data( Qt::DisplayRole ).toString();
+    if ( !m_loadingSpinners.contains( idx ) )
+        return;
+
+    delete m_loadingSpinners.take( idx );
+
+    update( idx );
+}
+
+
+void
+AccountDelegate::errorInstalling( const QPersistentModelIndex& idx )
+{
+    // Just hide the loading spinner as we do after a successful install
+    qDebug() << "ERROR INSTALLING index:" << idx;
+    doneInstalling( idx );
+}
+
+
+void
+AccountDelegate::doUpdateIndex( const QPersistentModelIndex& idx )
+{
+    emit update( idx );
+}
+
+
+void
+AccountDelegate::doUpdateIndexWithAccount( Account* account )
+{
+    // Urgh, have to go through the list and check based on the type
+    for ( int i = 0; i < m_model->rowCount(); i++ )
+    {
+        const QModelIndex index = m_model->index( i, 0, QModelIndex() );
+        const AccountModel::RowType rowType = static_cast< AccountModel::RowType >( index.data( AccountModel::RowTypeRole ).toInt() );
+        if ( rowType == AccountModel::TopLevelAccount ||
+            rowType == AccountModel::CustomAccount )
+        {
+            Account* acct = qobject_cast< Account* >( index.data( AccountModel::AccountData ).value< QObject* >() );
+
+            if ( account == acct )
+            {
+                emit update( index );
+                return;
+            }
+        }
+        else if ( rowType == AccountModel::TopLevelFactory || rowType == AccountModel::UniqueFactory )
+        {
+            const QList< Account* > accts = index.data( AccountModel::ChildrenOfFactoryRole ).value< QList< Tomahawk::Accounts::Account* > >();
+            if ( accts.contains( account ) )
+            {
+                emit update( index );
+                return;
+            }
+        }
+    }
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountDelegate.h Added

@@ -0,0 +1,91 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011-2012  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 ACCOUNTDELEGATE_H
+#define ACCOUNTDELEGATE_H
+
+#include "DllMacro.h"
+#include <QStyledItemDelegate>
+#include "accounts/AccountModel.h"
+
+class AnimatedSpinner;
+
+namespace Tomahawk
+{
+namespace Accounts
+{
+
+class Account;
+
+class DLLEXPORT AccountDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+public:
+    AccountDelegate( QObject* parent = 0);
+
+    virtual void paint ( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    virtual QSize sizeHint ( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+public slots:
+    void startInstalling( const QPersistentModelIndex& idx );
+    void doneInstalling ( const QPersistentModelIndex& idx );
+    void errorInstalling ( const QPersistentModelIndex& idx );
+
+
+    void doUpdateIndex( const QPersistentModelIndex& idx );
+
+protected:
+    virtual bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
+
+signals:
+    void update( const QModelIndex& idx );
+    void openConfig( Tomahawk::Accounts::Account* );
+    void openConfig( Tomahawk::Accounts::AccountFactory* );
+
+private slots:
+    void doUpdateIndexWithAccount( Tomahawk::Accounts::Account* account );
+
+private:
+    void drawRoundedButton( QPainter* painter, const QRect& buttonRect, bool red = false ) const;
+    // Returns new left edge
+    int drawStatus( QPainter* painter, const QPointF& rightTopEdge, Account* acct, bool drawText = false ) const;
+    void drawCheckBox( QStyleOptionViewItemV4& opt, QPainter* p, const QWidget* w ) const;
+    void drawConfigWrench( QPainter* painter, QStyleOptionViewItemV4& option, QStyleOptionToolButton& topt ) const;
+    // returns new left edge
+    int drawAccountList( QPainter* painter, QStyleOptionViewItemV4& option, const QList< Account* > accounts, int rightEdge ) const;
+
+    QRect checkRectForIndex( const QStyleOptionViewItem &option, const QModelIndex &idx ) const;
+
+    QPixmap m_offlineIcon, m_onlineIcon, m_defaultCover, m_onHoverStar, m_ratingStarPositive, m_ratingStarNegative, m_removeIcon;
+    int m_hoveringOver;
+    QPersistentModelIndex m_hoveringItem, m_configPressed;
+    mutable QHash< QPersistentModelIndex, QRect > m_cachedButtonRects;
+    mutable QHash< QPersistentModelIndex, QRect > m_cachedStarRects;
+    mutable QHash< QPersistentModelIndex, QRect > m_cachedConfigRects;
+    mutable QHash< QPersistentModelIndex, QSize > m_sizeHints;
+    mutable QHash< QPersistentModelIndex, AnimatedSpinner* > m_loadingSpinners;
+    mutable QHash< Account*, AnimatedSpinner* > m_connectingSpinners;
+    mutable int m_accountRowHeight;
+
+    mutable QAbstractItemModel* m_model;
+};
+
+}
+}
+
+#endif // ACCOUNTDELEGATE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountFactoryWrapper.cpp Added

@@ -0,0 +1,138 @@
+/* === 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 "AccountFactoryWrapper.h"
+
+#include "accounts/Account.h"
+#include "accounts/AccountManager.h"
+#include "utils/GuiHelpers.h"
+#include "AccountFactoryWrapperDelegate.h"
+#include "DelegateConfigWrapper.h"
+#include "ui_AccountFactoryWrapper.h"
+#include "Source.h"
+
+using namespace Tomahawk::Accounts;
+AccountFactoryWrapper::AccountFactoryWrapper( AccountFactory* factory, QWidget* parent )
+    : QDialog( parent, Qt::Sheet )
+    , m_factory( factory )
+    , m_ui( new Ui_AccountFactoryWrapper )
+{
+    m_ui->setupUi( this );
+
+    setWindowTitle( factory->prettyName() );
+
+    m_ui->factoryIcon->setPixmap( factory->icon() );
+    m_ui->factoryDescription->setText( factory->description() );
+
+    m_addButton = m_ui->buttonBox->addButton( tr( "Add Account" ), QDialogButtonBox::ActionRole );
+
+    AccountFactoryWrapperDelegate* del = new AccountFactoryWrapperDelegate( m_ui->accountsList );
+    m_ui->accountsList->setItemDelegate( del );
+
+    connect( del, SIGNAL( openConfig( Tomahawk::Accounts::Account* ) ), this, SLOT( openAccountConfig( Tomahawk::Accounts::Account* ) ) );
+    connect( del, SIGNAL( removeAccount( Tomahawk::Accounts::Account* ) ), this, SLOT( removeAccount( Tomahawk::Accounts::Account* ) ) );
+    connect( del, SIGNAL( checkOrUncheck( QModelIndex, Tomahawk::Accounts::Account* , Qt::CheckState ) ), this, SLOT( accountCheckedOrUnchecked( QModelIndex ,Tomahawk::Accounts::Account* ,Qt::CheckState ) ) );
+    load();
+
+    connect( m_ui->buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );
+    connect( m_ui->buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
+    connect( m_ui->buttonBox, SIGNAL( clicked( QAbstractButton*) ), this, SLOT( buttonClicked( QAbstractButton* ) ) );
+
+
+    connect ( AccountManager::instance(), SIGNAL( added( Tomahawk::Accounts::Account* ) ), this, SLOT( load() ) );
+    connect ( AccountManager::instance(), SIGNAL( removed( Tomahawk::Accounts::Account* ) ), this, SLOT( load() ) );
+
+#ifdef Q_OS_MAC
+    setContentsMargins( 0, 0, 0, 0 );
+    m_ui->verticalLayout->setSpacing( 6 );
+#endif
+}
+
+void
+AccountFactoryWrapper::load()
+{
+    m_ui->accountsList->clear();
+    foreach ( Account* acc, AccountManager::instance()->accounts() )
+    {
+        if ( AccountManager::instance()->factoryForAccount( acc ) == m_factory )
+        {
+            QTreeWidgetItem* item = new QTreeWidgetItem( m_ui->accountsList );
+            item->setData( 0, AccountRole, QVariant::fromValue< QObject *>( acc ) );
+            item->setCheckState( 0, acc->enabled() ? Qt::Checked : Qt::Unchecked );
+        }
+    }
+
+    if ( m_ui->accountsList->model()->rowCount() == 0 )
+        accept();
+
+#ifndef Q_OS_MAC
+    const int padding = 7;
+#else
+    const int padding = 8;
+#endif
+    const int height = m_ui->accountsList->model()->rowCount( QModelIndex() ) * ACCOUNT_ROW_HEIGHT + padding;
+
+    m_ui->accountsList->setFixedHeight( height );
+}
+
+
+void
+AccountFactoryWrapper::openAccountConfig( Account* account )
+{
+    TomahawkUtils::openAccountConfig( account, this, false );
+}
+
+
+void
+AccountFactoryWrapper::removeAccount( Tomahawk::Accounts::Account* acct )
+{
+    AccountManager::instance()->removeAccount( acct );
+
+    load();
+}
+
+void
+AccountFactoryWrapper::accountCheckedOrUnchecked( const QModelIndex& index, Account* acct, Qt::CheckState newstate )
+{
+    QTreeWidgetItem* item = m_ui->accountsList->topLevelItem( index.row() );
+    Q_ASSERT( item );
+
+    if ( newstate == Qt::Checked )
+    {
+        item->setCheckState( 0, Qt::Checked );
+        AccountManager::instance()->enableAccount( acct );
+    }
+    else if ( newstate == Qt::Unchecked )
+    {
+        item->setCheckState( 0, Qt::Unchecked );
+        AccountManager::instance()->disableAccount( acct );
+    }
+}
+
+
+void
+AccountFactoryWrapper::buttonClicked( QAbstractButton* button )
+{
+    if ( button == m_addButton )
+    {
+        TomahawkUtils::createAccountFromFactory( m_factory, this );
+    }
+    else
+        reject();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountFactoryWrapper.h Added

@@ -0,0 +1,64 @@
+/* === 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 ACCOUNTFACTORYWRAPPER_H
+#define ACCOUNTFACTORYWRAPPER_H
+
+#include "DllMacro.h"
+
+#include <QDialog>
+#include <QModelIndex>
+
+class QAbstractButton;
+namespace Tomahawk {
+namespace Accounts {
+    class AccountFactory;
+class Account;
+}
+}
+
+class Ui_AccountFactoryWrapper;
+
+// class AccountFactoryWrapper_
+class DLLEXPORT AccountFactoryWrapper : public QDialog
+{
+    Q_OBJECT
+public:
+    enum ExtraRoles {
+        AccountRole = Qt::UserRole + 140
+    };
+
+    explicit AccountFactoryWrapper( Tomahawk::Accounts::AccountFactory* factory, QWidget* parent = 0 );
+    virtual ~AccountFactoryWrapper() {}
+
+public slots:
+    void openAccountConfig( Tomahawk::Accounts::Account* );
+    void removeAccount( Tomahawk::Accounts::Account* );
+    void accountCheckedOrUnchecked( const QModelIndex& , Tomahawk::Accounts::Account* , Qt::CheckState );
+
+private slots:
+    void buttonClicked( QAbstractButton* );
+    void load();
+
+private:
+    Tomahawk::Accounts::AccountFactory* m_factory;
+    Ui_AccountFactoryWrapper* m_ui;
+    QPushButton* m_addButton;
+};
+
+#endif // ACCOUNTFACTORYWRAPPER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountFactoryWrapper.ui Added

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AccountFactoryWrapper</class>
+ <widget class="QDialog" name="AccountFactoryWrapper">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>507</width>
+    <height>150</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="factoryIcon">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="factoryDescription">
+     <property name="text">
+      <string>Description goes here</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTreeWidget" name="accountsList">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <property name="horizontalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOff</enum>
+     </property>
+     <property name="autoScroll">
+      <bool>false</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::NoSelection</enum>
+     </property>
+     <property name="verticalScrollMode">
+      <enum>QAbstractItemView::ScrollPerItem</enum>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="headerHidden">
+      <bool>true</bool>
+     </property>
+     <property name="expandsOnDoubleClick">
+      <bool>false</bool>
+     </property>
+     <column>
+      <property name="text">
+       <string notr="true">1</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountFactoryWrapperDelegate.cpp Added

@@ -0,0 +1,187 @@
+/* === 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 "AccountFactoryWrapperDelegate.h"
+#include "accounts/Account.h"
+#include "AccountFactoryWrapper.h"
+#include "utils/TomahawkUtils.h"
+#include "Source.h"
+
+#include <QApplication>
+#include <QPainter>
+#include <QMouseEvent>
+
+using namespace Tomahawk::Accounts;
+
+#define ICON_SIZE 15
+#define CONFIG_WRENCH_SIZE 20
+#define PADDING 4
+
+AccountFactoryWrapperDelegate::AccountFactoryWrapperDelegate( QObject* parent )
+    : QStyledItemDelegate( parent )
+{
+    m_removePixmap.load( RESPATH "images/list-remove.png" );
+    m_onlineIcon.load( RESPATH "images/sipplugin-online.png" );
+    m_offlineIcon.load( RESPATH "images/sipplugin-offline.png" );
+
+    m_removePixmap = m_removePixmap.scaled( ICON_SIZE, ICON_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation );
+    m_onlineIcon = m_onlineIcon.scaled( ICON_SIZE, ICON_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
+    m_offlineIcon = m_offlineIcon.scaled( ICON_SIZE, ICON_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
+
+    m_configIcon.addFile( RESPATH "images/configure.png", QSize( CONFIG_WRENCH_SIZE - 8, CONFIG_WRENCH_SIZE - 8 ) );
+}
+
+void
+AccountFactoryWrapperDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, index );
+
+    const int center = opt.rect.height() / 2 + opt.rect.top();
+    const int topIcon = center - ICON_SIZE/2;
+
+    // draw the background
+    const QWidget* w = opt.widget;
+    QStyle* style = w ? w->style() : QApplication::style();
+    style->drawPrimitive( QStyle::PE_PanelItemViewItem, &opt, painter, w );
+
+    Account* acc = qobject_cast< Account* >( index.data( AccountFactoryWrapper::AccountRole ).value< QObject* >() );
+    Q_ASSERT( acc );
+
+    // Checkbox on left edge, then text
+    const QRect checkRect( PADDING/4, PADDING/4 + opt.rect.top(), opt.rect.height() - PADDING/4, opt.rect.height() - PADDING/4 );
+    m_cachedCheckRects index  = checkRect;
+    QStyleOptionViewItemV4 opt2 = opt;
+    opt2.rect = checkRect;
+    opt.checkState == Qt::Checked ? opt2.state |= QStyle::State_On : opt2.state |= QStyle::State_Off;
+    style->drawPrimitive( QStyle::PE_IndicatorViewItemCheck, &opt2, painter, w );
+
+    // name on left
+    painter->drawText( opt.rect.adjusted( checkRect.right() + PADDING, PADDING, -PADDING, -PADDING ), Qt::AlignLeft | Qt::AlignVCenter, acc->accountFriendlyName() );
+
+    // remove, config, status on right
+    const QRect pmRect( opt.rect.right() - PADDING - m_removePixmap.width(), topIcon, ICON_SIZE, ICON_SIZE );
+    painter->drawPixmap( pmRect, m_removePixmap );
+    m_cachedButtonRects index  = pmRect;
+
+    const QRect confRect( pmRect.left() - PADDING - CONFIG_WRENCH_SIZE, center - CONFIG_WRENCH_SIZE/2, CONFIG_WRENCH_SIZE, CONFIG_WRENCH_SIZE );
+
+    QStyleOptionToolButton topt;
+    topt.rect = confRect;
+    topt.pos = confRect.topLeft();
+    topt.font = opt.font;
+    topt.icon = m_configIcon;
+    topt.iconSize = QSize( CONFIG_WRENCH_SIZE - 8, CONFIG_WRENCH_SIZE - 8 );
+    topt.subControls = QStyle::SC_ToolButton;
+    topt.activeSubControls = QStyle::SC_None;
+    topt.features = QStyleOptionToolButton::None;
+    bool pressed = ( m_configPressed == opt.index );
+    topt.state = pressed ? QStyle::State_On : QStyle::State_Raised;
+    if( opt.state & QStyle::State_MouseOver || pressed )
+        topt.state |= QStyle::State_HasFocus;
+    style->drawComplexControl( QStyle::CC_ToolButton, &topt, painter, w );
+    m_cachedConfigRects index  = confRect;
+
+    QPixmap p;
+    QString statusText;
+    Account::ConnectionState state = acc->connectionState();
+    if ( state == Account::Connected )
+    {
+        p = m_onlineIcon;
+        statusText = tr( "Online" );
+    }
+    else if ( state == Account::Connecting )
+    {
+        p = m_offlineIcon;
+        statusText = tr( "Connecting..." );
+    }
+    else
+    {
+        p = m_offlineIcon;
+        statusText = tr( "Offline" );
+    }
+
+    const QRect connectIconRect( confRect.left() - PADDING - ICON_SIZE, topIcon, ICON_SIZE, ICON_SIZE );
+    painter->drawPixmap( connectIconRect, p );
+
+    int width = painter->fontMetrics().width( statusText );
+    painter->drawText( QRect( connectIconRect.left() - PADDING - width, center - painter->fontMetrics().height()/2, width, painter->fontMetrics().height() ), statusText );
+
+}
+
+QSize
+AccountFactoryWrapperDelegate::sizeHint(const QStyleOptionViewItem&, const QModelIndex&) const
+{
+    return QSize( 200, ACCOUNT_ROW_HEIGHT );
+}
+
+
+bool
+AccountFactoryWrapperDelegate::editorEvent( QEvent* event, QAbstractItemModel*, const QStyleOptionViewItem&, const QModelIndex& index )
+{
+    if ( event->type() != QEvent::MouseButtonPress &&
+        event->type() != QEvent::MouseButtonRelease &&
+        event->type() != QEvent::MouseButtonDblClick &&
+        event->type() != QEvent::MouseMove )
+        return false;
+
+    if ( event->type() == QEvent::MouseButtonPress )
+    {
+        // Show the config wrench as depressed on click
+        QMouseEvent* me = static_cast< QMouseEvent* >( event );
+        if ( me->button() == Qt::LeftButton && m_cachedConfigRects.contains( index ) && m_cachedConfigRects index .contains( me->pos() ) )
+        {
+            m_configPressed = index;
+            Account* acct = qobject_cast< Account* >( index.data( AccountFactoryWrapper::AccountRole ).value< QObject* >() );
+            Q_ASSERT( acct ); // Should not be showing a config wrench if there is no account!
+
+            emit openConfig( acct );
+
+            return true;
+        }
+    } else if ( event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonDblClick )
+    {
+        QMouseEvent* me = static_cast< QMouseEvent* >( event );
+        if ( m_configPressed.isValid() )
+            emit update( m_configPressed );
+
+        m_configPressed = QModelIndex();
+        Account* acct = qobject_cast< Account* >( index.data( AccountFactoryWrapper::AccountRole ).value< QObject* >() );
+
+        if ( m_cachedCheckRects.contains( index ) && m_cachedCheckRects index .contains( me->pos() ) )
+        {
+            // Check box for this row
+            // eat the double click events inside the check rect
+            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;
+            emit checkOrUncheck( index, acct, newState );
+        }
+        if ( m_cachedButtonRects.contains( index ) && m_cachedButtonRects index .contains( me->pos() ) )
+        {
+            emit removeAccount( acct );
+
+            return true;
+        }
+    }
+    return false;
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountFactoryWrapperDelegate.h Added

@@ -0,0 +1,61 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, 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 ACCOUNTFACTORYWRAPPERDELEGATE_H
+#define ACCOUNTFACTORYWRAPPERDELEGATE_H
+
+#include <QStyledItemDelegate>
+
+#define ACCOUNT_ROW_HEIGHT 20
+
+namespace Tomahawk {
+namespace Accounts {
+class Account;
+}
+}
+
+class AccountFactoryWrapperDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+public:
+    explicit AccountFactoryWrapperDelegate( QObject* parent = 0 );
+
+    virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+    virtual QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    virtual bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index);
+
+signals:
+    void update( const QModelIndex& );
+
+    void openConfig( Tomahawk::Accounts::Account* );
+    void removeAccount( Tomahawk::Accounts::Account* );
+
+    void checkOrUncheck( const QModelIndex& row, Tomahawk::Accounts::Account* account, Qt::CheckState newState );
+
+private:
+    QPixmap m_removePixmap, m_offlineIcon, m_onlineIcon;
+    QIcon m_configIcon;
+    QModelIndex m_configPressed;
+
+    mutable QHash< QPersistentModelIndex, QRect > m_cachedCheckRects;
+    mutable QHash< QPersistentModelIndex, QRect > m_cachedButtonRects;
+    mutable QHash< QPersistentModelIndex, QRect > m_cachedConfigRects;
+};
+
+#endif // ACCOUNTFACTORYWRAPPERDELEGATE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountManager.cpp Added

@@ -0,0 +1,479 @@
+/* === 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
+ *   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 "AccountManager.h"
+#include "config.h"
+#include "SourceList.h"
+#include "TomahawkSettings.h"
+#include "ResolverAccount.h"
+
+#include <QtCore/QLibrary>
+#include <QtCore/QDir>
+#include <QtCore/QPluginLoader>
+#include <QtCore/QCoreApplication>
+#include <QTimer>
+#include <sip/SipHandler.h>
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+
+AccountManager* AccountManager::s_instance = 0;
+
+
+AccountManager*
+AccountManager::instance()
+{
+    return s_instance;
+}
+
+
+AccountManager::AccountManager( QObject *parent )
+    : QObject( parent )
+{
+    s_instance = this;
+
+    QTimer::singleShot( 0, this, SLOT( init() ) );
+}
+
+
+AccountManager::~AccountManager()
+{
+    delete SipHandler::instance();
+
+    disconnectAll();
+    qDeleteAll( m_accounts );
+    qDeleteAll( m_accountFactories );
+}
+
+
+void
+AccountManager::init()
+{
+    if ( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().isNull() )
+    {
+        //We need the info system worker to be alive so that we can move info plugins into its thread
+        QTimer::singleShot( 0, this, SLOT( init() ) );
+        return;
+    }
+
+    connect( TomahawkSettings::instance(), SIGNAL( changed() ), SLOT( onSettingsChanged() ) );
+
+    loadPluginFactories( findPluginFactories() );
+
+    // We include the resolver factory manually, not in a plugin
+    ResolverAccountFactory* f = new ResolverAccountFactory();
+    m_accountFactories f->factoryId()  = f;
+    registerAccountFactoryForFilesystem( f );
+
+    emit ready();
+}
+
+
+QStringList
+AccountManager::findPluginFactories()
+{
+    QStringList paths;
+    QList< QDir > pluginDirs;
+
+    QDir appDir( qApp->applicationDirPath() );
+#ifdef Q_WS_MAC
+    if ( appDir.dirName() == "MacOS" )
+    {
+        // Development convenience-hack
+        appDir.cdUp();
+        appDir.cdUp();
+        appDir.cdUp();
+    }
+#endif
+
+    QDir libDir( CMAKE_INSTALL_PREFIX "/lib" );
+
+    QDir lib64Dir( appDir );
+    lib64Dir.cdUp();
+    lib64Dir.cd( "lib64" );
+
+    pluginDirs << appDir << libDir << lib64Dir << QDir( qApp->applicationDirPath() );
+    foreach ( const QDir& pluginDir, pluginDirs )
+    {
+        tDebug() << Q_FUNC_INFO << "Checking directory for plugins:" << pluginDir;
+        foreach ( QString fileName, pluginDir.entryList( QStringList() << "*tomahawk_account_*.so" << "*tomahawk_account_*.dylib" << "*tomahawk_account_*.dll", QDir::Files ) )
+        {
+            if ( fileName.startsWith( "libtomahawk_account" ) )
+            {
+                const QString path = pluginDir.absoluteFilePath( fileName );
+                if ( !paths.contains( path ) )
+                    paths << path;
+            }
+        }
+    }
+
+    return paths;
+}
+
+
+void
+AccountManager::loadPluginFactories( const QStringList& paths )
+{
+    foreach ( QString fileName, paths )
+    {
+        if ( !QLibrary::isLibrary( fileName ) )
+            continue;
+
+        tDebug() << Q_FUNC_INFO << "Trying to load plugin:" << fileName;
+        loadPluginFactory( fileName );
+    }
+}
+
+
+bool
+AccountManager::hasPluginWithFactory( const QString& factory ) const
+{
+    foreach( Account* account, m_accounts ) {
+        if( factoryFromId( account->accountId() ) == factory )
+            return true;
+    }
+    return false;
+
+}
+
+
+QString
+AccountManager::factoryFromId( const QString& accountId ) const
+{
+    return accountId.split( "_" ).first();
+}
+
+AccountFactory*
+AccountManager::factoryForAccount( Account* account ) const
+{
+    const QString factoryId = factoryFromId( account->accountId() );
+    return m_accountFactories.value( factoryId, 0 );
+}
+
+
+void
+AccountManager::loadPluginFactory( const QString& path )
+{
+    QPluginLoader loader( path );
+    QObject* plugin = loader.instance();
+    if ( !plugin )
+    {
+        tDebug() << Q_FUNC_INFO << "Error loading plugin:" << loader.errorString();
+    }
+
+    AccountFactory* accountfactory = qobject_cast<AccountFactory*>( plugin );
+    if ( accountfactory )
+    {
+        tDebug() << Q_FUNC_INFO << "Loaded plugin factory:" << loader.fileName() << accountfactory->factoryId() << accountfactory->prettyName();
+        m_accountFactories accountfactory->factoryId()  = accountfactory;
+    } else
+    {
+        tDebug() << Q_FUNC_INFO << "Loaded invalid plugin.." << loader.fileName();
+    }
+}
+
+
+
+void
+AccountManager::enableAccount( Account* account )
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    if ( account->enabled() )
+        return;
+
+    account->authenticate();
+
+    if ( account->preventEnabling() )
+        return;
+
+    account->setEnabled( true );
+    m_enabledAccounts << account;
+
+    account->sync();
+}
+
+
+void
+AccountManager::disableAccount( Account* account )
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    if ( !account->enabled() )
+        return;
+
+    account->deauthenticate();
+    account->setEnabled( false );
+    m_enabledAccounts.removeAll( account );
+
+    account->sync();
+}
+
+
+void
+AccountManager::connectAll()
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    foreach( Account* acc, m_accounts )
+    {
+        if ( acc->enabled() )
+        {
+            acc->authenticate();
+            m_enabledAccounts << acc;
+        }
+
+    }
+    m_connected = true;
+}
+
+
+void
+AccountManager::disconnectAll()
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    foreach( Account* acc, m_enabledAccounts )
+        acc->deauthenticate();
+
+    m_enabledAccounts.clear();
+    SourceList::instance()->removeAllRemote();
+    m_connected = false;
+}
+
+
+void
+AccountManager::toggleAccountsConnected()
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    if ( m_connected )
+        disconnectAll();
+    else
+        connectAll();
+}
+
+
+void
+AccountManager::loadFromConfig()
+{
+    QStringList accountIds = TomahawkSettings::instance()->accounts();
+    qDebug() << "LOADING ALL ACCOUNTS" << accountIds;
+    foreach( const QString& accountId, accountIds )
+    {
+        QString pluginFactory = factoryFromId( accountId );
+        if( m_accountFactories.contains( pluginFactory ) )
+        {
+            Account* account = loadPlugin( accountId );
+            addAccount( account );
+        }
+    }
+}
+
+void
+AccountManager::initSIP()
+{
+    tDebug() << Q_FUNC_INFO;
+    foreach( Account* account, accounts() )
+    {
+        hookupAndEnable( account, true );
+    }
+}
+
+
+Account*
+AccountManager::loadPlugin( const QString& accountId )
+{
+    QString factoryName = factoryFromId( accountId );
+
+    Q_ASSERT( m_accountFactories.contains( factoryName ) );
+
+    Account* account = m_accountFactories factoryName ->createAccount( accountId );
+    hookupAccount( account );
+
+    return account;
+}
+
+
+void
+AccountManager::addAccount( Account* account )
+{
+    tDebug() << Q_FUNC_INFO << "adding account plugin";
+    m_accounts.append( account );
+
+    if ( account->types() & Accounts::SipType )
+        m_accountsByAccountType Accounts::SipType .append( account );
+    if ( account->types() & Accounts::InfoType )
+        m_accountsByAccountType Accounts::InfoType .append( account );
+    if ( account->types() & Accounts::ResolverType )
+        m_accountsByAccountType Accounts::ResolverType .append( account );
+    if ( account->types() & Accounts::StatusPushType )
+        m_accountsByAccountType Accounts::StatusPushType .append( account );
+
+    emit added( account );
+}
+
+
+void
+AccountManager::removeAccount( Account* account )
+{
+    account->deauthenticate();
+
+    // emit before moving from list so accountmodel can get indexOf
+    emit removed( account );
+
+    m_accounts.removeAll( account );
+    m_enabledAccounts.removeAll( account );
+    m_connectedAccounts.removeAll( account );
+    foreach ( AccountType type, m_accountsByAccountType.keys() )
+    {
+        QList< Account* > accounts = m_accountsByAccountType.value( type );
+        accounts.removeAll( account );
+        m_accountsByAccountType type  = accounts;
+    }
+
+    TomahawkSettings::instance()->removeAccount( account->accountId() );
+
+    account->removeFromConfig();
+    account->deleteLater();
+}
+
+
+QList< Account* >
+AccountManager::accountsFromFactory( AccountFactory* factory ) const
+{
+    QList< Account* > accts;
+    foreach ( Account* acct, m_accounts )
+    {
+        if ( factoryForAccount( acct ) == factory )
+            accts << acct;
+    }
+    return accts;
+}
+
+
+Account*
+AccountManager::accountFromPath( const QString& accountPath )
+{
+    foreach ( AccountFactory* factory, m_factoriesForFilesytem )
+    {
+        if ( factory->acceptsPath( accountPath ) )
+        {
+            return factory->createFromPath( accountPath );
+        }
+    }
+
+    Q_ASSERT_X( false, "Shouldn't have had no account factory accepting a path.. at least ResolverAccount!!", "");
+    return 0;
+}
+
+
+void
+AccountManager::registerAccountFactoryForFilesystem( AccountFactory* factory )
+{
+    m_factoriesForFilesytem.prepend( factory );
+}
+
+
+void
+AccountManager::addAccountFactory( AccountFactory* factory )
+{
+    m_accountFactories factory->factoryId()  = factory;
+}
+
+
+void
+AccountManager::hookupAccount( Account* account ) const
+{
+    connect( account, SIGNAL( error( int, QString ) ), SLOT( onError( int, QString ) ) );
+    connect( account, SIGNAL( connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ), SLOT( onStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ) );
+}
+
+
+void
+AccountManager::hookupAndEnable( Account* account, bool startup )
+{
+    Q_UNUSED( startup );
+
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    SipPlugin* p = account->sipPlugin();
+    if ( p )
+        SipHandler::instance()->hookUpPlugin( p );
+
+    if ( account->enabled() )
+    {
+        account->authenticate();
+        m_enabledAccounts << account;
+    }
+}
+
+
+void
+AccountManager::onError( int code, const QString& msg )
+{
+    Account* account = qobject_cast< Account* >( sender() );
+    Q_ASSERT( account );
+
+
+    qWarning() << "Failed to connect to SIP:" << account->accountFriendlyName() << code << msg;
+
+    if ( code == Account::AuthError )
+    {
+        emit authError( account );
+    }
+    else
+    {
+        QTimer::singleShot( 10000, account, SLOT( authenticate() ) );
+    }
+}
+
+void
+AccountManager::onSettingsChanged()
+{
+    foreach( Account* account, m_accounts )
+    {
+        if ( account->types() & Accounts::SipType && account->sipPlugin() )
+            account->sipPlugin()->checkSettings();
+    }
+}
+
+
+void
+AccountManager::onStateChanged( Account::ConnectionState state )
+{
+    Account* account = qobject_cast< Account* >( sender() );
+    Q_ASSERT( account );
+
+    if ( account->connectionState() == Account::Disconnected )
+    {
+        m_connectedAccounts.removeAll( account );
+        emit disconnected( account );
+    }
+    else if ( account->connectionState() == Account::Connected )
+    {
+        m_connectedAccounts << account;
+        emit connected( account );
+    }
+
+    emit stateChanged( account, state );
+}
+
+
+};
+
+};

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountManager.h Added

@@ -0,0 +1,131 @@
+/* === 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
+ *   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 ACCOUNTMANAGER_H
+#define ACCOUNTMANAGER_H
+
+#include <QtCore/QObject>
+
+#include "Typedefs.h"
+#include "DllMacro.h"
+#include "infosystem/InfoSystem.h"
+#include "sip/SipPlugin.h"
+#include "Account.h"
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+
+class DLLEXPORT AccountManager : public QObject
+{
+    Q_OBJECT
+
+public:
+    static AccountManager* instance();
+
+    explicit AccountManager( QObject *parent );
+    virtual ~AccountManager();
+
+    void loadFromConfig();
+    void initSIP();
+
+    void enableAccount( Account* account );
+    void disableAccount( Account* account );
+
+    QList< AccountFactory* > factories() const { return m_accountFactories.values(); }
+    bool hasPluginWithFactory( const QString& factory ) const;
+    AccountFactory* factoryForAccount( Account* account ) const;
+
+    void addAccount( Account* account );
+    void hookupAndEnable( Account* account, bool startup = false ); /// Hook up signals and start the plugin
+    void removeAccount( Account* account );
+
+    QList< Account* > accounts() const { return m_accounts; };
+    QList< Account* > accounts( Tomahawk::Accounts::AccountType type ) const { return m_accountsByAccountType type ; }
+
+    QList< Account* > accountsFromFactory( Tomahawk::Accounts::AccountFactory* factory ) const;
+
+    /**
+     * Returns a new Account for a certain path on disk. This will go through all on-disk resolver account providers
+     * to find the most specific account that matches this.
+     *
+     * The fallback is ResolverAccount, which handles our generic external script resolvers.
+     */
+    Account* accountFromPath( const QString& path );
+
+    /**
+     * Registers an account factory as being able to "handle" resolvers on disk. When accountFromPath is called
+     * AccountManager will go through all registered account factories in order until it finds one that can handle the path.
+     * This is searched in LIFO order.
+     */
+    void registerAccountFactoryForFilesystem( AccountFactory* factory );
+
+    void addAccountFactory( AccountFactory* factory );
+
+public slots:
+    void connectAll();
+    void disconnectAll();
+    void toggleAccountsConnected();
+
+signals:
+    void ready();
+
+    void added( Tomahawk::Accounts::Account* );
+    void removed( Tomahawk::Accounts::Account* );
+
+    void connected( Tomahawk::Accounts::Account* );
+    void disconnected( Tomahawk::Accounts::Account* );
+    void authError( Tomahawk::Accounts::Account* );
+
+    void stateChanged( Account* p, Accounts::Account::ConnectionState state );
+
+private slots:
+    void init();
+    void onStateChanged( Tomahawk::Accounts::Account::ConnectionState state );
+    void onError( int code, const QString& msg );
+
+    void onSettingsChanged();
+private:
+    QStringList findPluginFactories();
+    void loadPluginFactories( const QStringList &paths );
+    void loadPluginFactory( const QString &path );
+    QString factoryFromId( const QString& accountId ) const;
+
+    Account* loadPlugin( const QString &accountId );
+    void hookupAccount( Account* ) const;
+
+    QList< Account* > m_accounts;
+    QList< Account* > m_enabledAccounts;
+    QList< Account* > m_connectedAccounts;
+    bool m_connected;
+
+    QHash< AccountType, QList< Account* > > m_accountsByAccountType;
+    QHash< QString, AccountFactory* > m_accountFactories;
+    QList< AccountFactory* > m_factoriesForFilesytem;
+
+    static AccountManager* s_instance;
+};
+
+};
+
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountModel.cpp Added

@@ -0,0 +1,808 @@
+/* === 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 "AccountModel.h"
+
+#include "Account.h"
+#include "AccountModelNode.h"
+#include "AccountManager.h"
+#include "AtticaManager.h"
+#include "ResolverAccount.h"
+#include "TomahawkSettings.h"
+
+#ifndef ENABLE_HEADLESS
+#include <QMessageBox>
+#endif
+
+#include <attica/content.h>
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+#define ACCOUNTMODEL_DEBUG 0
+
+AccountModel::AccountModel( QObject* parent )
+    : QAbstractListModel( parent )
+{
+    connect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( loadData() ) );
+    connect( AtticaManager::instance(), SIGNAL( startedInstalling( QString ) ), this, SLOT( onStartedInstalling( QString ) ) );
+    connect( AtticaManager::instance(), SIGNAL( resolverInstalled( QString ) ), this, SLOT( onFinishedInstalling( QString ) ) );
+    connect( AtticaManager::instance(), SIGNAL( resolverInstallationFailed( QString ) ), this, SLOT( resolverInstallFailed( QString ) ) );
+
+    connect( AccountManager::instance(), SIGNAL( added( Tomahawk::Accounts::Account* ) ), this, SLOT( accountAdded( Tomahawk::Accounts::Account* ) ) );
+    connect( AccountManager::instance(), SIGNAL( removed( Tomahawk::Accounts::Account* ) ), this, SLOT( accountRemoved( Tomahawk::Accounts::Account* ) ) );
+    connect( AccountManager::instance(), SIGNAL( stateChanged( Account* ,Accounts::Account::ConnectionState ) ), this, SLOT( accountStateChanged( Account*, Accounts::Account::ConnectionState ) ) );
+
+    loadData();
+}
+
+void
+AccountModel::loadData()
+{
+    beginResetModel();
+
+    qDeleteAll( m_accounts );
+    m_accounts.clear();
+
+    // Add all factories
+    QList< AccountFactory* > factories = AccountManager::instance()->factories();
+    QList< Account* > allAccounts = AccountManager::instance()->accounts();
+#if ACCOUNTMODEL_DEBUG
+    qDebug() << "All accounts:";
+    foreach ( Account* acct, allAccounts )
+        qDebug() << acct->accountFriendlyName() << "\t" << acct->accountId();
+#endif
+    foreach ( AccountFactory* fac, factories )
+    {
+        if ( !fac->allowUserCreation() )
+            continue;
+
+        qDebug() << "Creating factory node:" << fac->prettyName();
+        m_accounts << new AccountModelNode( fac );
+
+        // remove the accounts we are dealing with
+        foreach ( Account* acct, allAccounts )
+        {
+            if ( AccountManager::instance()->factoryForAccount( acct ) == fac )
+                allAccounts.removeAll( acct );
+        }
+    }
+
+    // add all attica resolvers (installed or uninstalled)
+    Attica::Content::List fromAttica = AtticaManager::instance()->resolvers();
+    foreach ( const Attica::Content& content, fromAttica )
+    {
+        qDebug() << "Loading ATTICA ACCOUNT with content:" << content.id() << content.name();
+        if ( AtticaManager::instance()->hasCustomAccountForAttica( content.id() ) )
+        {
+            Account* acct = AtticaManager::instance()->customAccountForAttica( content.id() );
+            Q_ASSERT( acct );
+            if ( acct )
+            {
+                m_accounts << new AccountModelNode( acct );
+                const int removed = allAccounts.removeAll( acct );
+#if ACCOUNTMODEL_DEBUG
+                qDebug() << "Removed custom account from misc accounts list, found:" << removed;
+                qDebug() << "All accounts after remove:";
+                foreach ( Account* acct, allAccounts )
+                    qDebug() << acct->accountFriendlyName() << "\t" << acct->accountId();    // All other accounts we haven't dealt with yet
+#else
+                Q_UNUSED( removed );
+#endif
+            }
+        } else
+        {
+            m_accounts << new AccountModelNode( content );
+
+            foreach ( Account* acct, AccountManager::instance()->accounts( Accounts::ResolverType ) )
+            {
+#if ACCOUNTMODEL_DEBUG
+                qDebug() << "Found ResolverAccount" << acct->accountFriendlyName();
+#endif
+                if ( AtticaResolverAccount* resolver = qobject_cast< AtticaResolverAccount* >( acct ) )
+                {
+#if ACCOUNTMODEL_DEBUG
+                    qDebug() << "Which is an attica resolver with id:" << resolver->atticaId();
+#endif
+                    if ( resolver->atticaId() == content.id() )
+                    {
+                        allAccounts.removeAll( acct );
+                    }
+                }
+            }
+        }
+    }
+
+#if ACCOUNTMODEL_DEBUG
+    qDebug() << "All accounts left:";
+    foreach ( Account* acct, allAccounts )
+        qDebug() << acct->accountFriendlyName() << "\t" << acct->accountId();    // All other accounts we haven't dealt with yet
+#endif
+   foreach ( Account* acct, allAccounts )
+   {
+       qDebug() << "Resolver is left over:" << acct->accountFriendlyName() << acct->accountId();
+//        Q_ASSERT( !qobject_cast< AtticaResolverAccount* >( acct ) ); // This should be caught above in the attica list
+
+       if ( qobject_cast< ResolverAccount* >( acct ) && !qobject_cast< AtticaResolverAccount* >( acct ) )
+           m_accounts << new AccountModelNode( qobject_cast< ResolverAccount* >( acct ) );
+       else
+           m_accounts << new AccountModelNode( acct );
+   }
+
+   endResetModel();
+}
+
+
+QVariant
+AccountModel::data( const QModelIndex& index, int role ) const
+{
+    if ( !index.isValid() )
+        return QVariant();
+
+    if ( !hasIndex( index.row(), index.column(), index.parent() ) )
+        return QVariant();
+
+    const AccountModelNode* node = m_accounts.at( index.row() );
+    // This is a top-level item. 3 cases
+
+    switch ( node->type )
+    {
+        case AccountModelNode::FactoryType:
+        {
+            AccountFactory* fac = node->factory;
+            Q_ASSERT( fac );
+
+            switch ( role )
+            {
+                case Qt::DisplayRole:
+                    return fac->prettyName();
+                case Qt::DecorationRole:
+                    return fac->icon();
+                case StateRole:
+                    return ShippedWithTomahawk;
+                case Qt::ToolTipRole:
+                case DescriptionRole:
+                    return fac->description();
+                case CanRateRole:
+                    return false;
+                case RowTypeRole:
+                    return TopLevelFactory;
+                case AccountData:
+                    return QVariant::fromValue< QObject* >( node->factory );
+                case ChildrenOfFactoryRole:
+                    return QVariant::fromValue< QList< Tomahawk::Accounts::Account* > >( node->accounts );
+                case HasConfig:
+                    return !node->accounts.isEmpty();
+                case AccountTypeRole:
+                    return QVariant::fromValue< AccountTypes >( node->factory->types() );
+                case Qt::CheckStateRole:
+                {
+                    if ( node->accounts.isEmpty() )
+                        return Qt::Unchecked;
+
+                    // If all are checked or unchecked, return that
+                    bool someOn = false, someOff = false;
+                    foreach ( const Account* acct, node->accounts )
+                    {
+                        if ( acct->enabled() )
+                            someOn = true;
+                        else
+                            someOff = true;
+                    }
+                    if ( someOn && !someOff )
+                        return Qt::Checked;
+                    else if ( someOff & !someOn )
+                        return Qt::Unchecked;
+                    else
+                        return Qt::PartiallyChecked;
+                }
+                default:
+                    return QVariant();
+            }
+        }
+        case AccountModelNode::AtticaType:
+        {
+            Attica::Content c = node->atticaContent;
+            Q_ASSERT( !c.id().isNull() );
+
+            switch( role )
+            {
+                case Qt::DisplayRole:
+                    return c.name();
+                case Qt::DecorationRole:
+                    return QVariant::fromValue< QPixmap >( AtticaManager::instance()->iconForResolver( c ) );
+                case StateRole:
+                    return (int)AtticaManager::instance()->resolverState( c );
+                case Qt::ToolTipRole:
+                case DescriptionRole:
+                    return c.description();
+                case AuthorRole:
+                    return c.author();
+                case RowTypeRole:
+                    return TopLevelAccount;
+                case RatingRole:
+                    return c.rating() / 20; // rating is out of 100
+                case DownloadCounterRole:
+                    return c.downloads();
+                case CanRateRole:
+                    return true;
+                case AccountTypeRole:
+                    return QVariant::fromValue< AccountTypes >( AccountTypes( ResolverType ) );
+                case VersionRole:
+                    return c.version();
+                case UserHasRatedRole:
+                    return AtticaManager::instance()->userHasRated( c );
+                default:
+                    ;
+            }
+
+            AtticaResolverAccount* atticaAcct = node->atticaAccount;
+            if ( atticaAcct )
+            {
+                // If the resolver is installed or on disk, we expose some additional data
+                switch ( role )
+                {
+                    case HasConfig:
+                        return atticaAcct->configurationWidget() != 0;
+                    case Qt::CheckStateRole:
+                        return atticaAcct->enabled() ? Qt::Checked : Qt::Unchecked;
+                    case AccountData:
+                        return QVariant::fromValue< QObject* >( atticaAcct );
+                    case ConnectionStateRole:
+                        return atticaAcct->connectionState();
+                    default:
+                        ;
+                }
+            }
+            return QVariant();
+        }
+        case AccountModelNode::ManualResolverType:
+        case AccountModelNode::UniqueFactoryType:
+        {
+            if ( role == RowTypeRole )
+            {
+                if ( node->type == AccountModelNode::ManualResolverType )
+                    return TopLevelAccount;
+                else
+                    return UniqueFactory;
+            }
+            else if ( role == CanDeleteRole )
+            {
+                return node->type == AccountModelNode::ManualResolverType;
+            }
+
+            Account* acct = 0;
+            if ( node->type == AccountModelNode::ManualResolverType )
+                acct = node->resolverAccount;
+            else if ( node->type == AccountModelNode::UniqueFactoryType )
+                acct = node->accounts.isEmpty() ? 0 : node->accounts.first();
+
+            // If there's no account*, then it means it's a unique factory that hasn't been created
+            if ( !acct )
+            {
+                Q_ASSERT( node->type == AccountModelNode::UniqueFactoryType );
+                Q_ASSERT( node->factory );
+
+                switch( role )
+                {
+                case Qt::DisplayRole:
+                    return node->factory->prettyName();
+                case Qt::DecorationRole:
+                    return node->factory->icon();
+                case Qt::ToolTipRole:
+                case DescriptionRole:
+                    return node->factory->description();
+                case StateRole:
+                    return Uninstalled;
+                case CanRateRole:
+                    return false;
+                case AccountTypeRole:
+                    return QVariant::fromValue< AccountTypes >( node->factory->types() );
+                default:
+                    return QVariant();
+                }
+            }
+            else
+            {
+                switch ( role )
+                {
+                case Qt::DisplayRole:
+                    return acct->accountFriendlyName();
+                case Qt::DecorationRole:
+                    return acct->icon();
+                case DescriptionRole:
+                    return node->factory ? node->factory->description() : QString();
+                case Qt::CheckStateRole:
+                    return acct->enabled() ? Qt::Checked : Qt::Unchecked;
+                case AccountData:
+                    return QVariant::fromValue< QObject* >( acct );
+                case ConnectionStateRole:
+                    return acct->connectionState();
+                case HasConfig:
+                    return acct->configurationWidget() != 0;
+                case StateRole:
+                    return Installed;
+                case ChildrenOfFactoryRole:
+                    return QVariant::fromValue< QList< Tomahawk::Accounts::Account* > >( node->accounts );
+                case AccountTypeRole:
+                    return QVariant::fromValue< AccountTypes >( acct->types() );
+                default:
+                    return QVariant();
+                }
+            }
+        }
+        case AccountModelNode::CustomAccountType:
+        {
+            Q_ASSERT( node->customAccount );
+            Q_ASSERT( node->factory );
+
+            Attica::Content content = node->atticaContent;
+            // This is ugly. CustomAccounts are pure Account*, but we know that
+            // some might also be linked to attica resolvers (not always). If that is the case
+            // they have a Attica::Content set on the node, so we use that to display some
+            // extra metadata and rating
+            Account* account = node->customAccount;
+            if ( node->type == AccountModelNode::CustomAccountType && qobject_cast< CustomAtticaAccount* >( account ) )
+                content = qobject_cast< CustomAtticaAccount* >( node->customAccount )->atticaContent();
+            const bool hasAttica = !content.id().isNull();
+
+            switch ( role )
+            {
+                case Qt::DisplayRole:
+                    return account->accountFriendlyName();
+                case Qt::DecorationRole:
+                    return account->icon();
+                case StateRole:
+                    return ShippedWithTomahawk;
+                case Qt::ToolTipRole:
+                case DescriptionRole:
+                    return hasAttica ? content.description() : node->factory->description();
+                case CanRateRole:
+                    return hasAttica;
+                case AuthorRole:
+                    return hasAttica ? content.author() : QString();
+                case RatingRole:
+                    return hasAttica ? content.rating() / 20 : 0; // rating is out of 100
+                case DownloadCounterRole:
+                    return hasAttica ? content.downloads() : QVariant();
+                case RowTypeRole:
+                    return CustomAccount;
+                case AccountData:
+                    return QVariant::fromValue< QObject* >( account );
+                case HasConfig:
+                    return account->configurationWidget() != 0;
+                case AccountTypeRole:
+                    return QVariant::fromValue< AccountTypes >( account->types() );
+                case Qt::CheckStateRole:
+                    return account->enabled() ? Qt::Checked : Qt::Unchecked;
+                case ConnectionStateRole:
+                    return account->connectionState();
+                case UserHasRatedRole:
+                    return hasAttica ? AtticaManager::instance()->userHasRated( content ) : false;
+                default:
+                    return QVariant();
+            }
+        }
+    }
+
+    return QVariant();
+}
+
+
+
+bool
+AccountModel::setData( const QModelIndex& index, const QVariant& value, int role )
+{
+    if ( !index.isValid() || !hasIndex( index.row(), index.column(), index.parent() ) )
+        return false;
+
+    AccountModelNode* node = m_accounts.at( index.row() );
+
+    if ( role == CheckboxClickedRole )
+    {
+        Account* acct = 0;
+
+        Qt::CheckState checkState = static_cast< Qt::CheckState >( value.toInt() );
+
+        switch ( node->type )
+        {
+            case AccountModelNode::UniqueFactoryType:
+            {
+                const Qt::CheckState state = static_cast< Qt::CheckState >( value.toInt() );
+                if ( node->accounts.isEmpty() )
+                {
+                    Q_ASSERT( state == Qt::Checked ); // How could we have a checked unique factory w/ no account??
+                    // No account for this unique factory, create it
+                    // Don't add it to node->accounts here, slot attached to accountmanager::accountcreated will do it for us
+                    acct = node->factory->createAccount();
+                    AccountManager::instance()->addAccount( acct );
+                    TomahawkSettings::instance()->addAccount( acct->accountId() );
+                }
+                else
+                {
+                    Q_ASSERT( node->accounts.size() == 1 );
+                    acct = node->accounts.first();
+                }
+                break;
+            }
+            case AccountModelNode::AtticaType:
+            {
+                // This may or may not be installed. if it's not installed yet, install it, then go ahead and enable it
+                Q_ASSERT( node->atticaContent.isValid() );
+
+                Attica::Content resolver = node->atticaContent;
+                AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( resolver );
+                qDebug() << "Attica resolver was checked! Current state is:" << state << "and so..";
+                if ( state == AtticaManager::Installed && !node->atticaAccount )
+                {
+                    // Something is wrong, reinstall
+                    qDebug() << "Found installed state but no resolver, uninstalling first";
+                    AtticaManager::instance()->uninstallResolver( resolver );
+                    state = AtticaManager::Uninstalled;
+                }
+
+                // Don't install if we're unchecking. This happens if e.g. the user deletes his config file
+                // and opens tomahawk
+                if ( state == AtticaManager::Installed || checkState == Qt::Unchecked )
+                {
+                    qDebug() << "Already installed with resolver, or unchecking, just enabling/disabling";
+                    acct = node->atticaAccount;
+                    break;
+                }
+                else
+                {
+                    if ( m_waitingForAtticaInstall.contains( resolver.id() ) )
+                    {
+                        // in progress, ignore
+                        return true;
+                    }
+
+                    qDebug() << "Kicked off fetch+install, now waiting";
+                    m_waitingForAtticaInstall.insert( resolver.id() );
+
+                    if ( node->atticaAccount )
+                        AtticaManager::instance()->installResolverWithHandler( resolver, node->atticaAccount );
+                    else
+                        AtticaManager::instance()->installResolver( resolver, true );
+
+                    return true;
+                }
+
+            }
+            case AccountModelNode::ManualResolverType:
+                acct = node->resolverAccount;
+                break;
+            case AccountModelNode::CustomAccountType:
+                acct = node->customAccount;
+                break;
+            default:
+                ;
+        };
+
+        if ( node->type == AccountModelNode::FactoryType )
+        {
+            tLog() << "Factory account with members:" << node->accounts << node->accounts.size();
+            // Turn on or off all accounts for this factory
+            foreach ( Account* acct, node->accounts )
+            {
+                tLog() << "Account we are toggling for factory:" << acct;
+                if ( !acct )
+                    continue;
+
+                checkState == Qt::Checked ? AccountManager::instance()->enableAccount( acct )
+                                     : AccountManager::instance()->disableAccount( acct );
+            }
+
+            emit dataChanged( index, index );
+            return true;
+        }
+
+        Q_ASSERT( acct );
+        Qt::CheckState state = static_cast< Qt::CheckState >( value.toInt() );
+
+        if ( state == Qt::Checked && !acct->enabled() )
+            AccountManager::instance()->enableAccount( acct );
+        else if( state == Qt::Unchecked )
+            AccountManager::instance()->disableAccount( acct );
+
+#if defined(Q_OS_LINUX) && !defined(ENABLE_HEADLESS)
+        if ( acct->preventEnabling() )
+        {
+            // Can't install from attica yet on linux, so show a warning if the user tries to turn it on.
+            // TODO make a prettier display
+            QMessageBox box;
+            box.setWindowTitle( tr( "Manual Install Required" ) );
+            box.setTextFormat( Qt::RichText );
+            box.setIcon( QMessageBox::Information );
+            box.setText( tr( "Unfortunately, automatic installation of this resolver is not available or disabled for your platform.<br /><br />"
+            "Please use \"Install from file\" above, by fetching it from your distribution or compiling it yourself. Further instructions can be found here:<br /><br />http://www.tomahawk-player.org/resolvers/%1" ).arg( acct->accountServiceName() ) );
+            box.setStandardButtons( QMessageBox::Ok );
+            box.exec();
+        }
+#endif
+        emit dataChanged( index, index );
+
+        return true;
+    }
+
+    // The install/create/remove/etc button was clicked. Handle it properly depending on this item
+    if ( role == CustomButtonRole )
+    {
+        if ( node->type == AccountModelNode::FactoryType )
+        {
+            // Make a new account of this factory type
+            emit createAccount( node->factory );
+            return true;
+        }
+        else if ( node->type == AccountModelNode::ManualResolverType )
+        {
+            Q_ASSERT( node->resolverAccount );
+            AccountManager::instance()->removeAccount( node->resolverAccount );
+
+            return true;
+        }
+        Q_ASSERT( false ); // Should not be here, only the above two types should have this button
+        return false;
+    }
+
+
+    if ( role == RatingRole )
+    {
+        // We only support rating Attica resolvers for the moment.
+        Attica::Content content;
+        if ( node->type == AccountModelNode::AtticaType )
+        {
+            content = node->atticaContent;
+
+            AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( content );
+            // For now only allow rating if a resolver is installed!
+            if ( state != AtticaManager::Installed && state != AtticaManager::NeedsUpgrade )
+                return false;
+        } // Allow rating custom attica accounts regardless as user may have installed manually
+        else if ( node->type == AccountModelNode::CustomAccountType && qobject_cast< CustomAtticaAccount* >( node->customAccount ) )
+            content = qobject_cast< CustomAtticaAccount* >( node->customAccount )->atticaContent();
+
+        Q_ASSERT( !content.id().isNull() );
+
+        if ( AtticaManager::instance()->userHasRated( content ) )
+            return false;
+
+        content.setRating( value.toInt() * 20 );
+        AtticaManager::instance()->uploadRating( content );
+
+        if ( node->type == AccountModelNode::AtticaType )
+            node->atticaContent = content;
+
+        emit dataChanged( index, index );
+
+        return true;
+    }
+
+    return false;
+}
+
+
+void
+AccountModel::accountAdded( Account* account )
+{
+    // Find the factory this belongs up, and update
+    qDebug() << "IN ACCOUNT ADDED, new account:" << account->accountFriendlyName();
+    AccountFactory* factory = AccountManager::instance()->factoryForAccount( account );
+    ResolverAccount* resolver = qobject_cast< ResolverAccount* >( account );
+    AtticaResolverAccount* attica = qobject_cast< AtticaResolverAccount* >( account );
+    for ( int i = 0; i < m_accounts.size(); i++ )
+    {
+        AccountModelNode* n = m_accounts.at( i );
+        bool thisIsTheOne = false;
+        qDebug() << "Checking for added account's related factory or attica:" << n->factory << attica << resolver;
+        if ( attica )
+            qDebug() << n->atticaContent.id() << n->atticaContent.name() << attica->atticaId();
+        if ( n->factory == factory && !(resolver && !attica) ) // Specifically ignore manual resolvers, as the user added them directly
+        {
+            qDebug() << "Found added account with factory we already havel" << n->factory << factory;
+            n->accounts << account;
+            thisIsTheOne = true;
+        }
+        else if ( attica && n->atticaContent.id() == attica->atticaId() )
+        {
+
+            n->atticaAccount = attica;
+            n->atticaContent = AtticaManager::instance()->resolverForId( attica->atticaId() );
+            thisIsTheOne = true;
+
+            if ( m_waitingForAtticaInstall.contains( attica->atticaId() ) )
+                AccountManager::instance()->enableAccount( account );
+
+            m_waitingForAtticaInstall.remove( attica->atticaId() );
+        }
+
+        if ( thisIsTheOne )
+        {
+            const QModelIndex idx = index( i, 0, QModelIndex() );
+            dataChanged( idx, idx );
+
+            return;
+        }
+    }
+
+    // Ok, just a plain resolver. add it at the end
+    if ( ResolverAccount* resolver = qobject_cast< ResolverAccount* >( account ) )
+    {
+        qDebug() << "Plain old manual resolver added, appending at end";
+        Q_ASSERT( qobject_cast< AtticaResolverAccount* >( account ) == 0 ); // should NOT get attica accounts here, should be caught above
+        const int count = m_accounts.size();
+        beginInsertRows( QModelIndex(), count, count );
+        m_accounts << new AccountModelNode( resolver );
+        endInsertRows();
+
+        emit scrollTo( index( m_accounts.size() - 1, 0, QModelIndex() ) );
+    }
+}
+
+
+void
+AccountModel::accountStateChanged( Account* account , Account::ConnectionState )
+{
+    // Find the factory this belongs up, and update
+    for ( int i = 0; i < m_accounts.size(); i++ )
+    {
+        AccountModelNode* n = m_accounts.at( i );
+        if ( n->type != AccountModelNode::FactoryType )
+        {
+            // If this is not a non-unique factory, it has as top-level account, so find that and update it
+            // For each type that this node could be, check the corresponding data
+            if ( ( n->type == AccountModelNode::UniqueFactoryType && n->accounts.size() && n->accounts.first() == account ) ||
+                 ( n->type == AccountModelNode::AtticaType && n->atticaAccount && n->atticaAccount == account ) ||
+                 ( n->type == AccountModelNode::ManualResolverType && n->resolverAccount && n->resolverAccount == account ) ||
+                 ( n->type == AccountModelNode::CustomAccountType && n->customAccount && n->customAccount == account ) )
+            {
+                const QModelIndex idx = index( i, 0, QModelIndex() );
+                emit dataChanged( idx, idx );
+            }
+        }
+        else
+        {
+            for ( int k = 0; k < n->accounts.size(); k++ )
+            {
+                Account* childAccount = n->accounts.at( k );
+
+                if ( childAccount == account )
+                {
+                    const QModelIndex idx = index( i, 0, QModelIndex() );
+                    emit dataChanged( idx, idx );
+                }
+            }
+        }
+
+    }
+}
+
+
+void
+AccountModel::accountRemoved( Account* account )
+{
+    // Find the row this belongs to and update/remove
+    AccountFactory* factory = AccountManager::instance()->factoryForAccount( account );
+    qDebug() << "AccountModel got account removed:" << account->accountFriendlyName();
+    for ( int i = 0; i < m_accounts.size(); i++ )
+    {
+        AccountModelNode* n = m_accounts.at( i );
+
+        bool found = false;
+        // Account in a factory, remove child and update
+        if ( ( n->type == AccountModelNode::FactoryType && n->factory == factory ) ||
+             ( n->type == AccountModelNode::UniqueFactoryType && n->accounts.size() && n->accounts.first() == account ) )
+        {
+            n->accounts.removeAll( account );
+            found = true;
+        }
+
+        // Attica account, just clear the account but leave the attica shell
+        if ( n->type == AccountModelNode::AtticaType && n->atticaAccount && n->atticaAccount == account )
+        {
+            n->atticaAccount = 0;
+            found = true;
+        }
+
+        if ( found )
+        {
+            qDebug() << "Found account removed but we don't want to delete a row!" << i << n->type << n->factory;
+            const QModelIndex idx = index( i, 0, QModelIndex() );
+            emit dataChanged( idx, idx );
+
+            return;
+        }
+
+        // Manual resolver added, remove the row now
+        if ( n->type == AccountModelNode::ManualResolverType && n->resolverAccount && n->resolverAccount == account )
+        {
+            qDebug() << "Found account removed AND REMOVING IT FROM THE LIST!" << n->factory << n->type << n->accounts << i;
+
+            beginRemoveRows( QModelIndex(), i, i );
+            m_accounts.removeAt( i );
+            endRemoveRows();
+
+            return;
+        }
+    }
+}
+
+
+void
+AccountModel::resolverInstallFailed( const QString& resolverId )
+{
+    const QModelIndex idx = indexForAtticaId( resolverId );
+    if ( idx.isValid() )
+    {
+        qDebug() << "Got failed attica install in account mode, emitting signal!";
+        emit errorInstalling( idx );
+    }
+}
+
+
+QModelIndex
+AccountModel::indexForAtticaId( const QString& resolverId ) const
+{
+    for ( int i = 0; i < m_accounts.size(); i++ )
+    {
+        if ( m_accounts i ->type == AccountModelNode::AtticaType && m_accounts i ->atticaContent.id() == resolverId )
+        {
+            return index( i, 0, QModelIndex() );
+        }
+        else if ( m_accounts i ->type == AccountModelNode::CustomAccountType && qobject_cast< CustomAtticaAccount* >( m_accounts i ->customAccount ) )
+        {
+            const CustomAtticaAccount* atticaAcct = qobject_cast< CustomAtticaAccount* >( m_accounts i ->customAccount );
+            if ( atticaAcct->atticaContent().id() == resolverId )
+                return index( i, 0, QModelIndex() );
+        }
+    }
+
+    return QModelIndex();
+}
+
+
+void
+AccountModel::onStartedInstalling( const QString& resolverId )
+{
+    const QModelIndex idx = indexForAtticaId( resolverId );
+    if ( idx.isValid() )
+    {
+        qDebug() << "Got resolver that is beginning to install, emitting signal";
+        emit startInstalling( idx );
+    }
+}
+
+
+void
+AccountModel::onFinishedInstalling( const QString& resolverId )
+{
+    const QModelIndex idx = indexForAtticaId( resolverId );
+    if ( idx.isValid() )
+    {
+        qDebug() << "Got resolver that is beginning to install, emitting signal";
+        emit doneInstalling( idx );
+    }
+}
+
+
+int
+AccountModel::rowCount( const QModelIndex& ) const
+{
+    return m_accounts.size();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountModel.h Added

@@ -0,0 +1,123 @@
+/* === 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 TOMAHAWK_ACCOUNTS_ACCOUNTMODEL_H
+#define TOMAHAWK_ACCOUNTS_ACCOUNTMODEL_H
+
+#include "DllMacro.h"
+
+#include "Account.h"
+
+#include <QAbstractListModel>
+#include <QSet>
+
+
+namespace Tomahawk {
+
+namespace Accounts {
+
+class AccountModelNode;
+
+class DLLEXPORT AccountModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    enum Roles {
+        RowTypeRole = Qt::UserRole + 1, // RowType enum
+
+        // Used by top-level accounts
+        DescriptionRole = Qt::UserRole + 17,
+        StateRole = Qt::UserRole + 18, // ItemState,
+        RatingRole = Qt::UserRole + 19,
+        DownloadCounterRole = Qt::UserRole + 20,
+        VersionRole = Qt::UserRole + 21,
+        AuthorRole = Qt::UserRole + 22,
+        UserHasRatedRole = Qt::UserRole + 24,
+
+        // used by both
+        ConnectionStateRole = Qt::UserRole + 25,
+        HasConfig = Qt::UserRole + 26,
+        ErrorString = Qt::UserRole + 27,
+
+        // used by individual accounts
+        AccountData = Qt::UserRole + 28, // raw plugin
+        CanRateRole = Qt::UserRole + 32,
+        AccountTypeRole = Qt::UserRole + 33,
+        CanDeleteRole = Qt::UserRole + 34,
+
+        CheckboxClickedRole = Qt::UserRole + 29, // the checkbox for this row was toggled
+        CustomButtonRole = Qt::UserRole + 30, // the add account or remove account button
+
+        // Used by factories
+        ChildrenOfFactoryRole = Qt::UserRole + 31
+    };
+
+    enum RowType {
+        TopLevelFactory,
+        TopLevelAccount,
+        UniqueFactory,
+        CustomAccount
+    };
+
+    enum ItemState {
+        Uninstalled = 0, // Attica resolver states
+        Installing,
+        Installed,
+        NeedsUpgrade,
+        Upgrading,
+        Failed,
+        ShippedWithTomahawk, // Built-in account/factory state: Can't uninstall or uninstall, just create
+    };
+
+    explicit AccountModel( QObject* parent = 0 );
+
+    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
+    virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const;
+    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
+
+signals:
+    void createAccount( Tomahawk::Accounts::AccountFactory* factory );
+    void scrollTo( const QModelIndex& idx );
+
+    void startInstalling( const QPersistentModelIndex& idx );
+    void doneInstalling( const QPersistentModelIndex& idx );
+    void errorInstalling( const QPersistentModelIndex& idx );
+
+private slots:
+    void loadData();
+
+    void accountAdded( Tomahawk::Accounts::Account* );
+    void accountRemoved( Tomahawk::Accounts::Account* );
+    void accountStateChanged( Account*, Accounts::Account::ConnectionState );
+
+    void onStartedInstalling( const QString& resolverId );
+    void onFinishedInstalling( const QString& resolverId );
+    void resolverInstallFailed( const QString& resolverId );
+private:
+    QModelIndex indexForAtticaId( const QString& resolverId ) const;
+
+    QList< AccountModelNode* > m_accounts;
+    QSet< QString > m_waitingForAtticaInstall;
+};
+
+}
+
+}
+
+#endif // TOMAHAWK_ACCOUNTS_ACCOUNTMODEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountModelFilterProxy.cpp Added

@@ -0,0 +1,97 @@
+/* === 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 "AccountModelFilterProxy.h"
+
+#include "AccountModel.h"
+
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+AccountModelFilterProxy::AccountModelFilterProxy( QObject* parent )
+    : QSortFilterProxyModel(parent)
+    , m_filterType( NoType )
+{
+
+}
+
+
+void
+AccountModelFilterProxy::setSourceModel( QAbstractItemModel* sourceModel )
+{
+    connect( sourceModel, SIGNAL( scrollTo( QModelIndex ) ), this, SLOT( onScrollTo( QModelIndex ) ) );
+    connect( sourceModel, SIGNAL( startInstalling( QPersistentModelIndex ) ), this, SLOT( onStartInstalling( QPersistentModelIndex ) ) );
+    connect( sourceModel, SIGNAL( doneInstalling( QPersistentModelIndex ) ), this, SLOT( onDoneInstalling( QPersistentModelIndex ) ) );
+    connect( sourceModel, SIGNAL( errorInstalling( QPersistentModelIndex ) ), this, SLOT( onErrorInstalling( QPersistentModelIndex ) ) );
+    QSortFilterProxyModel::setSourceModel( sourceModel );
+}
+
+
+bool
+AccountModelFilterProxy::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
+{
+    if ( m_filterType == NoType )
+        return true;
+
+    const QModelIndex idx = sourceModel()->index( sourceRow, 0, sourceParent );
+    const AccountTypes types = static_cast< AccountTypes >( idx.data( AccountModel::AccountTypeRole ).value< AccountTypes >() );
+
+    return types.testFlag( m_filterType );
+
+}
+
+
+void
+AccountModelFilterProxy::setFilterType( AccountType type )
+{
+    if ( type == m_filterType )
+        return;
+
+    m_filterType = type;
+    invalidate();
+}
+
+
+void
+AccountModelFilterProxy::onScrollTo( const QModelIndex& idx )
+{
+    emit scrollTo( mapFromSource( idx ) );
+}
+
+
+void
+AccountModelFilterProxy::onDoneInstalling( const QPersistentModelIndex& idx )
+{
+    emit doneInstalling( mapFromSource( idx ) );
+}
+
+
+void
+AccountModelFilterProxy::onStartInstalling( const QPersistentModelIndex& idx )
+{
+    emit startInstalling( mapFromSource( idx ) );
+}
+
+
+void
+AccountModelFilterProxy::onErrorInstalling( const QPersistentModelIndex& idx )
+{
+    emit errorInstalling( mapFromSource( idx ) );
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountModelFilterProxy.h Added

@@ -0,0 +1,64 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, 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 ACCOUNTMODELFILTERPROXY_H
+#define ACCOUNTMODELFILTERPROXY_H
+
+#include "Account.h"
+#include "DllMacro.h"
+
+#include <QSortFilterProxyModel>
+
+namespace Tomahawk {
+namespace Accounts {
+
+class DLLEXPORT AccountModelFilterProxy : public QSortFilterProxyModel
+{
+    Q_OBJECT
+public:
+    AccountModelFilterProxy( QObject* parent = 0 );
+
+    void setFilterType( Tomahawk::Accounts::AccountType type );
+
+    virtual void setSourceModel( QAbstractItemModel* sourceModel );
+
+signals:
+    void scrollTo( const QModelIndex& idx );
+
+    void startInstalling( const QPersistentModelIndex& idx );
+    void doneInstalling( const QPersistentModelIndex& idx );
+    void errorInstalling( const QPersistentModelIndex& idx );
+
+protected:
+    virtual bool filterAcceptsRow ( int sourceRow, const QModelIndex& sourceParent ) const;
+
+private slots:
+    void onScrollTo( const QModelIndex& idx );
+
+    void onStartInstalling( const QPersistentModelIndex& idx );
+    void onDoneInstalling( const QPersistentModelIndex& idx );
+    void onErrorInstalling( const QPersistentModelIndex& idx );
+
+private:
+    Tomahawk::Accounts::AccountType m_filterType;
+};
+
+}
+
+}
+#endif // ACCOUNTMODELFILTERPROXY_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/AccountModelNode.h Added

@@ -0,0 +1,156 @@
+/* === 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 TOMAHAWK_ACCOUNTS_ACCOUNTMODELNODE_H
+#define TOMAHAWK_ACCOUNTS_ACCOUNTMODELNODE_H
+
+#include "Account.h"
+#include "AccountManager.h"
+#include "ResolverAccount.h"
+#include "AtticaManager.h"
+
+#include <attica/content.h>
+
+#define ACCOUNTMODELNODE_DEBUG 0
+
+namespace Tomahawk {
+
+namespace Accounts {
+
+/**
+ * Node for account tree.
+ *
+ * Basically a union with possible types:
+ * 1) AccountFactory* for all factories that have child accounts. Also a list of children
+ * 2) Attica::Content for AtticaResolverAccounts (with associated AtticaResolverAccount*) (all synchrotron resolvers)
+ * 3) ResolverAccount* for manually added resolvers (from file).
+ * 4) Account* for custom accounts. These may be hybrid infosystem/resolver/sip plugins or other special accounts
+ *
+ * These are the top-level items in tree.
+ *
+ * Top level nodes all look the same to the user. The only difference is that services that have login (and thus
+ *  can have multiple logins at once) allow a user to create multiple children with specific login information.
+ *  All other top level accounts (Account*, Attica::Content, ResolverAccount*) behave the same to the user, they can
+ *  simply toggle on/off.
+ *
+ */
+
+struct AccountModelNode {
+    enum NodeType {
+        FactoryType,
+        UniqueFactoryType,
+        AtticaType,
+        ManualResolverType,
+        CustomAccountType
+    };
+    AccountModelNode* parent;
+    NodeType type;
+
+    /// 1, 4
+    AccountFactory* factory;
+    QList< Account* > accounts; // list of children accounts (actually existing and configured accounts)
+
+    /// 2.
+    Attica::Content atticaContent;
+    AtticaResolverAccount* atticaAccount;
+
+    /// 3.
+    ResolverAccount* resolverAccount;
+
+    /// 4.
+    Account* customAccount;
+
+    // Construct in one of four ways. Then access the corresponding members
+    explicit AccountModelNode( AccountFactory* fac ) : type( FactoryType )
+    {
+        init();
+        factory = fac;
+
+        if ( fac->isUnique() )
+            type = UniqueFactoryType;
+
+        // Initialize factory nodes with their children
+        foreach ( Account* acct,  AccountManager::instance()->accounts() )
+        {
+            if ( AccountManager::instance()->factoryForAccount( acct ) == fac )
+            {
+#if ACCOUNTMODELNODE_DEBUG
+                qDebug() << "Found account for factory:" << acct->accountFriendlyName();
+#endif
+                accounts.append( acct );
+            }
+        }
+    }
+
+    explicit AccountModelNode( Attica::Content cnt ) : type( AtticaType )
+    {
+        init();
+        atticaContent = cnt;
+
+#if ACCOUNTMODELNODE_DEBUG
+        qDebug() << "Creating attica model node for resolver:" << cnt.id();
+#endif
+        foreach ( Account* acct, AccountManager::instance()->accounts( Accounts::ResolverType ) )
+        {
+#if ACCOUNTMODELNODE_DEBUG
+            qDebug() << "Checking account:" << acct->accountFriendlyName() << qobject_cast< AtticaResolverAccount* >( acct );
+#endif
+            if ( AtticaResolverAccount* resolver = qobject_cast< AtticaResolverAccount* >( acct ) )
+            {
+#if ACCOUNTMODELNODE_DEBUG
+                qDebug() << "With attica id:" << resolver->atticaId();
+#endif
+                if ( resolver->atticaId() == atticaContent.id() )
+                {
+#if ACCOUNTMODELNODE_DEBUG
+                    qDebug() << "found atticaaccount :" << resolver->accountFriendlyName();
+#endif
+                    atticaAccount = resolver;
+                    break;
+                }
+            }
+        }
+    }
+
+    explicit AccountModelNode( ResolverAccount* ra ) : type( ManualResolverType )
+    {
+        init();
+        resolverAccount = ra;
+        factory = AccountManager::instance()->factoryForAccount( ra );
+    }
+
+    explicit AccountModelNode( Account* account ) : type( CustomAccountType )
+    {
+        init();
+        customAccount = account;
+        factory = AccountManager::instance()->factoryForAccount( account );
+    }
+
+    void init()
+    {
+        factory = 0;
+        atticaAccount = 0;
+        resolverAccount = 0;
+        customAccount = 0;
+    }
+};
+
+}
+
+}
+#endif // TOMAHAWK_ACCOUNTS_ACCOUNTMODELNODE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/DelegateConfigWrapper.cpp Added

@@ -0,0 +1,155 @@
+/* === 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 "DelegateConfigWrapper.h"
+#include <QMessageBox>
+
+
+DelegateConfigWrapper::DelegateConfigWrapper( QWidget* conf, QWidget* aboutWidget, const QString& title, QWidget* parent, Qt::WindowFlags flags )
+    : QDialog( parent, flags )
+    , m_widget( conf )
+    , m_aboutW( aboutWidget )
+    , m_deleted( false )
+{
+    m_widget->setWindowFlags( Qt::Sheet );
+#ifdef Q_WS_MAC
+    m_widget->setVisible( true );
+#endif
+    setWindowTitle( title );
+    QVBoxLayout* v = new QVBoxLayout( this );
+    v->setContentsMargins( 0, 0, 0, 0 );
+    v->addWidget( m_widget );
+
+    QDialogButtonBox::StandardButtons buttons = QDialogButtonBox::Ok | QDialogButtonBox::Cancel;
+    if ( m_aboutW )
+    {
+        m_aboutW->hide();
+        buttons |= QDialogButtonBox::Help;
+    }
+
+    m_buttons = new QDialogButtonBox( buttons, Qt::Horizontal, this );
+    m_okButton = m_buttons->button( QDialogButtonBox::Ok );
+    connect( m_buttons, SIGNAL( clicked( QAbstractButton*)  ), this, SLOT( closed( QAbstractButton* ) ) );
+    connect( this, SIGNAL( rejected() ), this, SLOT( rejected() ) );
+
+    if ( m_aboutW )
+    {
+        connect( m_buttons->button( QDialogButtonBox::Help ), SIGNAL( clicked( bool ) ), this, SLOT( aboutClicked( bool ) ) );
+        m_buttons->button( QDialogButtonBox::Help )->setText( tr( "About" ) );
+    }
+
+    v->addWidget( m_buttons );
+
+    setLayout( v );
+
+#ifdef Q_WS_MAC
+    setSizeGripEnabled( false );
+    setMinimumSize( sizeHint() );
+    setMaximumSize( sizeHint() ); // to remove the resize grip on osx this is the only way
+
+    if( conf->metaObject()->indexOfSignal( "sizeHintChanged()" ) > -1 )
+        connect( conf, SIGNAL( sizeHintChanged() ), this, SLOT( updateSizeHint() ) );
+#else
+    m_widget->setVisible( true );
+#endif
+
+}
+
+
+void
+DelegateConfigWrapper::setShowDelete( bool del )
+{
+    if ( del )
+        m_deleteButton = m_buttons->addButton( tr( "Delete Account" ), QDialogButtonBox::DestructiveRole );
+}
+
+
+void
+DelegateConfigWrapper::toggleOkButton( bool dataError )
+{
+    // if dataError is True we want to set the button enabled to false
+    m_okButton->setEnabled( !dataError );
+}
+
+
+void
+DelegateConfigWrapper::closed( QAbstractButton* b )
+{
+    QDialogButtonBox* buttons = qobject_cast< QDialogButtonBox* >( sender() );
+
+    if ( buttons->standardButton( b ) == QDialogButtonBox::Help )
+        return;
+
+    // let the config widget live to see another day
+    layout()->removeWidget( m_widget );
+    m_widget->setParent( 0 );
+    m_widget->setVisible( false );
+
+    if ( buttons->standardButton( b ) == QDialogButtonBox::Ok )
+        done( QDialog::Accepted );
+    else if ( b == m_deleteButton )
+    {
+        m_deleted = true;
+        emit closedWithDelete();
+        reject();
+    }
+    else
+        done( QDialog::Rejected );
+}
+
+
+void
+DelegateConfigWrapper::rejected()
+{
+    layout()->removeWidget( m_widget );
+    m_widget->setParent( 0 );
+    m_widget->setVisible( false );
+}
+
+
+void
+DelegateConfigWrapper::updateSizeHint()
+{
+    setSizeGripEnabled( false );
+    setMinimumSize( sizeHint() );
+    setMaximumSize( sizeHint() );
+}
+
+
+void
+DelegateConfigWrapper::aboutClicked( bool )
+{
+    Q_ASSERT( m_aboutW );
+    m_aboutW->show();
+
+    QDialog d( this );
+    d.setWindowTitle( tr( "About this Account" ) );
+    QVBoxLayout* v = new QVBoxLayout( &d );
+    v->addWidget( m_aboutW );
+    QDialogButtonBox* bbox = new QDialogButtonBox( QDialogButtonBox::Ok, Qt::Horizontal, &d );
+    v->addWidget( bbox );
+
+    d.setLayout( v );
+    connect( bbox, SIGNAL( clicked( QAbstractButton* ) ), &d, SLOT( accept() ) );
+    d.exec();
+    v->removeWidget( m_aboutW );
+
+    m_aboutW->setParent( 0 );
+    m_aboutW->hide();
+
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/DelegateConfigWrapper.h Added

@@ -0,0 +1,61 @@
+/* === 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 RESOLVER_CONFIG_WRAPPER
+#define RESOLVER_CONFIG_WRAPPER
+
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QDebug>
+
+class DelegateConfigWrapper : public QDialog
+{
+    Q_OBJECT
+public:
+    DelegateConfigWrapper( QWidget* conf, QWidget* aboutWidget, const QString& title, QWidget* parent, Qt::WindowFlags flags = 0 );
+
+    ~DelegateConfigWrapper() {}
+
+    void setShowDelete( bool del );
+
+    bool deleted() const { return m_deleted; }
+
+public slots:
+    void toggleOkButton( bool dataError );
+    void closed( QAbstractButton* b );
+
+    // we get a rejected() signal emitted if the user presses escape (and no clicked() signal )
+    void rejected();
+
+    void updateSizeHint();
+
+signals:
+    void closedWithDelete();
+
+private slots:
+    void aboutClicked( bool );
+
+private:
+    QDialogButtonBox* m_buttons;
+    QWidget* m_widget, *m_aboutW;
+    QPushButton *m_okButton, *m_deleteButton;
+    bool m_deleted;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/ResolverAccount.cpp Added

@@ -0,0 +1,298 @@
+/* === 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 "ResolverAccount.h"
+
+#include "ExternalResolver.h"
+#include "ExternalResolverGui.h"
+#include "AccountManager.h"
+#include "TomahawkSettings.h"
+#include "Source.h"
+
+#include <Pipeline.h>
+#include <QFile>
+#include <QFileInfo>
+#include <QDir>
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+Account*
+ResolverAccountFactory::createAccount( const QString& accountId )
+{
+    // Can't use this to create new accounts. Needs to be able to find account in config
+    // to load proper resolver account type. Creation is done from AtticaManager when path is known
+    Q_ASSERT( !accountId.isEmpty() );
+
+    // If it's an attica resolver, return it instead so we get an icon
+    const bool isFromAttica = TomahawkSettings::instance()->value( QString( "accounts/%1/atticaresolver" ).arg( accountId ), false ).toBool();
+    if ( isFromAttica )
+        return new AtticaResolverAccount( accountId );
+    else
+        return new ResolverAccount( accountId );
+}
+
+
+Account*
+ResolverAccountFactory::createFromPath( const QString& path )
+{
+    return createFromPath( path, factoryId(), false );
+}
+
+
+Account*
+ResolverAccountFactory::createFromPath( const QString& path, const QString& factory,  bool isAttica )
+{
+    qDebug() << "Creating ResolverAccount from path:" << path << "is attica" << isAttica;
+    if ( isAttica )
+    {
+        QFileInfo info( path );
+        return new AtticaResolverAccount( generateId( factory ), path, info.baseName() );
+    }
+    else
+        return new ResolverAccount( generateId( factory ), path );
+}
+
+
+ResolverAccount::ResolverAccount( const QString& accountId )
+    : Account( accountId )
+{
+    const QString path = configuration() "path" .toString();
+    setTypes( AccountType( ResolverType ) );
+
+    // We should have a valid saved path
+    Q_ASSERT( !path.isEmpty() );
+
+    init( path );
+}
+
+
+ResolverAccount::ResolverAccount( const QString& accountId, const QString& path )
+    : Account( accountId )
+{
+    QVariantHash configuration;
+    configuration "path"  = path;
+    setConfiguration( configuration );
+
+    init( path );
+
+    sync();
+}
+
+
+ResolverAccount::~ResolverAccount()
+{
+    if ( m_resolver.isNull() )
+        return;
+
+    Pipeline::instance()->removeScriptResolver( m_resolver.data()->filePath() );
+    delete m_resolver.data();
+}
+
+
+void
+ResolverAccount::init( const QString& path )
+{
+    setTypes( AccountType( ResolverType ) );
+
+    if ( !QFile::exists( path ) )
+    {
+        AccountManager::instance()->disableAccount( this );
+    }
+    else
+    {
+        hookupResolver();
+    }
+}
+
+
+void
+ResolverAccount::hookupResolver()
+{
+    tDebug() << "Hooking up resolver:" << configuration().value( "path" ).toString() << enabled();
+
+    m_resolver = QWeakPointer< ExternalResolverGui >( qobject_cast< ExternalResolverGui* >( Pipeline::instance()->addScriptResolver( configuration().value( "path" ).toString() ) ) );
+    connect( m_resolver.data(), SIGNAL( changed() ), this, SLOT( resolverChanged() ) );
+
+    // What resolver do we have here? Should only be types that are 'real' resolvers
+    Q_ASSERT ( m_resolver.data() );
+
+    setAccountFriendlyName( m_resolver.data()->name() );
+}
+
+
+void
+ResolverAccount::authenticate()
+{
+    if ( m_resolver.isNull() )
+        return;
+
+    tDebug() << Q_FUNC_INFO << "Authenticating/starting resolver, exists?" << m_resolver.data()->name();
+
+    if ( !m_resolver.data()->running() )
+        m_resolver.data()->start();
+
+    emit connectionStateChanged( connectionState() );
+}
+
+
+bool
+ResolverAccount::isAuthenticated() const
+{
+    return !m_resolver.isNull() && m_resolver.data()->running();
+}
+
+
+void
+ResolverAccount::deauthenticate()
+{
+    if ( !m_resolver.isNull() && m_resolver.data()->running() )
+        m_resolver.data()->stop();
+
+    emit connectionStateChanged( connectionState() );
+
+}
+
+
+Account::ConnectionState
+ResolverAccount::connectionState() const
+{
+    if ( !m_resolver.isNull() && m_resolver.data()->running() )
+        return Connected;
+    else
+        return Disconnected;
+}
+
+
+QWidget*
+ResolverAccount::configurationWidget()
+{
+    if ( m_resolver.isNull() )
+        return 0;
+
+    return m_resolver.data()->configUI();
+}
+
+
+QString
+ResolverAccount::errorMessage() const
+{
+    // TODO
+//     return m_resolver->error();
+    return QString();
+}
+
+
+void
+ResolverAccount::removeFromConfig()
+{
+    // TODO
+    Account::removeFromConfig();
+}
+
+
+void ResolverAccount::saveConfig()
+{
+    Account::saveConfig();
+    if ( !m_resolver.isNull() )
+        m_resolver.data()->saveConfig();
+}
+
+
+QString
+ResolverAccount::path() const
+{
+    if ( m_resolver.isNull() )
+        return QString();
+
+    return m_resolver.data()->filePath();
+}
+
+
+void
+ResolverAccount::resolverChanged()
+{
+    setAccountFriendlyName( m_resolver.data()->name() );
+    emit connectionStateChanged( connectionState() );
+}
+
+
+/// AtticaResolverAccount
+
+AtticaResolverAccount::AtticaResolverAccount( const QString& accountId )
+    : ResolverAccount( accountId )
+{
+    TomahawkSettings::instance()->setValue( QString( "accounts/%1/atticaresolver" ).arg( accountId ), true );
+
+    m_atticaId = configuration().value( "atticaId" ).toString();
+    loadIcon();
+}
+
+AtticaResolverAccount::AtticaResolverAccount( const QString& accountId, const QString& path, const QString& atticaId )
+    : ResolverAccount( accountId, path )
+    , m_atticaId( atticaId )
+{
+    QVariantHash conf = configuration();
+    conf "atticaId"  = atticaId;
+    setConfiguration( conf );
+
+    TomahawkSettings::instance()->setValue( QString( "accounts/%1/atticaresolver" ).arg( accountId ), true );
+
+    loadIcon();
+    sync();
+}
+
+
+AtticaResolverAccount::~AtticaResolverAccount()
+{
+}
+
+
+void
+AtticaResolverAccount::loadIcon()
+{
+    if ( m_resolver.isNull() )
+        return;
+
+    const QFileInfo fi( m_resolver.data()->filePath() );
+    QDir codeDir = fi.absoluteDir();
+    codeDir.cd( "../images" );
+
+    if ( codeDir.exists() && codeDir.exists( "icon.png" ) )
+        m_icon.load( codeDir.absoluteFilePath( "icon.png" ) );
+}
+
+
+void
+AtticaResolverAccount::setPath( const QString& path )
+{
+    QVariantHash config = configuration();
+    config "path"  = path;
+    setConfiguration( config );
+
+    hookupResolver();
+
+    sync();
+}
+
+
+QPixmap
+AtticaResolverAccount::icon() const
+{
+    return m_icon;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/ResolverAccount.h Added

@@ -0,0 +1,136 @@
+/* === 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 RESOLVERACCOUNT_H
+#define RESOLVERACCOUNT_H
+
+#include "accounts/Account.h"
+#include "DllMacro.h"
+
+namespace Tomahawk {
+
+class ExternalResolverGui;
+
+namespace Accounts {
+
+class DLLEXPORT ResolverAccountFactory : public AccountFactory
+{
+    Q_OBJECT
+public:
+    ResolverAccountFactory() {}
+    virtual ~ResolverAccountFactory() {}
+
+    virtual Account* createAccount( const QString& accountId = QString() );
+    virtual QString factoryId() const  { return "resolveraccount"; }
+    virtual QString description() const { return QString(); }
+    virtual QString prettyName() const { return QString(); } // Internal, not displayed
+    AccountTypes types() const { return AccountTypes( ResolverType ); };
+    virtual bool allowUserCreation() const { return false; }
+
+    // Used to create a new resolver from a script on disk, either chosen by
+    // the user, or installed from synchrotron
+    virtual bool acceptsPath( const QString&  ) const { return true; } // This is the catch-all filesystem account
+    virtual Account* createFromPath( const QString& path );
+
+    // Internal use
+    static Account* createFromPath( const QString& path, const QString& factoryId, bool isAttica );
+};
+
+/**
+ * Helper wrapper class that is a resolver-only account.
+ *
+ * Contains the resolver* that is it wrapping
+ */
+class DLLEXPORT ResolverAccount : public Account
+{
+    Q_OBJECT
+public:
+    // Loads from config. Must already exist.
+    explicit ResolverAccount( const QString& accountId );
+    virtual ~ResolverAccount();
+
+    virtual void authenticate();
+    virtual void deauthenticate();
+    virtual bool isAuthenticated() const;
+    virtual Tomahawk::Accounts::Account::ConnectionState connectionState() const;
+
+    virtual QWidget* configurationWidget();
+    virtual QString errorMessage() const;
+
+    virtual void saveConfig();
+    virtual void removeFromConfig();
+
+    QString path() const;
+
+    // Not relevant
+    virtual QPixmap icon() const { return QPixmap(); }
+    virtual SipPlugin* sipPlugin() { return 0; }
+    virtual Tomahawk::InfoSystem::InfoPluginPtr infoPlugin() { return Tomahawk::InfoSystem::InfoPluginPtr(); }
+    virtual QWidget* aclWidget() { return 0; }
+
+private slots:
+    void resolverChanged();
+
+protected:
+    // Created by factory, when user installs a new resolver
+    ResolverAccount( const QString& accountId, const QString& path );
+
+    void hookupResolver();
+
+    QWeakPointer<ExternalResolverGui> m_resolver;
+
+private:
+    void init( const QString& path );
+
+    friend class ResolverAccountFactory;
+};
+
+
+/**
+ * Extends ResolverAccount with what attica additionally provides---e.g. icon
+ * Assumes certain file layout on disk.
+ */
+class DLLEXPORT AtticaResolverAccount : public ResolverAccount
+{
+    Q_OBJECT
+public:
+    // Loads from config
+    explicit AtticaResolverAccount( const QString& accountId );
+    virtual ~AtticaResolverAccount();
+
+    virtual QPixmap icon() const;
+
+    QString atticaId() const { return m_atticaId; }
+
+    void setPath( const QString& path );
+private:
+    // Created by factory, when user installs a new resolver
+    AtticaResolverAccount( const QString& accountId, const QString& path, const QString& atticaId );
+
+    void loadIcon();
+
+    QPixmap m_icon;
+    QString m_atticaId;
+
+    friend class ResolverAccountFactory;
+};
+
+}
+}
+
+#endif // RESOLVERACCOUNT_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/lastfm Added

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/lastfm/LastFmAccount.cpp Added

@@ -0,0 +1,300 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, 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 "LastFmAccount.h"
+#include "LastFmConfig.h"
+
+#include "infosystem/InfoSystem.h"
+#include "LastFmInfoPlugin.h"
+#include "utils/TomahawkUtils.h"
+#include "resolvers/QtScriptResolver.h"
+#include "AtticaManager.h"
+#include "Pipeline.h"
+#include "accounts/AccountManager.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+using namespace InfoSystem;
+using namespace Accounts;
+
+LastFmAccountFactory::LastFmAccountFactory()
+{
+    m_icon.load( RESPATH "images/lastfm-icon.png" );
+}
+
+
+Account*
+LastFmAccountFactory::createAccount( const QString& accountId )
+{
+    return new LastFmAccount( accountId.isEmpty() ? generateId( factoryId() ) : accountId );
+}
+
+
+QPixmap
+LastFmAccountFactory::icon() const
+{
+    return m_icon;
+}
+
+
+LastFmAccount::LastFmAccount( const QString& accountId )
+    : CustomAtticaAccount( accountId )
+{
+    setAccountFriendlyName( "Last.Fm" );
+    m_icon.load( RESPATH "images/lastfm-icon.png" );
+
+    AtticaManager::instance()->registerCustomAccount( "lastfm", this );
+
+    connect( AtticaManager::instance(), SIGNAL( resolverInstalled( QString ) ), this, SLOT( resolverInstalled( QString ) ) );
+
+    const Attica::Content res = AtticaManager::instance()->resolverForId( "lastfm" );
+    const AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( res );
+
+    if ( state == AtticaManager::Installed )
+    {
+        hookupResolver();
+    }
+
+
+    if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
+    {
+        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
+    }
+}
+
+
+LastFmAccount::~LastFmAccount()
+{
+    if ( m_infoPlugin )
+        Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
+
+    delete m_resolver.data();
+}
+
+
+void
+LastFmAccount::authenticate()
+{
+    if ( !AtticaManager::instance()->resolversLoaded() )
+    {
+        // If we're still waiting to load, wait for the attica resolvers to come down the pipe
+        connect( AtticaManager::instance(), SIGNAL(resolversLoaded(Attica::Content::List)), this, SLOT( atticaLoaded( Attica::Content::List ) ), Qt::UniqueConnection );
+        return;
+    }
+
+    const Attica::Content res = AtticaManager::instance()->resolverForId( "lastfm" );
+    const AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( res );
+
+    qDebug() << "Last.FM account authenticating...";
+    if ( m_resolver.isNull() && state == AtticaManager::Installed )
+    {
+        hookupResolver();
+    }
+    else if ( m_resolver.isNull() )
+    {
+        qDebug() << "Got null resolver but asked to authenticate, so installing i we have one from attica:" << res.isValid() << res.id();
+        if ( res.isValid() && !res.id().isEmpty() )
+            AtticaManager::instance()->installResolver( res, false );
+    }
+    else
+    {
+        m_resolver.data()->start();
+    }
+
+    emit connectionStateChanged( connectionState() );
+}
+
+
+void
+LastFmAccount::atticaLoaded( Attica::Content::List )
+{
+    disconnect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( atticaLoaded( Attica::Content::List ) ) );
+    authenticate();
+}
+
+
+void
+LastFmAccount::deauthenticate()
+{
+    if ( !m_resolver.isNull() && m_resolver.data()->running() )
+        m_resolver.data()->stop();
+
+    emit connectionStateChanged( connectionState() );
+}
+
+
+QWidget*
+LastFmAccount::configurationWidget()
+{
+    if ( m_configWidget.isNull() )
+        m_configWidget = QWeakPointer<LastFmConfig>( new LastFmConfig( this ) );
+
+    return m_configWidget.data();
+}
+
+
+Account::ConnectionState
+LastFmAccount::connectionState() const
+{
+    return (!m_resolver.isNull() && m_resolver.data()->running()) ? Account::Connected : Account::Disconnected;
+}
+
+
+QPixmap
+LastFmAccount::icon() const
+{
+    return m_icon;
+}
+
+
+InfoPluginPtr
+LastFmAccount::infoPlugin()
+{
+    if ( m_infoPlugin.isNull() )
+        m_infoPlugin = QWeakPointer< LastFmInfoPlugin >( new LastFmInfoPlugin( this ) );
+
+    return InfoPluginPtr( m_infoPlugin.data() );
+}
+
+bool
+LastFmAccount::isAuthenticated() const
+{
+    return !m_resolver.isNull() && m_resolver.data()->running();
+}
+
+
+void
+LastFmAccount::saveConfig()
+{
+    if ( !m_configWidget.isNull() )
+    {
+        setUsername( m_configWidget.data()->username() );
+        setPassword( m_configWidget.data()->password() );
+        setScrobble( m_configWidget.data()->scrobble() );
+    }
+
+    sync();
+
+    if ( m_infoPlugin )
+        QTimer::singleShot( 0, m_infoPlugin.data(), SLOT( settingsChanged() ) );
+}
+
+
+QString
+LastFmAccount::password() const
+{
+    return credentials().value( "password" ).toString();
+}
+
+
+void
+LastFmAccount::setPassword( const QString& password )
+{
+    QVariantHash creds = credentials();
+    creds "password"  = password;
+    setCredentials( creds );
+}
+
+QString
+LastFmAccount::sessionKey() const
+{
+    return credentials().value( "sessionkey" ).toString();
+}
+
+
+void
+LastFmAccount::setSessionKey( const QString& sessionkey )
+{
+    QVariantHash creds = credentials();
+    creds "sessionkey"  = sessionkey;
+    setCredentials( creds );
+}
+
+
+QString
+LastFmAccount::username() const
+{
+    return credentials().value( "username" ).toString();
+}
+
+
+void
+LastFmAccount::setUsername( const QString& username )
+{
+    QVariantHash creds = credentials();
+    creds "username"  = username;
+    setCredentials( creds );
+}
+
+
+bool
+LastFmAccount::scrobble() const
+{
+    return configuration().value( "scrobble" ).toBool();
+}
+
+
+void
+LastFmAccount::setScrobble( bool scrobble )
+{
+    QVariantHash conf;
+    conf "scrobble"  = scrobble;
+    setConfiguration( conf );
+}
+
+
+void
+LastFmAccount::resolverInstalled( const QString &resolverId )
+{
+    if ( resolverId == "lastfm" )
+    {
+        // We requested this install, so we want to launch it
+        hookupResolver();
+        AccountManager::instance()->enableAccount( this );
+    }
+}
+
+void
+LastFmAccount::resolverChanged()
+{
+    emit connectionStateChanged( connectionState() );
+}
+
+
+void
+LastFmAccount::hookupResolver()
+{
+    // If there is a last.fm resolver from attica installed, create the corresponding ExternalResolver* and hook up to it
+    const Attica::Content res = AtticaManager::instance()->resolverForId( "lastfm" );
+    const AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( res );
+    Q_ASSERT( state == AtticaManager::Installed );
+    Q_UNUSED( state );
+
+    const AtticaManager::Resolver data = AtticaManager::instance()->resolverData( res.id() );
+
+    m_resolver = QWeakPointer< ExternalResolverGui >( qobject_cast< ExternalResolverGui* >( Pipeline::instance()->addScriptResolver( data.scriptPath ) ) );
+    connect( m_resolver.data(), SIGNAL( changed() ), this, SLOT( resolverChanged() ) );
+}
+
+
+Attica::Content
+LastFmAccount::atticaContent() const
+{
+    return AtticaManager::instance()->resolverForId( "lastfm" );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/lastfm/LastFmAccount.h Added

@@ -0,0 +1,116 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, 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 LASTFMACCOUNT_H
+#define LASTFMACCOUNT_H
+
+#include "accounts/Account.h"
+#include "AtticaManager.h"
+#include "DllMacro.h"
+
+#include <attica/content.h>
+
+#include <QObject>
+
+namespace Tomahawk {
+class ExternalResolverGui;
+
+namespace InfoSystem {
+    class LastFmInfoPlugin;
+}
+
+namespace Accounts {
+
+class LastFmConfig;
+
+class DLLEXPORT LastFmAccountFactory : public AccountFactory
+{
+    Q_OBJECT
+public:
+    LastFmAccountFactory();
+
+    virtual Account* createAccount(const QString& accountId = QString());
+    virtual QString description() const { return tr( "Scrobble your tracks to last.fm, and find freely downloadable tracks to play" ); }
+    virtual QString factoryId() const { return "lastfmaccount"; }
+    virtual QString prettyName() const { return "Last.fm"; }
+    virtual AccountTypes types() const { return AccountTypes( InfoType | StatusPushType ); }
+    virtual bool allowUserCreation() const { return false; }
+    virtual QPixmap icon() const;
+    virtual bool isUnique() const { return true; }
+
+private:
+    QPixmap m_icon;
+};
+
+/**
+ * Last.Fm account is special. It is both an attica resolver *and* a InfoPlugin. We always want the infoplugin,
+ * but the user can install the attica resolver on-demand. So we take care of both there.
+ *
+ */
+class DLLEXPORT LastFmAccount : public CustomAtticaAccount
+{
+    Q_OBJECT
+public:
+    explicit LastFmAccount( const QString& accountId );
+    ~LastFmAccount();
+
+    virtual void deauthenticate();
+    virtual void authenticate();
+
+    virtual SipPlugin* sipPlugin() { return 0; }
+    virtual Tomahawk::InfoSystem::InfoPluginPtr infoPlugin();
+
+    virtual bool isAuthenticated() const;
+
+    virtual ConnectionState connectionState() const;
+    virtual QPixmap icon() const;
+    virtual QWidget* aclWidget() { return 0; }
+    virtual QWidget* configurationWidget();
+    virtual void saveConfig();
+
+    QString username() const;
+    void setUsername( const QString& );
+    QString password() const;
+    void setPassword( const QString& );
+    QString sessionKey() const;
+    void setSessionKey( const QString& );
+    bool scrobble() const;
+    void setScrobble( bool scrobble );
+
+    Attica::Content atticaContent() const;
+
+private slots:
+    void atticaLoaded( Attica::Content::List );
+
+    void resolverInstalled( const QString& resolverId );
+
+    void resolverChanged();
+private:
+    void hookupResolver();
+
+    QWeakPointer<Tomahawk::ExternalResolverGui> m_resolver;
+    QWeakPointer<Tomahawk::InfoSystem::LastFmInfoPlugin> m_infoPlugin;
+    QWeakPointer<LastFmConfig> m_configWidget;
+    QPixmap m_icon;
+};
+
+
+}
+}
+
+#endif // LASTFMACCOUNT_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp Added

@@ -0,0 +1,239 @@
+/* === 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 "LastFmConfig.h"
+#include "ui_LastFmConfig.h"
+
+#include "LastFmAccount.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_LogPlayback.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "lastfm/ws.h"
+#include "lastfm/User.h"
+#include "lastfm/XmlQuery.h"
+
+using namespace Tomahawk::Accounts;
+
+
+LastFmConfig::LastFmConfig( LastFmAccount* account )
+    : QWidget( 0 )
+    , m_account( account )
+    , m_page( 1 )
+    , m_lastTimeStamp( 0 )
+{
+    m_ui = new Ui_LastFmConfig;
+    m_ui->setupUi( this );
+
+    m_ui->progressBar->hide();
+
+    m_ui->username->setText( m_account->username() );
+    m_ui->password->setText( m_account->password() );
+    m_ui->enable->setChecked( m_account->scrobble() );
+
+    connect( m_ui->testLogin, SIGNAL( clicked( bool ) ), SLOT( testLogin() ) );
+    connect( m_ui->importHistory, SIGNAL( clicked( bool ) ), SLOT( loadHistory() ) );
+
+    connect( m_ui->username, SIGNAL( textChanged( QString ) ), SLOT( enableButton() ) );
+    connect( m_ui->password, SIGNAL( textChanged( QString ) ), SLOT( enableButton() ) );
+}
+
+
+QString
+LastFmConfig::password() const
+{
+    return m_ui->password->text();
+}
+
+
+bool
+LastFmConfig::scrobble() const
+{
+    return m_ui->enable->isChecked();
+}
+
+
+QString
+LastFmConfig::username() const
+{
+    return m_ui->username->text().trimmed();
+}
+
+
+void
+LastFmConfig::testLogin()
+{
+    m_ui->testLogin->setEnabled( false );
+    m_ui->testLogin->setText( tr( "Testing..." ) );
+
+    QString authToken = TomahawkUtils::md5( ( m_ui->username->text().toLower() + TomahawkUtils::md5( m_ui->password->text().toUtf8() ) ).toUtf8() );
+
+    // now authenticate w/ last.fm and get our session key
+    QMap<QString, QString> query;
+    query "method"  = "auth.getMobileSession";
+    query "username"  =  m_ui->username->text().toLower();
+    query "authToken"  = authToken;
+
+    // ensure they have up-to-date settings
+    lastfm::setNetworkAccessManager( TomahawkUtils::nam() );
+
+    QNetworkReply* authJob = lastfm::ws::post( query );
+
+    connect( authJob, SIGNAL( finished() ), SLOT( onLastFmFinished() ) );
+}
+
+
+void
+LastFmConfig::enableButton()
+{
+    m_ui->testLogin->setText( tr( "Test Login" ) );
+    m_ui->testLogin->setEnabled( true );
+}
+
+
+void
+LastFmConfig::loadHistory()
+{
+    if ( m_lastTimeStamp )
+    {
+        m_ui->importHistory->setText( tr( "Importing %1", "e.g. Importing 2012/01/01" ).arg( QDateTime::fromTime_t( m_lastTimeStamp ).toString( "MMMM d yyyy" ) ) );
+    }
+    else
+        m_ui->importHistory->setText( tr( "Importing History..." ) );
+
+    m_ui->importHistory->setEnabled( false );
+    m_ui->progressBar->show();
+
+    emit sizeHintChanged();
+
+    QNetworkReply* reply = lastfm::User( m_ui->username->text().toLower() ).getRecentTracks( 200, m_page );
+    connect( reply, SIGNAL( finished() ), SLOT( onHistoryLoaded() ) );
+}
+
+
+void
+LastFmConfig::onHistoryLoaded()
+{
+    uint total = 0;
+    bool finished = false;
+    QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
+
+    try
+    {
+        lastfm::XmlQuery lfm;
+        lfm.parse( reply->readAll() );
+
+        foreach ( lastfm::XmlQuery e, lfm.children( "track" ) )
+        {
+//            tDebug() << "Found:" << e.children( "artist" ).first()"name".text() << e"name".text() << e"date".attribute( "uts" ).toUInt();
+            Tomahawk::query_ptr query = Query::get( e.children( "artist" ).first()"name".text(), e"name".text(), QString(), QString(), false );
+            if ( query.isNull() )
+                continue;
+
+            m_lastTimeStamp = e"date".attribute( "uts" ).toUInt();
+
+            DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( query, DatabaseCommand_LogPlayback::Finished, m_lastTimeStamp );
+            Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+        }
+
+        if ( !lfm.children( "recenttracks" ).isEmpty() )
+        {
+            lastfm::XmlQuery stats = lfm.children( "recenttracks" ).first();
+
+            uint page = stats.attribute( "page" ).toUInt();
+            total = stats.attribute( "totalPages" ).toUInt();
+
+            m_ui->progressBar->setMaximum( total );
+            m_ui->progressBar->setValue( page );
+
+            if ( page < total )
+            {
+                m_page = page + 1;
+                loadHistory();
+            }
+            else
+                finished = true;
+        }
+        else
+            finished = true;
+    }
+    catch( lastfm::ws::ParseError e )
+    {
+        tDebug() << "XmlQuery error:" << e.message();
+        finished = true;
+    }
+
+    if ( finished )
+    {
+        if ( m_page != total )
+        {
+            m_ui->importHistory->setText( tr( "History Incomplete. Resume" ) );
+            m_ui->importHistory->setEnabled( true );
+        }
+        else
+        {
+            m_ui->importHistory->setText( tr( "Playback History Imported" ) );
+        }
+    }
+}
+
+
+void
+LastFmConfig::onLastFmFinished()
+{
+    QNetworkReply* authJob = dynamic_cast<QNetworkReply*>( sender() );
+    if( !authJob )
+    {
+        qDebug() << Q_FUNC_INFO << "No auth job returned!";
+        return;
+    }
+    if( authJob->error() == QNetworkReply::NoError )
+    {
+        lastfm::XmlQuery lfm;
+        lfm.parse( authJob->readAll() );
+
+        if( lfm.children( "error" ).size() > 0 )
+        {
+            qDebug() << "ERROR from last.fm:" << lfm.text();
+            m_ui->testLogin->setText( tr( "Failed" ) );
+            m_ui->testLogin->setEnabled( true );
+        }
+        else
+        {
+            m_ui->testLogin->setText( tr( "Success" ) );
+            m_ui->testLogin->setEnabled( false );
+        }
+    }
+    else
+    {
+        switch( authJob->error() )
+        {
+            case QNetworkReply::ContentOperationNotPermittedError:
+            case QNetworkReply::AuthenticationRequiredError:
+                m_ui->testLogin->setText( tr( "Failed" ) );
+                m_ui->testLogin->setEnabled( true );
+                break;
+
+            default:
+                qDebug() << "Couldn't get last.fm auth result";
+                m_ui->testLogin->setText( tr( "Could not contact server" ) );
+                m_ui->testLogin->setEnabled( true );
+                return;
+        }
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/lastfm/LastFmConfig.h Added

@@ -0,0 +1,67 @@
+/* === 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 LASTFMCONFIG_H
+#define LASTFMCONFIG_H
+
+#include <QWidget>
+
+class Ui_LastFmConfig;
+
+namespace Tomahawk {
+
+namespace Accounts {
+
+class LastFmAccount;
+
+class LastFmConfig : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit LastFmConfig( LastFmAccount* account );
+
+    QString username() const;
+    QString password() const;
+    bool scrobble() const;
+
+public slots:
+    void testLogin();
+    void onLastFmFinished();
+
+private slots:
+    void enableButton();
+    
+    void loadHistory();
+    void onHistoryLoaded();
+
+signals:
+    void sizeHintChanged();
+
+private:
+    LastFmAccount* m_account;
+    Ui_LastFmConfig* m_ui;
+    
+    unsigned int m_page;
+    unsigned int m_lastTimeStamp;
+};
+
+}
+
+}
+
+#endif // LASTFMCONFIG_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/lastfm/LastFmConfig.ui Added

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LastFmConfig</class>
+ <widget class="QWidget" name="LastFmConfig">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>253</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>4</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="../../../resources.qrc">:/data/images/lastfm-icon.png</pixmap>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
+      <widget class="QCheckBox" name="enable">
+       <property name="layoutDirection">
+        <enum>Qt::LeftToRight</enum>
+       </property>
+       <property name="text">
+        <string>Scrobble tracks to Last.fm</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Username:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="username"/>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Password:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="password">
+         <property name="echoMode">
+          <enum>QLineEdit::Password</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QPushButton" name="testLogin">
+       <property name="text">
+        <string>Test Login</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="importHistory">
+       <property name="text">
+        <string>Import Playback History</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QProgressBar" name="progressBar">
+       <property name="value">
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../../resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp Added

@@ -0,0 +1,958 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, 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 "LastFmInfoPlugin.h"
+
+#include <QDir>
+#include <QSettings>
+#include <QNetworkConfiguration>
+#include <QDomElement>
+
+#include "Album.h"
+#include "Typedefs.h"
+#include "audio/AudioEngine.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "accounts/lastfm/LastFmAccount.h"
+#include "Source.h"
+#include "TomahawkSettings.h"
+
+#include <lastfm/ws.h>
+#include <lastfm/XmlQuery.h>
+
+#include <qjson/parser.h>
+
+using namespace Tomahawk::Accounts;
+using namespace Tomahawk::InfoSystem;
+
+
+LastFmInfoPlugin::LastFmInfoPlugin( LastFmAccount* account )
+    : InfoPlugin()
+    , m_account( account )
+    , m_scrobbler( 0 )
+{
+    m_supportedGetTypes << InfoAlbumCoverArt << InfoArtistImages << InfoArtistSimilars << InfoArtistSongs << InfoChart << InfoChartCapabilities << InfoTrackSimilars;
+    m_supportedPushTypes << InfoSubmitScrobble << InfoSubmitNowPlaying << InfoLove << InfoUnLove;
+}
+
+
+void
+LastFmInfoPlugin::init()
+{
+    if ( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() && thread() != Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() )
+    {
+        tDebug() << "Failure: move to the worker thread before running init";
+        return;
+    }
+
+    lastfm::ws::ApiKey = "7194b85b6d1f424fe1668173a78c0c4a";
+    lastfm::ws::SharedSecret = "ba80f1df6d27ae63e9cb1d33ccf2052f";
+    lastfm::ws::Username = m_account.data()->username();
+    lastfm::setNetworkAccessManager( TomahawkUtils::nam() );
+
+    m_pw = m_account.data()->password();
+
+    //HACK work around a bug in liblastfm---it doesn't create its config dir, so when it
+    // tries to write the track cache, it fails silently. until we have a fixed version, do this
+    // code taken from Amarok (src/services/lastfm/ScrobblerAdapter.cpp)
+#ifdef Q_WS_X11
+    QString lpath = QDir::home().filePath( ".local/share/Last.fm" );
+    QDir ldir = QDir( lpath );
+    if( !ldir.exists() )
+    {
+        ldir.mkpath( lpath );
+    }
+#endif
+
+    m_badUrls << QUrl( "http://cdn.last.fm/flatness/catalogue/noimage" );
+
+    QTimer::singleShot( 0, this, SLOT( settingsChanged() ) );
+}
+
+
+LastFmInfoPlugin::~LastFmInfoPlugin()
+{
+    qDebug() << Q_FUNC_INFO;
+    delete m_scrobbler;
+    m_scrobbler = 0;
+}
+
+
+void
+LastFmInfoPlugin::dataError( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    emit info( requestData, QVariant() );
+    return;
+}
+
+
+void
+LastFmInfoPlugin::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    switch ( requestData.type )
+    {
+        case InfoArtistImages:
+            fetchArtistImages( requestData );
+            break;
+
+        case InfoAlbumCoverArt:
+            fetchCoverArt( requestData );
+            break;
+
+        case InfoArtistSimilars:
+            fetchSimilarArtists( requestData );
+            break;
+
+        case InfoArtistSongs:
+            fetchTopTracks( requestData );
+            break;
+
+        case InfoChart:
+            fetchChart( requestData );
+            break;
+
+        case InfoChartCapabilities:
+            fetchChartCapabilities( requestData );
+            break;
+
+        case InfoTrackSimilars:
+            fetchSimilarTracks( requestData );
+            break;
+
+        default:
+            dataError( requestData );
+    }
+}
+
+
+void
+LastFmInfoPlugin::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+{
+    switch ( pushData.type )
+    {
+        case InfoSubmitNowPlaying:
+            nowPlaying( pushData.infoPair.second );
+            break;
+
+        case InfoSubmitScrobble:
+            scrobble();
+            break;
+
+        case InfoLove:
+        case InfoUnLove:
+            sendLoveSong( pushData.type, pushData.infoPair.second );
+            break;
+
+        default:
+            return;
+    }
+}
+
+
+void
+LastFmInfoPlugin::nowPlaying( const QVariant &input )
+{
+    m_track = lastfm::MutableTrack();
+    if ( !input.canConvert< QVariantMap >() )
+    {
+        tDebug() << Q_FUNC_INFO << "Failed to convert data to a QVariantMap";
+        return;
+    }
+
+    QVariantMap map = input.toMap();
+    if ( map.contains( "private" ) && map "private"  == TomahawkSettings::FullyPrivate )
+        return;
+
+    if ( !map.contains( "trackinfo" ) || !map "trackinfo" .canConvert< Tomahawk::InfoSystem::InfoStringHash >() || !m_scrobbler )
+    {
+        tLog() << Q_FUNC_INFO << "LastFmInfoPlugin::nowPlaying no m_scrobbler, or cannot convert input!";
+        if ( !m_scrobbler )
+            tLog() << Q_FUNC_INFO << "No scrobbler!";
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash hash = map "trackinfo" .value< Tomahawk::InfoSystem::InfoStringHash >();
+
+    if ( !hash.contains( "title" ) || !hash.contains( "artist" ) || !hash.contains( "album" ) || !hash.contains( "duration" ) )
+        return;
+
+    m_track.stamp();
+
+    m_track.setTitle( hash"title" );
+    m_track.setArtist( hash"artist" );
+    m_track.setAlbum( hash"album" );
+    bool ok;
+    m_track.setDuration( hash"duration".toUInt( &ok ) );
+    m_track.setSource( lastfm::Track::Player );
+
+    m_scrobbler->nowPlaying( m_track );
+}
+
+
+void
+LastFmInfoPlugin::scrobble()
+{
+    if ( !m_scrobbler || m_track.isNull() )
+        return;
+
+    tLog() << Q_FUNC_INFO << "Scrobbling now:" << m_track.toString();
+
+    // FIXME: workaround for the duration-less dilandau (and others) tracks
+    if ( m_track.duration() == 0 )
+        m_track.setDuration( 31 );
+
+    m_scrobbler->cache( m_track );
+    m_scrobbler->submit();
+}
+
+
+void
+LastFmInfoPlugin::sendLoveSong( const InfoType type, QVariant input )
+{
+    qDebug() << Q_FUNC_INFO;
+
+    if ( !input.toMap().contains( "trackinfo" ) || !input.toMap() "trackinfo" .canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        tLog() << "LastFmInfoPlugin::nowPlaying cannot convert input!";
+        return;
+    }
+
+    InfoStringHash hash = input.toMap() "trackinfo" .value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "title" ) || !hash.contains( "artist" ) || !hash.contains( "album" ) )
+        return;
+
+    lastfm::MutableTrack track;
+    track.stamp();
+
+    track.setTitle( hash"title" );
+    track.setArtist( hash"artist" );
+    track.setAlbum( hash"album" );
+    bool ok;
+    track.setDuration( hash"duration".toUInt( &ok ) );
+    track.setSource( lastfm::Track::Player );
+
+    if ( type == Tomahawk::InfoSystem::InfoLove )
+    {
+        track.love();
+    }
+    else if ( type == Tomahawk::InfoSystem::InfoUnLove )
+    {
+        track.unlove();
+    }
+}
+
+
+void
+LastFmInfoPlugin::fetchSimilarArtists( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "artist" ) )
+    {
+        dataError( requestData );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = hash"artist";
+
+    emit getCachedInfo( criteria, 2419200000, requestData );
+}
+
+
+void
+LastFmInfoPlugin::fetchSimilarTracks( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "artist" ) || !hash.contains( "track" ) )
+    {
+        dataError( requestData );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = hash"artist";
+    criteria"track" = hash"track";
+
+    emit getCachedInfo( criteria, 2419200000, requestData );
+}
+
+
+void
+LastFmInfoPlugin::fetchTopTracks( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "artist" ) )
+    {
+        dataError( requestData );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = hash"artist";
+
+    emit getCachedInfo( criteria, 2419200000, requestData );
+}
+
+
+void
+LastFmInfoPlugin::fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    if ( !hash.contains( "chart_id" ) )
+    {
+        dataError( requestData );
+        return;
+    } else {
+        criteria"chart_id" = hash"chart_id";
+    }
+
+    emit getCachedInfo( criteria, 0, requestData );
+}
+
+
+void
+LastFmInfoPlugin::fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+
+    emit getCachedInfo( criteria, 0, requestData );
+}
+
+
+void
+LastFmInfoPlugin::fetchCoverArt( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "artist" ) || !hash.contains( "album" ) )
+    {
+        dataError( requestData );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = hash"artist";
+    criteria"album" = hash"album";
+
+    emit getCachedInfo( criteria, 2419200000, requestData );
+}
+
+
+void
+LastFmInfoPlugin::fetchArtistImages( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        dataError( requestData );
+        return;
+    }
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    if ( !hash.contains( "artist" ) )
+    {
+        dataError( requestData );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = hash"artist";
+
+    emit getCachedInfo( criteria, 2419200000, requestData );
+}
+
+
+void
+LastFmInfoPlugin::notInCacheSlot( QHash<QString, QString> criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    if ( !TomahawkUtils::nam() )
+    {
+        tLog() << "Have a null QNAM, uh oh";
+        emit info( requestData, QVariant() );
+        return;
+    }
+
+    InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+    switch ( requestData.type )
+    {
+        case InfoChart:
+        {
+             /// We need something to check if the request is actually ment to go to this plugin
+            if ( !hash.contains( "chart_source" ) )
+            {
+                dataError( requestData );
+                break;
+            }
+            else
+            {
+                if( "last.fm" != hash"chart_source" )
+                {
+                    dataError( requestData );
+                    break;
+                }
+
+            }
+            QMap<QString, QString> args;
+            args"method" = criteria"chart_id";
+            args"limit" = "100";
+            QNetworkReply* reply = lastfm::ws::get(args);
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+
+            connect( reply, SIGNAL( finished() ), SLOT( chartReturned() ) );
+            return;
+        }
+
+        case InfoChartCapabilities:
+        {
+            QList< InfoStringHash > track_charts;
+            InfoStringHash c;
+            c "type"  = "tracks";
+            c "id"  = "chart.getTopTracks";
+            c "label"  = tr( "Top Tracks" );
+            track_charts.append( c );
+            c "id"  = "chart.getLovedTracks";
+            c "label"  = tr( "Loved Tracks" );
+            track_charts.append( c );
+            c "id"  = "chart.getHypedTracks";
+            c "label"  = tr( "Hyped Tracks" );
+            track_charts.append( c );
+
+            QList< InfoStringHash > artist_charts;
+            c "type"  = "artists";
+            c "id"  = "chart.getTopArtists";
+            c "label"  = tr( "Top Artists" );
+            artist_charts.append( c );
+            c "id"  = "chart.getHypedArtists";
+            c "label"  = tr( "Hyped Artists" );
+            artist_charts.append( c );
+
+            QVariantMap charts;
+            charts.insert( "Tracks", QVariant::fromValue< QList< InfoStringHash > >( track_charts ) );
+            charts.insert( "Artists", QVariant::fromValue< QList< InfoStringHash > >( artist_charts ) );
+
+            QVariantMap result;
+            result.insert( "Last.fm", QVariant::fromValue<QVariantMap>( charts ) );
+
+            emit info( requestData, result );
+            return;
+        }
+
+        case InfoArtistSimilars:
+        {
+            lastfm::Artist a( criteria"artist" );
+            QNetworkReply* reply = a.getSimilar();
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+
+            connect( reply, SIGNAL( finished() ), SLOT( similarArtistsReturned() ) );
+            return;
+        }
+
+        case InfoTrackSimilars:
+        {
+            lastfm::MutableTrack t;
+            t.setArtist( criteria"artist" );
+            t.setTitle( criteria"track" );
+
+            QNetworkReply* reply = t.getSimilar();
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+
+            connect( reply, SIGNAL( finished() ), SLOT( similarTracksReturned() ) );
+            return;
+        }
+
+        case InfoArtistSongs:
+        {
+            lastfm::Artist a( criteria"artist" );
+            QNetworkReply* reply = a.getTopTracks();
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+
+            connect( reply, SIGNAL( finished() ), SLOT( topTracksReturned() ) );
+            return;
+        }
+
+        case InfoAlbumCoverArt:
+        {
+            QString artistName = criteria"artist";
+            QString albumName = criteria"album";
+
+            QUrl imgurl( "http://ws.audioscrobbler.com/2.0/" );
+            imgurl.addQueryItem( "method", "album.imageredirect" );
+            imgurl.addEncodedQueryItem( "artist", QUrl::toPercentEncoding( artistName, "", "+" ) );
+            imgurl.addEncodedQueryItem( "album", QUrl::toPercentEncoding( albumName, "", "+" ) );
+            imgurl.addQueryItem( "autocorrect", QString::number( 1 ) );
+            imgurl.addQueryItem( "size", "large" );
+            imgurl.addQueryItem( "api_key", "7a90f6672a04b809ee309af169f34b8b" );
+
+            QNetworkRequest req( imgurl );
+            QNetworkReply* reply = TomahawkUtils::nam()->get( req );
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+
+            connect( reply, SIGNAL( finished() ), SLOT( coverArtReturned() ) );
+            return;
+        }
+
+        case InfoArtistImages:
+        {
+            QString artistName = criteria"artist";
+
+            QUrl imgurl( "http://ws.audioscrobbler.com/2.0/" );
+            imgurl.addQueryItem( "method", "artist.imageredirect" );
+            imgurl.addEncodedQueryItem( "artist", QUrl::toPercentEncoding( artistName, "", "+" ) );
+            imgurl.addQueryItem( "autocorrect", QString::number( 1 ) );
+            imgurl.addQueryItem( "size", "largesquare" );
+            imgurl.addQueryItem( "api_key", "7a90f6672a04b809ee309af169f34b8b" );
+
+            QNetworkRequest req( imgurl );
+            QNetworkReply* reply = TomahawkUtils::nam()->get( req );
+            reply->setProperty( "requestData", QVariant::fromValue< Tomahawk::InfoSystem::InfoRequestData >( requestData ) );
+
+            connect( reply, SIGNAL( finished() ), SLOT( artistImagesReturned() ) );
+            return;
+        }
+
+        default:
+        {
+            tLog() << "Couldn't figure out what to do with this type of request after cache miss";
+            emit info( requestData, QVariant() );
+            return;
+        }
+    }
+}
+
+
+void
+LastFmInfoPlugin::similarArtistsReturned()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+
+    QMap< int, QString > similarArtists = lastfm::Artist::getSimilar( reply );
+
+    QStringList sortedArtists;
+    QStringList sortedScores;
+    QStringList al;
+    QStringList sl;
+
+    foreach ( const QString& artist, similarArtists.values() )
+        al << artist;
+    foreach ( int score, similarArtists.keys() )
+        sl << QString::number( score );
+
+    for ( int i = al.count() - 1; i >= 0; i-- )
+    {
+        sortedArtists << al.at( i );
+        sortedScores << sl.at( i );
+    }
+
+    QVariantMap returnedData;
+    returnedData"artists" = sortedArtists;
+    returnedData"score" = sortedScores;
+
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+    emit info( requestData, returnedData );
+
+    if ( !sortedArtists.isEmpty() )
+    {
+        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
+        Tomahawk::InfoSystem::InfoStringHash criteria;
+        criteria"artist" = origData"artist";
+        emit updateCache( criteria, 2419200000, requestData.type, returnedData );
+    }
+}
+
+
+void
+LastFmInfoPlugin::similarTracksReturned()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+
+    QMap< int, QPair< QString, QString > > similarTracks = lastfm::Track::getSimilar( reply );
+
+    QStringList sortedArtists;
+    QStringList sortedTracks;
+    QStringList sortedScores;
+    QStringList al;
+    QStringList tl;
+    QStringList sl;
+
+    QPair< QString, QString > track;
+    foreach ( track, similarTracks.values() )
+    {
+        tl << track.first;
+        al << track.second;
+    }
+    foreach ( int score, similarTracks.keys() )
+        sl << QString::number( score );
+
+    for ( int i = tl.count() - 1; i >= 0; i-- )
+    {
+        sortedTracks << tl.at( i );
+        sortedArtists << al.at( i );
+        sortedScores << sl.at( i );
+    }
+
+    QVariantMap returnedData;
+    returnedData"tracks" = sortedTracks;
+    returnedData"artists" = sortedArtists;
+    returnedData"score" = sortedScores;
+
+    qDebug() << "Returning data, tracks:" << sortedTracks << "artists:" << sortedArtists << "scors:" << sortedScores;
+
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+    emit info( requestData, returnedData );
+
+    if ( !sortedTracks.isEmpty() )
+    {
+        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
+        Tomahawk::InfoSystem::InfoStringHash criteria;
+        criteria"artist" = origData"artist";
+        criteria"track" = origData"track";
+        emit updateCache( criteria, 2419200000, requestData.type, returnedData );
+    }
+}
+
+
+void
+LastFmInfoPlugin::chartReturned()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+
+    QVariantMap returnedData;
+    const QRegExp tracks_rx( "chart\\.\\S+tracks\\S*", Qt::CaseInsensitive );
+    const QRegExp artists_rx( "chart\\.\\S+artists\\S*", Qt::CaseInsensitive );
+    const QString url = reply->url().toString();
+
+    if ( url.contains( tracks_rx ) )
+    {
+        QList<lastfm::Track> tracks = parseTrackList( reply );
+        QList<InfoStringHash> top_tracks;
+        foreach( const lastfm::Track& t, tracks )
+        {
+            InfoStringHash pair;
+            pair "artist"  = t.artist().toString();
+            pair "track"  = t.title();
+            top_tracks << pair;
+        }
+        returnedData"tracks" = QVariant::fromValue( top_tracks );
+        returnedData"type" = "tracks";
+
+    }
+    else if ( url.contains( artists_rx ) )
+    {
+        QList<lastfm::Artist> list = lastfm::Artist::list( reply );
+        QStringList al;
+        foreach ( const lastfm::Artist& a, list )
+            al << a.toString();
+        returnedData"artists" = al;
+        returnedData"type" = "artists";
+    }
+    else
+    {
+        tDebug() << Q_FUNC_INFO << "got non tracks and non artists";
+    }
+
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+    emit info( requestData, returnedData );
+    // TODO update cache
+}
+
+
+void
+LastFmInfoPlugin::topTracksReturned()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+
+    QStringList topTracks = lastfm::Artist::getTopTracks( reply );
+    topTracks.removeDuplicates();
+
+    QVariantMap returnedData;
+    returnedData"tracks" = topTracks;
+
+    Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+    emit info( requestData, returnedData );
+
+    Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = origData"artist";
+    emit updateCache( criteria, 0, requestData.type, returnedData );
+}
+
+
+void
+LastFmInfoPlugin::coverArtReturned()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    QUrl redir = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
+    if ( redir.isEmpty() )
+    {
+        QByteArray ba = reply->readAll();
+        if ( ba.isNull() || !ba.length() )
+        {
+            tLog() << Q_FUNC_INFO << "Uh oh, null byte array";
+            emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+            return;
+        }
+        foreach ( const QUrl& url, m_badUrls )
+        {
+            if ( reply->url().toString().startsWith( url.toString() ) )
+                ba = QByteArray();
+        }
+
+        QVariantMap returnedData;
+        returnedData"imgbytes" = ba;
+        returnedData"url" = reply->url().toString();
+
+        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+        emit info( requestData, returnedData );
+
+        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
+        Tomahawk::InfoSystem::InfoStringHash criteria;
+        criteria"artist" = origData"artist";
+        criteria"album" = origData"album";
+        emit updateCache( criteria, 2419200000, requestData.type, returnedData );
+    }
+    else
+    {
+        if ( !TomahawkUtils::nam() )
+        {
+            tLog() << Q_FUNC_INFO << "Uh oh, nam is null";
+            emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+            return;
+        }
+        // Follow HTTP redirect
+        QNetworkRequest req( redir );
+        QNetworkReply* newReply = TomahawkUtils::nam()->get( req );
+        newReply->setProperty( "requestData", reply->property( "requestData" ) );
+        connect( newReply, SIGNAL( finished() ), SLOT( coverArtReturned() ) );
+    }
+
+    reply->deleteLater();
+}
+
+
+void
+LastFmInfoPlugin::artistImagesReturned()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>( sender() );
+    QUrl redir = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
+    if ( redir.isEmpty() )
+    {
+        QByteArray ba = reply->readAll();
+        if ( ba.isNull() || !ba.length() )
+        {
+            tLog() << Q_FUNC_INFO << "Uh oh, null byte array";
+            emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+            return;
+        }
+        foreach ( const QUrl& url, m_badUrls )
+        {
+            if ( reply->url().toString().startsWith( url.toString() ) )
+                ba = QByteArray();
+        }
+        QVariantMap returnedData;
+        returnedData"imgbytes" = ba;
+        returnedData"url" = reply->url().toString();
+
+        Tomahawk::InfoSystem::InfoRequestData requestData = reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >();
+
+        emit info( requestData, returnedData );
+
+        Tomahawk::InfoSystem::InfoStringHash origData = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash>();
+        Tomahawk::InfoSystem::InfoStringHash criteria;
+        criteria"artist" = origData"artist";
+        emit updateCache( criteria, 2419200000, requestData.type, returnedData );
+    }
+    else
+    {
+        if ( !TomahawkUtils::nam() )
+        {
+            tLog() << Q_FUNC_INFO << "Uh oh, nam is null";
+            emit info( reply->property( "requestData" ).value< Tomahawk::InfoSystem::InfoRequestData >(), QVariant() );
+            return;
+        }
+        // Follow HTTP redirect
+        QNetworkRequest req( redir );
+        QNetworkReply* newReply = TomahawkUtils::nam()->get( req );
+        newReply->setProperty( "requestData", reply->property( "requestData" ) );
+        connect( newReply, SIGNAL( finished() ), SLOT( artistImagesReturned() ) );
+    }
+
+    reply->deleteLater();
+}
+
+
+void
+LastFmInfoPlugin::settingsChanged()
+{
+    if ( m_account.isNull() )
+        return;
+
+    if ( !m_scrobbler && m_account.data()->scrobble() )
+    { // can simply create the scrobbler
+        lastfm::ws::Username = m_account.data()->username();
+        m_pw = m_account.data()->password();
+
+        createScrobbler();
+    }
+    else if ( m_scrobbler && !m_account.data()->scrobble() )
+    {
+        delete m_scrobbler;
+        m_scrobbler = 0;
+    }
+    else if ( m_account.data()->username() != lastfm::ws::Username ||
+        m_account.data()->password() != m_pw )
+    {
+        qDebug() << "Last.fm credentials changed, re-creating scrobbler";
+        lastfm::ws::Username = m_account.data()->username();
+        m_pw = m_account.data()->password();
+        // credentials have changed, have to re-create scrobbler for them to take effect
+        if ( m_scrobbler )
+        {
+            delete m_scrobbler;
+            m_scrobbler = 0;
+        }
+
+        m_account.data()->setSessionKey( QString() );
+        createScrobbler();
+    }
+}
+
+
+void
+LastFmInfoPlugin::onAuthenticated()
+{
+    QNetworkReply* authJob = dynamic_cast<QNetworkReply*>( sender() );
+    if ( !authJob || m_account.isNull() )
+    {
+        tLog() << Q_FUNC_INFO << "Help! No longer got a last.fm auth job!";
+        return;
+    }
+
+    if ( authJob->error() == QNetworkReply::NoError )
+    {
+        lastfm::XmlQuery lfm;
+        lfm.parse( authJob->readAll() );
+
+        if ( lfm.children( "error" ).size() > 0 )
+        {
+            tLog() << "Error from authenticating with Last.fm service:" << lfm.text();
+            m_account.data()->setSessionKey( QByteArray() );
+        }
+        else
+        {
+            lastfm::ws::SessionKey = lfm "session"  "key" .text();
+
+            m_account.data()->setSessionKey( lastfm::ws::SessionKey.toLatin1() );
+
+//            qDebug() << "Got session key from last.fm";
+            if ( m_account.data()->scrobble() )
+                m_scrobbler = new lastfm::Audioscrobbler( "thk" );
+        }
+    }
+    else
+    {
+        tLog() << "Got error in Last.fm authentication job:" << authJob->errorString();
+    }
+
+    authJob->deleteLater();
+}
+
+
+void
+LastFmInfoPlugin::createScrobbler()
+{
+    if ( m_account.isNull() || lastfm::ws::Username.isEmpty() )
+        return;
+
+    if ( m_account.data()->sessionKey().isEmpty() ) // no session key, so get one
+    {
+        qDebug() << "LastFmInfoPlugin::createScrobbler Session key is empty";
+        QString authToken = TomahawkUtils::md5( ( lastfm::ws::Username.toLower() + TomahawkUtils::md5( m_pw.toUtf8() ) ).toUtf8() );
+
+        QMap<QString, QString> query;
+        query "method"  = "auth.getMobileSession";
+        query "username"  = lastfm::ws::Username;
+        query "authToken"  = authToken;
+        QNetworkReply* authJob = lastfm::ws::post( query );
+
+        connect( authJob, SIGNAL( finished() ), SLOT( onAuthenticated() ) );
+    }
+    else
+    {
+        qDebug() << "LastFmInfoPlugin::createScrobbler Already have session key";
+        lastfm::ws::SessionKey = m_account.data()->sessionKey();
+
+        m_scrobbler = new lastfm::Audioscrobbler( "thk" );
+    }
+}
+
+
+QList<lastfm::Track>
+LastFmInfoPlugin::parseTrackList( QNetworkReply* reply )
+{
+    QList<lastfm::Track> tracks;
+    try
+    {
+        lastfm::XmlQuery lfm;
+        lfm.parse( reply->readAll() );
+        foreach ( lastfm::XmlQuery xq, lfm.children( "track" ) )
+        {
+            tracks.append( lastfm::Track( xq ) );
+        }
+    }
+    catch ( lastfm::ws::ParseError& e )
+    {
+        qWarning() << e.message();
+    }
+
+    return tracks;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h Added

@@ -0,0 +1,102 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, 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 LASTFMPLUGIN_H
+#define LASTFMPLUGIN_H
+
+#include "infosystem/InfoSystem.h"
+#include "infosystem/InfoSystemWorker.h"
+#include "DllMacro.h"
+
+#include <lastfm/Track.h>
+#include <lastfm/Audioscrobbler.h>
+#include <lastfm/ScrobblePoint.h>
+
+#include <QObject>
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+    class LastFmAccount;
+}
+
+namespace InfoSystem
+{
+
+class DLLEXPORT LastFmInfoPlugin : public InfoPlugin
+{
+    Q_OBJECT
+
+public:
+    LastFmInfoPlugin( Accounts::LastFmAccount* account );
+    virtual ~LastFmInfoPlugin();
+
+public slots:
+    void settingsChanged();
+
+    void onAuthenticated();
+    void coverArtReturned();
+    void artistImagesReturned();
+    void similarArtistsReturned();
+    void topTracksReturned();
+    void chartReturned();
+    void similarTracksReturned();
+
+protected slots:
+    virtual void init();
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData );
+
+private:
+    void fetchCoverArt( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void fetchArtistImages( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void fetchSimilarArtists( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void fetchTopTracks( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void fetchChart( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void fetchChartCapabilities( Tomahawk::InfoSystem::InfoRequestData requestData );
+    void fetchSimilarTracks( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    void createScrobbler();
+    void nowPlaying( const QVariant &input );
+    void scrobble();
+    void sendLoveSong( const InfoType type, QVariant input );
+
+    void dataError( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    QWeakPointer< Accounts::LastFmAccount > m_account;
+    QList<lastfm::Track> parseTrackList( QNetworkReply * reply );
+
+    lastfm::MutableTrack m_track;
+    lastfm::Audioscrobbler* m_scrobbler;
+    QString m_pw;
+
+    QList< QUrl > m_badUrls;
+};
+
+}
+
+}
+
+#endif // LASTFMPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/spotify Added

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/spotify/SpotifyAccount.cpp Added

@@ -0,0 +1,1124 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *
+ *   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 "SpotifyAccount.h"
+#include "Playlist.h"
+#include "playlist/PlaylistUpdaterInterface.h"
+#include "SourceList.h"
+#include "SpotifyAccountConfig.h"
+#include "SpotifyPlaylistUpdater.h"
+#include "resolvers/ScriptResolver.h"
+#include "utils/TomahawkUtils.h"
+#include "ActionCollection.h"
+#include "Pipeline.h"
+#include "accounts/AccountManager.h"
+#include "utils/Closure.h"
+#include "SpotifyInfoPlugin.h"
+#include "infosystem/InfoSystem.h"
+
+#ifndef ENABLE_HEADLESS
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+#endif
+
+#include <QPixmap>
+#include <QAction>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMessageBox>
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+
+static QPixmap* s_icon = 0;
+
+#ifdef Q_OS_MAC
+static QString s_resolverId = "spotify-osx";
+#elif defined(Q_OS_WIN)
+static QString s_resolverId = "spotify-win";
+#elif defined(Q_OS_LINUX) && defined(__GNUC__) && defined(__x86_64__)
+static QString s_resolverId = "spotify-linux-x64";
+#elif defined(Q_OS_LINUX)
+static QString s_resolverId = "spotify-linux-x86";
+#else
+static QString s_resolverId = "spotify-unknown";
+#endif
+
+Account*
+SpotifyAccountFactory::createAccount( const QString& accountId )
+{
+    return new SpotifyAccount( accountId );
+}
+
+
+QPixmap
+SpotifyAccountFactory::icon() const
+{
+    if ( !s_icon )
+        s_icon = new QPixmap( RESPATH "images/spotify-logo.png" );
+
+    return *s_icon;
+}
+
+
+SpotifyAccount::SpotifyAccount( const QString& accountId )
+    : CustomAtticaAccount( accountId )
+    , m_preventEnabling( false )
+    , m_loggedIn( false )
+{
+    init();
+}
+
+
+SpotifyAccount::~SpotifyAccount()
+{
+    clearUser();
+
+    if ( m_spotifyResolver.isNull() )
+        return;
+
+    Pipeline::instance()->removeScriptResolver( m_spotifyResolver.data()->filePath() );
+    delete m_spotifyResolver.data();
+}
+
+
+void
+SpotifyAccount::init()
+{
+    setAccountFriendlyName( "Spotify" );
+    setAccountServiceName( "spotify" );
+
+    AtticaManager::instance()->registerCustomAccount( s_resolverId, this );
+    qRegisterMetaType< Tomahawk::Accounts::SpotifyPlaylistInfo* >( "Tomahawk::Accounts::SpotifyPlaylist*" );
+
+    if ( infoPlugin() && Tomahawk::InfoSystem::InfoSystem::instance()->workerThread() )
+    {
+        infoPlugin().data()->moveToThread( Tomahawk::InfoSystem::InfoSystem::instance()->workerThread().data() );
+        Tomahawk::InfoSystem::InfoSystem::instance()->addInfoPlugin( infoPlugin() );
+    }
+
+    if ( !AtticaManager::instance()->resolversLoaded() )
+    {
+        // If we're still waiting to load, wait for the attica resolvers to come down the pipe
+        connect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( delayedInit() ), Qt::UniqueConnection );
+    }
+    else
+    {
+        delayedInit();
+    }
+}
+
+
+void
+SpotifyAccount::delayedInit()
+{
+    connect( AtticaManager::instance(), SIGNAL( resolverInstalled( QString ) ), this, SLOT( resolverInstalled( QString ) ) );
+
+    const Attica::Content res = AtticaManager::instance()->resolverForId( s_resolverId );
+    const AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( res );
+
+    const QString path = configuration().value( "path" ).toString(); // Manual path override
+    if ( !checkForResolver() && state != AtticaManager::Uninstalled )
+    {
+        // If the user manually deleted the resolver, mark it as uninstalled, so we re-fetch for the user
+        QVariantHash conf = configuration();
+        conf.remove( "path" );
+        setConfiguration( conf );
+        sync();
+
+        AtticaManager::instance()->uninstallResolver( res );
+    }
+    else if ( state == AtticaManager::Installed || !path.isEmpty() )
+    {
+        if ( !path.isEmpty() )
+        {
+            QFileInfo info( path );
+            // Resolver was deleted, so abort and remove our manual override, as it's no longer valid
+            if ( !info.exists() )
+            {
+                QVariantHash conf = configuration();
+                conf.remove( "path" );
+                setConfiguration( conf );
+                sync();
+                return;
+            }
+        }
+        hookupResolver();
+    }
+}
+
+void
+SpotifyAccount::hookupResolver()
+{
+    // initialize the resolver itself. this is called if the account actually has an installed spotify resolver,
+    // as it might not.
+    // If there is a spotify resolver from attica installed, create the corresponding ExternalResolver* and hook up to it
+    QString path = configuration().value( "path" ).toString();
+    if ( path.isEmpty() )
+    {
+        const Attica::Content res = AtticaManager::instance()->resolverForId( s_resolverId );
+        const AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( res );
+        Q_ASSERT( state == AtticaManager::Installed );
+        Q_UNUSED( state );
+
+        const AtticaManager::Resolver data = AtticaManager::instance()->resolverData( res.id() );
+        path = data.scriptPath;
+    }
+
+    qDebug() << "Starting spotify resolver with path:" << path;
+    if ( !m_spotifyResolver.isNull() )
+    {
+        delete m_spotifyResolver.data();
+    }
+
+    if ( !QFile::exists( path ) )
+    {
+        qWarning() << "Asked to hook up spotify resolver but it doesn't exist, ignoring";
+        return;
+    }
+
+    // HACK
+    // Since the resolver in 0.4.x used an incompatible version of kdsingleappguard, we can't auto-kill old resolvers on the
+    // 0.4.x->0.5.x upgrade. So we do it manually for a while
+    killExistingResolvers();
+    m_spotifyResolver = QWeakPointer< ScriptResolver >( qobject_cast< ScriptResolver* >( Pipeline::instance()->addScriptResolver( path ) ) );
+
+    connect( m_spotifyResolver.data(), SIGNAL( changed() ), this, SLOT( resolverChanged() ) );
+    connect( m_spotifyResolver.data(), SIGNAL( customMessage( QString,QVariantMap ) ), this, SLOT( resolverMessage( QString, QVariantMap ) ) );
+
+    // Always get logged in status
+    QVariantMap msg;
+    msg "_msgtype"  = "getCredentials";
+    m_spotifyResolver.data()->sendMessage( msg );
+}
+
+
+void
+SpotifyAccount::killExistingResolvers()
+{
+    QProcess p;
+#if defined(Q_OS_UNIX)
+    const int ret = p.execute( "killall -9 spotify_tomahawkresolver" );
+    qDebug() << "Tried to killall -9 spotify_tomahawkresolver with return code:" << ret;
+#elif defined(Q_OS_WIN)
+    const int ret = p.execute( "taskkill.exe /F /im spotify_tomahawkresolver.exe" );
+    qDebug() << "Tried to taskkill.exe /F /im spotify_tomahawkresolver.exe with return code:" << ret;
+#endif
+}
+
+
+bool
+SpotifyAccount::checkForResolver()
+{
+#if defined(Q_OS_MAC)
+    const QDir path = QCoreApplication::applicationDirPath();
+    QFile file( path.absoluteFilePath( "spotify_tomahawkresolver" ) );
+    return file.exists();
+#elif defined(Q_OS_WIN)
+    QDir appDataDir = TomahawkUtils::appDataDir();
+    return appDataDir.exists( QString( "atticaresolvers/%1/spotify_tomahawkresolver.exe" ).arg( s_resolverId ) );
+#elif defined(Q_OS_LINUX)
+    QDir appDataDir = TomahawkUtils::appDataDir();
+    return appDataDir.exists( QString( "atticaresolvers/%1/spotify_tomahawkresolver" ).arg( s_resolverId ) );
+#endif
+
+    return false;
+}
+
+void
+SpotifyAccount::resolverChanged()
+{
+    emit connectionStateChanged( connectionState() );
+}
+
+
+Attica::Content
+SpotifyAccount::atticaContent() const
+{
+    return AtticaManager::instance()->resolverForId( s_resolverId );
+}
+
+
+void
+SpotifyAccount::authenticate()
+{
+    if ( !AtticaManager::instance()->resolversLoaded() )
+    {
+        // If we're still waiting to load, wait for the attica resolvers to come down the pipe
+        connect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( atticaLoaded( Attica::Content::List ) ), Qt::UniqueConnection );
+        return;
+    }
+
+    const Attica::Content res = AtticaManager::instance()->resolverForId( s_resolverId );
+    const AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( res );
+
+    qDebug() << "Spotify account authenticating...";
+
+    const QString path = configuration().value( "path" ).toString();
+    const QFileInfo info( path );
+    const bool manualResolverRemoved = !path.isEmpty() && !info.exists();
+
+    if ( m_spotifyResolver.isNull() && state == AtticaManager::Installed )
+    {
+        // We don;t have the resolver but it has been installed via attica already, so lets just turn it on
+        qDebug() << "No valid spotify resolver running, but attica reports it is installed, so start it up";
+        hookupResolver();
+    }
+    else if ( m_spotifyResolver.isNull() || manualResolverRemoved )
+    {
+        qDebug() << "Got null resolver but asked to authenticate, so installing if we have one from attica:" << res.isValid() << res.id();
+        if ( res.isValid() && !res.id().isEmpty() )
+            AtticaManager::instance()->installResolver( res, false );
+        else
+        {
+#ifdef Q_OS_LINUX
+            m_preventEnabling = true;
+#endif
+        }
+    }
+    else if ( !m_spotifyResolver.data()->running() )
+    {
+        qDebug() << "Spotify resolver exists but stopped, starting";
+        m_spotifyResolver.data()->start();
+    }
+    else
+    {
+        qDebug() << "Spotify resolver exists and is running, ignore authentication attempt";
+    }
+
+    emit connectionStateChanged( connectionState() );
+}
+
+
+void
+SpotifyAccount::deauthenticate()
+{
+    if ( !m_spotifyResolver.isNull() && m_spotifyResolver.data()->running() )
+        m_spotifyResolver.data()->stop();
+
+    emit connectionStateChanged( connectionState() );
+}
+
+
+bool
+SpotifyAccount::isAuthenticated() const
+{
+    return !m_spotifyResolver.isNull() && m_spotifyResolver.data()->running();
+}
+
+
+Account::ConnectionState
+SpotifyAccount::connectionState() const
+{
+    return (!m_spotifyResolver.isNull() && m_spotifyResolver.data()->running()) ? Account::Connected : Account::Disconnected;
+}
+
+
+InfoSystem::InfoPluginPtr
+SpotifyAccount::infoPlugin()
+{
+    if ( m_infoPlugin.isNull() )
+    {
+        m_infoPlugin = QWeakPointer< InfoSystem::SpotifyInfoPlugin >( new InfoSystem::SpotifyInfoPlugin( this ) );
+    }
+
+    return InfoSystem::InfoPluginPtr( m_infoPlugin.data() );
+}
+
+
+void
+SpotifyAccount::resolverInstalled(const QString& resolverId)
+{
+    if ( resolverId == s_resolverId )
+    {
+        // We requested this install, so we want to launch it
+        hookupResolver();
+
+        if ( enabled() )
+            authenticate();
+        else
+            AccountManager::instance()->enableAccount( this );
+    }
+}
+
+
+void
+SpotifyAccount::atticaLoaded( Attica::Content::List )
+{
+    disconnect( AtticaManager::instance(), SIGNAL( resolversLoaded( Attica::Content::List ) ), this, SLOT( atticaLoaded( Attica::Content::List ) ) );
+    authenticate();
+}
+
+
+void
+SpotifyAccount::setManualResolverPath( const QString &resolverPath )
+{
+    Q_ASSERT( !resolverPath.isEmpty() );
+
+    QVariantHash conf = configuration();
+    conf "path"  = resolverPath;
+    setConfiguration( conf );
+    sync();
+
+    // uninstall
+    const Attica::Content res = AtticaManager::instance()->resolverForId( s_resolverId );
+    if ( AtticaManager::instance()->resolverState( res ) != AtticaManager::Uninstalled )
+        AtticaManager::instance()->uninstallResolver( res );
+
+    m_preventEnabling = false;
+
+    if ( !m_spotifyResolver.isNull() )
+    {
+        // replace
+        AccountManager::instance()->disableAccount( this );
+        NewClosure( m_spotifyResolver.data(), SIGNAL( destroyed() ), this, SLOT( hookupAfterDeletion( bool ) ), true );
+        m_spotifyResolver.data()->deleteLater();
+    }
+    else
+    {
+        hookupResolver();
+        AccountManager::instance()->enableAccount( this );
+    }
+}
+
+
+bool
+SpotifyAccount::loggedIn() const
+{
+    return m_loggedIn;
+}
+
+
+void
+SpotifyAccount::hookupAfterDeletion( bool autoEnable )
+{
+    hookupResolver();
+    if ( autoEnable )
+        AccountManager::instance()->enableAccount( this );
+}
+
+
+void
+SpotifyAccount::aboutToShow( QAction* action, const playlist_ptr& playlist )
+{
+    if ( !m_customActions.contains( action ) )
+        return;
+
+    // If it's not being synced, allow the option to sync
+    bool found = false;
+    bool manuallyDisabled = false;
+    QList<PlaylistUpdaterInterface*> updaters = playlist->updaters();
+    foreach ( PlaylistUpdaterInterface* updater, updaters )
+    {
+        if ( SpotifyPlaylistUpdater* spotifyUpdater = qobject_cast< SpotifyPlaylistUpdater* >( updater ) )
+        {
+            found = true;
+            if ( !spotifyUpdater->sync() )
+                manuallyDisabled = true;
+
+        }
+    }
+
+    if ( !found )
+    {
+        action->setText( tr( "Sync with Spotify" ) );
+    }
+    else if ( manuallyDisabled )
+    {
+        action->setText( tr( "Re-enable syncing with Spotify" ) );
+    }
+    else
+    {
+        action->setText( tr( "Stop syncing with Spotify" ) );
+    }
+}
+
+
+void
+SpotifyAccount::syncActionTriggered( bool checked )
+{
+    Q_UNUSED( checked );
+    QAction* action = qobject_cast< QAction* >( sender() );
+
+    if ( !action || !m_customActions.contains( action ) )
+        return;
+
+    const playlist_ptr playlist = action->property( "payload" ).value< playlist_ptr >();
+    if ( playlist.isNull() )
+    {
+        qWarning() << "Got context menu spotify sync action triggered, but invalid playlist payload!";
+        Q_ASSERT( false );
+        return;
+    }
+
+    SpotifyPlaylistUpdater* updater = 0;
+    QList<PlaylistUpdaterInterface*> updaters = playlist->updaters();
+    foreach ( PlaylistUpdaterInterface* u, updaters )
+    {
+        if ( SpotifyPlaylistUpdater* spotifyUpdater = qobject_cast< SpotifyPlaylistUpdater* >( u ) )
+        {
+            updater = spotifyUpdater;
+        }
+    }
+
+    if ( !updater )
+    {
+        QVariantMap msg;
+        msg "_msgtype"  = "createPlaylist";
+        msg "sync"  = true;
+        msg "title"  = playlist->title();
+
+        QList< query_ptr > queries;
+        foreach ( const plentry_ptr& ple, playlist->entries() )
+            queries << ple->query();
+        QVariantList tracks = SpotifyPlaylistUpdater::queriesToVariant( queries );
+        msg "tracks"  = tracks;
+
+        const QString qid = sendMessage( msg, this, "playlistCreated" );
+        m_waitingForCreateReply qid  = playlist;
+    }
+    else
+    {
+        SpotifyPlaylistInfo* info = 0;
+        foreach ( SpotifyPlaylistInfo* ifo, m_allSpotifyPlaylists )
+        {
+            if ( ifo->plid == updater->spotifyId() )
+            {
+                info = ifo;
+                break;
+            }
+        }
+
+        Q_ASSERT( info );
+        if ( info )
+            info->sync = !updater->sync();
+
+        if ( m_configWidget.data() )
+            m_configWidget.data()->setPlaylists( m_allSpotifyPlaylists );
+
+        if ( !updater->sync() )
+        {
+            startPlaylistSync( info );
+        }
+        else
+        {
+            stopPlaylistSync( info, true );
+        }
+    }
+}
+
+
+void
+SpotifyAccount::resolverMessage( const QString &msgType, const QVariantMap &msg )
+{
+    if ( msgType == "credentials" )
+    {
+        QVariantHash creds = credentials();
+
+        creds "username"  = msg.value( "username" );
+        creds "password"  = msg.value( "password" );
+        creds "highQuality"  = msg.value( "highQuality" );
+        setCredentials( creds );
+
+        m_loggedIn = msg.value( "loggedIn", false ).toBool();
+        if ( m_loggedIn )
+        {
+            configurationWidget();
+
+            if ( !m_configWidget.isNull() )
+                m_configWidget.data()->loginResponse( true, QString(), creds "username" .toString() );
+        }
+
+        qDebug() << "Set creds:" << creds.value( "username" ) << creds.value( "password" ) << msg.value( "username" ) << msg.value( "password" );
+
+        QVariantHash config = configuration();
+        config "hasMigrated"  = true;
+        setConfiguration( config );
+        sync();
+
+        return;
+    }
+
+
+    const QString qid = msg.value( "qid" ).toString();
+    if ( m_qidToSlotMap.contains( qid ) )
+    {
+        QObject* receiver = m_qidToSlotMap qid .first;
+        QString slot = m_qidToSlotMap qid .second;
+        m_qidToSlotMap.remove( qid );
+        
+        QVariant extraData;
+        if ( m_qidToExtraData.contains( qid ) )
+            extraData = m_qidToExtraData.take( qid );
+
+        QMetaObject::invokeMethod( receiver, slot.toLatin1(), Q_ARG( QString, msgType ), Q_ARG( QVariantMap, msg ), Q_ARG( QVariant, extraData ) );
+    }
+    else if ( msgType == "allPlaylists" )
+    {
+        const QVariantList playlists = msg.value( "playlists" ).toList();
+        qDeleteAll( m_allSpotifyPlaylists );
+        m_allSpotifyPlaylists.clear();
+
+        foreach ( const QVariant& playlist, playlists )
+        {
+            const QVariantMap plMap = playlist.toMap();
+            const QString name = plMap.value( "name" ).toString();
+            const QString plid = plMap.value( "id" ).toString();
+            const QString revid = plMap.value( "revid" ).toString();
+            const bool sync = plMap.value( "sync" ).toBool();
+
+            if ( name.isNull() || plid.isNull() || revid.isNull() )
+            {
+                qDebug() << "Did not get name and plid and revid for spotify playlist:" << name << plid << revid << plMap;
+                continue;
+            }
+            m_allSpotifyPlaylists << new SpotifyPlaylistInfo( name, plid, revid, sync );
+        }
+
+        if ( !m_configWidget.isNull() )
+        {
+            m_configWidget.data()->setPlaylists( m_allSpotifyPlaylists );
+        }
+    }
+    else if ( msgType == "tracksAdded" )
+    {
+        const QString plid = msg.value( "playlistid" ).toString();
+        // We should already be syncing this playlist if we get updates for it
+//         Q_ASSERT( m_updaters.contains( plid ) );
+
+        if ( !m_updaters.contains( plid ) )
+            return;
+
+        SpotifyPlaylistUpdater* updater = m_updaters plid ;
+        Q_ASSERT( updater->sync() );
+
+        const QString startPos = msg.value( "startPosition" ).toString();
+        const QVariantList tracksList = msg.value( "tracks" ).toList();
+        const QString newRev = msg.value( "revid" ).toString();
+        const QString oldRev = msg.value( "oldRev" ).toString();
+
+        updater->spotifyTracksAdded( tracksList, startPos, newRev, oldRev  );
+    }
+    else if ( msgType == "tracksRemoved" )
+    {
+        const QString plid = msg.value( "playlistid" ).toString();
+        // We should already be syncing this playlist if we get updates for it
+//         Q_ASSERT( m_updaters.contains( plid ) );
+
+        if ( !m_updaters.contains( plid ) )
+            return;
+
+        SpotifyPlaylistUpdater* updater = m_updaters plid ;
+
+        // If we're not syncing with this, the resolver is quite misinformed.
+//         Q_ASSERT( updater && updater->sync() );
+        if ( !updater || !updater->sync() )
+            return;
+
+        const QVariantList tracksList = msg.value( "trackPositions" ).toList();
+        const QString newRev = msg.value( "revid" ).toString();
+        const QString oldRev = msg.value( "oldRev" ).toString();
+
+
+        updater->spotifyTracksRemoved( tracksList, newRev, oldRev );
+    }
+    else if ( msgType == "tracksMoved" )
+    {
+        const QString plid = msg.value( "playlistid" ).toString();
+        // We should already be syncing this playlist if we get updates for it
+        Q_ASSERT( m_updaters.contains( plid ) );
+
+        if ( !m_updaters.contains( plid ) )
+            return;
+
+        SpotifyPlaylistUpdater* updater = m_updaters plid ;
+        Q_ASSERT( updater->sync() );
+
+        const QString newStartPos = msg.value( "newStartPosition" ).toString();
+        const QVariantList tracksList = msg.value( "tracks" ).toList();
+        const QString newRev = msg.value( "revid" ).toString();
+        const QString oldRev = msg.value( "oldRev" ).toString();
+
+        updater->spotifyTracksMoved( tracksList, newStartPos, newRev, oldRev  );
+    }
+    else if( msgType == "playlistRenamed" )
+    {
+        const QString plid = msg.value( "id" ).toString();
+        // We should already be syncing this playlist if we get updates for it
+        //Q_ASSERT( m_updaters.contains( plid ) );
+
+        qDebug() << Q_FUNC_INFO;
+        if ( !m_updaters.contains( plid ) )
+            return;
+
+        SpotifyPlaylistUpdater* updater = m_updaters plid ;
+        Q_ASSERT( updater->sync() );
+
+        qDebug() << "Playlist renamed fetched in tomahawk";
+        const QString title = msg.value( "name" ).toString();
+        const QString newRev = msg.value( "revid" ).toString();
+        const QString oldRev = msg.value( "oldRev" ).toString();
+
+        updater->spotifyPlaylistRenamed( title, newRev, oldRev  );
+    }
+    else if( msgType == "spotifyError" )
+    {
+        const QString error = msg.value( "msg" ).toString();
+        if( error.isEmpty() )
+            return;
+
+        if( msg.value( "isDebugMsg" ).toBool() )
+            tDebug( LOGVERBOSE ) << "SpotifyResolverError: " << error;
+        else
+            JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( QString( "Spotify: %1" ).arg( error ) ) );
+    }
+    else if( msgType == "userChanged" )
+    {
+        const QString rmsg = msg.value( "msg" ).toString();
+        clearUser( true );
+
+        if ( m_configWidget.data() )
+            m_configWidget.data()->setPlaylists( QList< SpotifyPlaylistInfo* >() );
+
+        qDebug() << "User changed message from spotify:" << rmsg;
+    }
+    else if ( msgType == "loginResponse" )
+    {
+        QVariantHash creds = credentials();
+        creds "username"  = msg.value( "username" ).toString();
+        creds "password"  = msg.value( "password" ).toString();
+        creds "highQuality"  = msg.value( "highQuality" ).toString();
+        setCredentials( creds );
+        sync();
+
+        const bool success = msg.value( "success" ).toBool();
+
+        m_loggedIn = success;
+
+        if ( success )
+            createActions();
+
+        configurationWidget(); // ensure it's created so we can set the login button
+        if ( m_configWidget.data() )
+        {
+            const QString message = msg.value( "message" ).toString();
+            m_configWidget.data()->loginResponse( success, message, creds "username" .toString() );
+        }
+    }
+    else if ( msgType == "playlistDeleted" )
+    {
+        const QString plid = msg.value( "playlistid" ).toString();
+
+        if ( !m_updaters.contains( plid ) )
+            return;
+
+        SpotifyPlaylistUpdater* updater = m_updaters.take( plid );
+        updater->remove( false );
+    }
+    else if ( msgType == "status" )
+    {
+        const bool loggedIn = msg.value( "loggedIn" ).toBool();
+        const QString username = msg.value( "username" ).toString();
+
+        qDebug() << "Got status message with login info:" << loggedIn << username;
+
+        if ( !loggedIn || username.isEmpty() || credentials().value( "username").toString() != username )
+            m_loggedIn = false;
+
+        QVariantMap msg;
+        msg "_msgtype"  = "status";
+        msg "_status"  = 1;
+        sendMessage( msg );
+
+        return;
+    }
+}
+
+
+void
+SpotifyAccount::clearUser( bool permanentlyDelete )
+{
+    foreach( SpotifyPlaylistUpdater* updater, m_updaters.values() )
+    {
+        if ( permanentlyDelete )
+            updater->remove( false );
+        else
+            updater->deleteLater();
+    }
+
+    m_updaters.clear();
+
+    qDeleteAll( m_allSpotifyPlaylists );
+    m_allSpotifyPlaylists.clear();
+
+    m_qidToSlotMap.clear();
+    m_waitingForCreateReply.clear();
+
+    removeActions();
+}
+
+
+QPixmap
+SpotifyAccount::icon() const
+{
+    if ( !s_icon )
+        s_icon = new QPixmap( RESPATH "images/spotify-logo.png" );
+
+    return *s_icon;
+}
+
+
+QWidget*
+SpotifyAccount::configurationWidget()
+{
+    if ( m_configWidget.isNull() )
+    {
+        m_configWidget = QWeakPointer< SpotifyAccountConfig >( new SpotifyAccountConfig( this ) );
+        connect( m_configWidget.data(), SIGNAL( login( QString,QString ) ), this, SLOT( login( QString,QString ) ) );
+        connect( m_configWidget.data(), SIGNAL( logout() ), this, SLOT( logout() ) );
+        m_configWidget.data()->setPlaylists( m_allSpotifyPlaylists );
+    }
+
+    if ( m_spotifyResolver.isNull() || !m_spotifyResolver.data()->running() )
+        return 0;
+
+    return static_cast< QWidget* >( m_configWidget.data() );
+}
+
+
+QWidget*
+SpotifyAccount::aboutWidget()
+{
+    if ( m_aboutWidget.isNull() )
+    {
+        QWidget* w = new QWidget();
+        w->hide();
+
+        QHBoxLayout* l = new QHBoxLayout( w );
+        QLabel* pm = new QLabel( w );
+        pm->setPixmap( QPixmap( RESPATH "images/spotifycore-logo" ) );
+        QLabel* text = new QLabel( "This product uses SPOTIFY(R) CORE but is not endorsed, certified or otherwise approved in any way by Spotify. Spotify is the registered trade mark of the Spotify Group.", w );
+        text->setWordWrap( true );
+        l->addWidget( pm );
+        l->addWidget( text );
+        w->setLayout( l );
+        m_aboutWidget = QWeakPointer< QWidget >( w );
+    }
+
+    return m_aboutWidget.data();
+}
+
+
+void
+SpotifyAccount::saveConfig()
+{
+    Q_ASSERT( !m_configWidget.isNull() );
+    if ( m_configWidget.isNull() )
+        return;
+
+    QVariantHash creds = credentials();
+    if ( creds.value( "username" ).toString() != m_configWidget.data()->username() ||
+         creds.value( "password" ).toString() != m_configWidget.data()->password() ||
+         creds.value( "highQuality" ).toBool() != m_configWidget.data()->highQuality() )
+    {
+        creds "username"  = m_configWidget.data()->username();
+        creds "password"  = m_configWidget.data()->password();
+        creds "highQuality"  = m_configWidget.data()->highQuality();
+        setCredentials( creds );
+
+    }
+
+    QVariantHash config = configuration();
+    config "deleteOnUnsync"  = m_configWidget.data()->deleteOnUnsync();
+    setConfiguration( config );
+
+    m_configWidget.data()->saveSettings();
+    foreach ( SpotifyPlaylistInfo* pl, m_allSpotifyPlaylists )
+    {
+//        qDebug() << "Checking changed state:" << pl->changed << pl->name << pl->sync;
+        if ( pl->changed )
+        {
+            pl->changed = false;
+            if ( pl->sync )
+            {
+                // Fetch full playlist contents, then begin the sync
+                startPlaylistSync( pl );
+            }
+            else
+                stopPlaylistSync( pl );
+        }
+    }
+    sync();
+
+    if ( !m_configWidget.data()->loggedInManually() && !m_configWidget.data()->username().isEmpty() && !m_configWidget.data()->password().isEmpty() )
+    {
+        // If the user never pressed log in, he might have just pressed ok or hit enter. So log in anyway
+        login( m_configWidget.data()->username(), m_configWidget.data()->password() );
+    }
+}
+
+
+void
+SpotifyAccount::login( const QString& username, const QString& password )
+{
+    QVariantMap msg;
+    msg "_msgtype"  = "login";
+    msg "username"  = username;
+    msg "password"  = password;
+
+    msg "highQuality"  = m_configWidget.data()->highQuality();
+
+    m_spotifyResolver.data()->sendMessage( msg );
+}
+
+
+void
+SpotifyAccount::logout()
+{
+    QVariantMap msg;
+    msg "_msgtype"  = "logout";
+    m_spotifyResolver.data()->sendMessage( msg );
+}
+
+
+void
+SpotifyAccount::startPlaylistSync( SpotifyPlaylistInfo* playlist )
+{
+    if ( !playlist )
+        return;
+
+    QVariantMap msg;
+    msg "_msgtype"  = "getPlaylist";
+    msg "playlistid"  = playlist->plid;
+    msg "sync"  = playlist->sync;
+
+    sendMessage( msg, this, "startPlaylistSyncWithPlaylist" );
+}
+
+
+void
+SpotifyAccount::startPlaylistSyncWithPlaylist( const QString& msgType, const QVariantMap& msg, const QVariant& )
+{
+    Q_UNUSED( msgType );
+    qDebug() << Q_FUNC_INFO <<  "Got full spotify playlist body, creating a tomahawk playlist and enabling sync!!";
+    const QString id = msg.value( "id" ).toString();
+    const QString name = msg.value( "name" ).toString();
+    const QString revid = msg.value( "revid" ).toString();
+
+    qDebug() << "Starting sync with pl:" << id << name;
+    QVariantList tracks = msg.value( "tracks" ).toList();
+
+    // create a list of query/plentries directly
+    QList< query_ptr > queries = SpotifyPlaylistUpdater::variantToQueries( tracks );
+
+    /**
+     * Begin syncing a playlist. Two options:
+     * 1) This is a playlist that has never been synced to tomahawk. Create a new one
+     *    and attach a new SpotifyPlaylistUpdater to it
+     * 2) This was previously synced, and has since been unsynced. THe playlist is still around
+     *    with an inactive SpotifyPlaylistUpdater, so just enable it and bring it up to date by merging current with new
+     *    TODO: show a warning( "Do you want to overwrite with spotify's version?" )
+     */
+    if ( m_updaters.contains( id ) )
+    {
+        //Q_ASSERT( m_updaters id ->sync() == false ); /// Should have been unchecked/off before, but might not be if the user
+        // changed spotify resolver meanwhile, so allow it for now
+        m_updaters id ->setSync( true );
+//         m_updaters id ->
+        // TODO
+    }
+    else
+    {
+        playlist_ptr plPtr = Tomahawk::Playlist::create( SourceList::instance()->getLocal(),
+                                                        uuid(),
+                                                        name,
+                                                        QString(),
+                                                        QString(),
+                                                        false,
+                                                        queries );
+
+        SpotifyPlaylistUpdater* updater = new SpotifyPlaylistUpdater( this, revid, id, plPtr );
+        updater->setSync( true );
+        m_updaters id  = updater;
+    }
+}
+
+
+void
+SpotifyAccount::playlistCreated( const QString& msgType, const QVariantMap& msg, const QVariant& )
+{
+    Q_UNUSED( msgType );
+
+    qDebug() << Q_FUNC_INFO << "Got response from our createPlaylist command, now creating updater and attaching";
+    const bool success = msg.value( "success" ).toBool();
+
+    if ( !success )
+    {
+        qWarning() << "Got FAILED return code from spotify resolver createPlaylist command, aborting sync";
+        return;
+    }
+
+    const QString id = msg.value( "playlistid" ).toString();
+    const QString revid = msg.value( "playlistid" ).toString();
+    const QString qid = msg.value( "qid" ).toString();
+
+    if ( !m_waitingForCreateReply.contains( qid ) )
+    {
+        qWarning() << "Got a createPlaylist reply for a playlist/qid we were not waiting for :-/ " << qid << m_waitingForCreateReply;
+        return;
+    }
+
+    playlist_ptr playlist = m_waitingForCreateReply.take( qid );
+    SpotifyPlaylistUpdater* updater = new SpotifyPlaylistUpdater( this, revid, id, playlist );
+    updater->setSync( true );
+    m_updaters id  = updater;
+}
+
+
+QString
+SpotifyAccount::sendMessage( const QVariantMap &m, QObject* obj, const QString& slot, const QVariant& extraData )
+{
+    QVariantMap msg = m;
+    const QString qid = uuid();
+
+    if ( obj )
+    {
+        m_qidToSlotMap qid  = qMakePair( obj, slot );
+        msg "qid"  = qid;
+
+    }
+
+    m_qidToExtraData qid  = extraData;
+    
+    m_spotifyResolver.data()->sendMessage( msg );
+
+    return qid;
+}
+
+
+void
+SpotifyAccount::registerUpdaterForPlaylist( const QString& plId, SpotifyPlaylistUpdater* updater )
+{
+    m_updaters plId  = updater;
+}
+
+
+void
+SpotifyAccount::unregisterUpdater( const QString& plid )
+{
+    m_updaters.remove( plid );
+}
+
+
+void
+SpotifyAccount::fetchFullPlaylist( SpotifyPlaylistInfo* playlist )
+{
+    Q_UNUSED( playlist );
+}
+
+
+bool
+SpotifyAccount::deleteOnUnsync() const
+{
+    return configuration().value( "deleteOnUnsync", false ).toBool();
+}
+
+void
+SpotifyAccount::stopPlaylistSync( SpotifyPlaylistInfo* playlist, bool forceDontDelete )
+{
+    if ( !playlist )
+        return;
+
+    QVariantMap msg;
+    msg "_msgtype"  = "removeFromSyncList";
+    msg "playlistid"  = playlist->plid;
+
+    m_spotifyResolver.data()->sendMessage( msg );
+
+    if ( m_updaters.contains( playlist->plid ) )
+    {
+        SpotifyPlaylistUpdater* updater = m_updaters playlist->plid ;
+        updater->setSync( false );
+
+        if ( deleteOnUnsync() && !forceDontDelete )
+        {
+            playlist_ptr tomahawkPl = updater->playlist();
+
+            if ( !tomahawkPl.isNull() )
+                Playlist::remove( tomahawkPl );
+
+            updater->deleteLater();
+
+        }
+
+        updater->save();
+    }
+}
+
+
+
+void
+SpotifyAccount::loadPlaylists()
+{
+    // TODO cache this and only get changed?
+    QVariantMap msg;
+    msg "_msgtype"  = "getAllPlaylists";
+    sendMessage( msg, this, "allPlaylistsLoaded" );
+}
+
+
+void
+SpotifyAccount::setSyncForPlaylist( const QString& spotifyPlaylistId, bool sync )
+{
+    foreach ( SpotifyPlaylistInfo* info, m_allSpotifyPlaylists )
+    {
+        if( info->plid == spotifyPlaylistId )
+            info->sync = sync;
+    }
+
+    if ( !m_configWidget.isNull() )
+        m_configWidget.data()->setPlaylists( m_allSpotifyPlaylists );
+}
+
+
+void
+SpotifyAccount::createActions()
+{
+    if ( !m_customActions.isEmpty() )
+        return;
+
+    QAction* action = new QAction( 0 );
+    action->setIcon( QIcon( RESPATH "images/spotify-logo.png" ) );
+    connect( action, SIGNAL( triggered( bool ) ), this, SLOT( syncActionTriggered( bool ) ) );
+    ActionCollection::instance()->addAction( ActionCollection::LocalPlaylists, action, this );
+    m_customActions.append( action );
+}
+
+
+void
+SpotifyAccount::removeActions()
+{
+    foreach( QAction* action, m_customActions )
+        ActionCollection::instance()->removeAction( action );
+
+    m_customActions.clear();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/spotify/SpotifyAccount.h Added

@@ -0,0 +1,179 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *
+ *   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 SpotifyAccount_H
+#define SpotifyAccount_H
+
+#include "accounts/ResolverAccount.h"
+#include "SourceList.h"
+#include "AtticaManager.h"
+#include "Playlist.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/SmartPointerList.h"
+#include "DllMacro.h"
+
+class QAction;
+class SpotifyPlaylistUpdater;
+class QTimer;
+
+class ScriptResolver;
+
+namespace Tomahawk {
+
+namespace InfoSystem
+{
+    class SpotifyInfoPlugin;
+}
+
+namespace Accounts {
+
+class SpotifyAccountConfig;
+
+// metadata for a playlist
+struct SpotifyPlaylistInfo {
+    QString name, plid, revid;
+    bool sync, changed;
+
+
+    SpotifyPlaylistInfo( const QString& nname, const QString& pid, const QString& rrevid, bool ssync )
+        : name( nname ), plid( pid ), revid( rrevid ), sync( ssync ), changed( false ) {}
+
+    SpotifyPlaylistInfo() : sync( false ), changed( false ) {}
+};
+
+
+class DLLEXPORT SpotifyAccountFactory : public AccountFactory
+{
+    Q_OBJECT
+public:
+    SpotifyAccountFactory() {}
+
+    virtual Account* createAccount( const QString& accountId = QString() );
+    virtual QString description() const { return tr( "Play music from and sync your playlists with Spotify Premium" ); }
+    virtual QString factoryId() const { return "spotifyaccount"; }
+    virtual QString prettyName() const { return "Spotify"; }
+
+    virtual AccountTypes types() const { return AccountTypes( ResolverType ); }
+    virtual bool allowUserCreation() const { return false; }
+    virtual QPixmap icon() const;
+    virtual bool isUnique() const { return true; }
+
+};
+
+class DLLEXPORT SpotifyAccount : public CustomAtticaAccount
+{
+    Q_OBJECT
+public:
+    SpotifyAccount( const QString& accountId );
+    SpotifyAccount( const QString& accountId, const QString& path );
+    virtual ~SpotifyAccount();
+
+    virtual QPixmap icon() const;
+    virtual QWidget* configurationWidget();
+    virtual QWidget* aboutWidget();
+    virtual void saveConfig();
+    virtual Attica::Content atticaContent() const;
+    virtual void authenticate();
+    virtual ConnectionState connectionState() const;
+    virtual bool isAuthenticated() const;
+    virtual void deauthenticate();
+
+    virtual QWidget* aclWidget() { return 0; }
+    virtual Tomahawk::InfoSystem::InfoPluginPtr infoPlugin();
+    virtual SipPlugin* sipPlugin() { return 0; }
+    virtual bool preventEnabling() const { return m_preventEnabling; }
+
+
+    void registerUpdaterForPlaylist( const QString& plId, SpotifyPlaylistUpdater* updater );
+    void unregisterUpdater( const QString& plid );
+
+    bool deleteOnUnsync() const;
+
+    void setManualResolverPath( const QString& resolverPath );
+
+    bool loggedIn() const;
+
+public slots:
+    QString sendMessage( const QVariantMap& msg, QObject* receiver = 0, const QString& slot = QString(), const QVariant& extraData = QVariant() );
+    
+    void aboutToShow( QAction* action, const Tomahawk::playlist_ptr& playlist );
+    void syncActionTriggered( bool );
+    void atticaLoaded(Attica::Content::List);
+
+private slots:
+    void resolverChanged();
+    void resolverInstalled( const QString& resolverId );
+
+    void resolverMessage( const QString& msgType, const QVariantMap& msg );
+
+    void login( const QString& username, const QString& password );
+    void logout();
+
+    // SpotifyResolver message handlers, all take msgtype, msg as argument
+  //  void <here>( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
+    void startPlaylistSyncWithPlaylist( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
+    void playlistCreated( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
+
+    void delayedInit();
+    void hookupAfterDeletion( bool autoEnable );
+
+private:
+    void init();
+    bool checkForResolver();
+    void hookupResolver();
+    void killExistingResolvers();
+
+    void loadPlaylists();
+    void clearUser( bool permanentlyDelete = false );
+
+    void startPlaylistSync( SpotifyPlaylistInfo* playlist );
+    void stopPlaylistSync( SpotifyPlaylistInfo* playlist, bool forceDontDelete = false );
+    void fetchFullPlaylist( SpotifyPlaylistInfo* playlist );
+
+    void setSyncForPlaylist( const QString& spotifyPlaylistId, bool sync  );
+
+    void createActions();
+    void removeActions();
+
+    QWeakPointer<SpotifyAccountConfig> m_configWidget;
+    QWeakPointer<QWidget> m_aboutWidget;
+    QWeakPointer<ScriptResolver> m_spotifyResolver;
+    QWeakPointer< InfoSystem::SpotifyInfoPlugin > m_infoPlugin;
+
+    QMap<QString, QPair<QObject*, QString> > m_qidToSlotMap;
+    QMap<QString, QVariant > m_qidToExtraData;
+
+    // List of synced spotify playlists in config UI
+    QList< SpotifyPlaylistInfo* > m_allSpotifyPlaylists;
+    QHash< QString, SpotifyPlaylistUpdater* > m_updaters;
+
+    QHash< QString, playlist_ptr > m_waitingForCreateReply;
+
+    bool m_preventEnabling, m_loggedIn;
+
+    SmartPointerList< QAction > m_customActions;
+    friend class ::SpotifyPlaylistUpdater;
+};
+
+}
+}
+
+Q_DECLARE_METATYPE( Tomahawk::Accounts::SpotifyPlaylistInfo* )
+
+#endif // SpotifyAccount_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/spotify/SpotifyAccountConfig.cpp Added

@@ -0,0 +1,244 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, 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 "SpotifyAccountConfig.h"
+
+#include "SpotifyAccount.h"
+#include "utils/AnimatedSpinner.h"
+#include "ui_SpotifyAccountConfig.h"
+
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QShowEvent>
+#include <QLabel>
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+SpotifyAccountConfig::SpotifyAccountConfig( SpotifyAccount *account )
+    : QWidget( 0 )
+    , m_ui( new Ui::SpotifyConfig )
+    , m_loggedInUser( 0 )
+    , m_account( account )
+    , m_playlistsLoading( 0 )
+    , m_loggedInManually( false )
+    , m_isLoggedIn( false )
+{
+    m_ui->setupUi( this );
+
+    m_ui->loginButton->setDefault( true );
+
+    connect( m_ui->loginButton, SIGNAL( clicked( bool ) ), this, SLOT( doLogin() ) );
+
+    connect( m_ui->usernameEdit, SIGNAL( textEdited( QString ) ), this, SLOT( resetLoginButton() ) );
+    connect( m_ui->passwordEdit, SIGNAL( textEdited( QString ) ), this, SLOT( resetLoginButton() ) );
+    loadFromConfig();
+
+    m_playlistsLoading = new AnimatedSpinner( m_ui->playlistList );
+}
+
+
+void
+SpotifyAccountConfig::showEvent( QShowEvent *event )
+{
+    Q_UNUSED( event );
+
+    loadFromConfig();
+    m_loggedInManually = false;
+}
+
+
+void
+SpotifyAccountConfig::loadFromConfig()
+{
+    const QString username = m_account->credentials().value( "username" ).toString();
+    m_ui->usernameEdit->setText( username );
+    m_ui->passwordEdit->setText( m_account->credentials().value( "password" ).toString() );
+    m_ui->streamingCheckbox->setChecked( m_account->credentials().value( "highQuality" ).toBool() );
+    m_ui->deleteOnUnsync->setChecked( m_account->deleteOnUnsync() );
+
+    if ( m_account->loggedIn() )
+    {
+        qDebug() << "Loading spotify config widget with logged in username:" << username;
+        if ( !username.isEmpty() )
+            m_verifiedUsername = username;
+        showLoggedIn();
+    }
+    else
+        showLoggedOut();
+}
+
+void
+SpotifyAccountConfig::saveSettings()
+{
+    for( int i = 0; i < m_ui->playlistList->count(); i++ )
+    {
+        const QListWidgetItem* item = m_ui->playlistList->item( i );
+
+        SpotifyPlaylistInfo* pl = item->data( Qt::UserRole ).value< SpotifyPlaylistInfo* >();
+        const bool toSync = ( item->checkState() == Qt::Checked );
+        if ( pl->sync != toSync )
+        {
+            pl->changed = true;
+            pl->sync = toSync;
+        }
+    }
+}
+
+
+QString
+SpotifyAccountConfig::username() const
+{
+    return m_ui->usernameEdit->text().trimmed();
+}
+
+QString
+SpotifyAccountConfig::password() const
+{
+    return m_ui->passwordEdit->text().trimmed();
+}
+
+bool
+SpotifyAccountConfig::highQuality() const
+{
+    return m_ui->streamingCheckbox->isChecked();
+}
+
+
+bool
+SpotifyAccountConfig::deleteOnUnsync() const
+{
+    return m_ui->deleteOnUnsync->isChecked();
+}
+
+
+void
+SpotifyAccountConfig::setPlaylists( const QList<SpotifyPlaylistInfo *>& playlists )
+{
+    // User always has at least 1 playlist (starred tracks)
+    if ( !playlists.isEmpty() )
+        m_playlistsLoading->fadeOut();
+
+    m_ui->playlistList->clear();
+    foreach ( SpotifyPlaylistInfo* pl, playlists )
+    {
+        QListWidgetItem* item = new QListWidgetItem( pl->name, m_ui->playlistList );
+        item->setData( Qt::UserRole, QVariant::fromValue< SpotifyPlaylistInfo* >( pl ) );
+        item->setFlags( Qt::ItemIsUserCheckable | Qt::ItemIsSelectable | Qt::ItemIsEnabled );
+        item->setCheckState( pl->sync ? Qt::Checked : Qt::Unchecked );
+    }
+}
+
+
+void
+SpotifyAccountConfig::doLogin()
+{
+    if ( !m_isLoggedIn )
+    {
+        m_ui->loginButton->setText( tr( "Logging in..." ) );
+        m_ui->loginButton->setEnabled( false );
+
+        m_playlistsLoading->fadeIn();
+        m_loggedInManually = true;
+
+        emit login( username(), password() );
+    }
+    else
+    {
+        // Log out
+        m_isLoggedIn = false;
+        m_loggedInManually = true;
+        m_verifiedUsername.clear();
+        m_ui->playlistList->clear();
+        emit logout();
+        showLoggedOut();
+    }
+}
+
+
+void
+SpotifyAccountConfig::loginResponse( bool success, const QString& msg, const QString& username )
+{
+    if ( success )
+    {
+        qDebug() << Q_FUNC_INFO << "Login response with username:" << username;
+        m_verifiedUsername = username;
+        m_isLoggedIn = true;
+        showLoggedIn();
+    }
+    else
+    {
+        setPlaylists( QList< SpotifyPlaylistInfo* >() );
+        m_playlistsLoading->fadeOut();
+
+        m_ui->loginButton->setText( tr( "Failed: %1" ).arg( msg ) );
+        m_ui->loginButton->setEnabled( true );
+    }
+
+}
+
+
+void
+SpotifyAccountConfig::showLoggedIn()
+{
+    m_ui->passwordEdit->hide();
+    m_ui->passwordLabel->hide();
+    m_ui->usernameEdit->hide();
+    m_ui->usernameLabel->hide();
+
+    if ( !m_loggedInUser )
+    {
+        m_loggedInUser = new QLabel( this );
+        m_ui->verticalLayout->insertWidget( 1, m_loggedInUser, 0, Qt::AlignCenter );
+    }
+
+    qDebug() << "Showing logged in withuserame:" << m_verifiedUsername;
+    m_loggedInUser->show();
+    m_loggedInUser->setText( tr( "Logged in as %1" ).arg( m_verifiedUsername ) );
+
+    m_ui->loginButton->setText( tr( "Log Out" ) );
+    m_ui->loginButton->setEnabled( true );
+}
+
+
+void
+SpotifyAccountConfig::showLoggedOut()
+{
+    m_ui->passwordEdit->show();
+    m_ui->passwordLabel->show();
+    m_ui->usernameEdit->show();
+    m_ui->usernameLabel->show();
+
+    if ( m_loggedInUser )
+        m_loggedInUser->hide();
+
+    m_ui->loginButton->setText( tr( "Log In" ) );
+    m_ui->loginButton->setEnabled( true );
+}
+
+
+void
+SpotifyAccountConfig::resetLoginButton()
+{
+    if ( !m_isLoggedIn )
+    {
+        m_ui->loginButton->setText( tr( "Log In" ) );
+        m_ui->loginButton->setEnabled( true );
+    }
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/spotify/SpotifyAccountConfig.h Added

@@ -0,0 +1,89 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, 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 SPOTIFYACCOUNTCONFIG_H
+#define SPOTIFYACCOUNTCONFIG_H
+
+#include <QWidget>
+#include <QVariantMap>
+#include <QTimer>
+
+class QLabel;
+class AnimatedSpinner;
+class QShowEvent;
+
+namespace Ui
+{
+    class SpotifyConfig;
+}
+
+namespace Tomahawk
+{
+namespace Accounts
+{
+
+class SpotifyAccount;
+struct SpotifyPlaylistInfo;
+
+class SpotifyAccountConfig : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit SpotifyAccountConfig( SpotifyAccount* account );
+
+    QString username() const;
+    QString password() const;
+    bool highQuality() const;
+    bool deleteOnUnsync() const;
+
+    void setPlaylists( const QList< SpotifyPlaylistInfo* >& playlists );
+
+    void loadFromConfig();
+    void saveSettings();
+
+    void loginResponse( bool success, const QString& msg, const QString& username );
+
+    bool loggedInManually() const { return m_loggedInManually; }
+
+signals:
+    void login( const QString& username, const QString& pw );
+    void logout();
+
+protected:
+    void showEvent( QShowEvent* event );
+
+private slots:
+    void doLogin();
+    void resetLoginButton();
+
+private:
+    void showLoggedIn();
+    void showLoggedOut();
+
+    Ui::SpotifyConfig* m_ui;
+    QLabel* m_loggedInUser;
+    QString m_verifiedUsername;
+    SpotifyAccount* m_account;
+    AnimatedSpinner* m_playlistsLoading;
+    bool m_loggedInManually, m_isLoggedIn;
+};
+
+}
+}
+
+#endif // SPOTIFYACCOUNTCONFIG_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/spotify/SpotifyAccountConfig.ui Added

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SpotifyConfig</class>
+ <widget class="QWidget" name="SpotifyConfig">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>375</width>
+    <height>417</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="icon">
+       <property name="maximumSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../../../resources.qrc">:/data/images/spotify-logo.png</pixmap>
+       </property>
+       <property name="scaledContents">
+        <bool>true</bool>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="titleText">
+       <property name="font">
+        <font>
+         <pointsize>16</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Configure your Spotify account</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::PlainText</enum>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <layout class="QFormLayout" name="formLayout">
+       <property name="fieldGrowthPolicy">
+        <enum>QFormLayout::ExpandingFieldsGrow</enum>
+       </property>
+       <item row="0" column="0">
+        <widget class="QLabel" name="usernameLabel">
+         <property name="text">
+          <string>Username:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="usernameEdit">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="placeholderText">
+          <string>Username or Facebook Email</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="passwordLabel">
+         <property name="text">
+          <string>Password:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="passwordEdit">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="echoMode">
+          <enum>QLineEdit::Password</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QPushButton" name="loginButton">
+     <property name="text">
+      <string>Log In</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Right click on any Tomahawk playlist to sync it to Spotify.</string>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Spotify playlists to keep in sync:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListWidget" name="playlistList"/>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="streamingCheckbox">
+     <property name="layoutDirection">
+      <enum>Qt::LeftToRight</enum>
+     </property>
+     <property name="text">
+      <string>High Quality Streams</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="deleteOnUnsync">
+     <property name="text">
+      <string>Delete Tomahawk playlist when removing synchronization</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../../resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.cpp Added

@@ -0,0 +1,261 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012 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 "SpotifyInfoPlugin.h"
+
+#include "SpotifyAccount.h"
+#include "utils/Closure.h"
+
+using namespace Tomahawk;
+using namespace Tomahawk::InfoSystem;
+
+
+SpotifyInfoPlugin::SpotifyInfoPlugin( Accounts::SpotifyAccount* account )
+    : InfoPlugin()
+    , m_account( QWeakPointer< Accounts::SpotifyAccount >( account ) )
+{
+    if ( !m_account.isNull() )
+        m_supportedGetTypes << InfoAlbumSongs;
+}
+
+
+SpotifyInfoPlugin::~SpotifyInfoPlugin()
+{
+
+}
+
+
+void
+SpotifyInfoPlugin::getInfo( InfoRequestData requestData )
+{
+    switch ( requestData.type )
+    {
+    case InfoAlbumSongs:
+    {
+        if ( !requestData.input.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+        {
+            dataError( requestData );
+            return;
+        }
+
+        InfoStringHash hash = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >();
+        if ( !hash.contains( "album" ) )
+        {
+            dataError( requestData );
+            return;
+        }
+
+        Tomahawk::InfoSystem::InfoStringHash criteria;
+        criteria "album"  = hash "album" ;
+        if ( hash.contains( "artist" ) )
+            criteria"artist" = hash"artist";
+
+        emit getCachedInfo( criteria, 2419200000, requestData );
+
+        return;
+    }
+    default:
+        dataError( requestData );
+    }
+}
+
+
+void
+SpotifyInfoPlugin::notInCacheSlot( InfoStringHash criteria, InfoRequestData requestData )
+{
+    switch ( requestData.type )
+    {
+    case InfoAlbumSongs:
+    {
+        const QString album = criteria "album" ;
+        const QString artist = criteria "artist" ;
+
+        if ( m_account.isNull() || !m_account.data()->loggedIn() )
+        {
+            // No running spotify account, use our webservice
+            QUrl lookupUrl( "http://ws.spotify.com/search/1/album.json" );
+            lookupUrl.addQueryItem( "q", QString( "%1 %2" ).arg( album ).arg( album ) );
+
+            QNetworkReply * reply = TomahawkUtils::nam()->get( QNetworkRequest( lookupUrl ) );
+            NewClosure( reply, SIGNAL( finished() ), this, SLOT( albumIdLookupFinished( QNetworkReply*, Tomahawk::InfoSystem::InfoRequestData ) ), reply, requestData );
+        }
+        else
+        {
+            // Running resolver, so do the lookup through that
+            qDebug() << Q_FUNC_INFO << "Doing album lookup through spotify:" << album << artist;
+            QVariantMap message;
+            message "_msgtype"  = "albumListing";
+            message "artist"  = artist;
+            message "album"  = album;
+
+            QMetaObject::invokeMethod( m_account.data(), "sendMessage", Qt::QueuedConnection, Q_ARG( QVariantMap, message ),
+                                                                                              Q_ARG( QObject*, this ),
+                                                                                              Q_ARG( QString, "albumListingResult" ),
+                                                                                              Q_ARG( QVariant, QVariant::fromValue< InfoRequestData >( requestData ) ) );
+        }
+        break;
+    }
+    default:
+    {
+        Q_ASSERT( false );
+        break;
+    }
+    }
+}
+
+
+void
+SpotifyInfoPlugin::albumListingResult( const QString& msgType, const QVariantMap& msg, const QVariant& extraData )
+{
+    Q_ASSERT( msg.contains( "qid" ) );
+    Q_ASSERT( extraData.canConvert< InfoRequestData >() );
+
+    const InfoRequestData requestData = extraData.value< InfoRequestData >();
+
+    QVariantList tracks = msg.value( "tracks" ).toList();
+    QStringList trackNameList;
+
+    foreach ( const QVariant track, tracks )
+    {
+        const QVariantMap trackData = track.toMap();
+        if ( trackData.contains( "track" ) && !trackData "track" .toString().isEmpty() )
+            trackNameList << trackData "track" .toString();
+    }
+
+    qDebug() << Q_FUNC_INFO << "Successfully got album listing from spotify resolver";
+    trackListResult( trackNameList, requestData );
+}
+
+
+void
+SpotifyInfoPlugin::albumIdLookupFinished( QNetworkReply* reply, const InfoRequestData& requestData )
+{
+    Q_ASSERT( reply );
+
+    reply->deleteLater();
+
+    if ( reply->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        const QVariantMap response = p.parse( reply ).toMap();
+        if ( !response.contains( "albums" ) )
+        {
+            dataError( requestData );
+            return;
+        }
+
+        const QVariantList albums = response.value( "albums" ).toList();
+        if ( albums.isEmpty() )
+        {
+            dataError( requestData );
+            return;
+        }
+
+        const QVariantMap album = albums.first().toMap();
+        const QString id = album.value( "href" ).toString();
+        if ( id.isEmpty() || !id.contains( "spotify:album" ) )
+        {
+            qDebug() << "Empty or malformed spotify album ID from json:" << id << response;
+            dataError( requestData );
+            return;
+        }
+
+        qDebug() << "Doing spotify album lookup via webservice with ID:" << id;
+
+        QUrl lookupUrl( QString( "http://spotikea.tomahawk-player.org/browse/%1" ).arg( id ) );
+
+
+        QNetworkReply * reply = TomahawkUtils::nam()->get( QNetworkRequest( lookupUrl ) );
+        NewClosure( reply, SIGNAL( finished() ), this, SLOT( albumContentsLookupFinished( QNetworkReply*, Tomahawk::InfoSystem::InfoRequestData ) ), reply, requestData );
+    }
+    else
+    {
+        qDebug() << "Network Error retrieving ID from spotify metadata service:" << reply->error() << reply->errorString() << reply->url();
+    }
+}
+
+
+void
+SpotifyInfoPlugin::albumContentsLookupFinished( QNetworkReply* reply, const InfoRequestData& requestData )
+{
+    Q_ASSERT( reply );
+
+    reply->deleteLater();
+
+    if ( reply->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        const QVariantMap response = p.parse( reply ).toMap();
+
+        if ( !response.contains( "album" ) )
+        {
+            dataError( requestData );
+            return;
+        }
+
+        const QVariantMap album = response.value( "album" ).toMap();
+        if ( !album.contains( "result" ) || album.value( "result" ).toList().isEmpty() )
+        {
+            dataError( requestData );
+            return;
+        }
+
+        const QVariantList albumTracks = album.value( "result" ).toList();
+        QStringList trackNameList;
+
+        foreach ( const QVariant& track, albumTracks )
+        {
+            const QVariantMap trackMap = track.toMap();
+            if ( trackMap.contains( "title" ) )
+                trackNameList << trackMap.value( "title" ).toString();
+        }
+
+        qDebug() << Q_FUNC_INFO << "Successfully got album listing from spotikea service!";
+
+        if ( trackNameList.isEmpty() )
+            dataError( requestData );
+        else
+            trackListResult( trackNameList, requestData );
+    }
+    else
+    {
+        qDebug() << "Network Error retrieving ID from spotify metadata service:" << reply->error() << reply->errorString() << reply->url();
+    }
+}
+
+void
+SpotifyInfoPlugin::dataError( InfoRequestData requestData )
+{
+    emit info( requestData, QVariant() );
+}
+
+
+void
+SpotifyInfoPlugin::trackListResult( const QStringList& trackNameList, const InfoRequestData& requestData )
+{
+    QVariantMap returnedData;
+    returnedData"tracks" = trackNameList;
+
+    emit info( requestData, returnedData );
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria"artist" = requestData.input.value< InfoStringHash>()"artist";
+    criteria"album" = requestData.input.value< InfoStringHash>()"album";
+
+    emit updateCache( criteria, 0, requestData.type, returnedData );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/spotify/SpotifyInfoPlugin.h Added

@@ -0,0 +1,72 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012 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 SPOTIFYINFOPLUGIN_H
+#define SPOTIFYINFOPLUGIN_H
+
+#include "infosystem/InfoSystem.h"
+#include "DllMacro.h"
+
+#include <QWeakPointer>
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+namespace Accounts
+{
+    class SpotifyAccount;
+}
+
+namespace InfoSystem
+{
+
+class DLLEXPORT SpotifyInfoPlugin : public InfoPlugin
+{
+    Q_OBJECT
+
+public:
+    explicit SpotifyInfoPlugin( Accounts::SpotifyAccount* account );
+    virtual ~SpotifyInfoPlugin();
+
+public slots:
+    void  albumListingResult( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
+
+protected slots:
+    virtual void init() {}
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData  ) {}
+
+private slots:
+    void albumIdLookupFinished( QNetworkReply* reply, const Tomahawk::InfoSystem::InfoRequestData& requestData );
+    void albumContentsLookupFinished( QNetworkReply* reply, const Tomahawk::InfoSystem::InfoRequestData& requestData );
+
+private:
+    void dataError( InfoRequestData );
+    void trackListResult( const QStringList& trackNameList, const Tomahawk::InfoSystem::InfoRequestData& requestData );
+
+    QWeakPointer< Tomahawk::Accounts::SpotifyAccount > m_account;
+};
+
+}
+
+}
+
+#endif // SPOTIFYINFOPLUGIN_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.cpp Added

@@ -0,0 +1,693 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2012, Hugo Lindström <hugolm84@gmail.com>
+ *
+ *   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 "SpotifyPlaylistUpdater.h"
+
+#include "accounts/AccountManager.h"
+#include "SpotifyAccount.h"
+#include "utils/TomahawkUtils.h"
+
+#include <QMessageBox>
+
+using namespace Tomahawk;
+using namespace Accounts;
+
+#ifndef ENABLE_HEADLESS
+QPixmap* SpotifyPlaylistUpdater::s_typePixmap = 0;
+#endif
+
+Tomahawk::PlaylistUpdaterInterface*
+SpotifyUpdaterFactory::create( const Tomahawk::playlist_ptr& pl, const QVariantHash &settings )
+{
+    if ( !m_account )
+    {
+        // Find the spotify account
+        foreach ( Account* account, AccountManager::instance()->accounts() )
+        {
+            if ( SpotifyAccount* spotify = qobject_cast< SpotifyAccount* >( account ) )
+            {
+                m_account = spotify;
+                break;
+            }
+        }
+    }
+
+    if ( m_account.isNull() )
+    {
+        qWarning() << "Found a spotify updater with no spotify account... ignoreing for now!!";
+        return 0;
+    }
+
+    // Register the updater with the account
+    const QString spotifyId = settings.value( "spotifyId" ).toString();
+    const QString latestRev = settings.value( "latestrev" ).toString();
+    const bool sync         = settings.value( "sync" ).toBool();
+
+    Q_ASSERT( !spotifyId.isEmpty() );
+    SpotifyPlaylistUpdater* updater = new SpotifyPlaylistUpdater( m_account.data(), latestRev, spotifyId, pl );
+    updater->setSync( sync );
+    m_account.data()->registerUpdaterForPlaylist( spotifyId, updater );
+
+    return updater;
+}
+
+
+SpotifyPlaylistUpdater::SpotifyPlaylistUpdater( SpotifyAccount* acct, const QString& revid, const QString& spotifyId, const playlist_ptr& pl )
+    : PlaylistUpdaterInterface( pl )
+    , m_spotify( acct )
+    , m_latestRev( revid )
+    , m_spotifyId( spotifyId )
+    , m_blockUpdatesForNextRevision( false )
+    , m_sync( false )
+{
+    init();
+}
+
+
+void
+SpotifyPlaylistUpdater::init()
+{
+
+    connect( playlist().data(), SIGNAL( tracksInserted( QList<Tomahawk::plentry_ptr>, int ) ), this, SLOT( tomahawkTracksInserted( QList<Tomahawk::plentry_ptr>, int ) ) );
+    connect( playlist().data(), SIGNAL( tracksRemoved( QList<Tomahawk::query_ptr> ) ), this, SLOT( tomahawkTracksRemoved( QList<Tomahawk::query_ptr> ) ) );
+    connect( playlist().data(), SIGNAL( tracksMoved( QList<Tomahawk::plentry_ptr>, int ) ), this, SLOT( tomahawkTracksMoved( QList<Tomahawk::plentry_ptr>, int ) ) );
+    connect( playlist().data(), SIGNAL( renamed( QString, QString ) ), this, SLOT( tomahawkPlaylistRenamed( QString, QString ) ) );
+    connect( playlist().data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistRevisionLoaded() ), Qt::QueuedConnection ); // Queued so that in Playlist.cpp:443 we let the playlist clear its own queue first
+    // TODO reorders in a playlist
+
+    saveToSettings();
+}
+
+
+SpotifyPlaylistUpdater::~SpotifyPlaylistUpdater()
+{
+    if ( !m_spotify.isNull() )
+    {
+        if ( m_sync )
+        {
+            QVariantMap msg;
+            msg "_msgtype"  = "removeFromSyncList";
+            msg "playlistid"  = m_spotifyId;
+
+            m_spotify.data()->sendMessage( msg );
+
+            m_spotify.data()->setSyncForPlaylist( m_spotifyId, false );
+        }
+
+        m_spotify.data()->unregisterUpdater( m_spotifyId );
+    }
+}
+
+
+void
+SpotifyPlaylistUpdater::remove( bool askToDeletePlaylist )
+{
+    if ( !askToDeletePlaylist )
+        m_sync = false;
+    PlaylistUpdaterInterface::remove();
+}
+
+
+void
+SpotifyPlaylistUpdater::aboutToDelete()
+{
+    if ( m_sync )
+    {
+        if ( QThread::currentThread() != QApplication::instance()->thread() )
+            QMetaObject::invokeMethod( const_cast<SpotifyPlaylistUpdater*>(this), "checkDeleteDialog", Qt::BlockingQueuedConnection );
+        else
+            checkDeleteDialog();
+    }
+}
+
+
+void
+SpotifyPlaylistUpdater::checkDeleteDialog() const
+{
+    // Ask if we should delete the playlist on the spotify side as well
+    QMessageBox askDelete( QMessageBox::Question, tr( "Delete in Spotify?" ), tr( "Would you like to delete the corresponding Spotify playlist as well?" ), QMessageBox::Yes | QMessageBox::No, 0 );
+    int ret = askDelete.exec();
+    if ( ret == QMessageBox::Yes )
+    {
+        if ( m_spotify.isNull() )
+            return;
+
+        // User wants to delete it!
+        QVariantMap msg;
+        msg "_msgtype"  = "deletePlaylist";
+        msg "playlistid"  = m_spotifyId;
+        m_spotify.data()->sendMessage( msg );
+    }
+}
+
+
+void
+SpotifyPlaylistUpdater::playlistRevisionLoaded()
+{
+    if ( m_queuedOps.isEmpty() ) // nothing queued
+        return;
+
+    if ( playlist()->busy() ) // not ready yet, we'll get another revision loaded
+        return;
+
+    _detail::Closure* next = m_queuedOps.dequeue();
+    next->forceInvoke();
+}
+
+
+void
+SpotifyPlaylistUpdater::saveToSettings()
+{
+    QVariantHash s = settings();
+
+    s "latestrev"  = m_latestRev;
+    s "sync"  = m_sync;
+    s "spotifyId"  = m_spotifyId;
+
+    saveSettings( s );
+}
+
+
+QString
+SpotifyPlaylistUpdater::type() const
+{
+    return "spotify";
+}
+
+
+#ifndef ENABLE_HEADLESS
+QPixmap
+SpotifyPlaylistUpdater::typeIcon() const
+{
+    if ( !s_typePixmap )
+    {
+        QPixmap pm( RESPATH "images/spotify-logo.png" );
+        s_typePixmap = new QPixmap( pm.scaled( 32, 32, Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
+    }
+
+    if ( !m_sync )
+        return QPixmap();
+
+    return *s_typePixmap;
+}
+#endif
+
+
+void
+SpotifyPlaylistUpdater::setSync( bool sync )
+{
+    if ( m_sync == sync )
+        return;
+
+    m_sync = sync;
+
+    saveToSettings();
+    emit changed();
+}
+
+
+bool
+SpotifyPlaylistUpdater::sync() const
+{
+    return m_sync;
+}
+
+
+void
+SpotifyPlaylistUpdater::spotifyTracksAdded( const QVariantList& tracks, const QString& startPosId, const QString& newRev, const QString& oldRev )
+{
+    if( playlist()->busy() )
+    {
+        // We might still be waiting for a add/remove tracks command to finish, so the entries we get here might be stale
+        // wait for any to be complete
+        m_queuedOps << NewClosure( 0, "", this, SLOT(spotifyTracksAdded(QVariantList, QString, QString, QString)), tracks, startPosId, newRev, oldRev );
+        return;
+    }
+
+    const QList< query_ptr > queries = variantToQueries( tracks );
+
+    qDebug() << Q_FUNC_INFO << "inserting tracks in middle of tomahawk playlist, from spotify command!" << tracks << startPosId << newRev << oldRev;
+    // Uh oh, dont' want to get out of sync!!
+//     Q_ASSERT( m_latestRev == oldRev );
+//     m_latestRev = newRev;
+
+    // Find the position of the track to insert from
+    int pos = -1;
+    QList< plentry_ptr > entries = playlist()->entries();
+    for ( int i = 0; i < entries.size(); i++ )
+    {
+        if ( entries i ->annotation() == startPosId )
+        {
+            pos = i;
+            break;
+        }
+    }
+    pos++; // We found index of item before, so get index of new item.
+
+    if ( pos == -1 || pos > entries.size() )
+        pos = entries.size();
+
+    qDebug() << Q_FUNC_INFO << "inserting tracks at position:" << pos << "(playlist has current size:" << entries << ")";
+
+    m_blockUpdatesForNextRevision = true;
+    playlist()->insertEntries( queries, pos, playlist()->currentrevision() );
+}
+
+
+void
+SpotifyPlaylistUpdater::spotifyTracksRemoved( const QVariantList& trackIds, const QString& newRev, const QString& oldRev )
+{
+    if( playlist()->busy() )
+    {
+        // We might still be waiting for a add/remove tracks command to finish, so the entries we get here might be stale
+        // wait for any to be complete
+        m_queuedOps << NewClosure( 0, "", this, SLOT(spotifyTracksRemoved(QVariantList, QString, QString)), trackIds, newRev, oldRev );
+        return;
+    }
+
+    qDebug() << Q_FUNC_INFO << "remove tracks in middle of tomahawk playlist, from spotify command!" << trackIds << newRev << oldRev;
+    // Uh oh, dont' want to get out of sync!!
+//     Q_ASSERT( m_latestRev == oldRev );
+//     m_latestRev = newRev;
+
+    QList< plentry_ptr > entries = playlist()->entries();
+
+    // Collect list of tracks to remove (can't remove in-place as that might modify the indices)
+    QList<plentry_ptr> toRemove;
+    foreach( const QVariant trackIdV, trackIds )
+    {
+        const QString id = trackIdV.toString();
+        if ( id.isEmpty() )
+        {
+            qWarning() << Q_FUNC_INFO << "Tried to get track id to remove, but either couldn't convert to qstring:" << trackIdV;
+            continue;
+        }
+
+        foreach ( const plentry_ptr& entry, entries )
+        {
+            if ( entry->annotation() == id )
+            {
+                toRemove << entry;
+                break;
+            }
+        }
+    }
+
+
+    // Now remove them all
+    foreach( const plentry_ptr& torm, toRemove )
+        entries.removeAll( torm );
+
+    const int sizeDiff = playlist()->entries().size() - entries.size();
+    qDebug() << "We were asked to delete:" << trackIds.size() << "tracks from the playlist, and we deleted:" << sizeDiff;
+    if ( trackIds.size() != ( playlist()->entries().size() - entries.size() ) )
+        qWarning() << "========================= Failed to delete all the tracks we were asked for!! Didn't find some indicesss... ===================";
+
+    if ( sizeDiff > 0 )
+    {
+        // Won't get a tomahawkTracksInserted or tomahawkTracksRemoved slot called, no need to block
+        playlist()->createNewRevision( uuid(), playlist()->currentrevision(), entries );
+    }
+}
+
+void
+SpotifyPlaylistUpdater::spotifyPlaylistRenamed( const QString& title, const QString& newRev, const QString& oldRev )
+{
+    if( playlist()->busy() )
+    {
+        // We might still be waiting for a add/remove tracks command to finish, so the entries we get here might be stale
+        // wait for any to be complete
+        m_queuedOps << NewClosure( 0, "", this, SLOT(spotifyPlaylistRenamed(QString, QString, QString)), title, newRev, oldRev );
+        return;
+    }
+
+    Q_UNUSED( newRev );
+    Q_UNUSED( oldRev );
+    /// @note to self: should do some checking before trying to update
+    playlist()->rename( title );
+
+}
+
+void
+SpotifyPlaylistUpdater::tomahawkPlaylistRenamed(const QString &newT, const QString &oldT)
+{
+    qDebug() << Q_FUNC_INFO;
+    QVariantMap msg;
+    msg "_msgtype"  = "playlistRenamed";
+    msg "oldrev"  = m_latestRev;
+    msg "newTitle"  = newT;
+    msg "oldTitle"  = oldT;
+    msg "playlistid"  = m_spotifyId;
+
+    // TODO check return value
+    m_spotify.data()->sendMessage( msg, this, "onPlaylistRename" );
+}
+
+void
+SpotifyPlaylistUpdater::spotifyTracksMoved( const QVariantList& tracks, const QString& newStartPos, const QString& newRev, const QString& oldRev )
+{
+    if( playlist()->busy() )
+    {
+        // We might still be waiting for a add/remove tracks command to finish, so the entries we get here might be stale
+        // wait for any to be complete
+        m_queuedOps << NewClosure( 0, "", this, SLOT(spotifyTracksMoved(QVariantList, QString, QString, QString)), tracks, newStartPos, newRev, oldRev );
+        return;
+    }
+
+
+    qDebug() << "Moving some tracks in a spotify-synced playlist, tracks:" << tracks << "to new startpos:" << newStartPos;
+    // Uh oh, dont' want to get out of sync!!
+    //     Q_ASSERT( m_latestRev == oldRev );
+    //     m_latestRev = newRev;
+    QList< plentry_ptr > entries = playlist()->entries();
+
+    QList< plentry_ptr > toMove;
+    for ( QList< plentry_ptr >::iterator iter = entries.begin(); iter != entries.end(); )
+    {
+        if ( (*iter)->annotation().isEmpty() )
+            continue;
+
+        if ( tracks.contains( (*iter)->annotation() ) )
+        {
+            toMove << *iter;
+            iter = entries.erase( iter );
+            continue;
+        }
+
+        ++iter;
+    }
+
+
+    // Find the position of the track to insert from
+    if ( newStartPos.isEmpty() )
+    {
+        while ( !toMove.isEmpty() )
+            entries.prepend( toMove.takeLast() );
+    }
+    else
+    {
+        for ( QList< plentry_ptr >::iterator iter = entries.begin(); iter != entries.end(); ++iter )
+        {
+            if ( (*iter)->annotation() == newStartPos )
+            {
+                ++iter;
+                while ( !toMove.isEmpty() )
+                {
+                    qDebug() << "Adding moved track to playlist at pos (end:" << (iter == entries.end());
+                    if ( iter != entries.end() )
+                        qDebug() << (*iter)->query()->track() << (*iter)->query()->artist();
+                    iter = entries.insert( iter, toMove.takeLast() );
+                }
+
+                break;
+            }
+        }
+    }
+
+    m_blockUpdatesForNextRevision = true;
+    playlist()->createNewRevision( uuid(), playlist()->currentrevision(), entries );
+}
+
+
+void
+SpotifyPlaylistUpdater::tomahawkTracksInserted( const QList< plentry_ptr >& tracks, int pos )
+{
+    if ( m_spotify.isNull() )
+        return;
+
+    if ( m_blockUpdatesForNextRevision )
+    {
+        qDebug() << "Ignoring tracks inserted message since we just did an insert ourselves!";
+        m_blockUpdatesForNextRevision = false;
+        return;
+    }
+
+    // Notify the resolver that we've updated
+    qDebug() << Q_FUNC_INFO  << "updating spotify resolver with inserted tracks at:" << pos << tracks;
+    QVariantMap msg;
+    msg "_msgtype"  = "addTracksToPlaylist";
+    msg "oldrev"  = m_latestRev;
+
+    // Find the trackid of the nearest spotify track
+    QList< plentry_ptr > plTracks = playlist()->entries();
+    Q_ASSERT( pos-1 < plTracks.size() );
+    const QString startPos = nearestSpotifyTrack( plTracks, pos - 1 );
+    msg "startPosition"  = startPos;
+
+    m_waitingForIds = tracks;
+
+    msg "playlistid"  = m_spotifyId;
+
+    msg "tracks"  = plentryToVariant( tracks );
+
+    m_spotify.data()->sendMessage( msg, this, "onTracksInsertedReturn" );
+}
+
+
+QString
+SpotifyPlaylistUpdater::nearestSpotifyTrack( const QList< plentry_ptr >& entries, int pos )
+{
+    for ( int i = pos; i >= 0; i-- )
+    {
+        if ( !entries i ->annotation().isEmpty() && entries i ->annotation().contains( "spotify:track") )
+        {
+            return entries i ->annotation();
+        }
+    }
+
+    return QString();
+}
+
+
+QVariantList
+SpotifyPlaylistUpdater::plentryToVariant( const QList< plentry_ptr >& entries )
+{
+    QVariantList tracksJson;
+    foreach ( const plentry_ptr& ple, entries )
+    {
+        const query_ptr q = ple->query();
+        if ( q.isNull() )
+        {
+            qDebug() << "Got null query_ptr in plentry_ptr!!!" << ple;
+            continue;
+        }
+
+        tracksJson << queryToVariant( q );
+    }
+
+    return tracksJson;
+}
+
+
+void
+SpotifyPlaylistUpdater::onTracksInsertedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& )
+{
+    const bool success = msg.value( "success" ).toBool();
+
+    qDebug() << Q_FUNC_INFO << "GOT RETURN FOR tracksInserted call from spotify!" << msgType << msg << "Succeeded?" << success;
+    m_latestRev = msg.value( "revid" ).toString();
+
+
+    const QVariantList trackPositionsInserted = msg.value( "trackPosInserted" ).toList();
+    const QVariantList trackIdsInserted = msg.value( "trackIdInserted" ).toList();
+
+    Q_ASSERT( trackPositionsInserted.size() == trackIdsInserted.size() );
+
+    const QList< plentry_ptr > curEntries = playlist()->entries();
+    QList< plentry_ptr > changed;
+
+    for ( int i = 0; i < trackPositionsInserted.size(); i++ )
+    {
+        const QVariant posV = trackPositionsInserted i ;
+
+        bool ok;
+        const int pos = posV.toInt( &ok );
+        if ( !ok )
+            continue;
+
+        if ( pos < 0 || pos >= m_waitingForIds.size() )
+        {
+            qWarning() << Q_FUNC_INFO << "Got position that's not in the bounds of the tracks that we think we added... WTF?";
+            continue;
+        }
+
+        if ( !curEntries.contains( m_waitingForIds.at( pos ) ) )
+        {
+            qDebug() << Q_FUNC_INFO << "Got an id at a position for a plentry that's no longer in our playlist? WTF";
+            continue;
+        }
+
+        if ( i >= trackIdsInserted.size() )
+        {
+            qWarning() << Q_FUNC_INFO << "Help! Got more track positions than track IDS, wtf?";
+            continue;
+        }
+
+        qDebug() << "Setting annotation for track:" << m_waitingForIds pos ->query()->track() << m_waitingForIds pos ->query()->artist() << trackIdsInserted.at( i ).toString();
+        m_waitingForIds pos ->setAnnotation( trackIdsInserted.at( i ).toString() );
+        changed << m_waitingForIds pos ;
+    }
+
+    m_waitingForIds.clear();
+    // Save our changes if we added some IDs
+    if ( changed.size() > 0 )
+        playlist()->updateEntries( uuid(), playlist()->currentrevision(), changed );
+
+    // Update with latest rev when/if we use it
+//    saveToSettings();
+
+}
+
+
+void
+SpotifyPlaylistUpdater::tomahawkTracksRemoved( const QList< query_ptr >& tracks )
+{
+    if ( m_spotify.isNull() )
+        return;
+
+    if ( m_blockUpdatesForNextRevision )
+    {
+        qDebug() << "Ignoring tracks removed message since we just did a remove ourselves!";
+        m_blockUpdatesForNextRevision = false;
+        return;
+    }
+
+    qDebug() << Q_FUNC_INFO  << "updating spotify resolver with removed tracks:" << tracks;
+    QVariantMap msg;
+    msg "_msgtype"  = "removeTracksFromPlaylist";
+    msg "playlistid"  = m_spotifyId;
+    msg "oldrev"  = m_latestRev;
+    msg "tracks"  = queriesToVariant( tracks );
+
+    m_spotify.data()->sendMessage( msg, this, "onTracksRemovedReturn" );
+}
+
+
+void
+SpotifyPlaylistUpdater::onTracksRemovedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& )
+{
+    const bool success = msg.value( "success" ).toBool();
+
+    qDebug() << Q_FUNC_INFO << "GOT RETURN FOR tracksRemoved call from spotify!" << msgType << msg << "Succeeded?" << success;
+    m_latestRev = msg.value( "revid" ).toString();
+}
+
+
+void
+SpotifyPlaylistUpdater::tomahawkTracksMoved( const QList< plentry_ptr >& tracks, int position )
+{
+    if( playlist()->busy() )
+    {
+        // the playlist has had the new revision set, but it might not be finished, if it's not finished, playlist()->entries() still
+        // contains the *old* order, so we get the wrong data
+        m_queuedOps << NewClosure( 0, "", this, SLOT(tomahawkTracksMoved(QList<Tomahawk::plentry_ptr>,int)), tracks, position );
+        return;
+    }
+
+    qDebug() << Q_FUNC_INFO << "Got tracks moved at position:" << position;
+    foreach ( const plentry_ptr ple, tracks )
+    {
+        qDebug() << ple->query()->track() << ple->query()->artist();
+    }
+
+    qDebug() << Q_FUNC_INFO  << "updating spotify resolver with moved tracks to:" << position;
+    QVariantMap msg;
+    msg "_msgtype"  = "moveTracksInPlaylist";
+    msg "oldrev"  = m_latestRev;
+
+    // Find the trackid of the nearest spotify track
+    QList< plentry_ptr > plTracks = playlist()->entries();
+    Q_ASSERT( position-1 < plTracks.size() );
+
+    QString startPos;
+    if ( position > 0 )
+        startPos = nearestSpotifyTrack( plTracks, position );
+
+    msg "startPosition"  = startPos;
+    msg "playlistid"  = m_spotifyId;
+
+    msg "tracks"  = plentryToVariant( tracks );
+
+    m_spotify.data()->sendMessage( msg, this, "onTracksMovedReturn" );
+}
+
+
+void
+SpotifyPlaylistUpdater::onTracksMovedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& )
+{
+    const bool success = msg.value( "success" ).toBool();
+
+    qDebug() << Q_FUNC_INFO << "GOT RETURN FOR tracksMoved call from spotify!" << msgType << msg << "Succeeded?" << success;
+    m_latestRev = msg.value( "revid" ).toString();
+}
+
+
+QVariantList
+SpotifyPlaylistUpdater::queriesToVariant( const QList< query_ptr >& queries )
+{
+    QVariantList tracksJson;
+    foreach ( const query_ptr& q, queries )
+    {
+        QVariantMap m;
+        if ( q.isNull() )
+            continue;
+        tracksJson << queryToVariant( q );
+    }
+
+    return tracksJson;
+}
+
+
+QVariant
+SpotifyPlaylistUpdater::queryToVariant( const query_ptr& query )
+{
+    QVariantMap m;
+    m "track"  = query->track();
+    m "artist"  = query->artist();
+    m "album"  = query->album();
+
+    if ( !query->property( "annotation" ).isNull() )
+        m "id"  = query->property( "annotation" );
+
+    return m;
+}
+
+
+QList< query_ptr >
+SpotifyPlaylistUpdater::variantToQueries( const QVariantList& list )
+{
+    QList< query_ptr > queries;
+    foreach ( const QVariant& blob, list )
+    {
+        QVariantMap trackMap = blob.toMap();
+        const query_ptr q = Query::get( trackMap.value( "artist" ).toString(), trackMap.value( "track" ).toString(), trackMap.value( "album" ).toString(), uuid(), false );
+        if ( q.isNull() )
+            continue;
+
+        if ( trackMap.contains( "id" ) )
+        {
+            q->setResultHint( trackMap.value( "id" ).toString()  );
+            q->setProperty( "annotation", trackMap.value( "id" ) );
+        }
+        queries << q;
+    }
+
+    return queries;
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/accounts/spotify/SpotifyPlaylistUpdater.h Added

@@ -0,0 +1,122 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2012, Hugo Lindström <hugolm84@gmail.com>
+ *   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 SPOTIFYPLAYLISTUPDATER_H
+#define SPOTIFYPLAYLISTUPDATER_H
+
+#include "playlist/PlaylistUpdaterInterface.h"
+#include "utils/Closure.h"
+#include "DllMacro.h"
+
+#include <QQueue>
+#include <QVariant>
+
+namespace Tomahawk {
+namespace Accounts {
+    class SpotifyAccount;
+}
+}
+
+class DLLEXPORT SpotifyPlaylistUpdater : public Tomahawk::PlaylistUpdaterInterface
+{
+    Q_OBJECT
+
+    friend class Tomahawk::Accounts::SpotifyAccount;
+public:
+    SpotifyPlaylistUpdater( Tomahawk::Accounts::SpotifyAccount* acct, const QString& revid, const QString& spotifyId, const Tomahawk::playlist_ptr& pl );
+
+    virtual ~SpotifyPlaylistUpdater();
+
+    virtual QString type() const;
+    virtual void updateNow() {}
+
+#ifndef ENABLE_HEADLESS
+    virtual QWidget* configurationWidget() const { return 0; }
+
+    virtual QPixmap typeIcon() const;
+#endif
+
+    bool sync() const;
+    void setSync( bool sync );
+
+    QString spotifyId() const { return m_spotifyId; }
+
+    void remove( bool askToDeletePlaylist = true );
+public slots:
+    /// Spotify callbacks when we are directly instructed from the resolver
+    void spotifyTracksAdded( const QVariantList& tracks, const QString& startPosId, const QString& newRev, const QString& oldRev );
+    void spotifyTracksRemoved( const QVariantList& tracks, const QString& newRev, const QString& oldRev );
+    void spotifyTracksMoved( const QVariantList& tracks, const QString& newStartPos, const QString& newRev, const QString& oldRev );
+    void spotifyPlaylistRenamed( const QString& title, const QString& newRev, const QString& oldRev  );
+
+    void tomahawkTracksInserted( const QList<Tomahawk::plentry_ptr>& ,int );
+    void tomahawkTracksRemoved( const QList<Tomahawk::query_ptr>& );
+    void tomahawkTracksMoved( const QList<Tomahawk::plentry_ptr>& ,int );
+    void tomahawkPlaylistRenamed( const QString&, const QString& );
+
+protected:
+    void aboutToDelete();
+
+private slots:
+    // SpotifyResolver message handlers, all take msgtype, msg as argument
+    void onTracksInsertedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
+    void onTracksRemovedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
+    void onTracksMovedReturn( const QString& msgType, const QVariantMap& msg, const QVariant& extraData );
+
+    void checkDeleteDialog() const;
+
+    void playlistRevisionLoaded();
+private:
+    void init();
+    void saveToSettings();
+
+    /// Finds the nearest spotify id from pos to the beginning of the playlist
+    QString nearestSpotifyTrack( const QList< Tomahawk::plentry_ptr >& entries,  int pos );
+    QVariantList plentryToVariant( const QList< Tomahawk::plentry_ptr >& entries );
+
+    static QVariantList queriesToVariant( const QList< Tomahawk::query_ptr >& queries );
+    static QVariant queryToVariant( const Tomahawk::query_ptr& query );
+    static QList< Tomahawk::query_ptr > variantToQueries( const QVariantList& list );
+
+    QWeakPointer<Tomahawk::Accounts::SpotifyAccount> m_spotify;
+    QString m_latestRev, m_spotifyId;
+    QList< Tomahawk::plentry_ptr > m_waitingForIds;
+
+    bool m_blockUpdatesForNextRevision;
+    bool m_sync;
+
+    QQueue<_detail::Closure*> m_queuedOps;
+#ifndef ENABLE_HEADLESS
+    static QPixmap* s_typePixmap;
+#endif
+};
+
+
+class DLLEXPORT SpotifyUpdaterFactory : public Tomahawk::PlaylistUpdaterFactory
+{
+public:
+    SpotifyUpdaterFactory()  {}
+
+    virtual Tomahawk::PlaylistUpdaterInterface* create( const Tomahawk::playlist_ptr& pl, const QVariantHash& settings );
+    virtual QString type() const { return "spotify"; }
+
+private:
+    QWeakPointer<Tomahawk::Accounts::SpotifyAccount> m_account;
+};
+
+#endif // SPOTIFYPLAYLISTUPDATER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/audio/AudioEngine.cpp Added

@@ -0,0 +1,940 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "AudioEngine.h"
+
+#include "config.h"
+
+#include <QtCore/QUrl>
+#include <QtNetwork/QNetworkReply>
+#include <QTemporaryFile>
+
+#include "PlaylistInterface.h"
+#include "SourcePlaylistInterface.h"
+#include "TomahawkSettings.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_LogPlayback.h"
+#include "network/Servent.h"
+#include "utils/Qnr_IoDeviceStream.h"
+#include "utils/Closure.h"
+#include "HeadlessCheck.h"
+#include "infosystem/InfoSystem.h"
+#include "Album.h"
+#include "Pipeline.h"
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+#define AUDIO_VOLUME_STEP 5
+
+static QString s_aeInfoIdentifier = QString( "AUDIOENGINE" );
+
+AudioEngine* AudioEngine::s_instance = 0;
+
+
+AudioEngine*
+AudioEngine::instance()
+{
+    return s_instance;
+}
+
+
+AudioEngine::AudioEngine()
+    : QObject()
+    , m_queue( 0 )
+    , m_timeElapsed( 0 )
+    , m_expectStop( false )
+    , m_waitingOnNewTrack( false )
+    , m_state( Stopped )
+{
+    s_instance = this;
+    tDebug() << "Init AudioEngine";
+
+    qRegisterMetaType< AudioErrorCode >("AudioErrorCode");
+    qRegisterMetaType< AudioState >("AudioState");
+
+    m_mediaObject = new Phonon::MediaObject( this );
+    m_audioOutput = new Phonon::AudioOutput( Phonon::MusicCategory, this );
+    Phonon::createPath( m_mediaObject, m_audioOutput );
+
+    m_mediaObject->setTickInterval( 150 );
+    connect( m_mediaObject, SIGNAL( stateChanged( Phonon::State, Phonon::State ) ), SLOT( onStateChanged( Phonon::State, Phonon::State ) ) );
+    connect( m_mediaObject, SIGNAL( tick( qint64 ) ), SLOT( timerTriggered( qint64 ) ) );
+    connect( m_mediaObject, SIGNAL( aboutToFinish() ), SLOT( onAboutToFinish() ) );
+
+    connect( m_audioOutput, SIGNAL( volumeChanged( qreal ) ), SLOT( onVolumeChanged( qreal ) ) );
+
+    m_stateQueueTimer.setInterval( 5000 );
+    m_stateQueueTimer.setSingleShot( true );
+    connect( &m_stateQueueTimer, SIGNAL( timeout() ), SLOT( queueStateSafety() ) );
+
+    onVolumeChanged( m_audioOutput->volume() );
+
+    setVolume( TomahawkSettings::instance()->volume() );
+}
+
+
+AudioEngine::~AudioEngine()
+{
+    tDebug() << Q_FUNC_INFO;
+
+    m_mediaObject->stop();
+    TomahawkSettings::instance()->setVolume( volume() );
+}
+
+
+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()
+{
+    if ( isPlaying() )
+        pause();
+    else
+        play();
+}
+
+
+void
+AudioEngine::play()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+
+    if ( isPaused() )
+    {
+        queueState( Playing );
+        emit resumed();
+
+        sendNowPlayingNotification( Tomahawk::InfoSystem::InfoNowResumed );
+    }
+    else
+        next();
+}
+
+
+void
+AudioEngine::pause()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+
+    queueState( Paused );
+    emit paused();
+
+    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( Tomahawk::InfoSystem::InfoPushData( s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowPaused, QVariant(), Tomahawk::InfoSystem::PushNoFlag ) );
+}
+
+
+void
+AudioEngine::stop( AudioErrorCode errorCode )
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+
+    if ( isStopped() )
+        return;
+
+    if( errorCode == NoError )
+        setState( Stopped );
+    else
+        setState( Error );
+
+    m_mediaObject->stop();
+    emit stopped();
+
+    if ( !m_playlist.isNull() )
+        m_playlist.data()->reset();
+    if ( !m_currentTrack.isNull() )
+        emit timerPercentage( ( (double)m_timeElapsed / (double)m_currentTrack->duration() ) * 100.0 );
+
+    setCurrentTrack( Tomahawk::result_ptr() );
+
+    if ( m_waitingOnNewTrack )
+        sendWaitingNotification();
+
+    Tomahawk::InfoSystem::InfoPushData pushData( s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowStopped, QVariant(), Tomahawk::InfoSystem::PushNoFlag );
+    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
+}
+
+
+void
+AudioEngine::previous()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+
+    if ( canGoPrevious() )
+        loadPreviousTrack();
+}
+
+
+void
+AudioEngine::next()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+
+    if ( canGoNext() )
+        loadNextTrack();
+}
+
+
+bool
+AudioEngine::canGoNext()
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+
+    if ( m_queue && m_queue->trackCount() )
+        return true;
+
+    if ( m_playlist.isNull() )
+        return false;
+
+    if ( m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkip ||
+        m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkipForwards )
+        return false;
+
+    if ( !m_currentTrack.isNull() && !m_playlist->hasNextItem() &&
+         ( m_playlist->currentItem().isNull() || ( m_currentTrack->id() == m_playlist->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
+        tDebug( LOGEXTRA ) << Q_FUNC_INFO << "catch up, but same track or can't move on because don't have next track or it wasn't resolved";
+        return false;
+    }
+
+    return m_playlist.data()->hasNextItem();
+}
+
+
+bool
+AudioEngine::canGoPrevious()
+{
+    if ( m_playlist.isNull() )
+        return false;
+
+    if ( m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkip ||
+        m_playlist.data()->skipRestrictions() == PlaylistModes::NoSkipBackwards )
+        return false;
+
+    return true;
+}
+
+
+bool
+AudioEngine::canSeek()
+{
+    bool phononCanSeek = true;
+    /* TODO: When phonon properly reports this, re-enable it
+    if ( m_mediaObject && m_mediaObject->isValid() )
+        phononCanSeek = m_mediaObject->isSeekable();
+    */
+    if ( m_playlist.isNull() )
+        return phononCanSeek;
+
+    return !m_playlist.isNull() && ( m_playlist.data()->seekRestrictions() != PlaylistModes::NoSeek ) && phononCanSeek;
+}
+
+
+void
+AudioEngine::seek( qint64 ms )
+{
+    if ( !canSeek() )
+    {
+        tDebug( LOGEXTRA ) << "Could not seek!";
+        return;
+    }
+
+    if ( isPlaying() || isPaused() )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << ms;
+        m_mediaObject->seek( ms );
+        emit seeked( ms );
+    }
+}
+
+
+void
+AudioEngine::seek( int ms )
+{
+    seek( (qint64) ms );
+}
+
+
+void
+AudioEngine::setVolume( int percentage )
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << percentage;
+
+    percentage = qBound( 0, percentage, 100 );
+    m_audioOutput->setVolume( (qreal)percentage / 100.0 );
+    emit volumeChanged( percentage );
+}
+
+
+void
+AudioEngine::lowerVolume()
+{
+    setVolume( volume() - AUDIO_VOLUME_STEP );
+}
+
+
+void
+AudioEngine::raiseVolume()
+{
+    setVolume( volume() + AUDIO_VOLUME_STEP );
+}
+
+
+void
+AudioEngine::mute()
+{
+    setVolume( 0 );
+}
+
+
+void
+AudioEngine::sendWaitingNotification() const
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    //since it's async, after this is triggered our result could come in, so don't show the popup in that case
+    if ( !m_playlist.isNull() && m_playlist->hasNextItem() )
+        return;
+
+    Tomahawk::InfoSystem::InfoPushData pushData (
+        s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoTrackUnresolved,
+        QVariant(),
+        Tomahawk::InfoSystem::PushNoFlag );
+
+    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
+}
+
+
+void
+AudioEngine::sendNowPlayingNotification( const Tomahawk::InfoSystem::InfoType type )
+{
+    if ( m_currentTrack.isNull() )
+        return;
+
+#ifndef ENABLE_HEADLESS
+    if ( m_currentTrack->toQuery()->coverLoaded() )
+    {
+        onNowPlayingInfoReady( type );
+    }
+    else
+    {
+        NewClosure( m_currentTrack->toQuery().data(), SIGNAL( coverChanged() ), const_cast< AudioEngine* >( this ), SLOT( sendNowPlayingNotification( const Tomahawk::InfoSystem::InfoType ) ), type );
+        m_currentTrack->toQuery()->cover( QSize( 0, 0 ), true );
+    }
+#endif
+}
+
+
+void
+AudioEngine::onNowPlayingInfoReady( const Tomahawk::InfoSystem::InfoType type )
+{
+    if ( m_currentTrack.isNull() ||
+         m_currentTrack->track().isNull() ||
+         m_currentTrack->artist().isNull() )
+        return;
+
+    QVariantMap playInfo;
+
+#ifndef ENABLE_HEADLESS
+    QImage cover;
+    cover = m_currentTrack->toQuery()->cover( QSize( 0, 0 ) ).toImage();
+    if ( !cover.isNull() )
+    {
+        playInfo"cover" = cover;
+
+        QTemporaryFile* coverTempFile = new QTemporaryFile( QDir::toNativeSeparators( QDir::tempPath() + "/" + m_currentTrack->artist()->name() + "_" + m_currentTrack->album()->name() + "_tomahawk_cover.png" ) );
+        if ( !coverTempFile->open() )
+        {
+            tDebug() << Q_FUNC_INFO << "WARNING: could not write temporary file for cover art!";
+        }
+        else
+        {
+            // Finally, save the image to the new temp file
+            coverTempFile->setAutoRemove( false );
+            if ( cover.save( coverTempFile, "PNG" ) )
+            {
+                tDebug() <<  Q_FUNC_INFO << "Saving cover image to:" << QFileInfo( *coverTempFile ).absoluteFilePath();
+                playInfo"coveruri" = QFileInfo( *coverTempFile ).absoluteFilePath();
+            }
+            else
+                tDebug() << Q_FUNC_INFO << "failed to save cover image!";
+        }
+        delete coverTempFile;
+    }
+    else
+        tDebug() << Q_FUNC_INFO << "Cover from query is null!";
+#endif
+
+    Tomahawk::InfoSystem::InfoStringHash trackInfo;
+    trackInfo"title" = m_currentTrack->track();
+    trackInfo"artist" = m_currentTrack->artist()->name();
+    trackInfo"album" = m_currentTrack->album()->name();
+    trackInfo"duration" = QString::number( m_currentTrack->duration() );
+    trackInfo"albumpos" = QString::number( m_currentTrack->albumpos() );
+
+    playInfo"trackinfo" = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( trackInfo );
+    playInfo"private" = TomahawkSettings::instance()->privateListeningMode();
+
+    Tomahawk::InfoSystem::InfoPushData pushData ( s_aeInfoIdentifier, type, playInfo, Tomahawk::InfoSystem::PushShortUrlFlag );
+
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "pushing data with type" << type;
+    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
+}
+
+
+bool
+AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
+{
+    bool err = false;
+    {
+        QSharedPointer<QIODevice> io;
+
+        if ( result.isNull() )
+            err = true;
+        else
+        {
+            setCurrentTrack( result );
+
+            if ( !isHttpResult( m_currentTrack->url() ) && !isLocalResult( m_currentTrack->url() ) )
+            {
+                io = Servent::instance()->getIODeviceForUrl( m_currentTrack );
+
+                if ( !io || io.isNull() )
+                {
+                    tLog() << "Error getting iodevice for" << result->url();
+                    err = true;
+                }
+            }
+        }
+
+        if ( !err )
+        {
+            tLog() << "Starting new song:" << m_currentTrack->url();
+            emit loading( m_currentTrack );
+
+            if ( !isHttpResult( m_currentTrack->url() ) && !isLocalResult( m_currentTrack->url() ) )
+            {
+                if ( QNetworkReply* qnr_io = qobject_cast< QNetworkReply* >( io.data() ) )
+                    m_mediaObject->setCurrentSource( new QNR_IODeviceStream( qnr_io, this ) );
+                else
+                    m_mediaObject->setCurrentSource( io.data() );
+                m_mediaObject->currentSource().setAutoDelete( false );
+            }
+            else
+            {
+                if ( !isLocalResult( m_currentTrack->url() ) )
+                {
+                    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 );
+                }
+                else
+                {
+                    QString furl = m_currentTrack->url();
+#ifdef Q_WS_WIN
+                    if ( furl.startsWith( "file://" ) )
+                        furl = furl.right( furl.length() - 7 );
+#endif
+                    tLog( LOGVERBOSE ) << "Passing to Phonon:" << furl << furl.toLatin1();
+                    m_mediaObject->setCurrentSource( furl );
+                }
+
+                m_mediaObject->currentSource().setAutoDelete( true );
+            }
+
+            if ( !m_input.isNull() )
+            {
+                m_input->close();
+                m_input.clear();
+            }
+            m_input = io;
+            queueState( Playing );
+            emit started( m_currentTrack );
+
+            if ( TomahawkSettings::instance()->privateListeningMode() != TomahawkSettings::FullyPrivate )
+            {
+                DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_currentTrack, DatabaseCommand_LogPlayback::Started );
+                Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+            }
+
+            sendNowPlayingNotification( Tomahawk::InfoSystem::InfoNowPlaying );
+        }
+    }
+
+    if ( err )
+    {
+        stop();
+        return false;
+    }
+
+    m_waitingOnNewTrack = false;
+    return true;
+}
+
+
+void
+AudioEngine::loadPreviousTrack()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+
+    if ( m_playlist.isNull() )
+    {
+        stop();
+        return;
+    }
+
+    Tomahawk::result_ptr result = m_playlist.data()->previousItem();
+    if ( !result.isNull() )
+        loadTrack( result );
+    else
+        stop();
+}
+
+
+void
+AudioEngine::loadNextTrack()
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+
+    Tomahawk::result_ptr result;
+
+    if ( !m_stopAfterTrack.isNull() )
+    {
+        if ( m_stopAfterTrack->equals( m_currentTrack->toQuery() ) )
+        {
+            m_stopAfterTrack.clear();
+            stop();
+            return;
+        }
+    }
+
+    if ( m_queue && m_queue->trackCount() )
+    {
+        result = m_queue->nextItem();
+    }
+
+    if ( !m_playlist.isNull() && result.isNull() )
+    {
+        tDebug( LOGEXTRA ) << Q_FUNC_INFO << "Loading playlist's next item";
+        result = m_playlist.data()->nextItem();
+        m_currentTrackPlaylist = m_playlist;
+    }
+
+    if ( !result.isNull() )
+    {
+        tDebug( LOGEXTRA ) << Q_FUNC_INFO << "Got next item, loading track";
+        loadTrack( result );
+    }
+    else
+    {
+        if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistModes::Retry )
+            m_waitingOnNewTrack = true;
+
+        stop();
+    }
+}
+
+
+void
+AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::result_ptr& result )
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : result->url() );
+
+    if ( !m_playlist.isNull() )
+        m_playlist.data()->reset();
+
+    setPlaylist( playlist );
+    m_currentTrackPlaylist = playlist;
+
+    if ( !result.isNull() )
+    {
+        loadTrack( result );
+    }
+    else if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == PlaylistModes::Retry )
+    {
+        m_waitingOnNewTrack = true;
+        if ( isStopped() )
+            emit sendWaitingNotification();
+        else
+            stop();
+    }
+}
+
+
+void
+AudioEngine::playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::query_ptr& query )
+{
+    if ( query->resolvingFinished() )
+    {
+        if ( query->numResults() && query->results().first()->isOnline() )
+        {
+            playItem( playlist, query->results().first() );
+            return;
+        }
+
+        JobStatusView::instance()->model()->addJob(
+            new ErrorStatusMessage( tr( "Sorry, Tomahawk couldn't find the track '%1' by %2" ).arg( query->track() ).arg( query->artist() ), 15 ) );
+
+        if ( isStopped() )
+            emit stopped(); // we do this so the original caller knows we couldn't find this track
+    }
+    else
+    {
+        Pipeline::instance()->resolve( query );
+
+        NewClosure( query.data(), SIGNAL( resolvingFinished( bool ) ),
+                    const_cast<AudioEngine*>(this), SLOT( playItem( Tomahawk::playlistinterface_ptr, Tomahawk::query_ptr ) ), playlist, query );
+    }
+}
+
+
+void
+AudioEngine::playItem( const Tomahawk::artist_ptr& artist )
+{
+    playlistinterface_ptr pli = artist->playlistInterface( Mixed );
+    if ( pli->isFinished() )
+    {
+        if ( !pli->tracks().count() )
+        {
+            JobStatusView::instance()->model()->addJob(
+                new ErrorStatusMessage( tr( "Sorry, Tomahawk couldn't find the artist '%1'" ).arg( artist->name() ), 15 ) );
+
+            if ( isStopped() )
+                emit stopped(); // we do this so the original caller knows we couldn't find this track
+        }
+        else
+            playItem( pli, pli->tracks().first() );
+    }
+    else
+    {
+        NewClosure( artist.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                    const_cast<AudioEngine*>(this), SLOT( playItem( Tomahawk::artist_ptr ) ), artist );
+        pli->tracks();
+    }
+}
+
+
+void
+AudioEngine::playItem( const Tomahawk::album_ptr& album )
+{
+    playlistinterface_ptr pli = album->playlistInterface( Mixed );
+    if ( pli->isFinished() )
+    {
+        if ( !pli->tracks().count() )
+        {
+            JobStatusView::instance()->model()->addJob(
+                new ErrorStatusMessage( tr( "Sorry, Tomahawk couldn't find the album '%1' by %2" ).arg( album->name() ).arg( album->artist()->name() ), 15 ) );
+
+            if ( isStopped() )
+                emit stopped(); // we do this so the original caller knows we couldn't find this track
+        }
+        else
+            playItem( pli, pli->tracks().first() );
+    }
+    else
+    {
+        NewClosure( album.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                    const_cast<AudioEngine*>(this), SLOT( playItem( Tomahawk::album_ptr ) ), album );
+        pli->tracks();
+    }
+}
+
+
+void
+AudioEngine::onPlaylistNextTrackReady()
+{
+    // If in real-time and you have a few seconds left, you're probably lagging -- finish it up
+    if ( m_playlist && m_playlist->latchMode() == PlaylistModes::RealTime && ( m_waitingOnNewTrack || m_currentTrack.isNull() || m_currentTrack->id() == 0 || ( currentTrackTotalTime() - currentTime() > 6000 ) ) )
+    {
+        m_waitingOnNewTrack = false;
+        loadNextTrack();
+        return;
+    }
+
+    if ( !m_waitingOnNewTrack )
+        return;
+
+    m_waitingOnNewTrack = false;
+    loadNextTrack();
+}
+
+
+void
+AudioEngine::onAboutToFinish()
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    m_expectStop = true;
+}
+
+
+void
+AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState )
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << oldState << newState << m_expectStop;
+
+    if ( newState == Phonon::ErrorState )
+    {
+        stop( UnknownError );
+
+        tDebug() << "Phonon Error:" << m_mediaObject->errorString() << m_mediaObject->errorType();
+
+        emit error( UnknownError );
+        setState( Error );
+    }
+    if ( newState == Phonon::PlayingState )
+    {
+        setState( Playing );
+    }
+
+    if ( oldState == Phonon::PlayingState )
+    {
+        bool stopped = false;
+        switch ( newState )
+        {
+            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.";
+            if ( canGoNext() )
+                loadNextTrack();
+            else
+            {
+                if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistModes::Retry )
+                    m_waitingOnNewTrack = true;
+                stop();
+            }
+        }
+    }
+
+    if ( newState == Phonon::PausedState || newState == Phonon::PlayingState || newState == Phonon::ErrorState )
+    {
+        tDebug() << "Phonon state now:" << newState;
+        if ( m_stateQueue.count() )
+        {
+            AudioState qState = m_stateQueue.dequeue();
+            checkStateQueue();
+        }
+    }
+}
+
+
+void
+AudioEngine::timerTriggered( qint64 time )
+{
+    emit timerMilliSeconds( time );
+
+    if ( m_timeElapsed != time / 1000 )
+    {
+        m_timeElapsed = time / 1000;
+        emit timerSeconds( m_timeElapsed );
+
+        if ( !m_currentTrack.isNull() )
+        {
+            if ( m_currentTrack->duration() == 0 )
+            {
+                emit timerPercentage( 0 );
+            }
+            else
+            {
+                emit timerPercentage( ( (double)m_timeElapsed / (double)m_currentTrack->duration() ) * 100.0 );
+            }
+        }
+    }
+}
+
+
+void
+AudioEngine::setPlaylist( Tomahawk::playlistinterface_ptr playlist )
+{
+    if ( m_playlist == playlist )
+        return;
+
+    if ( !m_playlist.isNull() )
+    {
+        if ( m_playlist.data() && m_playlist.data()->retryMode() == PlaylistModes::Retry )
+            disconnect( m_playlist.data(), SIGNAL( nextTrackReady() ) );
+        m_playlist.data()->reset();
+    }
+
+    if ( playlist.isNull() )
+    {
+        m_playlist.clear();
+        emit playlistChanged( playlist );
+        return;
+    }
+
+    m_playlist = playlist;
+    m_stopAfterTrack.clear();
+
+    if ( !m_playlist.isNull() && m_playlist.data() && m_playlist.data()->retryMode() == PlaylistModes::Retry )
+        connect( m_playlist.data(), SIGNAL( nextTrackReady() ), SLOT( onPlaylistNextTrackReady() ) );
+
+    emit playlistChanged( playlist );
+}
+
+
+void
+AudioEngine::setStopAfterTrack( const query_ptr& query )
+{
+    if ( m_stopAfterTrack != query )
+    {
+        m_stopAfterTrack = query;
+        emit stopAfterTrackChanged();
+    }
+}
+
+
+void
+AudioEngine::setCurrentTrack( const Tomahawk::result_ptr& result )
+{
+    if ( !m_currentTrack.isNull() )
+    {
+        if ( m_state != Error && TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::PublicListening )
+        {
+            DatabaseCommand_LogPlayback* cmd = new DatabaseCommand_LogPlayback( m_currentTrack, DatabaseCommand_LogPlayback::Finished, m_timeElapsed );
+            Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+        }
+
+        emit finished( m_currentTrack );
+    }
+
+    m_currentTrack = result;
+}
+
+
+bool
+AudioEngine::isHttpResult( const QString& url ) const
+{
+    return url.startsWith( "http://" ) || url.startsWith( "https://" );
+}
+
+
+bool
+AudioEngine::isLocalResult( const QString& url ) const
+{
+    return url.startsWith( "file://" );
+}
+
+
+void
+AudioEngine::checkStateQueue()
+{
+    if ( m_stateQueue.count() )
+    {
+        AudioState state = m_stateQueue.head();
+        tDebug() << "Applying state command:" << state;
+        switch ( state )
+        {
+            case Playing:
+            {
+                bool paused = isPaused();
+                m_mediaObject->play();
+                if ( paused )
+                    setVolume( m_volume );
+
+                break;
+            }
+
+            case Paused:
+            {
+                m_volume = volume();
+                m_mediaObject->pause();
+                break;
+            }
+        }
+    }
+    else
+        tDebug() << "Queue is empty";
+}
+
+
+void
+AudioEngine::queueStateSafety()
+{
+    tDebug() << Q_FUNC_INFO;
+    m_stateQueue.clear();
+}
+
+
+void
+AudioEngine::queueState( AudioState state )
+{
+    if ( m_stateQueueTimer.isActive() )
+        m_stateQueueTimer.stop();
+
+    tDebug() << "Enqueuing state command:" << state << m_stateQueue.count();
+    m_stateQueue.enqueue( state );
+
+    if ( m_stateQueue.count() == 1 )
+    {
+        checkStateQueue();
+    }
+
+    m_stateQueueTimer.start();
+}
+
+
+void
+AudioEngine::setState( AudioState state )
+{
+    AudioState oldState = m_state;
+    m_state = state;
+
+    emit stateChanged( state, oldState );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/audio/AudioEngine.h Added

@@ -0,0 +1,178 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 AUDIOENGINE_H
+#define AUDIOENGINE_H
+
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QQueue>
+
+#include <phonon/MediaObject>
+#include <phonon/AudioOutput>
+#include <phonon/BackendCapabilities>
+
+#include "libtomahawk/infosystem/InfoSystem.h"
+
+#include "Typedefs.h"
+#include "Result.h"
+#include "PlaylistInterface.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT AudioEngine : public QObject
+{
+Q_OBJECT
+
+public:
+    enum AudioErrorCode { StreamReadError, AudioDeviceError, DecodeError, UnknownError, NoError };
+    enum AudioState { Stopped, Playing, Paused, Error };
+
+    static AudioEngine* instance();
+
+    explicit AudioEngine();
+    ~AudioEngine();
+
+    QStringList supportedMimeTypes() const;
+    unsigned int volume() const { return m_audioOutput->volume() * 100.0; } // in percent
+
+    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_ptr currentTrackPlaylist() const { return m_currentTrackPlaylist; }
+
+    /* Returns the PlaylistInterface of the current playlist. Note: The currently playing track might still be from a different playlist! */
+    Tomahawk::playlistinterface_ptr playlist() const { return m_playlist; }
+
+    Tomahawk::result_ptr currentTrack() const { return m_currentTrack; }
+
+    Tomahawk::query_ptr stopAfterTrack() const  { return m_stopAfterTrack; }
+
+    qint64 currentTime() const { return m_mediaObject->currentTime(); }
+    qint64 currentTrackTotalTime() const { return m_mediaObject->totalTime(); }
+
+public slots:
+    void playPause();
+    void play();
+    void pause();
+    void stop( AudioErrorCode errorCode = NoError );
+
+    void previous();
+    void next();
+
+    bool canGoPrevious();
+    bool canGoNext();
+    bool canSeek();
+
+    void seek( qint64 ms );
+    void seek( int ms ); // for compatibility with seekbar in audiocontrols
+    void setVolume( int percentage );
+    void lowerVolume(); 
+    void raiseVolume();
+    void mute();
+
+    void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::result_ptr& result );
+    void playItem( Tomahawk::playlistinterface_ptr playlist, const Tomahawk::query_ptr& query );
+    void playItem( const Tomahawk::artist_ptr& artist );
+    void playItem( const Tomahawk::album_ptr& album );
+    void setPlaylist( Tomahawk::playlistinterface_ptr playlist );
+    void setQueue( Tomahawk::playlistinterface_ptr queue ) { m_queue = queue; }
+
+    void setStopAfterTrack( const Tomahawk::query_ptr& query );
+
+signals:
+    void loading( const Tomahawk::result_ptr& track );
+    void started( const Tomahawk::result_ptr& track );
+    void finished( const Tomahawk::result_ptr& track );
+    void stopped();
+    void paused();
+    void resumed();
+
+    void stopAfterTrackChanged();
+
+    void seeked( qint64 ms );
+
+    void stateChanged( AudioState newState, AudioState oldState );
+    void volumeChanged( int volume /* in percent */ );
+
+    void timerMilliSeconds( qint64 msElapsed );
+    void timerSeconds( unsigned int secondsElapsed );
+    void timerPercentage( unsigned int percentage );
+
+    void playlistChanged( Tomahawk::playlistinterface_ptr playlist );
+
+    void error( AudioEngine::AudioErrorCode errorCode );
+
+private slots:
+    bool loadTrack( const Tomahawk::result_ptr& result );
+    void loadPreviousTrack();
+    void loadNextTrack();
+
+    void onAboutToFinish();
+    void onStateChanged( Phonon::State newState, Phonon::State oldState );
+    void onVolumeChanged( qreal volume ) { emit volumeChanged( volume * 100 ); }
+    void timerTriggered( qint64 time );
+
+    void setCurrentTrack( const Tomahawk::result_ptr& result );
+    void onNowPlayingInfoReady( const Tomahawk::InfoSystem::InfoType type );
+    void onPlaylistNextTrackReady();
+
+    void sendNowPlayingNotification( const Tomahawk::InfoSystem::InfoType type );
+    void sendWaitingNotification() const;
+
+    void queueStateSafety();
+
+private:
+    void checkStateQueue();
+    void queueState( AudioState state );
+
+    void setState( AudioState state );
+
+    bool isHttpResult( const QString& ) const;
+    bool isLocalResult( const QString& ) const;
+
+    QSharedPointer<QIODevice> m_input;
+
+    Tomahawk::query_ptr m_stopAfterTrack;
+    Tomahawk::result_ptr m_currentTrack;
+    Tomahawk::playlistinterface_ptr m_playlist;
+    Tomahawk::playlistinterface_ptr m_currentTrackPlaylist;
+    Tomahawk::playlistinterface_ptr m_queue;
+
+    Phonon::MediaObject* m_mediaObject;
+    Phonon::AudioOutput* m_audioOutput;
+
+    unsigned int m_timeElapsed;
+    bool m_expectStop;
+    bool m_waitingOnNewTrack;
+
+    mutable QStringList m_supportedMimeTypes;
+    unsigned int m_volume;
+
+    AudioState m_state;
+    QQueue< AudioState > m_stateQueue;
+    QTimer m_stateQueueTimer;
+
+    static AudioEngine* s_instance;
+};
+
+#endif // AUDIOENGINE_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/ContextPage.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/ContextPage.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/ContextPage.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/ContextPage.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/ContextWidget.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/ContextWidget.cpp Changed

@@ -29,11 +29,10 @@
 #include "context/pages/TopTracksContext.h"
 #include "context/pages/WikipediaContext.h"
 
-#include "playlist/artistview.h"
-#include "playlist/treemodel.h"
+#include "Source.h"
 
-#include "utils/stylehelper.h"
-#include "utils/tomahawkutilsgui.h"
+#include "utils/StyleHelper.h"
+#include "utils/TomahawkUtilsGui.h"
 
 #define ANIMATION_TIME 450
 #define SLIDE_TIME 350
@@ -76,7 +75,7 @@
 
     ui->contextView->setScene( m_scene );
     ui->contextView->setFrameShape( QFrame::NoFrame );
-    ui->contextView->setStyleSheet( "background: transparent" );
+    ui->contextView->setStyleSheet( "QGraphicsView { background: transparent; }" );
     ui->contextView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
     ui->contextView->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 
@@ -96,7 +95,7 @@
 
     ensurePolished();
     QPalette pal = palette();
-    pal.setBrush( QPalette::Window, StyleHelper::headerLowerColor() );
+    pal.setBrush( QPalette::Window, QColor( "#454e59" ) );
     setPalette( pal );
 
     connect( ui->toggleButton, SIGNAL( clicked() ), SLOT( toggleSize() ) );

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/ContextWidget.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/ContextWidget.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/pages/RelatedArtistsContext.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/pages/RelatedArtistsContext.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/pages/RelatedArtistsContext.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/pages/RelatedArtistsContext.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/pages/TopTracksContext.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/pages/TopTracksContext.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/pages/TopTracksContext.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/pages/TopTracksContext.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/pages/WebContext.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/pages/WebContext.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/pages/WebContext.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/pages/WebContext.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/pages/WikipediaContext.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/pages/WikipediaContext.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/context/pages/WikipediaContext.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/context/pages/WikipediaContext.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/Database.cpp Added

@@ -0,0 +1,150 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "Database.h"
+
+#include "DatabaseCommand.h"
+#include "DatabaseImpl.h"
+#include "DatabaseWorker.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+#define DEFAULT_WORKER_THREADS 4
+#define MAX_WORKER_THREADS 16
+
+Database* Database::s_instance = 0;
+
+
+Database*
+Database::instance()
+{
+    return s_instance;
+}
+
+
+Database::Database( const QString& dbname, QObject* parent )
+    : QObject( parent )
+    , m_ready( false )
+    , m_impl( new DatabaseImpl( dbname ) )
+    , m_workerRW( new DatabaseWorker( this, true ) )
+{
+    s_instance = this;
+
+    if ( MAX_WORKER_THREADS < DEFAULT_WORKER_THREADS )
+        m_maxConcurrentThreads = MAX_WORKER_THREADS;
+    else
+        m_maxConcurrentThreads = qBound( DEFAULT_WORKER_THREADS, QThread::idealThreadCount(), MAX_WORKER_THREADS );
+
+    tDebug() << Q_FUNC_INFO << "Using" << m_maxConcurrentThreads << "database worker threads; current (GUI) thread is " << QThread::currentThread();
+
+    connect( m_impl, SIGNAL( indexReady() ), SIGNAL( indexReady() ) );
+    connect( m_impl, SIGNAL( indexReady() ), SIGNAL( ready() ) );
+    connect( m_impl, SIGNAL( indexReady() ), SLOT( setIsReadyTrue() ) );
+
+    m_workerRW->start();
+}
+
+
+Database::~Database()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    qDeleteAll( m_workers );
+    delete m_workerRW;
+    qDeleteAll( m_implHash.values() );
+    delete m_impl;
+}
+
+
+void
+Database::loadIndex()
+{
+    m_impl->loadIndex();
+}
+
+
+void
+Database::enqueue( const QList< QSharedPointer<DatabaseCommand> >& lc )
+{
+    Q_ASSERT( m_ready );
+    qDebug() << "Enqueueing" << lc.count() << "commands to rw thread";
+    m_workerRW->enqueue( lc );
+}
+
+
+void
+Database::enqueue( const QSharedPointer<DatabaseCommand>& lc )
+{
+    Q_ASSERT( m_ready );
+    if ( lc->doesMutates() )
+    {
+        qDebug() << "Enqueueing command to rw thread:" << lc->commandname();
+        m_workerRW->enqueue( lc );
+    }
+    else
+    {
+        // find existing amount of worker threads for commandname
+        // create new thread if < WORKER_THREADS
+        if ( m_workers.count() < m_maxConcurrentThreads )
+        {
+            DatabaseWorker* worker = new DatabaseWorker( this, false );
+            worker->start();
+
+            m_workers << worker;
+        }
+
+        // find thread for commandname with lowest amount of outstanding jobs and enqueue job
+        int busyThreads = 0;
+        DatabaseWorker* happyThread = 0;
+        for ( int i = 0; i < m_workers.count(); i++ )
+        {
+            DatabaseWorker* worker = m_workers.at( i );
+
+            if ( !worker->busy() )
+            {
+                happyThread = worker;
+                break;
+            }
+            busyThreads++;
+
+            if ( !happyThread || worker->outstandingJobs() < happyThread->outstandingJobs() )
+                happyThread = worker;
+        }
+
+//        qDebug() << "Enqueueing command to thread:" << happyThread << busyThreads << lc->commandname();
+        happyThread->enqueue( lc );
+    }
+}
+
+
+DatabaseImpl*
+Database::impl()
+{
+    QMutexLocker lock( &m_mutex );
+
+    QThread* thread = QThread::currentThread();
+    if ( !m_implHash.contains( thread ) )
+    {
+        tDebug() << Q_FUNC_INFO << "Creating database impl for thread" << QThread::currentThread();
+        DatabaseImpl* impl = m_impl->clone();
+        m_implHash.insert( thread, impl );
+    }
+
+    return m_implHash.value( thread );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/Database.h Added

@@ -0,0 +1,91 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 DATABASE_H
+#define DATABASE_H
+
+#include <QSharedPointer>
+#include <QVariant>
+
+#include "Artist.h"
+#include "Album.h"
+#include "DatabaseCommand.h"
+
+#include "DllMacro.h"
+
+class DatabaseImpl;
+class DatabaseWorker;
+
+/*
+    This class is really a firewall/pimpl - the public functions of LibraryImpl
+    are the ones that operate on the database, without any locks.
+
+    HOWEVER, we're using the command pattern to serialize access to the database
+    and provide an async api. You create a DatabaseCommand object, and add it to
+    the queue of work. There is a threadpool responsible for exec'ing all
+    the non-mutating (readonly) commands and one separate thread for mutating ones,
+    so sqlite doesn't write to the Database from multiple threads.
+*/
+class DLLEXPORT Database : public QObject
+{
+Q_OBJECT
+
+public:
+    static Database* instance();
+
+    explicit Database( const QString& dbname, QObject* parent = 0 );
+    ~Database();
+
+    void loadIndex();
+    bool isReady() const { return m_ready; }
+
+    DatabaseImpl* impl();
+
+signals:
+    void indexReady(); // search index
+    void ready();
+
+    void newJobRO( QSharedPointer<DatabaseCommand> );
+    void newJobRW( QSharedPointer<DatabaseCommand> );
+
+public slots:
+    void enqueue( const QSharedPointer<DatabaseCommand>& lc );
+    void enqueue( const QList< QSharedPointer<DatabaseCommand> >& lc );
+
+private slots:
+    void setIsReadyTrue() { m_ready = true; }
+
+private:
+    bool m_ready;
+
+    DatabaseImpl* m_impl;
+    DatabaseWorker* m_workerRW;
+    QList<DatabaseWorker*> m_workers;
+    int m_maxConcurrentThreads;
+
+    QHash< QThread*, DatabaseImpl* > m_implHash;
+    QMutex m_mutex;
+
+    static Database* s_instance;
+
+    friend class Tomahawk::Artist;
+    friend class Tomahawk::Album;
+};
+
+#endif // DATABASE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCollection.cpp Added

@@ -0,0 +1,168 @@
+/* === 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
+ *   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 "DatabaseCollection.h"
+
+#include "database/Database.h"
+#include "DatabaseCommand_AllTracks.h"
+#include "DatabaseCommand_AddFiles.h"
+#include "DatabaseCommand_DeleteFiles.h"
+#include "DatabaseCommand_LoadAllPlaylists.h"
+#include "DatabaseCommand_LoadAllAutoPlaylists.h"
+#include "DatabaseCommand_LoadAllStations.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+DatabaseCollection::DatabaseCollection( const source_ptr& src, QObject* parent )
+    : Collection( src, QString( "dbcollection:%1" ).arg( src->userName() ), parent )
+{
+}
+
+
+void
+DatabaseCollection::loadPlaylists()
+{
+    DatabaseCommand_LoadAllPlaylists* cmd = new DatabaseCommand_LoadAllPlaylists( source() );
+
+    connect( cmd,  SIGNAL( done( const QList<Tomahawk::playlist_ptr>& ) ),
+                     SLOT( setPlaylists( const QList<Tomahawk::playlist_ptr>& ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+DatabaseCollection::loadAutoPlaylists()
+{
+    DatabaseCommand_LoadAllAutoPlaylists* cmd = new DatabaseCommand_LoadAllAutoPlaylists( source() );
+
+    connect( cmd, SIGNAL( autoPlaylistLoaded( Tomahawk::source_ptr, QVariantList ) ),
+                    SLOT( autoPlaylistCreated( const Tomahawk::source_ptr&, const QVariantList& ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+DatabaseCollection::loadStations()
+{
+    DatabaseCommand_LoadAllStations* cmd = new DatabaseCommand_LoadAllStations( source() );
+
+    connect( cmd, SIGNAL( stationLoaded( Tomahawk::source_ptr, QVariantList ) ),
+             SLOT( stationCreated( const Tomahawk::source_ptr&, const QVariantList& ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+DatabaseCollection::addTracks( const QList<QVariant>& newitems )
+{
+    qDebug() << Q_FUNC_INFO << newitems.length();
+    DatabaseCommand_AddFiles* cmd = new DatabaseCommand_AddFiles( newitems, source() );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+DatabaseCollection::removeTracks( const QDir& dir )
+{
+    qDebug() << Q_FUNC_INFO << dir;
+    DatabaseCommand_DeleteFiles* cmd = new DatabaseCommand_DeleteFiles( dir, source() );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+QList< Tomahawk::playlist_ptr >
+DatabaseCollection::playlists()
+{
+    if ( Collection::playlists().isEmpty() )
+    {
+        loadPlaylists();
+    }
+
+    return Collection::playlists();
+}
+
+
+QList< dynplaylist_ptr >
+DatabaseCollection::autoPlaylists()
+{
+    if ( Collection::autoPlaylists().isEmpty() )
+    {
+        loadAutoPlaylists();
+    }
+
+    return Collection::autoPlaylists();
+}
+
+
+QList< dynplaylist_ptr >
+DatabaseCollection::stations()
+{
+    if ( Collection::stations().isEmpty() )
+    {
+        loadStations();
+    }
+
+    return Collection::stations();
+}
+
+
+void
+DatabaseCollection::autoPlaylistCreated( const source_ptr& source, const QVariantList& data )
+{
+    dynplaylist_ptr p( new DynamicPlaylist( source,                  //src
+                                            data0.toString(),  //current rev
+                                            data1.toString(),  //title
+                                            data2.toString(),  //info
+                                            data3.toString(),  //creator
+                                            data4.toUInt(),  // createdOn
+                                            data5.toString(),  // dynamic type
+                                            static_cast<GeneratorMode>(data6.toInt()),  // dynamic mode
+                                            data7.toBool(),    //shared
+                                            data8.toInt(),     //lastmod
+                                            data9.toString() ), &QObject::deleteLater );  //GUID
+    addAutoPlaylist( p );
+}
+
+
+void
+DatabaseCollection::stationCreated( const source_ptr& source, const QVariantList& data )
+{
+    dynplaylist_ptr p( new DynamicPlaylist( source,                  //src
+                                            data0.toString(),  //current rev
+                                            data1.toString(),  //title
+                                            data2.toString(),  //info
+                                            data3.toString(),  //creator
+                                            data4.toUInt(),  // createdOn
+                                            data5.toString(),  // dynamic type
+                                            static_cast<GeneratorMode>(data6.toInt()),  // dynamic mode
+                                            data7.toBool(),    //shared
+                                            data8.toInt(),     //lastmod
+                                            data9.toString() ), &QObject::deleteLater );  //GUID
+    addStation( p );
+}
+
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCollection.h Added

@@ -0,0 +1,59 @@
+/* === 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
+ *   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 DATABASECOLLECTION_H
+#define DATABASECOLLECTION_H
+
+#include <QDir>
+
+#include "Collection.h"
+#include "Source.h"
+#include "Typedefs.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCollection : public Tomahawk::Collection
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseCollection( const Tomahawk::source_ptr& source, QObject* parent = 0 );
+    ~DatabaseCollection()
+    {
+        qDebug() << Q_FUNC_INFO;
+    }
+
+    virtual void loadPlaylists();
+    virtual void loadAutoPlaylists();
+    virtual void loadStations();
+
+    virtual QList< Tomahawk::playlist_ptr > playlists();
+    virtual QList< Tomahawk::dynplaylist_ptr > autoPlaylists();
+    virtual QList< Tomahawk::dynplaylist_ptr > stations();
+
+public slots:
+    virtual void addTracks( const QList<QVariant>& newitems );
+    virtual void removeTracks( const QDir& dir );
+
+private slots:
+    void stationCreated( const Tomahawk::source_ptr& source, const QVariantList& data );
+    void autoPlaylistCreated( const Tomahawk::source_ptr& source, const QVariantList& data );
+};
+
+#endif // DATABASECOLLECTION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand.cpp Added

@@ -0,0 +1,192 @@
+/* === 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
+ *   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.h"
+
+#include "DatabaseCommand_AddFiles.h"
+#include "DatabaseCommand_CreatePlaylist.h"
+#include "DatabaseCommand_DeleteFiles.h"
+#include "DatabaseCommand_DeletePlaylist.h"
+#include "DatabaseCommand_LogPlayback.h"
+#include "DatabaseCommand_RenamePlaylist.h"
+#include "DatabaseCommand_SetPlaylistRevision.h"
+#include "DatabaseCommand_CreateDynamicPlaylist.h"
+#include "DatabaseCommand_DeleteDynamicPlaylist.h"
+#include "DatabaseCommand_SetDynamicPlaylistRevision.h"
+#include "DatabaseCommand_SocialAction.h"
+
+#include "utils/Logger.h"
+#include "DatabaseCommand_SetCollectionAttributes.h"
+#include "DatabaseCommand_SetTrackAttributes.h"
+
+
+DatabaseCommand::DatabaseCommand( QObject* parent )
+    : QObject( parent )
+    , m_state( PENDING )
+{
+    //qDebug() << Q_FUNC_INFO;
+}
+
+
+DatabaseCommand::DatabaseCommand( const source_ptr& src, QObject* parent )
+    : QObject( parent )
+    , m_state( PENDING )
+    , m_source( src )
+{
+    //qDebug() << Q_FUNC_INFO;
+}
+
+DatabaseCommand::DatabaseCommand( const DatabaseCommand& other )
+    : QObject( other.parent() )
+{
+}
+
+DatabaseCommand::~DatabaseCommand()
+{
+//    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+DatabaseCommand::_exec( DatabaseImpl* lib )
+{
+    //qDebug() << "RUNNING" << thread();
+    m_state = RUNNING;
+    emit running();
+    exec( lib );
+    m_state = FINISHED;
+    //qDebug() << "FINISHED" << thread();
+}
+
+
+void
+DatabaseCommand::setSource( const Tomahawk::source_ptr& s )
+{
+    m_source = s;
+}
+
+
+const Tomahawk::source_ptr&
+DatabaseCommand::source() const
+{
+    return m_source;
+}
+
+
+DatabaseCommand*
+DatabaseCommand::factory( const QVariant& op, const source_ptr& source )
+{
+    const QString name = op.toMap().value( "command" ).toString();
+
+    if( name == "addfiles" )
+    {
+        DatabaseCommand_AddFiles * cmd = new DatabaseCommand_AddFiles;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "deletefiles" )
+    {
+        DatabaseCommand_DeleteFiles * cmd = new DatabaseCommand_DeleteFiles;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "createplaylist" )
+    {
+        DatabaseCommand_CreatePlaylist * cmd = new DatabaseCommand_CreatePlaylist;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "deleteplaylist" )
+    {
+        DatabaseCommand_DeletePlaylist * cmd = new DatabaseCommand_DeletePlaylist;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "logplayback" )
+    {
+        DatabaseCommand_LogPlayback * cmd = new DatabaseCommand_LogPlayback;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "renameplaylist" )
+    {
+        DatabaseCommand_RenamePlaylist * cmd = new DatabaseCommand_RenamePlaylist;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "setplaylistrevision" )
+    {
+        DatabaseCommand_SetPlaylistRevision * cmd = new DatabaseCommand_SetPlaylistRevision;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "createdynamicplaylist" )
+    {
+        DatabaseCommand_CreateDynamicPlaylist * cmd = new DatabaseCommand_CreateDynamicPlaylist;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "deletedynamicplaylist" )
+    {
+        DatabaseCommand_DeleteDynamicPlaylist * cmd = new DatabaseCommand_DeleteDynamicPlaylist;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "setdynamicplaylistrevision" )
+    {
+        qDebug() << "SETDYN CONTENT:" << op;
+        DatabaseCommand_SetDynamicPlaylistRevision * cmd = new DatabaseCommand_SetDynamicPlaylistRevision;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "socialaction" )
+    {
+        DatabaseCommand_SocialAction * cmd = new DatabaseCommand_SocialAction;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "setcollectionattributes" )
+    {
+        DatabaseCommand_SetCollectionAttributes * cmd = new DatabaseCommand_SetCollectionAttributes;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+    else if( name == "settrackattributes" )
+    {
+        DatabaseCommand_SetTrackAttributes * cmd = new DatabaseCommand_SetTrackAttributes;
+        cmd->setSource( source );
+        QJson::QObjectHelper::qvariant2qobject( op.toMap(), cmd );
+        return cmd;
+    }
+
+    qDebug() << "Unknown database command" << name;
+//    Q_ASSERT( false );
+    return NULL;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand.h Added

@@ -0,0 +1,109 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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_H
+#define DATABASECOMMAND_H
+
+#include <QObject>
+#include <QMetaType>
+#include <QTime>
+#include <QSqlQuery>
+#include <QVariant>
+
+#include "Typedefs.h"
+#include "database/Op.h"
+
+#include "DllMacro.h"
+
+class DatabaseImpl;
+
+class DLLEXPORT DatabaseCommand : public QObject
+{
+Q_OBJECT
+Q_PROPERTY( QString guid READ guid WRITE setGuid )
+
+public:
+    enum State {
+        PENDING = 0,
+        RUNNING = 1,
+        FINISHED = 2
+    };
+
+    explicit DatabaseCommand( QObject* parent = 0 );
+    explicit DatabaseCommand( const Tomahawk::source_ptr& src, QObject* parent = 0 );
+
+    DatabaseCommand( const DatabaseCommand &other );
+
+    virtual ~DatabaseCommand();
+
+    virtual QString commandname() const { return "DatabaseCommand"; }
+    virtual bool doesMutates() const { return true; }
+    State state() const { return m_state; }
+
+    // if i make this pure virtual, i get compile errors in qmetatype.h.
+    // we need Q_DECLARE_METATYPE to use in queued sig/slot connections.
+    virtual void exec( DatabaseImpl* /*lib*/ ) { Q_ASSERT( false ); }
+
+    void _exec( DatabaseImpl* lib );
+
+    // stuff to do once transaction applied ok.
+    // Don't change the database from in here, duh.
+    void postCommit() { postCommitHook(); emit committed(); }
+    virtual void postCommitHook(){};
+
+    void setSource( const Tomahawk::source_ptr& s );
+    const Tomahawk::source_ptr& source() const;
+
+    virtual bool loggable() const { return false; }
+    virtual bool groupable() const { return false; }
+    virtual bool singletonCmd() const { return false; }
+    virtual bool localOnly() const { return false; }
+
+    virtual QVariant data() const { return m_data; }
+    virtual void setData( const QVariant& data ) { m_data = data; }
+
+    QString guid() const
+    {
+        if( m_guid.isEmpty() )
+            m_guid = uuid();
+
+        return m_guid;
+    }
+    void setGuid( const QString& g ) { m_guid = g; }
+
+    void emitFinished() { emit finished(); }
+
+    static DatabaseCommand* factory( const QVariant& op, const Tomahawk::source_ptr& source );
+
+signals:
+    void running();
+    void finished();
+    void committed();
+
+private:
+    State m_state;
+    Tomahawk::source_ptr m_source;
+    mutable QString m_guid;
+
+    QVariant m_data;
+};
+
+Q_DECLARE_METATYPE( DatabaseCommand )
+
+#endif // DATABASECOMMAND_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommandLoggable.cpp Added

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommandLoggable.h Added

@@ -0,0 +1,45 @@
+/* === 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
+ *   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 DATABASECOMMANDLOGGABLE_H
+#define DATABASECOMMANDLOGGABLE_H
+
+#include "database/DatabaseCommand.h"
+#include "DllMacro.h"
+
+/// A Database Command that will be added to the oplog and sent over the network
+/// so peers can sync up and changes to our collection in their cached copy.
+class DLLEXPORT DatabaseCommandLoggable : public DatabaseCommand
+{
+Q_OBJECT
+Q_PROPERTY(QString command READ commandname)
+
+public:
+
+    explicit DatabaseCommandLoggable( QObject* parent = 0 )
+        : DatabaseCommand( parent )
+    {}
+
+    explicit DatabaseCommandLoggable( const Tomahawk::source_ptr& s, QObject* parent = 0 )
+        : DatabaseCommand( s, parent )
+    {}
+
+    virtual bool loggable() const { return true; }
+};
+
+#endif // DATABASECOMMANDLOGGABLE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AddClientAuth.cpp Added

@@ -0,0 +1,56 @@
+/* === 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_AddClientAuth.h"
+
+#include "DatabaseImpl.h"
+#include "TomahawkSqlQuery.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+
+DatabaseCommand_AddClientAuth::DatabaseCommand_AddClientAuth( const QString& clientToken,
+                                                              const QString& website,
+                                                              const QString& name,
+                                                              const QString& userAgent,
+                                                              QObject* parent )
+    : DatabaseCommand( parent )
+    , m_clientToken( clientToken )
+    , m_website( website )
+    , m_name( name )
+    , m_userAgent( userAgent )
+{
+}
+
+
+void DatabaseCommand_AddClientAuth::exec( DatabaseImpl* lib )
+{
+    TomahawkSqlQuery q = lib->newquery();
+    q.prepare( "INSERT INTO http_client_auth (token, website, name, ua, mtime, permissions) VALUES (?, ?, ?, ?, ?, ?)" );
+    q.addBindValue( m_clientToken );
+    q.addBindValue( m_website );
+    q.addBindValue( m_name );
+    q.addBindValue( m_userAgent );
+    q.addBindValue( 0 );
+    q.addBindValue( "*" );
+
+    if ( !q.exec() )
+    {
+        qWarning() << "Failed to insert http client into auth table!";
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AddClientAuth.h Added

@@ -0,0 +1,48 @@
+/* === 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
+ *   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_ADDCLIENTAUTH_H
+#define DATABASECOMMAND_ADDCLIENTAUTH_H
+
+#include "DatabaseCommand.h"
+#include "DllMacro.h"
+
+#include <QObject>
+
+class DatabaseImpl;
+
+class DLLEXPORT DatabaseCommand_AddClientAuth : public DatabaseCommand
+{
+    Q_OBJECT
+public:
+    explicit DatabaseCommand_AddClientAuth( QObject* parent = 0 )
+            : DatabaseCommand( parent )
+    {}
+
+    explicit DatabaseCommand_AddClientAuth( const QString& clientToken, const QString& website, const QString& name, const QString& userAgent, QObject* parent = 0 );
+
+    QString commandname() const { return "addclientauth"; }
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual bool doesMutates() const { return true; }
+
+private:
+    QString m_clientToken, m_website, m_name, m_userAgent;
+};
+
+#endif // DATABASECOMMAND_ADDCLIENTAUTH_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AddFiles.cpp Added

@@ -0,0 +1,170 @@
+/* === 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
+ *   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_AddFiles.h"
+
+#include <QSqlQuery>
+
+#include "Artist.h"
+#include "Album.h"
+#include "Collection.h"
+#include "database/Database.h"
+#include "DatabaseImpl.h"
+#include "network/DbSyncConnection.h"
+#include "network/Servent.h"
+#include "SourceList.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+// remove file paths when making oplog/for network transmission
+QVariantList
+DatabaseCommand_AddFiles::files() const
+{
+    QVariantList list;
+    foreach ( const QVariant& v, m_files )
+    {
+        // replace url with the id, we don't leak file paths over the network.
+        QVariantMap m = v.toMap();
+        m.remove( "url" );
+        m.insert( "url", QString::number( m.value( "id" ).toInt() ) );
+        list.append( m );
+    }
+    return list;
+}
+
+
+// After changing a collection, we need to tell other bits of the system:
+void
+DatabaseCommand_AddFiles::postCommitHook()
+{
+    // make the collection object emit its tracksAdded signal, so the
+    // collection browser will update/fade in etc.
+    Collection* coll = source()->collection().data();
+
+    connect( this, SIGNAL( notify( QList<unsigned int> ) ),
+             coll,   SLOT( setTracks( QList<unsigned int> ) ), Qt::QueuedConnection );
+
+    emit notify( m_ids );
+
+    if ( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+}
+
+
+void
+DatabaseCommand_AddFiles::exec( DatabaseImpl* dbi )
+{
+    qDebug() << Q_FUNC_INFO;
+    Q_ASSERT( !source().isNull() );
+
+    TomahawkSqlQuery query_file = dbi->newquery();
+    TomahawkSqlQuery query_filejoin = dbi->newquery();
+    TomahawkSqlQuery query_trackattr = dbi->newquery();
+
+    query_file.prepare( "INSERT INTO file(source, url, size, mtime, md5, mimetype, duration, bitrate) VALUES (?, ?, ?, ?, ?, ?, ?, ?)" );
+    query_filejoin.prepare( "INSERT INTO file_join(file, artist, album, track, albumpos, composer, discnumber) VALUES (?, ?, ?, ?, ?, ?, ?)" );
+    query_trackattr.prepare( "INSERT INTO track_attributes(id, k, v) VALUES (?, ?, ?)" );
+
+    int added = 0;
+    QVariant srcid = source()->isLocal() ? QVariant( QVariant::Int ) : source()->id();
+    qDebug() << "Adding" << m_files.length() << "files to db for source" << srcid;
+
+    QList<QVariant>::iterator it;
+    for ( it = m_files.begin(); it != m_files.end(); ++it )
+    {
+        QVariant& v = *it;
+        QVariantMap m = v.toMap();
+
+        int fileid = 0, artistid = 0, albumid = 0, trackid = 0, composerid = 0;
+
+        QString url      = m.value( "url" ).toString();
+        int mtime        = m.value( "mtime" ).toInt();
+        uint size        = m.value( "size" ).toUInt();
+        QString hash     = m.value( "hash" ).toString();
+        QString mimetype = m.value( "mimetype" ).toString();
+        uint duration    = m.value( "duration" ).toUInt();
+        uint bitrate     = m.value( "bitrate" ).toUInt();
+        QString artist   = m.value( "artist" ).toString();
+        QString album    = m.value( "album" ).toString();
+        QString track    = m.value( "track" ).toString();
+        uint albumpos    = m.value( "albumpos" ).toUInt();
+        QString composer = m.value( "composer" ).toString();
+        uint discnumber  = m.value( "discnumber" ).toUInt();
+        int year         = m.value( "year" ).toInt();
+
+        query_file.bindValue( 0, srcid );
+        query_file.bindValue( 1, url );
+        query_file.bindValue( 2, size );
+        query_file.bindValue( 3, mtime );
+        query_file.bindValue( 4, hash );
+        query_file.bindValue( 5, mimetype );
+        query_file.bindValue( 6, duration );
+        query_file.bindValue( 7, bitrate );
+        query_file.exec();
+
+        if ( added % 1000 == 0 )
+            qDebug() << "Inserted" << added;
+
+        // get internal IDs for art/alb/trk
+        fileid = query_file.lastInsertId().toInt();
+        m.insert( "id", fileid );
+        // this is the qvariant(map) the remote will get
+        v = m;
+
+        artistid = dbi->artistId( artist, true );
+        if ( artistid < 1 )
+            continue;
+        trackid = dbi->trackId( artistid, track, true );
+        if ( trackid < 1 )
+            continue;
+        albumid = dbi->albumId( artistid, album, true );
+
+        if( !composer.trimmed().isEmpty() )
+            composerid = dbi->artistId( composer, true );
+
+        // Now add the association
+        query_filejoin.bindValue( 0, fileid );
+        query_filejoin.bindValue( 1, artistid );
+        query_filejoin.bindValue( 2, albumid > 0 ? albumid : QVariant( QVariant::Int ) );
+        query_filejoin.bindValue( 3, trackid );
+        query_filejoin.bindValue( 4, albumpos );
+        query_filejoin.bindValue( 5, composerid > 0 ? composerid : QVariant( QVariant::Int ) );
+        query_filejoin.bindValue( 6, discnumber );
+        if ( !query_filejoin.exec() )
+        {
+            qDebug() << "Error inserting into file_join table";
+            continue;
+        }
+
+        query_trackattr.bindValue( 0, trackid );
+        query_trackattr.bindValue( 1, "releaseyear" );
+        query_trackattr.bindValue( 2, year );
+        query_trackattr.exec();
+
+        m_ids << fileid;
+        added++;
+    }
+
+    qDebug() << "Inserted" << added << "tracks to database";
+    tDebug() << "Committing" << added << "tracks...";
+
+    emit done( m_files, source()->collection() );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AddFiles.h Added

@@ -0,0 +1,65 @@
+/* === 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
+ *   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_ADDFILES_H
+#define DATABASECOMMAND_ADDFILES_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "database/DatabaseCommandLoggable.h"
+#include "Typedefs.h"
+#include "Query.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_AddFiles : public DatabaseCommandLoggable
+{
+Q_OBJECT
+Q_PROPERTY( QVariantList files READ files WRITE setFiles )
+
+public:
+    explicit DatabaseCommand_AddFiles( QObject* parent = 0 )
+        : DatabaseCommandLoggable( parent )
+    {}
+
+    explicit DatabaseCommand_AddFiles( const QList<QVariant>& files, const Tomahawk::source_ptr& source, QObject* parent = 0 )
+        : DatabaseCommandLoggable( parent ), m_files( files )
+    {
+        setSource( source );
+    }
+
+    virtual QString commandname() const { return "addfiles"; }
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return true; }
+    virtual void postCommitHook();
+
+    QVariantList files() const;
+    void setFiles( const QVariantList& f ) { m_files = f; }
+
+signals:
+    void done( const QList<QVariant>&, const Tomahawk::collection_ptr& );
+    void notify( const QList<unsigned int>& ids );
+
+private:
+    QVariantList m_files;
+    QList<unsigned int> m_ids;
+};
+
+#endif // DATABASECOMMAND_ADDFILES_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AddSource.cpp Added

@@ -0,0 +1,67 @@
+/* === 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
+ *   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_AddSource.h"
+
+#include <QSqlQuery>
+
+#include "DatabaseImpl.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+
+DatabaseCommand_addSource::DatabaseCommand_addSource( const QString& username, const QString& fname, QObject* parent )
+    : DatabaseCommand( parent )
+    , m_username( username )
+    , m_fname( fname )
+{
+}
+
+
+void
+DatabaseCommand_addSource::exec( DatabaseImpl* dbi )
+{
+    Q_ASSERT( !m_fname.isEmpty() );
+
+    TomahawkSqlQuery query = dbi->newquery();
+    query.prepare( "SELECT id FROM source WHERE name = ?" );
+    query.addBindValue( m_username );
+    query.exec();
+
+    if ( query.next() )
+    {
+        unsigned int id = query.value( 0 ).toInt();
+        query.prepare( "UPDATE source SET isonline = 'true', friendlyname = ? WHERE id = ?" );
+        query.addBindValue( m_fname );
+        query.addBindValue( id );
+        query.exec();
+        emit done( id, m_fname );
+        return;
+    }
+
+    query.prepare( "INSERT INTO source(name, friendlyname, isonline) VALUES(?,?,?)" );
+    query.addBindValue( m_username );
+    query.addBindValue( m_fname );
+    query.addBindValue( true );
+    query.exec();
+
+    unsigned int id = query.lastInsertId().toUInt();
+    tDebug() << "Inserted new source to DB, id:" << id << "friendlyname" << m_username;
+
+    emit done( id, m_fname );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AddSource.h Added

@@ -0,0 +1,46 @@
+/* === 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
+ *   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_ADDSOURCE_H
+#define DATABASECOMMAND_ADDSOURCE_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_addSource : public DatabaseCommand
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseCommand_addSource( const QString& username, const QString& fname, QObject* parent = 0 );
+    virtual void exec( DatabaseImpl* lib );
+    virtual bool doesMutates() const { return true; }
+    virtual QString commandname() const { return "addsource"; }
+
+signals:
+    void done( unsigned int, const QString& );
+
+private:
+    QString m_username, m_fname;
+};
+
+#endif // DATABASECOMMAND_ADDSOURCE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp Added

@@ -0,0 +1,180 @@
+/* === 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
+ *   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_AllAlbums.h"
+
+#include <QSqlQuery>
+
+#include "Artist.h"
+#include "DatabaseImpl.h"
+#include "Source.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+
+DatabaseCommand_AllAlbums::DatabaseCommand_AllAlbums( const Tomahawk::collection_ptr &collection, const Tomahawk::artist_ptr &artist, QObject *parent )
+  : DatabaseCommand( parent )
+  , m_collection( collection )
+  , m_artist( artist )
+  , m_amount( 0 )
+  , m_sortOrder( DatabaseCommand_AllAlbums::None )
+  , m_sortDescending( false )
+{}
+
+
+DatabaseCommand_AllAlbums::~DatabaseCommand_AllAlbums()
+{}
+
+
+void
+DatabaseCommand_AllAlbums::setArtist( const Tomahawk::artist_ptr &artist )
+{
+    m_artist = artist;
+}
+
+
+void
+DatabaseCommand_AllAlbums::execForArtist( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    QList<Tomahawk::album_ptr> al;
+    QString orderToken, sourceToken, filterToken, tables;
+
+    switch ( m_sortOrder )
+    {
+        case 0:
+            break;
+
+        case ModificationTime:
+            orderToken = "file.mtime";
+    }
+
+    if ( !m_collection.isNull() )
+        sourceToken = QString( "AND file.source %1 " ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) );
+
+    if ( !m_filter.isEmpty() )
+    {
+        QString filtersql;
+        QStringList sl = m_filter.split( " ", QString::SkipEmptyParts );
+        foreach( QString s, sl )
+        {
+            filtersql += QString( " AND ( artist.name LIKE '%%1%' OR album.name LIKE '%%1%' OR track.name LIKE '%%1%' )" ).arg( TomahawkSqlQuery::escape( s ) );
+        }
+
+        filterToken = QString( "AND artist.id = file_join.artist AND file_join.track = track.id %1" ).arg( filtersql );
+        tables = "file, file_join, artist, track";
+    }
+    else
+        tables = "file, file_join";
+
+    QString sql = QString(
+        "SELECT DISTINCT album.id, album.name "
+        "FROM %1 "
+        "LEFT OUTER JOIN album ON file_join.album = album.id "
+        "WHERE file.id = file_join.file "
+        "AND file_join.artist = %2 "
+        "%3 %4 %5 %6 %7"
+        ).arg( tables )
+         .arg( m_artist->id() )
+         .arg( sourceToken )
+         .arg( filterToken )
+         .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
+         .arg( m_sortDescending ? "DESC" : QString() )
+         .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );
+
+    query.prepare( sql );
+    query.exec();
+
+    while( query.next() )
+    {
+        unsigned int albumId = query.value( 0 ).toUInt();
+        QString albumName = query.value( 1 ).toString();
+        if ( query.value( 0 ).isNull() )
+        {
+            albumName = tr( "Unknown" );
+        }
+
+        Tomahawk::album_ptr album = Tomahawk::Album::get( albumId, albumName, m_artist );
+        al << album;
+    }
+
+    emit albums( al, data() );
+    emit done();
+}
+
+
+void
+DatabaseCommand_AllAlbums::execForCollection( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    QList<Tomahawk::album_ptr> al;
+    QString orderToken, sourceToken;
+
+    switch ( m_sortOrder )
+    {
+        case 0:
+            break;
+
+        case ModificationTime:
+            orderToken = "file.mtime";
+    }
+
+    if ( !m_collection.isNull() )
+        sourceToken = QString( "AND file.source %1 " ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) );
+
+    QString sql = QString(
+        "SELECT DISTINCT album.id, album.name, album.artist, artist.name "
+        "FROM file_join, file, album "
+        "LEFT OUTER JOIN artist ON album.artist = artist.id "
+        "WHERE file.id = file_join.file "
+        "AND file_join.album = album.id "
+        "%1 "
+        "%2 %3 %4"
+        ).arg( sourceToken )
+         .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
+         .arg( m_sortDescending ? "DESC" : QString() )
+         .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );
+
+    query.prepare( sql );
+    query.exec();
+
+    while( query.next() )
+    {
+        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( query.value( 2 ).toUInt(), query.value( 3 ).toString() );
+        Tomahawk::album_ptr album = Tomahawk::Album::get( query.value( 0 ).toUInt(), query.value( 1 ).toString(), artist );
+
+        al << album;
+    }
+
+    emit albums( al, data() );
+    emit done();
+}
+
+
+void
+DatabaseCommand_AllAlbums::exec( DatabaseImpl* dbi )
+{
+    if ( !m_artist.isNull() )
+    {
+        execForArtist( dbi );
+    }
+    else
+    {
+        execForCollection( dbi );
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AllAlbums.h Added

@@ -0,0 +1,75 @@
+/* === 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
+ *   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_ALLALBUMS_H
+#define DATABASECOMMAND_ALLALBUMS_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "Album.h"
+#include "Artist.h"
+#include "Collection.h"
+#include "Typedefs.h"
+#include "DatabaseCommand.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_AllAlbums : public DatabaseCommand
+{
+Q_OBJECT
+public:
+    enum SortOrder {
+        None = 0,
+        ModificationTime = 1
+    };
+
+    explicit DatabaseCommand_AllAlbums( const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr(), const Tomahawk::artist_ptr& artist = Tomahawk::artist_ptr(), QObject* parent = 0 );
+    virtual ~DatabaseCommand_AllAlbums();
+
+    virtual void exec( DatabaseImpl* );
+
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "allalbums"; }
+
+    Tomahawk::collection_ptr collection() const { return m_collection; }
+
+    void execForCollection( DatabaseImpl* );
+    void execForArtist( DatabaseImpl* );
+
+    void setArtist( const Tomahawk::artist_ptr& 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; }
+    void setFilter( const QString& filter ) { m_filter = filter; }
+
+signals:
+    void albums( const QList<Tomahawk::album_ptr>&, const QVariant& data );
+    void done();
+
+private:
+    Tomahawk::collection_ptr m_collection;
+    Tomahawk::artist_ptr m_artist;
+
+    unsigned int m_amount;
+    DatabaseCommand_AllAlbums::SortOrder m_sortOrder;
+    bool m_sortDescending;
+    QString m_filter;
+};
+
+#endif // DATABASECOMMAND_ALLALBUMS_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AllArtists.cpp Added

@@ -0,0 +1,107 @@
+/* === 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
+ *   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_AllArtists.h"
+
+#include <QSqlQuery>
+
+#include "Artist.h"
+#include "DatabaseImpl.h"
+#include "Source.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+
+DatabaseCommand_AllArtists::DatabaseCommand_AllArtists( const Tomahawk::collection_ptr &collection, QObject *parent )
+    : DatabaseCommand( parent )
+    , m_collection( collection )
+    , m_amount( 0 )
+    , m_sortOrder( DatabaseCommand_AllArtists::None )
+    , m_sortDescending( false )
+{
+}
+
+
+DatabaseCommand_AllArtists::~DatabaseCommand_AllArtists()
+{
+}
+
+
+void
+DatabaseCommand_AllArtists::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    QList<Tomahawk::artist_ptr> al;
+    QString orderToken, sourceToken, filterToken, tables, joins;
+
+    switch ( m_sortOrder )
+    {
+        case 0:
+            break;
+
+        case ModificationTime:
+            orderToken = "file.mtime";
+    }
+
+    if ( !m_collection.isNull() )
+        sourceToken = QString( "AND file.source %1" ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) );
+
+    if ( !m_filter.isEmpty() )
+    {
+        QString filtersql;
+        QStringList sl = m_filter.split( " ", QString::SkipEmptyParts );
+        foreach( QString s, sl )
+        {
+            filtersql += QString( " AND ( artist.name LIKE '%%1%' OR album.name LIKE '%%1%' OR track.name LIKE '%%1%' )" ).arg( TomahawkSqlQuery::escape( s ) );
+        }
+
+        filterToken = QString( "AND file_join.track = track.id %1" ).arg( filtersql );
+        joins = "LEFT JOIN album ON album.id = file_join.album";
+        tables = "artist, track, file, file_join";
+    }
+    else
+        tables = "artist, file, file_join";
+
+    QString sql = QString(
+            "SELECT DISTINCT artist.id, artist.name "
+            "FROM %1 "
+            "%2 "
+            "WHERE file.id = file_join.file "
+            "AND file_join.artist = artist.id "
+            "%3 %4 %5 %6 %7"
+            ).arg( tables )
+             .arg( joins )
+             .arg( sourceToken )
+             .arg( filterToken )
+             .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
+             .arg( m_sortDescending ? "DESC" : QString() )
+             .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );
+
+    query.prepare( sql );
+    query.exec();
+
+    while( query.next() )
+    {
+        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( query.value( 0 ).toUInt(), query.value( 1 ).toString() );
+
+        al << artist;
+    }
+
+    emit artists( al );
+    emit done();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AllArtists.h Added

@@ -0,0 +1,66 @@
+/* === 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
+ *   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_ALLARTISTS_H
+#define DATABASECOMMAND_ALLARTISTS_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "Artist.h"
+#include "Collection.h"
+#include "Typedefs.h"
+#include "DatabaseCommand.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_AllArtists : public DatabaseCommand
+{
+Q_OBJECT
+public:
+    enum SortOrder {
+        None = 0,
+        ModificationTime = 1
+    };
+
+    explicit DatabaseCommand_AllArtists( const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr(), QObject* parent = 0 );
+    virtual ~DatabaseCommand_AllArtists();
+
+    virtual void exec( DatabaseImpl* );
+
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "allartists"; }
+
+    void setLimit( unsigned int amount ) { m_amount = amount; }
+    void setSortOrder( DatabaseCommand_AllArtists::SortOrder order ) { m_sortOrder = order; }
+    void setSortDescending( bool descending ) { m_sortDescending = descending; }
+    void setFilter( const QString& filter ) { m_filter = filter; }
+
+signals:
+    void artists( const QList<Tomahawk::artist_ptr>& );
+    void done();
+
+private:
+    Tomahawk::collection_ptr m_collection;
+    unsigned int m_amount;
+    DatabaseCommand_AllArtists::SortOrder m_sortOrder;
+    bool m_sortDescending;
+    QString m_filter;
+};
+
+#endif // DATABASECOMMAND_ALLARTISTS_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AllTracks.cpp Added

@@ -0,0 +1,168 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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_AllTracks.h"
+
+#include <QSqlQuery>
+
+#include "DatabaseImpl.h"
+#include "Artist.h"
+#include "Album.h"
+#include "SourceList.h"
+#include "utils/Logger.h"
+
+
+void
+DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    QList<Tomahawk::query_ptr> ql;
+
+    QString m_orderToken, sourceToken;
+    switch ( m_sortOrder )
+    {
+        case 0:
+            break;
+
+        case Album:
+            m_orderToken = "album.name, file_join.discnumber, file_join.albumpos";
+            break;
+
+        case ModificationTime:
+            m_orderToken = "file.mtime";
+            break;
+
+        case AlbumPosition:
+            m_orderToken = "file_join.discnumber, file_join.albumpos";
+            break;
+    }
+
+    if ( !m_collection.isNull() )
+        sourceToken = QString( "AND file.source %1" ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) );
+
+    QString albumToken;
+    if ( m_album )
+    {
+        if ( m_album->id() == 0 )
+        {
+            m_artist = m_album->artist();
+            albumToken = QString( "AND album.id IS NULL" );
+        }
+        else
+            albumToken = QString( "AND album.id = %1" ).arg( m_album->id() );
+    }
+
+    QString sql = QString(
+            "SELECT file.id, artist.name, album.name, track.name, composer.name, file.size, "   //0
+                   "file.duration, file.bitrate, file.url, file.source, file.mtime, "           //6
+                   "file.mimetype, file_join.discnumber, file_join.albumpos, artist.id, "       //11
+                   "album.id, track.id, composer.id "                                           //15
+            "FROM file, artist, track, file_join "
+            "LEFT OUTER JOIN album "
+            "ON file_join.album = album.id "
+            "LEFT OUTER JOIN artist AS composer "
+            "ON file_join.composer = composer.id "
+            "WHERE file.id = file_join.file "
+            "AND file_join.artist = artist.id "
+            "AND file_join.track = track.id "
+            "%1 "
+            "%2 %3 "
+            "%4 %5 %6"
+            ).arg( sourceToken )
+             .arg( !m_artist ? QString() : QString( "AND artist.id = %1" ).arg( m_artist->id() ) )
+             .arg( !m_album ? QString() : albumToken )
+             .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( m_orderToken ) : QString() )
+             .arg( m_sortDescending ? "DESC" : QString() )
+             .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );
+
+    query.prepare( sql );
+    query.exec();
+
+    while( query.next() )
+    {
+        Tomahawk::source_ptr s;
+        QString url = query.value( 8 ).toString();
+
+        if ( query.value( 9 ).toUInt() == 0 )
+        {
+            s = SourceList::instance()->getLocal();
+        }
+        else
+        {
+            s = SourceList::instance()->get( query.value( 9 ).toUInt() );
+            if ( s.isNull() )
+            {
+                Q_ASSERT( false );
+                continue;
+            }
+
+            url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
+        }
+
+        QString artist, track, album, composer;
+        artist = query.value( 1 ).toString();
+        album = query.value( 2 ).toString();
+        track = query.value( 3 ).toString();
+        composer = query.value( 4 ).toString();
+
+        Tomahawk::result_ptr result = Tomahawk::Result::get( url );
+        Tomahawk::query_ptr qry = Tomahawk::Query::get( artist, track, album );
+        Tomahawk::artist_ptr artistptr = Tomahawk::Artist::get( query.value( 14 ).toUInt(), artist );
+        Tomahawk::artist_ptr composerptr = Tomahawk::Artist::get( query.value( 17 ).toUInt(), composer );
+        Tomahawk::album_ptr albumptr = Tomahawk::Album::get( query.value( 15 ).toUInt(), album, artistptr );
+
+        result->setTrackId( query.value( 16 ).toUInt() );
+        result->setArtist( artistptr );
+        result->setAlbum( albumptr );
+        result->setTrack( query.value( 3 ).toString() );
+        result->setComposer( composerptr );
+        result->setSize( query.value( 5 ).toUInt() );
+        result->setDuration( query.value( 6 ).toUInt() );
+        result->setBitrate( query.value( 7 ).toUInt() );
+        result->setModificationTime( query.value( 10 ).toUInt() );
+        result->setMimetype( query.value( 11 ).toString() );
+        result->setDiscNumber( query.value( 12 ).toUInt() );
+        result->setAlbumPos( query.value( 13 ).toUInt() );
+        result->setScore( 1.0 );
+        result->setCollection( s->collection() );
+
+        TomahawkSqlQuery attrQuery = dbi->newquery();
+        QVariantMap attr;
+
+        attrQuery.prepare( "SELECT k, v FROM track_attributes WHERE id = ?" );
+        attrQuery.bindValue( 0, result->trackId() );
+        attrQuery.exec();
+        while ( attrQuery.next() )
+        {
+            attr attrQuery.value( 0 ).toString()  = attrQuery.value( 1 ).toString();
+        }
+
+        result->setAttributes( attr );
+
+        QList<Tomahawk::result_ptr> results;
+        results << result;
+        qry->addResults( results );
+        qry->setResolveFinished( true );
+
+        ql << qry;
+    }
+
+    emit tracks( ql, data() );
+    emit done( m_collection );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_AllTracks.h Added

@@ -0,0 +1,82 @@
+/* === 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
+ *   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_ALLTRACKS_H
+#define DATABASECOMMAND_ALLTRACKS_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+#include "Collection.h"
+#include "Typedefs.h"
+#include "Query.h"
+#include "Artist.h"
+#include "Album.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_AllTracks : public DatabaseCommand
+{
+Q_OBJECT
+public:
+    enum SortOrder {
+        None = 0,
+        Album = 1,
+        ModificationTime = 2,
+        AlbumPosition = 3
+    };
+
+    explicit DatabaseCommand_AllTracks( const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr(), QObject* parent = 0 )
+        : DatabaseCommand( parent )
+        , m_collection( collection )
+        , m_artist( 0 )
+        , m_album( 0 )
+        , m_amount( 0 )
+        , m_sortOrder( DatabaseCommand_AllTracks::None )
+        , m_sortDescending( false )
+    {}
+
+    virtual void exec( DatabaseImpl* );
+
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "alltracks"; }
+
+    void setArtist( const Tomahawk::artist_ptr& artist ) { m_artist = artist; }
+    void setAlbum( const Tomahawk::album_ptr& album ) { m_album = album; }
+
+    void setLimit( unsigned int amount ) { m_amount = amount; }
+    void setSortOrder( DatabaseCommand_AllTracks::SortOrder order ) { m_sortOrder = order; }
+    void setSortDescending( bool descending ) { m_sortDescending = descending; }
+
+signals:
+    void tracks( const QList<Tomahawk::query_ptr>&, const QVariant& data );
+    void done( const Tomahawk::collection_ptr& );
+
+private:
+    Tomahawk::collection_ptr m_collection;
+
+    Tomahawk::artist_ptr m_artist;
+    Tomahawk::album_ptr m_album;
+
+    unsigned int m_amount;
+    DatabaseCommand_AllTracks::SortOrder m_sortOrder;
+    bool m_sortDescending;
+};
+
+#endif // DATABASECOMMAND_ALLTRACKS_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_ClientAuthValid.cpp Added

@@ -0,0 +1,56 @@
+/* === 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_ClientAuthValid.h"
+
+#include "DatabaseImpl.h"
+#include "TomahawkSqlQuery.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+
+DatabaseCommand_ClientAuthValid::DatabaseCommand_ClientAuthValid( const QString& clientToken, QObject* parent )
+    : DatabaseCommand( parent )
+    , m_clientToken( clientToken )
+{
+}
+
+
+void DatabaseCommand_ClientAuthValid::exec( DatabaseImpl* lib )
+{
+    TomahawkSqlQuery q = lib->newquery();
+    q.prepare( "SELECT name FROM http_client_auth WHERE token = ?" );
+    q.addBindValue( m_clientToken );
+
+    if ( q.exec() )
+    {
+        if ( q.next() )
+        {
+            QString name = q.value( 0 ).toString();
+            emit authValid( m_clientToken, name, true );
+        }
+        else
+        {
+            emit authValid( m_clientToken, QString(), false );
+        }
+    }
+    else
+    {
+        qWarning() << "Failed to query http auth table for client:" << m_clientToken;
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_ClientAuthValid.h Added

@@ -0,0 +1,50 @@
+/* === 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
+ *   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_CLIENTAUTHVALID_H
+#define DATABASECOMMAND_CLIENTAUTHVALID_H
+
+#include "DatabaseCommand.h"
+#include "DllMacro.h"
+
+#include <QObject>
+
+class DLLEXPORT DatabaseCommand_ClientAuthValid : public DatabaseCommand
+{
+    Q_OBJECT
+public:
+    explicit DatabaseCommand_ClientAuthValid( QObject* parent = 0 )
+            : DatabaseCommand( parent )
+    {}
+
+    explicit DatabaseCommand_ClientAuthValid( const QString& clientToken, QObject* parent = 0 );
+
+    QString commandname() const { return "clientauthvalid"; }
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual bool doesMutates() const { return false; }
+
+signals:
+    // if auth is invalid name is empty
+    void authValid( const QString& clientToken, const QString& name, bool valid );
+
+private:
+    QString m_clientToken;
+};
+
+#endif // DATABASECOMMAND_CLIENTAUTHVALID_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_CollectionAttributes.cpp Added

@@ -0,0 +1,58 @@
+/* === 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_CollectionAttributes.h"
+
+#include "DatabaseImpl.h"
+#include "Source.h"
+
+DatabaseCommand_CollectionAttributes::DatabaseCommand_CollectionAttributes( DatabaseCommand_SetCollectionAttributes::AttributeType type )
+    : DatabaseCommand()
+    , m_type( type )
+{
+}
+
+void
+DatabaseCommand_CollectionAttributes::exec( DatabaseImpl *lib )
+{
+    TomahawkSqlQuery query = lib->newquery();
+
+//    QString sourceStr;
+//    if ( source().isNull() )
+//        sourceStr = "id IS NULL";
+//    else
+//        sourceStr = QString( "id == %1" ).arg( source()->id() );
+
+    QString typeStr;
+    if ( m_type == DatabaseCommand_SetCollectionAttributes::EchonestSongCatalog )
+        typeStr = "echonest_song";
+    else if ( m_type == DatabaseCommand_SetCollectionAttributes::EchonestArtistCatalog )
+        typeStr = "echonest_artist";
+
+    QString queryStr = QString( "SELECT id, v FROM collection_attributes WHERE k = \"%1\"" ).arg( typeStr );
+    qDebug() << "Doing queryL" << queryStr;
+    query.exec( queryStr );
+    PairList data;
+    while ( query.next() )
+    {
+        QPair< QString, QString  > part;
+        part.first = query.value( 0 ).toString();
+        part.second = query.value( 1 ).toString();
+        data << part;
+    }
+    emit collectionAttributes( data );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_CollectionAttributes.h Added

@@ -0,0 +1,45 @@
+/* === 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_COLLECTIONATTRIBUTES_H
+#define DATABASECOMMAND_COLLECTIONATTRIBUTES_H
+
+#include "Typedefs.h"
+#include "DatabaseCommand.h"
+#include "DatabaseCommand_SetCollectionAttributes.h"
+#include <QByteArray>
+
+class DatabaseCommand_CollectionAttributes : public DatabaseCommand
+{
+    Q_OBJECT
+public:
+
+    DatabaseCommand_CollectionAttributes( DatabaseCommand_SetCollectionAttributes::AttributeType type );
+    virtual void exec( DatabaseImpl* lib );
+    virtual bool doesMutates() const { return false; }
+
+    virtual QString commandname() const { return "collectionattributes"; }
+
+signals:
+    void collectionAttributes( PairList );
+
+private:
+    DatabaseCommand_SetCollectionAttributes::AttributeType m_type;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_CollectionStats.cpp Added

@@ -0,0 +1,65 @@
+/* === 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
+ *   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_CollectionStats.h"
+
+#include "DatabaseImpl.h"
+#include "Source.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_CollectionStats::DatabaseCommand_CollectionStats( const source_ptr& source, QObject* parent )
+    : DatabaseCommand( source, parent )
+{
+}
+
+
+void
+DatabaseCommand_CollectionStats::exec( DatabaseImpl* dbi )
+{
+    Q_ASSERT( source()->isLocal() || source()->id() >= 1 );
+    TomahawkSqlQuery query = dbi->newquery();
+
+    QVariantMap m;
+    if ( source()->isLocal() )
+    {
+        query.exec( "SELECT count(*), max(mtime), (SELECT guid FROM oplog WHERE source IS NULL ORDER BY id DESC LIMIT 1) "
+                    "FROM file "
+                    "WHERE source IS NULL" );
+    }
+    else
+    {
+        query.prepare( "SELECT count(*), max(mtime), (SELECT lastop FROM source WHERE id = ?) "
+                       "FROM file "
+                       "WHERE source = ?" );
+        query.addBindValue( source()->id() );
+        query.addBindValue( source()->id() );
+        query.exec();
+    }
+
+    if ( query.next() )
+    {
+        m.insert( "numfiles", query.value( 0 ).toInt() );
+        m.insert( "lastmodified", query.value( 1 ).toInt() );
+        m.insert( "lastop", query.value( 2 ).toString() );
+    }
+
+    emit done( m );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_CollectionStats.h Added

@@ -0,0 +1,43 @@
+/* === 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
+ *   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_COLLECTIONSTATS_H
+#define DATABASECOMMAND_COLLECTIONSTATS_H
+
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+#include "Typedefs.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_CollectionStats : public DatabaseCommand
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseCommand_CollectionStats( const Tomahawk::source_ptr& source, QObject* parent = 0 );
+    virtual void exec( DatabaseImpl* lib );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "collectionstats"; }
+
+signals:
+    void done( const QVariantMap& );
+};
+
+#endif // DATABASECOMMAND_COLLECTIONSTATS_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.cpp Added

@@ -0,0 +1,129 @@
+/* === 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_CreateDynamicPlaylist.h"
+
+#include <QSqlQuery>
+#include <QSqlDriver>
+
+#include "DatabaseImpl.h"
+#include "TomahawkSqlQuery.h"
+#include "dynamic/DynamicPlaylist.h"
+#include "dynamic/DynamicControl.h"
+#include "dynamic/GeneratorInterface.h"
+
+#include "Source.h"
+#include "network/Servent.h"
+#include "utils/Logger.h"
+
+#ifndef ENABLE_HEADLESS
+    #include "ViewManager.h"
+#endif
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_CreateDynamicPlaylist::DatabaseCommand_CreateDynamicPlaylist( QObject* parent )
+    : DatabaseCommand_CreatePlaylist( parent )
+    , m_autoLoad( true )
+{
+    tDebug() << Q_FUNC_INFO << "creating dynamiccreatecommand 1";
+}
+
+
+DatabaseCommand_CreateDynamicPlaylist::DatabaseCommand_CreateDynamicPlaylist( const source_ptr& author,
+                                                                const dynplaylist_ptr& playlist, bool autoLoad )
+    : DatabaseCommand_CreatePlaylist( author, playlist.staticCast<Playlist>() )
+    , m_playlist( playlist )
+    , m_autoLoad( autoLoad )
+{
+    tDebug() << Q_FUNC_INFO << "creating dynamiccreatecommand 2";
+}
+
+DatabaseCommand_CreateDynamicPlaylist::~DatabaseCommand_CreateDynamicPlaylist()
+{}
+
+QVariant
+DatabaseCommand_CreateDynamicPlaylist::playlistV() const
+{
+        if( m_v.isNull() )
+            return QJson::QObjectHelper::qobject2qvariant( (QObject*)m_playlist.data() );
+        else
+            return m_v;
+}
+
+void
+DatabaseCommand_CreateDynamicPlaylist::exec( DatabaseImpl* lib )
+{
+    qDebug() << Q_FUNC_INFO;
+    Q_ASSERT( !( m_playlist.isNull() && m_v.isNull() ) );
+    Q_ASSERT( !source().isNull() );
+
+    DatabaseCommand_CreatePlaylist::createPlaylist( lib, true );
+    qDebug() << "Created normal playlist, now creating additional dynamic info!";
+
+    qDebug() << "Create dynamic execing!" << m_playlist << m_v;
+    TomahawkSqlQuery cre = lib->newquery();
+
+    cre.prepare( "INSERT INTO dynamic_playlist( guid, pltype, plmode, autoload ) "
+                 "VALUES( ?, ?, ?, ? )" );
+
+    if( m_playlist.isNull() ) {
+        QVariantMap m = m_v.toMap();
+        cre.addBindValue( m.value( "guid" ) );
+        cre.addBindValue( m.value( "type" ) );
+        cre.addBindValue( m.value( "mode" ) );
+    } else {
+        cre.addBindValue( m_playlist->guid() );
+        cre.addBindValue( m_playlist->type() );
+        cre.addBindValue( m_playlist->mode() );
+    }
+    cre.addBindValue( m_autoLoad );
+    cre.exec();
+}
+
+
+void
+DatabaseCommand_CreateDynamicPlaylist::postCommitHook()
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( source().isNull() || source()->collection().isNull() )
+    {
+        qDebug() << "Source has gone offline, not emitting to GUI.";
+        return;
+    }
+
+    if(  !DatabaseCommand_CreatePlaylist::report() || report() == false )
+        return;
+
+    qDebug() << Q_FUNC_INFO << "..reporting..";
+    if( m_playlist.isNull() ) {
+        source_ptr src = source();
+#ifndef ENABLE_HEADLESS
+        QMetaObject::invokeMethod( ViewManager::instance(),
+                                   "createDynamicPlaylist",
+                                   Qt::BlockingQueuedConnection,
+                                   QGenericArgument( "Tomahawk::source_ptr", (const void*)&src ),
+                                   Q_ARG( QVariant, m_v ) );
+#endif
+    } else {
+        m_playlist->reportCreated( m_playlist );
+    }
+    if( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_CreateDynamicPlaylist.h Added

@@ -0,0 +1,65 @@
+/* === 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_CREATEDYNAMICPLAYLIST_H
+#define DATABASECOMMAND_CREATEDYNAMICPLAYLIST_H
+
+#include "Typedefs.h"
+#include "DatabaseCommand_CreatePlaylist.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, bool autoLoad = true );
+    virtual ~DatabaseCommand_CreateDynamicPlaylist();
+
+    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;
+
+    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

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_CreatePlaylist.cpp Added

@@ -0,0 +1,145 @@
+/* === 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
+ *   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_CreatePlaylist.h"
+
+#include <QSqlQuery>
+
+#include "Source.h"
+#include "DatabaseImpl.h"
+#include "TomahawkSqlQuery.h"
+#include "network/Servent.h"
+#include "utils/Logger.h"
+
+#ifndef ENABLE_HEADLESS
+    #include "ViewManager.h"
+#endif
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_CreatePlaylist::DatabaseCommand_CreatePlaylist( QObject* parent )
+    : DatabaseCommandLoggable( parent )
+    , m_report( true )
+{
+}
+
+
+DatabaseCommand_CreatePlaylist::DatabaseCommand_CreatePlaylist( const source_ptr& author,
+                                                                const playlist_ptr& playlist )
+    : DatabaseCommandLoggable( author )
+    , m_playlist( playlist )
+    , m_report( false ) //this ctor used when creating locally, reporting done elsewhere
+{
+}
+
+DatabaseCommand_CreatePlaylist::~DatabaseCommand_CreatePlaylist()
+{}
+
+void
+DatabaseCommand_CreatePlaylist::exec( DatabaseImpl* lib )
+{
+    createPlaylist( lib, false );
+}
+
+QVariant
+DatabaseCommand_CreatePlaylist::playlistV() const
+{
+    if( m_v.isNull() )
+        return QJson::QObjectHelper::qobject2qvariant( (QObject*)m_playlist.data() );
+    else
+        return m_v;
+ }
+
+
+void
+DatabaseCommand_CreatePlaylist::postCommitHook()
+{
+    qDebug() << Q_FUNC_INFO;
+
+    if ( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+
+    if ( m_report == false )
+        return;
+
+    tDebug() << Q_FUNC_INFO << "reporting...";
+    if ( m_playlist.isNull() )
+    {
+        source_ptr src = source();
+#ifndef ENABLE_HEADLESS
+        QMetaObject::invokeMethod( ViewManager::instance(),
+                                   "createPlaylist",
+                                   Qt::BlockingQueuedConnection,
+                                   QGenericArgument( "Tomahawk::source_ptr", (const void*)&src ),
+                                   Q_ARG( QVariant, m_v ) );
+#endif
+    }
+    else
+    {
+        m_playlist->reportCreated( m_playlist );
+    }
+}
+
+
+void
+DatabaseCommand_CreatePlaylist::createPlaylist( DatabaseImpl* lib, bool dynamic)
+{
+    Q_ASSERT( !( m_playlist.isNull() && m_v.isNull() ) );
+    Q_ASSERT( !source().isNull() );
+
+    uint now = 0;
+    if ( m_playlist.isNull() )
+    {
+        now = m_v.toMap() "createdon" .toUInt();
+    }
+    else
+    {
+        now = QDateTime::currentDateTime().toTime_t();
+        m_playlist->setCreatedOn( now );
+    }
+
+    TomahawkSqlQuery cre = lib->newquery();
+    cre.prepare( "INSERT INTO playlist( guid, source, shared, title, info, creator, lastmodified, dynplaylist, createdOn ) "
+                 "VALUES( :guid, :source, :shared, :title, :info, :creator, :lastmodified, :dynplaylist, :createdOn )" );
+
+    cre.bindValue( ":source", source()->isLocal() ? QVariant(QVariant::Int) : source()->id() );
+    cre.bindValue( ":dynplaylist", dynamic );
+    cre.bindValue( ":createdOn", now );
+    if ( !m_playlist.isNull() )
+    {
+        cre.bindValue( ":guid", m_playlist->guid() );
+        cre.bindValue( ":shared", m_playlist->shared() );
+        cre.bindValue( ":title", m_playlist->title() );
+        cre.bindValue( ":info", m_playlist->info() );
+        cre.bindValue( ":creator", m_playlist->creator() );
+        cre.bindValue( ":lastmodified", m_playlist->lastmodified() );
+    }
+    else
+    {
+        QVariantMap m = m_v.toMap();
+        cre.bindValue( ":guid", m.value( "guid" ) );
+        cre.bindValue( ":shared", m.value( "shared" ) );
+        cre.bindValue( ":title", m.value( "title" ) );
+        cre.bindValue( ":info", m.value( "info" ) );
+        cre.bindValue( ":creator", m.value( "creator" ) );
+        cre.bindValue( ":lastmodified", m.value( "lastmodified", 0 ) );
+    }
+
+    cre.exec();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_CreatePlaylist.h Added

@@ -0,0 +1,65 @@
+/* === 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
+ *   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_CREATEPLAYLIST_H
+#define DATABASECOMMAND_CREATEPLAYLIST_H
+
+#include "Typedefs.h"
+#include "DatabaseCommandLoggable.h"
+#include "qjson/qobjecthelper.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_CreatePlaylist : public DatabaseCommandLoggable
+{
+Q_OBJECT
+Q_PROPERTY( QVariant playlist READ playlistV WRITE setPlaylistV )
+
+public:
+    explicit DatabaseCommand_CreatePlaylist( QObject* parent = 0 );
+    explicit DatabaseCommand_CreatePlaylist( const Tomahawk::source_ptr& author, const Tomahawk::playlist_ptr& playlist );
+    virtual ~DatabaseCommand_CreatePlaylist();
+
+    QString commandname() const { return "createplaylist"; }
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual void postCommitHook();
+    virtual bool doesMutates() const { return true; }
+
+    QVariant playlistV() const;
+
+    void setPlaylistV( const QVariant& v )
+    {
+        m_v = v;
+    }
+
+protected:
+    void createPlaylist( DatabaseImpl* lib, bool dynamic = false );
+
+    virtual bool report() { return m_report; }
+
+    void setPlaylist( const Tomahawk::playlist_ptr& playlist );
+
+    QVariant m_v;
+
+private:
+    Tomahawk::playlist_ptr m_playlist;
+    bool m_report; // call Playlist::reportCreated?
+};
+
+#endif // DATABASECOMMAND_CREATEPLAYLIST_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.cpp Added

@@ -0,0 +1,75 @@
+/* === 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
+ *   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_DeleteDynamicPlaylist.h"
+
+#include <QSqlQuery>
+
+#include "dynamic/DynamicPlaylist.h"
+#include "network/Servent.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_DeleteDynamicPlaylist::DatabaseCommand_DeleteDynamicPlaylist( const source_ptr& source, const QString& playlistguid )
+    : DatabaseCommand_DeletePlaylist( source, playlistguid )
+{
+}
+
+
+void
+DatabaseCommand_DeleteDynamicPlaylist::exec( DatabaseImpl* lib )
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "deleting dynamic playlist:" << m_playlistguid;
+    DatabaseCommand_DeletePlaylist::exec( lib );
+    TomahawkSqlQuery cre = lib->newquery();
+
+    cre.prepare( "DELETE FROM dynamic_playlist WHERE guid = :id" );
+    cre.bindValue( ":id", m_playlistguid );
+
+    cre.exec();
+}
+
+
+void
+DatabaseCommand_DeleteDynamicPlaylist::postCommitHook()
+{
+    qDebug() << Q_FUNC_INFO << "..reporting..:" << m_playlistguid;
+    if ( source().isNull() || source()->collection().isNull() )
+    {
+        qDebug() << "Source has gone offline, not emitting to GUI.";
+        return;
+    }
+    // we arent sure which it is, but it can't be more th an one. so try both
+    dynplaylist_ptr playlist = source()->collection()->autoPlaylist( m_playlistguid );
+    if( playlist.isNull() )
+        playlist = source()->collection()->station( m_playlistguid );
+
+    tLog( LOGVERBOSE ) << "Just tried to load playlist for deletion:" << m_playlistguid << "Did we get a null one?" << playlist.isNull();
+    Q_ASSERT( !playlist.isNull() );
+    if ( !playlist.isNull() )
+    {
+        tLog( LOGVERBOSE ) << "is it a station?" << ( playlist->mode() == OnDemand );
+        playlist->reportDeleted( playlist );
+    }
+
+    if( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_DeleteDynamicPlaylist.h Added

@@ -0,0 +1,43 @@
+/* === 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
+ *   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_DELETEDYNAMICPLAYLIST_H
+#define DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H
+
+#include "DatabaseCommand_DeletePlaylist.h"
+#include "Typedefs.h"
+
+class DatabaseCommand_DeleteDynamicPlaylist : public DatabaseCommand_DeletePlaylist
+{
+    Q_OBJECT
+public:
+    explicit DatabaseCommand_DeleteDynamicPlaylist( QObject* parent = 0 )
+    : DatabaseCommand_DeletePlaylist( parent )
+    {}
+
+    explicit DatabaseCommand_DeleteDynamicPlaylist( const Tomahawk::source_ptr& source, const QString& playlistguid );
+
+    QString commandname() const { return "deletedynamicplaylist"; }
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual void postCommitHook();
+    virtual bool doesMutates() const { return true; }
+
+};
+
+#endif // DATABASECOMMAND_DELETEDYNAMICPLAYLIST_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_DeleteFiles.cpp Added

@@ -0,0 +1,140 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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_DeleteFiles.h"
+
+#include <QtSql/QSqlQuery>
+
+#include "Artist.h"
+#include "Album.h"
+#include "Collection.h"
+#include "Source.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "network/Servent.h"
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+
+using namespace Tomahawk;
+
+
+// After changing a collection, we need to tell other bits of the system:
+void
+DatabaseCommand_DeleteFiles::postCommitHook()
+{
+    if ( !m_idList.count() )
+        return;
+
+    // make the collection object emit its tracksAdded signal, so the
+    // collection browser will update/fade in etc.
+    Collection* coll = source()->collection().data();
+
+    connect( this, SIGNAL( notify( QList<unsigned int> ) ),
+             coll,   SLOT( delTracks( QList<unsigned int> ) ), Qt::QueuedConnection );
+
+    tDebug() << "Notifying of deleted tracks:" << m_idList.size() << "from source" << source()->id();
+    emit notify( m_idList );
+
+    if ( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+}
+
+
+void
+DatabaseCommand_DeleteFiles::exec( DatabaseImpl* dbi )
+{
+    Q_ASSERT( !source().isNull() );
+
+    int srcid = source()->isLocal() ? 0 : source()->id();
+    TomahawkSqlQuery delquery = dbi->newquery();
+
+    if ( m_deleteAll )
+    {
+        TomahawkSqlQuery dirquery = dbi->newquery();
+        dirquery.prepare( QString( "SELECT id FROM file WHERE source %1" )
+                    .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ) );
+        dirquery.exec();
+        
+        while ( dirquery.next() )
+            m_idList << dirquery.value( 0 ).toUInt();
+    }
+    else if ( source()->isLocal() )
+    {
+        if ( m_dir.path() != QString( "." ) )
+        {
+            tDebug() << "Deleting" << m_dir.path() << "from db for localsource" << srcid;
+            TomahawkSqlQuery dirquery = dbi->newquery();
+            QString path( "file://" + m_dir.canonicalPath() + "/%" );
+            dirquery.prepare( QString( "SELECT id FROM file WHERE source IS NULL AND url LIKE '%1'" ).arg( TomahawkSqlQuery::escape( path ) ) );
+            dirquery.exec();
+
+            while ( dirquery.next() )
+            {
+                m_ids << dirquery.value( 0 );
+                m_idList << dirquery.value( 0 ).toUInt();
+            }
+        }
+        else if ( !m_ids.isEmpty() )
+        {
+            tDebug() << Q_FUNC_INFO << "deleting given ids";
+            foreach ( const QVariant& id, m_ids )
+                m_idList << id.toUInt();
+        }
+    }
+
+    if ( m_deleteAll )
+    {
+        delquery.prepare( QString( "DELETE FROM file WHERE source %1" )
+                    .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) ) );
+        delquery.exec();
+    }
+    else if ( !m_ids.isEmpty() )
+    {
+        QString idstring;
+        foreach ( const QVariant& id, m_ids )
+            idstring.append( id.toString() + ", " );
+        idstring.chop( 2 ); //remove the trailing ", "
+
+        if ( !source()->isLocal() )
+        {
+            delquery.prepare( QString( "SELECT id FROM file WHERE source = %1 AND url IN ( %2 )" )
+                        .arg( source()->id() )
+                        .arg( idstring ) );
+            delquery.exec();
+            
+            idstring = QString();
+            while ( delquery.next() )
+            {
+                idstring.append( delquery.value( 0 ).toString() + ", " );
+                m_idList << delquery.value( 0 ).toUInt();
+            }
+            idstring.chop( 2 ); //remove the trailing ", "
+        }
+
+        delquery.prepare( QString( "DELETE FROM file WHERE source %1 AND id IN ( %2 )" )
+                             .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) )
+                             .arg( idstring ) );
+        delquery.exec();
+    }
+
+    if ( m_idList.count() )
+        source()->updateIndexWhenSynced();
+
+    emit done( m_idList, source()->collection() );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_DeleteFiles.h Added

@@ -0,0 +1,88 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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_DELETEFILES_H
+#define DATABASECOMMAND_DELETEFILES_H
+
+#include <QtCore/QObject>
+#include <QtCore/QDir>
+#include <QtCore/QVariantMap>
+
+#include "database/DatabaseCommandLoggable.h"
+#include "Typedefs.h"
+
+#include "DllMacro.h"
+
+#include "utils/Logger.h"
+
+class DLLEXPORT DatabaseCommand_DeleteFiles : public DatabaseCommandLoggable
+{
+Q_OBJECT
+Q_PROPERTY( QVariantList ids READ ids WRITE setIds )
+Q_PROPERTY( bool deleteAll READ deleteAll WRITE setDeleteAll )
+
+public:
+    explicit DatabaseCommand_DeleteFiles( QObject* parent = 0 )
+        : DatabaseCommandLoggable( parent )
+    {}
+
+    explicit DatabaseCommand_DeleteFiles( const Tomahawk::source_ptr& source, QObject* parent = 0 )
+    : DatabaseCommandLoggable( parent ), m_deleteAll( true )
+    {
+        setSource( source );
+    }
+
+    explicit DatabaseCommand_DeleteFiles( const QDir& dir, const Tomahawk::source_ptr& source, QObject* parent = 0 )
+    : DatabaseCommandLoggable( parent ), m_dir( dir ), m_deleteAll( false )
+    {
+        setSource( source );
+    }
+
+    explicit DatabaseCommand_DeleteFiles( const QVariantList& ids, const Tomahawk::source_ptr& source, QObject* parent = 0 )
+    : DatabaseCommandLoggable( parent ), m_ids( ids ), m_deleteAll( false )
+    {
+        setSource( source );
+    }
+
+    virtual QString commandname() const { return "deletefiles"; }
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return true; }
+    virtual bool localOnly() const { return false; }
+    virtual bool groupable() const { return true; }
+    virtual void postCommitHook();
+
+    QVariantList ids() const { return m_ids; }
+    void setIds( const QVariantList& i ) { m_ids = i; }
+
+    bool deleteAll() const { return m_deleteAll; }
+    void setDeleteAll( const bool deleteAll ) { m_deleteAll = deleteAll; }
+
+signals:
+    void done( const QList<unsigned int>&, const Tomahawk::collection_ptr& );
+    void notify( const QList<unsigned int>& ids );
+
+private:
+    QDir m_dir;
+    QVariantList m_ids;
+    QList<unsigned int> m_idList;
+    bool m_deleteAll;
+};
+
+#endif // DATABASECOMMAND_DELETEFILES_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_DeletePlaylist.cpp Added

@@ -0,0 +1,69 @@
+/* === 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
+ *   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_DeletePlaylist.h"
+
+#include <QSqlQuery>
+
+#include "network/Servent.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_DeletePlaylist::DatabaseCommand_DeletePlaylist( const source_ptr& source, const QString& playlistguid )
+    : DatabaseCommandLoggable( source )
+{
+    setPlaylistguid( playlistguid );
+}
+
+
+void
+DatabaseCommand_DeletePlaylist::exec( DatabaseImpl* lib )
+{
+    qDebug() << Q_FUNC_INFO;
+
+    TomahawkSqlQuery cre = lib->newquery();
+
+    QString sql = QString( "DELETE FROM playlist WHERE guid = :id AND source %1" )
+                  .arg( source()->isLocal() ? "IS NULL" : QString("= %1").arg( source()->id() ) );
+    cre.prepare( sql );
+    cre.bindValue( ":id", m_playlistguid );
+
+    cre.exec();
+}
+
+
+void
+DatabaseCommand_DeletePlaylist::postCommitHook()
+{
+    qDebug() << Q_FUNC_INFO << "..reporting..";
+    if ( source().isNull() || source()->collection().isNull() )
+    {
+        qDebug() << "Source has gone offline, not emitting to GUI.";
+        return;
+    }
+
+    playlist_ptr playlist = source()->collection()->playlist( m_playlistguid );
+    Q_ASSERT( !playlist.isNull() );
+
+    playlist->reportDeleted( playlist );
+
+    if( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_DeletePlaylist.h Added

@@ -0,0 +1,54 @@
+/* === 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
+ *   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_DELETEPLAYLIST_H
+#define DATABASECOMMAND_DELETEPLAYLIST_H
+
+#include "DatabaseImpl.h"
+#include "DatabaseCommandLoggable.h"
+#include "Source.h"
+#include "Typedefs.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_DeletePlaylist : public DatabaseCommandLoggable
+{
+Q_OBJECT
+Q_PROPERTY( QString playlistguid READ playlistguid WRITE setPlaylistguid )
+
+public:
+    explicit DatabaseCommand_DeletePlaylist( QObject* parent = 0 )
+            : DatabaseCommandLoggable( parent )
+    {}
+
+    explicit DatabaseCommand_DeletePlaylist( const Tomahawk::source_ptr& source, const QString& playlistguid );
+
+    QString commandname() const { return "deleteplaylist"; }
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual void postCommitHook();
+    virtual bool doesMutates() const { return true; }
+
+    QString playlistguid() const { return m_playlistguid; }
+    void setPlaylistguid( const QString& s ) { m_playlistguid = s; }
+
+protected:
+    QString m_playlistguid;
+};
+
+#endif // DATABASECOMMAND_DELETEPLAYLIST_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_DirMtimes.cpp Added

@@ -0,0 +1,95 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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_DirMtimes.h"
+
+#include <QSqlQuery>
+
+#include "DatabaseImpl.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+
+void
+DatabaseCommand_DirMtimes::exec( DatabaseImpl* dbi )
+{
+    if( m_update )
+        execUpdate( dbi );
+    else
+        execSelect( dbi );
+}
+
+
+void
+DatabaseCommand_DirMtimes::execSelect( DatabaseImpl* dbi )
+{
+    QMap<QString,unsigned int> mtimes;
+    TomahawkSqlQuery query = dbi->newquery();
+    if( m_prefix.isEmpty() && m_prefixes.isEmpty() )
+    {
+        query.exec( "SELECT name, mtime FROM dirs_scanned" );
+        while( query.next() )
+            mtimes.insert( query.value( 0 ).toString(), query.value( 1 ).toUInt() );
+    }
+    else if( m_prefixes.isEmpty() )
+        execSelectPath( dbi, m_prefix, mtimes );
+    else
+    {
+        if( !m_prefix.isEmpty() )
+            execSelectPath( dbi, m_prefix, mtimes );
+        foreach( QString path, m_prefixes )
+            execSelectPath( dbi, path, mtimes );
+    }
+    emit done( mtimes );
+}
+
+void
+DatabaseCommand_DirMtimes::execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap<QString, unsigned int> &mtimes )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    query.prepare( QString( "SELECT name, mtime "
+                            "FROM dirs_scanned "
+                            "WHERE name LIKE :prefix" ) );
+
+    query.bindValue( ":prefix", path.canonicalPath() + "%" );
+    query.exec();
+
+    while( query.next() )
+        mtimes.insert( query.value( 0 ).toString(), query.value( 1 ).toUInt() );
+}
+
+
+void
+DatabaseCommand_DirMtimes::execUpdate( DatabaseImpl* dbi )
+{
+    qDebug() << "Saving mtimes...";
+    TomahawkSqlQuery query = dbi->newquery();
+    query.exec( "DELETE FROM dirs_scanned" );
+    query.prepare( "INSERT INTO dirs_scanned(name, mtime) VALUES(?, ?)" );
+
+    foreach( const QString& k, m_tosave.keys() )
+    {
+        query.bindValue( 0, k );
+        query.bindValue( 1, m_tosave.value( k ) );
+        query.exec();
+    }
+
+    qDebug() << "Saved mtimes for" << m_tosave.size() << "dirs.";
+    emit done( QMap< QString, unsigned int >() );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_DirMtimes.h Added

@@ -0,0 +1,71 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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_DIRMTIMES_H
+#define DATABASECOMMAND_DIRMTIMES_H
+
+#include <QObject>
+#include <QVariantMap>
+#include <QDir>
+#include <QMap>
+
+#include "DatabaseCommand.h"
+
+#include "DllMacro.h"
+
+// Not loggable, mtimes only used to speed up our local scanner.
+
+class DLLEXPORT DatabaseCommand_DirMtimes : public DatabaseCommand
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseCommand_DirMtimes( const QString& prefix = QString(), QObject* parent = 0 )
+        : DatabaseCommand( parent ), m_prefix( prefix ), m_update( false )
+    {}
+
+    explicit DatabaseCommand_DirMtimes( const QStringList& prefixes, QObject* parent = 0 )
+    : DatabaseCommand( parent ), m_prefixes( prefixes ), m_update( false )
+    {}
+
+    explicit DatabaseCommand_DirMtimes( QMap<QString, unsigned int> tosave, QObject* parent = 0 )
+        : DatabaseCommand( parent ), m_update( true ), m_tosave( tosave )
+    {}
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return m_update; }
+    virtual QString commandname() const { return "dirmtimes"; }
+
+signals:
+    void done( const QMap<QString, unsigned int>& );
+
+public slots:
+
+private:
+    void execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap<QString, unsigned int> &mtimes );
+
+    void execSelect( DatabaseImpl* dbi );
+    void execUpdate( DatabaseImpl* dbi );
+    QString m_prefix;
+    QStringList m_prefixes;
+    bool m_update;
+    QMap<QString, unsigned int> m_tosave;
+};
+
+#endif // DATABASECOMMAND_DIRMTIMES_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_FileMTimes.cpp Added

@@ -0,0 +1,84 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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_FileMTimes.h"
+
+#include <QSqlQuery>
+
+#include "DatabaseImpl.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+
+void
+DatabaseCommand_FileMtimes::exec( DatabaseImpl* dbi )
+{
+    execSelect( dbi );
+}
+
+
+void
+DatabaseCommand_FileMtimes::execSelect( DatabaseImpl* dbi )
+{
+    qDebug() << Q_FUNC_INFO;
+    //FIXME: If ever needed for a non-local source this will have to be fixed/updated
+    QMap< QString, QMap< unsigned int, unsigned int > > mtimes;
+    TomahawkSqlQuery query = dbi->newquery();
+    if( m_prefix.isEmpty() && m_prefixes.isEmpty() )
+    {
+        QString limit( m_checkonly ? QString( "LIMIT 1" ) : QString() );
+        query.exec( QString( "SELECT url, id, mtime FROM file WHERE source IS NULL %1" ).arg( limit ) );
+        while( query.next() )
+        {
+            QMap< unsigned int, unsigned int > map;
+            map.insert( query.value( 1 ).toUInt(), query.value( 2 ).toUInt() );
+            mtimes.insert( query.value( 0 ).toString(), map );
+        }
+    }
+    else if( m_prefixes.isEmpty() )
+        execSelectPath( dbi, m_prefix, mtimes );
+    else
+    {
+        if( !m_prefix.isEmpty() )
+            execSelectPath( dbi, m_prefix, mtimes );
+        foreach( QString path, m_prefixes )
+            execSelectPath( dbi, path, mtimes );
+    }
+    emit done( mtimes );
+}
+
+void
+DatabaseCommand_FileMtimes::execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap<QString, QMap< unsigned int, unsigned int > > &mtimes )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    query.prepare( QString( "SELECT url, id, mtime "
+                            "FROM file "
+                            "WHERE source IS NULL "
+                            "AND url LIKE :prefix" ) );
+
+    query.bindValue( ":prefix", "file://" + path.canonicalPath() + "%" );
+    query.exec();
+
+    while( query.next() )
+    {
+        QMap< unsigned int, unsigned int > map;
+        map.insert( query.value( 1 ).toUInt(), query.value( 2 ).toUInt() );
+        mtimes.insert( query.value( 0 ).toString(), map );
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_FileMTimes.h Added

@@ -0,0 +1,69 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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_FILEMTIMES_H
+#define DATABASECOMMAND_FILEMTIMES_H
+
+#include <QObject>
+#include <QVariantMap>
+#include <QMap>
+#include <QDir>
+
+#include "DatabaseCommand.h"
+
+#include "DllMacro.h"
+
+// Not loggable, mtimes only used to speed up our local scanner.
+
+class DLLEXPORT DatabaseCommand_FileMtimes : public DatabaseCommand
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseCommand_FileMtimes( const QString& prefix = QString(), QObject* parent = 0 )
+        : DatabaseCommand( parent ), m_prefix( prefix ), m_checkonly( false )
+    {}
+
+    explicit DatabaseCommand_FileMtimes( const QStringList& prefixes, QObject* parent = 0 )
+    : DatabaseCommand( parent ), m_prefixes( prefixes ), m_checkonly( false )
+    {}
+
+    //NOTE: when this is called we actually ignore the boolean flag; it's just used to give us the right constructor
+    explicit DatabaseCommand_FileMtimes( bool /*checkonly*/, QObject* parent = 0 )
+    : DatabaseCommand( parent ), m_checkonly( true )
+    {}
+    
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "filemtimes"; }
+
+signals:
+    void done( const QMap< QString, QMap< unsigned int, unsigned int > >& );
+
+public slots:
+
+private:
+    void execSelectPath( DatabaseImpl *dbi, const QDir& path, QMap< QString, QMap< unsigned int, unsigned int > > &mtimes );
+    void execSelect( DatabaseImpl* dbi );
+    QString m_prefix;
+    QStringList m_prefixes;
+    bool m_checkonly;
+};
+
+#endif // DATABASECOMMAND_FILEMTIMES_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_GenericSelect.cpp Added

@@ -0,0 +1,149 @@
+/* === 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 "SourceList.h"
+#include "Artist.h"
+#include "Album.h"
+#include "Pipeline.h"
+#include "utils/Logger.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 )
+    , m_raw( false )
+{
+}
+
+DatabaseCommand_GenericSelect::DatabaseCommand_GenericSelect( const QString& sqlSelect, QueryType type, bool rawData, QObject* parent )
+    : DatabaseCommand( parent )
+    , m_sqlSelect( sqlSelect )
+    , m_queryType( type )
+    , m_limit( -1 )
+    , m_raw( rawData )
+{
+}
+
+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;
+
+    if ( m_raw )
+    {
+        QList< QStringList > rawDataItems;
+
+        while( query.next() )
+        {
+            QStringList rawRow;
+            int count = 0;
+            while ( query.value( count ).isValid() )
+            {
+                rawRow << query.value( count ).toString();
+                ++count;
+            }
+            rawDataItems << rawRow;
+        }
+        emit rawData( rawDataItems );
+        return;
+    }
+
+    // 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() );
+            if ( qry.isNull() )
+                continue;
+        }
+        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 );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_GenericSelect.h Added

@@ -0,0 +1,87 @@
+/* === 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 "Typedefs.h"
+
+#include <QStringList>
+#include <QMetaType>
+
+#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 );
+    explicit DatabaseCommand_GenericSelect( const QString& sqlSelect, QueryType type, bool rawData, 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 );
+
+    void rawData( const QList< QStringList >& data );
+private:
+    QString m_sqlSelect;
+    QueryType m_queryType;
+    int m_limit;
+    bool m_raw;
+};
+
+Q_DECLARE_METATYPE(QList<QStringList>);
+
+#endif // DATABASECOMMAND_GENERICSELECT_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_ImportPlaylist.cpp Added

@@ -0,0 +1,61 @@
+/* === 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
+ *   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_ImportPlaylist.h"
+
+#include <QSqlQuery>
+
+#include "tomahawk/Query.h"
+#include "tomahawk/Playlist.h"
+#include "DatabaseImpl.h"
+#include "utils/Logger.h"
+
+
+void
+DatabaseCommand_ImportPlaylist::exec( DatabaseImpl * dbi )
+{
+    /*
+    qDebug() << "Importing playlist of" << m_playlist->length() << "tracks";
+    TomahawkSqlQuery query = dbi->newquery();
+    query.prepare("INSERT INTO playlist(title, info, creator, lastmodified) "
+                  "VALUES(?,?,?,?)");
+    query.addBindValue(m_playlist->title());
+    query.addBindValue(m_playlist->info());
+    query.addBindValue(m_playlist->creator());
+    query.addBindValue(m_playlist->lastmodified());
+    query.exec();
+    int pid = query.lastInsertId().toInt();
+    int pos = 0;
+    query.prepare("INSERT INTO playlist_tracks( "
+                  "playlist, position, trackname, albumname, artistname) "
+                  "VALUES (?,?,?,?,?)");
+
+    for(int k = 0; k < m_playlist->length(); k++)
+    {
+        pos++;
+        query.addBindValue(pid);
+        query.addBindValue(pos);
+        query.addBindValue(m_playlist->at(k)->artist());
+        query.addBindValue(m_playlist->at(k)->album());
+        query.addBindValue(m_playlist->at(k)->track());
+        query.exec();
+    }
+    emit done(pid);
+    */
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_ImportPlaylist.h Added

@@ -0,0 +1,50 @@
+/* === 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
+ *   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_IMPORTPLAYLIST_H
+#define DATABASECOMMAND_IMPORTPLAYLIST_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+
+#include "DllMacro.h"
+
+class Playlist;
+
+class DLLEXPORT DatabaseCommand_ImportPlaylist : public DatabaseCommand
+{
+    Q_OBJECT
+public:
+    explicit DatabaseCommand_ImportPlaylist(Playlist * p, QObject *parent = 0)
+        : DatabaseCommand(parent), m_playlist(p)
+    {}
+
+    virtual void exec(DatabaseImpl *);
+    virtual bool doesMutates() const { return true; }
+    virtual QString commandname() const { return "importplaylist"; }
+
+signals:
+    void done(int id);
+
+private:
+    Playlist * m_playlist;
+};
+
+#endif // DATABASECOMMAND_ADDFILES_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp Added

@@ -0,0 +1,79 @@
+/* === 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_LoadAllAutoPlaylists.h"
+
+#include <QSqlQuery>
+
+#include "DatabaseImpl.h"
+#include "Source.h"
+#include "dynamic/DynamicPlaylist.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+void
+DatabaseCommand_LoadAllAutoPlaylists::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    QString orderToken, sourceToken;
+
+    switch ( m_sortOrder )
+    {
+        case 0:
+            break;
+
+        case DatabaseCommand_LoadAllPlaylists::ModificationTime:
+            orderToken = "playlist.createdOn";
+    }
+
+    if ( !source().isNull() )
+        sourceToken = QString( "AND source %1 " ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
+
+
+    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 dynplaylist = 'true' AND playlist.guid = dynamic_playlist.guid AND dynamic_playlist.plmode = %1 AND dynamic_playlist.autoload = 'true' "
+                         "%2"
+                         "%3 %4 %5"
+                       )
+                       .arg( Static )
+                       .arg( sourceToken )
+                       .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
+                       .arg( m_sortDescending ? "DESC" : QString() )
+                       .arg( m_limitAmount > 0 ? QString( "LIMIT 0, %1" ).arg( m_limitAmount ) : QString() ) );
+
+    QList<dynplaylist_ptr> plists;
+    while ( query.next() )
+    {
+            QVariantList data = QVariantList()  <<      query.value(7).toString()  //current rev
+                                                <<      query.value(1).toString()  //title
+                                                <<      query.value(2).toString()  //info
+                                                <<      query.value(3).toString()  //creator
+                                                <<      query.value(4).toString()  //createdOn
+                                                <<      query.value(8).toString()  // dynamic type
+                                                <<      static_cast<GeneratorMode>(query.value(9).toInt())  // dynamic mode
+                                                <<      query.value(6).toBool()    //shared
+                                                <<      query.value(5).toInt()     //lastmod
+                                                <<      query.value(0).toString();  //GUID
+            emit autoPlaylistLoaded( source(), data );
+    }
+
+    emit done();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.h Added

@@ -0,0 +1,59 @@
+/* === 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_LOADALLAUTOPLAYLISTS_H
+#define DATABASECOMMAND_LOADALLAUTOPLAYLISTS_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+#include "Typedefs.h"
+#include "DatabaseCommand_LoadAllPlaylists.h"
+
+class DatabaseCommand_LoadAllAutoPlaylists : public DatabaseCommand
+{
+    Q_OBJECT
+
+public:
+    explicit DatabaseCommand_LoadAllAutoPlaylists( const Tomahawk::source_ptr& s, QObject* parent = 0 )
+    : DatabaseCommand( s, parent )
+    , m_limitAmount( 0 )
+    , m_sortOrder( DatabaseCommand_LoadAllPlaylists::None )
+    , m_sortDescending( false )
+    {}
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "loadallautoplaylists"; }
+
+    void setLimit( unsigned int limit ) { m_limitAmount = limit; }
+    void setSortOrder( DatabaseCommand_LoadAllPlaylists::SortOrder order ) { m_sortOrder = order; }
+    void setSortDescending( bool descending ) { m_sortDescending = descending; }
+
+signals:
+    void autoPlaylistLoaded( const Tomahawk::source_ptr& source, const QVariantList& data );
+    void done();
+
+private:
+    unsigned int m_limitAmount;
+    DatabaseCommand_LoadAllPlaylists::SortOrder m_sortOrder;
+    bool m_sortDescending;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.cpp Added

@@ -0,0 +1,80 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 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_LoadAllPlaylists.h"
+
+#include <QSqlQuery>
+
+#include "Playlist.h"
+#include "Source.h"
+#include "DatabaseImpl.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+void
+DatabaseCommand_LoadAllPlaylists::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    QString orderToken, sourceToken;
+
+    switch ( m_sortOrder )
+    {
+        case 0:
+            break;
+
+        case ModificationTime:
+            orderToken = "playlist.createdOn";
+    }
+
+    if ( !source().isNull() )
+        sourceToken = QString( "AND source %1 " ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
+
+
+    query.exec( QString( "SELECT guid, title, info, creator, lastmodified, shared, currentrevision, createdOn "
+                         "FROM playlist "
+                         "WHERE dynplaylist = 'false' "
+                         "%1 "
+                         "%2 %3 %4"
+                       )
+                       .arg( sourceToken )
+                       .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
+                       .arg( m_sortDescending ? "DESC" : QString() )
+                       .arg( m_limitAmount > 0 ? QString( "LIMIT 0, %1" ).arg( m_limitAmount ) : QString() ) );
+
+    QList<playlist_ptr> plists;
+    while ( query.next() )
+    {
+        playlist_ptr p( new Playlist( source(),                  //src
+                                      query.value(6).toString(), //current rev
+                                      query.value(1).toString(), //title
+                                      query.value(2).toString(), //info
+                                      query.value(3).toString(), //creator
+                                      query.value(7).toInt(),    //lastmod
+                                      query.value(5).toBool(),   //shared
+                                      query.value(4).toInt(),    //lastmod
+                                      query.value(0).toString()  //GUID
+                                    ), &QObject::deleteLater );
+        plists.append( p );
+    }
+
+    emit done( plists );
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadAllPlaylists.h Added

@@ -0,0 +1,70 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 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_LOADALLPLAYLIST_H
+#define DATABASECOMMAND_LOADALLPLAYLIST_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "Typedefs.h"
+#include "DatabaseCommand.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_LoadAllPlaylists : public DatabaseCommand
+{
+    Q_OBJECT
+
+public:
+    enum SortOrder {
+        None = 0,
+        ModificationTime = 1
+    };
+    enum SortAscDesc {
+        NoOrder = 0,
+        Ascending = 1,
+        Descending = 2
+    };
+
+    explicit DatabaseCommand_LoadAllPlaylists( const Tomahawk::source_ptr& s, QObject* parent = 0 )
+        : DatabaseCommand( s, parent )
+        , m_limitAmount( 0 )
+        , m_sortOrder( None )
+        , m_sortDescending( false )
+    {}
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "loadallplaylists"; }
+
+    void setLimit( unsigned int limit ) { m_limitAmount = limit; }
+    void setSortOrder( SortOrder order ) { m_sortOrder = order; }
+    void setSortDescending( bool descending ) { m_sortDescending = descending; }
+
+signals:
+    void done( const QList<Tomahawk::playlist_ptr>& playlists );
+
+private:
+    unsigned int m_limitAmount;
+    SortOrder m_sortOrder;
+    bool m_sortDescending;
+};
+
+#endif // DATABASECOMMAND_LOADALLPLAYLIST_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.cpp Added

@@ -0,0 +1,108 @@
+/* === 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_LoadAllSortedPlaylists.h"
+#include "DatabaseImpl.h"
+
+#include "Playlist.h"
+#include <libtomahawk/SourceList.h>
+
+using namespace Tomahawk;
+
+void
+DatabaseCommand_LoadAllSortedPlaylists::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    QString orderToken, sourceToken, ascDescToken;
+
+    switch ( m_sortOrder )
+    {
+        case 0:
+            break;
+
+        case DatabaseCommand_LoadAllPlaylists::ModificationTime:
+            orderToken = "playlist.createdOn";
+    }
+
+    switch ( m_sortAscDesc )
+    {
+        case DatabaseCommand_LoadAllPlaylists::NoOrder:
+            break;
+        case DatabaseCommand_LoadAllPlaylists::Ascending:
+            ascDescToken = "ASC";
+            break;
+        case DatabaseCommand_LoadAllPlaylists::Descending:
+            ascDescToken = "DESC";
+            break;
+    }
+
+    if ( !source().isNull() )
+        sourceToken = QString( "AND source %1 " ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
+
+
+    query.exec( QString( "SELECT playlist.guid as guid, title, info, creator, lastmodified, shared, currentrevision, createdOn, dynplaylist, source, dynamic_playlist.pltype, dynamic_playlist.plmode "
+                         "FROM playlist "
+                         "LEFT JOIN dynamic_playlist ON playlist.guid = dynamic_playlist.guid  "
+                         "%1 "
+                         "%2 %3 %4"
+    )
+    .arg( sourceToken )
+    .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
+    .arg( ascDescToken )
+    .arg( m_limitAmount > 0 ? QString( "LIMIT 0, %1" ).arg( m_limitAmount ) : QString() ) );
+
+    QList<SourcePlaylistPair> plists;
+    while ( query.next() )
+    {
+        plists << QPair< int, QString >( query.value(9).toInt(), query.value(0).toString() );
+//         playlist_ptr p;
+//         bool dynamic = query.value(8).toBool();
+//         source_ptr s = SourceList::instance()->get( query.value(9).toInt() );
+//
+//         if ( dynamic )
+//         {
+//             p = dynplaylist_ptr( new DynamicPlaylist( s,
+//                                                         query.value(6).toString(), //current rev
+//                                                         query.value(1).toString(), //title
+//                                                         query.value(2).toString(), //info
+//                                                         query.value(3).toString(), //creator
+//                                                         query.value(7).toInt(),    //createdOn
+//                                                         query.value(10).toString(), //type
+//                                                         (GeneratorMode)query.value(11).toInt(), // mode
+//                                                         query.value(5).toBool(),   //shared
+//                                                         query.value(4).toInt(),    //lastmod
+//                                                         query.value(0).toString()  //GUID
+//                 ) );
+//         } else
+//         {
+//             p = playlist_ptr( new Playlist( s,                  //src
+//                                         query.value(6).toString(), //current rev
+//                                         query.value(1).toString(), //title
+//                                         query.value(2).toString(), //info
+//                                         query.value(3).toString(), //creator
+//                                         query.value(7).toInt(),    //createdOn
+//                                         query.value(5).toBool(),   //shared
+//                                         query.value(4).toInt(),    //lastmod
+//                                         query.value(0).toString()  //GUID
+//             ) );
+//         }
+//         plists.append( p );
+    }
+
+    emit done( plists );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadAllSortedPlaylists.h Added

@@ -0,0 +1,65 @@
+/* === 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_LOADALLSORTEDPLAYLISTS_H
+#define DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H
+
+#include "DatabaseCommand.h"
+#include "DatabaseCommand_LoadAllPlaylists.h"
+
+/**
+ * Loads *all* playlists, automatic playlists, and stations. Another dbcmd because otherwise loading them all
+ * is fragmented across 3 dbcmds with a different interface.
+ *
+ * You probably want to limit / sort the output.
+ */
+class DatabaseCommand_LoadAllSortedPlaylists : public DatabaseCommand
+{
+    Q_OBJECT
+
+public:
+    // don't macros rock... not
+    typedef QPair<int,QString> SourcePlaylistPair;
+    explicit DatabaseCommand_LoadAllSortedPlaylists( const Tomahawk::source_ptr& s, QObject* parent = 0 )
+        : DatabaseCommand( s, parent )
+        , m_limitAmount( 0 )
+        , m_sortOrder( DatabaseCommand_LoadAllPlaylists::None )
+        , m_sortAscDesc( DatabaseCommand_LoadAllPlaylists::NoOrder )
+    {
+        qRegisterMetaType<QList<DatabaseCommand_LoadAllSortedPlaylists::SourcePlaylistPair> >("QList<DatabaseCommand_LoadAllSortedPlaylists::SourcePlaylistPair>");
+    }
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "loadallsortedplaylists"; }
+
+    void setLimit( unsigned int limit ) { m_limitAmount = limit; }
+    void setSortOrder( DatabaseCommand_LoadAllPlaylists::SortOrder order ) { m_sortOrder = order; }
+    void setSortAscDesc( DatabaseCommand_LoadAllPlaylists::SortAscDesc asc  ) { m_sortAscDesc = asc; }
+
+signals:
+    void done( const QList<DatabaseCommand_LoadAllSortedPlaylists::SourcePlaylistPair>& playlistGuids ); // QPair< sourceid, playlistguid>
+
+private:
+    unsigned int m_limitAmount;
+    DatabaseCommand_LoadAllPlaylists::SortOrder m_sortOrder;
+    DatabaseCommand_LoadAllPlaylists::SortAscDesc m_sortAscDesc;
+};
+
+Q_DECLARE_METATYPE(QList<DatabaseCommand_LoadAllSortedPlaylists::SourcePlaylistPair>)
+#endif // DATABASECOMMAND_LOADALLSORTEDPLAYLISTS_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadAllSources.cpp Added

@@ -0,0 +1,49 @@
+/* === 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
+ *   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_LoadAllSources.h"
+
+#include <QSqlQuery>
+
+#include "network/Servent.h"
+#include "Source.h"
+#include "DatabaseImpl.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+void
+DatabaseCommand_LoadAllSources::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+
+    query.exec( QString( "SELECT id, name, friendlyname "
+                         "FROM source" ) );
+
+    QList<source_ptr> sources;
+    while ( query.next() )
+    {
+        source_ptr src( new Source( query.value( 0 ).toUInt(), query.value( 1 ).toString() ) );
+        src->setFriendlyName( query.value( 2 ).toString() );
+        sources << src;
+    }
+
+    emit done( sources );
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadAllSources.h Added

@@ -0,0 +1,47 @@
+/* === 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
+ *   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_LOADALLSOURCES_H
+#define DATABASECOMMAND_LOADALLSOURCES_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+#include "Typedefs.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_LoadAllSources : public DatabaseCommand
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseCommand_LoadAllSources( QObject* parent = 0 )
+        : DatabaseCommand( parent )
+    {}
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "loadallsources"; }
+
+signals:
+    void done( const QList<Tomahawk::source_ptr>& sources );
+};
+
+#endif // DATABASECOMMAND_LOADALLSOURCES_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp Added

@@ -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/>.
+ */
+
+#include "DatabaseCommand_LoadAllStations.h"
+
+#include <QSqlQuery>
+
+#include "DatabaseImpl.h"
+#include "Source.h"
+#include "dynamic/DynamicPlaylist.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+void
+DatabaseCommand_LoadAllStations::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    QString orderToken, sourceToken;
+
+    switch ( m_sortOrder )
+    {
+        case 0:
+            break;
+
+        case DatabaseCommand_LoadAllPlaylists::ModificationTime:
+            orderToken = "playlist.createdOn";
+    }
+
+    if ( !source().isNull() )
+        sourceToken = QString( "AND source %1 " ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
+
+
+    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 "
+                         "dynplaylist = 'true' AND playlist.guid = dynamic_playlist.guid AND dynamic_playlist.plmode = %1 AND dynamic_playlist.autoload = 'true' "
+                         "%2"
+                         "%3 %4 %5"
+                       )
+                       .arg( OnDemand )
+                       .arg( sourceToken )
+                       .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( orderToken ) : QString() )
+                       .arg( m_sortDescending ? "DESC" : QString() )
+                       .arg( m_limitAmount > 0 ? QString( "LIMIT 0, %1" ).arg( m_limitAmount ) : QString() ) );
+
+    QList<dynplaylist_ptr> plists;
+    while ( query.next() )
+    {
+            QVariantList data = QVariantList()  <<      query.value(7).toString()  //current rev
+                                                <<      query.value(1).toString()  //title
+                                                <<      query.value(2).toString()  //info
+                                                <<      query.value(3).toString()  //creator
+                                                <<      query.value(4).toString()  //createdOn
+                                                <<      query.value(8).toString()  // dynamic type
+                                                <<      static_cast<GeneratorMode>(query.value(9).toInt())  // dynamic mode
+                                                <<      query.value(6).toBool()    //shared
+                                                <<      query.value(5).toInt()     //lastmod
+                                                <<      query.value(0).toString();  //GUID
+            emit stationLoaded( source(), data );
+    }
+
+    emit done();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadAllStations.h Added

@@ -0,0 +1,59 @@
+/* === 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_LOADALLSTATIONS_H
+#define DATABASECOMMAND_LOADALLSTATIONS_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+#include "Typedefs.h"
+#include "DatabaseCommand_LoadAllPlaylists.h"
+
+class DatabaseCommand_LoadAllStations : public DatabaseCommand
+{
+    Q_OBJECT
+
+public:
+    explicit DatabaseCommand_LoadAllStations( const Tomahawk::source_ptr& s, QObject* parent = 0 )
+    : DatabaseCommand( s, parent )
+    , m_limitAmount( 0 )
+    , m_sortOrder( DatabaseCommand_LoadAllPlaylists::None )
+    , m_sortDescending( false )
+    {}
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "loadallstations"; }
+
+    void setLimit( unsigned int limit ) { m_limitAmount = limit; }
+    void setSortOrder( DatabaseCommand_LoadAllPlaylists::SortOrder order ) { m_sortOrder = order; }
+    void setSortDescending( bool descending ) { m_sortDescending = descending; }
+
+signals:
+    void stationLoaded( const Tomahawk::source_ptr& source, const QVariantList& data );
+    void done();
+
+private:
+    unsigned int m_limitAmount;
+    DatabaseCommand_LoadAllPlaylists::SortOrder m_sortOrder;
+    bool m_sortDescending;
+};
+
+#endif
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp Added

@@ -0,0 +1,79 @@
+/* === 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_LoadDynamicPlaylist.h"
+
+#include <QSqlQuery>
+
+#include "DatabaseImpl.h"
+#include "Source.h"
+#include "dynamic/DynamicPlaylist.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+
+Tomahawk::DatabaseCommand_LoadDynamicPlaylist::DatabaseCommand_LoadDynamicPlaylist( const source_ptr& s, const QString& guid, QObject* parent )
+    : DatabaseCommand( s, parent )
+    , m_plid( guid )
+{
+
+}
+
+
+void
+Tomahawk::DatabaseCommand_LoadDynamicPlaylist::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 playlist.guid = '%2'" )
+    .arg( source()->isLocal() ? "IS NULL" : QString( "=%1" ).arg( source()->id() ) ).arg( m_plid ) );
+
+    QList<dynplaylist_ptr> plists;
+    if( query.next() )
+    {
+        dynplaylist_ptr p( new DynamicPlaylist( source(),
+                                                query.value(7).toString(),  //current rev
+                                                query.value(1).toString(),  //title
+                                                query.value(2).toString(),  //info
+                                                query.value(3).toString(),  //creator
+                                                query.value(4).toUInt(),  //createdOn
+                                                query.value(8).toString(),  // dynamic type
+                                                static_cast<GeneratorMode>(query.value(9).toInt()),  // dynamic mode
+                                                query.value(6).toBool(),    //shared
+                                                query.value(5).toInt(),     //lastmod
+                                                query.value(0).toString() ) );  //GUID
+
+        tLog() << "Loaded individual dynamic playlist:" <<      query.value(7).toString()  //current rev
+        <<      query.value(1).toString()  //title
+        <<      query.value(2).toString()  //info
+        <<      query.value(3).toString()  //creator
+        <<      query.value(4).toString()  //createdOn
+        <<      query.value(8).toString()  // dynamic type
+        <<      static_cast<GeneratorMode>(query.value(9).toInt())  // dynamic mode
+        <<      query.value(6).toBool()    //shared
+        <<      query.value(5).toInt()     //lastmod
+        <<      query.value(0).toString();  //GUID
+
+        emit dynamicPlaylistLoaded( p );
+    }
+
+    emit done();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.h Added

@@ -0,0 +1,52 @@
+/* === 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_LOADDYNAMICPLAYLIST_H
+#define DATABASECOMMAND_LOADDYNAMICPLAYLIST_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+#include "Typedefs.h"
+
+namespace Tomahawk
+{
+
+class DatabaseCommand_LoadDynamicPlaylist : public DatabaseCommand
+{
+    Q_OBJECT
+
+public:
+    explicit DatabaseCommand_LoadDynamicPlaylist( const source_ptr& s, const QString& guid, QObject* parent = 0 );
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "loadsingledynamicplaylist"; }
+
+signals:
+    void dynamicPlaylistLoaded( const Tomahawk::dynplaylist_ptr& pl );
+    void done();
+
+private:
+    QString m_plid;
+};
+
+}
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp Added

@@ -0,0 +1,112 @@
+/* === 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_LoadDynamicPlaylistEntries.h"
+
+#include <QSqlQuery>
+#include <QString>
+
+#include "DatabaseImpl.h"
+#include "TomahawkSqlQuery.h"
+#include "dynamic/DynamicControl.h"
+#include "dynamic/GeneratorInterface.h"
+#include "dynamic/GeneratorFactory.h"
+#include "qjson/parser.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+
+
+void
+DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
+{
+//    qDebug() << "Loading dynamic playlist guid" << guid();
+    // load the entries first
+    generateEntries( dbi );
+
+    // now load the controls etc
+
+    TomahawkSqlQuery controlsQuery = dbi->newquery();
+    controlsQuery.prepare("SELECT playlist_revision.playlist, controls, plmode, pltype "
+                          "FROM dynamic_playlist_revision, playlist_revision "
+                          "WHERE dynamic_playlist_revision.guid = ? AND playlist_revision.guid = dynamic_playlist_revision.guid");
+    controlsQuery.addBindValue( revisionGuid() );
+    controlsQuery.exec();
+
+    QString type;
+    GeneratorMode mode;
+
+    QList< QVariantMap > controls;
+    QString playlist_guid;
+//    qDebug() << "Loading controls..." << revisionGuid();
+//    qDebug() << "SELECT playlist_revision.playlist, controls, plmode, pltype "
+//    "FROM dynamic_playlist_revision, playlist_revision "
+//    "WHERE dynamic_playlist_revision.guid = "<< revisionGuid() << " AND playlist_revision.guid = dynamic_playlist_revision.guid";
+
+    if( controlsQuery.first() )
+    {
+        playlist_guid = controlsQuery.value( 0 ).toString();
+        QJson::Parser parser;
+        bool ok;
+        QVariant v = parser.parse( controlsQuery.value(1).toByteArray(), &ok );
+        Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
+
+
+        type = controlsQuery.value( 3 ).toString();
+        mode = static_cast<GeneratorMode>( controlsQuery.value( 2 ).toInt() );
+
+        QStringList controlIds = v.toStringList();
+//        qDebug() << "Got controls in dynamic playlist, loading:" << controlIds << controlsQuery.value(1);
+        foreach( const QString& controlId, controlIds )
+        {
+            TomahawkSqlQuery controlQuery = dbi->newquery();
+            controlQuery.prepare( "SELECT selectedType, match, input "
+                                  "FROM dynamic_playlist_controls "
+                                  "WHERE id = :id" );
+            controlQuery.bindValue( ":id", controlId );
+            controlQuery.exec();
+            if( controlQuery.next() )
+            {
+                QVariantMap c;
+                c "type"  = type;
+                c "id"  = controlId;
+                c "selectedType"  = controlQuery.value( 0 ).toString();
+                c "match"  = controlQuery.value( 1 ).toString();
+                c "input"  = controlQuery.value( 2 ).toString();
+                controls << c;
+            }
+        }
+    }
+    else
+    {
+        // No controls or plguid is null, but that's okay. We'll get a setdynrevision command with a proper revision some point later
+        return;
+    }
+
+    if( mode == OnDemand )
+    {
+//        Q_ASSERT( m_entrymap.isEmpty() ); // ondemand should have no entry
+
+        emit done( revisionGuid(), m_islatest, type, controls, true );
+    }
+    else
+    {
+        emit done( revisionGuid(), m_guids, m_oldentries, type, controls, m_islatest, m_entrymap, true );
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h Added

@@ -0,0 +1,65 @@
+/* === 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_LOADDYNAMICPLAYLISTENTRIES_H
+#define DATABASECOMMAND_LOADDYNAMICPLAYLISTENTRIES_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "Typedefs.h"
+#include "DatabaseCommand.h"
+#include "DatabaseCommand_LoadPlaylistEntries.h"
+#include "Playlist.h"
+
+class DatabaseCommand_LoadDynamicPlaylistEntries : public DatabaseCommand_LoadPlaylistEntries
+{
+    Q_OBJECT
+
+public:
+    explicit DatabaseCommand_LoadDynamicPlaylistEntries( QString revision_guid, QObject* parent = 0 )
+    : DatabaseCommand_LoadPlaylistEntries( revision_guid, parent )
+    {
+//        qDebug() << "loaded with:" << revision_guid << guid();
+    }
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "loaddynamicplaylist"; }
+
+signals:
+    // used if loading an ondemand playlist
+    void done( QString,
+                     bool,
+                     QString,
+                     QList< QVariantMap>,
+                     bool );
+    // used when loading a static playlist
+    void done( QString,
+               QList< QString >,
+               QList< QString >,
+               QString,
+               QList< QVariantMap>,
+               bool,
+               QMap< QString, Tomahawk::plentry_ptr >,
+               bool );
+
+private:
+};
+
+#endif // DATABASECOMMAND_LOADDYNAMICPLAYLIST_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadFiles.cpp Added

@@ -0,0 +1,59 @@
+/* === 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
+ *   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_LoadFiles.h"
+
+#include "DatabaseImpl.h"
+#include "Collection.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+
+DatabaseCommand_LoadFiles::DatabaseCommand_LoadFiles( unsigned int id, QObject* parent )
+    : DatabaseCommand( parent )
+    , m_single( true )
+{
+    m_ids << id;
+}
+
+DatabaseCommand_LoadFiles::DatabaseCommand_LoadFiles( const QList<unsigned int>& ids, QObject* parent )
+    : DatabaseCommand( parent )
+    , m_single( false )
+    , m_ids( ids )
+{
+}
+
+
+void
+DatabaseCommand_LoadFiles::exec( DatabaseImpl* dbi )
+{
+    QList<Tomahawk::result_ptr> resultList;
+    // file ids internally are really ints, at least for now:
+    foreach ( unsigned int id, m_ids )
+    {
+        qDebug() << "Loading file from db with id:" << id;
+        resultList << dbi->file( id );
+    }
+
+    Q_ASSERT( !m_single || resultList.size() <= 1 );
+
+    if ( m_single && !resultList.isEmpty() )
+        emit result( resultList.first() );
+    else
+        emit results( resultList );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadFiles.h Added

@@ -0,0 +1,57 @@
+/* === 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
+ *   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_LOADFILES_H
+#define DATABASECOMMAND_LOADFILES_H
+
+#include <QObject>
+#include <QVariantMap>
+#include <QStringList>
+#include <QMap>
+
+#include "DatabaseCommand.h"
+#include "Result.h"
+#include "DllMacro.h"
+
+/**
+  Loads a result_ptr from the database from a track dbid.
+
+  If use use the QStringList constructor, isten to results() instead of result()
+  */
+class DLLEXPORT DatabaseCommand_LoadFiles : public DatabaseCommand
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseCommand_LoadFiles( unsigned int id, QObject* parent = 0 );
+    explicit DatabaseCommand_LoadFiles( const QList<unsigned int>& ids, QObject* parent = 0 );
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "loadfiles"; }
+
+signals:
+    void result( const Tomahawk::result_ptr& result );
+    void results( const QList<Tomahawk::result_ptr>& results );
+
+private:
+    bool m_single;
+    QList<unsigned int> m_ids;
+};
+
+#endif // DATABASECOMMAND_LOADFILE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadOps.cpp Added

@@ -0,0 +1,76 @@
+/* === 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
+ *   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_LoadOps.h"
+
+#include "DatabaseImpl.h"
+#include "TomahawkSqlQuery.h"
+#include "Source.h"
+#include "utils/Logger.h"
+
+
+void
+DatabaseCommand_loadOps::exec( DatabaseImpl* dbi )
+{
+    QList< dbop_ptr > ops;
+
+    if ( !m_since.isEmpty() )
+    {
+        TomahawkSqlQuery query = dbi->newquery();
+        query.prepare( QString( "SELECT id FROM oplog WHERE guid = ?" ) );
+        query.addBindValue( m_since );
+        query.exec();
+
+        if ( !query.next() )
+        {
+            tLog() << "Unknown oplog guid, requested, not replying:" << m_since;
+            Q_ASSERT( false );
+            emit done( m_since, m_since, ops );
+            return;
+        }
+    }
+
+    TomahawkSqlQuery query = dbi->newquery();
+    query.prepare( QString(
+                   "SELECT guid, command, json, compressed, singleton "
+                   "FROM oplog "
+                   "WHERE source %1 "
+                   "AND id > coalesce((SELECT id FROM oplog WHERE guid = ?),0) "
+                   "ORDER BY id ASC"
+                   ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) )
+                  );
+    query.addBindValue( m_since );
+    query.exec();
+
+    QString lastguid = m_since;
+    while( query.next() )
+    {
+        dbop_ptr op( new DBOp );
+        op->guid = query.value( 0 ).toString();
+        op->command = query.value( 1 ).toString();
+        op->payload = query.value( 2 ).toByteArray();
+        op->compressed = query.value( 3 ).toBool();
+        op->singleton = query.value( 4 ).toBool();
+
+        lastguid = op->guid;
+        ops << op;
+    }
+
+//    qDebug() << "Loaded" << ops.length() << "ops from db";
+    emit done( m_since, lastguid, ops );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadOps.h Added

@@ -0,0 +1,50 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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_LOADOPS_H
+#define DATABASECOMMAND_LOADOPS_H
+
+#include "Typedefs.h"
+#include "DatabaseCommand.h"
+#include "Op.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_loadOps : public DatabaseCommand
+{
+Q_OBJECT
+public:
+    explicit DatabaseCommand_loadOps( const Tomahawk::source_ptr& src, QString since, QObject* parent = 0 )
+        : DatabaseCommand( src ), m_since( since )
+    {
+        Q_UNUSED( parent );
+    }
+
+    virtual void exec( DatabaseImpl* db );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "loadops"; }
+
+signals:
+    void done( QString sinceguid, QString lastguid, QList< dbop_ptr > ops );
+
+private:
+    QString m_since; // guid to load from
+};
+
+#endif // DATABASECOMMAND_LOADOPS_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.cpp Added

@@ -0,0 +1,122 @@
+/* === 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
+ *   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_LoadPlaylistEntries.h"
+
+#include <QSqlQuery>
+
+#include "DatabaseImpl.h"
+#include "Query.h"
+#include "qjson/parser.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+
+
+void
+DatabaseCommand_LoadPlaylistEntries::exec( DatabaseImpl* dbi )
+{
+    generateEntries( dbi );
+
+    emit done( m_revguid, m_guids, m_oldentries, m_islatest, m_entrymap, true );
+}
+
+
+void
+DatabaseCommand_LoadPlaylistEntries::generateEntries( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query_entries = dbi->newquery();
+    query_entries.prepare( "SELECT entries, playlist, author, timestamp, previous_revision "
+                           "FROM playlist_revision "
+                           "WHERE guid = :guid" );
+    query_entries.bindValue( ":guid", m_revguid );
+    query_entries.exec();
+
+    tLog( LOGVERBOSE ) << "trying to load playlist entries for guid:" << m_revguid;
+    QString prevrev;
+    QJson::Parser parser; bool ok;
+
+    if ( query_entries.next() )
+    {
+        // entries should be a list of strings:
+        QVariant v = parser.parse( query_entries.value( 0 ).toByteArray(), &ok );
+        Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
+        m_guids = v.toStringList();
+        QString inclause = QString( "('%1')" ).arg( m_guids.join( "', '" ) );
+
+        TomahawkSqlQuery query = dbi->newquery();
+        QString sql = QString( "SELECT guid, trackname, artistname, albumname, annotation, "
+                               "duration, addedon, addedby, result_hint "
+                               "FROM playlist_item "
+                               "WHERE guid IN %1" ).arg( inclause );
+
+        query.exec( sql );
+        while ( query.next() )
+        {
+            plentry_ptr e( new PlaylistEntry );
+            e->setGuid( query.value( 0 ).toString() );
+            e->setAnnotation( query.value( 4 ).toString() );
+            e->setDuration( query.value( 5 ).toUInt() );
+            e->setLastmodified( 0 ); // TODO e->lastmodified = query.value( 6 ).toInt();
+            e->setResultHint( query.value( 8 ).toString() );
+
+            Tomahawk::query_ptr q = Tomahawk::Query::get( query.value( 2 ).toString(), query.value( 1 ).toString(), query.value( 3 ).toString() );
+            if ( q.isNull() )
+                continue;
+
+            q->setResultHint( query.value( 8 ).toString() );
+            q->setProperty( "annotation", e->annotation() );
+            e->setQuery( q );
+
+            m_entrymap.insert( e->guid(), e );
+        }
+
+        prevrev = query_entries.value( 4 ).toString();
+    }
+    else
+    {
+//        qDebug() << "Playlist has no current revision data";
+    }
+
+    if ( prevrev.length() )
+    {
+        TomahawkSqlQuery query_entries_old = dbi->newquery();
+        query_entries_old.prepare( "SELECT entries, "
+                                   "(SELECT currentrevision = ? FROM playlist WHERE guid = ?) "
+                                   "FROM playlist_revision "
+                                   "WHERE guid = ?" );
+        query_entries_old.addBindValue( m_revguid );
+        query_entries_old.addBindValue( query_entries.value( 1 ).toString() );
+        query_entries_old.addBindValue( prevrev );
+
+        query_entries_old.exec();
+        if ( !query_entries_old.next() )
+        {
+            return;
+            Q_ASSERT( false );
+        }
+
+        QVariant v = parser.parse( query_entries_old.value( 0 ).toByteArray(), &ok );
+        Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
+        m_oldentries = v.toStringList();
+        m_islatest = query_entries_old.value( 1 ).toBool();
+    }
+
+//    qDebug() << Q_FUNC_INFO << "entrymap:" << m_entrymap;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadPlaylistEntries.h Added

@@ -0,0 +1,66 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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_LOADPLAYLIST_H
+#define DATABASECOMMAND_LOADPLAYLIST_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+#include "Playlist.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_LoadPlaylistEntries : public DatabaseCommand
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseCommand_LoadPlaylistEntries( QString revision_guid, QObject* parent = 0 )
+    : DatabaseCommand( parent ), m_islatest( true ), m_revguid( revision_guid )
+    {}
+
+    virtual void exec( DatabaseImpl* );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "loadplaylistentries"; }
+
+    QString revisionGuid() const { return m_revguid; }
+
+signals:
+    void done( const QString& rev,
+               const QList<QString>& orderedguid,
+               const QList<QString>& oldorderedguid,
+               bool islatest,
+               const QMap< QString, Tomahawk::plentry_ptr >& added,
+               bool applied );
+
+protected:
+    void generateEntries( DatabaseImpl* dbi );
+
+    QStringList m_guids;
+    QMap< QString, Tomahawk::plentry_ptr > m_entrymap;
+    bool m_islatest;
+    QStringList m_oldentries;
+
+private:
+    QString m_revguid;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.cpp Added

@@ -0,0 +1,76 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christopher Reichert <creichert07@gmail.com>
+ *
+ *   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_LoadSocialActions.h"
+
+#include <QSqlQuery>
+
+#include "database/Database.h"
+#include "DatabaseImpl.h"
+#include "network/Servent.h"
+#include "Result.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+void
+DatabaseCommand_LoadSocialActions::exec( DatabaseImpl* dbi )
+{
+    qDebug() << Q_FUNC_INFO;
+    Q_ASSERT( !source().isNull() );
+
+    TomahawkSqlQuery query = dbi->newquery();
+
+    QVariant srcid = source()->isLocal() ? QVariant( QVariant::Int ) : source()->id();
+
+    int artid = dbi->artistId( m_artist, false );
+    if( artid < 1 )
+        return;
+
+    int trkid = dbi->trackId( artid, m_track, false );
+    if( trkid < 1 )
+        return;
+
+    QString whereToken;
+    whereToken = QString( "WHERE id IS %1" ).arg( trkid );
+
+    QString sql = QString(
+            "SELECT k, v, timestamp, source "
+            "FROM social_attributes %1 "
+            "ORDER BY timestamp ASC" ).arg( whereToken );
+
+    query.prepare( sql );
+    query.exec();
+
+    QList< Tomahawk::SocialAction > allSocialActions;
+    while ( query.next() )
+    {
+        Tomahawk::SocialAction action;
+        action.action    = query.value( 0 );  // action
+        action.value     = query.value( 1 );  // comment
+        action.timestamp = query.value( 2 );  // timestamp
+        action.source    = SourceList::instance()->get( query.value( 3 ).toInt() );  // source
+        
+        if ( !action.source.isNull() )
+            allSocialActions.append( action );
+    }
+
+    m_query->setAllSocialActions( allSocialActions );
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LoadSocialActions.h Added

@@ -0,0 +1,134 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Christopher Reichert <creichert07@gmail.com>
+ *
+ *   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_LOADSOCIALACTIONS_H
+#define DATABASECOMMAND_LOADSOCIALACTIONS_H
+
+#include <QDateTime>
+#include <QList>
+#include "database/DatabaseCommand.h"
+
+#include "SourceList.h"
+#include "Typedefs.h"
+#include "Artist.h"
+
+#include "DllMacro.h"
+
+/**
+ * \class DatabaseCommand_LoadSocialActions
+ * \brief Database command used to load social actions from the database.
+ *
+ * This Database command allows Tomahawk to load social actions from
+ * the local database. The loaded social actions can be used to create
+ * dynamic playlists, generate statistics and provide data to share with
+ * friends on tomahawk.
+ *
+ * \see DatabaseCommand_SocialAction
+ */
+class DLLEXPORT DatabaseCommand_LoadSocialActions : public DatabaseCommand
+{
+Q_OBJECT
+
+public:
+    /**
+     * \brief Default constructor for DatabaseCommand_LoadSocialActions.
+     *
+     * Constructs an empty database command for loading social actions.
+     */
+    explicit DatabaseCommand_LoadSocialActions( QObject* parent = 0 )
+        : DatabaseCommand( parent )
+    {}
+
+    /**
+     * \brief Overloaded constructor for DatabaseCommand_LoadSocialAction.
+     * \param result A Tomahawk Query object.
+     * \param parent Parent class.
+     *
+     * Constructor which creates a new database command for loading all social actions.
+     */
+    explicit DatabaseCommand_LoadSocialActions( const Tomahawk::query_ptr& query, QObject* parent = 0 )
+        : DatabaseCommand( parent ), m_query( query )
+    {
+        setSource( SourceList::instance()->getLocal() );
+        setArtist( query->artist() );
+        setTrack( query->track() );
+    }
+
+    /**
+     * \brief Returns the name of this database command.
+     * \return QString containing the database command name 'loadsocialaction'.
+     */
+    virtual QString commandname() const { return "loadsocialactions"; }
+
+    /**
+     * \brief Executes the database command.
+     * \param dbi Database instance.
+     *
+     * This method prepares an sql query to load the social actions
+     * from the database into a list of all social actions.
+     *
+     * \see Result::setAllSocialActions()
+     */
+    virtual void exec( DatabaseImpl* );
+
+    /**
+     * \brief Returns the artist associated with this database command.
+     * \return Name of the artist.
+     * \see setArtist()
+     */
+    QString artist() const { return m_artist; }
+
+    /**
+     * \brief Sets the artist name for this database command.
+     * \param s QString containing the artist name.
+     * \see artist()
+     */
+    void setArtist( const QString& s ) { m_artist = s; }
+
+    /**
+     * \brief Returns the track name associated with this social action.
+     * \return QString containing the track name.
+     * \see setTrack()
+     */
+    QString track() const { return m_track; }
+
+    /**
+     * \brief Sets the track name associated with this database command.
+     * \param track QString containing the track name.
+     * \see track()
+     */
+    void setTrack( const QString& s ) { m_track = s; }
+
+signals:
+
+    /**
+     * \brief Emitted when the database command has finished the Query successfully
+     *
+     * \param QList of all social actions
+     * \see QList
+     */
+    void done( QList< Tomahawk::SocialAction >& allSocialActions );
+
+private:
+    Tomahawk::query_ptr m_query;
+    QString m_artist;
+    QString m_track;
+
+};
+
+#endif // DATABASECOMMAND_LOADSOCIALACTIONS_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LogPlayback.cpp Added

@@ -0,0 +1,136 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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_LogPlayback.h"
+
+#include <QSqlQuery>
+
+#include "Collection.h"
+#include "database/Database.h"
+#include "DatabaseImpl.h"
+#include "network/Servent.h"
+#include "utils/Logger.h"
+
+#define STARTED_THRESHOLD 600   // Don't advertise tracks older than X seconds as currently playing
+#define FINISHED_THRESHOLD 10   // Don't store tracks played less than X seconds in the playback log
+#define SUBMISSION_THRESHOLD 20 // Don't broadcast playback logs when a track was played less than X seconds
+
+using namespace Tomahawk;
+
+
+void
+DatabaseCommand_LogPlayback::postCommitHook()
+{
+    if ( !m_query.isNull() )
+        return;
+
+    connect( this, SIGNAL( trackPlaying( Tomahawk::query_ptr, unsigned int ) ),
+             source().data(), SLOT( onPlaybackStarted( Tomahawk::query_ptr, unsigned int ) ), Qt::QueuedConnection );
+    connect( this, SIGNAL( trackPlayed( Tomahawk::query_ptr ) ),
+             source().data(), SLOT( onPlaybackFinished( Tomahawk::query_ptr ) ), Qt::QueuedConnection );
+
+    if ( !m_result.isNull() && m_query.isNull() )
+    {
+        m_query = m_result->toQuery();
+    }
+    else
+    {
+        // do not auto resolve this track
+        m_query = Tomahawk::Query::get( m_artist, m_track, QString() );
+    }
+    
+    if ( m_query.isNull() )
+        return;
+    
+    m_query->setPlayedBy( source(), m_playtime );
+
+    if ( m_action == Finished )
+    {
+        emit trackPlayed( m_query );
+    }
+    // if the play time is more than 10 minutes in the past, ignore
+    else if ( m_action == Started && QDateTime::fromTime_t( playtime() ).secsTo( QDateTime::currentDateTime() ) < STARTED_THRESHOLD )
+    {
+        emit trackPlaying( m_query, m_trackDuration );
+    }
+
+    if ( source()->isLocal() )
+    {
+        Servent::instance()->triggerDBSync();
+    }
+}
+
+
+void
+DatabaseCommand_LogPlayback::exec( DatabaseImpl* dbi )
+{
+    Q_ASSERT( !source().isNull() );
+
+    if ( m_action != Finished )
+        return;
+    if ( m_secsPlayed < FINISHED_THRESHOLD && m_trackDuration > 0 )
+        return;
+    if ( m_artist.isEmpty() || m_track.isEmpty() )
+        return;
+
+    QVariant srcid = source()->isLocal() ? QVariant( QVariant::Int ) : source()->id();
+    TomahawkSqlQuery query = dbi->newquery();
+    
+    if ( !m_query.isNull() )
+    {
+        query.prepare( QString( "SELECT * FROM playback_log WHERE source %1 AND playtime = %2" ).arg( srcid.isNull() ? "IS NULL" : srcid.toString() ).arg( m_playtime ) );
+        query.exec();
+        if ( query.next() )
+        {
+            tDebug() << "Ignoring dupe playback log for source" << srcid << "with timestamp" << m_playtime;
+            return;
+        }
+    }
+
+//    tDebug() << "Logging playback of" << m_artist << "-" << m_track << "for source" << srcid << "- timestamp:" << m_playtime;
+
+    query.prepare( "INSERT INTO playback_log(source, track, playtime, secs_played) VALUES (?, ?, ?, ?)" );
+    query.bindValue( 0, srcid );
+
+    // If there's no artist, because it's a resolver result with bad metadata for example, don't save it
+    int artid = dbi->artistId( m_artist, true );
+    if( artid < 1 )
+        return;
+
+    int trkid = dbi->trackId( artid, m_track, true );
+    if( trkid < 1 )
+        return;
+
+    query.bindValue( 1, trkid );
+    query.bindValue( 2, m_playtime );
+    query.bindValue( 3, m_secsPlayed );
+
+    query.exec();
+}
+
+
+bool
+DatabaseCommand_LogPlayback::localOnly() const
+{
+    if ( m_action == Finished )
+        return m_secsPlayed < SUBMISSION_THRESHOLD;
+
+    return false;
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_LogPlayback.h Added

@@ -0,0 +1,120 @@
+/* === 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
+ *   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_LOGPLAYBACK_H
+#define DATABASECOMMAND_LOGPLAYBACK_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "database/DatabaseCommandLoggable.h"
+#include "SourceList.h"
+#include "Typedefs.h"
+#include "Artist.h"
+#include "Query.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_LogPlayback : public DatabaseCommandLoggable
+{
+Q_OBJECT
+Q_PROPERTY( QString artist READ artist WRITE setArtist )
+Q_PROPERTY( QString track READ track WRITE setTrack )
+Q_PROPERTY( unsigned int playtime READ playtime WRITE setPlaytime )
+Q_PROPERTY( unsigned int secsPlayed READ secsPlayed WRITE setSecsPlayed )
+Q_PROPERTY( unsigned int trackDuration READ trackDuration WRITE setTrackDuration )
+Q_PROPERTY( int action READ action WRITE setAction )
+
+public:
+    enum Action
+    {
+        Started = 1,
+        Finished = 2
+    };
+
+    explicit DatabaseCommand_LogPlayback( QObject* parent = 0 )
+        : DatabaseCommandLoggable( parent ), m_playtime( 0 ), m_secsPlayed( 0 ), m_trackDuration( 0 )
+    {}
+
+    explicit DatabaseCommand_LogPlayback( const Tomahawk::query_ptr& query, Action action, uint timeStamp, QObject* parent = 0 )
+        : DatabaseCommandLoggable( parent ), m_query( query ), m_secsPlayed( 0 ), m_action( action )
+    {
+        m_playtime = timeStamp;
+        m_trackDuration = 0;
+        setSource( SourceList::instance()->getLocal() );
+
+        setArtist( query->artist() );
+        setTrack( query->track() );
+    }
+
+    explicit DatabaseCommand_LogPlayback( const Tomahawk::result_ptr& result, Action action, unsigned int secsPlayed = 0, QObject* parent = 0 )
+        : DatabaseCommandLoggable( parent ), m_result( result ), m_secsPlayed( secsPlayed ), m_action( action )
+    {
+        m_playtime = QDateTime::currentDateTimeUtc().toTime_t();
+        m_trackDuration = result->duration();
+        setSource( SourceList::instance()->getLocal() );
+
+        setArtist( result->artist()->name() );
+        setTrack( result->track() );
+    }
+
+    virtual QString commandname() const { return "logplayback"; }
+
+    virtual void exec( DatabaseImpl* );
+    virtual void postCommitHook();
+
+    virtual bool doesMutates() const { return true; }
+    virtual bool singletonCmd() const { return ( m_action == Started ); }
+    virtual bool localOnly() const;
+    virtual bool groupable() const { return true; }
+
+    QString artist() const { return m_artist; }
+    void setArtist( const QString& s ) { m_artist = s; }
+
+    QString track() const { return m_track; }
+    void setTrack( const QString& s ) { m_track = s; }
+
+    unsigned int playtime() const { return m_playtime; }
+    void setPlaytime( unsigned int i ) { m_playtime = i; }
+
+    unsigned int secsPlayed() const { return m_secsPlayed; }
+    void setSecsPlayed( unsigned int i ) { m_secsPlayed = i; }
+
+    unsigned int trackDuration() const { return m_trackDuration; }
+    void setTrackDuration( unsigned int trackDuration ) { m_trackDuration = trackDuration; }
+
+    int action() const { return m_action; }
+    void setAction( int a ) { m_action = (Action)a; }
+
+signals:
+    void trackPlaying( const Tomahawk::query_ptr& query, unsigned int duration );
+    void trackPlayed( const Tomahawk::query_ptr& query );
+
+private:
+    Tomahawk::result_ptr m_result;
+    Tomahawk::query_ptr m_query;
+
+    QString m_artist;
+    QString m_track;
+    unsigned int m_playtime;
+    unsigned int m_secsPlayed;
+    unsigned int m_trackDuration;
+    Action m_action;
+};
+
+#endif // DATABASECOMMAND_LOGPLAYBACK_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_ModifyPlaylist.cpp Added

@@ -0,0 +1,44 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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_ModifyPlaylist.h"
+
+#include "utils/Logger.h"
+#include "Playlist.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_ModifyPlaylist::DatabaseCommand_ModifyPlaylist( Playlist* playlist, const QList< plentry_ptr >& entries, Mode mode )
+    : DatabaseCommand()
+    , m_playlist( playlist )
+    , m_entries( entries )
+    , m_mode( mode )
+{
+}
+
+DatabaseCommand_ModifyPlaylist::~DatabaseCommand_ModifyPlaylist()
+{}
+
+void
+DatabaseCommand_ModifyPlaylist::exec( DatabaseImpl* lib )
+{
+    Q_UNUSED( lib );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_ModifyPlaylist.h Added

@@ -0,0 +1,59 @@
+/* === 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
+ *   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_MODIFYPLAYLIST_H
+#define DATABASECOMMAND_MODIFYPLAYLIST_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "Typedefs.h"
+#include "DatabaseCommand.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_ModifyPlaylist : public DatabaseCommand
+{
+Q_OBJECT
+Q_PROPERTY( int mode READ mode WRITE setMode )
+
+public:
+    enum Mode
+    {
+        ADD = 1,
+        REMOVE = 2,
+        UPDATE = 3
+    };
+
+    explicit DatabaseCommand_ModifyPlaylist( Tomahawk::Playlist* playlist, const QList< Tomahawk::plentry_ptr >& entries, Mode mode );
+    virtual ~DatabaseCommand_ModifyPlaylist();
+
+    virtual bool doesMutates() const { return true; }
+
+    virtual void exec( DatabaseImpl* lib );
+
+    int mode() const { return m_mode; }
+    void setMode( int m ) { m_mode = (Mode)m; }
+
+private:
+    Tomahawk::Playlist* m_playlist;
+    QList< Tomahawk::plentry_ptr > m_entries;
+    Mode m_mode;
+};
+
+#endif // DATABASECOMMAND_MODIFYPLAYLIST_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_PlaybackHistory.cpp Added

@@ -0,0 +1,84 @@
+/* === 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
+ *   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_PlaybackHistory.h"
+
+#include <QSqlQuery>
+
+#include "DatabaseImpl.h"
+#include "SourceList.h"
+
+#include "utils/Logger.h"
+
+
+void
+DatabaseCommand_PlaybackHistory::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+    QList<Tomahawk::query_ptr> ql;
+
+    QString whereToken;
+    if ( !source().isNull() )
+    {
+        whereToken = QString( "WHERE source %1" ).arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
+    }
+
+    QString sql = QString(
+            "SELECT track, playtime, secs_played, source "
+            "FROM playback_log "
+            "%1 "
+            "ORDER BY playtime DESC "
+            "%2" ).arg( whereToken )
+                  .arg( m_amount > 0 ? QString( "LIMIT 0, %1" ).arg( m_amount ) : QString() );
+
+    query.prepare( sql );
+    query.exec();
+
+    while( query.next() )
+    {
+        TomahawkSqlQuery query_track = dbi->newquery();
+
+        QString sql = QString(
+                "SELECT track.name, artist.name "
+                "FROM track, artist "
+                "WHERE artist.id = track.artist "
+                "AND track.id = %1"
+                ).arg( query.value( 0 ).toUInt() );
+
+        query_track.prepare( sql );
+        query_track.exec();
+
+        if ( query_track.next() )
+        {
+            Tomahawk::query_ptr q = Tomahawk::Query::get( query_track.value( 1 ).toString(), query_track.value( 0 ).toString(), QString() );
+
+            if ( query.value( 3 ).toUInt() == 0 )
+            {
+                q->setPlayedBy( SourceList::instance()->getLocal(), query.value( 1 ).toUInt() );
+            }
+            else
+            {
+                q->setPlayedBy( SourceList::instance()->get( query.value( 3 ).toUInt() ), query.value( 1 ).toUInt() );
+            }
+
+            ql << q;
+        }
+    }
+
+    emit tracks( ql );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_PlaybackHistory.h Added

@@ -0,0 +1,55 @@
+/* === 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
+ *   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_PLAYBACKHISTORY_H
+#define DATABASECOMMAND_PLAYBACKHISTORY_H
+
+#include <QObject>
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+#include "Typedefs.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_PlaybackHistory : public DatabaseCommand
+{
+Q_OBJECT
+public:
+    explicit DatabaseCommand_PlaybackHistory( const Tomahawk::source_ptr& source, QObject* parent = 0 )
+        : DatabaseCommand( parent )
+        , m_amount( 0 )
+    {
+        setSource( source );
+    }
+
+    virtual void exec( DatabaseImpl* );
+
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "playbackhistory"; }
+
+    void setLimit( unsigned int amount ) { m_amount = amount; }
+
+signals:
+    void tracks( const QList<Tomahawk::query_ptr>& queries );
+
+private:
+    unsigned int m_amount;
+};
+
+#endif // DATABASECOMMAND_PLAYBACKHISTORY_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_RenamePlaylist.cpp Added

@@ -0,0 +1,75 @@
+/* === 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
+ *   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_RenamePlaylist.h"
+
+#include <QSqlQuery>
+
+#include "DatabaseImpl.h"
+#include "Collection.h"
+#include "Source.h"
+#include "network/Servent.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_RenamePlaylist::DatabaseCommand_RenamePlaylist( const source_ptr& source, const QString& playlistguid, const QString& playlistTitle )
+    : DatabaseCommandLoggable( source )
+{
+    setPlaylistguid( playlistguid );
+    setPlaylistTitle( playlistTitle );
+}
+
+
+void
+DatabaseCommand_RenamePlaylist::exec( DatabaseImpl* lib )
+{
+    TomahawkSqlQuery cre = lib->newquery();
+
+    QString sql = QString( "UPDATE playlist SET title = :title WHERE guid = :id AND source %1" )
+                     .arg( source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( source()->id() ) );
+
+    cre.prepare( sql );
+    cre.bindValue( ":id", m_playlistguid );
+    cre.bindValue( ":title", m_playlistTitle );
+
+    qDebug() << Q_FUNC_INFO << m_playlistTitle << m_playlistguid;
+
+    cre.exec();
+}
+
+
+void
+DatabaseCommand_RenamePlaylist::postCommitHook()
+{
+    playlist_ptr playlist = source()->collection()->playlist( m_playlistguid );
+    // fallback, check for auto and stations too
+    if( playlist.isNull() )
+        playlist = source()->collection()->autoPlaylist( m_playlistguid );
+    if( playlist.isNull() )
+        playlist = source()->collection()->station( m_playlistguid );
+
+    Q_ASSERT( !playlist.isNull() );
+
+    qDebug() << "Renaming old playlist" << playlist->title() << "to" << m_playlistTitle << m_playlistguid;
+    playlist->setTitle( m_playlistTitle );
+
+    if( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_RenamePlaylist.h Added

@@ -0,0 +1,59 @@
+/* === 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
+ *   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_RENAMEPLAYLIST_H
+#define DATABASECOMMAND_RENAMEPLAYLIST_H
+
+#include "Typedefs.h"
+#include "DatabaseCommandLoggable.h"
+
+#include "DllMacro.h"
+
+class DatabaseImpl;
+
+class DLLEXPORT DatabaseCommand_RenamePlaylist : public DatabaseCommandLoggable
+{
+Q_OBJECT
+Q_PROPERTY( QString playlistguid READ playlistguid WRITE setPlaylistguid )
+Q_PROPERTY( QString playlistTitle READ playlistTitle WRITE setPlaylistTitle )
+
+public:
+    explicit DatabaseCommand_RenamePlaylist( QObject* parent = 0 )
+            : DatabaseCommandLoggable( parent )
+    {}
+
+    explicit DatabaseCommand_RenamePlaylist( const Tomahawk::source_ptr& source, const QString& playlistguid, const QString& playlistTitle );
+
+    QString commandname() const { return "renameplaylist"; }
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual void postCommitHook();
+    virtual bool doesMutates() const { return true; }
+
+    QString playlistguid() const { return m_playlistguid; }
+    void setPlaylistguid( const QString& s ) { m_playlistguid = s; }
+
+    QString playlistTitle() const { return m_playlistTitle; }
+    void setPlaylistTitle( const QString& s ) { m_playlistTitle = s; }
+
+private:
+    QString m_playlistguid;
+    QString m_playlistTitle;
+};
+
+#endif // DATABASECOMMAND_RENAMEPLAYLIST_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_Resolve.cpp Added

@@ -0,0 +1,339 @@
+/* === 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
+ *   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_Resolve.h"
+
+#include "Artist.h"
+#include "Album.h"
+#include "Pipeline.h"
+#include "SourceList.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_Resolve::DatabaseCommand_Resolve( const query_ptr& query )
+    : DatabaseCommand()
+    , m_query( query )
+{
+    Q_ASSERT( Pipeline::instance()->isRunning() );
+}
+
+
+DatabaseCommand_Resolve::~DatabaseCommand_Resolve()
+{
+}
+
+
+void
+DatabaseCommand_Resolve::exec( DatabaseImpl* lib )
+{
+    /*
+     *        Resolving is a 2 stage process.
+     *        1) find list of trk/art/alb IDs that are reasonable matches to the metadata given
+     *        2) find files in database by permitted sources and calculate score, ignoring
+     *           results that are less than MINSCORE
+     */
+
+    if ( !m_query->resultHint().isEmpty() )
+    {
+        qDebug() << "Using result-hint to speed up resolving:" << m_query->resultHint();
+
+        Tomahawk::result_ptr result = lib->resultFromHint( m_query );
+        if ( !result.isNull() && !result->collection().isNull() && result->collection()->source()->isOnline() )
+        {
+            QList<Tomahawk::result_ptr> res;
+            res << result;
+            emit results( m_query->id(), res );
+            return;
+        }
+    }
+
+    if ( m_query->isFullTextQuery() )
+        fullTextResolve( lib );
+    else
+        resolve( lib );
+}
+
+
+void
+DatabaseCommand_Resolve::resolve( DatabaseImpl* lib )
+{
+    QList<Tomahawk::result_ptr> res;
+    typedef QPair<int, float> scorepair_t;
+
+    // STEP 1
+    QList< QPair<int, float> > tracks = lib->search( m_query );
+
+    if ( tracks.length() == 0 )
+    {
+        qDebug() << "No candidates found in first pass, aborting resolve" << m_query->artist() << m_query->track();
+        emit results( m_query->id(), res );
+        return;
+    }
+
+    // STEP 2
+    TomahawkSqlQuery files_query = lib->newquery();
+
+    QStringList trksl;
+    for ( int k = 0; k < tracks.count(); k++ )
+        trksl.append( QString::number( tracks.at( k ).first ) );
+
+    QString trksToken = QString( "file_join.track IN (%1)" ).arg( trksl.join( "," ) );
+
+    QString sql = QString( "SELECT "
+                            "url, mtime, size, md5, mimetype, duration, bitrate, "  //0
+                            "file_join.artist, file_join.album, file_join.track, "  //7
+                            "file_join.composer, file_join.discnumber, "            //10
+                            "artist.name as artname, "                              //12
+                            "album.name as albname, "                               //13
+                            "track.name as trkname, "                               //14
+                            "composer.name as cmpname, "                            //15
+                            "file.source, "                                         //16
+                            "file_join.albumpos, "                                  //17
+                            "artist.id as artid, "                                  //18
+                            "album.id as albid, "                                   //19
+                            "composer.id as cmpid "                                 //20
+                            "FROM file, file_join, artist, track "
+                            "LEFT JOIN album ON album.id = file_join.album "
+                            "LEFT JOIN artist AS composer ON composer.id = file_join.composer "
+                            "WHERE "
+                            "artist.id = file_join.artist AND "
+                            "track.id = file_join.track AND "
+                            "file.id = file_join.file AND "
+                            "(%1)" )
+         .arg( trksToken );
+
+    files_query.prepare( sql );
+    files_query.exec();
+
+    while ( files_query.next() )
+    {
+        source_ptr s;
+        QString url = files_query.value( 0 ).toString();
+
+        if ( files_query.value( 16 ).toUInt() == 0 )
+        {
+            s = SourceList::instance()->getLocal();
+        }
+        else
+        {
+            s = SourceList::instance()->get( files_query.value( 16 ).toUInt() );
+            if ( s.isNull() )
+            {
+                qDebug() << "Could not find source" << files_query.value( 16 ).toUInt();
+                continue;
+            }
+
+            url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
+        }
+
+        bool cached = Tomahawk::Result::isCached( url );
+        Tomahawk::result_ptr result = Tomahawk::Result::get( url );
+        if ( cached )
+        {
+            qDebug() << "Result already cached:" << result->toString();
+            res << result;
+            continue;
+        }
+
+        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( files_query.value( 18 ).toUInt(), files_query.value( 12 ).toString() );
+        Tomahawk::album_ptr album = Tomahawk::Album::get( files_query.value( 19 ).toUInt(), files_query.value( 13 ).toString(), artist );
+        Tomahawk::artist_ptr composer = Tomahawk::Artist::get( files_query.value( 20 ).toUInt(), files_query.value( 15 ).toString() );
+
+        result->setModificationTime( files_query.value( 1 ).toUInt() );
+        result->setSize( files_query.value( 2 ).toUInt() );
+        result->setMimetype( files_query.value( 4 ).toString() );
+        result->setDuration( files_query.value( 5 ).toUInt() );
+        result->setBitrate( files_query.value( 6 ).toUInt() );
+        result->setArtist( artist );
+        result->setComposer( composer );
+        result->setAlbum( album );
+        result->setDiscNumber( files_query.value( 11 ).toUInt() );
+        result->setTrack( files_query.value( 14 ).toString() );
+        result->setRID( uuid() );
+        result->setAlbumPos( files_query.value( 17 ).toUInt() );
+        result->setTrackId( files_query.value( 9 ).toUInt() );
+
+        TomahawkSqlQuery attrQuery = lib->newquery();
+        QVariantMap attr;
+
+        attrQuery.prepare( "SELECT k, v FROM track_attributes WHERE id = ?" );
+        attrQuery.bindValue( 0, result->trackId() );
+        attrQuery.exec();
+        while ( attrQuery.next() )
+        {
+            attr attrQuery.value( 0 ).toString()  = attrQuery.value( 1 ).toString();
+        }
+
+        result->setAttributes( attr );
+        result->setCollection( s->collection() );
+
+        res << result;
+    }
+
+    emit results( m_query->id(), res );
+}
+
+
+void
+DatabaseCommand_Resolve::fullTextResolve( DatabaseImpl* lib )
+{
+    QList<Tomahawk::result_ptr> res;
+    typedef QPair<int, float> scorepair_t;
+
+    // STEP 1
+    QList< QPair<int, float> > trackPairs = lib->search( m_query );
+    QList< QPair<int, float> > albumPairs = lib->searchAlbum( m_query, 20 );
+
+    foreach ( const scorepair_t& albumPair, albumPairs )
+    {
+        TomahawkSqlQuery query = lib->newquery();
+
+        QString sql = QString( "SELECT album.name, artist.id, artist.name FROM album, artist WHERE artist.id = album.artist AND album.id = %1" ).arg( albumPair.first );
+        query.prepare( sql );
+        query.exec();
+
+        QList<Tomahawk::album_ptr> albumList;
+        while ( query.next() )
+        {
+            Tomahawk::artist_ptr artist = Tomahawk::Artist::get( query.value( 1 ).toUInt(), query.value( 2 ).toString() );
+            Tomahawk::album_ptr album = Tomahawk::Album::get( albumPair.first, query.value( 0 ).toString(), artist );
+            albumList << album;
+        }
+
+        emit albums( m_query->id(), albumList );
+    }
+    
+    if ( trackPairs.length() == 0 )
+    {
+        qDebug() << "No candidates found in first pass, aborting resolve" << m_query->fullTextQuery();
+        emit results( m_query->id(), res );
+        return;
+    }
+
+    // STEP 2
+    TomahawkSqlQuery files_query = lib->newquery();
+
+    QStringList trksl;
+    for ( int k = 0; k < trackPairs.count(); k++ )
+        trksl.append( QString::number( trackPairs.at( k ).first ) );
+
+    QString trksToken = QString( "file_join.track IN (%1)" ).arg( trksl.join( "," ) );
+    QString sql = QString( "SELECT "
+                            "url, mtime, size, md5, mimetype, duration, bitrate, "  //0
+                            "file_join.artist, file_join.album, file_join.track, "  //7
+                            "file_join.composer, file_join.discnumber, "            //10
+                            "artist.name as artname, "                              //12
+                            "album.name as albname, "                               //13
+                            "track.name as trkname, "                               //14
+                            "composer.name as cmpname, "                            //15
+                            "file.source, "                                         //16
+                            "file_join.albumpos, "                                  //17
+                            "artist.id as artid, "                                  //18
+                            "album.id as albid, "                                   //19
+                            "composer.id as cmpid "                                 //20
+                            "FROM file, file_join, artist, track "
+                            "LEFT JOIN album ON album.id = file_join.album "
+                            "LEFT JOIN artist AS composer ON composer.id = file_join.composer "
+                            "WHERE "
+                            "artist.id = file_join.artist AND "
+                            "track.id = file_join.track AND "
+                            "file.id = file_join.file AND "
+                            "%1" )
+                        .arg( trksl.length() > 0 ? trksToken : QString( "0" ) );
+
+    files_query.prepare( sql );
+    files_query.exec();
+
+    while ( files_query.next() )
+    {
+        source_ptr s;
+        QString url = files_query.value( 0 ).toString();
+
+        if ( files_query.value( 16 ).toUInt() == 0 )
+        {
+            s = SourceList::instance()->getLocal();
+        }
+        else
+        {
+            s = SourceList::instance()->get( files_query.value( 16 ).toUInt() );
+            if ( s.isNull() )
+            {
+                qDebug() << "Could not find source" << files_query.value( 16 ).toUInt();
+                continue;
+            }
+
+            url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
+        }
+
+        bool cached = Tomahawk::Result::isCached( url );
+        Tomahawk::result_ptr result = Tomahawk::Result::get( url );
+        if ( cached )
+        {
+            qDebug() << "Result already cached:" << result->toString();
+            res << result;
+            continue;
+        }
+
+        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( files_query.value( 18 ).toUInt(), files_query.value( 12 ).toString() );
+        Tomahawk::album_ptr album = Tomahawk::Album::get( files_query.value( 19 ).toUInt(), files_query.value( 13 ).toString(), artist );
+        Tomahawk::artist_ptr composer = Tomahawk::Artist::get( files_query.value( 20 ).toUInt(), files_query.value( 15 ).toString() );
+
+        result->setModificationTime( files_query.value( 1 ).toUInt() );
+        result->setSize( files_query.value( 2 ).toUInt() );
+        result->setMimetype( files_query.value( 4 ).toString() );
+        result->setDuration( files_query.value( 5 ).toUInt() );
+        result->setBitrate( files_query.value( 6 ).toUInt() );
+        result->setArtist( artist );
+        result->setComposer( composer );
+        result->setAlbum( album );
+        result->setDiscNumber( files_query.value( 11 ).toUInt() );
+        result->setTrack( files_query.value( 14 ).toString() );
+        result->setRID( uuid() );
+        result->setAlbumPos( files_query.value( 17 ).toUInt() );
+        result->setTrackId( files_query.value( 9 ).toUInt() );
+
+        for ( int k = 0; k < trackPairs.count(); k++ )
+        {
+            if ( trackPairs.at( k ).first == (int)result->trackId() )
+            {
+                result->setScore( trackPairs.at( k ).second );
+                break;
+            }
+        }
+
+        TomahawkSqlQuery attrQuery = lib->newquery();
+        QVariantMap attr;
+
+        attrQuery.prepare( "SELECT k, v FROM track_attributes WHERE id = ?" );
+        attrQuery.bindValue( 0, result->trackId() );
+        attrQuery.exec();
+        while ( attrQuery.next() )
+        {
+            attr attrQuery.value( 0 ).toString()  = attrQuery.value( 1 ).toString();
+        }
+
+        result->setAttributes( attr );
+        result->setCollection( s->collection() );
+
+        res << result;
+    }
+
+    emit results( m_query->id(), res );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_Resolve.h Added

@@ -0,0 +1,58 @@
+/* === 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
+ *   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_RESOLVE_H
+#define DATABASECOMMAND_RESOLVE_H
+
+#include "DatabaseCommand.h"
+#include "DatabaseImpl.h"
+#include "Result.h"
+#include "Artist.h"
+#include "Album.h"
+
+#include <QVariant>
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_Resolve : public DatabaseCommand
+{
+Q_OBJECT
+public:
+    explicit DatabaseCommand_Resolve( const Tomahawk::query_ptr& query );
+    virtual ~DatabaseCommand_Resolve();
+
+    virtual QString commandname() const { return "dbresolve"; }
+    virtual bool doesMutates() const { return false; }
+
+    virtual void exec( DatabaseImpl *lib );
+
+signals:
+    void results( Tomahawk::QID qid, QList<Tomahawk::result_ptr> results );
+    void albums( Tomahawk::QID qid, QList<Tomahawk::album_ptr> albums );
+    void artists( Tomahawk::QID qid, QList<Tomahawk::artist_ptr> artists );
+
+private:
+    DatabaseCommand_Resolve();
+
+    void fullTextResolve( DatabaseImpl* lib );
+    void resolve( DatabaseImpl* lib );
+
+    Tomahawk::query_ptr m_query;
+};
+
+#endif // DATABASECOMMAND_RESOLVE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SetCollectionAttributes.cpp Added

@@ -0,0 +1,82 @@
+/* === 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_SetCollectionAttributes.h"
+
+#include "DatabaseImpl.h"
+#include "Source.h"
+#include "network/Servent.h"
+#include "SourceList.h"
+#include "EchonestCatalogSynchronizer.h"
+
+DatabaseCommand_SetCollectionAttributes::DatabaseCommand_SetCollectionAttributes( AttributeType type, const QByteArray& id )
+    : DatabaseCommandLoggable( )
+    , m_delete( false )
+    , m_type( type )
+    , m_id( id )
+{
+}
+
+DatabaseCommand_SetCollectionAttributes::DatabaseCommand_SetCollectionAttributes( DatabaseCommand_SetCollectionAttributes::AttributeType type, bool toDelete )
+    : DatabaseCommandLoggable()
+    , m_delete( toDelete )
+    , m_type( type )
+{
+}
+
+
+void
+DatabaseCommand_SetCollectionAttributes::exec( DatabaseImpl *lib )
+{
+    TomahawkSqlQuery query = lib->newquery();
+
+    QString sourceStr;
+    if ( source().isNull() )
+        setSource( SourceList::instance()->getLocal() );
+
+    if ( source().isNull() || source()->isLocal() )
+        sourceStr = "NULL";
+    else
+        sourceStr = QString( "%1" ).arg( source()->id() );
+
+    QString typeStr;
+    if ( m_type == EchonestSongCatalog )
+        typeStr = "echonest_song";
+    else if ( m_type == EchonestArtistCatalog )
+        typeStr = "echonest_artist";
+
+    TomahawkSqlQuery delQuery = lib->newquery();
+    delQuery.exec( QString( "DELETE FROM collection_attributes WHERE id %1" ).arg( source()->isLocal() ? QString("IS NULL") : QString( "= %1" ).arg( source()->id() )));
+
+    if ( m_delete )
+        return;
+
+    QString queryStr = QString( "INSERT INTO collection_attributes ( id, k, v ) VALUES( %1, \"%2\", \"%3\" )" ).arg( sourceStr ).arg( typeStr ).arg( QString::fromUtf8( m_id ) );
+    qDebug() << "Doing query:" << queryStr;
+    query.exec( queryStr );
+}
+
+void
+DatabaseCommand_SetCollectionAttributes::postCommitHook()
+{
+    if ( m_type == EchonestSongCatalog ||
+         m_type == EchonestArtistCatalog )
+        Tomahawk::EchonestCatalogSynchronizer::instance()->knownCatalogsChanged();
+
+    if ( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SetCollectionAttributes.h Added

@@ -0,0 +1,63 @@
+/* === 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_SETCOLLECTIONATTRIBUTES
+#define DATABASECOMMAND_SETCOLLECTIONATTRIBUTES
+
+#include "Typedefs.h"
+#include "DatabaseCommandLoggable.h"
+#include <QByteArray>
+
+class DatabaseCommand_SetCollectionAttributes : public DatabaseCommandLoggable
+{
+    Q_OBJECT
+    Q_PROPERTY( QByteArray     id                    READ id          WRITE setId )
+    Q_PROPERTY( int           type                   READ type        WRITE setType )
+    Q_PROPERTY( bool          del                    READ del         WRITE setDel )
+
+public:
+    enum AttributeType {
+        EchonestSongCatalog = 0,
+        EchonestArtistCatalog = 1
+    };
+
+    DatabaseCommand_SetCollectionAttributes( AttributeType type, const QByteArray& id );
+    // Delete all attributes for the source+type
+    DatabaseCommand_SetCollectionAttributes( AttributeType type, bool toDelete );
+    DatabaseCommand_SetCollectionAttributes() : m_delete( false ) {} // JSON
+    virtual void exec( DatabaseImpl* lib );
+    virtual bool doesMutates() const { return true; }
+    virtual void postCommitHook();
+
+    virtual QString commandname() const { return "setcollectionattributes"; }
+
+    void setId( const QByteArray& id ) { m_id = id; }
+    QByteArray id() const { return m_id; }
+
+    void setType( int type ) { m_type = (AttributeType)type; }
+    int type() const { return (int)m_type; }
+
+    void setDel( bool del ) { m_delete = del; }
+    bool del() const { return m_delete; }
+private:
+    bool m_delete;
+    AttributeType m_type;
+    QByteArray m_id;
+};
+
+#endif // DATABASECOMMAND_SETCOLLECTIONATTRIBUTES

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.cpp Added

@@ -0,0 +1,272 @@
+/* === 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_SetDynamicPlaylistRevision.h"
+
+#include <QSqlQuery>
+
+#include "Source.h"
+#include "DatabaseImpl.h"
+#include "TomahawkSqlQuery.h"
+#include "dynamic/DynamicPlaylist.h"
+#include "dynamic/DynamicControl.h"
+#include "network/Servent.h"
+#include "utils/Logger.h"
+
+
+DatabaseCommand_SetDynamicPlaylistRevision::DatabaseCommand_SetDynamicPlaylistRevision( const Tomahawk::source_ptr& s,
+                                                                                const QString& playlistguid,
+                                                                                const QString& newrev,
+                                                                                const QString& oldrev,
+                                                                                const QStringList& orderedguids,
+                                                                                const QList< plentry_ptr >& addedentries,
+                                                                                const QList<plentry_ptr>& entries,
+                                                                                const QString& type,
+                                                                                GeneratorMode mode,
+                                                                                const QList< dyncontrol_ptr >& controls )
+    : DatabaseCommand_SetPlaylistRevision( s, playlistguid, newrev, oldrev, orderedguids, addedentries, entries )
+    , m_type( type )
+    , m_mode( mode )
+    , m_controls( controls )
+    , m_playlist( 0 )
+{
+
+}
+
+
+DatabaseCommand_SetDynamicPlaylistRevision::DatabaseCommand_SetDynamicPlaylistRevision( const Tomahawk::source_ptr& s,
+                                                                                const QString& playlistguid,
+                                                                                const QString& newrev,
+                                                                                const QString& oldrev,
+                                                                                const QString& type,
+                                                                                GeneratorMode mode,
+                                                                                const QList< dyncontrol_ptr >& controls )
+    : DatabaseCommand_SetPlaylistRevision( s, playlistguid, newrev, oldrev, QStringList(), QList< plentry_ptr >(), QList< plentry_ptr >() )
+    , m_type( type )
+    , m_mode( mode )
+    , m_controls( controls )
+    , m_playlist( 0 )
+{
+
+}
+
+
+QVariantList
+DatabaseCommand_SetDynamicPlaylistRevision::controlsV()
+{
+    if ( m_controls.isEmpty() )
+        return m_controlsV;
+
+    if ( !m_controls.isEmpty() && m_controlsV.isEmpty() )
+    {
+        foreach ( const dyncontrol_ptr& control, m_controls )
+        {
+            m_controlsV << QJson::QObjectHelper::qobject2qvariant( control.data() );
+        }
+    }
+
+    return m_controlsV;
+}
+
+
+void
+DatabaseCommand_SetDynamicPlaylistRevision::postCommitHook()
+{
+    if ( source().isNull() || source()->collection().isNull() )
+    {
+        tDebug() << "Source has gone offline, not emitting to GUI.";
+        return;
+    }
+
+    QStringList orderedentriesguids;
+    foreach( const QVariant& v, orderedguids() )
+        orderedentriesguids << v.toString();
+
+    Q_ASSERT( !source().isNull() );
+    Q_ASSERT( !source()->collection().isNull() );
+    tLog() << "Postcommitting this playlist:" << playlistguid() << source().isNull();
+
+    // private, but we are a friend. will recall itself in its own thread:
+    dynplaylist_ptr playlist = source()->collection()->autoPlaylist( playlistguid() );
+    if ( playlist.isNull() )
+        playlist = source()->collection()->station( playlistguid() );
+    // UGH we don't have a sharedptr from DynamicPlaylist+
+
+    DynamicPlaylist* rawPl = playlist.data();
+    if( playlist.isNull() ) // if it's neither an auto or station, it must not be auto-loaded, so we MUST have been told about it directly
+        rawPl = m_playlist;
+
+    if ( rawPl == 0 )
+    {
+        tLog() <<"Got null playlist with guid:" << playlistguid() << "from source and collection:" << source()->friendlyName() << source()->collection()->name() << "and mode is static?:" << (m_mode == Static);
+        Q_ASSERT( false );
+        return;
+    }
+    
+    // workaround a bug in pre-0.1.0 tomahawks. they created dynamic playlists in OnDemand mode *always*, and then set the mode to the real one.
+    // now that we separate them, if we get them as one and then get a changed mode, the playlist ends up in the wrong bucket in Collection.
+    // so here we fix it if we have to.
+    // HACK
+    tDebug() << "Does this need the 0.3->0.1 playlist category hack fix?" << ( rawPl->mode() == Static && source()->collection()->autoPlaylist( playlistguid() ).isNull() )
+        <<  ( rawPl->mode() == OnDemand && source()->collection()->station( playlistguid() ).isNull() )
+                    << rawPl->mode() << source()->collection()->autoPlaylist( playlistguid() ).isNull() << source()->collection()->station( playlistguid() ).isNull();
+    if( rawPl->mode() == Static && source()->collection()->autoPlaylist( playlistguid() ).isNull() ) // should be here
+        source()->collection()->moveStationToAuto( playlistguid() );
+    else if ( rawPl->mode() == OnDemand && source()->collection()->station( playlistguid() ).isNull() ) // should be here
+        source()->collection()->moveAutoToStation( playlistguid() );
+
+  if ( !m_controlsV.isEmpty() && m_controls.isEmpty() )
+    {
+        QList<QVariantMap> controlMap;
+        foreach( const QVariant& v, m_controlsV )
+            controlMap << v.toMap();
+
+        if ( m_mode == OnDemand )
+            rawPl->setRevision(  newrev(),
+                                    true, // this *is* the newest revision so far
+                                    m_type,
+                                    controlMap,
+                                    m_applied );
+        else
+            rawPl->setRevision(  newrev(),
+                                    orderedentriesguids,
+                                    m_previous_rev_orderedguids,
+                                    m_type,
+                                    controlMap,
+                                    true, // this *is* the newest revision so far
+                                    m_addedmap,
+                                    m_applied );
+    }
+    else
+    {
+        if ( m_mode == OnDemand )
+            rawPl->setRevision(  newrev(),
+                                    true, // this *is* the newest revision so far
+                                    m_type,
+                                    m_controls,
+                                    m_applied );
+        else
+            rawPl->setRevision(  newrev(),
+                                    orderedentriesguids,
+                                    m_previous_rev_orderedguids,
+                                    m_type,
+                                    m_controls,
+                                    true, // this *is* the newest revision so far
+                                    m_addedmap,
+                                    m_applied );
+    }
+
+    if ( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+}
+
+
+void
+DatabaseCommand_SetDynamicPlaylistRevision::exec( DatabaseImpl* lib )
+{
+    DatabaseCommand_SetPlaylistRevision::exec( lib );
+
+    QVariantList newcontrols;
+    if ( m_controlsV.isEmpty() && !m_controls.isEmpty() )
+    {
+        foreach( const dyncontrol_ptr& control, m_controls )
+        {
+            newcontrols << control->id();
+        }
+    }
+    else if( !m_controlsV.isEmpty() )
+    {
+        foreach( const QVariant& v, m_controlsV )
+        {
+            newcontrols << v.toMap().value( "id" );
+        }
+    }
+
+    QJson::Serializer ser;
+    const QByteArray newcontrols_data = ser.serialize( newcontrols );
+
+    TomahawkSqlQuery query = lib->newquery();
+    QString sql = "INSERT INTO dynamic_playlist_revision (guid, controls, plmode, pltype) "
+                  "VALUES(?, ?, ?, ?)";
+
+    query.prepare( sql );
+    query.addBindValue( m_newrev );
+    query.addBindValue( newcontrols_data );
+    query.addBindValue( QString::number( (int) m_mode ) );
+    query.addBindValue( m_type );
+    query.exec();
+
+    // delete all the old controls, replace with new onws
+    qDebug() << "Deleting controls with playlist id" << m_playlistguid;
+    TomahawkSqlQuery delQuery = lib->newquery();
+    delQuery.prepare( "DELETE FROM dynamic_playlist_controls WHERE playlist = ?" );
+    delQuery.addBindValue( m_playlistguid );
+    if ( !delQuery.exec() )
+        tLog() << "Failed to delete controls from dynamic playlist controls table";
+
+    TomahawkSqlQuery controlsQuery = lib->newquery();
+    controlsQuery.prepare( "INSERT INTO dynamic_playlist_controls( id, playlist, selectedType, match, input ) "
+                            "VALUES( ?, ?, ?, ?, ? )" );
+    if ( m_controlsV.isEmpty() && !m_controls.isEmpty() )
+    {
+        foreach ( const dyncontrol_ptr& control, m_controls )
+        {
+            qDebug() << "inserting dynamic control:" << control->id() << m_playlistguid << control->selectedType() << control->match() << control->input();
+            controlsQuery.addBindValue( control->id() );
+            controlsQuery.addBindValue( m_playlistguid );
+            controlsQuery.addBindValue( control->selectedType() );
+            controlsQuery.addBindValue( control->match() );
+            controlsQuery.addBindValue( control->input() );
+
+            controlsQuery.exec();
+        }
+    }
+    else
+    {
+        foreach ( const QVariant& v, m_controlsV )
+        {
+            QVariantMap control = v.toMap();
+            qDebug() << "inserting dynamic control from JSON:" << control.value( "id" ) << m_playlistguid << control.value( "selectedType" ) << control.value( "match" ) << control.value( "input" );
+            controlsQuery.addBindValue( control.value( "id" ) );
+            controlsQuery.addBindValue( m_playlistguid );
+            controlsQuery.addBindValue( control.value( "selectedType" ) );
+            controlsQuery.addBindValue( control.value( "match" ) );
+            controlsQuery.addBindValue( control.value( "input" ) );
+
+            controlsQuery.exec();
+        }
+    }
+
+    if ( m_applied )
+    {
+        tLog() << "updating dynamic playlist, optimistic locking okay";
+
+        TomahawkSqlQuery query2 = lib->newquery();
+        query2.prepare( "UPDATE dynamic_playlist SET pltype = ?, plmode = ? WHERE guid = ?" );
+        query2.bindValue( 0, m_type );
+        query2.bindValue( 1, m_mode );
+        query2.bindValue( 2, m_playlistguid );
+        query2.exec();
+    }
+}
+
+void
+DatabaseCommand_SetDynamicPlaylistRevision::setPlaylist( DynamicPlaylist* pl )
+{
+    m_playlist = pl;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SetDynamicPlaylistRevision.h Added

@@ -0,0 +1,90 @@
+/* === 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_SETDYNAMICPLAYLISTREVISION_H
+#define DATABASECOMMAND_SETDYNAMICPLAYLISTREVISION_H
+
+#include "DatabaseCommand_SetPlaylistRevision.h"
+#include "dynamic/GeneratorInterface.h"
+
+using namespace Tomahawk;
+
+class DatabaseCommand_SetDynamicPlaylistRevision : public DatabaseCommand_SetPlaylistRevision
+{
+    Q_OBJECT
+    Q_PROPERTY( QString type                     READ type          WRITE setType )
+    Q_PROPERTY( int           mode               READ mode          WRITE setMode )
+    Q_PROPERTY( QVariantList controls            READ controlsV     WRITE setControlsV )
+
+public:
+    explicit DatabaseCommand_SetDynamicPlaylistRevision( QObject* parent = 0 )
+    : DatabaseCommand_SetPlaylistRevision( parent )
+    {}
+
+    explicit DatabaseCommand_SetDynamicPlaylistRevision( const source_ptr& s,
+                                                  const QString& playlistguid,
+                                                  const QString& newrev,
+                                                  const QString& oldrev,
+                                                  const QStringList& orderedguids,
+                                                  const QList<Tomahawk::plentry_ptr>& addedentries,
+                                                  const QList<plentry_ptr>& entries,
+                                                  const QString& type,
+                                                  GeneratorMode mode,
+                                                  const QList< dyncontrol_ptr >& controls );
+
+    explicit DatabaseCommand_SetDynamicPlaylistRevision( const source_ptr& s,
+                                                  const QString& playlistguid,
+                                                  const QString& newrev,
+                                                  const QString& oldrev,
+                                                  const QString& type,
+                                                  GeneratorMode mode,
+                                                  const QList< dyncontrol_ptr >& controls );
+
+    QString commandname() const { return "setdynamicplaylistrevision"; }
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual void postCommitHook();
+    virtual bool doesMutates() const { return true; }
+    virtual bool groupable() const { return true; }
+
+    void setControlsV( const QVariantList& vlist )
+    {
+        m_controlsV = vlist;
+    }
+
+    QVariantList controlsV();
+
+    QString type() const { return m_type; }
+    int mode() const { return (int)m_mode; }
+
+    void setType( const QString& type ) { m_type = type; }
+    void setMode( int mode ) { m_mode = (GeneratorMode)mode; }
+
+    void setPlaylist( DynamicPlaylist* pl ); // raw pointer b/c we don't have the shared pointer from inside the shared pointer
+
+private:
+    QString m_type;
+    GeneratorMode m_mode;
+    QList< dyncontrol_ptr > m_controls;
+    QList< QVariant > m_controlsV;
+
+    // ARG i hate sharedpointers sometimes
+    DynamicPlaylist* m_playlist; // Only used if setting revision of a non-autoloaded playlist, as those aren't able to be looked up by guid
+};
+
+#endif // DATABASECOMMAND_SETDYNAMICPLAYLISTREVISION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.cpp Added

@@ -0,0 +1,273 @@
+/* === 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
+ *   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_SetPlaylistRevision.h"
+
+#include <QSqlQuery>
+
+#include "Source.h"
+#include "DatabaseImpl.h"
+#include "TomahawkSqlQuery.h"
+#include "network/Servent.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_SetPlaylistRevision::DatabaseCommand_SetPlaylistRevision(
+                      const source_ptr& s,
+                      const QString& playlistguid,
+                      const QString& newrev,
+                      const QString& oldrev,
+                      const QStringList& orderedguids,
+                      const QList<plentry_ptr>& addedentries,
+                      const QList<plentry_ptr>& entries )
+    : DatabaseCommandLoggable( s )
+    , m_applied( false )
+    , m_newrev( newrev )
+    , m_oldrev( oldrev )
+    , m_addedentries( addedentries )
+    , m_entries( entries )
+    , m_metadataUpdate( false )
+{
+    Q_ASSERT( !newrev.isEmpty() );
+    m_localOnly = ( newrev == oldrev );
+
+    setPlaylistguid( playlistguid );
+
+    QVariantList tmp;
+    foreach( const QString& s, orderedguids )
+        tmp << s;
+
+    setOrderedguids( tmp );
+}
+
+
+DatabaseCommand_SetPlaylistRevision::DatabaseCommand_SetPlaylistRevision(
+                        const source_ptr& s,
+                        const QString& playlistguid,
+                        const QString& newrev,
+                        const QString& oldrev,
+                        const QStringList& orderedguids,
+                        const QList<plentry_ptr>& entriesToUpdate )
+    : DatabaseCommandLoggable( s )
+    , m_applied( false )
+    , m_newrev( newrev )
+    , m_oldrev( oldrev )
+    , m_entries( entriesToUpdate )
+    , m_metadataUpdate( true )
+{
+    Q_ASSERT( !newrev.isEmpty() );
+    m_localOnly = false;
+
+    QVariantList tmp;
+    foreach( const QString& s, orderedguids )
+        tmp << s;
+
+    setOrderedguids( tmp );
+    setPlaylistguid( playlistguid );
+}
+
+
+void
+DatabaseCommand_SetPlaylistRevision::postCommitHook()
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( m_localOnly )
+        return;
+
+    QStringList orderedentriesguids;
+    foreach( const QVariant& v, m_orderedguids )
+        orderedentriesguids << v.toString();
+
+    // private, but we are a friend. will recall itself in its own thread:
+    playlist_ptr playlist = source()->collection()->playlist( m_playlistguid );
+    if ( playlist.isNull() )
+    {
+        Q_ASSERT( !playlist.isNull() );
+        return;
+    }
+
+    playlist->setRevision( m_newrev,
+                           orderedentriesguids,
+                           m_previous_rev_orderedguids,
+                           true, // this *is* the newest revision so far
+                           m_addedmap,
+                           m_applied );
+
+    if ( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+}
+
+
+void
+DatabaseCommand_SetPlaylistRevision::exec( DatabaseImpl* lib )
+{
+    // get the current revision for this playlist
+    // this also serves to check the playlist exists.
+    TomahawkSqlQuery chkq = lib->newquery();
+    chkq.prepare( "SELECT currentrevision FROM playlist WHERE guid = ?" );
+    chkq.addBindValue( m_playlistguid );
+    if( chkq.exec() && chkq.next() )
+    {
+        m_currentRevision = chkq.value( 0 ).toString();
+        qDebug() << Q_FUNC_INFO << "pl guid" << m_playlistguid << "- curr rev" << m_currentRevision;
+    }
+    else
+    {
+        tDebug() << "Playlist:" << m_playlistguid << m_currentRevision << source()->friendlyName() << source()->id();
+        Q_ASSERT_X( false, "DatabaseCommand_SetPlaylistRevision::exec", "No such playlist, WTF?" );
+        return;
+    }
+
+    QVariantList vlist = m_orderedguids;
+    QJson::Serializer ser;
+    const QByteArray entries = ser.serialize( vlist );
+
+    // add any new items:
+    TomahawkSqlQuery adde = lib->newquery();
+    if ( m_localOnly )
+    {
+        QString sql = "UPDATE playlist_item SET result_hint = ? WHERE guid = ?";
+        adde.prepare( sql );
+
+        foreach( const plentry_ptr& e, m_entries )
+        {
+            if ( !e->isValid() )
+                continue;
+            if ( !e->query()->numResults() )
+                continue;
+
+            adde.bindValue( 0, e->query()->results().first()->url() );
+            adde.bindValue( 1, e->guid() );
+            adde.exec();
+        }
+
+        return;
+    }
+    else if ( m_metadataUpdate )
+    {
+        QString sql = "UPDATE playlist_item SET trackname = ?, artistname = ?, albumname = ?, annotation = ?, duration = ?, addedon = ?, addedby = ? WHERE guid = ?";
+        adde.prepare( sql );
+
+        foreach( const plentry_ptr& e, m_entries )
+        {
+            if ( !e->isValid() )
+                continue;
+
+            adde.bindValue( 0, e->query()->track() );
+            adde.bindValue( 1, e->query()->artist() );
+            adde.bindValue( 2, e->query()->album() );
+            adde.bindValue( 3, e->annotation() );
+            adde.bindValue( 4, (int) e->duration() );
+            adde.bindValue( 5, e->lastmodified() );
+            adde.bindValue( 6, source()->isLocal() ? QVariant(QVariant::Int) : source()->id() );
+            adde.bindValue( 7, e->guid() );
+
+            adde.exec();
+        }
+    }
+    else
+    {
+        QString sql = "INSERT INTO playlist_item( guid, playlist, trackname, artistname, albumname, "
+                                                 "annotation, duration, addedon, addedby, result_hint ) "
+                      "VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
+        adde.prepare( sql );
+
+        qDebug() << "Num new playlist_items to add:" << m_addedentries.length();
+        foreach( const plentry_ptr& e, m_addedentries )
+        {
+            if ( !e->isValid() )
+                continue;
+
+//             qDebug() << "Adding:" << e->guid() << e->query()->track() << e->query()->artist();
+
+            m_addedmap.insert( e->guid(), e ); // needed in postcommithook
+
+            QString resultHint;
+            if ( !e->query()->results().isEmpty() )
+                resultHint = e->query()->results().first()->url();
+            else if ( !e->query()->resultHint().isEmpty() )
+                resultHint = e->query()->resultHint();
+
+            adde.bindValue( 0, e->guid() );
+            adde.bindValue( 1, m_playlistguid );
+            adde.bindValue( 2, e->query()->track() );
+            adde.bindValue( 3, e->query()->artist() );
+            adde.bindValue( 4, e->query()->album() );
+            adde.bindValue( 5, e->annotation() );
+            adde.bindValue( 6, (int) e->duration() );
+            adde.bindValue( 7, e->lastmodified() );
+            adde.bindValue( 8, source()->isLocal() ? QVariant(QVariant::Int) : source()->id() );
+            adde.bindValue( 9, resultHint );
+            adde.exec();
+        }
+    }
+
+    // add / update the revision:
+    TomahawkSqlQuery query = lib->newquery();
+    QString sql = "INSERT INTO playlist_revision(guid, playlist, entries, author, timestamp, previous_revision) "
+                  "VALUES(?, ?, ?, ?, ?, ?)";
+    query.prepare( sql );
+
+    query.addBindValue( m_newrev );
+    query.addBindValue( m_playlistguid );
+    query.addBindValue( entries );
+    query.addBindValue( source()->isLocal() ? QVariant(QVariant::Int) : source()->id() );
+    query.addBindValue( 0 ); //ts
+    query.addBindValue( m_oldrev.isEmpty() ? QVariant(QVariant::String) : m_oldrev );
+    query.exec();
+
+    qDebug() << "Currentrevision:" << m_currentRevision << "oldrev:" << m_oldrev;
+    // if optimistic locking is ok, update current revision to this new one
+    if ( m_currentRevision == m_oldrev )
+    {
+        qDebug() << "Updating current revision, optimistic locking ok";
+
+        TomahawkSqlQuery query2 = lib->newquery();
+        query2.prepare( "UPDATE playlist SET currentrevision = ? WHERE guid = ?" );
+        query2.bindValue( 0, m_newrev );
+        query2.bindValue( 1, m_playlistguid );
+        query2.exec();
+
+        m_applied = true;
+
+        // load previous revision entries, which we need to pass on
+        // so the change can be diffed
+        TomahawkSqlQuery query_entries = lib->newquery();
+        query_entries.prepare( "SELECT entries, playlist, author, timestamp, previous_revision "
+                               "FROM playlist_revision "
+                               "WHERE guid = :guid" );
+        query_entries.bindValue( ":guid", m_oldrev );
+        query_entries.exec();
+        if ( query_entries.next() )
+        {
+            bool ok;
+            QJson::Parser parser;
+            QVariant v = parser.parse( query_entries.value( 0 ).toByteArray(), &ok );
+            Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
+
+            m_previous_rev_orderedguids = v.toStringList();
+        }
+    }
+    else if ( !m_oldrev.isEmpty() )
+    {
+        tDebug() << "Not updating current revision, optimistic locking fail";
+//        Q_ASSERT( false );
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SetPlaylistRevision.h Added

@@ -0,0 +1,131 @@
+/* === 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
+ *   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_SETPLAYLISTREVISION_H
+#define DATABASECOMMAND_SETPLAYLISTREVISION_H
+
+#include "DatabaseCommandLoggable.h"
+#include "Playlist.h"
+#include "qjson/qobjecthelper.h"
+
+#include "DllMacro.h"
+
+using namespace Tomahawk;
+
+class DLLEXPORT DatabaseCommand_SetPlaylistRevision : public DatabaseCommandLoggable
+{
+Q_OBJECT
+Q_PROPERTY( QString playlistguid      READ playlistguid  WRITE setPlaylistguid )
+Q_PROPERTY( QString newrev            READ newrev        WRITE setNewrev )
+Q_PROPERTY( QString oldrev            READ oldrev        WRITE setOldrev )
+Q_PROPERTY( QVariantList orderedguids READ orderedguids  WRITE setOrderedguids )
+Q_PROPERTY( QVariantList addedentries READ addedentriesV WRITE setAddedentriesV )
+Q_PROPERTY( bool metadataUpdate       READ metadataUpdate WRITE setMetadataUpdate )
+
+public:
+    explicit DatabaseCommand_SetPlaylistRevision( QObject* parent = 0 )
+        : DatabaseCommandLoggable( parent )
+        , m_applied( false )
+        , m_localOnly( false )
+        , m_metadataUpdate( false )
+    {}
+
+    // Constructor for inserting or removing entries
+    DatabaseCommand_SetPlaylistRevision( const source_ptr& s,
+                                                  const QString& playlistguid,
+                                                  const QString& newrev,
+                                                  const QString& oldrev,
+                                                  const QStringList& orderedguids,
+                                                  const QList<Tomahawk::plentry_ptr>& addedentries,
+                                                  const QList<Tomahawk::plentry_ptr>& entries );
+
+    // constructor for updating metadata only
+    DatabaseCommand_SetPlaylistRevision( const source_ptr& s,
+                                                  const QString& playlistguid,
+                                                  const QString& newrev,
+                                                  const QString& oldrev,
+                                                  const QStringList& orderedguids,
+                                                  const QList<Tomahawk::plentry_ptr>& entriesToUpdate );
+
+
+    QString commandname() const { return "setplaylistrevision"; }
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual void postCommitHook();
+
+    virtual bool doesMutates() const { return true; }
+    virtual bool localOnly() const { return m_localOnly; }
+    virtual bool groupable() const { return true; }
+
+    void setAddedentriesV( const QVariantList& vlist )
+    {
+        m_addedentries.clear();
+        foreach( const QVariant& v, vlist )
+        {
+            PlaylistEntry* pep = new PlaylistEntry;
+            QJson::QObjectHelper::qvariant2qobject( v.toMap(), pep );
+
+            if ( pep->isValid() )
+                m_addedentries << plentry_ptr( pep );
+        }
+    }
+
+    QVariantList addedentriesV() const
+    {
+        QVariantList vlist;
+        foreach( const plentry_ptr& pe, m_addedentries )
+        {
+            if ( !pe->isValid() )
+                continue;
+
+            QVariant v = QJson::QObjectHelper::qobject2qvariant( pe.data() );
+            vlist << v;
+        }
+        return vlist;
+    }
+
+    void setPlaylistguid( const QString& s ) { m_playlistguid = s; }
+
+    void setNewrev( const QString& s ) { m_newrev = s; }
+    void setOldrev( const QString& s ) { m_oldrev = s; }
+    QString newrev() const { return m_newrev; }
+    QString oldrev() const { return m_oldrev; }
+    QString playlistguid() const { return m_playlistguid; }
+    bool metadataUpdate() const { return m_metadataUpdate; }
+    void setMetadataUpdate( bool metadataUpdate ) { m_metadataUpdate = metadataUpdate; }
+
+    void setOrderedguids( const QVariantList& l ) { m_orderedguids = l; }
+    QVariantList orderedguids() const { return m_orderedguids; }
+
+protected:
+    bool m_applied;
+    QStringList m_previous_rev_orderedguids;
+    QString m_playlistguid;
+    QString m_newrev, m_oldrev;
+    QMap<QString, Tomahawk::plentry_ptr> m_addedmap;
+
+    QString m_currentRevision;
+
+private:
+    QVariantList m_orderedguids;
+    QList<Tomahawk::plentry_ptr> m_addedentries, m_entries;
+
+    bool m_localOnly, m_metadataUpdate;
+};
+
+#endif // DATABASECOMMAND_SETPLAYLISTREVISION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SetTrackAttributes.cpp Added

@@ -0,0 +1,98 @@
+/* === 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_SetTrackAttributes.h"
+#include "TomahawkSqlQuery.h"
+#include "DatabaseImpl.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+
+DatabaseCommand_SetTrackAttributes::DatabaseCommand_SetTrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type, QList< QPair< QID, QString > > ids, bool toDelete )
+    : DatabaseCommandLoggable()
+    , m_loggable( false )
+    , m_delete( toDelete )
+    , m_type( type )
+    , m_tracks( ids )
+{
+}
+
+DatabaseCommand_SetTrackAttributes::DatabaseCommand_SetTrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type )
+    : DatabaseCommandLoggable()
+    , m_loggable( false )
+    , m_delete( true )
+    , m_type( type )
+{
+
+}
+
+
+void
+DatabaseCommand_SetTrackAttributes::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery checkquery = dbi->newquery();
+    TomahawkSqlQuery delquery = dbi->newquery();
+    TomahawkSqlQuery insertquery = dbi->newquery();
+
+    QString k;
+    switch ( m_type )
+    {
+    case EchonestCatalogId:
+        k = "echonestcatalogid";
+        break;
+    }
+
+    if ( m_delete && m_tracks.isEmpty() )
+    {
+        //delete all
+        TomahawkSqlQuery delAll = dbi->newquery();
+        delAll.prepare( "DELETE FROM track_attributes WHERE k = ?" );
+        delAll.bindValue( 0, k );
+        delAll.exec();
+        return;
+    }
+
+    checkquery.prepare( "SELECT id, sortname FROM track WHERE id = ?" );
+    delquery.prepare( "DELETE FROM track_attributes WHERE id = ? AND k = ?" );
+    insertquery.prepare( "INSERT INTO track_attributes ( id, k, v ) VALUES( ?, ?, ? )" );
+
+    QPair< QID, QString > track;
+    foreach ( track, m_tracks )
+    {
+        checkquery.bindValue( 0, track.first );
+        if ( !checkquery.exec() )
+        {
+            tLog() << "No track in track table for set track attribute command...aborting:" << track.first;
+            continue;
+        }
+
+        delquery.bindValue( 0, track.first );
+        delquery.bindValue( 1, k );
+        delquery.exec();
+
+        if ( m_delete )
+            continue; // stop at deleting, don't insert
+
+        insertquery.bindValue( 0, track.first );
+        insertquery.bindValue( 1, k );
+        insertquery.bindValue( 2, track.second );
+        if ( !insertquery.exec() )
+            tLog() << "Failed to insert track attribute:" << k << track.first << track.second;
+
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SetTrackAttributes.h Added

@@ -0,0 +1,57 @@
+/* === 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_SETTRACKATTRIBUTES
+#define DATABASECOMMAND_SETTRACKATTRIBUTES
+
+#include "Typedefs.h"
+#include "DatabaseCommandLoggable.h"
+
+#include <QByteArray>
+
+class DatabaseCommand_SetTrackAttributes : public DatabaseCommandLoggable
+{
+    Q_OBJECT
+public:
+    enum AttributeType {
+        EchonestCatalogId = 0,
+    };
+
+    // Takes a list of <track_id, value> pairs. key is always type
+    DatabaseCommand_SetTrackAttributes( AttributeType type, QList< QPair< Tomahawk::QID, QString > > ids, bool toDelete = false );
+    // Deletes *all tracks with attribute*
+    DatabaseCommand_SetTrackAttributes( AttributeType type );
+    DatabaseCommand_SetTrackAttributes() {} // JSON
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual bool doesMutates() const { return true; }
+    virtual bool loggable() const { return m_loggable; }
+
+    virtual QString commandname() const { return "settrackattributes"; }
+
+    void setType( int type ) { m_type = (AttributeType)type; }
+    int type() const { return (int)m_type; }
+
+private:
+    bool m_loggable, m_delete;
+
+    AttributeType m_type;
+    QList< QPair< Tomahawk::QID, QString > > m_tracks;
+};
+
+#endif // DATABASECOMMAND_SETTRACKATTRIBUTES

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SocialAction.cpp Added

@@ -0,0 +1,93 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christopher Reichert <creichert07@gmail.com>
+ *
+ *   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_SocialAction.h"
+
+#include <QSqlQuery>
+
+#include "database/Database.h"
+#include "DatabaseImpl.h"
+#include "network/Servent.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+void
+DatabaseCommand_SocialAction::postCommitHook()
+{
+    qDebug() << Q_FUNC_INFO;
+    if ( source()->isLocal() )
+    {
+        Servent::instance()->triggerDBSync();
+    }
+
+    source()->reportSocialAttributesChanged( this );
+}
+
+
+void
+DatabaseCommand_SocialAction::exec( DatabaseImpl* dbi )
+{
+    qDebug() << Q_FUNC_INFO;
+    Q_ASSERT( !source().isNull() );
+
+    TomahawkSqlQuery query = dbi->newquery();
+
+    QVariant srcid = source()->isLocal() ? QVariant( QVariant::Int ) : source()->id();
+
+    if ( m_artist.isNull() || m_track.isEmpty() )
+        return;
+
+    int artid = dbi->artistId( m_artist, true );
+    if ( artid < 1 )
+        return;
+    int trkid = dbi->trackId( artid, m_track, true );
+    if ( trkid < 1 )
+        return;
+
+    // update if it already exists
+    TomahawkSqlQuery find = dbi->newquery();
+    find.prepare( QString( "SELECT id, k, v FROM social_attributes WHERE social_attributes.id = ? AND social_attributes.source %1 AND social_attributes.k = ?" ).arg( source()->isLocal() ? "IS NULL" : QString( "=%1" ).arg( source()->id() ) ) );
+    find.addBindValue( trkid );
+    find.addBindValue( m_action );
+    if ( find.exec() && find.next() )
+    {
+        // update
+        query.prepare( QString( "UPDATE social_attributes SET v = '%1', timestamp = %2 WHERE social_attributes.id = %3 AND social_attributes.source %4 AND social_attributes.k = '%5'" )
+                               .arg( m_comment )
+                               .arg( m_timestamp )
+                               .arg( trkid )
+                               .arg( source()->isLocal() ? "IS NULL" : QString( "=%1" ).arg( source()->id() ) )
+                               .arg( m_action ) );
+    }
+    else
+    {
+        query.prepare( "INSERT INTO social_attributes(id, source, k, v, timestamp) "
+                       "VALUES (?, ?, ?, ?, ?)" );
+
+        query.bindValue( 0, trkid );
+        query.bindValue( 1, srcid );
+        query.bindValue( 2, m_action );
+        query.bindValue( 3, m_comment );
+        query.bindValue( 4, m_timestamp );
+    }
+
+    query.exec();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SocialAction.h Added

@@ -0,0 +1,185 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Christopher Reichert <creichert07@gmail.com>
+ *
+ *   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_SOCIALACTION_H
+#define DATABASECOMMAND_SOCIALACTION_H
+
+#include <QDateTime>
+#include "database/DatabaseCommandLoggable.h"
+
+#include "SourceList.h"
+#include "Typedefs.h"
+#include "Artist.h"
+
+#include "DllMacro.h"
+
+/**
+ * \class DatabaseCommand_SocialAction
+ * \brief Database command used to write social actions to database.
+ *
+ * This Database command allows Tomahawk to write social actions to
+ * the local database. These social actions can be interfaced with social
+ * networking API's such as LastFm, Facebook, or Twitter to allow the user
+ * to sync these actions with their accounts on these sites.
+ *
+ * \see DatabaseCommand_LoadSocialActions
+ */
+class DLLEXPORT DatabaseCommand_SocialAction : public DatabaseCommandLoggable
+{
+    Q_OBJECT
+    Q_PROPERTY( QString action READ action WRITE setAction )
+    Q_PROPERTY( QString comment READ comment WRITE setComment )
+    Q_PROPERTY( int timestamp READ timestamp WRITE setTimestamp )
+    Q_PROPERTY( QString artist READ artist WRITE setArtist )
+    Q_PROPERTY( QString track READ track WRITE setTrack )
+
+public:
+
+    /**
+     * \brief Default constructor for DatabaseCommand_SocialAction.
+     *
+     * Constructs an empty database command for a social action.
+     */
+    explicit DatabaseCommand_SocialAction( QObject* parent = 0 )
+        : DatabaseCommandLoggable( parent )
+    {}
+
+    /**
+     * \brief Overloaded constructor for DatabaseCommand_SocialAction.
+     * \param query A Tomahawk Query object.
+     * \param action Name of the social action to be written to the database.
+     * \param comment Comment associated with this social action.
+     * \param parent Parent class.
+     *
+     * Constructor which creates a new database command for the specified social action.
+     */
+    explicit DatabaseCommand_SocialAction( const Tomahawk::query_ptr& query, QString action, QString comment = "", QObject* parent = 0 )
+        : DatabaseCommandLoggable( parent ), m_query( query ), m_action( action )
+    {
+        setSource( SourceList::instance()->getLocal() );
+
+        setArtist( query->artist() );
+        setTrack( query->track() );
+        setComment( comment );
+        setTimestamp( QDateTime::currentDateTime().toTime_t() );
+    }
+
+    /**
+     * \brief Returns the name of this database command.
+     * \return QString containing the database command name 'socialaction'.
+     */
+    virtual QString commandname() const { return "socialaction"; }
+
+    /**
+     * \brief Executes the database command.
+     * \param dbi Database instance.
+     *
+     * This method prepares an sql query to write this social action
+     * into the local database.
+     */
+    virtual void exec( DatabaseImpl* dbi );
+
+    /**
+     * \brief Triggers a Database Sync.
+     */
+    virtual void postCommitHook();
+
+    /**
+     * \brief Returns the artist associated with this database command.
+     * \return Name of the artist.
+     * \see setArtist()
+     */
+    QString artist() const { return m_artist; }
+
+    /**
+     * \brief Sets the artist name for this database command.
+     * \param s QString containing the artist name.
+     * \see artist()
+     */
+    void setArtist( const QString& s ) { m_artist = s; }
+
+    /**
+     * \brief Returns the track name associated with this social action.
+     * \return QString containing the track name.
+     * \see setTrack()
+     */
+    QString track() const { return m_track; }
+
+    /**
+     * \brief Sets the track name associated with this database command.
+     * \param track QString containing the track name.
+     * \see track()
+     */
+    void setTrack( const QString& track ) { m_track = track; }
+
+    /**
+     * \brief Returns the social action for this database command instance.
+     * \return QString containing the action name.
+     * \see setAction()
+     */
+    QString action() const { return m_action; }
+
+    /**
+     * \brief Sets the social actions
+     * \param a QString containing action to be set in this class.
+     * \see action()
+     */
+    void setAction( QString a ) { m_action = a; }
+
+    /**
+     * \brief Returns comment associated with this social action.
+     * \return QString containing comment associated with this social action.
+     * \see setComment()
+     */
+    QString comment() const { return m_comment; }
+
+    /**
+     * \brief Sets the comment associated with this social action.
+     * \param com Comment associated with this social action.
+     * \see comment()
+     */
+    void setComment( const QString& com ) { m_comment = com; }
+
+    /**
+     * \brief Returns the timestamp associated with this social action.
+     * \return unsigned integer containing timestamp
+     * \see setTimesetamp()
+     */
+    int timestamp() const { return m_timestamp; }
+
+    /**
+     * \brief Sets the timestamp associated with this social action.
+     * \param ts unsigned integer associated with this social action.
+     * \see timestamp()
+     */
+    void setTimestamp( const int ts ) { m_timestamp = ts; }
+
+    virtual bool doesMutates() const { return true; }
+    virtual bool groupable() const { return true; }
+
+private:
+    Tomahawk::query_ptr m_query;
+
+    QString m_artist;
+    QString m_track;
+    int m_timestamp;
+    QString m_comment;
+    QString m_action;
+};
+
+#endif // DATABASECOMMAND_SOCIALACTION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SourceOffline.cpp Added

@@ -0,0 +1,40 @@
+/* === 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
+ *   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_SourceOffline.h"
+
+#include "DatabaseImpl.h"
+#include "TomahawkSqlQuery.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+
+DatabaseCommand_SourceOffline::DatabaseCommand_SourceOffline( int id )
+    : DatabaseCommand()
+    , m_id( id )
+{
+}
+
+
+void
+DatabaseCommand_SourceOffline::exec( DatabaseImpl* lib )
+{
+    TomahawkSqlQuery q = lib->newquery();
+    q.exec( QString( "UPDATE source SET isonline = 'false' WHERE id = %1" )
+            .arg( m_id ) );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_SourceOffline.h Added

@@ -0,0 +1,41 @@
+/* === 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
+ *   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_SOURCEOFFLINE_H
+#define DATABASECOMMAND_SOURCEOFFLINE_H
+
+#include "DatabaseCommand.h"
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_SourceOffline : public DatabaseCommand
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseCommand_SourceOffline( int id );
+
+    virtual QString commandname() const { return "sourceoffline"; }
+
+    bool doesMutates() const { return true; }
+    void exec( DatabaseImpl* lib );
+
+private:
+    int m_id;
+};
+
+#endif // DATABASECOMMAND_SOURCEOFFLINE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_TrackAttributes.cpp Added

@@ -0,0 +1,73 @@
+/* === 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_TrackAttributes.h"
+#include "DatabaseImpl.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+DatabaseCommand_TrackAttributes::DatabaseCommand_TrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type, const QList< Tomahawk::QID > ids )
+    : DatabaseCommand()
+    , m_type( type )
+    , m_ids( ids )
+{
+}
+
+DatabaseCommand_TrackAttributes::DatabaseCommand_TrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type )
+    : DatabaseCommand()
+    , m_type( type )
+{
+}
+
+void DatabaseCommand_TrackAttributes::exec( DatabaseImpl* lib )
+{
+    TomahawkSqlQuery query = lib->newquery();
+
+    QString k;
+    switch ( m_type )
+    {
+        case DatabaseCommand_SetTrackAttributes::EchonestCatalogId:
+            k = "echonestcatalogid";
+            break;
+    }
+
+    PairList results;
+    if ( !m_ids.isEmpty() )
+    {
+        foreach ( const QID id, m_ids )
+        {
+            query.prepare( "SELECT v FROM track_attributes WHERE id = ? AND k = ?" );
+            query.bindValue( 0, id );
+            query.bindValue( 1, k );
+            if ( query.exec() )
+                results.append( QPair< QID, QString >( id, query.value( 0 ).toString() ) );
+        }
+    }
+    else
+    {
+        query.prepare( "SELECT id, v FROM track_attributes WHERE k = ?" );
+        query.bindValue( 0, k );
+        query.exec();
+        while ( query.next() )
+        {
+            results.append( QPair< QID, QString >( query.value( 0 ).toString(), query.value( 1 ).toString() ) );
+        }
+    }
+
+    emit trackAttributes( results );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_TrackAttributes.h Added

@@ -0,0 +1,51 @@
+/* === 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_TRACKATTRIBUTES_H
+#define DATABASECOMMAND_TRACKATTRIBUTES_H
+
+#include "Typedefs.h"
+#include "DatabaseCommand.h"
+#include "DatabaseCommand_CollectionAttributes.h"
+#include "DatabaseCommand_SetTrackAttributes.h"
+#include <QByteArray>
+
+class DatabaseCommand_TrackAttributes : public DatabaseCommand
+{
+    Q_OBJECT
+public:
+
+    // Get all tracks with this attribute
+    DatabaseCommand_TrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type );
+    // Get the specific tracks with this attribute
+    DatabaseCommand_TrackAttributes( DatabaseCommand_SetTrackAttributes::AttributeType type, const QList< Tomahawk::QID > ids );
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual bool doesMutates() const { return false; }
+
+    virtual QString commandname() const { return "trackattributes"; }
+
+signals:
+    void trackAttributes( PairList );
+
+private:
+    DatabaseCommand_SetTrackAttributes::AttributeType m_type;
+    QList< Tomahawk::QID > m_ids;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_TrackStats.cpp Added

@@ -0,0 +1,90 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Christian Muehlhaeuser <muesli@tomahawk-player.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_TrackStats.h"
+
+#include "DatabaseImpl.h"
+#include "SourceList.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_TrackStats::DatabaseCommand_TrackStats( const query_ptr& query, QObject* parent )
+    : DatabaseCommand( parent )
+    , m_query( query )
+{
+}
+
+
+DatabaseCommand_TrackStats::DatabaseCommand_TrackStats( const artist_ptr& artist, QObject* parent )
+    : DatabaseCommand( parent )
+    , m_artist( artist )
+{
+}
+
+
+void
+DatabaseCommand_TrackStats::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+
+    if ( !m_query.isNull() )
+    {
+        int artid = dbi->artistId( m_query->artist(), false );
+        if( artid < 1 )
+            return;
+
+        int trkid = dbi->trackId( artid, m_query->track(), false );
+        if( trkid < 1 )
+            return;
+
+        query.prepare( "SELECT * "
+                       "FROM playback_log "
+                       "WHERE track = ? ORDER BY playtime ASC" );
+        query.addBindValue( trkid );
+        query.exec();
+    }
+    else if ( !m_artist.isNull() )
+    {
+        query.prepare( "SELECT playback_log.* "
+                       "FROM playback_log, track "
+                       "WHERE playback_log.track = track.id AND track.artist = ?" );
+        query.addBindValue( m_artist->id() );
+        query.exec();
+    }
+
+    QList< Tomahawk::PlaybackLog > playbackData;
+    while ( query.next() )
+    {
+        Tomahawk::PlaybackLog log;
+        log.source = SourceList::instance()->get( query.value( 1 ).toInt() );  // source
+        log.timestamp = query.value( 3 ).toUInt();
+        log.secsPlayed = query.value( 4 ).toUInt();
+
+        if ( !log.source.isNull() )
+            playbackData.append( log );
+    }
+
+    if ( !m_query.isNull() )
+        m_query->setPlaybackHistory( playbackData );
+    else
+        m_artist->setPlaybackHistory( playbackData );
+
+    emit done( playbackData );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_TrackStats.h Added

@@ -0,0 +1,51 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Christian Muehlhaeuser <muesli@tomahawk-player.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_TRACKSTATS_H
+#define DATABASECOMMAND_TRACKSTATS_H
+
+#include <QVariantMap>
+
+#include "DatabaseCommand.h"
+#include "Typedefs.h"
+#include "Query.h"
+#include "Artist.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseCommand_TrackStats : public DatabaseCommand
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseCommand_TrackStats( const Tomahawk::query_ptr& query, QObject* parent = 0 );
+    explicit DatabaseCommand_TrackStats( const Tomahawk::artist_ptr& artist, QObject* parent = 0 );
+
+    virtual void exec( DatabaseImpl* lib );
+    virtual bool doesMutates() const { return false; }
+    virtual QString commandname() const { return "trackstats"; }
+
+signals:
+    void done( QList< Tomahawk::PlaybackLog >& playbackData );
+    
+private:
+    Tomahawk::query_ptr m_query;
+    Tomahawk::artist_ptr m_artist;
+};
+
+#endif // DATABASECOMMAND_TRACKSTATS_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.cpp Added

@@ -0,0 +1,94 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2012       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_UpdateSearchIndex.h"
+
+#include <QSqlRecord>
+
+#include "DatabaseImpl.h"
+#include "Source.h"
+#include "TomahawkSqlQuery.h"
+#include "jobview/IndexingJobItem.h"
+
+#ifndef ENABLE_HEADLESS
+    #include "jobview/JobStatusView.h"
+    #include "jobview/JobStatusModel.h"
+#endif
+
+#include "utils/Logger.h"
+
+
+DatabaseCommand_UpdateSearchIndex::DatabaseCommand_UpdateSearchIndex()
+    : DatabaseCommand()
+    , m_statusJob( new IndexingJobItem )
+{
+    tLog() << Q_FUNC_INFO << "Updating index.";
+
+#ifndef ENABLE_HEADLESS
+    JobStatusView::instance()->model()->addJob( m_statusJob.data() );
+#endif
+}
+
+
+DatabaseCommand_UpdateSearchIndex::~DatabaseCommand_UpdateSearchIndex()
+{
+#ifndef ENABLE_HEADLESS
+    if ( ! m_statusJob.isNull() )
+        m_statusJob.data()->done();
+#endif
+}
+
+
+void
+DatabaseCommand_UpdateSearchIndex::exec( DatabaseImpl* db )
+{
+    db->m_fuzzyIndex->beginIndexing();
+
+    QMap< unsigned int, QMap< QString, QString > > data;
+    TomahawkSqlQuery q = db->newquery();
+
+    q.exec( "SELECT track.id, track.name, artist.name, artist.id FROM track, artist WHERE artist.id = track.artist" );
+    while ( q.next() )
+    {
+        QMap< QString, QString > track;
+        track.insert( "track", q.value( 1 ).toString() );
+        track.insert( "artist", q.value( 2 ).toString() );
+        track.insert( "artistid", q.value( 3 ).toString() );
+
+        data.insert( q.value( 0 ).toUInt(), track );
+    }
+
+    db->m_fuzzyIndex->appendFields( data );
+    data.clear();
+
+    q.exec( "SELECT album.id, album.name FROM album" );
+    while ( q.next() )
+    {
+        QMap< QString, QString > album;
+        album.insert( "album", q.value( 1 ).toString() );
+
+        data.insert( q.value( 0 ).toUInt(), album );
+    }
+
+    db->m_fuzzyIndex->appendFields( data );
+
+    qDebug() << "Building index finished.";
+
+    db->m_fuzzyIndex->endIndexing();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseCommand_UpdateSearchIndex.h Added

@@ -0,0 +1,42 @@
+/* === 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
+ *   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_UPDATESEARCHINDEX_H
+#define DATABASECOMMAND_UPDATESEARCHINDEX_H
+
+#include "DatabaseCommand.h"
+#include "DllMacro.h"
+
+class IndexingJobItem;
+
+class DLLEXPORT DatabaseCommand_UpdateSearchIndex : public DatabaseCommand
+{
+Q_OBJECT
+public:
+    explicit DatabaseCommand_UpdateSearchIndex();
+    virtual ~DatabaseCommand_UpdateSearchIndex();
+
+    virtual QString commandname() const { return "updatesearchindex"; }
+    virtual bool doesMutates() const { return true; }
+    virtual void exec( DatabaseImpl* db );
+
+private:
+    QWeakPointer<IndexingJobItem> m_statusJob;
+};
+
+#endif // DATABASECOMMAND_UPDATESEARCHINDEX_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseImpl.cpp Added

@@ -0,0 +1,791 @@
+/* === 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>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "DatabaseImpl.h"
+
+#include <QCoreApplication>
+#include <QRegExp>
+#include <QStringList>
+#include <QtAlgorithms>
+#include <QFile>
+
+#include "database/Database.h"
+#include "SourceList.h"
+#include "Result.h"
+#include "Artist.h"
+#include "Album.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+/* !!!! You need to manually generate Schema.sql.h when the schema changes:
+    cd src/libtomahawk/database
+   ./gen_schema.h.sh ./Schema.sql tomahawk > Schema.sql.h
+*/
+#include "Schema.sql.h"
+
+#define CURRENT_SCHEMA_VERSION 28
+
+
+DatabaseImpl::DatabaseImpl( const QString& dbname )
+{
+    QTime t;
+    t.start();
+
+    bool schemaUpdated = openDatabase( dbname );
+    tDebug( LOGVERBOSE ) << "Opened database:" << t.elapsed();
+
+    TomahawkSqlQuery query = newquery();
+    query.exec( "SELECT v FROM settings WHERE k='dbid'" );
+    if ( query.next() )
+    {
+        m_dbid = query.value( 0 ).toString();
+    }
+    else
+    {
+        m_dbid = uuid();
+        query.exec( QString( "INSERT INTO settings(k,v) VALUES('dbid','%1')" ).arg( m_dbid ) );
+    }
+
+    tLog() << "Database ID:" << m_dbid;
+    init();
+    query.exec( "PRAGMA auto_vacuum = FULL" );
+    query.exec( "PRAGMA synchronous = NORMAL" );
+
+    tDebug( LOGVERBOSE ) << "Tweaked db pragmas:" << t.elapsed();
+
+    // in case of unclean shutdown last time:
+    query.exec( "UPDATE source SET isonline = 'false'" );
+
+    m_fuzzyIndex = new FuzzyIndex( this, schemaUpdated );
+
+    tDebug( LOGVERBOSE ) << "Loaded index:" << t.elapsed();
+    if ( qApp->arguments().contains( "--dumpdb" ) )
+    {
+        dumpDatabase();
+        ::exit( 0 );
+    }
+}
+
+
+DatabaseImpl::DatabaseImpl( const QString& dbname, bool internal )
+{
+    Q_UNUSED( internal );
+    openDatabase( dbname, false );
+    init();
+}
+
+
+void
+DatabaseImpl::init()
+{
+    m_lastartid = m_lastalbid = m_lasttrkid = 0;
+
+    TomahawkSqlQuery query = newquery();
+
+     // make sqlite behave how we want:
+    query.exec( "PRAGMA foreign_keys = ON" );
+}
+
+
+DatabaseImpl::~DatabaseImpl()
+{
+    tDebug() << "Shutting down database connection.";
+
+/*
+#ifdef TOMAHAWK_QUERY_ANALYZE
+    TomahawkSqlQuery q = newquery();
+
+    q.exec( "ANALYZE" );
+    q.exec( "SELECT * FROM sqlite_stat1" );
+    while ( q.next() )
+    {
+        tLog( LOGSQL ) << q.value( 0 ).toString() << q.value( 1 ).toString() << q.value( 2 ).toString();
+    }
+
+#endif
+*/
+}
+
+
+TomahawkSqlQuery
+DatabaseImpl::newquery()
+{
+    QMutexLocker lock( &m_mutex );
+    return TomahawkSqlQuery( m_db );
+}
+
+
+QSqlDatabase&
+DatabaseImpl::database()
+{
+    QMutexLocker lock( &m_mutex );
+    return m_db;
+}
+
+
+DatabaseImpl*
+DatabaseImpl::clone() const
+{
+    QMutexLocker lock( &m_mutex );
+
+    DatabaseImpl* impl = new DatabaseImpl( m_db.databaseName(), true );
+    impl->setDatabaseID( m_dbid );
+    impl->setFuzzyIndex( m_fuzzyIndex );
+    return impl;
+}
+
+
+void
+DatabaseImpl::dumpDatabase()
+{
+    QFile dump( "dbdump.txt" );
+    if ( !dump.open( QIODevice::WriteOnly | QIODevice::Text ) )
+    {
+        tDebug() << "Couldn't open dbdump.txt for writing!";
+        Q_ASSERT( false );
+    }
+    else
+    {
+        QTextStream dumpout( &dump );
+        TomahawkSqlQuery query = newquery();
+
+        query.exec( "SELECT * FROM oplog" );
+        while ( query.next() )
+        {
+            dumpout << "ID: " << query.value( 0 ).toInt() << endl
+                    << "GUID: " << query.value( 2 ).toString() << endl
+                    << "Command: " << query.value( 3 ).toString() << endl
+                    << "Singleton: " << query.value( 4 ).toBool() << endl
+                    << "JSON: " << ( query.value( 5 ).toBool() ? qUncompress( query.value( 6 ).toByteArray() ) : query.value( 6 ).toByteArray() )
+                    << endl << endl << endl;
+        }
+    }
+}
+
+
+void
+DatabaseImpl::loadIndex()
+{
+    connect( m_fuzzyIndex, SIGNAL( indexReady() ), SIGNAL( indexReady() ) );
+    m_fuzzyIndex->loadLuceneIndex();
+}
+
+
+bool
+DatabaseImpl::updateSchema( int oldVersion )
+{
+    // we are called here with the old database. we must migrate it to the CURRENT_SCHEMA_VERSION from the oldVersion
+    if ( oldVersion == 0 ) // empty database, so create our tables and stuff
+    {
+        tLog() << "Create tables... old version is" << oldVersion;
+        QString sql( get_tomahawk_sql() );
+        QStringList statements = sql.split( ";", QString::SkipEmptyParts );
+        m_db.transaction();
+
+        foreach ( const QString& sl, statements )
+        {
+            QString s( sl.trimmed() );
+            if ( s.length() == 0 )
+                continue;
+
+            tLog() << "Executing:" << s;
+            TomahawkSqlQuery query = newquery();
+            query.exec( s );
+        }
+
+        m_db.commit();
+        return true;
+    }
+    else // update in place! run the proper upgrade script
+    {
+        int cur = oldVersion;
+        m_db.transaction();
+        while ( cur < CURRENT_SCHEMA_VERSION )
+        {
+            cur++;
+
+            QString path = QString( RESPATH "sql/dbmigrate-%1_to_%2.sql" ).arg( cur - 1 ).arg( cur );
+            QFile script( path );
+            if ( !script.exists() || !script.open( QIODevice::ReadOnly ) )
+            {
+                tLog() << "Failed to find or open upgrade script from" << (cur-1) << "to" << cur << " (" << path << ")! Aborting upgrade...";
+                return false;
+            }
+
+            QString sql = QString::fromUtf8( script.readAll() ).trimmed();
+            QStringList statements = sql.split( ";", QString::SkipEmptyParts );
+            foreach ( const QString& sql, statements )
+            {
+                QString clean = cleanSql( sql ).trimmed();
+                if ( clean.isEmpty() )
+                    continue;
+
+                tLog() << "Executing upgrade statement:" << clean;
+                TomahawkSqlQuery q = newquery();
+                q.exec( clean );
+            }
+        }
+        m_db.commit();
+        tLog() << "DB Upgrade successful!";
+        return true;
+    }
+}
+
+
+QString
+DatabaseImpl::cleanSql( const QString& sql )
+{
+    QString fixed = sql;
+    QRegExp r( "--^\\n*" );
+    fixed.replace( r, QString() );
+    return fixed.trimmed();
+}
+
+
+Tomahawk::result_ptr
+DatabaseImpl::file( int fid )
+{
+    Tomahawk::result_ptr r;
+    TomahawkSqlQuery query = newquery();
+    query.exec( QString( "SELECT url, mtime, size, md5, mimetype, duration, bitrate, "
+                         "file_join.artist, file_join.album, file_join.track, file_join.composer, "
+                         "(select name from artist where id = file_join.artist) as artname, "
+                         "(select name from album  where id = file_join.album)  as albname, "
+                         "(select name from track  where id = file_join.track)  as trkname, "
+                         "(select name from artist where id = file_join.composer) as cmpname, "
+                         "source "
+                         "FROM file, file_join "
+                         "WHERE file.id = file_join.file AND file.id = %1" )
+                .arg( fid ) );
+
+    if ( query.next() )
+    {
+        Tomahawk::source_ptr s;
+        QString url = query.value( 0 ).toString();
+
+        if ( query.value( 15 ).toUInt() == 0 )
+        {
+            s = SourceList::instance()->getLocal();
+        }
+        else
+        {
+            s = SourceList::instance()->get( query.value( 15 ).toUInt() );
+            if ( s.isNull() )
+            {
+                return r;
+            }
+
+            url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
+        }
+
+        r = Tomahawk::Result::get( url );
+        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( query.value( 7 ).toUInt(), query.value( 11 ).toString() );
+        Tomahawk::album_ptr album = Tomahawk::Album::get( query.value( 8 ).toUInt(), query.value( 12 ).toString(), artist );
+        Tomahawk::artist_ptr composer = Tomahawk::Artist::get( query.value( 10 ).toUInt(), query.value( 14 ).toString() );
+
+        r->setModificationTime( query.value( 1 ).toUInt() );
+        r->setSize( query.value( 2 ).toUInt() );
+        r->setMimetype( query.value( 4 ).toString() );
+        r->setDuration( query.value( 5 ).toUInt() );
+        r->setBitrate( query.value( 6 ).toUInt() );
+        r->setArtist( artist );
+        r->setAlbum( album );
+        r->setComposer( composer );
+        r->setTrack( query.value( 13 ).toString() );
+        r->setTrackId( query.value( 9 ).toUInt() );
+        r->setCollection( s->collection() );
+        r->setScore( 1.0 );
+        r->setFileId( fid );
+    }
+
+    return r;
+}
+
+
+int
+DatabaseImpl::artistId( const QString& name_orig, bool autoCreate )
+{
+    if ( m_lastart == name_orig )
+        return m_lastartid;
+
+    int id = 0;
+    QString sortname = DatabaseImpl::sortname( name_orig );
+
+    TomahawkSqlQuery query = newquery();
+    query.prepare( "SELECT id FROM artist WHERE sortname = ?" );
+    query.addBindValue( sortname );
+    query.exec();
+    if ( query.next() )
+    {
+        id = query.value( 0 ).toInt();
+    }
+    if ( id )
+    {
+        m_lastart = name_orig;
+        m_lastartid = id;
+        return id;
+    }
+
+    if ( autoCreate )
+    {
+        // not found, insert it.
+        query.prepare( "INSERT INTO artist(id,name,sortname) VALUES(NULL,?,?)" );
+        query.addBindValue( name_orig );
+        query.addBindValue( sortname );
+        if ( !query.exec() )
+        {
+            tDebug() << "Failed to insert artist:" << name_orig;
+            return 0;
+        }
+
+        id = query.lastInsertId().toInt();
+        m_lastart = name_orig;
+        m_lastartid = id;
+    }
+
+    return id;
+}
+
+
+int
+DatabaseImpl::trackId( int artistid, const QString& name_orig, bool autoCreate )
+{
+    int id = 0;
+    QString sortname = DatabaseImpl::sortname( name_orig );
+    //if( ( id = m_artistcachesortname ) ) return id;
+
+    TomahawkSqlQuery query = newquery();
+    query.prepare( "SELECT id FROM track WHERE artist = ? AND sortname = ?" );
+    query.addBindValue( artistid );
+    query.addBindValue( sortname );
+    query.exec();
+
+    if ( query.next() )
+    {
+        id = query.value( 0 ).toInt();
+    }
+    if ( id )
+    {
+        //m_trackcachesortname=id;
+        return id;
+    }
+
+    if ( autoCreate )
+    {
+        // not found, insert it.
+        query.prepare( "INSERT INTO track(id,artist,name,sortname) VALUES(NULL,?,?,?)" );
+        query.addBindValue( artistid );
+        query.addBindValue( name_orig );
+        query.addBindValue( sortname );
+        if ( !query.exec() )
+        {
+            tDebug() << "Failed to insert track:" << name_orig;
+            return 0;
+        }
+
+        id = query.lastInsertId().toInt();
+    }
+
+    return id;
+}
+
+
+int
+DatabaseImpl::albumId( int artistid, const QString& name_orig, bool autoCreate )
+{
+    if ( name_orig.isEmpty() )
+    {
+        //qDebug() << Q_FUNC_INFO << "empty album name";
+        return 0;
+    }
+
+    if ( m_lastartid == artistid && m_lastalb == name_orig )
+        return m_lastalbid;
+
+    int id = 0;
+    QString sortname = DatabaseImpl::sortname( name_orig );
+    //if( ( id = m_albumcachesortname ) ) return id;
+
+    TomahawkSqlQuery query = newquery();
+    query.prepare( "SELECT id FROM album WHERE artist = ? AND sortname = ?" );
+    query.addBindValue( artistid );
+    query.addBindValue( sortname );
+    query.exec();
+    if ( query.next() )
+    {
+        id = query.value( 0 ).toInt();
+    }
+    if ( id )
+    {
+        m_lastalb = name_orig;
+        m_lastalbid = id;
+        return id;
+    }
+
+    if ( autoCreate )
+    {
+        // not found, insert it.
+        query.prepare( "INSERT INTO album(id,artist,name,sortname) VALUES(NULL,?,?,?)" );
+        query.addBindValue( artistid );
+        query.addBindValue( name_orig );
+        query.addBindValue( sortname );
+        if( !query.exec() )
+        {
+            tDebug() << "Failed to insert album:" << name_orig;
+            return 0;
+        }
+
+        id = query.lastInsertId().toInt();
+        m_lastalb = name_orig;
+        m_lastalbid = id;
+    }
+
+    return id;
+}
+
+
+QList< QPair<int, float> >
+DatabaseImpl::search( const Tomahawk::query_ptr& query, uint limit )
+{
+    QList< QPair<int, float> > resultslist;
+
+    QMap< int, float > resultsmap = m_fuzzyIndex->search( query );
+    foreach ( int i, resultsmap.keys() )
+    {
+        resultslist << QPair<int, float>( i, (float)resultsmap.value( i ) );
+    }
+    qSort( resultslist.begin(), resultslist.end(), DatabaseImpl::scorepairSorter );
+
+    if ( !limit )
+        return resultslist;
+
+    QList< QPair<int, float> > resultscapped;
+    for ( int i = 0; i < (int)limit && i < resultsmap.count(); i++ )
+    {
+        resultscapped << resultslist.at( i );
+    }
+
+    return resultscapped;
+}
+
+
+QList< QPair<int, float> >
+DatabaseImpl::searchAlbum( const Tomahawk::query_ptr& query, uint limit )
+{
+    QList< QPair<int, float> > resultslist;
+
+    QMap< int, float > resultsmap = m_fuzzyIndex->searchAlbum( query );
+    foreach ( int i, resultsmap.keys() )
+    {
+        resultslist << QPair<int, float>( i, (float)resultsmap.value( i ) );
+    }
+    qSort( resultslist.begin(), resultslist.end(), DatabaseImpl::scorepairSorter );
+
+    if ( !limit )
+        return resultslist;
+
+    QList< QPair<int, float> > resultscapped;
+    for ( int i = 0; i < (int)limit && i < resultsmap.count(); i++ )
+    {
+        resultscapped << resultslist.at( i );
+    }
+
+    return resultscapped;
+}
+
+
+QList< int >
+DatabaseImpl::getTrackFids( int tid )
+{
+    QList< int > ret;
+
+    TomahawkSqlQuery query = newquery();
+    query.exec( QString( "SELECT file.id FROM file, file_join "
+                         "WHERE file_join.file=file.id "
+                         "AND file_join.track = %1 ").arg( tid ) );
+    query.exec();
+
+    while( query.next() )
+        ret.append( query.value( 0 ).toInt() );
+
+    return ret;
+}
+
+
+QString
+DatabaseImpl::sortname( const QString& str, bool replaceArticle )
+{
+    QString s = str.toLower().trimmed().replace( QRegExp( "\\s{2,}" ), " " );
+
+    if ( replaceArticle && s.startsWith( "the " ) )
+    {
+        s = s.mid( 4 );
+    }
+
+    return s;
+}
+
+
+QVariantMap
+DatabaseImpl::artist( int id )
+{
+    TomahawkSqlQuery query = newquery();
+    query.exec( QString( "SELECT id, name, sortname FROM artist WHERE id = %1" ).arg( id ) );
+
+    QVariantMap m;
+    if( !query.next() )
+        return m;
+
+    m"id" = query.value( 0 );
+    m"name" = query.value( 1 );
+    m"sortname" = query.value( 2 );
+    return m;
+}
+
+
+QVariantMap
+DatabaseImpl::track( int id )
+{
+    TomahawkSqlQuery query = newquery();
+    query.exec( QString( "SELECT id, artist, name, sortname FROM track WHERE id = %1" ).arg( id ) );
+
+    QVariantMap m;
+    if( !query.next() )
+        return m;
+
+    m"id" = query.value( 0 );
+    m"artist" = query.value( 1 );
+    m"name" = query.value( 2 );
+    m"sortname" = query.value( 3 );
+    return m;
+}
+
+
+QVariantMap
+DatabaseImpl::album( int id )
+{
+    TomahawkSqlQuery query = newquery();
+    query.exec( QString( "SELECT id, artist, name, sortname FROM album WHERE id = %1" ).arg( id ) );
+
+    QVariantMap m;
+    if( !query.next() )
+        return m;
+
+    m"id" = query.value( 0 );
+    m"artist" = query.value( 1 );
+    m"name" = query.value( 2 );
+    m"sortname" = query.value( 3 );
+    return m;
+}
+
+
+Tomahawk::result_ptr
+DatabaseImpl::resultFromHint( const Tomahawk::query_ptr& origquery )
+{
+    QString url = origquery->resultHint();
+    TomahawkSqlQuery query = newquery();
+    Tomahawk::source_ptr s;
+    Tomahawk::result_ptr res;
+    QString fileUrl;
+
+    if ( url.contains( "servent://" ) )
+    {
+        QStringList parts = url.mid( QString( "servent://" ).length() ).split( "\t" );
+        s = SourceList::instance()->get( parts.at( 0 ) );
+        fileUrl = parts.at( 1 );
+
+        if ( s.isNull() )
+            return res;
+    }
+    else if ( url.contains( "file://" ) )
+    {
+        s = SourceList::instance()->getLocal();
+        fileUrl = url;
+    }
+    else
+    {
+//        Q_ASSERT( false );
+/*        res = Tomahawk::result_ptr( new Tomahawk::Result() );
+        s = SourceList::instance()->webSource();
+        res->setUrl( url );
+        res->setCollection( s->collection() );
+        res->setRID( uuid() );
+        res->setScore( 1.0 );
+        res->setArtist( Tomahawk::artist_ptr( new Tomahawk::Artist( 0, origquery->artist() ) ) );
+        res->setAlbum( Tomahawk::album_ptr( new Tomahawk::Album( 0, origquery->album(), res->artist() ) ) );
+        res->setTrack( origquery->track() );
+        res->setDuration( origquery->duration() );
+        res->setFriendlySource( url );*/
+
+        return res;
+    }
+
+    bool searchlocal = s->isLocal();
+
+    QString sql = QString( "SELECT "
+                            "url, mtime, size, md5, mimetype, duration, bitrate, "  //0
+                            "file_join.artist, file_join.album, file_join.track, "  //7
+                            "file_join.composer, "                                  //10
+                            "artist.name as artname, "                              //11
+                            "album.name as albname, "                               //12
+                            "track.name as trkname, "                               //13
+                            "composer.name as cmpname, "                            //14
+                            "file.source, "                                         //15
+                            "file_join.albumpos, "                                  //16
+                            "file_join.discnumber, "                                //17
+                            "artist.id as artid, "                                  //18
+                            "album.id as albid, "                                   //19
+                            "composer.id as cmpid, "                                //20
+                            "track_attributes.v as year "                           //21
+                            "FROM file, file_join, artist, track, track_attributes "
+                            "LEFT JOIN album ON album.id = file_join.album "
+                            "LEFT JOIN artist AS composer on composer.id = file_join.composer "
+                            "WHERE "
+                            "artist.id = file_join.artist AND "
+                            "track.id = file_join.track AND "
+                            "file.source %1 AND "
+                            "file_join.file = file.id AND "
+                            "file.id = track_attributes.id AND "
+                            "file.url = ?"
+        ).arg( searchlocal ? "IS NULL" : QString( "= %1" ).arg( s->id() ) );
+
+    query.prepare( sql );
+    query.bindValue( 0, fileUrl );
+    query.exec();
+
+    if( query.next() )
+    {
+        Tomahawk::source_ptr s;
+        QString url = query.value( 0 ).toString();
+
+        if ( query.value( 15 ).toUInt() == 0 )
+        {
+            s = SourceList::instance()->getLocal();
+        }
+        else
+        {
+            s = SourceList::instance()->get( query.value( 15 ).toUInt() );
+            if ( s.isNull() )
+            {
+                return res;
+            }
+
+            url = QString( "servent://%1\t%2" ).arg( s->userName() ).arg( url );
+        }
+
+        res = Tomahawk::Result::get( url );
+        Tomahawk::artist_ptr artist = Tomahawk::Artist::get( query.value( 18 ).toUInt(), query.value( 11 ).toString() );
+        Tomahawk::album_ptr album = Tomahawk::Album::get( query.value( 19 ).toUInt(), query.value( 12 ).toString(), artist );
+        Tomahawk::artist_ptr composer = Tomahawk::Artist::get( query.value( 20 ).toUInt(), query.value( 14 ).toString() );
+
+        res->setModificationTime( query.value( 1 ).toUInt() );
+        res->setSize( query.value( 2 ).toUInt() );
+        res->setMimetype( query.value( 4 ).toString() );
+        res->setDuration( query.value( 5 ).toInt() );
+        res->setBitrate( query.value( 6 ).toInt() );
+        res->setArtist( artist );
+        res->setAlbum( album );
+        res->setComposer( composer );
+        res->setScore( 1.0 );
+        res->setTrack( query.value( 13 ).toString() );
+        res->setAlbumPos( query.value( 16 ).toUInt() );
+        res->setDiscNumber( query.value( 17 ).toUInt() );
+        res->setRID( uuid() );
+        res->setTrackId( query.value( 9 ).toUInt() );
+        res->setCollection( s->collection() );
+        res->setYear( query.value( 21 ).toUInt() );
+    }
+
+    return res;
+}
+
+
+bool
+DatabaseImpl::openDatabase( const QString& dbname, bool checkSchema )
+{
+    QString connName( "tomahawk" );
+    if ( !checkSchema )
+    {
+        // secondary connection, use a unique connection name
+        connName += "_" + uuid();
+    }
+
+    bool schemaUpdated = false;
+    int version = -1;
+    {
+        QSqlDatabase db = QSqlDatabase::addDatabase( "QSQLITE", connName );
+        db.setDatabaseName( dbname );
+        db.setConnectOptions( "QSQLITE_ENABLE_SHARED_CACHE=1" );
+        if ( !db.open() )
+        {
+            tLog() << "Failed to open database" << dbname;
+            throw "failed to open db"; // TODO
+        }
+
+        if ( checkSchema )
+        {
+            QSqlQuery qry = QSqlQuery( db );
+            qry.exec( "SELECT v FROM settings WHERE k='schema_version'" );
+            if ( qry.next() )
+            {
+                version = qry.value( 0 ).toInt();
+                tLog() << "Database schema of" << dbname << "is" << version;
+            }
+        }
+        else
+            version = CURRENT_SCHEMA_VERSION;
+
+        if ( version < 0 || version == CURRENT_SCHEMA_VERSION )
+            m_db = db;
+    }
+
+    if ( version > 0 && version != CURRENT_SCHEMA_VERSION )
+    {
+        QSqlDatabase::removeDatabase( connName );
+
+        QString newname = QString( "%1.v%2" ).arg( dbname ).arg( version );
+        tLog() << endl << "****************************" << endl;
+        tLog() << "Schema version too old: " << version << ". Current version is:" << CURRENT_SCHEMA_VERSION;
+        tLog() << "Moving" << dbname << newname;
+        tLog() << "If the migration fails, you can recover your DB by copying" << newname << "back to" << dbname;
+        tLog() << endl << "****************************" << endl;
+
+        QFile::copy( dbname, newname );
+        {
+            m_db = QSqlDatabase::addDatabase( "QSQLITE", connName );
+            m_db.setDatabaseName( dbname );
+            if ( !m_db.open() )
+                throw "db moving failed";
+
+            schemaUpdated = updateSchema( version );
+            if ( !schemaUpdated )
+            {
+                Q_ASSERT( false );
+                QTimer::singleShot( 0, qApp, SLOT( quit() ) );
+            }
+        }
+    }
+    else if ( version < 0 )
+    {
+            schemaUpdated = updateSchema( 0 );
+    }
+
+    return schemaUpdated;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseImpl.h Added

@@ -0,0 +1,106 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 DATABASEIMPL_H
+#define DATABASEIMPL_H
+
+#include <QObject>
+#include <QList>
+#include <QPair>
+#include <QVariant>
+#include <QVariantMap>
+#include <QSqlDatabase>
+#include <QSqlError>
+#include <QSqlQuery>
+#include <QHash>
+#include <QThread>
+
+#include "TomahawkSqlQuery.h"
+#include "FuzzyIndex.h"
+#include "Typedefs.h"
+
+class Database;
+
+class DatabaseImpl : public QObject
+{
+Q_OBJECT
+
+friend class FuzzyIndex;
+friend class DatabaseCommand_UpdateSearchIndex;
+
+public:
+    DatabaseImpl( const QString& dbname );
+    ~DatabaseImpl();
+
+    DatabaseImpl* clone() const;
+
+    TomahawkSqlQuery newquery();
+    QSqlDatabase& database();
+
+    int artistId( const QString& name_orig, bool autoCreate ); //also for composers!
+    int trackId( int artistid, const QString& name_orig, bool autoCreate );
+    int albumId( int artistid, const QString& name_orig, bool autoCreate );
+
+    QList< QPair<int, float> > search( const Tomahawk::query_ptr& query, uint limit = 0 );
+    QList< QPair<int, float> > searchAlbum( const Tomahawk::query_ptr& query, uint limit = 0 );
+    QList< int > getTrackFids( int tid );
+
+    static QString sortname( const QString& str, bool replaceArticle = false );
+
+    QVariantMap artist( int id );
+    QVariantMap album( int id );
+    QVariantMap track( int id );
+    Tomahawk::result_ptr file( int fid );
+    Tomahawk::result_ptr resultFromHint( const Tomahawk::query_ptr& query );
+
+    static bool scorepairSorter( const QPair<int,float>& left, const QPair<int,float>& right )
+    {
+        return left.second > right.second;
+    }
+
+    QString dbid() const { return m_dbid; }
+
+    void loadIndex();
+
+signals:
+    void indexReady();
+
+private:
+    DatabaseImpl( const QString& dbname, bool internal );
+    void setFuzzyIndex( FuzzyIndex* fi ) { m_fuzzyIndex = fi; }
+    void setDatabaseID( const QString& dbid ) { m_dbid = dbid; }
+
+    void init();
+    bool openDatabase( const QString& dbname, bool checkSchema = true );
+    bool updateSchema( int oldVersion );
+    void dumpDatabase();
+    QString cleanSql( const QString& sql );
+
+    bool m_ready;
+    QSqlDatabase m_db;
+
+    QString m_lastart, m_lastalb, m_lasttrk;
+    int m_lastartid, m_lastalbid, m_lasttrkid;
+
+    QString m_dbid;
+    FuzzyIndex* m_fuzzyIndex;
+    mutable QMutex m_mutex;
+};
+
+#endif // DATABASEIMPL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseResolver.cpp Added

@@ -0,0 +1,84 @@
+/* === 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
+ *   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 "DatabaseResolver.h"
+
+#include "Pipeline.h"
+#include "network/Servent.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_Resolve.h"
+#include "Source.h"
+
+#include "utils/Logger.h"
+
+
+DatabaseResolver::DatabaseResolver( int weight )
+    : Resolver()
+    , m_weight( weight )
+{
+}
+
+
+void
+DatabaseResolver::resolve( const Tomahawk::query_ptr& query )
+{
+    DatabaseCommand_Resolve* cmd = new DatabaseCommand_Resolve( query );
+
+    connect( cmd, SIGNAL( results( Tomahawk::QID, QList< Tomahawk::result_ptr > ) ),
+                    SLOT( gotResults( Tomahawk::QID, QList< Tomahawk::result_ptr > ) ), Qt::QueuedConnection );
+    connect( cmd, SIGNAL( albums( Tomahawk::QID, QList< Tomahawk::album_ptr > ) ),
+                    SLOT( gotAlbums( Tomahawk::QID, QList< Tomahawk::album_ptr > ) ), Qt::QueuedConnection );
+    connect( cmd, SIGNAL( artists( Tomahawk::QID, QList< Tomahawk::artist_ptr > ) ),
+                    SLOT( gotArtists( Tomahawk::QID, QList< Tomahawk::artist_ptr > ) ), Qt::QueuedConnection );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+
+}
+
+
+void
+DatabaseResolver::gotResults( const Tomahawk::QID qid, QList< Tomahawk::result_ptr> results )
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << qid << results.length();
+
+    foreach ( const Tomahawk::result_ptr& r, results )
+        r->setResolvedBy( this );
+
+    Tomahawk::Pipeline::instance()->reportResults( qid, results );
+}
+
+
+void
+DatabaseResolver::gotAlbums( const Tomahawk::QID qid, QList< Tomahawk::album_ptr> albums )
+{
+    Tomahawk::Pipeline::instance()->reportAlbums( qid, albums );
+}
+
+
+void
+DatabaseResolver::gotArtists( const Tomahawk::QID qid, QList< Tomahawk::artist_ptr> artists )
+{
+    Tomahawk::Pipeline::instance()->reportArtists( qid, artists );
+}
+
+
+QString
+DatabaseResolver::name() const
+{
+    return QString( "DatabaseResolver" );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseResolver.h Added

@@ -0,0 +1,53 @@
+/* === 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
+ *   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 DATABASERESOLVER_H
+#define DATABASERESOLVER_H
+
+#include "Resolver.h"
+#include "Result.h"
+#include "Artist.h"
+#include "Album.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT DatabaseResolver : public Tomahawk::Resolver
+{
+Q_OBJECT
+
+public:
+    explicit DatabaseResolver( int weight );
+
+    virtual QString name() const;
+    virtual unsigned int weight() const { return m_weight; }
+    virtual unsigned int preference() const { return 100; }
+    virtual unsigned int timeout() const { return 0; }
+
+public slots:
+    virtual void resolve( const Tomahawk::query_ptr& query );
+
+private slots:
+    void gotResults( const Tomahawk::QID qid, QList< Tomahawk::result_ptr> results );
+    void gotAlbums( const Tomahawk::QID qid, QList< Tomahawk::album_ptr> albums );
+    void gotArtists( const Tomahawk::QID qid, QList< Tomahawk::artist_ptr> artists );
+
+private:
+    int m_weight;
+};
+
+#endif // DATABASERESOLVER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseWorker.cpp Added

@@ -0,0 +1,305 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "DatabaseWorker.h"
+
+#include <QTimer>
+#include <QTime>
+#include <QSqlQuery>
+
+#include "Source.h"
+#include "Database.h"
+#include "DatabaseImpl.h"
+#include "DatabaseCommandLoggable.h"
+#include "TomahawkSqlQuery.h"
+#include "utils/Logger.h"
+
+#ifndef QT_NO_DEBUG
+    //#define DEBUG_TIMING TRUE
+#endif
+
+DatabaseWorker::DatabaseWorker( Database* db, bool mutates )
+    : QThread()
+    , m_db( db )
+    , m_outstanding( 0 )
+{
+    Q_UNUSED( db );
+    Q_UNUSED( mutates );
+
+    moveToThread( this );
+
+    qDebug() << "CTOR DatabaseWorker" << this->thread();
+}
+
+
+DatabaseWorker::~DatabaseWorker()
+{
+    tDebug() << Q_FUNC_INFO << m_outstanding;
+
+    if ( m_outstanding )
+    {
+        foreach ( const QSharedPointer<DatabaseCommand>& cmd, m_commands )
+        {
+            tDebug() << "Outstanding db command to finish:" << cmd->guid() << cmd->commandname();
+        }
+    }
+
+    thread()->quit();
+    wait();
+}
+
+
+void
+DatabaseWorker::run()
+{
+    tDebug() << "New db connection with name:" << Database::instance()->impl()->database().connectionName();
+    exec();
+    qDebug() << Q_FUNC_INFO << "DatabaseWorker finishing...";
+}
+
+
+void
+DatabaseWorker::enqueue( const QList< QSharedPointer<DatabaseCommand> >& cmds )
+{
+    QMutexLocker lock( &m_mut );
+    m_outstanding += cmds.count();
+    m_commands << cmds;
+
+    if ( m_outstanding == cmds.count() )
+        QTimer::singleShot( 0, this, SLOT( doWork() ) );
+}
+
+
+void
+DatabaseWorker::enqueue( const QSharedPointer<DatabaseCommand>& cmd )
+{
+    QMutexLocker lock( &m_mut );
+    m_outstanding++;
+    m_commands << cmd;
+
+    if ( m_outstanding == 1 )
+        QTimer::singleShot( 0, this, SLOT( doWork() ) );
+}
+
+
+void
+DatabaseWorker::doWork()
+{
+    /*
+        Run the dbcmd. Only inside a transaction if the cmd does mutates.
+
+        If the cmd is modifying local content (ie source->isLocal()) then
+        log to the database oplog for replication to peers.
+
+     */
+
+#ifdef DEBUG_TIMING
+    QTime timer;
+    timer.start();
+#endif
+
+    QList< QSharedPointer<DatabaseCommand> > cmdGroup;
+    QSharedPointer<DatabaseCommand> cmd;
+    {
+        QMutexLocker lock( &m_mut );
+        cmd = m_commands.takeFirst();
+    }
+
+    DatabaseImpl* impl = Database::instance()->impl();
+    if ( cmd->doesMutates() )
+    {
+        bool transok = impl->database().transaction();
+        Q_ASSERT( transok );
+        Q_UNUSED( transok );
+    }
+
+    unsigned int completed = 0;
+    try
+    {
+        bool finished = false;
+        {
+            while ( !finished )
+            {
+                completed++;
+                cmd->_exec( impl ); // runs actual SQL stuff
+
+                if ( cmd->loggable() )
+                {
+                    // We only save our own ops to the oplog, since incoming ops from peers
+                    // are applied immediately.
+                    //
+                    // Crazy idea: if peers had keypairs and could sign ops/msgs, in theory it
+                    // would be safe to sync ops for friend A from friend B's cache, if he saved them,
+                    // which would mean you could get updates even if a peer was offline.
+                    if ( cmd->source()->isLocal() && !cmd->localOnly() )
+                    {
+                        // save to op-log
+                        DatabaseCommandLoggable* command = (DatabaseCommandLoggable*)cmd.data();
+                        logOp( command );
+                    }
+                    else
+                    {
+                        // Make a note of the last guid we applied for this source
+                        // so we can always request just the newer ops in future.
+                        //
+                        if ( !cmd->singletonCmd() )
+                        {
+                            TomahawkSqlQuery query = impl->newquery();
+                            query.prepare( "UPDATE source SET lastop = ? WHERE id = ?" );
+                            query.addBindValue( cmd->guid() );
+                            query.addBindValue( cmd->source()->id() );
+
+                            if ( !query.exec() )
+                            {
+                                throw "Failed to set lastop";
+                            }
+                        }
+                    }
+                }
+
+                cmdGroup << cmd;
+                if ( cmd->groupable() && !m_commands.isEmpty() )
+                {
+                    QMutexLocker lock( &m_mut );
+                    if ( m_commands.first()->groupable() )
+                    {
+                        cmd = m_commands.takeFirst();
+                    }
+                    else
+                    {
+                        finished = true;
+                    }
+                }
+                else
+                    finished = true;
+            }
+
+            if ( cmd->doesMutates() )
+            {
+                qDebug() << "Committing" << cmd->commandname() << cmd->guid();
+                if ( !impl->newquery().commitTransaction() )
+                {
+                    tDebug() << "FAILED TO COMMIT TRANSACTION*";
+                    throw "commit failed";
+                }
+            }
+
+#ifdef DEBUG_TIMING
+            uint duration = timer.elapsed();
+            tDebug() << "DBCmd Duration:" << duration << "ms, now running postcommit for" << cmd->commandname();
+#endif
+
+            foreach ( QSharedPointer<DatabaseCommand> c, cmdGroup )
+                c->postCommit();
+
+#ifdef DEBUG_TIMING
+            tDebug() << "Post commit finished in" << timer.elapsed() - duration << "ms for" << cmd->commandname();
+#endif
+        }
+    }
+    catch( const char * msg )
+    {
+        tLog() << endl
+                 << "*ERROR* processing databasecommand:"
+                 << cmd->commandname()
+                 << msg
+                 << impl->database().lastError().databaseText()
+                 << impl->database().lastError().driverText()
+                 << endl;
+
+        if ( cmd->doesMutates() )
+            impl->database().rollback();
+
+        Q_ASSERT( false );
+    }
+    catch(...)
+    {
+        qDebug() << "Uncaught exception processing dbcmd";
+        if ( cmd->doesMutates() )
+            impl->database().rollback();
+
+        Q_ASSERT( false );
+        throw;
+    }
+
+    foreach ( QSharedPointer<DatabaseCommand> c, cmdGroup )
+        c->emitFinished();
+
+    QMutexLocker lock( &m_mut );
+    m_outstanding -= completed;
+    if ( m_outstanding > 0 )
+        QTimer::singleShot( 0, this, SLOT( doWork() ) );
+}
+
+
+// this should take a const command, need to check/make json stuff mutable for some objs tho maybe.
+void
+DatabaseWorker::logOp( DatabaseCommandLoggable* command )
+{
+    TomahawkSqlQuery oplogquery = Database::instance()->impl()->newquery();
+    qDebug() << "INSERTING INTO OPTLOG:" << command->source()->id() << command->guid() << command->commandname();
+    oplogquery.prepare( "INSERT INTO oplog(source, guid, command, singleton, compressed, json) "
+                        "VALUES(?, ?, ?, ?, ?, ?)" );
+
+    QVariantMap variant = QJson::QObjectHelper::qobject2qvariant( command );
+    QByteArray ba = m_serializer.serialize( variant );
+
+//     qDebug() << "OP JSON:" << ba.isNull() << ba << "from:" << variant; // debug
+
+    bool compressed = false;
+    if( ba.length() >= 512 )
+    {
+        // We need to compress this in this thread, since inserting into the log
+        // has to happen as part of the same transaction as the dbcmd.
+        // (we are in a worker thread for RW dbcmds anyway, so it's ok)
+        //qDebug() << "Compressing DB OP JSON, uncompressed size:" << ba.length();
+        ba = qCompress( ba, 9 );
+        compressed = true;
+        //qDebug() << "Compressed DB OP JSON size:" << ba.length();
+    }
+
+    if ( command->singletonCmd() )
+    {
+        tDebug() << "Singleton command, deleting previous oplog commands";
+
+        TomahawkSqlQuery oplogdelquery = Database::instance()->impl()->newquery();
+        oplogdelquery.prepare( QString( "DELETE FROM oplog WHERE source %1 AND singleton = 'true' AND command = ?" )
+                                  .arg( command->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( command->source()->id() ) ) );
+
+        oplogdelquery.bindValue( 0, command->commandname() );
+        oplogdelquery.exec();
+    }
+
+    tDebug() << "Saving to oplog:" << command->commandname()
+             << "bytes:" << ba.length()
+             << "guid:" << command->guid();
+
+    oplogquery.bindValue( 0, command->source()->isLocal() ?
+                          QVariant(QVariant::Int) : command->source()->id() );
+    oplogquery.bindValue( 1, command->guid() );
+    oplogquery.bindValue( 2, command->commandname() );
+    oplogquery.bindValue( 3, command->singletonCmd() );
+    oplogquery.bindValue( 4, compressed );
+    oplogquery.bindValue( 5, ba );
+    if( !oplogquery.exec() )
+    {
+        tLog() << "Error saving to oplog";
+        throw "Failed to save to oplog";
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/DatabaseWorker.h Added

@@ -0,0 +1,69 @@
+/* === 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
+ *   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 DATABASEWORKER_H
+#define DATABASEWORKER_H
+
+#include <QObject>
+#include <QThread>
+#include <QMutex>
+#include <QList>
+#include <QSharedPointer>
+
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+#include <qjson/qobjecthelper.h>
+
+#include "DatabaseCommand.h"
+
+class Database;
+class DatabaseCommandLoggable;
+
+class DatabaseWorker : public QThread
+{
+Q_OBJECT
+
+public:
+    DatabaseWorker( Database*, bool mutates );
+    ~DatabaseWorker();
+
+    bool busy() const { return m_outstanding > 0; }
+    unsigned int outstandingJobs() const { return m_outstanding; }
+
+public slots:
+    void enqueue( const QSharedPointer<DatabaseCommand>& );
+    void enqueue( const QList< QSharedPointer<DatabaseCommand> >& );
+
+protected:
+    void run();
+
+private slots:
+    void doWork();
+
+private:
+    void logOp( DatabaseCommandLoggable* command );
+
+    QMutex m_mut;
+    Database* m_db;
+    QList< QSharedPointer<DatabaseCommand> > m_commands;
+    int m_outstanding;
+
+    QJson::Serializer m_serializer;
+};
+
+#endif // DATABASEWORKER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/FuzzyIndex.cpp Added

@@ -0,0 +1,355 @@
+/* === 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
+ *   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 "FuzzyIndex.h"
+
+#include <QDir>
+#include <QTime>
+
+#include <CLucene.h>
+#include <CLucene/queryParser/MultiFieldQueryParser.h>
+
+#include "DatabaseCommand_UpdateSearchIndex.h"
+#include "DatabaseImpl.h"
+#include "Database.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+using namespace lucene::analysis;
+using namespace lucene::analysis::standard;
+using namespace lucene::document;
+using namespace lucene::store;
+using namespace lucene::index;
+using namespace lucene::queryParser;
+using namespace lucene::search;
+
+
+FuzzyIndex::FuzzyIndex( QObject* parent, bool wipe )
+    : QObject( parent )
+    , m_luceneReader( 0 )
+    , m_luceneSearcher( 0 )
+{
+    QString m_lucenePath = TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.lucene" );
+    QByteArray path = m_lucenePath.toUtf8();
+    const char* cPath = path.constData();
+
+    bool failed = false;
+    tDebug() << "Opening Lucene directory:" << path;
+    try
+    {
+        m_analyzer = _CLNEW SimpleAnalyzer();
+        m_luceneDir = FSDirectory::getDirectory( cPath );
+    }
+    catch ( CLuceneError& error )
+    {
+        tDebug() << "Caught CLucene error:" << error.what();
+        failed = true;
+    }
+
+    if ( failed )
+    {
+        tDebug() << "Initializing RAM directory instead.";
+
+        m_luceneDir = _CLNEW RAMDirectory();
+        wipe = true;
+    }
+
+    if ( wipe )
+        wipeIndex();
+}
+
+
+FuzzyIndex::~FuzzyIndex()
+{
+    delete m_luceneSearcher;
+    delete m_luceneReader;
+    delete m_analyzer;
+    delete m_luceneDir;
+}
+
+
+bool
+FuzzyIndex::wipeIndex()
+{
+    tLog( LOGVERBOSE ) << "Wiping fuzzy index...";
+    beginIndexing();
+    endIndexing();
+
+    QTimer::singleShot( 0, this, SLOT( updateIndex() ) );
+
+    return true; // FIXME
+}
+
+
+void
+FuzzyIndex::updateIndex()
+{
+    DatabaseCommand* cmd = new DatabaseCommand_UpdateSearchIndex();
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+FuzzyIndex::beginIndexing()
+{
+    m_mutex.lock();
+
+    try
+    {
+        qDebug() << Q_FUNC_INFO << "Starting indexing.";
+        if ( m_luceneReader != 0 )
+        {
+            qDebug() << "Deleting old lucene stuff.";
+            m_luceneSearcher->close();
+            m_luceneReader->close();
+            delete m_luceneSearcher;
+            delete m_luceneReader;
+            m_luceneSearcher = 0;
+            m_luceneReader = 0;
+        }
+
+        qDebug() << "Creating new index writer.";
+        IndexWriter luceneWriter( m_luceneDir, m_analyzer, true );
+    }
+    catch( CLuceneError& error )
+    {
+        tDebug() << "Caught CLucene error:" << error.what();
+        Q_ASSERT( false );
+    }
+}
+
+
+void
+FuzzyIndex::endIndexing()
+{
+    m_mutex.unlock();
+    emit indexReady();
+}
+
+
+void
+FuzzyIndex::appendFields( const QMap< unsigned int, QMap< QString, QString > >& trackData )
+{
+    try
+    {
+        tDebug() << "Appending to index:" << trackData.count();
+        bool create = !IndexReader::indexExists( TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.lucene" ).toStdString().c_str() );
+        IndexWriter luceneWriter( m_luceneDir, m_analyzer, create );
+        Document doc;
+
+        QMapIterator< unsigned int, QMap< QString, QString > > it( trackData );
+        while ( it.hasNext() )
+        {
+            it.next();
+            unsigned int id = it.key();
+            QMap< QString, QString > values = it.value();
+
+            if ( values.contains( "track" ) )
+            {
+                doc.add( *( _CLNEW Field( _T( "fulltext" ), DatabaseImpl::sortname( QString( "%1 %2" ).arg( values.value( "artist" ) ).arg( values.value( "track" ) ) ).toStdWString().c_str(),
+                                          Field::STORE_NO | Field::INDEX_UNTOKENIZED ) ) );
+
+                doc.add( *( _CLNEW Field( _T( "track" ), DatabaseImpl::sortname( values.value( "track" ) ).toStdWString().c_str(),
+                                          Field::STORE_NO | Field::INDEX_UNTOKENIZED ) ) );
+
+                doc.add( *( _CLNEW Field( _T( "artist" ), DatabaseImpl::sortname( values.value( "artist" ) ).toStdWString().c_str(),
+                                          Field::STORE_NO | Field::INDEX_UNTOKENIZED ) ) );
+
+                doc.add( *( _CLNEW Field( _T( "artistid" ), values.value( "artistid" ).toStdWString().c_str(),
+                                          Field::STORE_YES | Field::INDEX_NO ) ) );
+
+                doc.add( *( _CLNEW Field( _T( "trackid" ), QString::number( id ).toStdWString().c_str(),
+                                          Field::STORE_YES | Field::INDEX_NO ) ) );
+            }
+            else if ( values.contains( "album" ) )
+            {
+                doc.add( *( _CLNEW Field( _T( "album" ), DatabaseImpl::sortname( values.value( "album" ) ).toStdWString().c_str(),
+                                          Field::STORE_NO | Field::INDEX_UNTOKENIZED ) ) );
+
+                doc.add( *( _CLNEW Field( _T( "albumid" ), QString::number( id ).toStdWString().c_str(),
+                                          Field::STORE_YES | Field::INDEX_NO ) ) );
+            }
+            else
+                Q_ASSERT( false );
+
+            luceneWriter.addDocument( &doc );
+            doc.clear();
+        }
+
+        luceneWriter.optimize();
+        luceneWriter.close();
+    }
+    catch( CLuceneError& error )
+    {
+        tDebug() << "Caught CLucene error:" << error.what();
+
+        QTimer::singleShot( 0, this, SLOT( wipeIndex() ) );
+    }
+}
+
+
+void
+FuzzyIndex::loadLuceneIndex()
+{
+    emit indexReady();
+}
+
+
+QMap< int, float >
+FuzzyIndex::search( const Tomahawk::query_ptr& query )
+{
+    QMutexLocker lock( &m_mutex );
+
+    QMap< int, float > resultsmap;
+    try
+    {
+        if ( !m_luceneReader )
+        {
+            if ( !IndexReader::indexExists( TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.lucene" ).toStdString().c_str() ) )
+            {
+                qDebug() << Q_FUNC_INFO << "index didn't exist.";
+                return resultsmap;
+            }
+
+            m_luceneReader = IndexReader::open( m_luceneDir );
+            m_luceneSearcher = _CLNEW IndexSearcher( m_luceneReader );
+        }
+
+        float minScore;
+        const TCHAR** fields = 0;
+        MultiFieldQueryParser parser( fields, m_analyzer );
+        BooleanQuery* qry = _CLNEW BooleanQuery();
+
+        if ( query->isFullTextQuery() )
+        {
+            QString escapedQuery = QString::fromWCharArray( parser.escape( DatabaseImpl::sortname( query->fullTextQuery() ).toStdWString().c_str() ) );
+
+            Term* term = _CLNEW Term( _T( "track" ), escapedQuery.toStdWString().c_str() );
+            Query* fqry = _CLNEW FuzzyQuery( term );
+            qry->add( fqry, true, BooleanClause::SHOULD );
+
+            term = _CLNEW Term( _T( "artist" ), escapedQuery.toStdWString().c_str() );
+            fqry = _CLNEW FuzzyQuery( term );
+            qry->add( fqry, true, BooleanClause::SHOULD );
+
+            term = _CLNEW Term( _T( "fulltext" ), escapedQuery.toStdWString().c_str() );
+            fqry = _CLNEW FuzzyQuery( term );
+            qry->add( fqry, true, BooleanClause::SHOULD );
+
+            minScore = 0.00;
+        }
+        else
+        {
+            QString track = QString::fromWCharArray( parser.escape( DatabaseImpl::sortname( query->track() ).toStdWString().c_str() ) );
+            QString artist = QString::fromWCharArray( parser.escape( DatabaseImpl::sortname( query->artist() ).toStdWString().c_str() ) );
+//            QString album = QString::fromWCharArray( parser.escape( query->album().toStdWString().c_str() ) );
+
+            Term* term = _CLNEW Term( _T( "track" ), track.toStdWString().c_str() );
+            Query* fqry = _CLNEW FuzzyQuery( term );
+            qry->add( fqry, true, BooleanClause::MUST );
+
+            term = _CLNEW Term( _T( "artist" ), artist.toStdWString().c_str() );
+            fqry = _CLNEW FuzzyQuery( term );
+            qry->add( fqry, true, BooleanClause::MUST );
+
+            minScore = 0.00;
+        }
+
+        Hits* hits = m_luceneSearcher->search( qry );
+        for ( uint i = 0; i < hits->length(); i++ )
+        {
+            Document* d = &hits->doc( i );
+
+            float score = hits->score( i );
+            int id = QString::fromWCharArray( d->get( _T( "trackid" ) ) ).toInt();
+
+            if ( score > minScore )
+            {
+                resultsmap.insert( id, score );
+//                tDebug() << "Index hit:" << id << score << QString::fromWCharArray( ((Query*)qry)->toString() );
+            }
+        }
+
+        delete hits;
+        delete qry;
+    }
+    catch( CLuceneError& error )
+    {
+        tDebug() << "Caught CLucene error:" << error.what() << query->toString();
+
+        QTimer::singleShot( 0, this, SLOT( wipeIndex() ) );
+    }
+
+    return resultsmap;
+}
+
+
+QMap< int, float >
+FuzzyIndex::searchAlbum( const Tomahawk::query_ptr& query )
+{
+    Q_ASSERT( query->isFullTextQuery() );
+
+    QMutexLocker lock( &m_mutex );
+
+    QMap< int, float > resultsmap;
+    try
+    {
+        if ( !m_luceneReader )
+        {
+            if ( !IndexReader::indexExists( TomahawkUtils::appDataDir().absoluteFilePath( "tomahawk.lucene" ).toStdString().c_str() ) )
+            {
+                qDebug() << Q_FUNC_INFO << "index didn't exist.";
+                return resultsmap;
+            }
+
+            m_luceneReader = IndexReader::open( m_luceneDir );
+            m_luceneSearcher = _CLNEW IndexSearcher( m_luceneReader );
+        }
+
+        QueryParser parser( _T( "album" ), m_analyzer );
+        QString escapedName = QString::fromWCharArray( parser.escape( DatabaseImpl::sortname( query->fullTextQuery() ).toStdWString().c_str() ) );
+
+        Query* qry = _CLNEW FuzzyQuery( _CLNEW Term( _T( "album" ), escapedName.toStdWString().c_str() ) );
+        Hits* hits = m_luceneSearcher->search( qry );
+        for ( uint i = 0; i < hits->length(); i++ )
+        {
+            Document* d = &hits->doc( i );
+
+            float score = hits->score( i );
+            int id = QString::fromWCharArray( d->get( _T( "albumid" ) ) ).toInt();
+
+            if ( score > 0.30 )
+            {
+                resultsmap.insert( id, score );
+//                tDebug() << "Index hit:" << id << score;
+            }
+        }
+
+        delete hits;
+        delete qry;
+    }
+    catch( CLuceneError& error )
+    {
+        tDebug() << "Caught CLucene error:" << error.what();
+
+        QTimer::singleShot( 0, this, SLOT( wipeIndex() ) );
+    }
+
+    return resultsmap;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/FuzzyIndex.h Added

@@ -0,0 +1,88 @@
+/* === 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
+ *   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 FUZZYINDEX_H
+#define FUZZYINDEX_H
+
+#include <QObject>
+#include <QMap>
+#include <QHash>
+#include <QString>
+#include <QMutex>
+
+#include "Query.h"
+
+namespace lucene
+{
+    namespace analysis
+    {
+      class SimpleAnalyzer;
+    }
+    namespace store
+    {
+      class Directory;
+    }
+    namespace index
+    {
+      class IndexReader;
+      class IndexWriter;
+    }
+    namespace search
+    {
+      class IndexSearcher;
+    }
+}
+
+class DatabaseImpl;
+
+class FuzzyIndex : public QObject
+{
+Q_OBJECT
+
+public:
+    explicit FuzzyIndex( QObject* parent, bool wipe = false );
+    ~FuzzyIndex();
+
+    void beginIndexing();
+    void endIndexing();
+    void appendFields( const QMap< unsigned int, QMap< QString, QString > >& trackData );
+
+signals:
+    void indexReady();
+
+public slots:
+    void loadLuceneIndex();
+
+    QMap< int, float > search( const Tomahawk::query_ptr& query );
+    QMap< int, float > searchAlbum( const Tomahawk::query_ptr& query );
+
+private slots:
+    void updateIndex();
+    bool wipeIndex();
+
+private:
+    QMutex m_mutex;
+    QString m_lucenePath;
+
+    lucene::analysis::SimpleAnalyzer* m_analyzer;
+    lucene::store::Directory* m_luceneDir;
+    lucene::index::IndexReader* m_luceneReader;
+    lucene::search::IndexSearcher* m_luceneSearcher;
+};
+
+#endif // FUZZYINDEX_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/LocalCollection.cpp Added

@@ -0,0 +1,71 @@
+/*
+    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
+
+
+    This program 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+#include "LocalCollection.h"
+
+#include "SourceList.h"
+#include <TomahawkSettings.h>
+#include "utils/Logger.h"
+
+#ifndef ENABLE_HEADLESS
+    #include "ViewManager.h"
+#endif
+
+
+LocalCollection::LocalCollection( const Tomahawk::source_ptr& source, QObject* parent )
+    : DatabaseCollection( source, parent )
+{
+
+}
+
+
+Tomahawk::playlist_ptr
+LocalCollection::bookmarksPlaylist()
+{
+    if( TomahawkSettings::instance()->bookmarkPlaylist().isEmpty() )
+        return Tomahawk::playlist_ptr();
+
+    return playlist( TomahawkSettings::instance()->bookmarkPlaylist() );
+}
+
+
+void
+LocalCollection::createBookmarksPlaylist()
+{
+    if( bookmarksPlaylist().isNull() ) {
+        QString guid = uuid();
+        Tomahawk::playlist_ptr p = Tomahawk::Playlist::create( SourceList::instance()->getLocal(), guid, tr( "Bookmarks" ), tr( "Saved tracks" ), QString(), false );
+
+#ifndef ENABLE_HEADLESS
+        ViewManager::instance()->createPageForPlaylist( p );
+//         connect( p.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( loaded( Tomahawk::PlaylistRevision ) ), Qt::QueuedConnection );
+        connect( p.data(), SIGNAL( created() ), this, SLOT( created() ) );
+#endif
+        TomahawkSettings::instance()->setBookmarkPlaylist( guid );
+//         p->createNewRevision( uuid(), p->currentrevision(), QList< Tomahawk::plentry_ptr >() );
+    }
+}
+
+
+void
+LocalCollection::created()
+{
+    emit bookmarkPlaylistCreated( bookmarksPlaylist() );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/LocalCollection.h Added

@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
+
+    This program 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+#ifndef LOCALCOLLECTION_H
+#define LOCALCOLLECTION_H
+
+#include "DatabaseCollection.h"
+#include "DllMacro.h"
+#include "Playlist.h"
+
+class DLLEXPORT LocalCollection : public DatabaseCollection
+{
+    Q_OBJECT
+public:
+    explicit LocalCollection( const Tomahawk::source_ptr& source, QObject* parent = 0 );
+
+    // gets the playlist used for storing stuff from the web, if it already exists. if the returned playlist
+    // is invalid ask to create and listen to the signal
+    Tomahawk::playlist_ptr bookmarksPlaylist();
+    void createBookmarksPlaylist();
+
+signals:
+    void bookmarkPlaylistCreated( const Tomahawk::playlist_ptr& p );
+
+private slots:
+    void created();
+
+};
+
+#endif // LOCALCOLLECTION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/Op.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/Schema.sql Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/Schema.sql.h Added

@@ -0,0 +1,202 @@
+/*
+    This file was automatically generated from ./Schema.sql on Fri Nov 18 14:00:37 CET 2011.
+*/
+
+static const char * tomahawk_schema_sql = 
+"CREATE TABLE IF NOT EXISTS oplog ("
+"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
+"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE, "
+"    guid TEXT NOT NULL,"
+"    command TEXT NOT NULL,"
+"    singleton BOOLEAN NOT NULL,"
+"    compressed BOOLEAN NOT NULL,"
+"    json TEXT NOT NULL"
+");"
+"CREATE UNIQUE INDEX oplog_guid ON oplog(guid);"
+"CREATE INDEX oplog_source ON oplog(source);"
+"CREATE TABLE IF NOT EXISTS artist ("
+"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
+"    name TEXT NOT NULL,"
+"    sortname TEXT NOT NULL"
+");"
+"CREATE UNIQUE INDEX artist_sortname ON artist(sortname);"
+"CREATE TABLE IF NOT EXISTS track ("
+"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
+"    artist INTEGER NOT NULL REFERENCES artist(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    name TEXT NOT NULL,"
+"    sortname TEXT NOT NULL"
+");"
+"CREATE UNIQUE INDEX track_artist_sortname ON track(artist,sortname);"
+"CREATE TABLE IF NOT EXISTS album ("
+"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
+"    artist INTEGER NOT NULL REFERENCES artist(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    name TEXT NOT NULL,"
+"    sortname TEXT NOT NULL"
+");"
+"CREATE UNIQUE INDEX album_artist_sortname ON album(artist,sortname);"
+"CREATE TABLE IF NOT EXISTS source ("
+"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
+"    name TEXT NOT NULL,"
+"    friendlyname TEXT,"
+"    lastop TEXT NOT NULL DEFAULT \"\",       "
+"    isonline BOOLEAN NOT NULL DEFAULT false"
+");"
+"CREATE UNIQUE INDEX source_name ON source(name);"
+"CREATE TABLE IF NOT EXISTS playlist ("
+"    guid TEXT PRIMARY KEY,"
+"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED, "
+"    shared BOOLEAN DEFAULT false,"
+"    title TEXT,"
+"    info TEXT,"
+"    creator TEXT,"
+"    lastmodified INTEGER NOT NULL DEFAULT 0,"
+"    currentrevision TEXT REFERENCES playlist_revision(guid) DEFERRABLE INITIALLY DEFERRED,"
+"    dynplaylist BOOLEAN DEFAULT false,"
+"    createdOn INTEGER NOT NULL DEFAULT 0"
+");"
+"CREATE TABLE IF NOT EXISTS playlist_item ("
+"    guid TEXT PRIMARY KEY,"
+"    playlist TEXT NOT NULL REFERENCES playlist(guid) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    trackname  TEXT NOT NULL,"
+"    artistname TEXT NOT NULL,"
+"    albumname  TEXT,"
+"    annotation TEXT,"
+"    duration INTEGER,       "
+"    addedon INTEGER NOT NULL DEFAULT 0,   "
+"    addedby INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED, "
+"    result_hint TEXT        "
+");"
+"CREATE INDEX playlist_item_playlist ON playlist_item(playlist);"
+"CREATE TABLE IF NOT EXISTS playlist_revision ("
+"    guid TEXT PRIMARY KEY,"
+"    playlist TEXT NOT NULL REFERENCES playlist(guid) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    entries TEXT, "
+"    author INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    timestamp INTEGER NOT NULL DEFAULT 0,"
+"    previous_revision TEXT REFERENCES playlist_revision(guid) DEFERRABLE INITIALLY DEFERRED"
+");"
+"CREATE TABLE IF NOT EXISTS dynamic_playlist ("
+"    guid TEXT NOT NULL REFERENCES playlist(guid) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    pltype TEXT, "
+"    plmode INTEGER, "
+"    autoload BOOLEAN DEFAULT true "
+");"
+"CREATE TABLE IF NOT EXISTS dynamic_playlist_controls ("
+"    id TEXT PRIMARY KEY,"
+"    playlist TEXT NOT NULL REFERENCES playlist(guid) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    selectedType TEXT,"
+"    match TEXT,"
+"    input TEXT"
+");"
+"CREATE TABLE IF NOT EXISTS dynamic_playlist_revision ("
+"    guid TEXT PRIMARY KEY NOT NULL REFERENCES playlist_revision(guid) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    controls TEXT, "
+"    plmode INTEGER,"
+"    pltype TEXT"
+");"
+"CREATE TABLE IF NOT EXISTS file ("
+"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
+"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    url TEXT NOT NULL,                   "
+"    size INTEGER NOT NULL,               "
+"    mtime INTEGER NOT NULL,              "
+"    md5 TEXT,                            "
+"    mimetype TEXT,                       "
+"    duration INTEGER NOT NULL DEFAULT 0, "
+"    bitrate INTEGER NOT NULL DEFAULT 0   "
+");"
+"CREATE UNIQUE INDEX file_url_src_uniq ON file(source, url);"
+"CREATE INDEX file_source ON file(source);"
+"CREATE TABLE IF NOT EXISTS dirs_scanned ("
+"    name TEXT PRIMARY KEY,"
+"    mtime INTEGER NOT NULL"
+");"
+"CREATE TABLE IF NOT EXISTS file_join ("
+"    file INTEGER PRIMARY KEY REFERENCES file(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    artist INTEGER NOT NULL REFERENCES artist(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    track INTEGER NOT NULL REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    album INTEGER REFERENCES album(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    albumpos INTEGER,"
+"    composer INTEGER REFERENCES artist(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    discnumber INTEGER"
+");"
+"CREATE INDEX file_join_track  ON file_join(track);"
+"CREATE INDEX file_join_artist ON file_join(artist);"
+"CREATE INDEX file_join_album  ON file_join(album);"
+"CREATE TABLE IF NOT EXISTS track_tags ("
+"    id INTEGER PRIMARY KEY,   "
+"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    tag TEXT NOT NULL,        "
+"    ns TEXT,                  "
+"    weight float DEFAULT 1.0  "
+");"
+"CREATE INDEX track_tags_tag ON track_tags(tag);"
+"CREATE TABLE IF NOT EXISTS album_tags ("
+"    id INTEGER PRIMARY KEY,   "
+"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    tag TEXT NOT NULL,        "
+"    ns TEXT,                  "
+"    weight float DEFAULT 1.0  "
+");"
+"CREATE INDEX album_tags_tag ON album_tags(tag);"
+"CREATE TABLE IF NOT EXISTS artist_tags ("
+"    id INTEGER PRIMARY KEY,   "
+"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    tag TEXT NOT NULL,        "
+"    ns TEXT,                  "
+"    weight float DEFAULT 1.0  "
+");"
+"CREATE INDEX artist_tags_tag ON artist_tags(tag);"
+"CREATE TABLE IF NOT EXISTS track_attributes ("
+"    id INTEGER REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,   "
+"    k TEXT NOT NULL,"
+"    v TEXT NOT NULL"
+");"
+"CREATE INDEX track_attrib_id ON track_attributes(id);"
+"CREATE INDEX track_attrib_k  ON track_attributes(k);"
+"CREATE TABLE IF NOT EXISTS collection_attributes ("
+"    id INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED, "
+"    k TEXT NOT NULL,"
+"    v TEXT NOT NULL"
+");"
+"CREATE TABLE IF NOT EXISTS social_attributes ("
+"    id INTEGER REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,   "
+"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE, "
+"    k TEXT NOT NULL,"
+"    v TEXT NOT NULL,"
+"    timestamp INTEGER NOT NULL DEFAULT 0"
+");"
+"CREATE INDEX social_attrib_id        ON social_attributes(id);"
+"CREATE INDEX social_attrib_source    ON social_attributes(source);"
+"CREATE INDEX social_attrib_k         ON social_attributes(k);"
+"CREATE INDEX social_attrib_timestamp ON social_attributes(timestamp);"
+"CREATE TABLE IF NOT EXISTS playback_log ("
+"    id INTEGER PRIMARY KEY AUTOINCREMENT,"
+"    source INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    track INTEGER REFERENCES track(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,"
+"    playtime INTEGER NOT NULL,              "
+"    secs_played INTEGER NOT NULL"
+");"
+"CREATE INDEX playback_log_source ON playback_log(source);"
+"CREATE INDEX playback_log_track ON playback_log(track);"
+"CREATE TABLE IF NOT EXISTS http_client_auth ("
+"    token TEXT NOT NULL PRIMARY KEY,"
+"    website TEXT NOT NULL,"
+"    name TEXT NOT NULL,"
+"    ua TEXT,"
+"    mtime INTEGER,"
+"    permissions TEXT NOT NULL"
+");"
+"CREATE TABLE IF NOT EXISTS settings ("
+"    k TEXT NOT NULL PRIMARY KEY,"
+"    v TEXT NOT NULL DEFAULT ''"
+");"
+"INSERT INTO settings(k,v) VALUES('schema_version', '28');"
+    ;
+
+const char * get_tomahawk_sql()
+{
+    return tomahawk_schema_sql;
+}
+
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/TomahawkSqlQuery.cpp Added

@@ -0,0 +1,163 @@
+/* === 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
+ *   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 "database/TomahawkSqlQuery.h"
+
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+#include <QSqlError>
+#include <QTime>
+#include <QThread>
+#include <QVariant>
+
+#define QUERY_THRESHOLD 60
+
+
+TomahawkSqlQuery::TomahawkSqlQuery()
+    : QSqlQuery()
+{
+}
+
+
+TomahawkSqlQuery::TomahawkSqlQuery( const QSqlDatabase& db )
+    : QSqlQuery( db )
+    , m_db( db )
+{
+}
+
+
+QString
+TomahawkSqlQuery::escape( QString identifier )
+{
+    return identifier.replace( "'", "''" );
+}
+
+
+bool
+TomahawkSqlQuery::prepare( const QString& query )
+{
+    m_query = query;
+    return QSqlQuery::prepare( query );
+}
+
+
+bool
+TomahawkSqlQuery::exec( const QString& query )
+{
+    bool prepareResult = prepare( query );
+    //tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Query preparation successful?" << ( prepareResult ? "true" : "false" );
+    return exec();
+}
+
+
+bool
+TomahawkSqlQuery::exec()
+{
+    bool log = false;
+#ifdef TOMAHAWK_QUERY_ANALYZE
+    log = true;
+#endif
+    if ( log )
+        tLog( LOGSQL ) << "TomahawkSqlQuery::exec running in thread " << QThread::currentThread();
+
+    QTime t;
+    t.start();
+
+    unsigned int retries = 0;
+    while ( !QSqlQuery::exec() && ++retries < 10 )
+    {
+        if ( lastError().text().toLower().contains( "no query" ) ||
+             lastError().text().toLower().contains( "parameter count mismatch" ) )
+        {
+            tDebug() << Q_FUNC_INFO << "Re-preparing query!";
+
+            QMap< QString, QVariant > bv = boundValues();
+            prepare( m_query );
+
+            foreach ( const QString& key, bv.keys() )
+            {
+                tDebug() << Q_FUNC_INFO << "Rebinding key" << key << "with value" << bv.value( key );
+                bindValue( key, bv.value( key ) );
+            }
+        }
+
+        if ( isBusyError( lastError() ) )
+            retries = 0;
+
+        tDebug() << "INFO: Retrying failed query:" << lastQuery() << lastError().text();
+        TomahawkUtils::msleep( 10 );
+    }
+
+    bool ret = ( retries < 10 );
+    if ( !ret )
+        showError();
+
+    int e = t.elapsed();
+    if ( log || e >= QUERY_THRESHOLD )
+        tLog( LOGSQL ) << "TomahawkSqlQuery::exec (" << t.elapsed() << "ms ):" << lastQuery();
+
+    return ret;
+}
+
+
+bool
+TomahawkSqlQuery::commitTransaction()
+{
+    bool log = false;
+#ifdef TOMAHAWK_QUERY_ANALYZE
+    log = true;
+#endif
+    if ( log )
+        tLog( LOGSQL ) << "TomahawkSqlQuery::commitTransaction running in thread " << QThread::currentThread();
+
+    unsigned int retries = 0;
+    while ( !m_db.commit() && ++retries < 10 )
+    {
+        if ( isBusyError( lastError() ) )
+            retries = 0;
+
+        tDebug() << "INFO: Retrying failed commit:" << retries << lastError().text();
+        TomahawkUtils::msleep( 10 );
+    }
+
+    return ( retries < 10 );
+}
+
+
+void
+TomahawkSqlQuery::showError()
+{
+    tLog() << endl << "*** DATABASE ERROR ***" << endl
+           << lastQuery() << endl
+           << "boundValues:" << boundValues() << endl
+           << lastError().text() << endl;
+
+    Q_ASSERT( false );
+}
+
+
+bool
+TomahawkSqlQuery::isBusyError( const QSqlError& error ) const
+{
+    const QString text = error.text().trimmed().toLower();
+
+    return ( text.contains( "locked" ) || text.contains( "busy" ) || text.isEmpty() );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/TomahawkSqlQuery.h Added

@@ -0,0 +1,53 @@
+/* === 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
+ *   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 TOMAHAWKSQLQUERY_H
+#define TOMAHAWKSQLQUERY_H
+
+// subclass QSqlQuery so that it prints the error msg if a query fails
+
+#include <QSqlDriver>
+#include <QSqlQuery>
+
+//#define TOMAHAWK_QUERY_ANALYZE 1
+
+class TomahawkSqlQuery : public QSqlQuery
+{
+
+public:
+    TomahawkSqlQuery();
+    TomahawkSqlQuery( const QSqlDatabase& db );
+
+    static QString escape( QString identifier );
+
+    bool prepare( const QString& query );
+    bool exec( const QString& query );
+    bool exec();
+
+    bool commitTransaction();
+
+private:
+    bool isBusyError( const QSqlError& error ) const;
+
+    void showError();
+
+    QSqlDatabase m_db;
+    QString m_query;
+};
+
+#endif // TOMAHAWKSQLQUERY_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/database/gen_schema.h.sh -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/database/gen_schema.h.sh Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/infobar/InfoBar.cpp Added

@@ -0,0 +1,357 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2012,      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 "InfoBar.h"
+#include "ui_InfoBar.h"
+
+#include <QLabel>
+#include <QPixmap>
+#include <QCheckBox>
+#include <QPaintEvent>
+#include <QPainter>
+
+#include "ViewManager.h"
+#include "thirdparty/Qocoa/qsearchfield.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "widgets/QueryLabel.h"
+#include "Source.h"
+
+#define ANIMATION_TIME 400
+#define IMAGE_HEIGHT 64
+
+using namespace Tomahawk;
+
+
+InfoBar::InfoBar( QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::InfoBar )
+    , m_queryLabel( 0 )
+{
+    ui->setupUi( this );
+    TomahawkUtils::unmarginLayout( layout() );
+    layout()->setContentsMargins( 8, 4, 8, 4 );
+
+    QFont boldFont = ui->captionLabel->font();
+    boldFont.setPixelSize( 18 );
+    boldFont.setBold( true );
+    ui->captionLabel->setFont( boldFont );
+    ui->captionLabel->setElideMode( Qt::ElideRight );
+
+    boldFont.setPixelSize( 12 );
+    boldFont.setBold( false );
+    ui->descriptionLabel->setFont( boldFont );
+
+    QFont regFont = ui->longDescriptionLabel->font();
+    regFont.setPixelSize( 11 );
+    ui->longDescriptionLabel->setFont( regFont );
+
+    m_whitePal = ui->captionLabel->palette();
+    m_whitePal.setColor( QPalette::Foreground, Qt::white );
+
+    ui->captionLabel->setPalette( m_whitePal );
+    ui->descriptionLabel->setPalette( m_whitePal );
+    ui->longDescriptionLabel->setPalette( m_whitePal );
+
+    ui->captionLabel->setMargin( 6 );
+    ui->descriptionLabel->setMargin( 6 );
+    ui->longDescriptionLabel->setMargin( 4 );
+
+    ui->captionLabel->setText( QString() );
+    ui->descriptionLabel->setText( QString() );
+    ui->longDescriptionLabel->setText( QString() );
+    ui->imageLabel->setText( QString() );
+
+    m_queryLabel = new QueryLabel( this );
+    m_queryLabel->setType( QueryLabel::Artist );
+    m_queryLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
+    m_queryLabel->setTextPen( palette().brightText().color() );
+    m_queryLabel->setFont( boldFont );
+    m_queryLabel->hide();
+    connect( m_queryLabel, SIGNAL( clickedArtist() ), this, SLOT( artistClicked() ) );
+
+    m_searchWidget = new QSearchField( this );
+    m_searchWidget->setPlaceholderText( tr( "Filter..." ) );
+    m_searchWidget->setMinimumWidth( 180 );
+    connect( m_searchWidget, SIGNAL( textChanged( QString ) ), this, SLOT( onFilterEdited() ) );
+
+    ui->horizontalLayout->addWidget( m_searchWidget );
+
+    setAutoFillBackground( true );
+
+    setMinimumHeight( geometry().height() );
+    setMaximumHeight( geometry().height() );
+
+    createTile();
+
+    connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ), SLOT( setFilterAvailable( bool ) ) );
+}
+
+
+InfoBar::~InfoBar()
+{
+    delete ui;
+}
+
+
+void
+InfoBar::setCaption( const QString& s )
+{
+    ui->captionLabel->setText( s );
+}
+
+
+void
+InfoBar::setDescription( const QString& s )
+{
+    if ( m_queryLabel->isVisible() )
+    {
+        ui->verticalLayout->removeWidget( m_queryLabel );
+        m_queryLabel->hide();
+
+        ui->verticalLayout->addWidget( ui->descriptionLabel );
+        ui->verticalLayout->setContentsMargins( 0, 0, 0, 0 );
+        ui->descriptionLabel->show();
+    }
+    ui->descriptionLabel->setText( s );
+}
+
+
+void
+InfoBar::setDescription( const artist_ptr& artist )
+{
+    m_queryLabel->setArtist( artist );
+    m_queryLabel->setExtraContentsMargins( 4, 0, 0, 0 );
+
+    if ( !m_queryLabel->isVisible() )
+    {
+        ui->verticalLayout->removeWidget( ui->descriptionLabel );
+        ui->descriptionLabel->hide();
+
+        m_queryLabel->show();
+        ui->verticalLayout->addWidget( m_queryLabel );
+        ui->verticalLayout->setContentsMargins( 0, 0, 0, 15 );
+    }
+
+}
+
+void
+InfoBar::setDescription( const album_ptr& )
+{
+    // TODO
+}
+
+
+void
+InfoBar::artistClicked()
+{
+    if ( m_queryLabel && !m_queryLabel->artist().isNull() )
+        ViewManager::instance()->show( m_queryLabel->artist() );
+}
+
+
+void
+InfoBar::setLongDescription( const QString& s )
+{
+    ui->longDescriptionLabel->setText( s );
+
+    if ( s.isEmpty() )
+    {
+        ui->horizontalLayout->setStretchFactor( ui->verticalLayout, 1 );
+        ui->horizontalLayout->setStretchFactor( ui->verticalLayout_2, 0 );
+    } else
+    {
+        ui->horizontalLayout->setStretchFactor( ui->verticalLayout, 0 );
+        ui->horizontalLayout->setStretchFactor( ui->verticalLayout_2, 99 );
+    }
+}
+
+
+void
+InfoBar::setPixmap( const QPixmap& p )
+{
+    ui->imageLabel->setPixmap( p.scaledToHeight( IMAGE_HEIGHT, Qt::SmoothTransformation ) );
+}
+
+
+void
+InfoBar::setFilter( const QString& filter )
+{
+    m_searchWidget->setText( filter );
+}
+
+
+void
+InfoBar::setFilterAvailable( bool b )
+{
+    m_searchWidget->setVisible( b );
+}
+
+
+void
+InfoBar::setUpdaters( const QList<PlaylistUpdaterInterface*>& updaters )
+{
+    QList< QWidget* > newUpdaterWidgets;
+    foreach ( PlaylistUpdaterInterface* updater, updaters )
+    {
+        if ( updater->configurationWidget() )
+            newUpdaterWidgets << updater->configurationWidget();
+    }
+
+    foreach ( QWidget* updaterWidget, m_updaterConfigurations )
+    {
+        updaterWidget->hide();
+
+        if ( !newUpdaterWidgets.contains( updaterWidget ) )
+        {
+            // Old config widget no longer present, remove it
+            ui->horizontalLayout->removeWidget( updaterWidget );
+        }
+    }
+
+    m_updaters = updaters;
+    m_updaterConfigurations = newUpdaterWidgets;
+
+    // Display each new widget in the proper place
+    int insertIdx = -1; // Ugh, no indexOf for QSpacerItem*
+    for ( int i = 0; i < ui->horizontalLayout->count(); i++ )
+    {
+        if ( ui->horizontalLayout->itemAt( i )->spacerItem() == ui->horizontalSpacer_4 )
+        {
+            insertIdx = i;
+            break;
+        }
+    }
+    insertIdx++;
+
+    foreach ( QWidget* updaterWidget, m_updaterConfigurations )
+    {
+        updaterWidget->setPalette( m_whitePal );
+        ui->horizontalLayout->insertWidget( insertIdx, updaterWidget );
+        updaterWidget->show();
+    }
+
+//     if ( m_updaterConfiguration )
+//         m_updaterConfiguration->hide();
+//
+//     if ( m_updaterConfiguration && ( interface ? (m_updaterConfiguration != interface->configurationWidget()) : true ) )
+//         ui->horizontalLayout->removeWidget( m_updaterConfiguration );
+//
+//     m_updaterInterface = interface;
+//     m_updaterConfiguration = interface ? interface->configurationWidget() : 0;
+//
+//     if ( !m_updaterInterface || !m_updaterConfiguration )
+//         return;
+//
+//     m_updaterConfiguration->setPalette( m_whitePal );
+//     int insertIdx = -1; // Ugh, no indexOf for QSpacerItem*
+//     for ( int i = 0; i < ui->horizontalLayout->count(); i++ )
+//     {
+//         if ( ui->horizontalLayout->itemAt( i )->spacerItem() == ui->horizontalSpacer_4 )
+//         {
+//             insertIdx = i;
+//             break;
+//         }
+//     }
+//     insertIdx++;
+//     ui->horizontalLayout->insertWidget( insertIdx, m_updaterConfiguration );
+//
+//     m_updaterConfiguration->show();
+}
+
+
+void
+InfoBar::onFilterEdited()
+{
+    emit filterTextChanged( m_searchWidget->text() );
+}
+
+
+void
+InfoBar::createTile( int w )
+{
+    QImage tile = QImage( RESPATH "images/playlist-header-tiled.png" );
+
+    if ( tile.isNull() )
+        return;
+
+    if ( tile.height() < height() )
+    {
+        // image must be at least as tall as we are
+        QImage taller( tile.width(), height(), QImage::Format_ARGB32_Premultiplied );
+        QPainter p( &taller );
+        int curY = 0;
+        while ( curY < taller.height() )
+        {
+            const int thisHeight = (curY + tile.height() > height()) ? height() - curY : tile.height();
+            p.drawImage( QRect( 0, curY, tile.width(), thisHeight ), tile, QRect( 0, 0, tile.width(), thisHeight ) );
+            curY += tile.height();
+        }
+        tile = taller;
+    }
+
+    m_bgTile = QPixmap( w, height() );
+    m_bgTile.fill( Qt::transparent );
+
+    int curWidth = 0;
+    QPainter p( &m_bgTile );
+    while ( curWidth < w )
+    {
+        const int thisWidth = (curWidth + tile.width() > w) ? w - curWidth : tile.width();
+
+        const QRect source( 0, 0, thisWidth, m_bgTile.height() );
+        const QRect dest( curWidth, 0, thisWidth, m_bgTile.height() );
+        p.drawImage( dest, tile, source );
+        curWidth += thisWidth;
+    }
+}
+
+
+void
+InfoBar::paintEvent( QPaintEvent* e )
+{
+    Q_UNUSED( e );
+
+    if ( m_bgTile.isNull() || width() > m_bgTile.width() )
+        createTile( width() );
+
+    if ( m_bgTile.isNull() )
+        return;
+
+    QPainter p( this );
+
+    // Truncate bg pixmap and paint into bg
+    p.drawPixmap( rect(), m_bgTile, rect() );
+}
+
+
+void
+InfoBar::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+//            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/infobar/InfoBar.h Added

@@ -0,0 +1,93 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2012,      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 INFOBAR_H
+#define INFOBAR_H
+
+#include <QWidget>
+
+#include "DllMacro.h"
+#include "Artist.h"
+
+class QueryLabel;
+class QCheckBox;
+class QTimeLine;
+class QSearchField;
+class ContextWidget;
+
+namespace Ui
+{
+    class InfoBar;
+}
+
+namespace Tomahawk
+{
+class PlaylistUpdaterInterface;
+}
+
+class DLLEXPORT InfoBar : public QWidget
+{
+Q_OBJECT
+
+public:
+    InfoBar( QWidget* parent = 0 );
+    ~InfoBar();
+
+public slots:
+    void setCaption( const QString& s );
+
+    void setDescription( const QString& s );
+    // If you want a querylabel instead of an ElidedLabel
+    void setDescription( const Tomahawk::artist_ptr& artist );
+    void setDescription( const Tomahawk::album_ptr& album_ptr );
+
+    void setLongDescription( const QString& s );
+    void setPixmap( const QPixmap& p );
+
+    void setFilter( const QString& filter );
+    void setFilterAvailable( bool b );
+
+    void setUpdaters( const QList<Tomahawk::PlaylistUpdaterInterface*>& updaters );
+signals:
+    void filterTextChanged( const QString& filter );
+
+protected:
+    void changeEvent( QEvent* e );
+    void paintEvent( QPaintEvent* e );
+
+private slots:
+    void onFilterEdited();
+    void artistClicked();
+
+private:
+    void createTile( int width = 2000 );
+
+    Ui::InfoBar* ui;
+
+    QPixmap m_bgTile;
+    QPalette m_whitePal;
+
+    QList<Tomahawk::PlaylistUpdaterInterface*> m_updaters;;
+    QList<QWidget*> m_updaterConfigurations;
+
+    QSearchField* m_searchWidget;
+    QueryLabel* m_queryLabel;
+};
+
+#endif // INFOBAR_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/infobar/InfoBar.ui Added

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>InfoBar</class>
+ <widget class="QWidget" name="InfoBar">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>774</width>
+    <height>80</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>72</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>InfoBar</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetDefaultConstraint</enum>
+     </property>
+     <item>
+      <widget class="QLabel" name="imageLabel">
+       <property name="minimumSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetDefaultConstraint</enum>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="ElidedLabel" name="captionLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="ElidedLabel" name="descriptionLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetMaximumSize</enum>
+       </property>
+       <item>
+        <widget class="ElidedLabel" name="longDescriptionLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>62</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>62</height>
+          </size>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>1</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>widgets/ElidedLabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/libtomahawk/infosystem/InfoSystem.cpp Added

@@ -0,0 +1,370 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2012       Leo Franchi            <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 <QCoreApplication>
+
+#include "InfoSystem.h"
+#include "TomahawkSettings.h"
+#include "InfoSystemCache.h"
+#include "InfoSystemWorker.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+static const int DEFAULT_TIMEOUT_MILLIS = 10000;
+
+InfoRequestData::InfoRequestData()
+    : requestId( TomahawkUtils::infosystemRequestId() )
+{
+    init( QString() , Tomahawk::InfoSystem::InfoNoInfo, QVariant(), QVariantMap() );
+}
+
+
+InfoRequestData::InfoRequestData( const quint64 rId, const QString& callr, const InfoType typ, const QVariant& inputvar, const QVariantMap& custom )
+    : requestId( rId )
+{
+    init( callr, typ, inputvar, custom );
+}
+
+
+void
+InfoRequestData::init( const QString& callr, const InfoType typ, const QVariant& inputvar, const QVariantMap& custom )
+{
+    internalId = TomahawkUtils::infosystemRequestId();
+    caller = callr;
+    type = typ;
+    input = inputvar;
+    customData = custom;
+    timeoutMillis = DEFAULT_TIMEOUT_MILLIS;
+    allSources = false;
+}
+
+
+InfoPlugin::InfoPlugin()
+    : QObject()
+{
+}
+
+InfoPlugin::~InfoPlugin()
+{
+}
+
+InfoSystem* InfoSystem::s_instance = 0;
+
+InfoSystem*
+InfoSystem::instance()
+{
+    if ( !s_instance )
+        s_instance = new InfoSystem( 0 );
+
+    return s_instance;
+}
+
+
+InfoSystem::InfoSystem( QObject *parent )
+    : QObject( parent )
+    , m_inited( false )
+    , m_infoSystemCacheThreadController( 0 )
+    , m_infoSystemWorkerThreadController( 0 )
+{
+    s_instance = this;
+
+    qDebug() << Q_FUNC_INFO;
+
+    m_infoSystemCacheThreadController = new InfoSystemCacheThread( this );
+    m_infoSystemCacheThreadController->start( QThread::IdlePriority );
+
+    m_infoSystemWorkerThreadController = new InfoSystemWorkerThread( this );
+    m_infoSystemWorkerThreadController->start();
+
+    QTimer::singleShot( 0, this, SLOT( init() ) );
+}
+
+
+InfoSystem::~InfoSystem()
+{
+    tDebug() << Q_FUNC_INFO << " beginning";
+
+    if ( m_infoSystemWorkerThreadController->worker() )
+    {
+        m_infoSystemWorkerThreadController->quit();
+        m_infoSystemWorkerThreadController->wait( 60000 );
+
+        delete m_infoSystemWorkerThreadController;
+        m_infoSystemWorkerThreadController = 0;
+    }
+    tDebug() << Q_FUNC_INFO << " done deleting worker";
+
+    if( m_infoSystemCacheThreadController->cache() )
+    {
+        m_infoSystemCacheThreadController->quit();
+        m_infoSystemCacheThreadController->wait( 60000 );
+
+        delete m_infoSystemCacheThreadController;
+        m_infoSystemCacheThreadController = 0;
+    }
+
+    tDebug() << Q_FUNC_INFO << " done deleting cache";
+}
+
+
+void
+InfoSystem::init()
+{
+    tDebug() << Q_FUNC_INFO;
+    if ( m_inited )
+        return;
+
+    if ( !m_infoSystemCacheThreadController->cache() || !m_infoSystemWorkerThreadController->worker() )
+    {
+        QTimer::singleShot( 0, this, SLOT( init() ) );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoSystemCache* cache = m_infoSystemCacheThreadController->cache();
+    Tomahawk::InfoSystem::InfoSystemWorker* worker = m_infoSystemWorkerThreadController->worker();
+
+    connect( cache, SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+             worker, SLOT( infoSlot( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
+
+    connect( worker, SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+             this,       SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ), Qt::UniqueConnection );
+
+    connect( worker, SIGNAL( finished( QString ) ), this, SIGNAL( finished( QString ) ), Qt::UniqueConnection );
+
+    connect( worker, SIGNAL( finished( QString, Tomahawk::InfoSystem::InfoType ) ),
+             this, SIGNAL( finished( QString, Tomahawk::InfoSystem::InfoType ) ), Qt::UniqueConnection );
+
+    QMetaObject::invokeMethod( worker, "init", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoSystemCache*, cache ) );
+
+    m_inited = true;
+}
+
+
+bool
+InfoSystem::getInfo( const InfoRequestData &requestData )
+{
+    //qDebug() << Q_FUNC_INFO;
+    if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
+    {
+        init();
+        return false;
+    }
+    QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "getInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoRequestData, requestData ) );
+    return true;
+}
+
+
+bool
+InfoSystem::getInfo( const QString &caller, const QVariantMap &customData, const InfoTypeMap &inputMap, const InfoTimeoutMap &timeoutMap, bool allSources )
+{
+    if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
+    {
+        init();
+        return false;
+    }
+    InfoRequestData requestData;
+    requestData.caller = caller;
+    requestData.customData = customData;
+    requestData.allSources = allSources;
+    Q_FOREACH( InfoType type, inputMap.keys() )
+    {
+        requestData.type = type;
+        requestData.input = inputMap type ;
+        requestData.timeoutMillis = timeoutMap.contains( type ) ? timeoutMap type  : DEFAULT_TIMEOUT_MILLIS;
+        QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "getInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoRequestData, requestData ) );
+    }
+    return false;
+}
+
+
+bool
+InfoSystem::pushInfo( InfoPushData pushData )
+{
+    tDebug() << Q_FUNC_INFO << "type is " << pushData.type;
+    if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
+    {
+        init();
+        return false;
+    }
+
+    PushInfoPair pushInfoPair( QVariantMap(), pushData.input );
+    pushData.infoPair = pushInfoPair;
+    QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "pushInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPushData, pushData ) );
+
+    return true;
+}
+
+
+bool
+InfoSystem::pushInfo( const QString &caller, const InfoTypeMap &input, const PushInfoFlags pushFlags )
+{
+    if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
+    {
+        init();
+        return false;
+    }
+
+    Q_FOREACH( InfoType type, input.keys() )
+    {
+        InfoPushData pushData( caller, type, input type , pushFlags );
+        pushData.infoPair = PushInfoPair( QVariantMap(), pushData.input );
+        QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "pushInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPushData, pushData ) );
+    }
+
+    return true;
+}
+
+
+void
+InfoSystem::addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
+{
+    // Init is not complete (waiting for worker thread to start and create worker object) so keep trying till then
+    if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
+    {
+        QMetaObject::invokeMethod( this, "addInfoPlugin", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPluginPtr, plugin ) );
+        return;
+    }
+
+    if ( plugin.isNull() )
+    {
+        tDebug() << Q_FUNC_INFO << "Given plugin is null!";
+        return;
+    }
+
+    if ( plugin.data()->thread() != m_infoSystemWorkerThreadController->worker()->thread() )
+    {
+        Q_ASSERT( false );
+        tDebug() << Q_FUNC_INFO << "The object must be moved to the worker thread first, see InfoSystem::workerThread()";
+        return;
+    }
+
+    tDebug() << Q_FUNC_INFO << plugin.data();
+    QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "addInfoPlugin", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPluginPtr, plugin ) );
+}
+
+
+void
+InfoSystem::removeInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
+{
+    // Init is not complete (waiting for worker th read to start and create worker object) so keep trying till then
+    if ( !m_inited || !m_infoSystemWorkerThreadController->worker() )
+    {
+        QMetaObject::invokeMethod( this, "removeInfoPlugin", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPluginPtr, plugin ) );
+        return;
+    }
+
+    if ( plugin.isNull() )
+    {
+        tDebug() << Q_FUNC_INFO << "Given plugin is null!";
+        return;
+    }
+
+    if ( plugin.data()->thread() != m_infoSystemWorkerThreadController->worker()->thread() )
+    {
+        tDebug() << Q_FUNC_INFO << "The object must be moved to the worker thread first, see InfoSystem::workerThread()";
+        return;
+    }
+
+    tDebug() << Q_FUNC_INFO << plugin.data();
+    QMetaObject::invokeMethod( m_infoSystemWorkerThreadController->worker(), "removeInfoPlugin", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPluginPtr, plugin ) );
+}
+
+
+QWeakPointer< QThread >
+InfoSystem::workerThread() const
+{
+    if ( m_infoSystemWorkerThreadController->isRunning() && m_infoSystemWorkerThreadController->worker() )
+        return QWeakPointer< QThread >( m_infoSystemWorkerThreadController->worker()->thread() );
+
+    return QWeakPointer< QThread >();
+}
+
+
+InfoSystemCacheThread::InfoSystemCacheThread( QObject *parent )
+    : QThread( parent )
+{
+    tDebug() << Q_FUNC_INFO;
+}
+
+
+InfoSystemCacheThread::~InfoSystemCacheThread()
+{
+    tDebug() << Q_FUNC_INFO;
+}
+
+
+void
+InfoSystemCacheThread::InfoSystemCacheThread::run()
+{
+    m_cache = QWeakPointer< InfoSystemCache >( new InfoSystemCache() );
+    exec();
+    if ( !m_cache.isNull() )
+        delete m_cache.data();
+}
+
+
+InfoSystemCache*
+InfoSystemCacheThread::cache() const
+{
+    if ( m_cache.isNull() )
+        return 0;
+    return m_cache.data();
+}
+
+
+InfoSystemWorkerThread::InfoSystemWorkerThread( QObject *parent )
+    : QThread( parent )
+{
+    tDebug() << Q_FUNC_INFO;
+}
+
+InfoSystemWorkerThread::~InfoSystemWorkerThread()
+{
+    tDebug() << Q_FUNC_INFO;
+}
+
+void
+InfoSystemWorkerThread::InfoSystemWorkerThread::run()
+{
+    m_worker = QWeakPointer< InfoSystemWorker >( new InfoSystemWorker() );
+    exec();
+    if( !m_worker.isNull() )
+        delete m_worker.data();
+}
+
+InfoSystemWorker*
+InfoSystemWorkerThread::worker() const
+{
+    if ( m_worker.isNull() )
+        return 0;
+    return m_worker.data();
+}
+
+
+} //namespace InfoSystem
+
+} //namespace Tomahawk

tomahawk-0.5.5.tar.bz2/src/libtomahawk/infosystem/InfoSystem.h Added

@@ -0,0 +1,254 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWK_INFOSYSTEM_H
+#define TOMAHAWK_INFOSYSTEM_H
+
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QObject>
+#include <QtCore/QtDebug>
+#include <QtCore/QMap>
+#include <QtCore/QWeakPointer>
+#include <QtCore/QSet>
+#include <QtCore/QLinkedList>
+#include <QtCore/QUrl>
+#include <QtCore/QVariant>
+#include <QtCore/QThread>
+#include <QtCore/QStringList>
+
+#include "DllMacro.h"
+#include "utils/TomahawkUtils.h"
+#include "Typedefs.h"
+
+class QNetworkAccessManager;
+
+namespace Tomahawk {
+
+namespace InfoSystem {
+
+class InfoSystemCache;
+class InfoSystemWorker;
+
+enum PushInfoFlags { // must be powers of 2
+    PushNoFlag = 1,
+    PushShortUrlFlag = 2
+};
+
+
+struct DLLEXPORT InfoRequestData {
+    quint64 requestId;
+    quint64 internalId; //do not assign to this; it may get overwritten by the InfoSystem
+    QString caller;
+    Tomahawk::InfoSystem::InfoType type;
+    QVariant input;
+    QVariantMap customData;
+    uint timeoutMillis;
+    bool allSources;
+
+    InfoRequestData();
+
+    InfoRequestData( const quint64 rId, const QString &callr, const Tomahawk::InfoSystem::InfoType typ, const QVariant &inputvar, const QVariantMap &custom );
+
+private:
+    void init( const QString& callr, const InfoType typ, const QVariant& inputvar, const QVariantMap& custom);
+};
+
+
+struct InfoPushData {
+    QString caller;
+    InfoType type;
+    QVariant input;
+    PushInfoFlags pushFlags;
+    PushInfoPair infoPair;
+
+    InfoPushData()
+        : caller( QString() )
+        , type( Tomahawk::InfoSystem::InfoNoInfo )
+        , input( QVariant() )
+        , pushFlags( Tomahawk::InfoSystem::PushNoFlag )
+        , infoPair( Tomahawk::InfoSystem::PushInfoPair( QVariantMap(), QVariant() ) )
+        {}
+
+    InfoPushData( const QString &callr, const Tomahawk::InfoSystem::InfoType typ, const QVariant &inputvar, const Tomahawk::InfoSystem::PushInfoFlags pflags )
+        : caller( callr )
+        , type( typ )
+        , input( inputvar )
+        , pushFlags( pflags )
+        , infoPair( Tomahawk::InfoSystem::PushInfoPair( QVariantMap(), QVariant() ) )
+        {}
+
+};
+
+
+class DLLEXPORT InfoPlugin : public QObject
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @brief Creates the plugin. Do *not* perform any network-based setup tasks here; defer that to init(), which will be called automatically.
+     *
+     **/
+    InfoPlugin();
+
+    virtual ~InfoPlugin();
+
+    QSet< InfoType > supportedGetTypes() const { return m_supportedGetTypes; }
+    QSet< InfoType > supportedPushTypes() const { return m_supportedPushTypes; }
+
+signals:
+    void getCachedInfo( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 newMaxAge, Tomahawk::InfoSystem::InfoRequestData requestData );
+    void info( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+
+    void updateCache( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 maxAge, Tomahawk::InfoSystem::InfoType type, QVariant output );
+
+protected slots:
+    
+    /**
+     * @brief Called after the plugin has been moved to the appropriate thread. Do network-based setup tasks here.
+     *
+     * @return void
+     **/
+    virtual void init() = 0;
+    
+    virtual void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData ) = 0;
+    virtual void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData ) = 0;
+    virtual void notInCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData ) = 0;
+
+protected:
+    InfoType m_type;
+    QSet< InfoType > m_supportedGetTypes;
+    QSet< InfoType > m_supportedPushTypes;
+
+private:
+    friend class InfoSystem;
+};
+
+
+class InfoSystemCacheThread : public QThread
+{
+    Q_OBJECT
+
+public:
+    InfoSystemCacheThread( QObject *parent );
+    virtual ~InfoSystemCacheThread();
+
+    void run();
+    InfoSystemCache* cache() const;
+
+private:
+    QWeakPointer< InfoSystemCache > m_cache;
+};
+
+
+class InfoSystemWorkerThread : public QThread
+{
+    Q_OBJECT
+
+public:
+    InfoSystemWorkerThread( QObject *parent );
+    virtual ~InfoSystemWorkerThread();
+
+    void run();
+    InfoSystemWorker* worker() const;
+
+private:
+    QWeakPointer< InfoSystemWorker > m_worker;
+};
+
+
+class DLLEXPORT InfoSystem : public QObject
+{
+    Q_OBJECT
+
+public:
+    static InfoSystem* instance();
+
+    InfoSystem( QObject *parent );
+    ~InfoSystem();
+
+    bool getInfo( const InfoRequestData &requestData );
+    //WARNING: if changing timeoutMillis above, also change in below function in .cpp file
+    bool getInfo( const QString &caller, const QVariantMap &customData, const InfoTypeMap &inputMap, const InfoTimeoutMap &timeoutMap = InfoTimeoutMap(), bool allSources = false );
+    bool pushInfo( InfoPushData pushData );
+    bool pushInfo( const QString &caller, const InfoTypeMap &input, const PushInfoFlags pushFlags );
+
+    QWeakPointer< QThread > workerThread() const;
+
+public slots:
+    // InfoSystem takes ownership of InfoPlugins
+    void addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin );
+    void removeInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin );
+
+signals:
+    void info( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void finished( QString target );
+    void finished( QString target, Tomahawk::InfoSystem::InfoType type );
+
+private slots:
+    void init();
+
+private:
+    bool m_inited;
+    InfoSystemCacheThread* m_infoSystemCacheThreadController;
+    InfoSystemWorkerThread* m_infoSystemWorkerThreadController;
+
+    static InfoSystem* s_instance;
+};
+
+}
+
+}
+
+
+inline uint qHash( Tomahawk::InfoSystem::InfoStringHash hash )
+{
+    QCryptographicHash md5( QCryptographicHash::Md5 );
+    QStringList keys = hash.keys();
+    keys.sort();
+    foreach( QString key, keys )
+    {
+        md5.addData( key.toUtf8() );
+        md5.addData( hashkey.toUtf8() );
+    }
+
+    QString hexData = md5.result();
+
+    uint returnval = 0;
+
+    foreach( uint val, hexData.toUcs4() )
+        returnval += val;
+
+    return returnval;
+}
+
+Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoRequestData );
+Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoPushData );
+Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoStringHash );
+Q_DECLARE_METATYPE( Tomahawk::InfoSystem::PushInfoPair );
+Q_DECLARE_METATYPE( Tomahawk::InfoSystem::PushInfoFlags );
+Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoType );
+Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoSystemCache* );
+Q_DECLARE_METATYPE( QList< Tomahawk::InfoSystem::InfoStringHash > );
+Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoPluginPtr );
+Q_DECLARE_METATYPE( Tomahawk::InfoSystem::InfoPlugin* );
+
+Q_DECLARE_INTERFACE( Tomahawk::InfoSystem::InfoPlugin, "tomahawk.InfoPlugin/1.0" )
+
+#endif // TOMAHAWK_INFOSYSTEM_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/infosystem/InfoSystemCache.cpp Added

@@ -0,0 +1,323 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 <QtDebug>
+
+
+#ifndef ENABLE_HEADLESS
+    #include <QDesktopServices>
+#endif
+
+#include "InfoSystemCache.h"
+#include "TomahawkSettings.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+#include <QDir>
+#include <QSettings>
+#include <QCryptographicHash>
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+
+InfoSystemCache::InfoSystemCache( QObject* parent )
+    : QObject( parent )
+    , m_cacheBaseDir( TomahawkSettings::instance()->storageCacheLocation() + "/InfoSystemCache/" )
+    , m_cacheVersion( 3 )
+{
+    tDebug() << Q_FUNC_INFO;
+    TomahawkSettings *s = TomahawkSettings::instance();
+    if ( s->infoSystemCacheVersion() != m_cacheVersion )
+    {
+        tLog() << "Cache version outdated, old:" << s->infoSystemCacheVersion()
+               << "new:" << m_cacheVersion
+               << "Doing upgrade, if any...";
+
+        uint current = s->infoSystemCacheVersion();
+        while( current < m_cacheVersion )
+        {
+            doUpgrade( current, current + 1 );
+            current++;
+        }
+        s->setInfoSystemCacheVersion( m_cacheVersion );
+    }
+
+    m_pruneTimer.setInterval( 300000 );
+    m_pruneTimer.setSingleShot( false );
+    connect( &m_pruneTimer, SIGNAL( timeout() ), SLOT( pruneTimerFired() ) );
+    m_pruneTimer.start();
+}
+
+
+InfoSystemCache::~InfoSystemCache()
+{
+    tDebug() << Q_FUNC_INFO;
+}
+
+
+void
+InfoSystemCache::performWipe( QString directory )
+{
+    QDir dir;
+    for ( int i = InfoNoInfo; i <= InfoLastInfo; i++ )
+    {
+        InfoType type = (InfoType)(i);
+        const QString cacheDirName = directory + QString::number( (int)type );
+        QFileInfoList fileList = QDir( cacheDirName ).entryInfoList( QDir::Files | QDir::NoDotAndDotDot );
+        foreach ( QFileInfo file, fileList )
+        {
+            if ( !QFile::remove( file.canonicalFilePath() ) )
+                tLog() << "During upgrade, failed to remove cache file " << file.canonicalFilePath();
+        }
+        dir.rmdir( cacheDirName );
+    }
+    dir.rmdir( directory );
+}
+
+
+void
+InfoSystemCache::doUpgrade( uint oldVersion, uint newVersion )
+{
+    Q_UNUSED( newVersion );
+    qDebug() << Q_FUNC_INFO;
+    if ( oldVersion == 0 || oldVersion == 1  )
+    {
+        qDebug() << Q_FUNC_INFO << "Wiping cache";
+
+        performWipe( m_cacheBaseDir );
+    }
+
+    if ( oldVersion == 2 )
+    {
+        qDebug() << Q_FUNC_INFO << "Wiping cache";
+
+        performWipe( m_cacheBaseDir );
+
+        performWipe( m_cacheBaseDir + "/InfoSystemCache/" );
+    }
+}
+
+
+void
+InfoSystemCache::pruneTimerFired()
+{
+    qDebug() << Q_FUNC_INFO << "Pruning infosystemcache";
+    qlonglong currentMSecsSinceEpoch = QDateTime::currentMSecsSinceEpoch();
+
+    for ( int i = InfoNoInfo; i <= InfoLastInfo; i++ )
+    {
+        InfoType type = (InfoType)(i);
+        QHash< QString, QString > fileLocationHash = m_fileLocationCachetype;
+        const QString cacheDirName = m_cacheBaseDir + QString::number( (int)type );
+        QFileInfoList fileList = QDir( cacheDirName ).entryInfoList( QDir::Files | QDir::NoDotAndDotDot );
+        foreach ( QFileInfo file, fileList )
+        {
+            QString baseName = file.baseName();
+            if ( file.suffix().toLongLong() < currentMSecsSinceEpoch )
+            {
+                if ( !QFile::remove( file.canonicalFilePath() ) )
+                    tLog() << "Failed to remove stale cache file" << file.canonicalFilePath();
+                else
+                    qDebug() << "Removed stale cache file" << file.canonicalFilePath();
+            }
+            if ( fileLocationHash.contains( baseName ) )
+                fileLocationHash.remove( baseName );
+        }
+        m_fileLocationCachetype = fileLocationHash;
+    }
+}
+
+
+void
+InfoSystemCache::getCachedInfoSlot( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 newMaxAge, Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    QObject* sendingObj = sender();
+    const QString criteriaHashVal = criteriaMd5( criteria );
+    const QString criteriaHashValWithType = criteriaMd5( criteria, requestData.type );
+    QHash< QString, QString > fileLocationHash = m_fileLocationCache requestData.type ;
+    if ( !fileLocationHash.contains( criteriaHashVal ) )
+    {
+        if ( !fileLocationHash.isEmpty() )
+        {
+            //We already know of some values, so no need to re-read the directory again as it's already happened
+            //qDebug() << Q_FUNC_INFO << "notInCache -- filelocationhash empty";
+            notInCache( sendingObj, criteria, requestData );
+            return;
+        }
+
+        const QString cacheDir = m_cacheBaseDir + QString::number( (int)requestData.type );
+        QDir dir( cacheDir );
+        if ( !dir.exists() )
+        {
+            //Dir doesn't exist so clearly not in cache
+            //qDebug() << Q_FUNC_INFO << "notInCache -- dir doesn't exist";
+            notInCache( sendingObj, criteria, requestData );
+            return;
+        }
+
+        QFileInfoList fileList = dir.entryInfoList( QDir::Files | QDir::NoDotAndDotDot );
+        foreach ( QFileInfo file, fileList )
+        {
+            QString baseName = file.baseName();
+            fileLocationHash baseName  = file.canonicalFilePath();
+        }
+
+        //Store what we've loaded up
+        m_fileLocationCache requestData.type  = fileLocationHash;
+        if ( !fileLocationHash.contains( criteriaHashVal ) )
+        {
+            //Still didn't find it? It's really not in the cache then
+            //qDebug() << Q_FUNC_INFO << "notInCache -- filelocationhash doesn't contain criteria val";
+            notInCache( sendingObj, criteria, requestData );
+            return;
+        }
+    }
+
+    QFileInfo file( fileLocationHash criteriaHashVal  );
+    qlonglong currMaxAge = file.suffix().toLongLong();
+
+    if ( currMaxAge < QDateTime::currentMSecsSinceEpoch() )
+    {
+        if ( !QFile::remove( file.canonicalFilePath() ) )
+            tLog() << "Failed to remove stale cache file" << file.canonicalFilePath();
+        else
+            qDebug() << "Removed stale cache file" << file.canonicalFilePath();
+
+        fileLocationHash.remove( criteriaHashVal );
+        m_fileLocationCache requestData.type  = fileLocationHash;
+        m_dataCache.remove( criteriaHashValWithType );
+
+        qDebug() << Q_FUNC_INFO << "notInCache -- file was stale";
+        notInCache( sendingObj, criteria, requestData );
+        return;
+    }
+    else if ( newMaxAge > 0 )
+    {
+        const QString newFilePath = QString( file.dir().canonicalPath() + '/' + criteriaHashVal + '.' + QString::number( QDateTime::currentMSecsSinceEpoch() + newMaxAge ) );
+
+        if ( !QFile::rename( file.canonicalFilePath(), newFilePath ) )
+        {
+            qDebug() << Q_FUNC_INFO << "notInCache -- failed to move old cache file to new location";
+            notInCache( sendingObj, criteria, requestData );
+            return;
+        }
+
+        fileLocationHash criteriaHashVal  = newFilePath;
+        m_fileLocationCache requestData.type  = fileLocationHash;
+    }
+
+    if ( !m_dataCache.contains( criteriaHashValWithType ) )
+    {
+        QSettings cachedSettings( fileLocationHash criteriaHashVal , QSettings::IniFormat );
+        QVariant output = cachedSettings.value( "data" );
+        m_dataCache.insert( criteriaHashValWithType, new QVariant( output ) );
+
+        emit info( requestData, output );
+    }
+    else
+    {
+        emit info( requestData, QVariant( *( m_dataCache criteriaHashValWithType  ) ) );
+    }
+}
+
+
+void
+InfoSystemCache::notInCache( QObject *receiver, Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    QMetaObject::invokeMethod( receiver, "notInCacheSlot", Q_ARG( Tomahawk::InfoSystem::InfoStringHash, criteria ), Q_ARG( Tomahawk::InfoSystem::InfoRequestData, requestData ) );
+}
+
+
+void
+InfoSystemCache::updateCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 maxAge, Tomahawk::InfoSystem::InfoType type, QVariant output )
+{
+    //qDebug() << Q_FUNC_INFO;
+    const QString criteriaHashVal = criteriaMd5( criteria );
+    const QString criteriaHashValWithType = criteriaMd5( criteria, type );
+    const QString cacheDir = m_cacheBaseDir + QString::number( (int)type );
+    const QString settingsFilePath( cacheDir + '/' + criteriaHashVal + '.' + QString::number( QDateTime::currentMSecsSinceEpoch() + maxAge ) );
+
+    QHash< QString, QString > fileLocationHash = m_fileLocationCache type ;
+    if ( fileLocationHash.contains( criteriaHashVal ) )
+    {
+        if ( !QFile::rename( fileLocationHash criteriaHashVal , settingsFilePath ) )
+        {
+            tLog() << "Failed to move old cache file to new location!";
+            return;
+        }
+        fileLocationHash criteriaHashVal  = settingsFilePath;
+        m_fileLocationCache type  = fileLocationHash;
+
+        QSettings cachedSettings( fileLocationHash criteriaHashVal , QSettings::IniFormat );
+        cachedSettings.setValue( "data", output );
+
+        m_dataCache.insert( criteriaHashValWithType, new QVariant( output ) );
+
+        return;
+    }
+
+    QDir dir( cacheDir );
+    if( !dir.exists( cacheDir ) )
+    {
+        qDebug() << "Creating cache directory " << cacheDir;
+        if( !dir.mkpath( cacheDir ) )
+        {
+            tLog() << "Failed to create cache dir! Bailing...";
+            return;
+        }
+    }
+
+    QSettings cachedSettings( settingsFilePath, QSettings::IniFormat );
+    QStringList keys = criteria.keys();
+    cachedSettings.beginGroup( "criteria" );
+    for( int i = 0; i < criteria.size(); i++ )
+        cachedSettings.setValue( keys.at( i ), criteriakeys.at( i ) );
+    cachedSettings.endGroup();
+    cachedSettings.setValue( "data", output );
+
+    fileLocationHashcriteriaHashVal = settingsFilePath;
+    m_fileLocationCachetype = fileLocationHash;
+    m_dataCache.insert( criteriaHashValWithType, new QVariant( output ) );
+}
+
+
+const QString
+InfoSystemCache::criteriaMd5( const Tomahawk::InfoSystem::InfoStringHash &criteria, Tomahawk::InfoSystem::InfoType type ) const
+{
+    QCryptographicHash md5( QCryptographicHash::Md5 );
+    QStringList keys = criteria.keys();
+    keys.sort();
+    foreach( QString key, keys )
+    {
+        md5.addData( key.toUtf8() );
+        md5.addData( criteriakey.toUtf8() );
+    }
+    if ( type != Tomahawk::InfoSystem::InfoNoInfo && type != Tomahawk::InfoSystem::InfoLastInfo )
+        md5.addData( QString::number( (int)type ).toUtf8() );
+    return md5.result().toHex();
+}
+
+
+} //namespace InfoSystem
+
+} //namespace Tomahawk

tomahawk-0.5.5.tar.bz2/src/libtomahawk/infosystem/InfoSystemCache.h Added

@@ -0,0 +1,74 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWK_INFOSYSTEMCACHE_H
+#define TOMAHAWK_INFOSYSTEMCACHE_H
+
+#include <QCache>
+#include <QDateTime>
+#include <QObject>
+#include <QtDebug>
+#include <QTimer>
+
+#include "InfoSystem.h"
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+class InfoSystemCache : public QObject
+{
+Q_OBJECT
+
+public:
+    InfoSystemCache( QObject *parent = 0 );
+
+    virtual ~InfoSystemCache();
+
+signals:
+    void info( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+
+public slots:
+    void getCachedInfoSlot( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 newMaxAge, Tomahawk::InfoSystem::InfoRequestData requestData );
+    void updateCacheSlot( Tomahawk::InfoSystem::InfoStringHash criteria, qint64 maxAge, Tomahawk::InfoSystem::InfoType type, QVariant output );
+
+private slots:
+    void pruneTimerFired();
+
+private:
+    void notInCache( QObject *receiver, Tomahawk::InfoSystem::InfoStringHash criteria, Tomahawk::InfoSystem::InfoRequestData requestData );
+    void doUpgrade( uint oldVersion, uint newVersion );
+    void performWipe( QString directory );
+    const QString criteriaMd5( const Tomahawk::InfoSystem::InfoStringHash &criteria, Tomahawk::InfoSystem::InfoType type = Tomahawk::InfoSystem::InfoNoInfo ) const;
+
+    QString m_cacheBaseDir;
+    QHash< InfoType, QHash< QString, QString > > m_fileLocationCache;
+    QTimer m_pruneTimer;
+    QCache< QString, QVariant > m_dataCache;
+
+    uint m_cacheVersion;
+};
+
+} //namespace InfoSystem
+
+} //namespace Tomahawk
+
+#endif //TOMAHAWK_INFOSYSTEMCACHE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/infosystem/InfoSystemWorker.cpp Added

@@ -0,0 +1,513 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2012       Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "InfoSystemWorker.h"
+
+#include "config.h"
+#include "HeadlessCheck.h"
+#include "InfoSystemCache.h"
+#include "GlobalActionManager.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+
+#include <QCoreApplication>
+#include <QNetworkConfiguration>
+#include <QNetworkProxy>
+#include <QDir>
+#include <QLibrary>
+#include <QPluginLoader>
+
+namespace Tomahawk
+{
+
+namespace InfoSystem
+{
+
+InfoSystemWorker::InfoSystemWorker()
+    : QObject()
+{
+    tDebug() << Q_FUNC_INFO;
+
+    m_checkTimeoutsTimer.setInterval( 1000 );
+    m_checkTimeoutsTimer.setSingleShot( false );
+    connect( &m_checkTimeoutsTimer, SIGNAL( timeout() ), SLOT( checkTimeoutsTimerFired() ) );
+    m_checkTimeoutsTimer.start();
+}
+
+
+InfoSystemWorker::~InfoSystemWorker()
+{
+    tDebug() << Q_FUNC_INFO << " beginning";
+    Q_FOREACH( InfoPluginPtr plugin, m_plugins )
+    {
+        if( plugin )
+            delete plugin.data();
+    }
+    tDebug() << Q_FUNC_INFO << " finished";
+}
+
+
+void
+InfoSystemWorker::init( Tomahawk::InfoSystem::InfoSystemCache* cache )
+{
+    tDebug() << Q_FUNC_INFO;
+    m_shortLinksWaiting = 0;
+    m_cache = cache;
+
+    loadInfoPlugins( findInfoPlugins() );
+}
+
+
+void
+InfoSystemWorker::addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
+{
+    tDebug() << Q_FUNC_INFO << plugin;
+    foreach ( InfoPluginPtr ptr, m_plugins )
+    {
+        if ( ptr == plugin )
+        {
+            tDebug() << Q_FUNC_INFO << "This plugin is already added to the infosystem.";
+            return;
+        }
+    }
+
+    if ( plugin.isNull() )
+    {
+        tDebug() << Q_FUNC_INFO << "passed-in plugin is null";
+        return;
+    }
+
+    plugin.data()->moveToThread( this->thread() );
+    m_plugins.append( plugin );
+    registerInfoTypes( plugin, plugin.data()->supportedGetTypes(), plugin.data()->supportedPushTypes() );
+
+    connect(
+        plugin.data(),
+            SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+            this,
+            SLOT( infoSlot( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
+            Qt::QueuedConnection
+    );
+
+    connect(
+        plugin.data(),
+            SIGNAL( getCachedInfo( Tomahawk::InfoSystem::InfoStringHash, qint64, Tomahawk::InfoSystem::InfoRequestData ) ),
+            m_cache,
+            SLOT( getCachedInfoSlot( Tomahawk::InfoSystem::InfoStringHash, qint64, Tomahawk::InfoSystem::InfoRequestData ) ),
+            Qt::QueuedConnection
+    );
+    connect(
+        plugin.data(),
+            SIGNAL( updateCache( Tomahawk::InfoSystem::InfoStringHash, qint64, Tomahawk::InfoSystem::InfoType, QVariant ) ),
+            m_cache,
+            SLOT( updateCacheSlot( Tomahawk::InfoSystem::InfoStringHash, qint64, Tomahawk::InfoSystem::InfoType, QVariant ) ),
+            Qt::QueuedConnection
+    );
+    
+    QMetaObject::invokeMethod( plugin.data(), "init", Qt::QueuedConnection );
+}
+
+
+void
+InfoSystemWorker::removeInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
+{
+    tDebug() << Q_FUNC_INFO << plugin;
+
+    if ( plugin.isNull() )
+    {
+        tDebug() << Q_FUNC_INFO << "passed-in plugin is null";
+        return;
+    }
+
+    foreach ( InfoPluginPtr ptr, m_plugins )
+    {
+        if ( ptr == plugin )
+            break;
+
+        tDebug() << Q_FUNC_INFO << "This plugin does not exist in the infosystem.";
+        return;
+    }
+
+    m_plugins.removeOne( plugin );
+    deregisterInfoTypes( plugin, plugin.data()->supportedGetTypes(), plugin.data()->supportedPushTypes() );
+    delete plugin.data();
+}
+
+
+QStringList
+InfoSystemWorker::findInfoPlugins()
+{
+    QStringList paths;
+    QList< QDir > pluginDirs;
+
+    QDir appDir( qApp->applicationDirPath() );
+#ifdef Q_WS_MAC
+    if ( appDir.dirName() == "MacOS" )
+    {
+        // Development convenience-hack
+        appDir.cdUp();
+        appDir.cdUp();
+        appDir.cdUp();
+    }
+#endif
+
+    QDir libDir( CMAKE_INSTALL_PREFIX "/lib" );
+
+    QDir lib64Dir( appDir );
+    lib64Dir.cdUp();
+    lib64Dir.cd( "lib64" );
+
+    pluginDirs << appDir << libDir << lib64Dir << QDir( qApp->applicationDirPath() );
+    foreach ( const QDir& pluginDir, pluginDirs )
+    {
+        tDebug() << Q_FUNC_INFO << "Checking directory for plugins:" << pluginDir;
+        foreach ( QString fileName, pluginDir.entryList( QStringList() << "*tomahawk_infoplugin_*.so" << "*tomahawk_infoplugin_*.dylib" << "*tomahawk_infoplugin_*.dll", QDir::Files ) )
+        {
+            if ( fileName.startsWith( "libtomahawk_infoplugin" ) )
+            {
+                const QString path = pluginDir.absoluteFilePath( fileName );
+                if ( !paths.contains( path ) )
+                    paths << path;
+            }
+        }
+    }
+
+    return paths;
+}
+
+
+void
+InfoSystemWorker::loadInfoPlugins( const QStringList& pluginPaths )
+{
+    tDebug() << Q_FUNC_INFO << "Attempting to load the following plugin paths:" << pluginPaths;
+
+    if ( pluginPaths.isEmpty() )
+        return;
+
+    foreach ( const QString fileName, pluginPaths )
+    {
+        if ( !QLibrary::isLibrary( fileName ) )
+            continue;
+
+        tDebug() << Q_FUNC_INFO << "Trying to load plugin:" << fileName;
+
+        QPluginLoader loader( fileName );
+        QObject* plugin = loader.instance();
+        if ( !plugin )
+        {
+            tDebug() << Q_FUNC_INFO << "Error loading plugin:" << loader.errorString();
+            continue;
+        }
+
+        InfoPlugin* infoPlugin = qobject_cast< InfoPlugin* >( plugin );
+        if ( infoPlugin )
+        {
+            tDebug() << Q_FUNC_INFO << "Loaded info plugin:" << loader.fileName();
+            addInfoPlugin( InfoPluginPtr( infoPlugin ) );
+        }
+        else
+            tDebug() << Q_FUNC_INFO << "Loaded invalid plugin:" << loader.fileName();
+    }
+}
+
+
+void
+InfoSystemWorker::registerInfoTypes( const InfoPluginPtr &plugin, const QSet< InfoType >& getTypes, const QSet< InfoType >& pushTypes )
+{
+    Q_FOREACH( InfoType type, getTypes )
+        m_infoGetMaptype.append( plugin );
+    Q_FOREACH( InfoType type, pushTypes )
+        m_infoPushMaptype.append( plugin );
+}
+
+
+void
+InfoSystemWorker::deregisterInfoTypes( const InfoPluginPtr &plugin, const QSet< InfoType >& getTypes, const QSet< InfoType >& pushTypes )
+{
+    Q_FOREACH( InfoType type, getTypes )
+        m_infoGetMaptype.removeOne( plugin );
+    Q_FOREACH( InfoType type, pushTypes )
+        m_infoPushMaptype.removeOne( plugin );
+}
+
+
+QList< InfoPluginPtr >
+InfoSystemWorker::determineOrderedMatches( const InfoType type ) const
+{
+    //Dummy function for now that returns the various items in the QSet; at some point this will
+    //probably need to support ordering based on the data source
+    QList< InfoPluginPtr > providers;
+    Q_FOREACH( InfoPluginPtr ptr, m_infoGetMaptype )
+        providers << ptr;
+    return providers;
+}
+
+
+void
+InfoSystemWorker::getInfo( Tomahawk::InfoSystem::InfoRequestData requestData )
+{
+    //qDebug() << Q_FUNC_INFO << "type is " << requestData.type << " and allSources = " << (allSources ? "true" : "false" );
+
+    QList< InfoPluginPtr > providers = determineOrderedMatches( requestData.type );
+    if ( providers.isEmpty() )
+    {
+        emit info( requestData, QVariant() );
+        checkFinished( requestData );
+        return;
+    }
+
+    if ( !requestData.allSources )
+        providers = QList< InfoPluginPtr >( providers.mid( 0, 1 ) );
+
+    bool foundOne = false;
+    foreach ( InfoPluginPtr ptr, providers )
+    {
+        if ( !ptr )
+            continue;
+
+        foundOne = true;
+
+        if ( requestData.allSources || m_savedRequestMap.contains( requestData.requestId ) )
+        {
+            if ( m_savedRequestMap.contains( requestData.requestId ) )
+                tDebug() << Q_FUNC_INFO << "Warning: reassigning requestId because it already exists";
+            requestData.internalId = TomahawkUtils::infosystemRequestId();
+        }
+        else
+            requestData.internalId = requestData.requestId;
+
+        quint64 requestId = requestData.internalId;
+        m_requestSatisfiedMap requestId  = false;
+        if ( requestData.timeoutMillis != 0 )
+        {
+            qint64 currMs = QDateTime::currentMSecsSinceEpoch();
+            m_timeRequestMapper.insert( currMs + requestData.timeoutMillis, requestId );
+        }
+    //    qDebug() << "Assigning request with requestId" << requestId << "and type" << requestData.type;
+        m_dataTracker requestData.caller  requestData.type  = m_dataTracker requestData.caller  requestData.type  + 1;
+    //    qDebug() << "Current count in dataTracker for target" << requestData.caller << "and type" << requestData.type << "is" << m_dataTracker requestData.caller  requestData.type ;
+
+        InfoRequestData* data = new InfoRequestData;
+        data->caller = requestData.caller;
+        data->type = requestData.type;
+        data->input = requestData.input;
+        data->customData = requestData.customData;
+        m_savedRequestMap requestId  = data;
+
+        QMetaObject::invokeMethod( ptr.data(), "getInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoRequestData, requestData ) );
+    }
+
+    if ( !foundOne )
+    {
+        emit info( requestData, QVariant() );
+        checkFinished( requestData );
+    }
+}
+
+
+void
+InfoSystemWorker::pushInfo( Tomahawk::InfoSystem::InfoPushData pushData )
+{
+    tDebug() << Q_FUNC_INFO << "type is " << pushData.type;
+
+    if ( pushData.pushFlags != PushNoFlag )
+    {
+        if ( pushData.pushFlags & PushShortUrlFlag )
+        {
+            pushData.pushFlags = Tomahawk::InfoSystem::PushInfoFlags( pushData.pushFlags & ~PushShortUrlFlag );
+            QMetaObject::invokeMethod( this, "getShortUrl", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPushData, pushData ) );
+            return;
+        }
+    }
+
+    tDebug() << Q_FUNC_INFO << "number of matching plugins: " << m_infoPushMap pushData.type .size();
+
+    Q_FOREACH( InfoPluginPtr ptr, m_infoPushMap pushData.type  )
+    {
+        if( ptr )
+            QMetaObject::invokeMethod( ptr.data(), "pushInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPushData, pushData ) );
+    }
+}
+
+
+void
+InfoSystemWorker::getShortUrl( Tomahawk::InfoSystem::InfoPushData pushData )
+{
+    tDebug() << Q_FUNC_INFO << "type is " << pushData.type;
+    if ( !pushData.infoPair.second.canConvert< Tomahawk::InfoSystem::InfoStringHash >() )
+    {
+        QMetaObject::invokeMethod( this, "pushInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPushData, pushData ) );
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash hash = pushData.infoPair.second.value< Tomahawk::InfoSystem::InfoStringHash >();
+
+    if ( hash.isEmpty() || !hash.contains( "title" ) || !hash.contains( "artist" ) )
+    {
+        QMetaObject::invokeMethod( this, "pushInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPushData, pushData ) );
+        return;
+    }
+
+    QString title, artist, album;
+    title = hash "title" ;
+    artist = hash "artist" ;
+    if( hash.contains( "album" ) )
+        album = hash "album" ;
+
+    QUrl longUrl = GlobalActionManager::instance()->openLink( title, artist, album );
+
+    GlobalActionManager::instance()->shortenLink( longUrl, QVariant::fromValue< Tomahawk::InfoSystem::InfoPushData >( pushData ) );
+    connect( GlobalActionManager::instance(), SIGNAL( shortLinkReady( QUrl, QUrl, QVariant ) ), this, SLOT( shortLinkReady( QUrl, QUrl, QVariant ) ), Qt::UniqueConnection );
+    m_shortLinksWaiting++;
+}
+
+
+void
+InfoSystemWorker::shortLinkReady( QUrl longUrl, QUrl shortUrl, QVariant callbackObj )
+{
+    tDebug() << Q_FUNC_INFO << "long url = " << longUrl << ", shortUrl = " << shortUrl;
+    m_shortLinksWaiting--;
+    if ( !m_shortLinksWaiting )
+        disconnect( GlobalActionManager::instance(), SIGNAL( shortLinkReady( QUrl, QUrl, QVariant ) ) );
+
+    if ( !callbackObj.isValid() )
+    {
+        tDebug() << Q_FUNC_INFO << "callback object was not valid, cannot continue";
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoPushData pushData = callbackObj.value< Tomahawk::InfoSystem::InfoPushData >();
+
+    if ( !shortUrl.isEmpty() && longUrl != shortUrl )
+    {
+        QVariantMap flagProps = pushData.infoPair.first;
+        flagProps "shorturl"  = shortUrl;
+        pushData.infoPair.first = flagProps;
+    }
+
+    tDebug() << Q_FUNC_INFO << "pushInfoPair first is: " << pushData.infoPair.first.keys();
+
+    QMetaObject::invokeMethod( this, "pushInfo", Qt::QueuedConnection, Q_ARG( Tomahawk::InfoSystem::InfoPushData, pushData ) );
+}
+
+
+void
+InfoSystemWorker::infoSlot( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
+{
+//    qDebug() << Q_FUNC_INFO << "with requestId" << requestId;
+
+    quint64 requestId = requestData.internalId;
+
+    if ( m_dataTracker requestData.caller  requestData.type  == 0 )
+    {
+//        qDebug() << Q_FUNC_INFO << "Caller was not waiting for that type of data!";
+        return;
+    }
+    if ( !m_requestSatisfiedMap.contains( requestId ) || m_requestSatisfiedMap requestId  )
+    {
+//        qDebug() << Q_FUNC_INFO << "Request was already taken care of!";
+        return;
+    }
+
+    m_requestSatisfiedMap requestId  = true;
+    emit info( requestData, output );
+
+    m_dataTracker requestData.caller  requestData.type  = m_dataTracker requestData.caller  requestData.type  - 1;
+//    qDebug() << "Current count in dataTracker for target" << requestData.caller << "and type" << requestData.type << "is" << m_dataTracker requestData.caller  requestData.type ;
+    delete m_savedRequestMap requestId ;
+    m_savedRequestMap.remove( requestId );
+    checkFinished( requestData );
+}
+
+
+void
+InfoSystemWorker::checkFinished( const Tomahawk::InfoSystem::InfoRequestData &requestData )
+{
+    if ( m_dataTracker requestData.caller  requestData.type  == 0 )
+        emit finished( requestData.caller, requestData.type );
+
+    Q_FOREACH( InfoType testtype, m_dataTracker requestData.caller .keys() )
+    {
+        if ( m_dataTracker requestData.caller  testtype  != 0 )
+            return;
+    }
+//    qDebug() << "Emitting finished with target" << target;
+    emit finished( requestData.caller );
+}
+
+
+void
+InfoSystemWorker::checkTimeoutsTimerFired()
+{
+    qint64 currTime = QDateTime::currentMSecsSinceEpoch();
+    Q_FOREACH( qint64 time, m_timeRequestMapper.keys() )
+    {
+        Q_FOREACH( quint64 requestId, m_timeRequestMapper.values( time ) )
+        {
+            if ( time < currTime )
+            {
+                if ( m_requestSatisfiedMap requestId  )
+                {
+//                    qDebug() << Q_FUNC_INFO << "Removing mapping of" << requestId << "which expired at time" << time << "and was already satisfied";
+                    m_timeRequestMapper.remove( time, requestId );
+                    if ( !m_timeRequestMapper.count( time ) )
+                        m_timeRequestMapper.remove( time );
+                    continue;
+                }
+
+                //doh, timed out
+//                qDebug() << Q_FUNC_INFO << "Doh, timed out for requestId" << requestId;
+                InfoRequestData *savedData = m_savedRequestMap requestId ;
+
+                InfoRequestData returnData;
+                returnData.caller = savedData->caller;
+                returnData.type = savedData->type;
+                returnData.input = savedData->input;
+                returnData.customData = savedData->customData;
+                emit info( returnData, QVariant() );
+
+                delete savedData;
+                m_savedRequestMap.remove( requestId );
+
+                m_dataTracker returnData.caller  returnData.type  = m_dataTracker returnData.caller  returnData.type  - 1;
+//                qDebug() << "Current count in dataTracker for target" << returnData.caller << "is" << m_dataTracker returnData.caller  returnData.type ;
+
+                m_requestSatisfiedMap requestId  = true;
+                m_timeRequestMapper.remove( time, requestId );
+                if ( !m_timeRequestMapper.count( time ) )
+                    m_timeRequestMapper.remove( time );
+
+                checkFinished( returnData );
+            }
+            else
+            {
+                //we've caught up, the remaining requets still have time to work
+                return;
+            }
+        }
+    }
+}
+
+
+} //namespace InfoSystem
+
+} //namespace Tomahawk

tomahawk-0.5.5.tar.bz2/src/libtomahawk/infosystem/InfoSystemWorker.h Added

@@ -0,0 +1,106 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWK_INFOSYSTEMWORKER_H
+#define TOMAHAWK_INFOSYSTEMWORKER_H
+
+#include "infosystem/InfoSystem.h"
+
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtCore/QObject>
+#include <QtCore/QtDebug>
+#include <QtCore/QMap>
+#include <QtCore/QWeakPointer>
+#include <QtCore/QSet>
+#include <QtCore/QList>
+#include <QtCore/QVariant>
+#include <QtCore/QTimer>
+
+#include "DllMacro.h"
+
+namespace Tomahawk {
+
+namespace InfoSystem {
+
+class InfoSystemCache;
+
+
+class DLLEXPORT InfoSystemWorker : public QObject
+{
+    Q_OBJECT
+
+public:
+    InfoSystemWorker();
+    ~InfoSystemWorker();
+
+signals:
+    void info( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void finished( QString target );
+    void finished( QString target, Tomahawk::InfoSystem::InfoType type );
+
+public slots:
+    void init( Tomahawk::InfoSystem::InfoSystemCache* cache );
+    void getInfo( Tomahawk::InfoSystem::InfoRequestData requestData );
+
+    void pushInfo( Tomahawk::InfoSystem::InfoPushData pushData );
+    
+    void infoSlot( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+
+    void addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin );
+    void removeInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin );
+    QStringList findInfoPlugins();
+    void loadInfoPlugins( const QStringList &pluginPaths );
+    
+    void getShortUrl( Tomahawk::InfoSystem::InfoPushData data );
+    void shortLinkReady( QUrl longUrl, QUrl shortUrl, QVariant callbackObj );
+
+private slots:
+    void checkTimeoutsTimerFired();
+
+private:
+    void registerInfoTypes( const InfoPluginPtr &plugin, const QSet< InfoType > &getTypes, const QSet< InfoType > &pushTypes );
+    void deregisterInfoTypes( const InfoPluginPtr &plugin, const QSet< InfoType > &getTypes, const QSet< InfoType > &pushTypes );
+
+    void checkFinished( const Tomahawk::InfoSystem::InfoRequestData &target );
+    QList< InfoPluginPtr > determineOrderedMatches( const InfoType type ) const;
+
+    QHash< QString, QHash< InfoType, int > > m_dataTracker;
+    QMultiMap< qint64, quint64 > m_timeRequestMapper;
+    QHash< uint, bool > m_requestSatisfiedMap;
+    QHash< uint, InfoRequestData* > m_savedRequestMap;
+
+    // NOTE Cache object lives in a different thread, do not call methods on it directly
+    InfoSystemCache* m_cache;
+
+    // For now, statically instantiate plugins; this is just somewhere to keep them
+    QList< InfoPluginPtr > m_plugins;
+
+    QMap< InfoType, QList< InfoPluginPtr > > m_infoGetMap;
+    QMap< InfoType, QList< InfoPluginPtr > > m_infoPushMap;
+
+    QTimer m_checkTimeoutsTimer;
+
+    quint64 m_shortLinksWaiting;
+};
+
+}
+
+}
+
+#endif // TOMAHAWK_INFOSYSTEMWORKER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/AclJobItem.cpp Added

@@ -0,0 +1,207 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2012, Jeff Mitchell <jeff@tomahawk-player.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 "AclJobItem.h"
+
+#include "JobStatusModel.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "libtomahawk/infosystem/InfoSystem.h"
+#include "utils/Logger.h"
+
+#include <QPixmap>
+#include <QPainter>
+#include <QListView>
+#include <QApplication>
+#include <QMouseEvent>
+
+
+#define ROW_HEIGHT 20
+#define ICON_PADDING 1
+#define PADDING 2
+
+
+AclJobDelegate::AclJobDelegate( QObject* parent )
+    : QStyledItemDelegate ( parent )
+{
+    tLog() << Q_FUNC_INFO;
+}
+
+
+AclJobDelegate::~AclJobDelegate()
+{
+    tLog() << Q_FUNC_INFO;
+}
+
+
+void
+AclJobDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    AclJobItem* item = dynamic_cast< AclJobItem* >( index.data( JobStatusModel::JobDataRole ).value< JobStatusItem* >() );
+    if ( !item )
+        return;
+    //tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, index );
+    QFontMetrics fm( opt.font );
+
+    opt.state &= ~QStyle::State_MouseOver;
+    QApplication::style()->drawPrimitive( QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget );
+
+    painter->setRenderHint( QPainter::Antialiasing );
+
+    painter->fillRect( opt.rect, Qt::lightGray );
+
+    QString mainText = QString( tr( "Allow %1 to\nconnect and stream from you?" ) ).arg( item->username() );
+    //tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Displaying text:" << mainText;
+ 
+    const QRect rRect( opt.rect.left() + PADDING, opt.rect.top() + 4*PADDING, opt.rect.width() - 2*PADDING, opt.rect.height() - 2*PADDING );
+    painter->drawText( rRect, Qt::AlignHCenter, mainText );
+
+    //tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Using rect " << rRect << ", opt rect is " << opt.rect;
+
+    int totalwidth = opt.rect.width();
+    int thirds = totalwidth/3;
+    QRect allowBtnRect;
+    QRect denyBtnRect;
+    painter->setPen( Qt::white );
+
+    int minPixels = 20;
+    
+    QString allowBtnText = tr( "Allow Streaming" );
+    int allowBtnWidth = fm.width( allowBtnText ) + 2*PADDING;
+    allowBtnRect = QRect( opt.rect.left() + thirds - allowBtnWidth/2, opt.rect.bottom() - fm.height() - 4*PADDING,  allowBtnWidth + 2*PADDING, fm.height() + 2*PADDING );
+    QString denyBtnText = tr( "Deny Access" );
+    int denyBtnWidth = fm.width( denyBtnText ) + 2*PADDING;
+    denyBtnRect = QRect( opt.rect.right() - thirds - denyBtnWidth/2, opt.rect.bottom() - fm.height() - 4*PADDING,  denyBtnWidth + 2*PADDING, fm.height() + 2*PADDING );
+
+    if ( allowBtnRect.right() >= denyBtnRect.left() )
+    {
+        allowBtnRect.moveLeft( allowBtnRect.left() - minPixels / 2 );
+        denyBtnRect.moveLeft( denyBtnRect.left() + minPixels / 2 );
+    }
+
+    drawRoundedButton( painter, allowBtnRect, allowBtnRect.contains( m_savedHoverPos ) );
+    painter->drawText( allowBtnRect, Qt::AlignCenter, allowBtnText );
+    m_savedAcceptRect = allowBtnRect;
+    drawRoundedButton( painter, denyBtnRect, denyBtnRect.contains( m_savedHoverPos ) );
+    painter->drawText( denyBtnRect, Qt::AlignCenter, denyBtnText );
+    m_savedDenyRect = denyBtnRect;
+}
+
+QSize
+AclJobDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QSize size( QStyledItemDelegate::sizeHint ( option, index ).width(), ROW_HEIGHT * 3 );
+    return size;
+}
+
+
+void
+AclJobDelegate::drawRoundedButton( QPainter* painter, const QRect& btnRect, bool red ) const
+{
+    if ( !red )
+        TomahawkUtils::drawRoundedButton( painter, btnRect, QColor(54, 127, 211), QColor(43, 104, 182), QColor(34, 85, 159), QColor(35, 79, 147) );
+    else
+        TomahawkUtils::drawRoundedButton( painter, btnRect, QColor(206, 63, 63), QColor(170, 52, 52), QColor(150, 50, 50), QColor(130, 40, 40) );
+}
+
+
+bool
+AclJobDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
+{
+    Q_UNUSED( option )
+    Q_UNUSED( model )
+    //tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
+    if ( event->type() != QEvent::MouseButtonPress &&
+         event->type() != QEvent::MouseButtonRelease &&
+         event->type() != QEvent::MouseButtonDblClick &&
+         event->type() != QEvent::MouseMove )
+        return false;
+
+    if ( event->type() == QEvent::MouseMove )
+    {
+        QMouseEvent* me = static_cast< QMouseEvent* >( event );
+        m_savedHoverPos = me->pos();
+        //tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Setting position to " << m_savedHoverPos;
+        emit update( index );
+        return true;
+    }
+
+    if ( event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonDblClick )
+    {
+        QMouseEvent* me = static_cast< QMouseEvent* >( event );
+        if ( m_savedAcceptRect.contains( me->pos() ) )
+            emit aclResult( ACLRegistry::Stream );
+        else if ( m_savedDenyRect.contains( me->pos() ) )
+            emit aclResult( ACLRegistry::Deny );
+        return true;
+    }
+
+    return false;
+}
+
+
+
+AclJobItem::AclJobItem( ACLRegistry::User user, const QString &username )
+    : m_delegate( 0 )
+    , m_user( user )
+    , m_username( username )
+{
+    tLog() << Q_FUNC_INFO;
+}
+
+
+AclJobItem::~AclJobItem()
+{
+    tLog() << Q_FUNC_INFO;
+}
+
+
+void
+AclJobItem::createDelegate( QObject* parent )
+{
+    tLog() << Q_FUNC_INFO;
+    
+    if ( m_delegate )
+        return;
+
+    m_delegate = new AclJobDelegate( parent );
+
+    Tomahawk::InfoSystem::InfoPushData pushData( "AclJobItem", Tomahawk::InfoSystem::InfoNotifyUser, tr( "Tomahawk needs you to decide whether %1 is allowed to connect." ).arg( m_username ), Tomahawk::InfoSystem::PushNoFlag );
+    Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( pushData );
+}
+
+
+void
+AclJobDelegate::emitSizeHintChanged( const QModelIndex& index )
+{
+    emit sizeHintChanged( index );
+}
+
+
+void
+AclJobItem::aclResult( ACLRegistry::ACL result )
+{
+    tLog() << Q_FUNC_INFO;
+    m_user.acl = result;
+    emit userDecision( m_user );
+    emit finished();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/AclJobItem.h Added

@@ -0,0 +1,92 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2012, Jeff Mitchell <jeff@tomahawk-player.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 ACLJOBITEM_H
+#define ACLJOBITEM_H
+
+#include <jobview/JobStatusItem.h>
+#include "AclRegistry.h"
+
+#include <QStyledItemDelegate>
+
+class QListView;
+
+class AclJobDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+
+public:
+    explicit AclJobDelegate ( QObject* parent = 0 );
+    virtual ~AclJobDelegate();
+
+    virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    virtual QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+    virtual void emitSizeHintChanged( const QModelIndex &index );
+    
+signals:
+    void update( const QModelIndex& idx );
+    void aclResult( ACLRegistry::ACL result );
+    
+protected:
+    virtual bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
+    
+private:
+    void drawRoundedButton( QPainter* painter, const QRect& btnRect, bool red = false ) const;
+    
+    QPoint m_savedHoverPos;
+    mutable QRect m_savedAcceptRect;
+    mutable QRect m_savedDenyRect;
+};
+
+
+class AclJobItem : public JobStatusItem
+{
+    Q_OBJECT
+public:
+    explicit AclJobItem( ACLRegistry::User user, const QString &username );
+    virtual ~AclJobItem();
+    
+    virtual QString rightColumnText() const { return QString(); }
+    virtual QString mainText() const { return QString(); }
+    virtual QPixmap icon() const { return QPixmap(); }
+    virtual QString type() const { return "acljob"; }
+
+    virtual int concurrentJobLimit() const { return 3; }
+    
+    virtual bool hasCustomDelegate() const { return true; }
+    virtual void createDelegate( QObject* parent = 0 );
+    virtual QStyledItemDelegate* customDelegate() const { return m_delegate; }
+
+    virtual ACLRegistry::User user() const { return m_user; }
+    virtual const QString& username() const { return m_username; }
+    
+signals:
+    void userDecision( ACLRegistry::User user );
+
+public slots:
+    void aclResult( ACLRegistry::ACL result );
+    
+private:
+    QStyledItemDelegate* m_delegate;
+    ACLRegistry::User m_user;
+    const QString m_username;
+};
+
+#endif // ACLJOBITEM_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/ErrorStatusMessage.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/ErrorStatusMessage.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/ErrorStatusMessage.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/ErrorStatusMessage.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/IndexingJobItem.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/IndexingJobItem.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/JobStatusDelegate.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/JobStatusDelegate.cpp Changed

@@ -19,15 +19,17 @@
 #include "JobStatusDelegate.h"
 
 #include "JobStatusModel.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 #include <QPainter>
 #include <QApplication>
 #include <QListView>
 
 #define ROW_HEIGHT 20
-#define ICON_PADDING 1
+#define ICON_PADDING 2
 #define PADDING 2
+
+
 JobStatusDelegate::JobStatusDelegate( QObject* parent )
     : QStyledItemDelegate ( parent )
     , m_parentView( qobject_cast< QListView* >( parent ) )
@@ -35,6 +37,7 @@
     Q_ASSERT( m_parentView );
 }
 
+
 JobStatusDelegate::~JobStatusDelegate()
 {
 
@@ -55,12 +58,15 @@
 //     painter->drawLine( opt.rect.topLeft(), opt.rect.topRight() );
 
     painter->setRenderHint( QPainter::Antialiasing );
-    QRect iconRect( ICON_PADDING, ICON_PADDING + opt.rect.y(), ROW_HEIGHT - 2*ICON_PADDING, ROW_HEIGHT - 2*ICON_PADDING );
+    QRect iconRect( ICON_PADDING, ICON_PADDING + opt.rect.y(), ROW_HEIGHT - 2 * ICON_PADDING, ROW_HEIGHT - 2 * ICON_PADDING );
     if ( allowMultiLine )
         iconRect.moveTop( opt.rect.top() + opt.rect.height() / 2 - iconRect.height() / 2);
     QPixmap p = index.data( Qt::DecorationRole ).value< QPixmap >();
-    p = p.scaledToHeight( iconRect.height(), Qt::SmoothTransformation );
-    painter->drawPixmap( iconRect, p );
+    if ( !p.isNull() )
+    {
+        p = p.scaledToHeight( iconRect.height(), Qt::SmoothTransformation );
+        painter->drawPixmap( iconRect, p );
+    }
 
     // draw right column if there is one
     const QString rCol = index.data( JobStatusModel::RightColumnRole ).toString();
@@ -68,22 +74,24 @@
     if ( !rCol.isEmpty() )
     {
         const int w = fm.width( rCol );
-        const QRect rRect( opt.rect.right() - PADDING - w, PADDING + opt.rect.y(), w, opt.rect.height() - 2*PADDING );
+        const QRect rRect( opt.rect.right() - PADDING - w, PADDING + opt.rect.y(), w, opt.rect.height() - 2 * PADDING );
         painter->drawText( rRect, Qt::AlignCenter, rCol );
 
         rightEdge = rRect.left();
     }
 
-    const int mainW = rightEdge - 3*PADDING - iconRect.right();
+    const int mainW = rightEdge - 4 * PADDING - iconRect.right();
     QString mainText = index.data( Qt::DisplayRole ).toString();
     QTextOption to( Qt::AlignLeft | Qt::AlignVCenter );
     if ( !allowMultiLine )
-        mainText = fm.elidedText( mainText, Qt::ElideRight, mainW  );
+        mainText = fm.elidedText( mainText, Qt::ElideRight, mainW );
     else
         to.setWrapMode( QTextOption::WrapAtWordBoundaryOrAnywhere );
-    painter->drawText( QRect( iconRect.right() + 2*PADDING, PADDING + opt.rect.y(), mainW, opt.rect.height() - 2*PADDING ), mainText, to );
+
+    painter->drawText( QRect( iconRect.right() + 4 * PADDING, PADDING + opt.rect.y(), mainW, opt.rect.height() - 2 * PADDING ), mainText, to );
 }
 
+
 QSize
 JobStatusDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
 {
@@ -99,11 +107,11 @@
     initStyleOption( &opt, index );
 
     const QString text = index.data( Qt::DisplayRole ).toString();
-    const int leftEdge =  ICON_PADDING + ROW_HEIGHT + 2*PADDING;
+    const int leftEdge =  ICON_PADDING + ROW_HEIGHT + 2 * PADDING;
     const QRect rect = opt.fontMetrics.boundingRect( leftEdge, opt.rect.top(), m_parentView->width() - leftEdge, 200, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, text );
 
-    m_cachedMultiLineHeights.insert( index, rect.height() + 4*PADDING );
+    m_cachedMultiLineHeights.insert( index, rect.height() + 4 * PADDING );
 
-    return QSize( QStyledItemDelegate::sizeHint ( option, index ).width(), rect.height() + 4*PADDING );
+    return QSize( QStyledItemDelegate::sizeHint ( option, index ).width(), rect.height() + 4 * PADDING );
 }

tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/JobStatusItem.cpp Added

@@ -0,0 +1,74 @@
+/* === 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 "JobStatusItem.h"
+
+
+JobStatusItem::JobStatusItem()
+    : QObject()
+{
+}
+
+
+JobStatusItem::~JobStatusItem()
+{
+}
+
+
+bool
+JobStatusItem::allowMultiLine() const
+{
+    return false;
+}
+
+
+bool
+JobStatusItem::collapseItem() const
+{
+    return false;
+}
+
+
+int
+JobStatusItem::concurrentJobLimit() const
+{
+    return 0;
+}
+
+
+bool
+JobStatusItem::hasCustomDelegate() const
+{
+    return false;
+}
+
+
+void
+JobStatusItem::createDelegate( QObject* parent )
+{
+    Q_UNUSED( parent );
+    return;
+}
+
+
+QStyledItemDelegate*
+JobStatusItem::customDelegate() const
+{
+    return 0;
+}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/JobStatusItem.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/JobStatusItem.h Changed

@@ -20,7 +20,10 @@
 #define JOB_STATUS_ITEM
 
 #include <QObject>
-#include <QPixmap>
+#include <QMetaType>
+
+class QStyledItemDelegate;
+class QPixmap;
 
 /**
  * Implement your own JobStatusItem if you want to add some sort of job status entry in the JobStatusView.
@@ -37,8 +40,8 @@
 {
     Q_OBJECT
 public:
-    explicit JobStatusItem() : QObject() {}
-    virtual ~JobStatusItem() {}
+    explicit JobStatusItem();
+    virtual ~JobStatusItem();
 
     virtual QString type() const = 0;
 
@@ -52,8 +55,14 @@
      * instead of showing each individually. In this case, the right column from the item will be ignored
      * and a count will be shown instead.
      */
-    virtual bool collapseItem() const { return false; }
-    virtual bool allowMultiLine() const { return false; }
+    virtual bool collapseItem() const;
+    virtual bool allowMultiLine() const;
+
+    virtual int concurrentJobLimit() const;
+
+    virtual bool hasCustomDelegate() const;
+    virtual void createDelegate( QObject* parent );
+    virtual QStyledItemDelegate* customDelegate() const;
 
 signals:
     /// Ask for an update
@@ -63,4 +72,6 @@
     void finished();
 };
 
+Q_DECLARE_METATYPE( JobStatusItem* );
+
 #endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/JobStatusModel.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/JobStatusModel.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/JobStatusModel.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/JobStatusModel.h Changed

@@ -19,11 +19,14 @@
 #ifndef JOBSTATUSMODEL_H
 #define JOBSTATUSMODEL_H
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 #include <QModelIndex>
+#include <QQueue>
 
+class QStyledItemDelegate;
 class JobStatusItem;
+
 class DLLEXPORT JobStatusModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -32,7 +35,8 @@
         // DecorationRole is icon
         // DisplayRole is main col
         RightColumnRole = Qt::UserRole + 1,
-        AllowMultiLineRole = Qt::UserRole + 2
+        AllowMultiLineRole = Qt::UserRole + 2,
+        JobDataRole = Qt::UserRole + 3
     };
 
     explicit JobStatusModel( QObject* parent = 0 );
@@ -42,9 +46,15 @@
     virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
     virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const;
 
+signals:
+    void customDelegateJobInserted( int row, JobStatusItem* item );
+    void customDelegateJobRemoved( int row );
+    void refreshDelegates();
+
+public slots:
     /// Takes ownership of job
     void addJob( JobStatusItem* item );
-
+    
 private slots:
     void itemUpdated();
     void itemFinished();
@@ -52,6 +62,8 @@
 private:
     QList< JobStatusItem* > m_items;
     QHash< QString, QList< JobStatusItem* > > m_collapseCount;
+    QHash< QString, QQueue< JobStatusItem* > > m_jobQueue;
+    QHash< QString, int > m_jobTypeCount;
 };
 
 #endif // JOBSTATUSMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/JobStatusView.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/JobStatusView.cpp Changed

@@ -19,13 +19,16 @@
 
 #include "JobStatusView.h"
 
-#include "pipeline.h"
+#include "Pipeline.h"
+#include "AclJobItem.h"
 #include "JobStatusModel.h"
+#include "JobStatusItem.h"
 #include "JobStatusDelegate.h"
 #include "PipelineStatusItem.h"
 #include "TransferStatusItem.h"
 #include "LatchedStatusItem.h"
-#include "utils/logger.h"
+#include "utils/Logger.h"
+#include "Source.h"
 
 #include <QHeaderView>
 #include <QVBoxLayout>
@@ -73,6 +76,9 @@
     new PipelineStatusManager( this );
     new TransferStatusManager( this );
     new LatchedStatusManager( this );
+
+    setMouseTracking( true );
+    m_view->setMouseTracking( true );
 }
 
 
@@ -86,6 +92,67 @@
     connect( m_view->model(), SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SLOT( checkCount() ) );
     connect( m_view->model(), SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SLOT( checkCount() ) );
     connect( m_view->model(), SIGNAL( modelReset() ), this, SLOT( checkCount() ) );
+    connect( m_view->model(), SIGNAL( customDelegateJobInserted( int, JobStatusItem* ) ), this, SLOT( customDelegateJobInserted( int, JobStatusItem* ) ) );
+    connect( m_view->model(), SIGNAL( customDelegateJobRemoved( int ) ), this, SLOT( customDelegateJobRemoved( int ) ) );
+    connect( m_view->model(), SIGNAL( refreshDelegates() ), this, SLOT( refreshDelegates() ) );
+}
+
+
+void
+JobStatusView::customDelegateJobInserted( int row, JobStatusItem* item )
+{
+    tLog() << Q_FUNC_INFO << "item is" << item << ", row is" << row;
+    if ( !item )
+        return;
+
+    item->createDelegate( m_view );
+    tLog() << Q_FUNC_INFO << "item delegate is" << item->customDelegate();
+    m_view->setItemDelegateForRow( row, item->customDelegate() );
+    AclJobDelegate* delegate = qobject_cast< AclJobDelegate* >( item->customDelegate() );
+    if ( delegate )
+    {
+        tLog() << Q_FUNC_INFO << "delegate found";
+        connect( delegate, SIGNAL( update( const QModelIndex& ) ), m_view, SLOT( update( const QModelIndex & ) ) );
+        connect( delegate, SIGNAL( aclResult( ACLRegistry::ACL ) ), item, SLOT( aclResult( ACLRegistry::ACL ) ) );
+        delegate->emitSizeHintChanged( m_model->index( row ) );
+    }
+    else
+        tLog() << Q_FUNC_INFO << "delegate was not properly found!";
+
+    checkCount();
+}
+
+
+void
+JobStatusView::customDelegateJobRemoved( int row )
+{
+    tLog() << Q_FUNC_INFO << "row is" << row;
+}
+
+
+void
+JobStatusView::refreshDelegates()
+{
+    tLog() << Q_FUNC_INFO;
+    int count = m_model->rowCount();
+    for ( int i = 0; i < count; i++ )
+    {
+        tLog() << Q_FUNC_INFO << "checking row" << i;
+        QModelIndex index = m_model->index( i );
+        QVariant itemVar = index.data( JobStatusModel::JobDataRole );
+        if ( !itemVar.canConvert< JobStatusItem* >() || !itemVar.value< JobStatusItem* >() )
+        {
+            tLog() << Q_FUNC_INFO << "unable to fetch JobStatusItem* at row" << i;
+            continue;
+        }
+        JobStatusItem* item = itemVar.value< JobStatusItem* >();
+        if ( item->hasCustomDelegate() )
+            m_view->setItemDelegateForRow( i, item->customDelegate() );
+        else
+            m_view->setItemDelegateForRow( i, m_view->itemDelegate() );
+    }
+
+    checkCount();
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/JobStatusView.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/JobStatusView.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/LatchedStatusItem.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/LatchedStatusItem.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/LatchedStatusItem.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/LatchedStatusItem.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/PipelineStatusItem.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/PipelineStatusItem.cpp Changed

@@ -2,6 +2,7 @@
  *
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
  *                        Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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
@@ -19,20 +20,23 @@
 
 #include "PipelineStatusItem.h"
 
-#include "utils/tomahawkutils.h"
-#include "pipeline.h"
-#include "tomahawkapp.h"
+#include "utils/TomahawkUtils.h"
+#include "Pipeline.h"
+#include "TomahawkApp.h"
 #include "JobStatusModel.h"
 #include "JobStatusView.h"
+#include "Source.h"
 
+QPixmap* PipelineStatusItem::s_pixmap = 0;
 
-PipelineStatusItem::PipelineStatusItem()
+PipelineStatusItem::PipelineStatusItem( const Tomahawk::query_ptr& q )
     : JobStatusItem()
 {
-    m_icon.load( RESPATH"images/search-icon.png" );
-
     connect( Tomahawk::Pipeline::instance(), SIGNAL( resolving( Tomahawk::query_ptr ) ), this, SLOT( resolving( Tomahawk::query_ptr ) ) );
     connect( Tomahawk::Pipeline::instance(), SIGNAL( idle() ), this, SLOT( idle() ) );
+
+    if ( !q.isNull() )
+        resolving( q );
 }
 
 
@@ -63,6 +67,18 @@
 }
 
 
+QPixmap
+PipelineStatusItem::icon() const
+{
+    if ( !s_pixmap )
+    {
+        s_pixmap = new QPixmap( RESPATH"images/search-icon.png" );
+    }
+
+    return *s_pixmap;
+}
+
+
 void
 PipelineStatusItem::resolving( const Tomahawk::query_ptr& query )
 {
@@ -71,6 +87,10 @@
     else
         m_latestQuery = QString( "%1 - %2" ).arg( query->artist() ).arg( query->track() );
 
+    if ( m_latestQuery.isEmpty() )
+        qDebug() << "EMPTY STRING IN STATUS ITEM:" << query->fullTextQuery() << query->track() << query->artist() << query->album();
+    Q_ASSERT( !m_latestQuery.isEmpty() );
+
     emit statusChanged();
 }
 
@@ -85,11 +105,10 @@
 void
 PipelineStatusManager::resolving( const Tomahawk::query_ptr& p )
 {
-    Q_UNUSED( p );
     if ( m_curItem.isNull() )
     {
         // No current query item and we're resolving something, so show it
-        m_curItem = QWeakPointer< PipelineStatusItem >( new PipelineStatusItem );
+        m_curItem = QWeakPointer< PipelineStatusItem >( new PipelineStatusItem( p ) );
         JobStatusView::instance()->model()->addJob( m_curItem.data() );
     }
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/PipelineStatusItem.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/PipelineStatusItem.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/TransferStatusItem.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/TransferStatusItem.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/jobview/TransferStatusItem.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/jobview/TransferStatusItem.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/mac Added

tomahawk-0.5.5.tar.bz2/src/libtomahawk/mac/FileHelpers.h Added

@@ -0,0 +1,41 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, 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 MAC_FILE_HELPERS_H
+#define MAC_FILE_HELPERS_H
+
+#import <Cocoa/Cocoa.h>
+
+// Implement this delegate protocol to get notified about the result of your copy attempt
+@interface NSObject (SUInstallerDelegateInformalProtocol)
+- (void)moveFinished;
+- (void)moveFailedWithError:(NSError *)error;
+@end
+
+@interface FileHelpers : NSObject
+{}
+// Move a file from point A to point B, asking for authentication if necessary
+// Will be asynchronous: Implement the delegate protocol know about the completion
++ (void) moveFile:(NSString *)source to:(NSString*)dest withDelegate:delegate;
+
+// Internal
++ (void)notifyDelegate:(NSDictionary *)info;
+
+@end
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/mac/FileHelpers.mm Added

@@ -0,0 +1,230 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, 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/>.
+ */
+
+#import "FileHelpers.h"
+
+#import <CoreServices/CoreServices.h>
+#import <Security/Security.h>
+#import <sys/stat.h>
+#import <sys/wait.h>
+#import <dirent.h>
+#import <unistd.h>
+#import <sys/param.h>
+
+#include <QDebug>
+
+static NSString * const TKCopySourceKey = @"TKInstallerSourcePath";
+static NSString * const TKCopyDestinationKey = @"TKInstallerDestinationPath";
+static NSString * const TKInstallerDelegateKey = @"TKInstallerDelegate";
+static NSString * const TKInstallerResultKey = @"TKInstallerResult";
+static NSString * const TKInstallerErrorKey = @"TKInstallerError";
+
+class CAutoreleasePool
+{
+  NSAutoreleasePool *pool;
+
+public:
+  CAutoreleasePool()
+  {
+    pool = NSAutoreleasePool alloc init;
+  }
+
+  ~CAutoreleasePool()
+  {
+    pool drain;
+  }
+};
+
+// Authorization code based on generous contribution from Allan Odgaard. Thanks, Allan!
+static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authorization, const char* executablePath, AuthorizationFlags options, const char* const* arguments)
+{
+        // *** MUST BE SAFE TO CALL ON NON-MAIN THREAD!
+
+        sig_t oldSigChildHandler = signal(SIGCHLD, SIG_DFL);
+        BOOL returnValue = YES;
+
+        if (AuthorizationExecuteWithPrivileges(authorization, executablePath, options, (char* const*)arguments, NULL) == errAuthorizationSuccess)
+        {
+                int status;
+                pid_t pid = wait(&status);
+                if (pid == -1 || !WIFEXITED(status) || WEXITSTATUS(status) != 0)
+                        returnValue = NO;
+        }
+        else
+                returnValue = NO;
+
+        signal(SIGCHLD, oldSigChildHandler);
+        return returnValue;
+}
+
+@implementation FileHelpers
+
++ (void) moveFile:(NSString *)source to:(NSString*)dest withDelegate:delegate
+{
+    NSLog(@"FileHelpers moving file from %@ to %@", source, dest);
+
+    NSDictionary *info = NSDictionary dictionaryWithObjectsAndKeys:source, TKCopySourceKey, dest, TKCopyDestinationKey, delegate, TKInstallerDelegateKey, nil;
+    NSThread detachNewThreadSelector:@selector(performMoveWithInfo:) toTarget:self withObject:info;
+}
+
+
++ (void)performMoveWithInfo:(NSDictionary *)info
+{
+    // *** GETS CALLED ON NON-MAIN THREAD!
+
+    NSString* fromPath = info objectForKey: TKCopySourceKey;
+    NSString* toPath = info objectForKey: TKCopyDestinationKey;
+
+    AuthorizationRef auth = NULL;
+    OSStatus authStat = errAuthorizationDenied;
+
+    NSLog(@"FileHelpers moving file from %@ to %@", fromPath, toPath);
+    BOOL haveOld = NSFileManager defaultManager fileExistsAtPath: toPath;
+
+    if (haveOld == YES) { // delete the old file if it's there
+        if (0 != access(toPath stringByDeletingLastPathComponent fileSystemRepresentation, W_OK)
+            || 0 != access(toPath stringByDeletingLastPathComponent stringByDeletingLastPathComponent fileSystemRepresentation, W_OK))
+        {
+            const char* rmParams = { toPath fileSystemRepresentation, NULL };
+            // NSLog( @"WOULD DELETE: %@", toPath fileSystemRepresentation );
+
+            while( authStat == errAuthorizationDenied )
+            {
+                authStat = AuthorizationCreate(NULL,
+                                               kAuthorizationEmptyEnvironment,
+                                               kAuthorizationFlagDefaults,
+                                               &auth);
+            }
+            if (authStat == errAuthorizationSuccess)
+            {
+                BOOL res = AuthorizationExecuteWithPrivilegesAndWait( auth, "/bin/rm", kAuthorizationFlagDefaults, rmParams );
+                if (!res)
+                    NSLog(@"Could not delete: %@", toPath);
+            } else {
+                qDebug() << "Failed to authenticate to delete file under target to move, aborting";
+                return;
+            }
+        } else {
+            // We can delete it ourselves w/out authenticating
+            NSFileManager *manager = NSFileManager alloc init autorelease;
+            NSError* error;
+            BOOL success = manager removeItemAtPath:toPath error:&error;
+
+            if (!success) {
+                NSLog(@"Failed to delete file (w/out perms) underneath copy!: %@", error userInfo objectForKey: NSLocalizedDescriptionKey);
+                return;
+            }
+        }
+    }
+
+    FSRef dstRef, dstDirRef;
+    OSStatus err = FSPathMakeRefWithOptions((UInt8 *)toPath fileSystemRepresentation, kFSPathMakeRefDoNotFollowLeafSymlink, &dstRef, NULL);
+
+    if (err != noErr && err != fnfErr) { // If the file is not found that's fine, we're moving to there after all
+        qDebug() << "GOT AN ERROR DOING FSPathMakeRefWithOptions!!!!! aborting move";
+        return;
+    }
+
+    if (0 != access(toPath stringByDeletingLastPathComponent fileSystemRepresentation, W_OK)
+        || 0 != access(toPath stringByDeletingLastPathComponent stringByDeletingLastPathComponent fileSystemRepresentation, W_OK))
+    {
+        // Not writeable by user, so authenticate
+        if (!auth) {
+            while( authStat == errAuthorizationDenied )
+            {
+                authStat = AuthorizationCreate(NULL,
+                                               kAuthorizationEmptyEnvironment,
+                                               kAuthorizationFlagDefaults,
+                                               &auth);
+            }
+        }
+
+        if (authStat == errAuthorizationSuccess)
+        {
+            // Fix perms before moving so we have them correct when they arrive
+            struct stat dstSB;
+            stat(toPath stringByDeletingLastPathComponent fileSystemRepresentation, &dstSB);
+            char uidgid42;
+            snprintf(uidgid, sizeof(uidgid), "%d:%d",
+                     dstSB.st_uid, dstSB.st_gid);
+
+            const char* coParams = { "-R", uidgid, fromPath fileSystemRepresentation, NULL };
+            BOOL res = AuthorizationExecuteWithPrivilegesAndWait( auth, "/usr/sbin/chown", kAuthorizationFlagDefaults, coParams );
+            if( !res )
+                qDebug() << "Failed to set permissions before moving";
+
+            // Do the move
+            const char* mvParams = { "-f", fromPath fileSystemRepresentation, toPath fileSystemRepresentation, NULL };
+            res = AuthorizationExecuteWithPrivilegesAndWait( auth, "/bin/mv", kAuthorizationFlagDefaults, mvParams );
+            if( !res )
+                NSLog(@"Failed to move source file from %@ to %@ with error %@", fromPath, toPath, res );
+
+            AuthorizationFree(auth, 0);
+            auth = NULL;
+        }
+
+        return;
+    }
+
+    if (auth) {
+        AuthorizationFree(auth, 0);
+        auth = NULL;
+    }
+
+    err = FSPathMakeRef((UInt8 *)toPath stringByDeletingLastPathComponent fileSystemRepresentation, &dstDirRef, NULL);
+
+    if (err != noErr) {
+        qDebug() << "GOT AN ERROR DOING FSPathMakeRef to get dir to copy into!!!!! aborting move";
+        return;
+    }
+
+    NSFileManager *manager = NSFileManager alloc init autorelease;
+    NSError* error;
+    BOOL success = manager moveItemAtPath:fromPath toPath:toPath error:&error;
+    if (!success) {
+        NSLog( @"Failed to do non-authenticated move! Help! %@", error userInfo objectForKey: NSLocalizedDescriptionKey );
+    }
+
+    NSDictionary* dict = NSDictionary dictionaryWithObjectsAndKeys:NSNumber numberWithBool:success, TKInstallerResultKey, info objectForKey:TKInstallerDelegateKey, TKInstallerDelegateKey, error, TKInstallerErrorKey, nil;
+    self notifyDelegate:dict;
+
+    // TODO Do not release yet as seems to crash on some systems.
+//    fromPath release;
+//    toPath release;
+}
+
+
++ (void)notifyDelegate:(NSDictionary *)info
+{
+        // *** GETS CALLED ON NON-MAIN THREAD!
+    BOOL result = info objectForKey:TKInstallerResultKey boolValue;
+    if (result)
+    {
+        if (info objectForKey:TKInstallerDelegateKey respondsToSelector:@selector(moveFinished))
+            info objectForKey:TKInstallerDelegateKey performSelectorOnMainThread: @selector(moveFinished) withObject:nil waitUntilDone: NO;
+    }
+    else
+    {
+        if (info objectForKey:TKInstallerDelegateKey respondsToSelector:@selector(moveFailedWithError:))
+        {
+            info objectForKey:TKInstallerDelegateKey performSelectorOnMainThread: @selector(moveFailedWithError) withObject:NSDictionary dictionaryWithObjectsAndKeys:info objectForKey:TKInstallerErrorKey, TKInstallerErrorKey, nil waitUntilDone: NO;
+        }
+    }
+}
+
+@end

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/BufferIoDevice.cpp Added

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/BufferIoDevice.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/Connection.cpp Added

@@ -0,0 +1,515 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "Connection.h"
+
+#include "network/Servent.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+#include <QtCore/QTime>
+#include <QtCore/QThread>
+
+#define PROTOVER "4" // must match remote peer, or we can't talk.
+
+
+Connection::Connection( Servent* parent )
+    : QObject()
+    , m_sock( 0 )
+    , m_peerport( 0 )
+    , m_servent( parent )
+    , m_ready( false )
+    , m_onceonly( true )
+    , m_do_shutdown( false )
+    , m_actually_shutting_down( false )
+    , m_peer_disconnected( false )
+    , m_tx_bytes( 0 )
+    , m_tx_bytes_requested( 0 )
+    , m_rx_bytes( 0 )
+    , m_id( "Connection()" )
+    , m_statstimer( 0 )
+    , m_stats_tx_bytes_per_sec( 0 )
+    , m_stats_rx_bytes_per_sec( 0 )
+    , m_rx_bytes_last( 0 )
+    , m_tx_bytes_last( 0 )
+{
+    moveToThread( m_servent->thread() );
+    qDebug() << "CTOR Connection (super)" << thread();
+
+    connect( &m_msgprocessor_out, SIGNAL( ready( msg_ptr ) ),
+             SLOT( sendMsg_now( msg_ptr ) ), Qt::QueuedConnection );
+
+    connect( &m_msgprocessor_in,  SIGNAL( ready( msg_ptr ) ),
+             SLOT( handleMsg( msg_ptr ) ), Qt::QueuedConnection );
+
+    connect( &m_msgprocessor_in, SIGNAL( empty() ),
+             SLOT( handleIncomingQueueEmpty() ), Qt::QueuedConnection );
+}
+
+
+Connection::~Connection()
+{
+    tDebug() << "DTOR connection (super)" << id() << thread() << m_sock.isNull();
+    if( !m_sock.isNull() )
+    {
+//        qDebug() << "deleteLatering sock" << m_sock;
+        m_sock->deleteLater();
+    }
+
+    delete m_statstimer;
+}
+
+
+void
+Connection::handleIncomingQueueEmpty()
+{
+    //qDebug() << Q_FUNC_INFO << "bavail" << m_sock->bytesAvailable()
+    //         << "isopen" << m_sock->isOpen()
+    //         << "m_peer_disconnected" << m_peer_disconnected
+    //         << "bytes rx" << bytesReceived();
+
+    if( !m_sock.isNull() && m_sock->bytesAvailable() == 0 && m_peer_disconnected )
+    {
+        qDebug() << "No more data to read, peer disconnected. shutting down connection."
+                 << "bytesavail" << m_sock->bytesAvailable()
+                 << "bytesrx" << m_rx_bytes;
+        shutdown();
+    }
+}
+
+
+// convenience:
+void
+Connection::setFirstMessage( const QVariant& m )
+{
+    QJson::Serializer ser;
+    const QByteArray ba = ser.serialize( m );
+    //qDebug() << "first msg json len:" << ba.length();
+    setFirstMessage( Msg::factory( ba, Msg::JSON ) );
+}
+
+
+void
+Connection::setFirstMessage( msg_ptr m )
+{
+    m_firstmsg = m;
+    //qDebug() << id() << " first msg set to " << QString::fromAscii(m_firstmsg->payload())
+    //        << "msg len:" << m_firstmsg->length() ;
+}
+
+
+void
+Connection::shutdown( bool waitUntilSentAll )
+{
+    qDebug() << Q_FUNC_INFO << waitUntilSentAll << id();
+    if ( m_do_shutdown )
+    {
+        //qDebug() << id() << " already shutting down";
+        return;
+    }
+
+    m_do_shutdown = true;
+    if ( !waitUntilSentAll )
+    {
+//        qDebug() << "Shutting down immediately " << id();
+        actualShutdown();
+    }
+    else
+    {
+        qDebug() << "Shutting down after transfer complete " << id()
+                 << "Actual/Desired" << m_tx_bytes << m_tx_bytes_requested;
+
+        bytesWritten( 0 ); // trigger shutdown if we've already sent everything
+        // otherwise the bytesWritten slot will call actualShutdown()
+        // once all enqueued data has been properly written to the socket
+    }
+}
+
+
+void
+Connection::actualShutdown()
+{
+    qDebug() << Q_FUNC_INFO << m_actually_shutting_down << id();
+    if ( m_actually_shutting_down )
+    {
+        return;
+    }
+    m_actually_shutting_down = true;
+
+    if ( !m_sock.isNull() && m_sock->isOpen() )
+    {
+        m_sock->disconnectFromHost();
+    }
+
+//    qDebug() << "EMITTING finished()";
+    emit finished();
+}
+
+
+void
+Connection::markAsFailed()
+{
+    qDebug() << "Connection" << id() << "FAILED ***************" << thread();
+    emit failed();
+    shutdown();
+}
+
+
+void
+Connection::start( QTcpSocket* sock )
+{
+    Q_ASSERT( m_sock.isNull() );
+    Q_ASSERT( sock );
+    Q_ASSERT( sock->isValid() );
+
+    m_sock = sock;
+
+    if( m_name.isEmpty() )
+    {
+        m_name = QString( "peer%1" ).arg( m_sock->peerAddress().toString() );
+    }
+
+    QTimer::singleShot( 0, this, SLOT( checkACL() ) );
+}
+
+
+void
+Connection::checkACL()
+{
+    if ( !property( "nodeid" ).isValid() )
+    {
+        tLog() << Q_FUNC_INFO << "Not checking ACL, nodeid is empty";
+        QTimer::singleShot( 0, this, SLOT( doSetup() ) );
+        return;
+    }
+
+    if ( Servent::isIPWhitelisted( m_peerIpAddress ) )
+    {
+        QTimer::singleShot( 0, this, SLOT( doSetup() ) );
+        return;
+    }
+
+    QString nodeid = property( "nodeid" ).toString();
+    QString bareName = name().contains( '/' ) ? name().left( name().indexOf( "/" ) ) : name();
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Checking ACL for" << name();
+    connect( ACLRegistry::instance(), SIGNAL( aclResult( QString, QString, ACLRegistry::ACL ) ), this, SLOT( checkACLResult( QString, QString, ACLRegistry::ACL ) ), Qt::QueuedConnection );
+    QMetaObject::invokeMethod( ACLRegistry::instance(), "isAuthorizedUser", Qt::QueuedConnection, Q_ARG( QString, nodeid ), Q_ARG( QString, bareName ), Q_ARG( ACLRegistry::ACL, ACLRegistry::NotFound ) );
+}
+
+
+void
+Connection::checkACLResult( const QString &nodeid, const QString &username, ACLRegistry::ACL peerStatus )
+{
+    QString bareName = name().contains( '/' ) ? name().left( name().indexOf( "/" ) ) : name();
+    if ( nodeid != property( "nodeid" ).toString() || username != bareName )
+    {
+        tLog() << Q_FUNC_INFO << "nodeid not ours, or username not our barename";
+        return;
+    }
+
+    disconnect( ACLRegistry::instance(), SIGNAL( aclResult( QString, QString, ACLRegistry::ACL ) ) );
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "ACL status is" << peerStatus;
+    if ( peerStatus == ACLRegistry::Stream )
+    {
+        QTimer::singleShot( 0, this, SLOT( doSetup() ) );
+        return;
+    }
+
+    shutdown();
+}
+
+
+void
+Connection::authCheckTimeout()
+{
+    if( m_ready )
+        return;
+
+    qDebug() << "Closing connection, not authed in time.";
+    shutdown();
+}
+
+
+void
+Connection::doSetup()
+{
+    qDebug() << Q_FUNC_INFO << thread();
+    /*
+        New connections can be created from other thread contexts, such as
+        when AudioEngine calls getIODevice.. - we need to ensure that connections
+        and their associated sockets are running in the same thread as the servent.
+
+        HINT: export QT_FATAL_WARNINGS=1 helps to catch these kind of errors.
+     */
+    if( QThread::currentThread() != m_servent->thread() )
+    {
+        // Connections should always be in the same thread as the servent.
+        qDebug() << "Fixing thead affinity...";
+        moveToThread( m_servent->thread() );
+        qDebug() << Q_FUNC_INFO  << thread();
+    }
+
+    //stats timer calculates BW used by this connection
+    m_statstimer = new QTimer;
+    m_statstimer->moveToThread( this->thread() );
+    m_statstimer->setInterval( 1000 );
+    connect( m_statstimer, SIGNAL( timeout() ), SLOT( calcStats() ) );
+    m_statstimer->start();
+    m_statstimer_mark.start();
+
+    m_sock->moveToThread( thread() );
+
+    connect( m_sock.data(), SIGNAL( bytesWritten( qint64 ) ),
+                              SLOT( bytesWritten( qint64 ) ), Qt::QueuedConnection );
+
+    connect( m_sock.data(), SIGNAL( disconnected() ),
+                              SLOT( socketDisconnected() ), Qt::QueuedConnection );
+
+    connect( m_sock.data(), SIGNAL( error( QAbstractSocket::SocketError ) ),
+                              SLOT( socketDisconnectedError( QAbstractSocket::SocketError ) ), Qt::QueuedConnection );
+
+    connect( m_sock.data(), SIGNAL( readyRead() ),
+                              SLOT( readyRead() ), Qt::QueuedConnection );
+
+    // if connection not authed/setup fast enough, kill it:
+    QTimer::singleShot( AUTH_TIMEOUT, this, SLOT( authCheckTimeout() ) );
+
+    if( outbound() )
+    {
+        Q_ASSERT( !m_firstmsg.isNull() );
+        sendMsg( m_firstmsg );
+    }
+    else
+    {
+        sendMsg( Msg::factory( PROTOVER, Msg::SETUP ) );
+    }
+
+    // call readyRead incase we missed the signal in between the servent disconnecting and us
+    // connecting to the signal - won't do anything if there are no bytesAvailable anyway.
+    readyRead();
+}
+
+
+void
+Connection::socketDisconnected()
+{
+    tDebug() << "SOCKET DISCONNECTED" << this->name() << id()
+             << "shutdown will happen after incoming queue empties."
+             << "bytesavail:" << m_sock->bytesAvailable()
+             << "bytesRecvd" << bytesReceived();
+
+    m_peer_disconnected = true;
+    emit socketClosed();
+
+    if( m_msgprocessor_in.length() == 0 && m_sock->bytesAvailable() == 0 )
+    {
+        handleIncomingQueueEmpty();
+        actualShutdown();
+    }
+}
+
+
+void
+Connection::socketDisconnectedError( QAbstractSocket::SocketError e )
+{
+    qDebug() << "SOCKET ERROR CODE" << e << this->name() << "CALLING Connection::shutdown(false)";
+
+    if ( e == QAbstractSocket::RemoteHostClosedError )
+        return;
+
+    m_peer_disconnected = true;
+
+    emit socketErrored(e);
+    emit socketClosed();
+
+    shutdown( false );
+}
+
+
+QString
+Connection::id() const
+{
+    return m_id;
+}
+
+
+void
+Connection::setId( const QString& id )
+{
+    m_id = id;
+}
+
+
+void
+Connection::readyRead()
+{
+//    qDebug() << "readyRead, bytesavail:" << m_sock->bytesAvailable();
+
+    if( m_msg.isNull() )
+    {
+        if( m_sock->bytesAvailable() < Msg::headerSize() )
+            return;
+
+        char msgheader Msg::headerSize() ;
+        if( m_sock->read( (char*) &msgheader, Msg::headerSize() ) != Msg::headerSize() )
+        {
+            qDebug() << "Failed reading msg header";
+            this->markAsFailed();
+            return;
+        }
+
+        m_msg = Msg::begin( (char*) &msgheader );
+        m_rx_bytes += Msg::headerSize();
+    }
+
+    if( m_sock->bytesAvailable() < m_msg->length() )
+        return;
+
+    QByteArray ba = m_sock->read( m_msg->length() );
+    if( ba.length() != (qint32)m_msg->length() )
+    {
+        qDebug() << "Failed to read full msg payload";
+        this->markAsFailed();
+        return;
+    }
+    m_msg->fill( ba );
+    m_rx_bytes += ba.length();
+
+    handleReadMsg(); // process m_msg and clear() it
+
+    // since there is no explicit threading, use the event loop to schedule this:
+    if( m_sock->bytesAvailable() )
+    {
+        QTimer::singleShot( 0, this, SLOT( readyRead() ) );
+    }
+}
+
+
+void
+Connection::handleReadMsg()
+{
+    if( outbound() == false &&
+        m_msg->is( Msg::SETUP ) &&
+        m_msg->payload() == "ok" )
+    {
+        m_ready = true;
+        qDebug() << "Connection" << id() << "READY";
+        setup();
+        emit ready();
+    }
+    else if( !m_ready &&
+             outbound() &&
+             m_msg->is( Msg::SETUP ) )
+    {
+        if( m_msg->payload() == PROTOVER )
+        {
+            sendMsg( Msg::factory( "ok", Msg::SETUP ) );
+            m_ready = true;
+            qDebug() << "Connection" << id() << "READY";
+            setup();
+            emit ready();
+        }
+        else
+        {
+            sendMsg( Msg::factory( "{\"method\":\"protovercheckfail\"}", Msg::JSON | Msg::SETUP ) );
+            shutdown( true );
+        }
+    }
+    else
+    {
+        m_msgprocessor_in.append( m_msg );
+    }
+
+    m_msg.clear();
+}
+
+
+void
+Connection::sendMsg( QVariant j )
+{
+    if( m_do_shutdown )
+        return;
+
+    QJson::Serializer serializer;
+    const QByteArray payload = serializer.serialize( j );
+    sendMsg( Msg::factory( payload, Msg::JSON ) );
+}
+
+
+void
+Connection::sendMsg( msg_ptr msg )
+{
+    if( m_do_shutdown )
+    {
+        qDebug() << Q_FUNC_INFO << "SHUTTING DOWN, NOT SENDING msg flags:"
+                << (int)msg->flags() << "length:" << msg->length() << id();
+        return;
+    }
+
+    m_tx_bytes_requested += msg->length() + Msg::headerSize();
+    m_msgprocessor_out.append( msg );
+}
+
+
+void
+Connection::sendMsg_now( msg_ptr msg )
+{
+    //qDebug() << Q_FUNC_INFO << thread() << QThread::currentThread();
+    Q_ASSERT( QThread::currentThread() == thread() );
+//    Q_ASSERT( this->isRunning() );
+
+    if ( m_sock.isNull() || !m_sock->isOpen() || !m_sock->isWritable() )
+    {
+        qDebug() << "***** Socket problem, whilst in sendMsg(). Cleaning up. *****";
+        shutdown( false );
+        return;
+    }
+
+    if ( !msg->write( m_sock.data() ) )
+    {
+        //qDebug() << "Error writing to socket in sendMsg() *************";
+        shutdown( false );
+        return;
+    }
+}
+
+
+void
+Connection::bytesWritten( qint64 i )
+{
+    m_tx_bytes += i;
+    // if we are waiting to shutdown, and have sent all queued data, do actual shutdown:
+    if ( m_do_shutdown && m_tx_bytes == m_tx_bytes_requested )
+        actualShutdown();
+}
+
+
+void
+Connection::calcStats()
+{
+    int elapsed = m_statstimer_mark.restart(); // ms since last calc
+
+    m_stats_tx_bytes_per_sec = (float)1000 * ( (m_tx_bytes - m_tx_bytes_last) / (float)elapsed );
+    m_stats_rx_bytes_per_sec = (float)1000 * ( (m_rx_bytes - m_rx_bytes_last) / (float)elapsed );
+
+    m_rx_bytes_last = m_rx_bytes;
+    m_tx_bytes_last = m_tx_bytes;
+
+    emit statsTick( m_stats_tx_bytes_per_sec, m_stats_rx_bytes_per_sec );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/Connection.h Added

@@ -0,0 +1,155 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 CONNECTION_H
+#define CONNECTION_H
+
+#include <QtCore/QSharedPointer>
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QHostAddress>
+#include <QtCore/QVariant>
+#include <QtCore/QVariantMap>
+#include <QtCore/QString>
+#include <QtCore/QDataStream>
+#include <QtCore/QtEndian>
+#include <QtCore/QTimer>
+#include <QtCore/QTime>
+#include <QtCore/QPointer>
+
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+#include <qjson/qobjecthelper.h>
+
+#include "Msg.h"
+#include "MsgProcessor.h"
+#include "libtomahawk/AclRegistry.h"
+
+#include "DllMacro.h"
+
+class Servent;
+
+class DLLEXPORT Connection : public QObject
+{
+Q_OBJECT
+
+public:
+
+    Connection( Servent* parent );
+    virtual ~Connection();
+    virtual Connection* clone() = 0;
+
+    QString id() const;
+    void setId( const QString& );
+
+    void setFirstMessage( const QVariant& m );
+    void setFirstMessage( msg_ptr m );
+    msg_ptr firstMessage() const { return m_firstmsg; };
+
+    const QPointer<QTcpSocket>& socket() { return m_sock; };
+
+    void setOutbound( bool o ) { m_outbound = o; };
+    bool outbound() const { return m_outbound; }
+
+    Servent* servent() { return m_servent; };
+
+    // get public port of remote peer:
+    int peerPort() { return m_peerport; };
+    void setPeerPort( int p ) { m_peerport = p; };
+
+    void markAsFailed();
+
+    void setName( const QString& n ) { m_name = n; };
+    QString name() const { return m_name; };
+
+    void setOnceOnly( bool b ) { m_onceonly = b; };
+    bool onceOnly() const { return m_onceonly; };
+
+    bool isReady() const { return m_ready; } ;
+    bool isRunning() const { return m_sock != 0; }
+
+    qint64 bytesSent() const { return m_tx_bytes; }
+    qint64 bytesReceived() const { return m_rx_bytes; }
+
+    void setMsgProcessorModeOut( quint32 m ) { m_msgprocessor_out.setMode( m ); }
+    void setMsgProcessorModeIn( quint32 m ) { m_msgprocessor_in.setMode( m ); }
+
+    const QHostAddress peerIpAddress() const { return m_peerIpAddress; }
+
+signals:
+    void ready();
+    void failed();
+    void finished();
+    void statsTick( qint64 tx_bytes_sec, qint64 rx_bytes_sec );
+    void socketClosed();
+    void socketErrored( QAbstractSocket::SocketError );
+
+protected:
+    virtual void setup() = 0;
+
+protected slots:
+    virtual void handleMsg( msg_ptr msg ) = 0;
+
+public slots:
+    virtual void start( QTcpSocket* sock );
+    void sendMsg( QVariant );
+    void sendMsg( msg_ptr );
+
+    void shutdown( bool waitUntilSentAll = false );
+
+private slots:
+    void handleIncomingQueueEmpty();
+    void sendMsg_now( msg_ptr );
+    void socketDisconnected();
+    void socketDisconnectedError( QAbstractSocket::SocketError );
+    void readyRead();
+    void doSetup();
+    void checkACL();
+    void checkACLResult( const QString &nodeid, const QString &username, ACLRegistry::ACL peerStatus );
+    void authCheckTimeout();
+    void bytesWritten( qint64 );
+    void calcStats();
+
+protected:
+    QPointer<QTcpSocket> m_sock;
+    int m_peerport;
+    msg_ptr m_msg;
+    QJson::Parser parser;
+    Servent* m_servent;
+    bool m_outbound, m_ready, m_onceonly;
+    msg_ptr m_firstmsg;
+    QString m_name;
+    QHostAddress m_peerIpAddress;
+
+private:
+    void handleReadMsg();
+    void actualShutdown();
+    bool m_do_shutdown, m_actually_shutting_down, m_peer_disconnected;
+    qint64 m_tx_bytes, m_tx_bytes_requested;
+    qint64 m_rx_bytes;
+    QString m_id;
+
+    QTimer* m_statstimer;
+    QTime m_statstimer_mark;
+    qint64 m_stats_tx_bytes_per_sec, m_stats_rx_bytes_per_sec;
+    qint64 m_rx_bytes_last, m_tx_bytes_last;
+
+    MsgProcessor m_msgprocessor_in, m_msgprocessor_out;
+};
+
+#endif // CONNECTION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/ControlConnection.cpp Added

@@ -0,0 +1,311 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "ControlConnection.h"
+
+#include "StreamConnection.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_CollectionStats.h"
+#include "DbSyncConnection.h"
+#include "SourceList.h"
+#include "network/DbSyncConnection.h"
+#include "network/Servent.h"
+#include "sip/SipHandler.h"
+#include "utils/Logger.h"
+
+#define TCP_TIMEOUT 600
+
+using namespace Tomahawk;
+
+
+ControlConnection::ControlConnection( Servent* parent, const QHostAddress &ha )
+    : Connection( parent )
+    , m_dbsyncconn( 0 )
+    , m_registered( false )
+    , m_pingtimer( 0 )
+{
+    qDebug() << "CTOR controlconnection";
+    setId("ControlConnection()");
+
+    // auto delete when connection closes:
+    connect( this, SIGNAL( finished() ), SLOT( deleteLater() ) );
+
+    this->setMsgProcessorModeIn( MsgProcessor::UNCOMPRESS_ALL | MsgProcessor::PARSE_JSON );
+    this->setMsgProcessorModeOut( MsgProcessor::COMPRESS_IF_LARGE );
+
+    m_peerIpAddress = ha;
+}
+
+
+ControlConnection::ControlConnection( Servent* parent, const QString &ha )
+    : Connection( parent )
+    , m_dbsyncconn( 0 )
+    , m_registered( false )
+    , m_pingtimer( 0 )
+{
+    qDebug() << "CTOR controlconnection";
+    setId("ControlConnection()");
+
+    // auto delete when connection closes:
+    connect( this, SIGNAL( finished() ), SLOT( deleteLater() ) );
+
+    this->setMsgProcessorModeIn( MsgProcessor::UNCOMPRESS_ALL | MsgProcessor::PARSE_JSON );
+    this->setMsgProcessorModeOut( MsgProcessor::COMPRESS_IF_LARGE );
+
+    if ( !ha.isEmpty() )
+    {
+        QHostAddress qha( ha );
+        if ( !qha.isNull() )
+            m_peerIpAddress = qha;
+        else
+        {
+            QHostInfo qhi = QHostInfo::fromName( ha );
+            if ( !qhi.addresses().isEmpty() )
+                m_peerIpAddress = qhi.addresses().first();
+        }
+    }
+}
+
+
+ControlConnection::~ControlConnection()
+{
+    qDebug() << "DTOR controlconnection";
+
+    if ( !m_source.isNull() )
+        m_source->setOffline();
+
+    delete m_pingtimer;
+    m_servent->unregisterControlConnection( this );
+    if ( m_dbsyncconn )
+        m_dbsyncconn->deleteLater();
+}
+
+source_ptr
+ControlConnection::source() const
+{
+    return m_source;
+}
+
+Connection*
+ControlConnection::clone()
+{
+    ControlConnection* clone = new ControlConnection( servent(), m_peerIpAddress.toString() );
+    clone->setOnceOnly( onceOnly() );
+    clone->setName( name() );
+    return clone;
+}
+
+
+void
+ControlConnection::setup()
+{
+    qDebug() << Q_FUNC_INFO << id() << name();
+
+    if ( !m_source.isNull() )
+    {
+        qDebug() << "This source seems to be online already.";
+        Q_ASSERT( false );
+        return;
+    }
+
+    QString friendlyName = name();
+
+    tDebug() << "Detected name:" << name() << friendlyName << m_sock->peerAddress();
+
+    // setup source and remote collection for this peer
+    m_source = SourceList::instance()->get( id(), friendlyName, true );
+    m_source->setControlConnection( this );
+
+    // delay setting up collection/etc until source is synced.
+    // we need it DB synced so it has an ID + exists in DB.
+    connect( m_source.data(), SIGNAL( syncedWithDatabase() ),
+                                SLOT( registerSource() ), Qt::QueuedConnection );
+
+    m_source->setOnline();
+
+    m_pingtimer = new QTimer;
+    m_pingtimer->setInterval( 5000 );
+    connect( m_pingtimer, SIGNAL( timeout() ), SLOT( onPingTimer() ) );
+    m_pingtimer->start();
+    m_pingtimer_mark.start();
+}
+
+
+// source was synced to DB, set it up properly:
+void
+ControlConnection::registerSource()
+{
+    qDebug() << Q_FUNC_INFO << m_source->id();
+    Source* source = (Source*) sender();
+    Q_UNUSED( source )
+    Q_ASSERT( source == m_source.data() );
+
+#ifndef ENABLE_HEADLESS
+//    qDebug() << Q_FUNC_INFO << "Setting avatar ... " << name() << !SipHandler::instance()->avatar( name() ).isNull();
+    if( !SipHandler::instance()->avatar( name() ).isNull() )
+    {
+        source->setAvatar( SipHandler::instance()->avatar( name() ) );
+    }
+#endif
+
+    m_registered = true;
+    m_servent->registerControlConnection( this );
+    setupDbSyncConnection();
+}
+
+
+void
+ControlConnection::setupDbSyncConnection( bool ondemand )
+{
+    qDebug() << Q_FUNC_INFO << ondemand << m_source->id() << m_dbconnkey << m_dbsyncconn << m_registered;
+
+    if ( m_dbsyncconn || !m_registered )
+        return;
+
+    Q_ASSERT( m_source->id() > 0 );
+
+    if( !m_dbconnkey.isEmpty() )
+    {
+        qDebug() << "Connecting to DBSync offer from peer...";
+        m_dbsyncconn = new DBSyncConnection( m_servent, m_source );
+
+        m_servent->createParallelConnection( this, m_dbsyncconn, m_dbconnkey );
+        m_dbconnkey.clear();
+    }
+    else if( !outbound() || ondemand ) // only one end makes the offer
+    {
+        qDebug() << "Offering a DBSync key to peer...";
+        m_dbsyncconn = new DBSyncConnection( m_servent, m_source );
+
+        QString key = uuid();
+        m_servent->registerOffer( key, m_dbsyncconn );
+        QVariantMap m;
+        m.insert( "method", "dbsync-offer" );
+        m.insert( "key", key );
+        sendMsg( m );
+    }
+
+    if ( m_dbsyncconn )
+    {
+        connect( m_dbsyncconn, SIGNAL( finished() ),
+                 m_dbsyncconn,   SLOT( deleteLater() ) );
+
+        connect( m_dbsyncconn, SIGNAL( destroyed( QObject* ) ),
+                                 SLOT( dbSyncConnFinished( QObject* ) ), Qt::DirectConnection );
+    }
+}
+
+
+void
+ControlConnection::dbSyncConnFinished( QObject* c )
+{
+    qDebug() << Q_FUNC_INFO << "DBSync connection closed (for now)";
+    if( (DBSyncConnection*)c == m_dbsyncconn )
+    {
+        //qDebug() << "Setting m_dbsyncconn to NULL";
+        m_dbsyncconn = NULL;
+    }
+    else
+        qDebug() << "Old DbSyncConn destroyed?!";
+}
+
+
+DBSyncConnection*
+ControlConnection::dbSyncConnection()
+{
+    qDebug() << Q_FUNC_INFO << m_source->id();
+    if ( !m_dbsyncconn )
+    {
+        setupDbSyncConnection( true );
+//        Q_ASSERT( m_dbsyncconn );
+    }
+
+    return m_dbsyncconn;
+}
+
+
+void
+ControlConnection::handleMsg( msg_ptr msg )
+{
+    if ( msg->is( Msg::PING ) )
+    {
+        // qDebug() << "Received Connection PING, nice." << m_pingtimer_mark.elapsed();
+        m_pingtimer_mark.restart();
+        return;
+    }
+
+    // if small and not compresed, print it out for debug
+    if( msg->length() < 1024 && !msg->is( Msg::COMPRESSED ) )
+    {
+        qDebug() << id() << "got msg:" << QString::fromAscii( msg->payload() );
+    }
+
+    // All control connection msgs are JSON
+    if( !msg->is( Msg::JSON ) )
+    {
+        Q_ASSERT( msg->is( Msg::JSON ) );
+        markAsFailed();
+        return;
+    }
+
+    QVariantMap m = msg->json().toMap();
+    if( !m.isEmpty() )
+    {
+        if( m.value("conntype").toString() == "request-offer" )
+        {
+            QString theirkey = m"key".toString();
+            QString ourkey   = m"offer".toString();
+            QString theirdbid = m"controlid".toString();
+            servent()->reverseOfferRequest( this, theirdbid, ourkey, theirkey );
+        }
+        else if( m.value( "method" ).toString() == "dbsync-offer" )
+        {
+            m_dbconnkey = m.value( "key" ).toString() ;
+            setupDbSyncConnection();
+        }
+        else if( m.value( "method" ) == "protovercheckfail" )
+        {
+            qDebug() << "*** Remote peer protocol version mismatch, connection closed";
+            shutdown( true );
+            return;
+        }
+        else
+        {
+            qDebug() << id() << "Unhandled msg:" << QString::fromAscii( msg->payload() );
+        }
+
+        return;
+    }
+
+    qDebug() << id() << "Invalid msg:" << QString::fromAscii(msg->payload());
+}
+
+
+
+void
+ControlConnection::onPingTimer()
+{
+    if ( m_pingtimer_mark.elapsed() >= TCP_TIMEOUT * 1000 )
+    {
+        qDebug() << "Timeout reached! Shutting down connection to" << m_source->friendlyName();
+        shutdown( true );
+    }
+
+    sendMsg( Msg::factory( QByteArray(), Msg::PING ) );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/ControlConnection.h Added

@@ -0,0 +1,76 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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/>.
+ */
+
+/*
+    One ControlConnection always remains open to each peer.
+
+    They arrange connections/reverse connections, inform us
+    when the peer goes offline, and own+setup DBSyncConnections.
+
+*/
+#ifndef CONTROLCONNECTION_H
+#define CONTROLCONNECTION_H
+
+#include "Typedefs.h"
+#include "Connection.h"
+
+#include "DllMacro.h"
+
+class Servent;
+class DBSyncConnection;
+
+class DLLEXPORT ControlConnection : public Connection
+{
+Q_OBJECT
+
+public:
+    explicit ControlConnection( Servent* parent = 0, const QHostAddress &ha = QHostAddress() );
+    explicit ControlConnection( Servent* parent = 0, const QString &ha = QString() );
+    ~ControlConnection();
+    Connection* clone();
+
+    DBSyncConnection* dbSyncConnection();
+
+    Tomahawk::source_ptr source() const;
+
+protected:
+    virtual void setup();
+
+protected slots:
+    virtual void handleMsg( msg_ptr msg );
+
+private slots:
+    void dbSyncConnFinished( QObject* c );
+    void registerSource();
+    void onPingTimer();
+
+private:
+    void setupDbSyncConnection( bool ondemand = false );
+
+    Tomahawk::source_ptr m_source;
+    DBSyncConnection* m_dbsyncconn;
+
+    QString m_dbconnkey;
+    bool m_registered;
+
+    QTimer* m_pingtimer;
+    QTime m_pingtimer_mark;
+};
+
+#endif // CONTROLCONNECTION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/DbSyncConnection.cpp Added

@@ -0,0 +1,297 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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/>.
+ */
+
+/*
+    Database syncing using the oplog table.
+    =======================================
+    Load the last GUID we applied for the peer, tell them it.
+    In return, they send us all new ops since that guid.
+
+    We then apply those new ops to our cache of their data
+
+    Synced.
+
+*/
+
+#include "DbSyncConnection.h"
+
+#include "database/Database.h"
+#include "database/DatabaseCommand.h"
+#include "database/DatabaseCommand_CollectionStats.h"
+#include "database/DatabaseCommand_LoadOps.h"
+#include "RemoteCollection.h"
+#include "Source.h"
+#include "SourceList.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+DBSyncConnection::DBSyncConnection( Servent* s, const source_ptr& src )
+    : Connection( s )
+    , m_source( src )
+    , m_state( UNKNOWN )
+    , m_fetchCount( 0 )
+{
+    qDebug() << Q_FUNC_INFO << src->id() << thread();
+
+    connect( this,            SIGNAL( stateChanged( DBSyncConnection::State, DBSyncConnection::State, QString ) ),
+             m_source.data(),   SLOT( onStateChanged( DBSyncConnection::State, DBSyncConnection::State, QString ) ) );
+    connect( m_source.data(), SIGNAL( commandsFinished() ),
+             this,              SLOT( lastOpApplied() ) );
+
+    this->setMsgProcessorModeIn( MsgProcessor::PARSE_JSON | MsgProcessor::UNCOMPRESS_ALL );
+
+    // msgs are stored compressed in the db, so not typically needed here, but doesnt hurt:
+    this->setMsgProcessorModeOut( MsgProcessor::COMPRESS_IF_LARGE );
+}
+
+
+DBSyncConnection::~DBSyncConnection()
+{
+    tDebug() << "DTOR" << Q_FUNC_INFO << m_source->id() << m_source->friendlyName();
+    m_state = SHUTDOWN;
+}
+
+
+void
+DBSyncConnection::changeState( State newstate )
+{
+    if ( m_state == SHUTDOWN )
+        return;
+
+    State s = m_state;
+    m_state = newstate;
+    qDebug() << "DBSYNC State changed from" << s << "to" << newstate << "- source:" << m_source->id();
+    emit stateChanged( newstate, s, "" );
+}
+
+
+void
+DBSyncConnection::setup()
+{
+    setId( QString( "DBSyncConnection/%1" ).arg( socket()->peerAddress().toString() ) );
+    check();
+}
+
+
+void
+DBSyncConnection::trigger()
+{
+    // if we're still setting up the connection, do nothing - we sync on first connect anyway:
+    if ( !isRunning() )
+        return;
+
+    QMetaObject::invokeMethod( this, "sendMsg", Qt::QueuedConnection,
+                               Q_ARG( msg_ptr, Msg::factory( "{\"method\":\"trigger\"}", Msg::JSON ) ) );
+}
+
+
+void
+DBSyncConnection::check()
+{
+    qDebug() << Q_FUNC_INFO << this << m_source->id();
+
+    if ( m_state == SHUTDOWN )
+    {
+        qDebug() << "Aborting sync due to shutdown.";
+        return;
+    }
+    if ( m_state != UNKNOWN && m_state != SYNCED )
+    {
+        qDebug() << "Syncing in progress already.";
+        return;
+    }
+
+    m_uscache.clear();
+    changeState( CHECKING );
+
+    if ( m_source->lastCmdGuid().isEmpty() )
+    {
+        tDebug() << "Fetching lastCmdGuid from database!";
+        DatabaseCommand_CollectionStats* cmd_them = new DatabaseCommand_CollectionStats( m_source );
+        connect( cmd_them, SIGNAL( done( QVariantMap ) ), SLOT( gotThem( QVariantMap ) ) );
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd_them) );
+    }
+    else
+    {
+        fetchOpsData( m_source->lastCmdGuid() );
+    }
+}
+
+
+/// Called once we've loaded our cached data about their collection
+void
+DBSyncConnection::gotThem( const QVariantMap& m )
+{
+    fetchOpsData( m.value( "lastop" ).toString() );
+}
+
+
+void
+DBSyncConnection::fetchOpsData( const QString& sinceguid )
+{
+    changeState( FETCHING );
+
+    tLog() << "Sending a FETCHOPS cmd since:" << sinceguid << "- source:" << m_source->id();
+
+    QVariantMap msg;
+    msg.insert( "method", "fetchops" );
+    msg.insert( "lastop", sinceguid );
+    sendMsg( msg );
+}
+
+
+void
+DBSyncConnection::handleMsg( msg_ptr msg )
+{
+    Q_ASSERT( !msg->is( Msg::COMPRESSED ) );
+
+    if ( m_state == FETCHING )
+        changeState( PARSING );
+
+    // "everything is synced" indicated by non-json msg containing "ok":
+    if ( !msg->is( Msg::JSON ) &&
+         msg->is( Msg::DBOP ) &&
+         msg->payload() == "ok" )
+    {
+        changeState( SYNCED );
+
+        // calc the collection stats, to updates the "X tracks" in the sidebar etc
+        // this is done automatically if you run a dbcmd to add files.
+        DatabaseCommand_CollectionStats* cmd = new DatabaseCommand_CollectionStats( m_source );
+        connect( cmd,           SIGNAL( done( const QVariantMap & ) ),
+                 m_source.data(), SLOT( setStats( const QVariantMap& ) ), Qt::QueuedConnection );
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
+        return;
+    }
+
+    Q_ASSERT( msg->is( Msg::JSON ) );
+
+    QVariantMap m = msg->json().toMap();
+    if ( m.empty() )
+    {
+        tLog() << "Failed to parse msg in dbsync" << m_source->id() << m_source->friendlyName();
+        Q_ASSERT( false );
+        return;
+    }
+
+    // a db sync op msg
+    if ( msg->is( Msg::DBOP ) )
+    {
+        DatabaseCommand* cmd = DatabaseCommand::factory( m, m_source );
+        if ( cmd )
+        {
+            QSharedPointer<DatabaseCommand> cmdsp = QSharedPointer<DatabaseCommand>(cmd);
+            m_source->addCommand( cmdsp );
+        }
+
+        if ( !msg->is( Msg::FRAGMENT ) ) // last msg in this batch
+        {
+            changeState( SAVING ); // just DB work left to complete
+            m_source->executeCommands();
+        }
+        return;
+    }
+
+    if ( m.value( "method" ).toString() == "fetchops" )
+    {
+        ++m_fetchCount;
+        tDebug() << "Fetching new dbops:" << m"lastop".toString() << m_fetchCount;
+        m_uscache = m;
+        sendOps();
+        return;
+    }
+
+    if ( m.value( "method" ).toString() == "trigger" )
+    {
+        tLog() << "Got trigger msg on dbsyncconnection, checking for new stuff.";
+        check();
+        return;
+    }
+
+    tLog() << Q_FUNC_INFO << "Unhandled msg:" << msg->payload();
+    Q_ASSERT( false );
+}
+
+
+void
+DBSyncConnection::lastOpApplied()
+{
+    changeState( SYNCED );
+    // check again, until peer responds we have no new ops to process
+    check();
+}
+
+
+/// request new copies of anything we've cached that is stale
+void
+DBSyncConnection::sendOps()
+{
+    tLog() << "Will send peer" << m_source->id() << "all ops since" << m_uscache.value( "lastop" ).toString();
+
+    source_ptr src = SourceList::instance()->getLocal();
+
+    DatabaseCommand_loadOps* cmd = new DatabaseCommand_loadOps( src, m_uscache.value( "lastop" ).toString() );
+    connect( cmd, SIGNAL( done( QString, QString, QList< dbop_ptr > ) ),
+                    SLOT( sendOpsData( QString, QString, QList< dbop_ptr > ) ) );
+
+    m_uscache.clear();
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+DBSyncConnection::sendOpsData( QString sinceguid, QString lastguid, QList< dbop_ptr > ops )
+{
+    if ( m_lastSentOp == lastguid )
+        ops.clear();
+
+    m_lastSentOp = lastguid;
+    if ( ops.length() == 0 )
+    {
+        tLog( LOGVERBOSE ) << "Sending ok" << m_source->id() << m_source->friendlyName();
+        sendMsg( Msg::factory( "ok", Msg::DBOP ) );
+        return;
+    }
+
+    tLog( LOGVERBOSE ) << Q_FUNC_INFO << sinceguid << lastguid << "Num ops to send:" << ops.length();
+
+    int i;
+    for( i = 0; i < ops.length(); ++i )
+    {
+        quint8 flags = Msg::JSON | Msg::DBOP;
+
+        if ( ops.at( i )->compressed )
+            flags |= Msg::COMPRESSED;
+        if ( i != ops.length() - 1 )
+            flags |= Msg::FRAGMENT;
+
+        sendMsg( Msg::factory( ops.at( i )->payload, flags ) );
+    }
+}
+
+
+Connection*
+DBSyncConnection::clone()
+{
+    Q_ASSERT( false );
+    return 0;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/DbSyncConnection.h Added

@@ -0,0 +1,89 @@
+/* === 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
+ *   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 DBSYNCCONNECTION_H
+#define DBSYNCCONNECTION_H
+
+#include <QObject>
+#include <QTimer>
+#include <QSharedPointer>
+#include <QIODevice>
+
+#include "network/Connection.h"
+#include "database/Op.h"
+#include "Typedefs.h"
+
+class DatabaseCommand;
+
+class DBSyncConnection : public Connection
+{
+Q_OBJECT
+
+public:
+    enum State
+    {
+        UNKNOWN,
+        CHECKING,
+        FETCHING,
+        PARSING,
+        SAVING,
+        SYNCED,
+        SCANNING,
+        SHUTDOWN
+    };
+
+    explicit DBSyncConnection( Servent* s, const Tomahawk::source_ptr& src );
+    virtual ~DBSyncConnection();
+
+    void setup();
+    Connection* clone();
+
+signals:
+    void stateChanged( DBSyncConnection::State newstate, DBSyncConnection::State oldstate, const QString& info );
+
+protected slots:
+    virtual void handleMsg( msg_ptr msg );
+
+public slots:
+    void sendOps();
+    /// trigger a re-sync to pick up any new ops
+    void trigger();
+
+private slots:
+    void gotThem( const QVariantMap& m );
+
+    void fetchOpsData( const QString& sinceguid );
+    void sendOpsData( QString sinceguid, QString lastguid, QList< dbop_ptr > ops );
+    void lastOpApplied();
+
+    void check();
+
+private:
+    void synced();
+    void changeState( State newstate );
+
+    int m_fetchCount;
+    Tomahawk::source_ptr m_source;
+    QVariantMap m_uscache;
+
+    QString m_lastSentOp;
+
+    State m_state;
+};
+
+#endif // DBSYNCCONNECTION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/Msg.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/MsgProcessor.cpp Added

@@ -0,0 +1,137 @@
+/* === 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
+ *   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 "MsgProcessor.h"
+
+#include "network/Servent.h"
+#include "utils/Logger.h"
+
+
+MsgProcessor::MsgProcessor( quint32 mode, quint32 t ) :
+    QObject(), m_mode( mode ), m_threshold( t ), m_totmsgsize( 0 )
+{
+    moveToThread( Servent::instance()->thread() );
+}
+
+
+void
+MsgProcessor::append( msg_ptr msg )
+{
+    if( QThread::currentThread() != thread() )
+    {
+        qDebug() << "reinvoking msgprocessor::append in correct thread, ie not" << QThread::currentThread();
+        QMetaObject::invokeMethod( this, "append", Qt::QueuedConnection, Q_ARG(msg_ptr, msg) );
+        return;
+    }
+
+    m_msgs.append( msg );
+    m_msg_ready.insert( msg.data(), false );
+
+    m_totmsgsize += msg->payload().length();
+
+    if( m_mode & NOTHING )
+    {
+        //qDebug() << "MsgProcessor::NOTHING";
+        handleProcessedMsg( msg );
+        return;
+    }
+
+    QFuture<msg_ptr> fut = QtConcurrent::run(&MsgProcessor::process, msg, m_mode, m_threshold);
+    QFutureWatcher<msg_ptr> * watcher = new QFutureWatcher<msg_ptr>;
+    connect( watcher, SIGNAL( finished() ),
+             this, SLOT( processed() ),
+             Qt::QueuedConnection );
+
+    watcher->setFuture( fut );
+}
+
+
+void
+MsgProcessor::processed()
+{
+    QFutureWatcher<msg_ptr> * watcher = (QFutureWatcher<msg_ptr> *) sender();
+    msg_ptr msg = watcher->result();
+    watcher->deleteLater();
+    handleProcessedMsg( msg );
+}
+
+
+void
+MsgProcessor::handleProcessedMsg( msg_ptr msg )
+{
+    Q_ASSERT( QThread::currentThread() == thread() );
+
+    m_msg_ready.insert( msg.data(), true );
+
+    while( !m_msgs.isEmpty() )
+    {
+        if( m_msg_ready.value( m_msgs.first().data() ) )
+        {
+            msg_ptr m = m_msgs.takeFirst();
+            m_msg_ready.remove( m.data() );
+            //qDebug() << Q_FUNC_INFO << "totmsgsize:" << m_totmsgsize;
+            emit ready( m );
+        }
+        else
+        {
+            return;
+        }
+    }
+
+    //qDebug() << Q_FUNC_INFO << "EMPTY, no msgs left.";
+    emit empty();
+}
+
+
+/// This method is run by QtConcurrent:
+msg_ptr
+MsgProcessor::process( msg_ptr msg, quint32 mode, quint32 threshold )
+{
+    // uncompress if needed
+    if( (mode & UNCOMPRESS_ALL) && msg->is( Msg::COMPRESSED ) )
+    {
+//        qDebug() << "MsgProcessor::UNCOMPRESSING";
+        msg->m_payload = qUncompress( msg->payload() );
+        msg->m_length  = msg->m_payload.length();
+        msg->m_flags ^= Msg::COMPRESSED;
+    }
+
+    // parse json payload into qvariant if needed
+    if( (mode & PARSE_JSON) &&
+        msg->is( Msg::JSON ) &&
+        msg->m_json_parsed == false )
+    {
+//        qDebug() << "MsgProcessor::PARSING JSON";
+        bool ok;
+        QJson::Parser parser;
+        msg->m_json = parser.parse( msg->payload(), &ok );
+        msg->m_json_parsed = true;
+    }
+
+    // compress if needed
+    if( (mode & COMPRESS_IF_LARGE) &&
+        !msg->is( Msg::COMPRESSED )
+        && msg->length() > threshold )
+    {
+//        qDebug() << "MsgProcessor::COMPRESSING";
+        msg->m_payload = qCompress( msg->payload(), 9 );
+        msg->m_length  = msg->m_payload.length();
+        msg->m_flags |= Msg::COMPRESSED;
+    }
+    return msg;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/MsgProcessor.h Added

@@ -0,0 +1,82 @@
+/* === 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
+ *   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/>.
+ */
+
+/*
+    MsgProcessor is a FIFO queue of msg_ptr, you .add() a msg_ptr, and
+    it emits done(msg_ptr) for each msg, preserving the order.
+
+    It can be configured to auto-compress, or de-compress msgs for sending
+    or receiving.
+
+    It uses QtConcurrent, but preserves msg order.
+
+    NOT threadsafe.
+*/
+#ifndef MSGPROCESSOR_H
+#define MSGPROCESSOR_H
+
+#include <QObject>
+#include <QtConcurrentRun>
+#include <QFuture>
+#include <QFutureWatcher>
+
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+#include <qjson/qobjecthelper.h>
+
+#include "Msg.h"
+
+class MsgProcessor : public QObject
+{
+Q_OBJECT
+public:
+    enum Mode
+    {
+        NOTHING = 0,
+        COMPRESS_IF_LARGE = 1,
+        UNCOMPRESS_ALL = 2,
+        PARSE_JSON = 4
+    };
+
+    explicit MsgProcessor( quint32 mode = NOTHING, quint32 t = 512 );
+
+    void setMode( quint32 m ) { m_mode = m ; }
+
+    static msg_ptr process( msg_ptr msg, quint32 mode, quint32 threshold );
+
+    int length() const { return m_msgs.length(); }
+
+signals:
+    void ready( msg_ptr );
+    void empty();
+
+public slots:
+    void append( msg_ptr msg );
+    void processed();
+
+private:
+    void handleProcessedMsg( msg_ptr msg );
+
+    quint32 m_mode;
+    quint32 m_threshold;
+    QList<msg_ptr> m_msgs;
+    QMap< Msg*, bool> m_msg_ready;
+    unsigned int m_totmsgsize;
+};
+
+#endif // MSGPROCESSOR_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/PortFwdThread.cpp Added

@@ -0,0 +1,118 @@
+/* === 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
+ *   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 "PortFwdThread.h"
+
+#include "HeadlessCheck.h"
+#include "portfwd/portfwd.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+#include <QNetworkInterface>
+#include <QStringList>
+#include <QTime>
+#include <QTimer>
+
+
+
+PortFwdThread::PortFwdThread( unsigned int port )
+    : QThread()
+    , m_externalPort( 0 )
+    , m_port( port )
+{
+    moveToThread( this );
+    start();
+}
+
+
+PortFwdThread::~PortFwdThread()
+{
+    qDebug() << Q_FUNC_INFO << "waiting for event loop to finish...";
+    quit();
+    wait( 6000 );
+
+    delete m_portfwd;
+}
+
+
+void
+PortFwdThread::work()
+{
+    qsrand( QTime( 0, 0, 0 ).secsTo( QTime::currentTime() ) );
+    m_portfwd = new Portfwd();
+
+    foreach ( QHostAddress ha, QNetworkInterface::allAddresses() )
+    {
+        if( ha.toString() == "127.0.0.1" ) continue;
+        if( ha.toString().contains( ":" ) ) continue; //ipv6
+
+        m_portfwd->addBlockedDevice( ha.toString().toStdString() );
+    }
+
+    // try and pick an available port:
+    if ( m_portfwd->init( 2000 ) )
+    {
+        int tryport = m_port;
+
+        // last.fm office firewall policy hack
+        // (corp. firewall allows outgoing connections to this port,
+        //  so listen on this if you want lastfmers to connect to you)
+        if ( qApp->arguments().contains( "--porthack" ) )
+        {
+            tryport = 3389;
+            m_portfwd->remove( tryport );
+        }
+
+        for ( int r = 0; r < 3; ++r )
+        {
+            qDebug() << "Trying to setup portfwd on" << tryport;
+            if ( m_portfwd->add( tryport, m_port ) )
+            {
+                QString pubip = QString( m_portfwd->external_ip().c_str() ).trimmed();
+                m_externalAddress = QHostAddress( pubip );
+                m_externalPort = tryport;
+                tDebug() << "External servent address detected as" << pubip << ":" << m_externalPort;
+                qDebug() << "Max upstream  " << m_portfwd->max_upstream_bps() << "bps";
+                qDebug() << "Max downstream" << m_portfwd->max_downstream_bps() << "bps";
+                break;
+            }
+            tryport = qAbs( 10000 + 50000 * (float)qrand() / RAND_MAX );
+        }
+    }
+    else
+        tDebug() << "No UPNP Gateway device found?";
+
+    if ( !m_externalPort )
+        tDebug() << "Could not setup fwd for port:" << m_port;
+
+    emit externalAddressDetected( m_externalAddress, m_externalPort );
+}
+
+
+void
+PortFwdThread::run()
+{
+    QTimer::singleShot( 0, this, SLOT( work() ) );
+    exec();
+
+    if ( m_externalPort )
+    {
+        qDebug() << "Unregistering port fwd";
+        m_portfwd->remove( m_externalPort );
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/PortFwdThread.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/RemoteCollection.cpp Added

@@ -0,0 +1,48 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "RemoteCollection.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+RemoteCollection::RemoteCollection( source_ptr source, QObject* parent )
+    :  DatabaseCollection( source, parent )
+{
+}
+
+
+// adding/removing is done by dbsyncconnection, and the dbcmd objects that modify
+// the database will make us emit the appropriate signals (tracksAdded etc.)
+void
+RemoteCollection::addTracks( const QList<QVariant>& newitems )
+{
+    Q_UNUSED( newitems );
+    Q_ASSERT( false );
+}
+
+
+void
+RemoteCollection::removeTracks( const QDir& dir )
+{
+    Q_UNUSED( dir );
+    Q_ASSERT( false );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/RemoteCollection.h Added

@@ -0,0 +1,45 @@
+/* === 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
+ *   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 REMOTECOLLECTION_H
+#define REMOTECOLLECTION_H
+
+#include "Typedefs.h"
+
+#include "network/ControlConnection.h"
+#include "database/DatabaseCollection.h"
+
+class RemoteCollection : public DatabaseCollection
+{
+Q_OBJECT
+
+friend class ControlConnection; // for receiveTracks()
+
+public:
+    explicit RemoteCollection( Tomahawk::source_ptr source, QObject* parent = 0 );
+    ~RemoteCollection()
+    {
+        qDebug() << Q_FUNC_INFO;
+    }
+
+public slots:
+    virtual void addTracks( const QList<QVariant>& newitems );
+    virtual void removeTracks( const QDir& dir );
+};
+
+#endif // REMOTECOLLECTION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/Servent.cpp Added

@@ -0,0 +1,866 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "Servent.h"
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QMutexLocker>
+#include <QtNetwork/QNetworkInterface>
+#include <QtCore/QFile>
+#include <QtCore/QThread>
+#include <QtNetwork/QNetworkProxy>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+
+#include "Result.h"
+#include "Source.h"
+#include "BufferIoDevice.h"
+#include "Connection.h"
+#include "ControlConnection.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "StreamConnection.h"
+#include "SourceList.h"
+
+#include "PortFwdThread.h"
+#include "TomahawkSettings.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+Servent* Servent::s_instance = 0;
+
+
+Servent*
+Servent::instance()
+{
+    return s_instance;
+}
+
+
+Servent::Servent( QObject* parent )
+    : QTcpServer( parent )
+    , m_port( 0 )
+    , m_externalPort( 0 )
+    , m_ready( false )
+    , m_portfwd( 0 )
+{
+    s_instance = this;
+
+    m_lanHack = qApp->arguments().contains( "--lanhack" );
+    ACLRegistry::instance();
+    setProxy( QNetworkProxy::NoProxy );
+
+    {
+    boost::function<QSharedPointer<QIODevice>(result_ptr)> fac =
+        boost::bind( &Servent::localFileIODeviceFactory, this, _1 );
+    this->registerIODeviceFactory( "file", fac );
+    }
+
+    {
+    boost::function<QSharedPointer<QIODevice>(result_ptr)> fac =
+        boost::bind( &Servent::remoteIODeviceFactory, this, _1 );
+    this->registerIODeviceFactory( "servent", fac );
+    }
+
+    {
+    boost::function<QSharedPointer<QIODevice>(result_ptr)> fac =
+        boost::bind( &Servent::httpIODeviceFactory, this, _1 );
+    this->registerIODeviceFactory( "http", fac );
+    }
+}
+
+
+Servent::~Servent()
+{
+    delete ACLRegistry::instance();
+    delete m_portfwd;
+}
+
+
+bool
+Servent::startListening( QHostAddress ha, bool upnp, int port )
+{
+    m_port = port;
+    int defPort = TomahawkSettings::instance()->defaultPort();
+
+    // Listen on both the selected port and, if not the same, the default port -- the latter sometimes necessary for zeroconf
+    // TODO: only listen on both when zeroconf sip is enabled
+    // TODO: use a real zeroconf system instead of a simple UDP broadcast?
+    if ( !listen( ha, m_port ) )
+    {
+        if ( m_port != defPort )
+        {
+            if ( !listen( ha, defPort ) )
+            {
+                tLog() << "Failed to listen on both port" << m_port << "and port" << defPort;
+                tLog() << "Error string is:" << errorString();
+                return false;
+            }
+            else
+                m_port = defPort;
+        }
+    }
+
+    TomahawkSettings::ExternalAddressMode mode = TomahawkSettings::instance()->externalAddressMode();
+    
+    tLog() << "Servent listening on port" << m_port << "- servent thread:" << thread()
+           << "- address mode:" << (int)( mode );
+
+    // --lanhack means to advertise your LAN IP as if it were externally visible
+    switch ( mode )
+    {
+        case TomahawkSettings::Static:
+            m_externalHostname = TomahawkSettings::instance()->externalHostname();
+            m_externalPort = TomahawkSettings::instance()->externalPort();
+            m_ready = true;
+            emit ready();
+            break;
+
+        case TomahawkSettings::Lan:
+            setInternalAddress();
+            break;
+
+        case TomahawkSettings::Upnp:
+            if ( !upnp )
+            {
+                setInternalAddress();
+                break;
+            }
+            // TODO check if we have a public/internet IP on this machine directly
+            tLog() << "External address mode set to upnp...";
+            m_portfwd = new PortFwdThread( m_port );
+            connect( m_portfwd, SIGNAL( externalAddressDetected( QHostAddress, unsigned int ) ),
+                                  SLOT( setExternalAddress( QHostAddress, unsigned int ) ) );
+            break;
+    }
+
+    return true;
+}
+
+
+QString
+Servent::createConnectionKey( const QString& name, const QString &nodeid, const QString &key, bool onceOnly )
+{
+    Q_ASSERT( this->thread() == QThread::currentThread() );
+
+    QString _key = ( key.isEmpty() ? uuid() : key );
+    ControlConnection* cc = new ControlConnection( this, name );
+    cc->setName( name.isEmpty() ? QString( "KEY(%1)" ).arg( key ) : name );
+    if ( !nodeid.isEmpty() )
+        cc->setId( nodeid );
+    cc->setOnceOnly( onceOnly );
+
+    tDebug( LOGVERBOSE ) << "Creating connection key with name of" << cc->name() << "and id of" << cc->id() << "and key of" << _key << "; key is once only? :" << (onceOnly ? "true" : "false");
+    registerOffer( _key, cc );
+    return _key;
+}
+
+
+bool
+Servent::isValidExternalIP( const QHostAddress& addr ) const
+{
+    QString ip = addr.toString();
+    if ( !m_lanHack && ( ip.startsWith( "10." ) || ip.startsWith( "172.16." ) || ip.startsWith( "192.168." ) ) )
+    {
+        return false;
+    }
+
+    return !addr.isNull();
+}
+
+
+void
+Servent::setInternalAddress()
+{
+    foreach ( QHostAddress ha, QNetworkInterface::allAddresses() )
+    {
+        if ( ha.toString() == "127.0.0.1" )
+            continue;
+        if ( ha.toString().contains( ":" ) )
+            continue; //ipv6
+
+        if ( m_lanHack && isValidExternalIP( ha ) )
+        {
+            tLog() << "LANHACK: set external address to lan address" << ha.toString();
+            setExternalAddress( ha, m_port );
+        }
+        else
+        {
+            m_ready = true;
+            emit ready();
+        }
+        break;
+    }
+}
+
+
+void
+Servent::setExternalAddress( QHostAddress ha, unsigned int port )
+{
+    if ( isValidExternalIP( ha ) )
+    {
+        m_externalAddress = ha;
+        m_externalPort = port;
+    }
+
+    if ( m_externalPort == 0 || !isValidExternalIP( ha ) )
+    {
+        tLog() << "UPnP failed, LAN and outbound connections only!";
+        setInternalAddress();
+        return;
+    }
+
+    m_ready = true;
+    emit ready();
+}
+
+
+void
+Servent::registerOffer( const QString& key, Connection* conn )
+{
+    m_offerskey = QWeakPointer<Connection>(conn);
+}
+
+
+void
+Servent::registerControlConnection( ControlConnection* conn )
+{
+    m_controlconnections.append( conn );
+}
+
+
+void
+Servent::unregisterControlConnection( ControlConnection* conn )
+{
+    QList<ControlConnection*> n;
+    foreach( ControlConnection* c, m_controlconnections )
+        if( c!=conn )
+            n.append( c );
+
+    m_connectedNodes.removeAll( conn->id() );
+    m_controlconnections = n;
+}
+
+
+ControlConnection*
+Servent::lookupControlConnection( const QString& name )
+{
+    foreach( ControlConnection* c, m_controlconnections )
+        if( c->name() == name )
+            return c;
+
+    return NULL;
+}
+
+
+void
+Servent::incomingConnection( int sd )
+{
+    Q_ASSERT( this->thread() == QThread::currentThread() );
+
+    QTcpSocketExtra* sock = new QTcpSocketExtra;
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Accepting connection, sock" << sock;
+
+    sock->moveToThread( thread() );
+    sock->_disowned = false;
+    sock->_outbound = false;
+    if( !sock->setSocketDescriptor( sd ) )
+    {
+        Q_ASSERT( false );
+        return;
+    }
+
+    connect( sock, SIGNAL( readyRead() ), SLOT( readyRead() ) );
+    connect( sock, SIGNAL( disconnected() ), sock, SLOT( deleteLater() ) );
+}
+
+
+void
+Servent::readyRead()
+{
+    Q_ASSERT( this->thread() == QThread::currentThread() );
+    QWeakPointer< QTcpSocketExtra > sock = (QTcpSocketExtra*)sender();
+
+    if( sock.isNull() || sock.data()->_disowned )
+    {
+        return;
+    }
+
+    if( sock.data()->_msg.isNull() )
+    {
+        char msgheader Msg::headerSize() ;
+        if( sock.data()->bytesAvailable() < Msg::headerSize() )
+            return;
+
+        sock.data()->read( (char*) &msgheader, Msg::headerSize() );
+        sock.data()->_msg = Msg::begin( (char*) &msgheader );
+    }
+
+    if( sock.data()->bytesAvailable() < sock.data()->_msg->length() )
+        return;
+
+    QByteArray ba = sock.data()->read( sock.data()->_msg->length() );
+    sock.data()->_msg->fill( ba );
+    Q_ASSERT( sock.data()->_msg->is( Msg::JSON ) );
+
+    ControlConnection* cc = 0;
+    bool ok;
+    QString key, conntype, nodeid, controlid;
+    QVariantMap m = parser.parse( sock.data()->_msg->payload(), &ok ).toMap();
+    if( !ok )
+    {
+        tDebug() << "Invalid JSON on new connection, aborting";
+        goto closeconnection;
+    }
+
+    conntype  = m.value( "conntype" ).toString();
+    key       = m.value( "key" ).toString();
+    nodeid    = m.value( "nodeid" ).toString();
+    controlid = m.value( "controlid" ).toString();
+
+    tDebug( LOGVERBOSE ) << "Incoming connection details:" << m;
+
+    if( !nodeid.isEmpty() ) // only control connections send nodeid
+    {
+        bool dupe = false;
+        if ( m_connectedNodes.contains( nodeid ) )
+            dupe = true;
+
+        foreach( ControlConnection* con, m_controlconnections )
+        {
+            tLog( LOGVERBOSE ) << "known connection:" << con->id() << con->source()->friendlyName();
+            if( con->id() == nodeid )
+            {
+                dupe = true;
+                break;
+            }
+        }
+
+        if ( dupe )
+        {
+            tLog() << "Duplicate control connection detected, dropping:" << nodeid << conntype;
+            goto closeconnection;
+        }
+    }
+
+    foreach( ControlConnection* con, m_controlconnections )
+    {
+        if ( con->id() == controlid )
+        {
+            cc = con;
+            break;
+        }
+    }
+
+    // they connected to us and want something we are offering
+    if ( conntype == "accept-offer" || conntype == "push-offer" )
+    {
+        sock.data()->_msg.clear();
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << key << nodeid << "socket peer address = " << sock.data()->peerAddress() << "socket peer name = " << sock.data()->peerName();
+        Connection* conn = claimOffer( cc, nodeid, key, sock.data()->peerAddress() );
+        if ( !conn )
+        {
+            tLog() << "claimOffer FAILED, key:" << key << nodeid;
+            goto closeconnection;
+        }
+        if ( sock.isNull() )
+        {
+            tLog() << "Socket has become null, possibly took too long to make an ACL decision, key:" << key << nodeid;
+            return;
+        }
+        else if ( !sock.data()->isValid() )
+        {
+            tLog() << "Socket has become invalid, possibly took too long to make an ACL decision, key:" << key << nodeid;
+            goto closeconnection;
+        }
+        tDebug( LOGVERBOSE ) << "claimOffer OK:" << key << nodeid;        
+        
+        m_connectedNodes << nodeid;
+        if( !nodeid.isEmpty() )
+            conn->setId( nodeid );
+
+        handoverSocket( conn, sock.data() );
+        return;
+    }
+    else
+    {
+        tLog() << "Invalid or unhandled conntype";
+    }
+
+    // fallthru to cleanup:
+closeconnection:
+    tLog() << "Closing incoming connection, something was wrong.";
+    sock.data()->_msg.clear();
+    sock.data()->disconnectFromHost();
+}
+
+
+// creates a new tcp connection to peer from conn, handled by given connector
+// new_conn is responsible for sending the first msg, if needed
+void
+Servent::createParallelConnection( Connection* orig_conn, Connection* new_conn, const QString& key )
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << ", key:" << key << thread() << orig_conn;
+    // if we can connect to them directly:
+    if( orig_conn && orig_conn->outbound() )
+    {
+        connectToPeer( orig_conn->socket()->peerAddress().toString(),
+                       orig_conn->peerPort(),
+                       key,
+                       new_conn );
+    }
+    else // ask them to connect to us:
+    {
+        QString tmpkey = uuid();
+        tLog() << "Asking them to connect to us using" << tmpkey ;
+        registerOffer( tmpkey, new_conn );
+
+        QVariantMap m;
+        m.insert( "conntype", "request-offer" );
+        m.insert( "key", tmpkey );
+        m.insert( "offer", key );
+        m.insert( "port", externalPort() );
+        m.insert( "controlid", Database::instance()->impl()->dbid() );
+
+        QJson::Serializer ser;
+        orig_conn->sendMsg( Msg::factory( ser.serialize(m), Msg::JSON ) );
+    }
+}
+
+
+void
+Servent::socketConnected()
+{
+    QTcpSocketExtra* sock = (QTcpSocketExtra*)sender();
+
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << thread() << "socket: " << sock << ", hostaddr: " << sock->peerAddress() << ", hostname: " << sock->peerName();
+
+    if ( sock->_conn.isNull() )
+    {
+        sock->close();
+        sock->deleteLater();
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Socket's connection was null, could have timed out or been given an invalid address";
+        return;
+    }
+    
+    Connection* conn = sock->_conn.data();
+    handoverSocket( conn, sock );
+}
+
+
+// transfers ownership of socket to the connection and inits the connection
+void Servent::handoverSocket( Connection* conn, QTcpSocketExtra* sock )
+{
+    Q_ASSERT( conn );
+    Q_ASSERT( sock );
+    Q_ASSERT( conn->socket().isNull() );
+    Q_ASSERT( sock->isValid() );
+
+    disconnect( sock, SIGNAL( readyRead() ),    this, SLOT( readyRead() ) );
+    disconnect( sock, SIGNAL( disconnected() ), sock, SLOT( deleteLater() ) );
+    disconnect( sock, SIGNAL( error( QAbstractSocket::SocketError ) ),
+                this, SLOT( socketError( QAbstractSocket::SocketError ) ) );
+
+    sock->_disowned = true;
+    conn->setOutbound( sock->_outbound );
+    conn->setPeerPort( sock->peerPort() );
+
+    conn->start( sock );
+}
+
+
+void
+Servent::socketError( QAbstractSocket::SocketError e )
+{
+    QTcpSocketExtra* sock = (QTcpSocketExtra*)sender();
+    if ( !sock )
+    {
+        tLog() << "SocketError, sock is null";
+        return;
+    }
+
+    if ( !sock->_conn.isNull() )
+    {
+        Connection* conn = sock->_conn.data();
+        tLog() << "Servent::SocketError:" << e << conn->id() << conn->name();
+
+        if ( !sock->_disowned )
+        {
+            // connection will delete if we already transferred ownership, otherwise:
+            sock->deleteLater();
+        }
+
+        conn->markAsFailed(); // will emit failed, then finished
+    }
+    else
+    {
+        tLog() << "SocketError, connection is null";
+        sock->deleteLater();
+    }
+}
+
+
+void
+Servent::connectToPeer( const QString& ha, int port, const QString &key, const QString& name, const QString& id )
+{
+    Q_ASSERT( this->thread() == QThread::currentThread() );
+
+    ControlConnection* conn = new ControlConnection( this, ha );
+    QVariantMap m;
+    m"conntype"  = "accept-offer";
+    m"key"       = key;
+    m"port"      = externalPort();
+    m"nodeid"    = Database::instance()->impl()->dbid();
+
+    conn->setFirstMessage( m );
+    if( name.length() )
+        conn->setName( name );
+    if( id.length() )
+        conn->setId( id );
+
+    conn->setProperty( "nodeid", id );
+
+    connectToPeer( ha, port, key, conn );
+}
+
+
+void
+Servent::connectToPeer( const QString& ha, int port, const QString &key, Connection* conn )
+{
+    tDebug( LOGVERBOSE ) << "Servent::connectToPeer:" << ha << ":" << port
+                         << thread() << QThread::currentThread();
+
+    Q_ASSERT( port > 0 );
+    Q_ASSERT( conn );
+
+    if ( ( ha == m_externalAddress.toString() || ha == m_externalHostname ) &&
+         ( port == m_externalPort ) )
+    {
+        tDebug() << "ERROR: Tomahawk won't try to connect to" << ha << ":" << port << ": identified as ourselves.";
+        return;
+    }
+
+    if( key.length() && conn->firstMessage().isNull() )
+    {
+        QVariantMap m;
+        m"conntype"  = "accept-offer";
+        m"key"       = key;
+        m"port"      = externalPort();
+        m"controlid" = Database::instance()->impl()->dbid();
+        conn->setFirstMessage( m );
+    }
+
+    QTcpSocketExtra* sock = new QTcpSocketExtra();
+    sock->_disowned = false;
+    sock->_conn = conn;
+    sock->_outbound = true;
+
+    connect( sock, SIGNAL( connected() ), SLOT( socketConnected() ) );
+    connect( sock, SIGNAL( error( QAbstractSocket::SocketError ) ),
+                     SLOT( socketError( QAbstractSocket::SocketError ) ) );
+
+    if ( !conn->peerIpAddress().isNull() )
+        sock->connectToHost( conn->peerIpAddress(), port, QTcpSocket::ReadWrite );
+    else
+        sock->connectToHost( ha, port, QTcpSocket::ReadWrite );
+    sock->moveToThread( thread() );
+}
+
+
+void
+Servent::reverseOfferRequest( ControlConnection* orig_conn, const QString& theirdbid, const QString& key, const QString& theirkey )
+{
+    Q_ASSERT( this->thread() == QThread::currentThread() );
+
+    tDebug( LOGVERBOSE ) << "Servent::reverseOfferRequest received for" << key;
+    Connection* new_conn = claimOffer( orig_conn, theirdbid, key );
+    if ( !new_conn )
+    {
+        tDebug() << "claimOffer failed, killing requesting connection out of spite";
+        orig_conn->shutdown();
+        return;
+    }
+
+    QVariantMap m;
+    m"conntype"  = "push-offer";
+    m"key"       = theirkey;
+    m"port"      = externalPort();
+    m"controlid" = Database::instance()->impl()->dbid();
+    new_conn->setFirstMessage( m );
+    createParallelConnection( orig_conn, new_conn, QString() );
+}
+
+
+// return the appropriate connection for a given offer key, or NULL if invalid
+Connection*
+Servent::claimOffer( ControlConnection* cc, const QString &nodeid, const QString &key, const QHostAddress peer )
+{
+    bool noauth = qApp->arguments().contains( "--noauth" );
+
+    // magic key for stream connections:
+    if( key.startsWith( "FILE_REQUEST_KEY:" ) )
+    {
+        // check if the source IP matches an existing, authenticated connection
+        if ( !noauth && peer != QHostAddress::Any && !isIPWhitelisted( peer ) )
+        {
+            bool authed = false;
+            foreach( ControlConnection* cc, m_controlconnections )
+            {
+                if( cc->socket()->peerAddress() == peer )
+                {
+                    authed = true;
+                    break;
+                }
+            }
+            if( !authed )
+            {
+                tLog() << "File transfer request rejected, invalid source IP";
+                return NULL;
+            }
+        }
+
+        QString fid = key.right( key.length() - 17 );
+        StreamConnection* sc = new StreamConnection( this, cc, fid );
+        return sc;
+    }
+
+    if( key == "whitelist" ) // LAN IP address, check source IP
+    {
+        if( isIPWhitelisted( peer ) )
+        {
+            tDebug() << "Connection is from whitelisted IP range (LAN)";
+            Connection* conn = new ControlConnection( this, peer.toString() );
+            conn->setName( peer.toString() );
+            return conn;
+        }
+        else
+        {
+            tDebug() << "Connection claimed to be whitelisted, but wasn't.";
+            return NULL;
+        }
+    }
+
+    if( m_offers.contains( key ) )
+    {
+        QWeakPointer<Connection> conn = m_offers.value( key );
+        if( conn.isNull() )
+        {
+            // This can happen if it's a streamconnection, but the audioengine has
+            // already closed the iodevice, causing the connection to be deleted before
+            // the peer connects and provides the first byte
+            tLog() << Q_FUNC_INFO << "invalid/expired offer:" << key;
+            return NULL;
+        }
+
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "nodeid is: " << nodeid;
+        if( !nodeid.isEmpty() )
+        {
+            // Used by the connection for the ACL check
+            // If there isn't a nodeid it's not the first connection and will already have been stopped
+            conn.data()->setProperty( "nodeid", nodeid );
+        }
+
+        if( conn.data()->onceOnly() )
+        {
+            m_offers.remove( key );
+            return conn.data();
+        }
+        else
+        {
+            return conn.data()->clone();
+        }
+    }
+    else if ( noauth )
+    {
+        Connection* conn;
+        conn = new ControlConnection( this, peer );
+        conn->setName( key );
+        return conn;
+    }
+    else
+    {
+        tLog() << "Invalid offer key:" << key;
+        return NULL;
+    }
+}
+
+
+QSharedPointer<QIODevice>
+Servent::remoteIODeviceFactory( const result_ptr& result )
+{
+    QSharedPointer<QIODevice> sp;
+
+    QStringList parts = result->url().mid( QString( "servent://" ).length() ).split( "\t" );
+    const QString sourceName = parts.at( 0 );
+    const QString fileId = parts.at( 1 );
+    source_ptr s = SourceList::instance()->get( sourceName );
+    if ( s.isNull() || !s->controlConnection() )
+        return sp;
+
+    ControlConnection* cc = s->controlConnection();
+    StreamConnection* sc = new StreamConnection( this, cc, fileId, result );
+    createParallelConnection( cc, sc, QString( "FILE_REQUEST_KEY:%1" ).arg( fileId ) );
+    return sc->iodevice();
+}
+
+
+void
+Servent::registerStreamConnection( StreamConnection* sc )
+{
+    Q_ASSERT( !m_scsessions.contains( sc ) );
+    tDebug( LOGVERBOSE ) << "Registering Stream" << m_scsessions.length() + 1;
+
+    QMutexLocker lock( &m_ftsession_mut );
+    m_scsessions.append( sc );
+
+    printCurrentTransfers();
+    emit streamStarted( sc );
+}
+
+
+void
+Servent::onStreamFinished( StreamConnection* sc )
+{
+    Q_ASSERT( sc );
+    tDebug( LOGVERBOSE ) << "Stream Finished, unregistering" << sc->id();
+
+    QMutexLocker lock( &m_ftsession_mut );
+    m_scsessions.removeAll( sc );
+
+    printCurrentTransfers();
+    emit streamFinished( sc );
+}
+
+
+// used for debug output:
+void
+Servent::printCurrentTransfers()
+{
+    int k = 1;
+//    qDebug() << "~~~ Active file transfer connections:" << m_scsessions.length();
+    foreach( StreamConnection* i, m_scsessions )
+    {
+        qDebug() << k << ") " << i->id();
+    }
+    qDebug() << endl;
+}
+
+
+bool
+Servent::isIPWhitelisted( QHostAddress ip )
+{
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Performing checks against ip" << ip.toString();
+    typedef QPair< QHostAddress, int > range;
+    QList< range > subnetEntries;
+    
+    QList< QNetworkInterface > networkInterfaces = QNetworkInterface::allInterfaces();
+    foreach( QNetworkInterface interface, networkInterfaces )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Checking interface" << interface.humanReadableName();
+        QList< QNetworkAddressEntry > addressEntries = interface.addressEntries();
+        foreach( QNetworkAddressEntry addressEntry, addressEntries )
+        {
+            tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Checking address entry with ip" << addressEntry.ip().toString() << "and prefix length" << addressEntry.prefixLength();
+            if ( ip.isInSubnet( addressEntry.ip(), addressEntry.prefixLength() ) )
+            {
+                tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "success";
+                return true;
+            }
+        }
+    }
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "failure";
+    return false;
+}
+
+
+bool
+Servent::connectedToSession( const QString& session )
+{
+    foreach( ControlConnection* cc, m_controlconnections )
+    {
+        if( cc->id() == session )
+            return true;
+    }
+
+    return false;
+}
+
+
+void
+Servent::triggerDBSync()
+{
+    // tell peers we have new stuff they should sync
+    QList<source_ptr> sources = SourceList::instance()->sources();
+    foreach( const source_ptr& src, sources )
+    {
+        // skip local source
+        if ( src.isNull() || src->isLocal() )
+            continue;
+
+        if ( src->controlConnection() && src->controlConnection()->dbSyncConnection() ) // source online?
+            src->controlConnection()->dbSyncConnection()->trigger();
+    }
+}
+
+
+void
+Servent::registerIODeviceFactory( const QString &proto, boost::function<QSharedPointer<QIODevice>(Tomahawk::result_ptr)> fac )
+{
+    m_iofactories.insert( proto, fac );
+}
+
+
+QSharedPointer<QIODevice>
+Servent::getIODeviceForUrl( const Tomahawk::result_ptr& result )
+{
+    QSharedPointer<QIODevice> sp;
+
+    QRegExp rx( "^(a-zA-Z0-9+)://(.+)$" );
+    if ( rx.indexIn( result->url() ) == -1 )
+        return sp;
+
+    const QString proto = rx.cap( 1 );
+    if ( !m_iofactories.contains( proto ) )
+        return sp;
+
+    return m_iofactories.value( proto )( result );
+}
+
+
+QSharedPointer<QIODevice>
+Servent::localFileIODeviceFactory( const Tomahawk::result_ptr& result )
+{
+    // ignore "file://" at front of url
+    QFile* io = new QFile( result->url().mid( QString( "file://" ).length() ) );
+    if ( io )
+        io->open( QIODevice::ReadOnly );
+
+    return QSharedPointer<QIODevice>( io );
+}
+
+
+QSharedPointer<QIODevice>
+Servent::httpIODeviceFactory( const Tomahawk::result_ptr& result )
+{
+    QNetworkRequest req( result->url() );
+    QNetworkReply* reply = TomahawkUtils::nam()->get( req );
+    return QSharedPointer<QIODevice>( reply, &QObject::deleteLater );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/Servent.h Added

@@ -0,0 +1,181 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 SERVENT_H
+#define SERVENT_H
+
+// time before new connection terminates if no auth received
+#define AUTH_TIMEOUT 180000
+
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QMutex>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QTimer>
+#include <QtCore/QPointer>
+#include <QtNetwork/QTcpServer>
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QHostInfo>
+
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+#include <qjson/qobjecthelper.h>
+
+#include "Typedefs.h"
+#include "Msg.h"
+
+#include <boost/function.hpp>
+
+#include "DllMacro.h"
+
+class Connection;
+class Connector;
+class ControlConnection;
+class StreamConnection;
+class ProxyConnection;
+class RemoteCollectionConnection;
+class PortFwdThread;
+
+// this is used to hold a bit of state, so when a connected signal is emitted
+// from a socket, we can associate it with a Connection object etc.
+class DLLEXPORT QTcpSocketExtra : public QTcpSocket
+{
+Q_OBJECT
+
+public:
+    QTcpSocketExtra() : QTcpSocket()
+    {
+        QTimer::singleShot( AUTH_TIMEOUT, this, SLOT( authTimeout() ) ) ;
+    }
+
+    QWeakPointer<Connection> _conn;
+    bool _outbound;
+    bool _disowned;
+    msg_ptr _msg;
+
+private slots:
+    void authTimeout()
+    {
+      if( _disowned )
+          return;
+
+      qDebug() << "Connection timed out before providing a valid offer-key";
+      this->disconnectFromHost();
+    }
+};
+
+class DLLEXPORT Servent : public QTcpServer
+{
+Q_OBJECT
+
+public:
+    static Servent* instance();
+
+    explicit Servent( QObject* parent = 0 );
+    virtual ~Servent();
+
+    bool startListening( QHostAddress ha, bool upnp, int port );
+
+    int port() const { return m_port; }
+
+    // creates new token that allows a controlconnection to be set up
+    QString createConnectionKey( const QString& name = "", const QString &nodeid = "", const QString &key = "", bool onceOnly = true );
+
+    void registerOffer( const QString& key, Connection* conn );
+
+    void registerControlConnection( ControlConnection* conn );
+    void unregisterControlConnection( ControlConnection* conn );
+    ControlConnection* lookupControlConnection( const QString& name );
+
+    void connectToPeer( const QString& ha, int port, const QString &key, const QString& name = "", const QString& id = "" );
+    void connectToPeer( const QString& ha, int port, const QString &key, Connection* conn );
+    void reverseOfferRequest( ControlConnection* orig_conn, const QString &theirdbid, const QString& key, const QString& theirkey );
+
+    bool visibleExternally() const { return !m_externalHostname.isNull() || (m_externalPort > 0 && !m_externalAddress.isNull()); }
+    QString externalAddress() const { return !m_externalHostname.isNull() ? m_externalHostname : m_externalAddress.toString(); }
+    int externalPort() const { return m_externalPort; }
+
+    QSharedPointer< QIODevice > remoteIODeviceFactory( const Tomahawk::result_ptr& );
+    static bool isIPWhitelisted( QHostAddress ip );
+
+    bool connectedToSession( const QString& session );
+    unsigned int numConnectedPeers() const { return m_controlconnections.length(); }
+
+    QList< StreamConnection* > streams() const { return m_scsessions; }
+
+    QSharedPointer< QIODevice > getIODeviceForUrl( const Tomahawk::result_ptr& result );
+    void registerIODeviceFactory( const QString &proto, boost::function< QSharedPointer< QIODevice >(Tomahawk::result_ptr) > fac );
+    QSharedPointer< QIODevice > localFileIODeviceFactory( const Tomahawk::result_ptr& result );
+    QSharedPointer< QIODevice > httpIODeviceFactory( const Tomahawk::result_ptr& result );
+
+    bool isReady() const { return m_ready; };
+
+signals:
+    void streamStarted( StreamConnection* );
+    void streamFinished( StreamConnection* );
+    void ready();
+
+protected:
+    void incomingConnection( int sd );
+
+public slots:
+    void setInternalAddress();
+    void setExternalAddress( QHostAddress ha, unsigned int port );
+
+    void socketError( QAbstractSocket::SocketError );
+    void createParallelConnection( Connection* orig_conn, Connection* new_conn, const QString& key );
+
+    void registerStreamConnection( StreamConnection* );
+    void onStreamFinished( StreamConnection* sc );
+
+    void socketConnected();
+    void triggerDBSync();
+
+private slots:
+    void readyRead();
+
+    Connection* claimOffer( ControlConnection* cc, const QString &nodeid, const QString &key, const QHostAddress peer = QHostAddress::Any );
+
+private:
+    bool isValidExternalIP( const QHostAddress& addr ) const;
+    void handoverSocket( Connection* conn, QTcpSocketExtra* sock );
+    void printCurrentTransfers();
+
+    QJson::Parser parser;
+    QList< ControlConnection* > m_controlconnections; // canonical list of authed peers
+    QMap< QString, QWeakPointer< Connection > > m_offers;
+    QStringList m_connectedNodes;
+
+    int m_port, m_externalPort;
+    QHostAddress m_externalAddress;
+    QString m_externalHostname;
+    bool m_ready;
+    bool m_lanHack;
+
+    // currently active file transfers:
+    QList< StreamConnection* > m_scsessions;
+    QMutex m_ftsession_mut;
+
+    QMap< QString,boost::function< QSharedPointer< QIODevice >(Tomahawk::result_ptr) > > m_iofactories;
+
+    PortFwdThread* m_portfwd;
+    static Servent* s_instance;
+};
+
+#endif // SERVENT_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/StreamConnection.cpp Added

@@ -0,0 +1,289 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "StreamConnection.h"
+
+#include <QFile>
+
+#include "Result.h"
+
+#include "BufferIoDevice.h"
+#include "network/ControlConnection.h"
+#include "network/Servent.h"
+#include "database/DatabaseCommand_LoadFiles.h"
+#include "database/Database.h"
+#include "SourceList.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+StreamConnection::StreamConnection( Servent* s, ControlConnection* cc, QString fid, const Tomahawk::result_ptr& result )
+    : Connection( s )
+    , m_cc( cc )
+    , m_fid( fid )
+    , m_type( RECEIVING )
+    , m_curBlock( 0 )
+    , m_badded( 0 )
+    , m_bsent( 0 )
+    , m_allok( false )
+    , m_result( result )
+    , m_transferRate( 0 )
+{
+    qDebug() << Q_FUNC_INFO;
+
+    BufferIODevice* bio = new BufferIODevice( result->size() );
+    m_iodev = QSharedPointer<QIODevice>( bio, &QObject::deleteLater ); // device audio data gets written to
+    m_iodev->open( QIODevice::ReadWrite );
+
+    Servent::instance()->registerStreamConnection( this );
+
+    // if the audioengine closes the iodev (skip/stop/etc) then kill the connection
+    // immediately to avoid unnecessary network transfer
+    connect( m_iodev.data(), SIGNAL( aboutToClose() ), SLOT( shutdown() ), Qt::QueuedConnection );
+    connect( m_iodev.data(), SIGNAL( blockRequest( int ) ), SLOT( onBlockRequest( int ) ) );
+
+    // auto delete when connection closes:
+    connect( this, SIGNAL( finished() ), SLOT( deleteLater() ), Qt::QueuedConnection );
+
+    // don't fuck with our messages at all. No compression, no parsing, nothing:
+    this->setMsgProcessorModeIn ( MsgProcessor::NOTHING );
+    this->setMsgProcessorModeOut( MsgProcessor::NOTHING );
+}
+
+
+StreamConnection::StreamConnection( Servent* s, ControlConnection* cc, QString fid )
+    : Connection( s )
+    , m_cc( cc )
+    , m_fid( fid )
+    , m_type( SENDING )
+    , m_badded( 0 )
+    , m_bsent( 0 )
+    , m_allok( false )
+    , m_transferRate( 0 )
+{
+    Servent::instance()->registerStreamConnection( this );
+    // auto delete when connection closes:
+    connect( this, SIGNAL( finished() ), SLOT( deleteLater() ), Qt::QueuedConnection );
+}
+
+
+StreamConnection::~StreamConnection()
+{
+    qDebug() << Q_FUNC_INFO << "TX/RX:" << bytesSent() << bytesReceived();
+    if( m_type == RECEIVING && !m_allok )
+    {
+        qDebug() << "FTConnection closing before last data msg received, shame.";
+        //TODO log the fact that our peer was bad-mannered enough to not finish the upload
+
+        // protected, we could expose it:
+        //m_iodev->setErrorString("FTConnection providing data went away mid-transfer");
+
+        if ( !m_iodev.isNull() )
+            ((BufferIODevice*)m_iodev.data())->inputComplete();
+    }
+
+    Servent::instance()->onStreamFinished( this );
+}
+
+
+QString
+StreamConnection::id() const
+{
+    return QString( "FTC%1 %2" )
+              .arg( m_type == SENDING ? "TX" : "RX" )
+              .arg( m_fid );
+}
+
+
+Tomahawk::source_ptr
+StreamConnection::source() const
+{
+	return m_source;
+}
+
+void
+StreamConnection::showStats( qint64 tx, qint64 rx )
+{
+    if( tx > 0 || rx > 0 )
+    {
+        qDebug() << id()
+                 << QString( "Down: %L1 bytes/sec," ).arg( rx )
+                 << QString( "Up: %L1 bytes/sec" ).arg( tx );
+    }
+
+    m_transferRate = tx + rx;
+    emit updated();
+}
+
+
+void
+StreamConnection::setup()
+{
+    QList<source_ptr> sources = SourceList::instance()->sources();
+    foreach( const source_ptr& src, sources )
+    {
+        // local src doesnt have a control connection, skip it:
+        if( src.isNull() || src->isLocal() )
+            continue;
+
+        if ( src->controlConnection() == m_cc )
+        {
+            m_source = src;
+            break;
+        }
+    }
+
+    connect( this, SIGNAL( statsTick( qint64, qint64 ) ), SLOT( showStats( qint64, qint64 ) ) );
+    if( m_type == RECEIVING )
+    {
+        qDebug() << "in RX mode";
+        emit updated();
+        return;
+    }
+
+    qDebug() << "in TX mode, fid:" << m_fid;
+
+    DatabaseCommand_LoadFiles* cmd = new DatabaseCommand_LoadFiles( m_fid.toUInt() );
+    connect( cmd, SIGNAL( result( Tomahawk::result_ptr ) ), SLOT( startSending( Tomahawk::result_ptr ) ) );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+StreamConnection::startSending( const Tomahawk::result_ptr& result )
+{
+    if ( result.isNull() )
+    {
+        qDebug() << "Can't handle invalid result!";
+        shutdown();
+        return;
+    }
+
+    m_result = result;
+    qDebug() << "Starting to transmit" << m_result->url();
+
+    QSharedPointer<QIODevice> io = Servent::instance()->getIODeviceForUrl( m_result );
+    if( !io )
+    {
+        qDebug() << "Couldn't read from source:" << m_result->url();
+        shutdown();
+        return;
+    }
+
+    m_readdev = QSharedPointer<QIODevice>( io );
+    sendSome();
+
+    emit updated();
+}
+
+
+void
+StreamConnection::handleMsg( msg_ptr msg )
+{
+    Q_ASSERT( msg->is( Msg::RAW ) );
+
+    if ( msg->payload().startsWith( "block" ) )
+    {
+        int block = QString( msg->payload() ).mid( 5 ).toInt();
+        m_readdev->seek( block * BufferIODevice::blockSize() );
+
+        qDebug() << "Seeked to block:" << block;
+
+        QByteArray sm;
+        sm.append( QString( "doneblock%1" ).arg( block ) );
+
+        sendMsg( Msg::factory( sm, Msg::RAW | Msg::FRAGMENT ) );
+        QTimer::singleShot( 0, this, SLOT( sendSome() ) );
+    }
+    else if ( msg->payload().startsWith( "doneblock" ) )
+    {
+        int block = QString( msg->payload() ).mid( 9 ).toInt();
+        ((BufferIODevice*)m_iodev.data())->seeked( block );
+
+        m_curBlock = block;
+        qDebug() << "Next block is now:" << block;
+    }
+    else if ( msg->payload().startsWith( "data" ) )
+    {
+        m_badded += msg->payload().length() - 4;
+        ((BufferIODevice*)m_iodev.data())->addData( m_curBlock++, msg->payload().mid( 4 ) );
+    }
+
+    //qDebug() << Q_FUNC_INFO << "flags" << (int) msg->flags()
+    //         << "payload len" << msg->payload().length()
+    //         << "written to device so far: " << m_badded;
+
+    if ( ((BufferIODevice*)m_iodev.data())->nextEmptyBlock() < 0 )
+    {
+        m_allok = true;
+        // tell our iodev there is no more data to read, no args meaning a success:
+        ((BufferIODevice*)m_iodev.data())->inputComplete();
+        shutdown();
+    }
+}
+
+
+Connection*
+StreamConnection::clone()
+{
+    Q_ASSERT( false );
+    return 0;
+}
+
+
+void
+StreamConnection::sendSome()
+{
+    Q_ASSERT( m_type == StreamConnection::SENDING );
+
+    QByteArray ba = "data";
+    ba.append( m_readdev->read( BufferIODevice::blockSize() ) );
+    m_bsent += ba.length() - 4;
+
+    if( m_readdev->atEnd() )
+    {
+        sendMsg( Msg::factory( ba, Msg::RAW ) );
+        return;
+    }
+    else
+    {
+        // more to come -> FRAGMENT
+        sendMsg( Msg::factory( ba, Msg::RAW | Msg::FRAGMENT ) );
+    }
+
+    // HINT: change the 0 to 50 to transmit at 640Kbps, for example
+    //       (this is where upload throttling could be implemented)
+    QTimer::singleShot( 0, this, SLOT( sendSome() ) );
+}
+
+
+void
+StreamConnection::onBlockRequest( int block )
+{
+    qDebug() << Q_FUNC_INFO << block;
+
+    if ( m_curBlock == block )
+        return;
+
+    QByteArray sm;
+    sm.append( QString( "block%1" ).arg( block ) );
+
+    sendMsg( Msg::factory( sm, Msg::RAW | Msg::FRAGMENT ) );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/network/StreamConnection.h Added

@@ -0,0 +1,97 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 STREAMCONNECTION_H
+#define STREAMCONNECTION_H
+
+#include <QObject>
+#include <QSharedPointer>
+#include <QIODevice>
+
+#include "network/Connection.h"
+#include "Result.h"
+
+#include "DllMacro.h"
+
+class ControlConnection;
+class BufferIODevice;
+
+class DLLEXPORT StreamConnection : public Connection
+{
+Q_OBJECT
+
+public:
+    enum Type
+    {
+        SENDING = 0,
+        RECEIVING = 1
+    };
+
+    // RX:
+    explicit StreamConnection( Servent* s, ControlConnection* cc, QString fid, const Tomahawk::result_ptr& result );
+    // TX:
+    explicit StreamConnection( Servent* s, ControlConnection* cc, QString fid );
+
+    virtual ~StreamConnection();
+
+    QString id() const;
+    void setup();
+    Connection* clone();
+
+    const QSharedPointer<QIODevice>& iodevice() { return m_iodev; }
+    ControlConnection* controlConnection() const { return m_cc; }
+
+    Tomahawk::source_ptr source() const;
+    Tomahawk::result_ptr track() const { return m_result; }
+    qint64 transferRate() const { return m_transferRate; }
+
+    Type type() const { return m_type; }
+    QString fid() const { return m_fid; }
+
+signals:
+    void updated();
+
+protected slots:
+    virtual void handleMsg( msg_ptr msg );
+
+private slots:
+    void startSending( const Tomahawk::result_ptr& );
+    void sendSome();
+    void showStats( qint64 tx, qint64 rx );
+
+    void onBlockRequest( int pos );
+
+private:
+    QSharedPointer<QIODevice> m_iodev;
+    ControlConnection* m_cc;
+    QString m_fid;
+    Type m_type;
+    QSharedPointer<QIODevice> m_readdev;
+
+    int m_curBlock;
+
+    int m_badded, m_bsent;
+    bool m_allok; // got last msg ok, transfer complete?
+
+    Tomahawk::source_ptr m_source;
+    Tomahawk::result_ptr m_result;
+    qint64 m_transferRate;
+};
+
+#endif // STREAMCONNECTION_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/AlbumModel.cpp Added

@@ -0,0 +1,279 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "AlbumModel.h"
+
+#include <QListView>
+#include <QMimeData>
+#include <QNetworkReply>
+
+#include "Artist.h"
+#include "PlayableItem.h"
+#include "Source.h"
+#include "SourceList.h"
+#include "database/Database.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+AlbumModel::AlbumModel( QObject* parent )
+    : PlayableModel( parent )
+    , m_overwriteOnAdd( false )
+{
+}
+
+
+AlbumModel::~AlbumModel()
+{
+}
+
+
+void
+AlbumModel::addCollection( const collection_ptr& collection, bool overwrite )
+{
+    qDebug() << Q_FUNC_INFO << collection->name()
+                            << collection->source()->id()
+                            << collection->source()->userName();
+
+    DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( collection );
+    m_overwriteOnAdd = overwrite;
+    m_collection = collection;
+
+    connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
+                    SLOT( addAlbums( QList<Tomahawk::album_ptr> ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+
+    setTitle( tr( "All albums from %1" ).arg( collection->source()->friendlyName() ) );
+
+    if ( collection.isNull() )
+    {
+        connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ), Qt::UniqueConnection );
+
+        QList<Tomahawk::source_ptr> sources = SourceList::instance()->sources();
+        foreach ( const source_ptr& source, sources )
+        {
+            connect( source->collection().data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
+        }
+    }
+    else
+    {
+        connect( collection.data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
+    }
+
+    emit loadingStarted();
+}
+
+
+void
+AlbumModel::addFilteredCollection( const collection_ptr& collection, unsigned int amount, DatabaseCommand_AllAlbums::SortOrder order, bool overwrite )
+{
+/*    qDebug() << Q_FUNC_INFO << collection->name()
+                            << collection->source()->id()
+                            << collection->source()->userName()
+                            << amount << order;*/
+
+    DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( collection );
+    cmd->setLimit( amount );
+    cmd->setSortOrder( order );
+    cmd->setSortDescending( true );
+    m_overwriteOnAdd = overwrite;
+    m_collection = collection;
+
+    connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
+                    SLOT( addAlbums( QList<Tomahawk::album_ptr> ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+
+    if ( !collection.isNull() )
+        setTitle( tr( "All albums from %1" ).arg( collection->source()->friendlyName() ) );
+    else
+        setTitle( tr( "All albums" ) );
+
+    emit loadingStarted();
+}
+
+
+void
+AlbumModel::addAlbums( const QList<Tomahawk::album_ptr>& albums )
+{
+    emit loadingFinished();
+
+    if ( m_overwriteOnAdd )
+        clear();
+
+    QList<Tomahawk::album_ptr> trimmedAlbums;
+    foreach ( const album_ptr& album, albums )
+    {
+        if ( !album.isNull() && album->name().length() )
+        {
+            if ( findItem( album ) || trimmedAlbums.contains( album ) )
+                continue;
+            trimmedAlbums << album;
+        }
+    }
+
+    if ( !trimmedAlbums.count() )
+    {
+        emit itemCountChanged( rowCount( QModelIndex() ) );
+        return;
+    }
+
+    int c = rowCount( QModelIndex() );
+    QPair< int, int > crows;
+    crows.first = c;
+    crows.second = c + trimmedAlbums.count() - 1;
+
+    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
+
+    PlayableItem* albumitem;
+    foreach( const album_ptr& album, trimmedAlbums )
+    {
+        albumitem = new PlayableItem( album, rootItem() );
+        albumitem->index = createIndex( rootItem()->children.count() - 1, 0, albumitem );
+
+        connect( albumitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
+    }
+
+    emit endInsertRows();
+    emit itemCountChanged( rowCount( QModelIndex() ) );
+}
+
+
+void
+AlbumModel::addArtists( const QList<Tomahawk::artist_ptr>& artists )
+{
+    emit loadingFinished();
+
+    if ( m_overwriteOnAdd )
+        clear();
+
+    QList<Tomahawk::artist_ptr> trimmedArtists;
+    foreach ( const artist_ptr& artist, artists )
+    {
+        if ( !artist.isNull() && artist->name().length() )
+        {
+            if ( findItem( artist ) || trimmedArtists.contains( artist ) )
+                continue;
+            trimmedArtists << artist;
+        }
+    }
+
+    if ( !trimmedArtists.count() )
+    {
+        emit itemCountChanged( rowCount( QModelIndex() ) );
+        return;
+    }
+
+    int c = rowCount( QModelIndex() );
+    QPair< int, int > crows;
+    crows.first = c;
+    crows.second = c + trimmedArtists.count() - 1;
+
+    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
+
+    PlayableItem* albumitem;
+    foreach ( const artist_ptr& artist, trimmedArtists )
+    {
+        albumitem = new PlayableItem( artist, rootItem() );
+        albumitem->index = createIndex( rootItem()->children.count() - 1, 0, albumitem );
+
+        connect( albumitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
+    }
+
+    emit endInsertRows();
+    emit itemCountChanged( rowCount( QModelIndex() ) );
+}
+
+
+void
+AlbumModel::addQueries( const QList<Tomahawk::query_ptr>& queries )
+{
+    emit loadingFinished();
+
+    if ( m_overwriteOnAdd )
+        clear();
+
+    int c = rowCount( QModelIndex() );
+    QPair< int, int > crows;
+    crows.first = c;
+    crows.second = c + queries.count() - 1;
+
+    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
+
+    PlayableItem* albumitem;
+    foreach ( const query_ptr& query, queries )
+    {
+        albumitem = new PlayableItem( query, rootItem() );
+        albumitem->index = createIndex( rootItem()->children.count() - 1, 0, albumitem );
+
+        connect( albumitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
+    }
+
+    emit endInsertRows();
+    emit itemCountChanged( rowCount( QModelIndex() ) );
+}
+
+
+void
+AlbumModel::onSourceAdded( const Tomahawk::source_ptr& source )
+{
+    connect( source->collection().data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
+}
+
+
+void
+AlbumModel::onCollectionChanged()
+{
+    addCollection( m_collection, true );
+}
+
+
+PlayableItem*
+AlbumModel::findItem( const artist_ptr& artist ) const
+{
+    for ( int i = 0; i < rowCount( QModelIndex() ); i++ )
+    {
+        PlayableItem* item = itemFromIndex( index( i, 0, QModelIndex() ) );
+        if ( !item->artist().isNull() && item->artist() == artist )
+        {
+            return item;
+        }
+    }
+
+    return 0;
+}
+
+
+PlayableItem*
+AlbumModel::findItem( const album_ptr& album ) const
+{
+    for ( int i = 0; i < rowCount( QModelIndex() ); i++ )
+    {
+        PlayableItem* item = itemFromIndex( index( i, 0, QModelIndex() ) );
+        if ( !item->album().isNull() && item->album() == album )
+        {
+            return item;
+        }
+    }
+
+    return 0;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/AlbumModel.h Added

@@ -0,0 +1,68 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 ALBUMMODEL_H
+#define ALBUMMODEL_H
+
+#include <QPixmap>
+
+#include "Album.h"
+#include "PlaylistInterface.h"
+#include "database/DatabaseCommand_AllAlbums.h"
+#include "PlayableModel.h"
+
+#include "DllMacro.h"
+
+class PlayableItem;
+class QMetaData;
+
+class DLLEXPORT AlbumModel : public PlayableModel
+{
+Q_OBJECT
+
+public:
+    explicit AlbumModel( QObject* parent = 0 );
+    virtual ~AlbumModel();
+
+    Tomahawk::collection_ptr collection() const { return m_collection; }
+
+    void addCollection( const Tomahawk::collection_ptr& collection, bool overwrite = false );
+    void addFilteredCollection( const Tomahawk::collection_ptr& collection, unsigned int amount, DatabaseCommand_AllAlbums::SortOrder order, bool overwrite = false );
+
+    PlayableItem* findItem( const Tomahawk::artist_ptr& artist ) const;
+    PlayableItem* findItem( const Tomahawk::album_ptr& album ) const;
+
+public slots:
+    void addAlbums( const QList<Tomahawk::album_ptr>& albums );
+    void addArtists( const QList<Tomahawk::artist_ptr>& artists );
+    void addQueries( const QList<Tomahawk::query_ptr>& queries );
+
+signals:
+
+private slots:
+    void onSourceAdded( const Tomahawk::source_ptr& source );
+    void onCollectionChanged();
+
+private:
+    bool m_overwriteOnAdd;
+
+    Tomahawk::collection_ptr m_collection;
+};
+
+#endif // ALBUMMODEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/CustomPlaylistView.cpp Added

@@ -0,0 +1,177 @@
+/* === 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 "CustomPlaylistView.h"
+
+#include "database/DatabaseCommand_GenericSelect.h"
+#include "database/Database.h"
+#include "utils/TomahawkUtils.h"
+#include "SourceList.h"
+#include "audio/AudioEngine.h"
+
+using namespace Tomahawk;
+
+CustomPlaylistView::CustomPlaylistView( CustomPlaylistView::PlaylistType type, const source_ptr& s, QWidget* parent )
+    : PlaylistView ( parent )
+    , m_type( type )
+    , m_source( s )
+    , m_model( new PlaylistModel( this ) )
+{
+    // Generate the tracks, add them to the playlist
+    m_model->setStyle( PlayableModel::Large );
+    setPlaylistModel( m_model );
+    generateTracks();
+
+    if ( m_type == SourceLovedTracks )
+        connect( m_source.data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) );
+    else if ( m_type == TopLovedTracks )
+    {
+        connect( SourceList::instance()->getLocal().data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) );
+        foreach ( const source_ptr& s, SourceList::instance()->sources( true ) )
+            connect( s.data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) );
+
+        connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), this, SLOT( sourceAdded( Tomahawk::source_ptr ) ) );
+    }
+}
+
+
+CustomPlaylistView::~CustomPlaylistView()
+{
+}
+
+
+bool
+CustomPlaylistView::isBeingPlayed() const
+{
+    return AudioEngine::instance()->currentTrackPlaylist() == playlistInterface();
+}
+
+
+bool
+CustomPlaylistView::jumpToCurrentTrack()
+{
+    return PlaylistView::jumpToCurrentTrack();
+}
+
+
+void
+CustomPlaylistView::generateTracks()
+{
+    m_model->startLoading();
+
+    QString sql;
+    switch ( m_type )
+    {
+        // TODO
+        case SourceLovedTracks:
+            sql = QString( "SELECT track.name, artist.name, COUNT(*) as counter "
+                           "FROM social_attributes, track, artist "
+                           "WHERE social_attributes.id = track.id AND artist.id = track.artist AND social_attributes.k = 'Love' AND social_attributes.v = 'true' AND social_attributes.source %1 "
+                           "GROUP BY track.id "
+                           "ORDER BY counter DESC, social_attributes.timestamp DESC " ).arg( m_source->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_source->id() ) );
+            break;
+        case TopLovedTracks:
+            sql = QString( "SELECT track.name, artist.name, source, COUNT(*) as counter "
+                           "FROM social_attributes, track, artist "
+                           "WHERE social_attributes.id = track.id AND artist.id = track.artist AND social_attributes.k = 'Love' AND social_attributes.v = 'true' "
+                           "GROUP BY track.id "
+                           "ORDER BY counter DESC, social_attributes.timestamp DESC LIMIT 0, 50" );
+            break;
+    }
+
+    DatabaseCommand_GenericSelect* cmd = new DatabaseCommand_GenericSelect( sql, DatabaseCommand_GenericSelect::Track, -1, 0 );
+    connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( tracksGenerated( QList<Tomahawk::query_ptr> ) ) );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+CustomPlaylistView::tracksGenerated( QList< query_ptr > tracks )
+{
+    bool changed = false;
+    QList< query_ptr > newTracks = TomahawkUtils::mergePlaylistChanges( m_model->queries(), tracks, changed );
+
+    m_model->finishLoading();
+    if ( !changed )
+        return;
+
+    m_model->clear();
+    m_model->appendQueries( newTracks );
+}
+
+
+QString
+CustomPlaylistView::title() const
+{
+    if ( m_source.isNull() )
+        return tr( "Top Loved Tracks" );
+    else
+    {
+        if ( m_source->isLocal() )
+            return tr( "Your loved tracks" );
+        else
+            return tr( "%1's loved tracks" ).arg( m_source->friendlyName() );
+    }
+}
+
+
+QString
+CustomPlaylistView::description() const
+{
+    if ( m_source.isNull() )
+        return tr( "The most loved tracks from all your friends" );
+    else
+    {
+        if ( m_source->isLocal() )
+            return tr( "All of your loved tracks" );
+        else
+            return tr( "All of %1's loved tracks" ).arg( m_source->friendlyName() );
+    }
+}
+
+
+QString
+CustomPlaylistView::longDescription() const
+{
+    return QString();
+}
+
+
+QPixmap
+CustomPlaylistView::pixmap() const
+{
+    return QPixmap( RESPATH "images/loved_playlist.png" );
+}
+
+
+void
+CustomPlaylistView::socialAttributesChanged( const QString& action )
+{
+    if ( action == "Love" )
+    {
+        generateTracks();
+    }
+}
+
+
+void
+CustomPlaylistView::sourceAdded( const source_ptr& s )
+{
+    connect( s.data(), SIGNAL( socialAttributesChanged( QString ) ), this, SLOT( socialAttributesChanged( QString ) ) );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/CustomPlaylistView.h Added

@@ -0,0 +1,70 @@
+/* === 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 CUSTOMPLAYLISTVIEW_H
+#define CUSTOMPLAYLISTVIEW_H
+
+#include "PlaylistView.h"
+
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT CustomPlaylistView : public PlaylistView
+{
+    Q_OBJECT
+public:
+    enum PlaylistType {
+        SourceLovedTracks,
+        TopLovedTracks
+    };
+
+    explicit CustomPlaylistView( PlaylistType type, const source_ptr& s, QWidget* parent = 0 );
+    virtual ~CustomPlaylistView();
+
+    virtual bool showFilter() const { return false; }
+    virtual bool showStatsBar() const { return false; }
+
+    virtual QString title() const;
+    virtual QPixmap pixmap() const;
+    virtual QString description() const;
+    virtual QString longDescription() const;
+
+    virtual bool isTemporaryPage() const { return false; }
+    virtual bool isBeingPlayed() const;
+    virtual bool jumpToCurrentTrack();
+
+private slots:
+    void tracksGenerated( QList<Tomahawk::query_ptr> tracks );
+
+    void socialAttributesChanged( const QString& );
+    void sourceAdded( const Tomahawk::source_ptr& );
+
+private:
+    void generateTracks();
+
+    PlaylistType m_type;
+    source_ptr m_source;
+    PlaylistModel* m_model;
+};
+
+}
+
+#endif // CUSTOMPLAYLISTVIEW_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/GridItemDelegate.cpp Added

@@ -0,0 +1,585 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011-2012, 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 "GridItemDelegate.h"
+
+#include <QApplication>
+#include <QPainter>
+#include <QAbstractItemView>
+#include <QMouseEvent>
+#include <QTimeLine>
+
+#include "Artist.h"
+#include "Query.h"
+#include "Result.h"
+#include "Source.h"
+#include "audio/AudioEngine.h"
+
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/PixmapDelegateFader.h"
+#include <utils/Closure.h>
+
+#include "playlist/PlayableItem.h"
+#include "playlist/PlayableProxyModel.h"
+#include "GridView.h"
+#include "ViewManager.h"
+#include "utils/AnimatedSpinner.h"
+#include "widgets/ImageButton.h"
+#include "utils/Logger.h"
+
+namespace {
+    static const int FADE_DURATION = 200;
+};
+
+
+GridItemDelegate::GridItemDelegate( QAbstractItemView* parent, PlayableProxyModel* proxy )
+    : QStyledItemDelegate( (QObject*)parent )
+    , m_view( parent )
+    , m_model( proxy )
+{
+    if ( m_view && m_view->metaObject()->indexOfSignal( "modelChanged()" ) > -1 )
+        connect( m_view, SIGNAL( modelChanged() ), this, SLOT( modelChanged() ) );
+
+    connect( proxy, SIGNAL( rowsAboutToBeInserted( QModelIndex, int, int ) ), SLOT( modelChanged() ) );
+    connect( proxy, SIGNAL( rowsAboutToBeRemoved( QModelIndex, int, int ) ), SLOT( modelChanged() ) );
+    connect( m_view, SIGNAL( scrolledContents( int, int ) ), SLOT( onViewChanged() ) );
+    connect( m_view, SIGNAL( resized() ), SLOT( onViewChanged() ) );
+}
+
+
+QSize
+GridItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QSize size = QStyledItemDelegate::sizeHint( option, index );
+    return size;
+}
+
+
+void
+GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    PlayableItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( index ) );
+    if ( !item )
+        return;
+
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, QModelIndex() );
+    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
+
+    painter->save();
+    painter->setRenderHint( QPainter::Antialiasing );
+
+    QRect r = option.rect;
+    QString top, bottom;
+    if ( !item->album().isNull() )
+    {
+        top = item->album()->name();
+
+        if ( !item->album()->artist().isNull() )
+            bottom = item->album()->artist()->name();
+    }
+    else if ( !item->artist().isNull() )
+    {
+        top = item->artist()->name();
+    }
+    else
+    {
+        top = item->query()->track();
+        bottom = item->query()->artist();
+    }
+
+    if ( !m_covers.contains( index ) )
+    {
+        if ( !item->album().isNull() )
+        {
+            m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->album(), r.size(), TomahawkUtils::Grid ) ) );
+        }
+        else if ( !item->artist().isNull() )
+        {
+            m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->artist(), r.size(), TomahawkUtils::Grid ) ) );
+        }
+        else
+        {
+            m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->query(), r.size(), TomahawkUtils::Grid ) ) );
+        }
+
+        NewClosure( m_covers index , SIGNAL( repaintRequest() ),
+                    const_cast<GridItemDelegate*>(this), SLOT( doUpdateIndex( QPersistentModelIndex ) ), QPersistentModelIndex( index ) )->setAutoDelete( false );
+    }
+
+    QSharedPointer< Tomahawk::PixmapDelegateFader > fader = m_covers index ;
+    if ( fader->size() != r.size() )
+        fader->setSize( r.size() );
+
+    const QPixmap cover = fader->currentPixmap();
+    painter->drawPixmap( r, cover );
+
+    qreal opacity = -1.;
+    if ( m_hoverFaders.contains( index ) )
+    {
+        const qreal pct = ( m_hoverFaders index ->currentFrame() / 100. );
+        opacity = 0.35 - pct * 0.35;
+    }
+    else if ( m_hoverIndex == index )
+    {
+        opacity = 0.35;
+    }
+
+    if ( opacity > -1. )
+    {
+        painter->save();
+
+        painter->setPen( QColor( 33, 33, 33 ) );
+        painter->setBrush( QColor( 33, 33, 33 ) );
+        painter->setOpacity( opacity );
+        painter->drawRect( r );
+
+        painter->restore();
+    }
+
+    painter->save();
+
+    painter->setPen( Qt::black );
+    painter->setBrush( Qt::black );
+    painter->setOpacity( 0.5 );
+    painter->drawRoundedRect( r.adjusted( 4, +r.height() - 36, -4, -4 ), 3, 3 );
+
+    painter->restore();
+
+    painter->setPen( opt.palette.color( QPalette::HighlightedText ) );
+    QTextOption to;
+    to.setWrapMode( QTextOption::NoWrap );
+
+    QString text;
+    QFont font = opt.font;
+    font.setPixelSize( 10 );
+    QFont boldFont = font;
+    boldFont.setBold( true );
+    boldFont.setPixelSize( 14 );
+
+    QRect textRect = option.rect.adjusted( 6, option.rect.height() - 36, -4, -6 );
+    painter->setFont( font );
+    int bottomHeight = painter->fontMetrics().boundingRect( bottom ).height();
+    painter->setFont( boldFont );
+    int topHeight = painter->fontMetrics().boundingRect( top ).height();
+
+    bool oneLiner = false;
+    if ( bottom.isEmpty() )
+        oneLiner = true;
+    else
+        oneLiner = ( textRect.height() < topHeight + bottomHeight );
+
+    if ( oneLiner )
+    {
+        to.setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+        text = painter->fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - 3 );
+        painter->drawText( textRect, text, to );
+    }
+    else
+    {
+        to.setAlignment( Qt::AlignHCenter | Qt::AlignTop );
+        text = painter->fontMetrics().elidedText( top, Qt::ElideRight, textRect.width() - 3 );
+        painter->drawText( textRect, text, to );
+
+        painter->setFont( font );
+        // If the user is hovering over an artist rect, draw a background so she knows it's clickable
+        QRect r = textRect;
+        r.setTop( r.bottom() - painter->fontMetrics().height() );
+        r.adjust( 4, 0, -4, -1 );
+        if ( m_hoveringOver == index )
+        {
+            TomahawkUtils::drawQueryBackground( painter, opt.palette, r, 1.1 );
+            painter->setPen( opt.palette.color( QPalette::HighlightedText ) );
+        }
+
+        to.setAlignment( Qt::AlignHCenter | Qt::AlignBottom );
+        text = painter->fontMetrics().elidedText( bottom, Qt::ElideRight, textRect.width() - 10 );
+        painter->drawText( textRect.adjusted( 5, -1, -5, -1 ), text, to );
+
+        // Calculate rect of artist on-hover button click area
+        m_artistNameRects index  = r;
+    }
+
+    painter->restore();
+}
+
+
+void
+GridItemDelegate::onPlayClicked( const QPersistentModelIndex& index )
+{
+    QPoint pos = m_playButton index ->pos();
+    foreach ( ImageButton* button, m_playButton )
+        button->deleteLater();
+    m_playButton.clear();
+
+    AnimatedSpinner* spinner = new AnimatedSpinner( m_view );
+    spinner->setAutoCenter( false );
+    spinner->fadeIn();
+    spinner->move( pos );
+    spinner->setFocusPolicy( Qt::NoFocus );
+    spinner->installEventFilter( this );
+
+    m_spinner index  = spinner;
+
+    PlayableItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( index ) );
+    if ( item )
+    {
+        NewClosure( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ),
+                    const_cast<GridItemDelegate*>(this), SLOT( onPlaybackStarted( QPersistentModelIndex ) ), QPersistentModelIndex( index ) );
+
+        m_closures.remove( index );
+
+        m_closures.insertMulti( index, NewClosure( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ),
+                                                   const_cast<GridItemDelegate*>(this), SLOT( onPlaylistChanged( QPersistentModelIndex ) ), QPersistentModelIndex( index ) ) );
+        m_closures.insertMulti( index, NewClosure( AudioEngine::instance(), SIGNAL( stopped() ),
+                                       const_cast<GridItemDelegate*>(this), SLOT( onPlaylistChanged( QPersistentModelIndex ) ), QPersistentModelIndex( index ) ) );
+
+        foreach ( _detail::Closure* closure, m_closures.values( index ) )
+            closure->setAutoDelete( false );
+
+        connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackFinished() ) );
+
+        if ( !item->query().isNull() )
+            AudioEngine::instance()->playItem( Tomahawk::playlistinterface_ptr(), item->query() );
+        else if ( !item->album().isNull() )
+            AudioEngine::instance()->playItem( item->album() );
+        else if ( !item->artist().isNull() )
+            AudioEngine::instance()->playItem( item->artist() );
+    }
+}
+
+
+bool
+GridItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
+{
+    Q_UNUSED( model );
+    Q_UNUSED( option );
+
+    if ( event->type() != QEvent::MouseButtonRelease &&
+         event->type() != QEvent::MouseMove &&
+         event->type() != QEvent::MouseButtonPress &&
+         event->type() != QEvent::Leave )
+        return false;
+
+    bool hoveringArtist = false;
+    if ( m_artistNameRects.contains( index ) )
+    {
+        const QRect artistNameRect = m_artistNameRects index ;
+        const QMouseEvent* ev = static_cast< QMouseEvent* >( event );
+        hoveringArtist = artistNameRect.contains( ev->pos() );
+    }
+
+    if ( event->type() == QEvent::MouseMove )
+    {
+        if ( hoveringArtist )
+            m_view->setCursor( Qt::PointingHandCursor );
+        else
+            m_view->setCursor( Qt::ArrowCursor );
+
+        foreach ( const QModelIndex& idx, m_playButton.keys() )
+        {
+            if ( index != idx )
+                m_playButton.take( idx )->deleteLater();
+        }
+
+        if ( !m_playButton.contains( index ) && !m_spinner.contains( index ) && !m_pauseButton.contains( index ) )
+        {
+            foreach ( ImageButton* button, m_playButton )
+                button->deleteLater();
+            m_playButton.clear();
+
+            ImageButton* button = new ImageButton( m_view );
+            button->setPixmap( RESPATH "images/play-rest.png" );
+            button->setPixmap( RESPATH "images/play-pressed.png", QIcon::Off, QIcon::Active );
+            button->setFixedSize( 48, 48 );
+            button->move( option.rect.center() - QPoint( 23, 23 ) );
+            button->setContentsMargins( 0, 0, 0, 0 );
+            button->setFocusPolicy( Qt::NoFocus );
+            button->installEventFilter( this );
+            button->show();
+
+            NewClosure( button, SIGNAL( clicked( bool ) ),
+                        const_cast<GridItemDelegate*>(this), SLOT( onPlayClicked( QPersistentModelIndex ) ), QPersistentModelIndex( index ) );
+
+            m_playButton index  = button;
+        }
+
+        if ( m_hoveringOver != index || ( !hoveringArtist && m_hoveringOver.isValid() ) )
+        {
+            emit updateIndex( m_hoveringOver );
+
+            if ( hoveringArtist )
+                m_hoveringOver = index;
+            else
+                m_hoveringOver = QPersistentModelIndex();
+
+            emit updateIndex( index );
+        }
+
+        if ( m_hoverIndex != index )
+        {
+            if ( m_hoverIndex.isValid() )
+            {
+                QTimeLine* fadeOut = createTimeline( QTimeLine::Forward );
+                _detail::Closure* c = NewClosure( fadeOut, SIGNAL( frameChanged( int ) ), this, SLOT( fadingFrameChanged( QPersistentModelIndex ) ), QPersistentModelIndex( m_hoverIndex ) );
+                c->setAutoDelete( false );
+                c = NewClosure( fadeOut, SIGNAL( finished() ), this, SLOT( fadingFrameFinished( QPersistentModelIndex ) ), QPersistentModelIndex( m_hoverIndex ) );
+                c->setAutoDelete( false );
+                m_hoverFaders m_hoverIndex  = fadeOut;
+                fadeOut->start();
+            }
+
+            emit updateIndex( m_hoverIndex );
+            m_hoverIndex = index;
+
+            QTimeLine* fadeIn = createTimeline( QTimeLine::Backward );
+            _detail::Closure* c = NewClosure( fadeIn, SIGNAL( frameChanged( int ) ), this, SLOT( fadingFrameChanged( QPersistentModelIndex ) ), QPersistentModelIndex( index ) );
+            c->setAutoDelete( false );
+            c = NewClosure( fadeIn, SIGNAL( finished() ), this, SLOT( fadingFrameFinished( QPersistentModelIndex ) ), QPersistentModelIndex( index ) );
+            c->setAutoDelete( false );
+
+            m_hoverFaders index  = fadeIn;
+            fadeIn->start();
+
+            emit updateIndex( index );
+        }
+
+        event->accept();
+        return true;
+    }
+
+    // reset mouse cursor. we switch to a pointing hand cursor when hovering an artist name
+    m_view->setCursor( Qt::ArrowCursor );
+    
+    if ( hoveringArtist )
+    {
+
+        if ( event->type() == QEvent::MouseButtonRelease )
+        {
+            PlayableItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( index ) );
+            if ( !item )
+                return false;
+
+            if ( !item->query().isNull() )
+                ViewManager::instance()->show( Tomahawk::Artist::get( item->query()->artist() ) );
+            else if ( !item->album().isNull() && !item->album()->artist().isNull() )
+                ViewManager::instance()->show( item->album()->artist() );
+
+            event->accept();
+            return true;
+        }
+        else if ( event->type() == QEvent::MouseButtonPress )
+        {
+            // Stop the whole album from having a down click action as we just want the artist name to be clicked
+            event->accept();
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+void
+GridItemDelegate::modelChanged()
+{
+    m_artistNameRects.clear();
+    m_hoveringOver = QPersistentModelIndex();
+    m_hoverIndex = QPersistentModelIndex();
+
+    foreach ( ImageButton* button, m_playButton )
+        button->deleteLater();
+    m_playButton.clear();
+    foreach ( ImageButton* button, m_pauseButton )
+        button->deleteLater();
+    m_pauseButton.clear();
+    foreach ( QWidget* widget, m_spinner )
+        widget->deleteLater();
+    m_spinner.clear();
+
+    if ( GridView* view = qobject_cast< GridView* >( m_view ) )
+        m_model = view->proxyModel();
+}
+
+
+void
+GridItemDelegate::doUpdateIndex( const QPersistentModelIndex& idx )
+{
+    if ( !idx.isValid() )
+        return;
+    emit updateIndex( idx );
+}
+
+
+void
+GridItemDelegate::onViewChanged()
+{
+    foreach ( const QPersistentModelIndex& index, m_spinner.keys() )
+    {
+        QRect rect = m_view->visualRect( index );
+        m_spinner.value( index )->move( rect.center() - QPoint( 23, 23 ) );
+    }
+    foreach ( const QPersistentModelIndex& index, m_playButton.keys() )
+    {
+        QRect rect = m_view->visualRect( index );
+        m_playButton.value( index )->move( rect.center() - QPoint( 23, 23 ) );
+    }
+    foreach ( const QPersistentModelIndex& index, m_pauseButton.keys() )
+    {
+        QRect rect = m_view->visualRect( index );
+        m_pauseButton.value( index )->move( rect.center() - QPoint( 23, 23 ) );
+    }
+}
+
+
+void
+GridItemDelegate::onPlaybackFinished()
+{
+    foreach ( ImageButton* button, m_pauseButton )
+        button->deleteLater();
+    m_pauseButton.clear();
+}
+
+
+void
+GridItemDelegate::onPlaylistChanged( const QPersistentModelIndex& index )
+{
+    PlayableItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( index ) );
+    if ( item )
+    {
+        bool finished = false;
+
+        if ( !item->query().isNull() )
+        {
+            if ( !item->query()->numResults() || AudioEngine::instance()->currentTrack() != item->query()->results().first() )
+                finished = true;
+        }
+        else if ( !item->album().isNull() )
+        {
+            if ( AudioEngine::instance()->currentTrackPlaylist() != item->album()->playlistInterface( Tomahawk::Mixed ) )
+                finished = true;
+        }
+        else if ( !item->artist().isNull() )
+        {
+            if ( AudioEngine::instance()->currentTrackPlaylist() != item->artist()->playlistInterface( Tomahawk::Mixed ) )
+                finished = true;
+        }
+
+        if ( finished )
+        {
+            foreach ( _detail::Closure* closure, m_closures.values( index ) )
+                closure->deleteLater();
+
+            if ( m_pauseButton.contains( index ) )
+            {
+                m_pauseButton index ->deleteLater();
+                m_pauseButton.remove( index );
+            }
+            if ( m_spinner.contains( index ) )
+            {
+                m_spinner index ->deleteLater();
+                m_spinner.remove( index );
+            }
+        }
+    }
+}
+
+
+void
+GridItemDelegate::onPlaybackStarted( const QPersistentModelIndex& index )
+{
+    if ( !m_spinner.contains( index ) )
+        return;
+
+    QPoint pos = m_spinner index ->pos();
+    foreach ( QWidget* widget, m_spinner.values() )
+    {
+        delete widget;
+    }
+    m_spinner.clear();
+
+    ImageButton* button = new ImageButton( m_view );
+    button->setPixmap( RESPATH "images/pause-rest.png" );
+    button->setPixmap( RESPATH "images/pause-pressed.png", QIcon::Off, QIcon::Active );
+    button->setFixedSize( 48, 48 );
+    button->move( pos );
+    button->setContentsMargins( 0, 0, 0, 0 );
+    button->setFocusPolicy( Qt::NoFocus );
+    button->installEventFilter( this );
+    button->show();
+
+    connect( button, SIGNAL( clicked( bool ) ), AudioEngine::instance(), SLOT( playPause() ) );
+
+    m_pauseButton index  = button;
+}
+
+
+void
+GridItemDelegate::fadingFrameChanged( const QPersistentModelIndex& idx )
+{
+    emit updateIndex( idx );
+}
+
+
+void
+GridItemDelegate::fadingFrameFinished( const QPersistentModelIndex& idx )
+{
+    if ( m_hoverFaders.contains( idx ) )
+    {
+        m_hoverFaders.take( idx )->deleteLater();
+        emit updateIndex( idx );
+    }
+}
+
+
+QTimeLine*
+GridItemDelegate::createTimeline( QTimeLine::Direction direction )
+{
+    QTimeLine* timeline = new QTimeLine( FADE_DURATION, this );
+    timeline->setDirection( direction );
+    timeline->setCurveShape( QTimeLine::LinearCurve );
+    timeline->setUpdateInterval( 30 );
+    timeline->setStartFrame( 0 );
+    timeline->setEndFrame( 100 );
+
+    return timeline;
+}
+
+
+bool
+GridItemDelegate::eventFilter( QObject* obj, QEvent* event )
+{
+    if ( event->type() == QEvent::Wheel )
+    {
+        QWheelEvent* we = static_cast<QWheelEvent*>( event );
+        QWheelEvent* wheelEvent = new QWheelEvent(
+            we->pos(),
+            we->globalPos(),
+            we->delta(),
+            we->buttons(),
+            we->modifiers(),
+            we->orientation() );
+
+        qApp->postEvent( m_view->viewport(), wheelEvent );
+        event->accept();
+        return true;
+    }
+    else
+        return QObject::eventFilter( obj, event );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/GridItemDelegate.h Added

@@ -0,0 +1,93 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011-2012, 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 GRIDITEMDELEGATE_H
+#define GRIDITEMDELEGATE_H
+
+#include <QStyledItemDelegate>
+#include <QTimeLine>
+
+#include "DllMacro.h"
+
+namespace Tomahawk {
+    class PixmapDelegateFader;
+}
+
+namespace _detail {
+    class Closure;
+}
+
+class QEvent;
+class QTimeLine;
+class PlayableProxyModel;
+class ImageButton;
+
+class DLLEXPORT GridItemDelegate : public QStyledItemDelegate
+{
+Q_OBJECT
+
+public:
+    GridItemDelegate( QAbstractItemView* parent = 0, PlayableProxyModel* proxy = 0 );
+
+protected:
+    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+    bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
+    bool eventFilter( QObject* obj, QEvent* event );
+
+signals:
+    void updateIndex( const QModelIndex& idx );
+
+private slots:
+    void modelChanged();
+    void doUpdateIndex( const QPersistentModelIndex& idx );
+
+    void onViewChanged();
+    void onPlaybackStarted( const QPersistentModelIndex& index );
+    void onPlaybackFinished();
+
+    void onPlayClicked( const QPersistentModelIndex& index );
+    void onPlaylistChanged( const QPersistentModelIndex& index );
+
+    void fadingFrameChanged( const QPersistentModelIndex& );
+    void fadingFrameFinished( const QPersistentModelIndex& );
+
+private:
+    QTimeLine* createTimeline( QTimeLine::Direction direction );
+
+    QAbstractItemView* m_view;
+    PlayableProxyModel* m_model;
+
+    mutable QHash< QPersistentModelIndex, QRect > m_artistNameRects;
+    mutable QHash< QPersistentModelIndex, QSharedPointer< Tomahawk::PixmapDelegateFader > > m_covers;
+
+    QPersistentModelIndex m_hoverIndex;
+    QPersistentModelIndex m_hoveringOver;
+    mutable QRect m_playButtonRect;
+
+    QPixmap m_shadowPixmap;
+    mutable QHash< QPersistentModelIndex, QWidget* > m_spinner;
+    mutable QHash< QPersistentModelIndex, ImageButton* > m_playButton;
+    mutable QHash< QPersistentModelIndex, ImageButton* > m_pauseButton;
+    mutable QHash< QPersistentModelIndex, QTimeLine* > m_hoverFaders;
+    mutable QHash< QPersistentModelIndex, _detail::Closure* > m_closures;
+};
+
+#endif // GRIDITEMDELEGATE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/GridView.cpp Added

@@ -0,0 +1,349 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "GridView.h"
+
+#include <QHeaderView>
+#include <QKeyEvent>
+#include <QPainter>
+#include <QScrollBar>
+#include <qmath.h>
+
+#include "audio/AudioEngine.h"
+#include "context/ContextWidget.h"
+#include "TomahawkSettings.h"
+#include "Artist.h"
+#include "Source.h"
+#include "PlayableItem.h"
+#include "GridItemDelegate.h"
+#include "AlbumModel.h"
+#include "PlayableModel.h"
+#include "ContextMenu.h"
+#include "ViewManager.h"
+#include "utils/Logger.h"
+#include "utils/AnimatedSpinner.h"
+#include "utils/TomahawkUtilsGui.h"
+
+#define SCROLL_TIMEOUT 280
+
+using namespace Tomahawk;
+
+
+GridView::GridView( QWidget* parent )
+    : QListView( parent )
+    , m_model( 0 )
+    , m_proxyModel( 0 )
+    , m_delegate( 0 )
+    , m_loadingSpinner( new LoadingSpinner( this ) )
+    , m_overlay( new OverlayWidget( this ) )
+    , m_contextMenu( new ContextMenu( this ) )
+    , m_inited( false )
+{
+    setFrameShape( QFrame::NoFrame );
+    setAttribute( Qt::WA_MacShowFocusRect, 0 );
+
+    setDragEnabled( true );
+    setDropIndicatorShown( false );
+    setDragDropOverwriteMode( false );
+    setUniformItemSizes( true );
+    setSpacing( 0 );
+    setContentsMargins( 0, 0, 0, 0 );
+    setMouseTracking( true );
+    setContextMenuPolicy( Qt::CustomContextMenu );
+    setResizeMode( Adjust );
+    setViewMode( IconMode );
+    setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
+    setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
+
+    setStyleSheet( "QListView { background-color: #323435; }" );
+
+    setAutoFitItems( true );
+    setAutoResize( false );
+    setProxyModel( new PlayableProxyModel( this ) );
+
+    connect( this, SIGNAL( doubleClicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
+    connect( this, SIGNAL( customContextMenuRequested( QPoint ) ), SLOT( onCustomContextMenu( QPoint ) ) );
+
+    connect( proxyModel(), SIGNAL( modelReset() ), SLOT( layoutItems() ) );
+}
+
+
+GridView::~GridView()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+GridView::setProxyModel( PlayableProxyModel* model )
+{
+    if ( m_proxyModel )
+    {
+        disconnect( m_proxyModel, SIGNAL( filterChanged( QString ) ), this, SLOT( onFilterChanged( QString ) ) );
+    }
+
+    m_proxyModel = model;
+    connect( m_proxyModel, SIGNAL( filterChanged( QString ) ), SLOT( onFilterChanged( QString ) ) );
+
+    m_delegate = new GridItemDelegate( this, m_proxyModel );
+    connect( m_delegate, SIGNAL( updateIndex( QModelIndex ) ), this, SLOT( update( QModelIndex ) ) );
+    setItemDelegate( m_delegate );
+
+    QListView::setModel( m_proxyModel );
+}
+
+
+void
+GridView::setModel( QAbstractItemModel* model )
+{
+    Q_UNUSED( model );
+    qDebug() << "Explicitly use setAlbumModel instead";
+    Q_ASSERT( false );
+}
+
+
+void
+GridView::setPlayableModel( PlayableModel* model )
+{
+    if ( m_model )
+    {
+        disconnect( model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SLOT( verifySize() ) );
+        disconnect( model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), this, SLOT( verifySize() ) );
+    }
+
+    m_inited = false;
+    m_model = model;
+
+    if ( m_proxyModel )
+    {
+        m_proxyModel->setSourcePlayableModel( m_model );
+        m_proxyModel->sort( 0 );
+    }
+
+    connect( model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( verifySize() ) );
+    connect( model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), SLOT( verifySize() ) );
+
+    emit modelChanged();
+}
+
+
+void
+GridView::setEmptyTip( const QString& tip )
+{
+    m_emptyTip = tip;
+    m_overlay->setText( tip );
+}
+
+
+void
+GridView::currentChanged( const QModelIndex& current, const QModelIndex& previous )
+{
+    QListView::currentChanged( current, previous );
+
+    PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( current ) );
+    if ( item )
+    {
+        if ( !item->album().isNull() )
+            ViewManager::instance()->context()->setAlbum( item->album() );
+    }
+}
+
+
+void
+GridView::onItemActivated( const QModelIndex& index )
+{
+    PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
+    if ( item )
+    {
+//        qDebug() << "Result activated:" << item->album()->tracks().first()->toString() << item->album()->tracks().first()->results().first()->url();
+//        APP->audioEngine()->playItem( item->album().data(), item->album()->tracks().first()->results().first() );
+
+        if ( !item->album().isNull() )
+            ViewManager::instance()->show( item->album() );
+        else if ( !item->artist().isNull() )
+            ViewManager::instance()->show( item->artist() );
+        else if ( !item->query().isNull() )
+            AudioEngine::instance()->playItem( playlistinterface_ptr(), item->query() );
+    }
+}
+
+
+void
+GridView::scrollContentsBy( int dx, int dy )
+{
+    QListView::scrollContentsBy( dx, dy );
+    emit scrolledContents( dx, dy );
+}
+
+
+void
+GridView::paintEvent( QPaintEvent* event )
+{
+    if ( !autoFitItems() || m_inited || !m_proxyModel->rowCount() )
+        QListView::paintEvent( event );
+}
+
+
+void
+GridView::resizeEvent( QResizeEvent* event )
+{
+    QListView::resizeEvent( event );
+    layoutItems();
+
+    emit resized();
+}
+
+
+void
+GridView::verifySize()
+{
+    if ( !autoResize() || !m_model )
+        return;
+
+#ifdef Q_WS_X11
+//    int scrollbar = verticalScrollBar()->isVisible() ? verticalScrollBar()->width() + 16 : 0;
+    int scrollbar = 0; verticalScrollBar()->rect().width();
+#else
+    int scrollbar = verticalScrollBar()->rect().width();
+#endif
+
+    const int rectWidth = contentsRect().width() - scrollbar - 3;
+    const int itemWidth = 160;
+    const int itemsPerRow = qMax( 1, qFloor( rectWidth / itemWidth ) );
+
+    const int overlapRows = m_model->rowCount( QModelIndex() ) % itemsPerRow;
+    const int rows = floor( (double)m_model->rowCount( QModelIndex() ) / (double)itemsPerRow );
+    const int newHeight = rows * m_model->itemSize().height();
+
+    if ( newHeight > 0 )
+        setFixedHeight( newHeight );
+
+    m_proxyModel->setMaxVisibleItems( m_model->rowCount( QModelIndex() ) - overlapRows );
+}
+
+
+void
+GridView::layoutItems()
+{
+    if ( autoFitItems() && m_model )
+    {
+#ifdef Q_WS_X11
+//        int scrollbar = verticalScrollBar()->isVisible() ? verticalScrollBar()->width() + 16 : 0;
+        int scrollbar = 0; verticalScrollBar()->rect().width();
+#else
+        int scrollbar = verticalScrollBar()->rect().width();
+#endif
+
+        const int rectWidth = contentsRect().width() - scrollbar - 3;
+        const int itemWidth = 160;
+        const int itemsPerRow = qMax( 1, qFloor( rectWidth / itemWidth ) );
+
+        const int remSpace = rectWidth - ( itemsPerRow * itemWidth );
+        const int extraSpace = remSpace / itemsPerRow;
+        const int newItemWidth = itemWidth + extraSpace;
+        
+        m_model->setItemSize( QSize( newItemWidth, newItemWidth ) );
+        verifySize();
+
+        if ( !m_inited )
+        {
+            m_inited = true;
+            repaint();
+        }
+    }
+}
+
+
+void
+GridView::onFilterChanged( const QString& )
+{
+    if ( selectedIndexes().count() )
+        scrollTo( selectedIndexes().at( 0 ), QAbstractItemView::PositionAtCenter );
+}
+
+
+void
+GridView::startDrag( Qt::DropActions supportedActions )
+{
+    QList<QPersistentModelIndex> pindexes;
+    QModelIndexList indexes;
+    foreach( const QModelIndex& idx, selectedIndexes() )
+    {
+        if ( ( m_proxyModel->flags( idx ) & Qt::ItemIsDragEnabled ) )
+        {
+            indexes << idx;
+            pindexes << idx;
+        }
+    }
+
+    if ( indexes.count() == 0 )
+        return;
+
+    qDebug() << "Dragging" << indexes.count() << "indexes";
+    QMimeData* data = m_proxyModel->mimeData( indexes );
+    if ( !data )
+        return;
+
+    QDrag* drag = new QDrag( this );
+    drag->setMimeData( data );
+    const QPixmap p = TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeAlbum, indexes.count() );
+    drag->setPixmap( p );
+    drag->setHotSpot( QPoint( -20, -20 ) );
+
+    /* Qt::DropAction action = */ drag->exec( supportedActions, Qt::CopyAction );
+}
+
+
+void
+GridView::onCustomContextMenu( const QPoint& pos )
+{
+    m_contextMenu->clear();
+
+    QModelIndex idx = indexAt( pos );
+    idx = idx.sibling( idx.row(), 0 );
+    m_contextMenuIndex = idx;
+
+    if ( !idx.isValid() )
+        return;
+
+    QList<query_ptr> queries;
+    QList<artist_ptr> artists;
+    QList<album_ptr> albums;
+
+    foreach ( const QModelIndex& index, selectedIndexes() )
+    {
+        if ( index.column() || selectedIndexes().contains( index.parent() ) )
+            continue;
+
+        PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
+
+        if ( item && !item->query().isNull() )
+            queries << item->query();
+        else if ( item && !item->artist().isNull() )
+            artists << item->artist();
+        else if ( item && !item->album().isNull() )
+            albums << item->album();
+    }
+
+    m_contextMenu->setQueries( queries );
+    m_contextMenu->setArtists( artists );
+    m_contextMenu->setAlbums( albums );
+
+    m_contextMenu->exec( viewport()->mapToGlobal( pos ) );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/GridView.h Added

@@ -0,0 +1,118 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 GRIDVIEW_H
+#define GRIDVIEW_H
+
+#include <QListView>
+#include <QSortFilterProxyModel>
+#include <QTimer>
+
+#include "ViewPage.h"
+#include "PlayableProxyModel.h"
+#include "widgets/OverlayWidget.h"
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+    class ContextMenu;
+};
+
+class AnimatedSpinner;
+class GridItemDelegate;
+class PlayableModel;
+
+class DLLEXPORT GridView : public QListView, public Tomahawk::ViewPage
+{
+Q_OBJECT
+
+public:
+    explicit GridView( QWidget* parent = 0 );
+    ~GridView();
+
+    void setProxyModel( PlayableProxyModel* model );
+
+    PlayableModel* model() const { return m_model; }
+    PlayableProxyModel* proxyModel() const { return m_proxyModel; }
+
+    bool autoFitItems() const { return m_autoFitItems; }
+    void setAutoFitItems( bool b ) { m_autoFitItems = b; }
+
+    bool autoResize() const { return m_autoResize; }
+    void setAutoResize( bool b ) { m_autoResize = b; }
+
+    void setPlayableModel( PlayableModel* model );
+    void setModel( QAbstractItemModel* model );
+
+    void setEmptyTip( const QString& tip );
+
+    virtual QWidget* widget() { return this; }
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return proxyModel()->playlistInterface(); }
+
+    virtual QString title() const { return m_model->title(); }
+    virtual QString description() const { return m_model->description(); }
+
+    virtual bool showModes() const { return true; }
+
+    virtual bool jumpToCurrentTrack() { return false; }
+
+public slots:
+    void onItemActivated( const QModelIndex& index );
+
+signals:
+    void modelChanged();
+    void scrolledContents( int dx, int dy );
+    void resized();
+
+protected:
+    virtual void startDrag( Qt::DropActions supportedActions );
+    virtual void scrollContentsBy( int dx, int dy );
+
+    void paintEvent( QPaintEvent* event );
+    void resizeEvent( QResizeEvent* event );
+
+protected slots:
+    virtual void currentChanged( const QModelIndex& current, const QModelIndex& previous );
+
+private slots:
+    void onFilterChanged( const QString& filter );
+    void onCustomContextMenu( const QPoint& pos );
+
+    void layoutItems();
+    void verifySize();
+
+private:
+    PlayableModel* m_model;
+    PlayableProxyModel* m_proxyModel;
+    GridItemDelegate* m_delegate;
+    AnimatedSpinner* m_loadingSpinner;
+    OverlayWidget* m_overlay;
+
+    QModelIndex m_contextMenuIndex;
+    Tomahawk::ContextMenu* m_contextMenu;
+
+    QString m_emptyTip;
+    bool m_inited;
+    bool m_autoFitItems;
+    bool m_autoResize;
+    
+    QRect m_paintRect;
+};
+
+#endif // GRIDVIEW_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlayableItem.cpp Added

@@ -0,0 +1,223 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Christian Muehlhaeuser <muesli@tomahawk-player.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 "PlayableItem.h"
+
+#include "utils/TomahawkUtils.h"
+#include "Artist.h"
+#include "Album.h"
+#include "Query.h"
+#include "Source.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+PlayableItem::~PlayableItem()
+{
+    // Don't use qDeleteAll here! The children will remove themselves
+    // from the list when they get deleted and the qDeleteAll iterator
+    // will fail badly!
+    for ( int i = children.count() - 1; i >= 0; i-- )
+        delete children.at( i );
+
+    if ( m_parent && index.isValid() )
+    {
+        m_parent->children.removeAt( index.row() );
+    }
+}
+
+
+PlayableItem::PlayableItem( PlayableItem* parent, QAbstractItemModel* model )
+{
+    init( parent );
+}
+
+
+PlayableItem::PlayableItem( const Tomahawk::album_ptr& album, PlayableItem* parent, int row )
+    : QObject( parent )
+    , m_album( album )
+{
+    init( parent, row );
+
+    connect( album.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
+}
+
+
+PlayableItem::PlayableItem( const Tomahawk::artist_ptr& artist, PlayableItem* parent, int row )
+    : QObject( parent )
+    , m_artist( artist )
+{
+    init( parent, row );
+
+    connect( artist.data(), SIGNAL( updated() ), SIGNAL( dataChanged() ) );
+}
+
+
+PlayableItem::PlayableItem( const Tomahawk::result_ptr& result, PlayableItem* parent, int row )
+    : QObject( parent )
+    , m_result( result )
+{
+    init( parent, row );
+}
+
+
+PlayableItem::PlayableItem( const Tomahawk::query_ptr& query, PlayableItem* parent, int row )
+    : QObject( parent )
+    , m_query( query )
+{
+    init( parent, row );
+
+    connect( query.data(), SIGNAL( socialActionsLoaded() ),
+                           SIGNAL( dataChanged() ) );
+
+    connect( query.data(), SIGNAL( updated() ),
+                           SIGNAL( dataChanged() ) );
+
+    connect( query.data(), SIGNAL( resultsChanged() ),
+                             SLOT( onResultsChanged() ) );
+}
+
+
+PlayableItem::PlayableItem( const Tomahawk::plentry_ptr& entry, PlayableItem* parent, int row )
+    : QObject( parent )
+    , m_entry( entry )
+{
+    m_query = entry->query();
+    init( parent, row );
+
+    connect( m_query.data(), SIGNAL( socialActionsLoaded() ),
+                             SIGNAL( dataChanged() ) );
+
+    connect( m_query.data(), SIGNAL( updated() ),
+                             SIGNAL( dataChanged() ) );
+
+    connect( m_query.data(), SIGNAL( resultsChanged() ),
+                               SLOT( onResultsChanged() ) );
+}
+
+
+void
+PlayableItem::init( PlayableItem* parent, int row )
+{
+    m_fetchingMore = false;
+    m_isPlaying = false;
+    m_parent = parent;
+
+    if ( parent )
+    {
+        if ( row < 0 )
+        {
+            parent->children.append( this );
+            row = parent->children.count() - 1;
+        }
+        else
+        {
+            parent->children.insert( row, this );
+        }
+
+        this->model = parent->model;
+    }
+
+    if ( !m_query.isNull() )
+    {
+        onResultsChanged();
+    }
+}
+
+
+void
+PlayableItem::onResultsChanged()
+{
+    if ( !m_query->results().isEmpty() )
+        m_result = m_query->results().first();
+    else
+        m_result = result_ptr();
+
+    emit dataChanged();
+}
+
+
+QString
+PlayableItem::name() const
+{
+    if ( !m_artist.isNull() )
+    {
+        return m_artist->name();
+    }
+    else if ( !m_album.isNull() )
+    {
+        return m_album->name();
+    }
+    else if ( !m_result.isNull() )
+    {
+        return m_result->track();
+    }
+    else if ( !m_query.isNull() )
+    {
+        return m_query->track();
+    }
+
+    Q_ASSERT( false );
+    return QString();
+}
+
+
+QString
+PlayableItem::artistName() const
+{
+    if ( !m_result.isNull() )
+    {
+        return m_result->artist()->name();
+    }
+    else if ( !m_query.isNull() )
+    {
+        return m_query->artist();
+    }
+
+    return QString();
+}
+
+
+QString
+PlayableItem::albumName() const
+{
+    if ( !m_result.isNull() && !m_result->album().isNull() )
+    {
+        return m_result->album()->name();
+    }
+    else if ( !m_query.isNull() )
+    {
+        return m_query->album();
+    }
+
+    return QString();
+}
+
+
+const Tomahawk::result_ptr&
+PlayableItem::result() const
+{
+    if ( m_result.isNull() && !m_query.isNull() )
+    {
+        if ( m_query->numResults() )
+            return m_query->results().first();
+    }
+
+    return m_result;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlayableItem.h Added

@@ -0,0 +1,86 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Christian Muehlhaeuser <muesli@tomahawk-player.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 PLAYABLEITEM_H
+#define PLAYABLEITEM_H
+
+#include <QAbstractItemModel>
+#include <QHash>
+#include <QPersistentModelIndex>
+#include <QPixmap>
+
+#include "Typedefs.h"
+#include "DllMacro.h"
+
+class DLLEXPORT PlayableItem : public QObject
+{
+Q_OBJECT
+
+public:
+    ~PlayableItem();
+
+    explicit PlayableItem( PlayableItem* parent = 0, QAbstractItemModel* model = 0 );
+    explicit PlayableItem( const Tomahawk::artist_ptr& artist, PlayableItem* parent = 0, int row = -1 );
+    explicit PlayableItem( const Tomahawk::album_ptr& album, PlayableItem* parent = 0, int row = -1 );
+    explicit PlayableItem( const Tomahawk::result_ptr& result, PlayableItem* parent = 0, int row = -1 );
+    explicit PlayableItem( const Tomahawk::query_ptr& query, PlayableItem* parent = 0, int row = -1 );
+    explicit PlayableItem( const Tomahawk::plentry_ptr& entry, PlayableItem* parent = 0, int row = -1 );
+
+    const Tomahawk::artist_ptr& artist() const { return m_artist; }
+    const Tomahawk::album_ptr& album() const { return m_album; }
+    const Tomahawk::query_ptr& query() const { return m_query; }
+    const Tomahawk::plentry_ptr& entry() const { return m_entry; }
+    const Tomahawk::result_ptr& result() const;
+
+    PlayableItem* parent() const { return m_parent; }
+
+    bool isPlaying() const { return m_isPlaying; }
+    void setIsPlaying( bool b ) { m_isPlaying = b; emit dataChanged(); }
+    bool fetchingMore() const { return m_fetchingMore; }
+    void setFetchingMore( bool b ) { m_fetchingMore = b; }
+
+    QString name() const;
+    QString artistName() const;
+    QString albumName() const;
+
+    QList<PlayableItem*> children;
+
+    QPersistentModelIndex index;
+    QAbstractItemModel* model;
+
+signals:
+    void dataChanged();
+
+private slots:
+    void onResultsChanged();
+
+private:
+    void init( PlayableItem* parent, int row = -1 );
+
+    Tomahawk::artist_ptr m_artist;
+    Tomahawk::album_ptr m_album;
+    Tomahawk::result_ptr m_result;
+    Tomahawk::query_ptr m_query;
+    Tomahawk::plentry_ptr m_entry;
+
+    PlayableItem* m_parent;
+    bool m_fetchingMore;
+    bool m_isPlaying;
+};
+
+#endif // PLAYABLEITEM_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlayableModel.cpp Added

@@ -0,0 +1,916 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011       Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "PlayableModel.h"
+
+#include <QDateTime>
+#include <QMimeData>
+#include <QTreeView>
+
+#include "audio/AudioEngine.h"
+#include "utils/TomahawkUtils.h"
+#include "Source.h"
+
+#include "Artist.h"
+#include "Album.h"
+#include "Pipeline.h"
+#include "PlayableItem.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+PlayableModel::PlayableModel( QObject* parent, bool loading )
+    : QAbstractItemModel( parent )
+    , m_rootItem( new PlayableItem( 0, this ) )
+    , m_readOnly( true )
+    , m_style( Detailed )
+    , m_loading( loading )
+{
+    connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( onPlaybackStarted( Tomahawk::result_ptr ) ), Qt::DirectConnection );
+    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ), Qt::DirectConnection );
+
+    m_header << tr( "Artist" ) << tr( "Title" ) << tr( "Composer" ) << tr( "Album" ) << tr( "Track" ) << tr( "Duration" )
+             << tr( "Bitrate" ) << tr( "Age" ) << tr( "Year" ) << tr( "Size" ) << tr( "Origin" ) << tr( "Score" ) << tr( "Name" );
+
+    m_headerStyle Detailed    << Artist << Track << Composer << Album << AlbumPos << Duration << Bitrate << Age << Year << Filesize << Origin << Score;
+    m_headerStyle Collection  << Name << Composer << Duration << Bitrate << Age << Year << Filesize << Origin;
+}
+
+
+PlayableModel::~PlayableModel()
+{
+}
+
+
+QModelIndex
+PlayableModel::index( int row, int column, const QModelIndex& parent ) const
+{
+    if ( !m_rootItem || row < 0 || column < 0 )
+        return QModelIndex();
+
+    PlayableItem* parentItem = itemFromIndex( parent );
+    PlayableItem* childItem = parentItem->children.value( row );
+    if ( !childItem )
+        return QModelIndex();
+
+    return createIndex( row, column, childItem );
+}
+
+
+int
+PlayableModel::rowCount( const QModelIndex& parent ) const
+{
+    if ( parent.column() > 0 )
+        return 0;
+
+    PlayableItem* parentItem = itemFromIndex( parent );
+    if ( !parentItem )
+        return 0;
+
+    return parentItem->children.count();
+}
+
+
+int
+PlayableModel::columnCount( const QModelIndex& parent ) const
+{
+    Q_UNUSED( parent );
+
+    switch ( m_style )
+    {
+        case Short:
+        case ShortWithAvatars:
+        case Large:
+            return 1;
+            break;
+
+        case Collection:
+            return 8;
+            break;
+
+        case Detailed:
+        default:
+            return 12;
+            break;
+    }
+}
+
+
+bool
+PlayableModel::hasChildren( const QModelIndex& parent ) const
+{
+    PlayableItem* parentItem = itemFromIndex( parent );
+    if ( !parentItem )
+        return false;
+
+    if ( parentItem == m_rootItem )
+        return true;
+
+    return ( !parentItem->artist().isNull() || !parentItem->album().isNull() );
+}
+
+
+QModelIndex
+PlayableModel::parent( const QModelIndex& child ) const
+{
+    PlayableItem* entry = itemFromIndex( child );
+    if ( !entry )
+        return QModelIndex();
+
+    PlayableItem* parentEntry = entry->parent();
+    if ( !parentEntry )
+        return QModelIndex();
+
+    PlayableItem* grandparentEntry = parentEntry->parent();
+    if ( !grandparentEntry )
+        return QModelIndex();
+
+    int row = grandparentEntry->children.indexOf( parentEntry );
+    return createIndex( row, 0, parentEntry );
+}
+
+
+QVariant
+PlayableModel::artistData( const artist_ptr& artist, int role ) const
+{
+    if ( role == Qt::SizeHintRole )
+        return QSize( 0, 44 );
+
+    if ( role != Qt::DisplayRole ) // && role != Qt::ToolTipRole )
+        return QVariant();
+
+    return artist->name();
+}
+
+
+QVariant
+PlayableModel::albumData( const album_ptr& album, int role ) const
+{
+    if ( role == Qt::SizeHintRole )
+        return QSize( 0, 32 );
+
+    if ( role != Qt::DisplayRole ) // && role != Qt::ToolTipRole )
+        return QVariant();
+
+    return album->name();
+}
+
+
+QVariant
+PlayableModel::queryData( const query_ptr& query, int column, int role ) const
+{
+    if ( role == Qt::SizeHintRole )
+        return QSize( 0, 18 );
+
+    if ( role != Qt::DisplayRole ) // && role != Qt::ToolTipRole )
+        return QVariant();
+
+    if ( !m_headerStyle.contains( m_style ) )
+        return query->track();
+
+    switch( m_headerStyle m_style .at( column ) )
+    {
+        case Artist:
+            return query->artist();
+            break;
+
+        case Name:
+        case Track:
+            return query->track();
+            break;
+
+        case Album:
+            return query->album();
+            break;
+
+        case Composer:
+            return query->composer();
+            break;
+
+        case Duration:
+            return TomahawkUtils::timeToString( query->duration() );
+            break;
+
+        case AlbumPos:
+        {
+            QString tPos;
+            if ( query->albumpos() != 0 )
+            {
+                tPos = QString::number( query->albumpos() );
+                if( query->discnumber() == 0 )
+                    return tPos;
+                else
+                    return QString( "%1.%2" ).arg( QString::number( query->discnumber() ) )
+                                             .arg( tPos );
+            }
+        }
+        break;
+
+        default:
+            break;
+    }
+    if ( query->numResults() )
+    {
+        switch( m_headerStyle m_style .at( column ) )
+        {
+            case Bitrate:
+                if ( query->results().first()->bitrate() > 0 )
+                    return query->results().first()->bitrate();
+                break;
+
+            case Age:
+                return TomahawkUtils::ageToString( QDateTime::fromTime_t( query->results().first()->modificationTime() ) );
+                break;
+
+            case Year:
+                if ( query->results().first()->year() != 0 )
+                    return query->results().first()->year();
+                break;
+
+            case Filesize:
+                return TomahawkUtils::filesizeToString( query->results().first()->size() );
+                break;
+
+            case Origin:
+                return query->results().first()->friendlySource();
+                break;
+
+            case Score:
+                return query->results().first()->score();
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    return QVariant();
+}
+
+
+QVariant
+PlayableModel::data( const QModelIndex& index, int role ) const
+{
+    PlayableItem* entry = itemFromIndex( index );
+    if ( !entry )
+        return QVariant();
+
+    if ( role == Qt::DecorationRole )
+    {
+        return QVariant();
+    }
+
+    if ( role == Qt::TextAlignmentRole )
+    {
+        return QVariant( columnAlignment( index.column() ) );
+    }
+
+    if ( role == StyleRole )
+    {
+        return m_style;
+    }
+
+    if ( role == Qt::SizeHintRole && !m_itemSize.isEmpty() )
+    {
+        return m_itemSize;
+    }
+
+    if ( !entry->query().isNull() )
+    {
+        return queryData( entry->query()->displayQuery(), index.column(), role );
+    }
+    else if ( !entry->artist().isNull() )
+    {
+        return artistData( entry->artist(), role );
+    }
+    else if ( !entry->album().isNull() )
+    {
+        return albumData( entry->album(), role );
+    }
+
+    return QVariant();
+}
+
+
+QVariant
+PlayableModel::headerData( int section, Qt::Orientation orientation, int role ) const
+{
+    Q_UNUSED( orientation );
+
+    if ( role == Qt::DisplayRole && section >= 0 )
+    {
+        if ( m_headerStyle.contains( m_style ) )
+        {
+            return m_header.at( m_headerStyle m_style .at( section ) );
+        }
+        else
+            return tr( "Name" );
+    }
+
+    if ( role == Qt::TextAlignmentRole )
+    {
+        return QVariant( columnAlignment( section ) );
+    }
+
+    return QVariant();
+}
+
+
+void
+PlayableModel::updateDetailedInfo( const QModelIndex& index )
+{
+    if ( style() != PlayableModel::Short && style() != PlayableModel::Large )
+        return;
+
+    PlayableItem* item = itemFromIndex( index );
+    if ( item->query().isNull() )
+        return;
+
+    if ( style() == PlayableModel::Short || style() == PlayableModel::Large )
+    {
+        item->query()->cover( QSize( 0, 0 ) );
+    }
+
+    if ( style() == PlayableModel::Large )
+    {
+        item->query()->loadSocialActions();
+    }
+}
+
+
+void
+PlayableModel::setCurrentItem( const QModelIndex& index )
+{
+    PlayableItem* oldEntry = itemFromIndex( m_currentIndex );
+    if ( oldEntry )
+    {
+        oldEntry->setIsPlaying( false );
+    }
+
+    PlayableItem* entry = itemFromIndex( index );
+    if ( index.isValid() && entry && !entry->query().isNull() )
+    {
+        m_currentIndex = index;
+        m_currentUuid = entry->query()->id();
+        entry->setIsPlaying( true );
+    }
+    else
+    {
+        m_currentIndex = QModelIndex();
+        m_currentUuid = QString();
+    }
+}
+
+
+Qt::DropActions
+PlayableModel::supportedDropActions() const
+{
+    return Qt::CopyAction | Qt::MoveAction;
+}
+
+
+Qt::ItemFlags
+PlayableModel::flags( const QModelIndex& index ) const
+{
+    Qt::ItemFlags defaultFlags = QAbstractItemModel::flags( index );
+
+    if ( index.isValid() && index.column() == 0 )
+        return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
+    else
+        return Qt::ItemIsDropEnabled | defaultFlags;
+}
+
+
+QStringList
+PlayableModel::mimeTypes() const
+{
+    QStringList types;
+    types << "application/tomahawk.mixed";
+    return types;
+}
+
+
+QMimeData*
+PlayableModel::mimeData( const QModelIndexList &indexes ) const
+{
+    qDebug() << Q_FUNC_INFO;
+
+    QByteArray resultData;
+    QDataStream resultStream( &resultData, QIODevice::WriteOnly );
+
+    // lets try with artist only
+    bool fail = false;
+    foreach ( const QModelIndex& i, indexes )
+    {
+        if ( i.column() > 0 || indexes.contains( i.parent() ) )
+            continue;
+
+        PlayableItem* item = itemFromIndex( i );
+        if ( !item )
+            continue;
+
+        if ( !item->artist().isNull() )
+        {
+            const artist_ptr& artist = item->artist();
+            resultStream << artist->name();
+        }
+        else
+        {
+            fail = true;
+            break;
+        }
+    }
+    if ( !fail )
+    {
+        QMimeData* mimeData = new QMimeData();
+        mimeData->setData( "application/tomahawk.metadata.artist", resultData );
+        return mimeData;
+    }
+
+    // lets try with album only
+    fail = false;
+    resultData.clear();
+    foreach ( const QModelIndex& i, indexes )
+    {
+        if ( i.column() > 0 || indexes.contains( i.parent() ) )
+            continue;
+
+        PlayableItem* item = itemFromIndex( i );
+        if ( !item )
+            continue;
+
+        if ( !item->album().isNull() )
+        {
+            const album_ptr& album = item->album();
+            resultStream << album->artist()->name();
+            resultStream << album->name();
+        }
+        else
+        {
+            fail = true;
+            break;
+        }
+    }
+    if ( !fail )
+    {
+        QMimeData* mimeData = new QMimeData();
+        mimeData->setData( "application/tomahawk.metadata.album", resultData );
+        return mimeData;
+    }
+
+    // lets try with tracks only
+    fail = false;
+    resultData.clear();
+    foreach ( const QModelIndex& i, indexes )
+    {
+        if ( i.column() > 0 || indexes.contains( i.parent() ) )
+            continue;
+
+        PlayableItem* item = itemFromIndex( i );
+        if ( !item )
+            continue;
+
+        if ( !item->result().isNull() )
+        {
+            const result_ptr& result = item->result();
+            resultStream << qlonglong( &result );
+        }
+        else
+        {
+            fail = true;
+            break;
+        }
+    }
+    if ( !fail )
+    {
+        QMimeData* mimeData = new QMimeData();
+        mimeData->setData( "application/tomahawk.result.list", resultData );
+        return mimeData;
+    }
+
+    // Ok... we have to use mixed
+    resultData.clear();
+    QDataStream mixedStream( &resultData, QIODevice::WriteOnly );
+    foreach ( const QModelIndex& i, indexes )
+    {
+        if ( i.column() > 0 || indexes.contains( i.parent() ) )
+            continue;
+
+        PlayableItem* item = itemFromIndex( i );
+        if ( !item )
+            continue;
+
+        if ( !item->artist().isNull() )
+        {
+            const artist_ptr& artist = item->artist();
+            mixedStream << QString( "application/tomahawk.metadata.artist" ) << artist->name();
+        }
+        else if ( !item->album().isNull() )
+        {
+            const album_ptr& album = item->album();
+            mixedStream << QString( "application/tomahawk.metadata.album" ) << album->artist()->name() << album->name();
+        }
+        else if ( !item->result().isNull() )
+        {
+            const result_ptr& result = item->result();
+            mixedStream << QString( "application/tomahawk.result.list" ) << qlonglong( &result );
+        }
+        else if ( !item->query().isNull() )
+        {
+            const query_ptr& query = item->query();
+            mixedStream << QString( "application/tomahawk.query.list" ) << qlonglong( &query );
+        }
+    }
+
+    QMimeData* mimeData = new QMimeData();
+    mimeData->setData( "application/tomahawk.mixed", resultData );
+    return mimeData;
+}
+
+
+void
+PlayableModel::clear()
+{
+    if ( rowCount( QModelIndex() ) )
+    {
+        finishLoading();
+
+        emit beginResetModel();
+        delete m_rootItem;
+        m_rootItem = 0;
+        m_rootItem = new PlayableItem( 0, this );
+        emit endResetModel();
+    }
+}
+
+
+QList< query_ptr >
+PlayableModel::queries() const
+{
+    Q_ASSERT( m_rootItem );
+
+    QList< query_ptr > tracks;
+    foreach ( PlayableItem* item, m_rootItem->children )
+    {
+        tracks << item->query();
+    }
+
+    return tracks;
+}
+
+
+template <typename T>
+void
+PlayableModel::insertInternal( const QList< T >& items, int row )
+{
+    if ( !items.count() )
+    {
+        emit trackCountChanged( rowCount( QModelIndex() ) );
+        emit itemCountChanged( rowCount( QModelIndex() ) );
+
+        finishLoading();
+        return;
+    }
+
+    int c = row;
+    QPair< int, int > crows;
+    crows.first = c;
+    crows.second = c + items.count() - 1;
+
+    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
+
+    int i = 0;
+    PlayableItem* plitem;
+    foreach( const T& item, items )
+    {
+        plitem = new PlayableItem( item, m_rootItem, row + i );
+        plitem->index = createIndex( row + i, 0, plitem );
+        i++;
+
+/*        if ( item->id() == currentItemUuid() )
+            setCurrentItem( plitem->index );*/
+
+        connect( plitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
+    }
+
+    emit endInsertRows();
+    emit trackCountChanged( rowCount( QModelIndex() ) );
+    finishLoading();
+}
+
+
+void
+PlayableModel::remove( int row, bool moreToCome )
+{
+    removeIndex( index( row, 0, QModelIndex() ), moreToCome );
+}
+
+
+void
+PlayableModel::removeIndex( const QModelIndex& index, bool moreToCome )
+{
+    if ( QThread::currentThread() != thread() )
+    {
+        QMetaObject::invokeMethod( this, "remove",
+                                   Qt::QueuedConnection,
+                                   Q_ARG(const QModelIndex, index),
+                                   Q_ARG(bool, moreToCome) );
+        return;
+    }
+
+    if ( index.column() > 0 )
+        return;
+
+    PlayableItem* item = itemFromIndex( index );
+    if ( item )
+    {
+        emit beginRemoveRows( index.parent(), index.row(), index.row() );
+        delete item;
+        emit endRemoveRows();
+    }
+
+    if ( !moreToCome )
+        emit trackCountChanged( rowCount( QModelIndex() ) );
+}
+
+
+void
+PlayableModel::removeIndexes( const QList<QModelIndex>& indexes )
+{
+    QList<QPersistentModelIndex> pil;
+    foreach ( const QModelIndex& idx, indexes )
+    {
+        pil << idx;
+    }
+
+    removeIndexes( pil );
+}
+
+
+void
+PlayableModel::removeIndexes( const QList<QPersistentModelIndex>& indexes )
+{
+    QList<QPersistentModelIndex> finalIndexes;
+    foreach ( const QPersistentModelIndex index, indexes )
+    {
+        if ( index.column() > 0 )
+            continue;
+        finalIndexes << index;
+    }
+
+    for ( int i = 0; i < finalIndexes.count(); i++ )
+    {
+        removeIndex( finalIndexes.at( i ), i + 1 != finalIndexes.count() );
+    }
+}
+
+
+void
+PlayableModel::onPlaybackStarted( const Tomahawk::result_ptr& result )
+{
+    PlayableItem* oldEntry = itemFromIndex( m_currentIndex );
+    if ( oldEntry && ( oldEntry->query().isNull() || !oldEntry->query()->numResults() || oldEntry->query()->results().first().data() != result.data() ) )
+    {
+        oldEntry->setIsPlaying( false );
+    }
+}
+
+
+void
+PlayableModel::onPlaybackStopped()
+{
+    PlayableItem* oldEntry = itemFromIndex( m_currentIndex );
+    if ( oldEntry )
+    {
+        oldEntry->setIsPlaying( false );
+    }
+}
+
+
+void
+PlayableModel::ensureResolved()
+{
+    for( int i = 0; i < rowCount( QModelIndex() ); i++ )
+    {
+        query_ptr query = itemFromIndex( index( i, 0, QModelIndex() ) )->query();
+
+        if ( !query->resolvingFinished() )
+            Pipeline::instance()->resolve( query );
+    }
+}
+
+
+void
+PlayableModel::setStyle( PlayableModel::PlayableItemStyle style )
+{
+    m_style = style;
+}
+
+
+QList< double >
+PlayableModel::columnWeights() const
+{
+    QList< double > w;
+
+    switch ( m_style )
+    {
+        case Short:
+        case ShortWithAvatars:
+        case Large:
+            w << 1.0;
+            break;
+
+        case Collection:
+            w << 0.42 << 0.12 << 0.07 << 0.07 << 0.07 << 0.07 << 0.07; // << 0.11;
+            break;
+
+        case Detailed:
+        default:
+            w << 0.16 << 0.16 << 0.14 << 0.12 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.09; // << 0.03;
+            break;
+    }
+
+    return w;
+}
+
+
+Qt::Alignment
+PlayableModel::columnAlignment( int column ) const
+{
+    if ( !m_headerStyle.contains( m_style ) )
+        return Qt::AlignLeft;
+
+    switch( m_headerStyle m_style .at( column ) )
+    {
+        case Age:
+        case AlbumPos:
+        case Bitrate:
+        case Duration:
+        case Filesize:
+        case Year:
+            return Qt::AlignHCenter;
+            break;
+
+        default:
+            return Qt::AlignLeft;
+    }
+}
+
+
+void
+PlayableModel::onDataChanged()
+{
+    PlayableItem* p = (PlayableItem*)sender();
+    if ( p && p->index.isValid() )
+        emit dataChanged( p->index, p->index.sibling( p->index.row(), columnCount() - 1 ) );
+}
+
+
+void
+PlayableModel::startLoading()
+{
+    m_loading = true;
+    emit loadingStarted();
+}
+
+
+void
+PlayableModel::finishLoading()
+{
+    m_loading = false;
+    emit loadingFinished();
+}
+
+
+PlayableItem*
+PlayableModel::itemFromIndex( const QModelIndex& index ) const
+{
+    if ( index.isValid() )
+    {
+        return static_cast<PlayableItem*>( index.internalPointer() );
+    }
+    else
+    {
+        return m_rootItem;
+    }
+}
+
+
+void
+PlayableModel::appendArtist( const Tomahawk::artist_ptr& artist )
+{
+    QList< artist_ptr > artists;
+    artists << artist;
+
+    appendArtists( artists );
+}
+
+
+void
+PlayableModel::appendAlbum( const Tomahawk::album_ptr& album )
+{
+    QList< album_ptr > albums;
+    albums << album;
+
+    appendAlbums( albums );
+}
+
+
+void
+PlayableModel::appendQuery( const Tomahawk::query_ptr& query )
+{
+    QList< query_ptr > queries;
+    queries << query;
+
+    appendQueries( queries );
+}
+
+
+void
+PlayableModel::appendArtists( const QList< Tomahawk::artist_ptr >& artists )
+{
+    insertArtists( artists, rowCount( QModelIndex() ) );
+}
+
+
+void
+PlayableModel::appendAlbums( const QList< Tomahawk::album_ptr >& albums )
+{
+    insertAlbums( albums, rowCount( QModelIndex() ) );
+}
+
+
+void
+PlayableModel::appendQueries( const QList< Tomahawk::query_ptr >& queries )
+{
+    insertQueries( queries, rowCount( QModelIndex() ) );
+}
+
+
+void
+PlayableModel::insertArtist( const Tomahawk::artist_ptr& artist, int row )
+{
+    QList< artist_ptr > artists;
+    artists << artist;
+
+    insertArtists( artists, row );
+}
+
+
+void
+PlayableModel::insertAlbum( const Tomahawk::album_ptr& album, int row )
+{
+    QList< album_ptr > albums;
+    albums << album;
+
+    insertAlbums( albums, row );
+}
+
+
+void
+PlayableModel::insertQuery( const Tomahawk::query_ptr& query, int row )
+{
+    QList< query_ptr > queries;
+    queries << query;
+
+    insertQueries( queries, row );
+}
+
+
+void
+PlayableModel::insertArtists( const QList< Tomahawk::artist_ptr >& artists, int row )
+{
+    insertInternal( artists, row );
+}
+
+
+void
+PlayableModel::insertAlbums( const QList< Tomahawk::album_ptr >& albums, int row )
+{
+    insertInternal( albums, row );
+}
+
+
+void
+PlayableModel::insertQueries( const QList< Tomahawk::query_ptr >& queries, int row )
+{
+    insertInternal( queries, row );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlayableModel.h Added

@@ -0,0 +1,194 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011       Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 PLAYABLEMODEL_H
+#define PLAYABLEMODEL_H
+
+#include <QAbstractItemModel>
+#include <QPixmap>
+
+#include "PlaylistInterface.h"
+#include "Typedefs.h"
+
+#include "DllMacro.h"
+
+class QMetaData;
+
+class PlayableItem;
+
+class DLLEXPORT PlayableModel : public QAbstractItemModel
+{
+Q_OBJECT
+
+public:
+    enum PlayableItemStyle
+    { Detailed = 0, Short = 1, ShortWithAvatars = 2, Large = 3, Collection = 4 };
+
+    enum PlayableModelRole
+    { StyleRole = Qt::UserRole + 1 };
+
+    enum Columns {
+        Artist = 0,
+        Track = 1,
+        Composer = 2,
+        Album = 3,
+        AlbumPos = 4,
+        Duration = 5,
+        Bitrate = 6,
+        Age = 7,
+        Year = 8,
+        Filesize = 9,
+        Origin = 10,
+        Score = 11,
+        Name = 12
+    };
+
+    explicit PlayableModel( QObject* parent = 0, bool loading = true );
+    virtual ~PlayableModel();
+
+    PlayableModel::PlayableItemStyle style() const { return m_style; }
+    void setStyle( PlayableModel::PlayableItemStyle style );
+
+    virtual QModelIndex index( int row, int column, const QModelIndex& parent ) const;
+    virtual QModelIndex parent( const QModelIndex& child ) const;
+
+    virtual bool isReadOnly() const { return m_readOnly; }
+    virtual void setReadOnly( bool b ) { m_readOnly = b; }
+    virtual bool isLoading() const { return m_loading; }
+
+    virtual QString title() const { return m_title; }
+    virtual void setTitle( const QString& title ) { m_title = title; }
+    virtual QString description() const { return m_description; }
+    virtual void setDescription( const QString& description ) { m_description = description; }
+    virtual QPixmap icon() const { return m_icon; }
+    virtual void setIcon( const QPixmap& pixmap ) { m_icon = pixmap; }
+
+    virtual int trackCount() const { return rowCount( QModelIndex() ); }
+    virtual int itemCount() const { return rowCount( QModelIndex() ); }
+
+    virtual int rowCount( const QModelIndex& parent ) const;
+    virtual int columnCount( const QModelIndex& parent = QModelIndex() ) const;
+    virtual bool hasChildren( const QModelIndex& parent ) const;
+
+    QList< double > columnWeights() const;
+
+    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
+    virtual QVariant headerData( int section, Qt::Orientation orientation, int role ) const;
+
+    virtual QVariant artistData( const Tomahawk::artist_ptr& artist, int role = Qt::DisplayRole ) const;
+    virtual QVariant albumData( const Tomahawk::album_ptr& album, int role = Qt::DisplayRole ) const;
+    virtual QVariant queryData( const Tomahawk::query_ptr&, int column, int role = Qt::DisplayRole ) const;
+
+    virtual QMimeData* mimeData( const QModelIndexList& indexes ) const;
+    virtual QStringList mimeTypes() const;
+    virtual Qt::DropActions supportedDropActions() const;
+    virtual Qt::ItemFlags flags( const QModelIndex& index ) const;
+
+    virtual QPersistentModelIndex currentItem() { return m_currentIndex; }
+    virtual Tomahawk::QID currentItemUuid() { return m_currentUuid; }
+
+    virtual Tomahawk::PlaylistModes::RepeatMode repeatMode() const { return Tomahawk::PlaylistModes::NoRepeat; }
+    virtual bool shuffled() const { return false; }
+
+    virtual void ensureResolved();
+
+    PlayableItem* itemFromIndex( const QModelIndex& index ) const;
+    /// Returns a flat list of all tracks in this model
+    QList< Tomahawk::query_ptr > queries() const;
+
+    void updateDetailedInfo( const QModelIndex& index );
+
+    QSize itemSize() const { return m_itemSize; }
+    void setItemSize( const QSize& size ) { m_itemSize = size; }
+
+    void startLoading();
+    void finishLoading();
+
+signals:
+    void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode );
+    void shuffleModeChanged( bool enabled );
+
+    void trackCountChanged( unsigned int tracks );
+    void itemCountChanged( unsigned int items );
+
+    void loadingStarted();
+    void loadingFinished();
+
+public slots:
+    virtual void setCurrentItem( const QModelIndex& index );
+
+    virtual void clear();
+
+    virtual void appendQueries( const QList< Tomahawk::query_ptr >& queries );
+    virtual void appendArtists( const QList< Tomahawk::artist_ptr >& artists );
+    virtual void appendAlbums( const QList< Tomahawk::album_ptr >& albums );
+    virtual void appendQuery( const Tomahawk::query_ptr& query );
+    virtual void appendArtist( const Tomahawk::artist_ptr& artist );
+    virtual void appendAlbum( const Tomahawk::album_ptr& album );
+
+    virtual void insertQueries( const QList< Tomahawk::query_ptr >& queries, int row = 0 );
+    virtual void insertArtists( const QList< Tomahawk::artist_ptr >& artists, int row = 0 );
+    virtual void insertAlbums( const QList< Tomahawk::album_ptr >& albums, int row = 0 );
+    virtual void insertQuery( const Tomahawk::query_ptr& query, int row = 0 );
+    virtual void insertArtist( const Tomahawk::artist_ptr& artist, int row = 0 );
+    virtual void insertAlbum( const Tomahawk::album_ptr& album, int row = 0 );
+
+    virtual void remove( int row, bool moreToCome = false );
+    virtual void removeIndex( const QModelIndex& index, bool moreToCome = false );
+    virtual void removeIndexes( const QList<QModelIndex>& indexes );
+    virtual void removeIndexes( const QList<QPersistentModelIndex>& indexes );
+
+    virtual void setRepeatMode( Tomahawk::PlaylistModes::RepeatMode /*mode*/ ) {}
+    virtual void setShuffled( bool /*shuffled*/ ) {}
+
+protected:
+    PlayableItem* rootItem() const { return m_rootItem; }
+
+private slots:
+    void onDataChanged();
+
+    void onPlaybackStarted( const Tomahawk::result_ptr& result );
+    void onPlaybackStopped();
+
+private:
+    template <typename T>
+    void insertInternal( const QList< T >& items, int row );
+
+    Qt::Alignment columnAlignment( int column ) const;
+
+    PlayableItem* m_rootItem;
+    QPersistentModelIndex m_currentIndex;
+    Tomahawk::QID m_currentUuid;
+    QSize m_itemSize;
+
+    bool m_readOnly;
+
+    QString m_title;
+    QString m_description;
+    QPixmap m_icon;
+
+    QHash< PlayableItemStyle, QList<Columns> > m_headerStyle;
+    QStringList m_header;
+
+    PlayableItemStyle m_style;
+    bool m_loading;
+};
+
+#endif // PLAYABLEMODEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlayableProxyModel.cpp Added

@@ -0,0 +1,463 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "PlayableProxyModel.h"
+
+#include <QTreeView>
+
+#include "PlayableProxyModelPlaylistInterface.h"
+#include "Artist.h"
+#include "Album.h"
+#include "Query.h"
+#include "Source.h"
+#include "PlayableItem.h"
+#include "utils/Logger.h"
+
+
+PlayableProxyModel::PlayableProxyModel( QObject* parent )
+    : QSortFilterProxyModel( parent )
+    , m_model( 0 )
+    , m_showOfflineResults( true )
+    , m_hideDupeItems( false )
+    , m_maxVisibleItems( -1 )
+{
+    setFilterCaseSensitivity( Qt::CaseInsensitive );
+    setSortCaseSensitivity( Qt::CaseInsensitive );
+    setDynamicSortFilter( true );
+
+    setSourcePlayableModel( 0 );
+}
+
+
+bool
+PlayableProxyModel::isLoading() const
+{
+    if ( m_model )
+    {
+        return m_model->isLoading();
+    }
+
+    return false;
+}
+
+
+void
+PlayableProxyModel::setSourceModel( QAbstractItemModel* model )
+{
+    Q_UNUSED( model );
+    qDebug() << "Explicitly use setSourcePlayableModel instead";
+    Q_ASSERT( false );
+}
+
+
+void
+PlayableProxyModel::setSourcePlayableModel( PlayableModel* sourceModel )
+{
+    if ( m_model )
+    {
+        if ( m_model->metaObject()->indexOfSignal( "trackCountChanged(uint)" ) > -1 )
+            disconnect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), this, SIGNAL( sourceTrackCountChanged( unsigned int ) ) );
+
+        disconnect( m_model, SIGNAL( loadingStarted() ), this, SIGNAL( loadingStarted() ) );
+        disconnect( m_model, SIGNAL( loadingFinished() ), this, SIGNAL( loadingFinished() ) );
+    }
+
+    m_model = sourceModel;
+
+    if ( m_model )
+    {
+        if ( m_model->metaObject()->indexOfSignal( "trackCountChanged(uint)" ) > -1 )
+            connect( m_model, SIGNAL( trackCountChanged( unsigned int ) ), playlistInterface().data(), SIGNAL( sourceTrackCountChanged( unsigned int ) ) );
+
+        connect( m_model, SIGNAL( loadingStarted() ), SIGNAL( loadingStarted() ) );
+        connect( m_model, SIGNAL( loadingFinished() ), SIGNAL( loadingFinished() ) );
+    }
+
+    QSortFilterProxyModel::setSourceModel( m_model );
+}
+
+
+bool
+PlayableProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
+{
+    PlayableItem* pi = itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
+    if ( !pi )
+        return false;
+
+    if ( m_maxVisibleItems >= 0 && sourceRow > m_maxVisibleItems - 1 )
+        return false;
+
+    if ( m_hideDupeItems )
+    {
+        for ( int i = 0; i < sourceRow; i++ )
+        {
+            PlayableItem* di = itemFromIndex( sourceModel()->index( i, 0, sourceParent ) );
+            if ( !di )
+                continue;
+
+            bool b = ( pi->query() && pi->query()->equals( di->query() ) ) ||
+                     ( pi->album() && pi->album() == di->album() ) ||
+                     ( pi->artist() && pi->artist()->name() == di->artist()->name() );
+
+            if ( b && filterAcceptsRow( i, sourceParent ) )
+                return false;
+        }
+    }
+
+    if ( pi->query() )
+    {
+        const Tomahawk::query_ptr& q = pi->query()->displayQuery();
+        if ( q.isNull() ) // uh oh? filter out invalid queries i guess
+            return false;
+
+        Tomahawk::result_ptr r;
+        if ( q->numResults() )
+            r = q->results().first();
+
+        if ( !m_showOfflineResults && !r.isNull() && !r->isOnline() )
+            return false;
+
+        if ( filterRegExp().isEmpty() )
+            return true;
+
+        QStringList sl = filterRegExp().pattern().split( " ", QString::SkipEmptyParts );
+        foreach( QString s, sl )
+        {
+            s = s.toLower();
+            if ( !q->artist().toLower().contains( s ) &&
+                !q->album().toLower().contains( s ) &&
+                !q->track().toLower().contains( s ) )
+            {
+                return false;
+            }
+        }
+    }
+
+    const Tomahawk::album_ptr& al = pi->album();
+    if ( al )
+    {
+        QStringList sl = filterRegExp().pattern().split( " ", QString::SkipEmptyParts );
+
+        bool found = true;
+        foreach( const QString& s, sl )
+        {
+            if ( !al->name().contains( s, Qt::CaseInsensitive ) && !al->artist()->name().contains( s, Qt::CaseInsensitive ) )
+            {
+                found = false;
+            }
+        }
+
+        return found;
+    }
+
+    const Tomahawk::album_ptr& ar = pi->album();
+    if ( ar )
+    {
+        QStringList sl = filterRegExp().pattern().split( " ", QString::SkipEmptyParts );
+
+        bool found = true;
+        foreach( const QString& s, sl )
+        {
+            if ( !ar->name().contains( s, Qt::CaseInsensitive ) && !ar->artist()->name().contains( s, Qt::CaseInsensitive ) )
+            {
+                found = false;
+            }
+        }
+
+        return found;
+    }
+
+    return true;
+}
+
+
+void
+PlayableProxyModel::removeIndex( const QModelIndex& index )
+{
+    if ( !sourceModel() )
+        return;
+    if ( !index.isValid() )
+        return;
+
+    sourceModel()->removeIndex( mapToSource( index ) );
+}
+
+
+void
+PlayableProxyModel::removeIndexes( const QModelIndexList& indexes )
+{
+    if ( !sourceModel() )
+        return;
+
+    QList<QPersistentModelIndex> pil;
+    foreach ( const QModelIndex& idx, indexes )
+    {
+        if ( idx.isValid() )
+            pil << mapToSource( idx );
+    }
+
+    sourceModel()->removeIndexes( pil );
+}
+
+
+void
+PlayableProxyModel::removeIndexes( const QList< QPersistentModelIndex >& indexes )
+{
+    if ( !sourceModel() )
+        return;
+
+    QList<QPersistentModelIndex> pil;
+    foreach ( const QPersistentModelIndex& idx, indexes )
+    {
+        if ( idx.isValid() )
+            pil << mapToSource( idx );
+    }
+
+    sourceModel()->removeIndexes( pil );
+}
+
+
+void
+PlayableProxyModel::setShowOfflineResults( bool b )
+{
+    m_showOfflineResults = b;
+    invalidateFilter();
+}
+
+
+void
+PlayableProxyModel::setHideDupeItems( bool b )
+{
+    m_hideDupeItems = b;
+    invalidateFilter();
+}
+
+
+void
+PlayableProxyModel::setMaxVisibleItems( int items )
+{
+    if ( m_maxVisibleItems == items )
+        return;
+
+    m_maxVisibleItems = items;
+    invalidateFilter();
+}
+
+
+bool
+PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const Tomahawk::query_ptr& q2 ) const
+{
+    const QString artist1 = q1->artistSortname();
+    const QString artist2 = q2->artistSortname();
+    const QString album1 = q1->albumSortname();
+    const QString album2 = q2->albumSortname();
+    const QString track1 = q1->trackSortname();
+    const QString track2 = q2->trackSortname();
+    const QString composer1 = q1->composerSortname();
+    const QString composer2 = q2->composerSortname();
+    const unsigned int albumpos1 = q1->albumpos();
+    const unsigned int albumpos2 = q2->albumpos();
+    const unsigned int discnumber1 = q1->discnumber();
+    const unsigned int discnumber2 = q2->discnumber();
+    unsigned int bitrate1 = 0, bitrate2 = 0;
+    unsigned int mtime1 = 0, mtime2 = 0;
+    unsigned int size1 = 0, size2 = 0;
+    float score1 = 0, score2 = 0;
+    QString origin1;
+    QString origin2;
+    qint64 id1 = 0, id2 = 0;
+
+    if ( q1->numResults() )
+    {
+        const Tomahawk::result_ptr& r = q1->results().at( 0 );
+        bitrate1 = r->bitrate();
+        mtime1 = r->modificationTime();
+        size1 = r->size();
+        score1 = r->score();
+        origin1 = r->friendlySource().toLower();
+        id1 = (qint64)&r;
+    }
+    if ( q2->numResults() )
+    {
+        const Tomahawk::result_ptr& r = q2->results().at( 0 );
+        bitrate2 = r->bitrate();
+        mtime2 = r->modificationTime();
+        size2 = r->size();
+        score2 = r->score();
+        origin2 = r->friendlySource().toLower();
+        id2 = (qint64)&r;
+    }
+
+    // This makes it a stable sorter and prevents items from randomly jumping about.
+    if ( id1 == id2 )
+    {
+        id1 = (qint64)&q1;
+        id2 = (qint64)&q2;
+    }
+
+    if ( column == PlayableModel::Artist ) // sort by artist
+    {
+        if ( artist1 == artist2 )
+        {
+            if ( album1 == album2 )
+            {
+                if ( discnumber1 == discnumber2 )
+                {
+                    if ( albumpos1 == albumpos2 )
+                        return id1 < id2;
+
+                    return albumpos1 < albumpos2;
+                }
+
+                return discnumber1 < discnumber2;
+            }
+
+            return QString::localeAwareCompare( album1, album2 ) < 0;
+        }
+
+        return QString::localeAwareCompare( artist1, artist2 ) < 0;
+    }
+    else if ( column == PlayableModel::Composer ) // sort by composer
+    {
+        if ( composer1 == composer2 )
+        {
+            if ( album1 == album2 )
+            {
+                if ( discnumber1 == discnumber2 )
+                {
+                    if ( albumpos1 == albumpos2 )
+                        return id1 < id2;
+
+                    return albumpos1 < albumpos2;
+                }
+
+                return discnumber1 < discnumber2;
+            }
+
+            return QString::localeAwareCompare( album1, album2 ) < 0;
+        }
+
+        return QString::localeAwareCompare( composer1, composer2 ) < 0;
+    }
+    else if ( column == PlayableModel::Album ) // sort by album
+    {
+        if ( album1 == album2 )
+        {
+            if ( discnumber1 == discnumber2 )
+            {
+                if ( albumpos1 == albumpos2 )
+                    return id1 < id2;
+
+                return albumpos1 < albumpos2;
+            }
+
+            return discnumber1 < discnumber2;
+        }
+
+        return QString::localeAwareCompare( album1, album2 ) < 0;
+    }
+    else if ( column == PlayableModel::Bitrate ) // sort by bitrate
+    {
+        if ( bitrate1 == bitrate2 )
+            return id1 < id2;
+
+        return bitrate1 < bitrate2;
+    }
+    else if ( column == PlayableModel::Age ) // sort by mtime
+    {
+        if ( mtime1 == mtime2 )
+            return id1 < id2;
+
+        return mtime1 < mtime2;
+    }
+    else if ( column == PlayableModel::Filesize ) // sort by file size
+    {
+        if ( size1 == size2 )
+            return id1 < id2;
+
+        return size1 < size2;
+    }
+    else if ( column == PlayableModel::Score ) // sort by file score
+    {
+        if ( score1 == score2 )
+            return id1 < id2;
+
+        return score1 < score2;
+    }
+    else if ( column == PlayableModel::Origin ) // sort by file origin
+    {
+        if ( origin1 == origin2 )
+            return id1 < id2;
+
+        return origin1 < origin2;
+    }
+    else if ( column == PlayableModel::AlbumPos ) // sort by album pos
+    {
+        if ( discnumber1 != discnumber2 )
+        {
+            return discnumber1 < discnumber2;
+        }
+        else
+        {
+            if ( albumpos1 != albumpos2 )
+                return albumpos1 < albumpos2;
+        }
+    }
+
+    const QString& lefts = q1->track();
+    const QString& rights = q2->track();
+    if ( lefts == rights )
+        return id1 < id2;
+
+    return QString::localeAwareCompare( lefts, rights ) < 0;
+}
+
+
+bool
+PlayableProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
+{
+    PlayableItem* p1 = itemFromIndex( left );
+    PlayableItem* p2 = itemFromIndex( right );
+
+    if ( !p1 )
+        return true;
+    if ( !p2 )
+        return false;
+
+    if ( p1->query() && p2->query() )
+    {
+        const Tomahawk::query_ptr& q1 = p1->query()->displayQuery();
+        const Tomahawk::query_ptr& q2 = p2->query()->displayQuery();
+        return lessThan( left.column(), q1, q2 );
+    }
+
+    return QString::localeAwareCompare( sourceModel()->data( left ).toString(), sourceModel()->data( right ).toString() ) < 0;
+}
+
+
+Tomahawk::playlistinterface_ptr
+PlayableProxyModel::playlistInterface()
+{
+    if ( m_playlistInterface.isNull() )
+    {
+        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::PlayableProxyModelPlaylistInterface( this ) );
+    }
+
+    return m_playlistInterface;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlayableProxyModel.h Added

@@ -0,0 +1,91 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TRACKPROXYMODEL_H
+#define TRACKPROXYMODEL_H
+
+#include <QtGui/QSortFilterProxyModel>
+
+#include "PlaylistInterface.h"
+#include "playlist/PlayableModel.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT PlayableProxyModel : public QSortFilterProxyModel
+{
+Q_OBJECT
+
+public:
+    explicit PlayableProxyModel ( QObject* parent = 0 );
+    virtual ~PlayableProxyModel() {}
+
+    virtual PlayableModel* sourceModel() const { return m_model; }
+    virtual void setSourcePlayableModel( PlayableModel* sourceModel );
+    virtual void setSourceModel( QAbstractItemModel* model );
+
+    virtual bool isLoading() const;
+
+    virtual QPersistentModelIndex currentIndex() const { return mapFromSource( m_model->currentItem() ); }
+    virtual void setCurrentIndex( const QModelIndex& index ) { m_model->setCurrentItem( mapToSource( index ) ); }
+
+    virtual void removeIndex( const QModelIndex& index );
+    virtual void removeIndexes( const QModelIndexList& indexes );
+    virtual void removeIndexes( const QList< QPersistentModelIndex >& indexes );
+
+    virtual bool showOfflineResults() const { return m_showOfflineResults; }
+    virtual void setShowOfflineResults( bool b );
+
+    virtual bool hideDupeItems() const { return m_hideDupeItems; }
+    virtual void setHideDupeItems( bool b );
+
+    virtual int maxVisibleItems() const { return m_maxVisibleItems; }
+    virtual void setMaxVisibleItems( int items );
+
+    virtual void emitFilterChanged( const QString &pattern ) { emit filterChanged( pattern ); }
+
+    virtual PlayableItem* itemFromIndex( const QModelIndex& index ) const { return sourceModel()->itemFromIndex( index ); }
+
+    virtual Tomahawk::playlistinterface_ptr playlistInterface();
+
+signals:
+    void filterChanged( const QString& filter );
+
+    void filteringStarted();
+    void filteringFinished();
+
+    void loadingStarted();
+    void loadingFinished();
+
+protected:
+    virtual bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const;
+    virtual bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
+
+    Tomahawk::playlistinterface_ptr m_playlistInterface;
+
+private:
+    virtual bool lessThan( int column, const Tomahawk::query_ptr& left, const Tomahawk::query_ptr& right ) const;
+
+    PlayableModel* m_model;
+
+    bool m_showOfflineResults;
+    bool m_hideDupeItems;
+    int m_maxVisibleItems;
+};
+
+#endif // TRACKPROXYMODEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.cpp Added

@@ -0,0 +1,197 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "PlayableProxyModelPlaylistInterface.h"
+
+#include "PlayableProxyModel.h"
+#include "Artist.h"
+#include "Album.h"
+#include "Query.h"
+#include "PlayableItem.h"
+#include "Source.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+PlayableProxyModelPlaylistInterface::PlayableProxyModelPlaylistInterface( PlayableProxyModel* proxyModel )
+    : PlaylistInterface()
+    , m_proxyModel( proxyModel )
+    , m_repeatMode( PlaylistModes::NoRepeat )
+    , m_shuffled( false )
+{
+}
+
+
+PlayableProxyModelPlaylistInterface::~PlayableProxyModelPlaylistInterface()
+{
+    m_proxyModel.clear();
+}
+
+
+int
+PlayableProxyModelPlaylistInterface::unfilteredTrackCount() const
+{
+    return ( m_proxyModel.isNull() ? 0 : m_proxyModel.data()->sourceModel()->trackCount() );
+}
+
+
+int
+PlayableProxyModelPlaylistInterface::trackCount() const
+{
+    return ( m_proxyModel.isNull() ? 0 : m_proxyModel.data()->rowCount( QModelIndex() ) );
+}
+
+
+QString
+PlayableProxyModelPlaylistInterface::filter() const
+{
+    return ( m_proxyModel.isNull() ? QString() : m_proxyModel.data()->filterRegExp().pattern() );
+}
+
+
+void
+PlayableProxyModelPlaylistInterface::setFilter( const QString& pattern )
+{
+    if ( m_proxyModel.isNull() )
+        return;
+
+    m_proxyModel.data()->setFilterRegExp( pattern );
+    m_proxyModel.data()->emitFilterChanged( pattern );
+
+    emit trackCountChanged( trackCount() );
+}
+
+
+QList< Tomahawk::query_ptr >
+PlayableProxyModelPlaylistInterface::tracks()
+{
+    if ( m_proxyModel.isNull() )
+        return QList< Tomahawk::query_ptr >();
+
+    PlayableProxyModel* proxyModel = m_proxyModel.data();
+    QList<Tomahawk::query_ptr> queries;
+
+    for ( int i = 0; i < proxyModel->rowCount( QModelIndex() ); i++ )
+    {
+        PlayableItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( proxyModel->index( i, 0 ) ) );
+        if ( item )
+            queries << item->query();
+    }
+
+    return queries;
+}
+
+
+Tomahawk::result_ptr
+PlayableProxyModelPlaylistInterface::siblingItem( int itemsAway )
+{
+    return siblingItem( itemsAway, false );
+}
+
+
+bool
+PlayableProxyModelPlaylistInterface::hasNextItem()
+{
+    return !( siblingItem( 1, true ).isNull() );
+}
+
+
+Tomahawk::result_ptr
+PlayableProxyModelPlaylistInterface::siblingItem( int itemsAway, bool readOnly )
+{
+    qDebug() << Q_FUNC_INFO;
+
+    if ( m_proxyModel.isNull() )
+        return Tomahawk::result_ptr();
+
+    PlayableProxyModel* proxyModel = m_proxyModel.data();
+
+    QModelIndex idx = proxyModel->index( 0, 0 );
+    if ( proxyModel->rowCount() )
+    {
+        if ( m_shuffled )
+        {
+            // random mode is enabled
+            // TODO come up with a clever random logic, that keeps track of previously played items
+            idx = proxyModel->index( qrand() % proxyModel->rowCount(), 0 );
+        }
+        else if ( proxyModel->currentIndex().isValid() )
+        {
+            idx = proxyModel->currentIndex();
+
+            // random mode is disabled
+            if ( m_repeatMode != PlaylistModes::RepeatOne )
+            {
+                // keep progressing through the playlist normally
+                idx = proxyModel->index( idx.row() + itemsAway, 0 );
+            }
+        }
+    }
+
+    if ( !idx.isValid() && m_repeatMode == PlaylistModes::RepeatAll )
+    {
+        // repeat all tracks
+        if ( itemsAway > 0 )
+        {
+            // reset to first item
+            idx = proxyModel->index( 0, 0 );
+        }
+        else
+        {
+            // reset to last item
+            idx = proxyModel->index( proxyModel->rowCount() - 1, 0 );
+        }
+    }
+
+    // Try to find the next available PlaylistItem (with results)
+    while ( idx.isValid() )
+    {
+        PlayableItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( idx ) );
+        if ( item && item->query()->playable() )
+        {
+            qDebug() << "Next PlaylistItem found:" << item->query()->toString() << item->query()->results().at( 0 )->url();
+            if ( !readOnly )
+                proxyModel->setCurrentIndex( idx );
+            return item->query()->results().at( 0 );
+        }
+
+        idx = proxyModel->index( idx.row() + ( itemsAway > 0 ? 1 : -1 ), 0 );
+    }
+
+    if ( !readOnly )
+        proxyModel->setCurrentIndex( QModelIndex() );
+    return Tomahawk::result_ptr();
+}
+
+
+Tomahawk::result_ptr
+PlayableProxyModelPlaylistInterface::currentItem() const
+{
+    if ( m_proxyModel.isNull() )
+        return Tomahawk::result_ptr();
+
+    PlayableProxyModel* proxyModel = m_proxyModel.data();
+
+    PlayableItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( proxyModel->currentIndex() ) );
+    if ( item && !item->query().isNull() && item->query()->playable() )
+        return item->query()->results().at( 0 );
+    return Tomahawk::result_ptr();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlayableProxyModelPlaylistInterface.h Added

@@ -0,0 +1,70 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TRACKPROXYMODELPLAYLISTINTERFACE_H
+#define TRACKPROXYMODELPLAYLISTINTERFACE_H
+
+#include <QtGui/QSortFilterProxyModel>
+
+#include "PlaylistInterface.h"
+#include "playlist/PlayableModel.h"
+
+#include "DllMacro.h"
+
+class PlayableProxyModel;
+
+namespace Tomahawk {
+
+class DLLEXPORT PlayableProxyModelPlaylistInterface : public Tomahawk::PlaylistInterface
+{
+Q_OBJECT
+
+public:
+    explicit PlayableProxyModelPlaylistInterface( PlayableProxyModel* proxyModel );
+    virtual ~PlayableProxyModelPlaylistInterface();
+
+    virtual QList<Tomahawk::query_ptr> tracks();
+
+    virtual int unfilteredTrackCount() const;
+    virtual int trackCount() const;
+
+    virtual Tomahawk::result_ptr currentItem() const;
+    virtual Tomahawk::result_ptr siblingItem( int itemsAway );
+    virtual Tomahawk::result_ptr siblingItem( int itemsAway, bool readOnly );
+    virtual bool hasNextItem();
+
+    virtual QString filter() const;
+    virtual void setFilter( const QString& pattern );
+
+    virtual PlaylistModes::RepeatMode repeatMode() const { return m_repeatMode; }
+    virtual bool shuffled() const { return m_shuffled; }
+
+public slots:
+    virtual void setRepeatMode( Tomahawk::PlaylistModes::RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
+    virtual void setShuffled( bool enabled ) { m_shuffled = enabled; emit shuffleModeChanged( enabled ); }
+
+protected:
+    QWeakPointer< PlayableProxyModel > m_proxyModel;
+    PlaylistModes::RepeatMode m_repeatMode;
+    bool m_shuffled;
+};
+
+} //ns
+
+#endif // TRACKPROXYMODELPLAYLISTINTERFACE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp Added

@@ -0,0 +1,252 @@
+/* === 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
+ *   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 "PlaylistChartItemDelegate.h"
+
+#include <QApplication>
+#include <QPainter>
+
+#include "Query.h"
+#include "Result.h"
+#include "Artist.h"
+#include "Source.h"
+#include "SourceList.h"
+
+#include "PlaylistView.h"
+#include "PlayableModel.h"
+#include "PlayableItem.h"
+#include "PlayableProxyModel.h"
+#include "TrackView.h"
+#include "ViewHeader.h"
+
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include <utils/PixmapDelegateFader.h>
+#include <utils/Closure.h>
+
+using namespace Tomahawk;
+
+
+PlaylistChartItemDelegate::PlaylistChartItemDelegate( TrackView* parent, PlayableProxyModel* proxy )
+    : QStyledItemDelegate( (QObject*)parent )
+    , m_view( parent )
+    , m_model( proxy )
+{
+    m_topOption = QTextOption( Qt::AlignTop );
+    m_topOption.setWrapMode( QTextOption::NoWrap );
+
+    m_centerOption = QTextOption( Qt::AlignCenter );
+    m_centerOption.setWrapMode( QTextOption::NoWrap );
+
+    m_centerRightOption = QTextOption( Qt::AlignVCenter | Qt::AlignRight );
+    m_centerRightOption.setWrapMode( QTextOption::NoWrap );
+
+    m_bottomOption = QTextOption( Qt::AlignBottom );
+    m_bottomOption.setWrapMode( QTextOption::NoWrap );
+
+    connect( m_model, SIGNAL( modelReset() ), this, SLOT( modelChanged() ) );
+    if ( PlaylistView* plView = qobject_cast< PlaylistView* >( parent ) )
+        connect( plView, SIGNAL( modelChanged() ), this, SLOT( modelChanged() ) );
+
+}
+
+
+QSize
+PlaylistChartItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QSize size = QStyledItemDelegate::sizeHint( option, index );
+
+    int stretch = 0;
+    switch ( index.row() )
+    {
+        case 0:
+            stretch = 6;
+            break;
+        case 1:
+            stretch = 5;
+            break;
+        case 2:
+            stretch = 4;
+            break;
+
+        default:
+            if ( index.row() < 10 )
+                stretch = 3;
+            else
+                stretch = 2;
+    }
+
+    if ( index.isValid() )
+    {
+        int rowHeight = option.fontMetrics.height() + 8;
+        size.setHeight( rowHeight * stretch );
+    }
+
+    return size;
+}
+
+
+QWidget*
+PlaylistChartItemDelegate::createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    Q_UNUSED( parent );
+    Q_UNUSED( option );
+    Q_UNUSED( index );
+    return 0;
+}
+
+
+void
+PlaylistChartItemDelegate::prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, PlayableItem* item ) const
+{
+    initStyleOption( option, index );
+
+    TomahawkUtils::prepareStyleOption( option, index, item );
+}
+
+
+void
+PlaylistChartItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    PlayableItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
+    Q_ASSERT( item );
+
+    QStyleOptionViewItemV4 opt = option;
+    prepareStyleOption( &opt, index, item );
+    opt.text.clear();
+
+    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
+
+    if ( m_view->header()->visualIndex( index.column() ) > 0 )
+        return;
+
+    const query_ptr q = item->query()->displayQuery();
+    unsigned int duration = q->duration();
+    QString artist = q->artist();
+    QString track = q->track();
+    QPixmap avatar;
+    QString upperText, lowerText;
+
+    painter->save();
+    {
+        QRect r = opt.rect.adjusted( 3, 6, 0, -6 );
+
+        // Paint Now Playing Speaker Icon
+        if ( item->isPlaying() )
+        {
+            QPixmap nowPlayingIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker );
+            QRect npr = r.adjusted( 3, r.height() / 2 - nowPlayingIcon.height() / 2, 18 - r.width(), -r.height() / 2 + nowPlayingIcon.height() / 2 );
+            nowPlayingIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker, TomahawkUtils::Original, npr.size() );
+            painter->drawPixmap( npr, nowPlayingIcon );
+            r.adjust( 22, 0, 0, 0 );
+        }
+
+        QFont figureFont = opt.font;
+        figureFont.setPixelSize( 18 );
+        figureFont.setWeight( 99 );
+
+        QFont boldFont = opt.font;
+        boldFont.setPixelSize( 15 );
+        boldFont.setWeight( 99 );
+
+        QFont smallBoldFont = opt.font;
+        smallBoldFont.setPixelSize( 12 );
+        smallBoldFont.setWeight( 60 );
+
+        QFont durationFont = opt.font;
+        durationFont.setPixelSize( 12 );
+        durationFont.setWeight( 80 );
+
+        if ( index.row() == 0 )
+        {
+            figureFont.setPixelSize( 36 );
+            boldFont.setPixelSize( 26 );
+            smallBoldFont.setPixelSize( 22 );
+        }
+        else if ( index.row() == 1 )
+        {
+            figureFont.setPixelSize( 30 );
+            boldFont.setPixelSize( 22 );
+            smallBoldFont.setPixelSize( 18 );
+        }
+        else if ( index.row() == 2 )
+        {
+            figureFont.setPixelSize( 24 );
+            boldFont.setPixelSize( 18 );
+            smallBoldFont.setPixelSize( 14 );
+        }
+        else if ( index.row() >= 10 )
+        {
+            boldFont.setPixelSize( 12 );
+            smallBoldFont.setPixelSize( 11 );
+        }
+
+        QRect figureRect = r.adjusted( 0, 0, -option.rect.width() + 60 - 6 + r.left(), 0 );
+        painter->setFont( figureFont );
+        painter->setPen( option.palette.text().color().lighter( 450 ) );
+        painter->drawText( figureRect, QString::number( index.row() + 1 ), m_centerOption );
+        painter->setPen( opt.palette.text().color() );
+
+        QRect pixmapRect = r.adjusted( figureRect.width() + 6, 0, -option.rect.width() + figureRect.width() + option.rect.height() - 6 + r.left(), 0 );
+
+        if ( !m_pixmaps.contains( index ) )
+        {
+            m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->query(), pixmapRect.size(), TomahawkUtils::ScaledCover, false ) ) );
+            _detail::Closure* closure = NewClosure( m_pixmaps index , SIGNAL( repaintRequest() ), const_cast<PlaylistChartItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) );
+            closure->setAutoDelete( false );
+        }
+
+        const QPixmap pixmap = m_pixmaps index ->currentPixmap();
+        painter->drawPixmap( pixmapRect, pixmap );
+
+        r.adjust( pixmapRect.width() + figureRect.width() + 18, 1, -28, 0 );
+        QRect leftRect = r.adjusted( 0, 0, -48, 0 );
+        QRect rightRect = r.adjusted( r.width() - 40, 0, 0, 0 );
+
+        painter->setFont( boldFont );
+        QString text = painter->fontMetrics().elidedText( track, Qt::ElideRight, leftRect.width() );
+        painter->drawText( leftRect, text, m_topOption );
+
+        painter->setFont( smallBoldFont );
+        text = painter->fontMetrics().elidedText( artist, Qt::ElideRight, leftRect.width() );
+        painter->drawText( index.row() >= 10 ? leftRect : leftRect.adjusted( 0, painter->fontMetrics().height() + 6, 0, 0 ), text, index.row() >= 10 ? m_bottomOption : m_topOption );
+
+        if ( duration > 0 )
+        {
+            painter->setFont( durationFont );
+            text = painter->fontMetrics().elidedText( TomahawkUtils::timeToString( duration ), Qt::ElideRight, rightRect.width() );
+            painter->drawText( rightRect, text, m_centerRightOption );
+        }
+    }
+    painter->restore();
+}
+
+
+void
+PlaylistChartItemDelegate::doUpdateIndex( const QPersistentModelIndex& idx )
+{
+    emit updateRequest( idx );
+}
+
+
+void
+PlaylistChartItemDelegate::modelChanged()
+{
+    m_pixmaps.clear();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistChartItemDelegate.h Added

@@ -0,0 +1,71 @@
+/* === 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
+ *   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 PLAYLISTCHARTITEMDELEGATE_H
+#define PLAYLISTCHARTITEMDELEGATE_H
+
+#include <QStyledItemDelegate>
+#include <QTextOption>
+
+#include "DllMacro.h"
+#include "Typedefs.h"
+
+
+namespace Tomahawk {
+class PixmapDelegateFader;
+}
+
+class TrackModel;
+class PlayableItem;
+class PlayableProxyModel;
+class TrackView;
+
+class DLLEXPORT PlaylistChartItemDelegate : public QStyledItemDelegate
+{
+Q_OBJECT
+
+public:
+    PlaylistChartItemDelegate( TrackView* parent = 0, PlayableProxyModel* proxy = 0 );
+
+signals:
+    void updateRequest( const QModelIndex& idx );
+
+protected:
+    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+private slots:
+    void modelChanged();
+    void doUpdateIndex( const QPersistentModelIndex& idx );
+
+private:
+    void prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, PlayableItem* item ) const;
+
+    QTextOption m_topOption;
+    QTextOption m_centerOption;
+    QTextOption m_centerRightOption;
+    QTextOption m_bottomOption;
+
+    TrackView* m_view;
+    PlayableProxyModel* m_model;
+
+    mutable QHash< QPersistentModelIndex, QSharedPointer< Tomahawk::PixmapDelegateFader > > m_pixmaps;
+};
+
+#endif // PLAYLISTCHARTITEMDELEGATE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistItemDelegate.cpp Added

@@ -0,0 +1,288 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "PlaylistItemDelegate.h"
+
+#include <QApplication>
+#include <QPainter>
+
+#include "Query.h"
+#include "Result.h"
+#include "Artist.h"
+#include "Source.h"
+#include "SourceList.h"
+
+#include "PlayableModel.h"
+#include "PlayableItem.h"
+#include "PlayableProxyModel.h"
+#include "TrackView.h"
+#include "ViewHeader.h"
+
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+PlaylistItemDelegate::PlaylistItemDelegate( TrackView* parent, PlayableProxyModel* proxy )
+    : QStyledItemDelegate( (QObject*)parent )
+    , m_view( parent )
+    , m_model( proxy )
+{
+    m_topOption = QTextOption( Qt::AlignTop );
+    m_topOption.setWrapMode( QTextOption::NoWrap );
+
+    m_bottomOption = QTextOption( Qt::AlignBottom );
+    m_bottomOption.setWrapMode( QTextOption::NoWrap );
+}
+
+
+void
+PlaylistItemDelegate::updateRowSize( const QModelIndex& index )
+{
+    emit sizeHintChanged( index );
+}
+
+
+QSize
+PlaylistItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QSize size = QStyledItemDelegate::sizeHint( option, index );
+
+    if ( index.isValid() )
+    {
+        int style = index.data( PlayableModel::StyleRole ).toInt();
+        if ( style == PlayableModel::Short || style == PlayableModel::ShortWithAvatars )
+        {
+            int rowHeight = option.fontMetrics.height() + 8;
+            size.setHeight( rowHeight * 2 );
+        }
+    }
+
+    return size;
+}
+
+
+QWidget*
+PlaylistItemDelegate::createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    Q_UNUSED( parent );
+    Q_UNUSED( option );
+    Q_UNUSED( index );
+    return 0;
+}
+
+
+void
+PlaylistItemDelegate::prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, PlayableItem* item ) const
+{
+    initStyleOption( option, index );
+
+    TomahawkUtils::prepareStyleOption( option, index, item );
+}
+
+
+void
+PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    int style = index.data( PlayableModel::StyleRole ).toInt();
+    switch ( style )
+    {
+        case PlayableModel::Detailed:
+            paintDetailed( painter, option, index );
+            break;
+
+        case PlayableModel::Short:
+            paintShort( painter, option, index );
+            break;
+        case PlayableModel::ShortWithAvatars:
+            paintShort( painter, option, index, true );
+            break;
+    }
+}
+
+
+void
+PlaylistItemDelegate::paintShort( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, bool useAvatars ) const
+{
+    PlayableItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
+    Q_ASSERT( item );
+
+    QStyleOptionViewItemV4 opt = option;
+    prepareStyleOption( &opt, index, item );
+    opt.text.clear();
+
+    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
+
+    if ( m_view->header()->visualIndex( index.column() ) > 0 )
+        return;
+
+    const query_ptr q = item->query()->displayQuery();
+    QString artist = q->artist();
+    QString track = q->track();
+    QPixmap pixmap;
+    QString upperText, lowerText;
+    source_ptr source = item->query()->playedBy().first;
+
+    if ( source.isNull() )
+    {
+        upperText = track;
+        lowerText = artist;
+    }
+    else
+    {
+        upperText = QString( "%1 - %2" ).arg( artist ).arg( track );
+        QString playtime = TomahawkUtils::ageToString( QDateTime::fromTime_t( item->query()->playedBy().second ), true );
+
+        if ( source == SourceList::instance()->getLocal() )
+            lowerText = QString( tr( "played %1 by you" ) ).arg( playtime );
+        else
+            lowerText = QString( tr( "played %1 by %2" ) ).arg( playtime ).arg( source->friendlyName() );
+    }
+
+    painter->save();
+    {
+        QRect r = opt.rect.adjusted( 3, 6, 0, -6 );
+
+        // Paint Now Playing Speaker Icon
+        if ( item->isPlaying() )
+        {
+            QPixmap nowPlayingIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker );
+            QRect npr = r.adjusted( 3, r.height() / 2 - nowPlayingIcon.height() / 2, 18 - r.width(), -r.height() / 2 + nowPlayingIcon.height() / 2  );
+            nowPlayingIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker, TomahawkUtils::Original, npr.size() );
+            painter->drawPixmap( npr, nowPlayingIcon );
+            r.adjust( 22, 0, 0, 0 );
+        }
+
+        painter->setPen( opt.palette.text().color() );
+
+        QRect ir = r.adjusted( 4, 0, -option.rect.width() + option.rect.height() - 8 + r.left(), 0 );
+
+        if ( useAvatars )
+        {
+            if ( !source.isNull() )
+                pixmap = source->avatar( Source::FancyStyle, ir.size() );
+        }
+        else
+            pixmap = item->query()->cover( ir.size(), false );
+
+        if ( pixmap.isNull() )
+        {
+            if ( !useAvatars )
+                pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::ScaledCover, ir.size() );
+            else
+                pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultSourceAvatar, TomahawkUtils::AvatarInFrame, ir.size() );
+        }
+
+        painter->drawPixmap( ir, pixmap );
+
+        QFont boldFont = opt.font;
+        boldFont.setBold( true );
+
+        r.adjust( ir.width() + 12, 0, -12, 0 );
+        painter->setFont( boldFont );
+        QString text = painter->fontMetrics().elidedText( upperText, Qt::ElideRight, r.width() );
+        painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, m_topOption );
+
+        painter->setFont( opt.font );
+        if ( option.state & QStyle::State_Selected )
+            painter->setPen( option.palette.color( QPalette::HighlightedText ) );
+        else
+            painter->setPen( Qt::gray );
+
+        text = painter->fontMetrics().elidedText( lowerText, Qt::ElideRight, r.width() );
+        painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, m_bottomOption );
+    }
+    painter->restore();
+}
+
+
+void
+PlaylistItemDelegate::paintDetailed( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    PlayableItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
+    Q_ASSERT( item );
+
+    QTextOption textOption( Qt::AlignVCenter | (Qt::Alignment)index.data( Qt::TextAlignmentRole ).toUInt() );
+    textOption.setWrapMode( QTextOption::NoWrap );
+
+    QStyleOptionViewItemV4 opt = option;
+    prepareStyleOption( &opt, index, item );
+    opt.text.clear();
+    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
+
+    if ( m_view->hoveredIndex().row() == index.row() && m_view->hoveredIndex().column() == index.column() && !index.data().toString().isEmpty() &&
+       ( index.column() == PlayableModel::Artist || index.column() == PlayableModel::Album || index.column() == PlayableModel::Track ) )
+    {
+        opt.rect.setWidth( opt.rect.width() - 16 );
+        QRect arrowRect( opt.rect.x() + opt.rect.width(), opt.rect.y() + 1, opt.rect.height() - 2, opt.rect.height() - 2 );
+
+        QPixmap infoIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::InfoIcon, TomahawkUtils::Original, arrowRect.size() );
+        painter->drawPixmap( arrowRect, infoIcon );
+    }
+
+    painter->save();
+
+    if ( index.column() == PlayableModel::Score )
+    {
+        QColor barColor( 167, 183, 211 ); // This matches the sidebar (sourcetreeview.cpp:672)
+        if ( opt.state & QStyle::State_Selected )
+            painter->setPen( opt.palette.brightText().color() );
+        else
+            painter->setPen( barColor );
+
+        QRect r = opt.rect.adjusted( 3, 3, -6, -4 );
+        painter->drawRect( r );
+
+        QRect fillR = r;
+        int fillerWidth = (int)( index.data().toFloat() * (float)fillR.width() );
+        fillR.adjust( 0, 0, -( fillR.width() - fillerWidth ), 0 );
+
+        if ( opt.state & QStyle::State_Selected )
+            painter->setBrush( opt.palette.brightText().color() );
+        else
+            painter->setBrush( barColor );
+
+        painter->drawRect( fillR );
+    }
+    else if ( item->isPlaying() )
+    {
+        QRect r = opt.rect.adjusted( 3, 0, 0, 0 );
+
+        // Paint Now Playing Speaker Icon
+        if ( m_view->header()->visualIndex( index.column() ) == 0 )
+        {
+            r.adjust( 0, 0, 0, -3 );
+            painter->drawPixmap( r.adjusted( 3, 1, 18 - r.width(), 1 ), TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker ) );
+            r.adjust( 25, 0, 0, 3 );
+        }
+
+        painter->setPen( opt.palette.text().color() );
+        QString text = painter->fontMetrics().elidedText( index.data().toString(), Qt::ElideRight, r.width() - 3 );
+        painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, textOption );
+    }
+    else
+    {
+        painter->setPen( opt.palette.text().color() );
+        QString text = painter->fontMetrics().elidedText( index.data().toString(), Qt::ElideRight, opt.rect.width() - 6 );
+        painter->drawText( opt.rect.adjusted( 3, 1, -3, 0 ), text, textOption );
+    }
+
+    painter->restore();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistItemDelegate.h Added

@@ -0,0 +1,59 @@
+/* === 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
+ *   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 PLAYLISTITEMDELEGATE_H
+#define PLAYLISTITEMDELEGATE_H
+
+#include <QStyledItemDelegate>
+#include <QTextOption>
+
+#include "DllMacro.h"
+
+class TrackModel;
+class PlayableItem;
+class PlayableProxyModel;
+class TrackView;
+
+class DLLEXPORT PlaylistItemDelegate : public QStyledItemDelegate
+{
+Q_OBJECT
+
+public:
+    PlaylistItemDelegate( TrackView* parent = 0, PlayableProxyModel* proxy = 0 );
+
+    void updateRowSize( const QModelIndex& index );
+
+protected:
+    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+private:
+    void prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, PlayableItem* item ) const;
+
+    void paintDetailed( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    void paintShort( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index, bool useAvatars = false ) const;
+
+    QTextOption m_topOption;
+    QTextOption m_bottomOption;
+
+    TrackView* m_view;
+    PlayableProxyModel* m_model;
+};
+
+#endif // PLAYLISTITEMDELEGATE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp Added

@@ -0,0 +1,268 @@
+/* === 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
+ *   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 "PlaylistLargeItemDelegate.h"
+
+#include <QApplication>
+#include <QPainter>
+#include <QAbstractTextDocumentLayout>
+
+#include "Query.h"
+#include "Result.h"
+#include "Artist.h"
+#include "Source.h"
+#include "SourceList.h"
+
+#include "PlaylistView.h"
+#include "PlayableModel.h"
+#include "PlayableItem.h"
+#include "PlayableProxyModel.h"
+#include "TrackView.h"
+#include "ViewHeader.h"
+
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include <utils/PixmapDelegateFader.h>
+#include <utils/Closure.h>
+
+using namespace Tomahawk;
+
+
+PlaylistLargeItemDelegate::PlaylistLargeItemDelegate( DisplayMode mode, TrackView* parent, PlayableProxyModel* proxy )
+    : QStyledItemDelegate( (QObject*)parent )
+    , m_view( parent )
+    , m_model( proxy )
+    , m_mode( mode )
+{
+    m_topOption = QTextOption( Qt::AlignTop );
+    m_topOption.setWrapMode( QTextOption::NoWrap );
+
+    m_centerRightOption = QTextOption( Qt::AlignVCenter | Qt::AlignRight );
+    m_centerRightOption.setWrapMode( QTextOption::NoWrap );
+
+    m_bottomOption = QTextOption( Qt::AlignBottom );
+    m_bottomOption.setWrapMode( QTextOption::NoWrap );
+
+    connect( proxy, SIGNAL( modelReset() ), this, SLOT( modelChanged() ) );
+    if ( PlaylistView* plView = qobject_cast< PlaylistView* >( parent ) )
+        connect( plView, SIGNAL( modelChanged() ), this, SLOT( modelChanged() ) );
+}
+
+
+QSize
+PlaylistLargeItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QSize size = QStyledItemDelegate::sizeHint( option, index );
+
+    if ( index.isValid() )
+    {
+        int rowHeight = option.fontMetrics.height() + 8;
+        size.setHeight( rowHeight * 3 );
+    }
+
+    return size;
+}
+
+
+QWidget*
+PlaylistLargeItemDelegate::createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    Q_UNUSED( parent );
+    Q_UNUSED( option );
+    Q_UNUSED( index );
+    return 0;
+}
+
+
+void
+PlaylistLargeItemDelegate::prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, PlayableItem* item ) const
+{
+    initStyleOption( option, index );
+
+    TomahawkUtils::prepareStyleOption( option, index, item );
+}
+
+
+void
+PlaylistLargeItemDelegate::drawRichText( QPainter* painter, const QStyleOptionViewItem& option, const QRect& rect, int flags, QTextDocument& text ) const
+{
+    text.setPageSize( QSize( rect.width(), QWIDGETSIZE_MAX ) );
+    QAbstractTextDocumentLayout* layout = text.documentLayout();
+
+    const int height = qRound( layout->documentSize().height() );
+    int y = rect.y();
+    if ( flags & Qt::AlignBottom )
+        y += ( rect.height() - height );
+    else if ( flags & Qt::AlignVCenter )
+        y += ( rect.height() - height ) / 2;
+
+    QAbstractTextDocumentLayout::PaintContext context;
+
+    if ( option.state & QStyle::State_Selected )
+        context.palette.setColor( QPalette::Text, option.palette.color( QPalette::HighlightedText ) );
+    else
+        context.palette.setColor( QPalette::Text, painter->pen().color() );
+
+    painter->save();
+    painter->translate( rect.x(), y );
+    layout->draw( painter, context );
+    painter->restore();
+}
+
+
+void
+PlaylistLargeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    PlayableItem* item = m_model->itemFromIndex( m_model->mapToSource( index ) );
+    Q_ASSERT( item );
+
+    QStyleOptionViewItemV4 opt = option;
+    prepareStyleOption( &opt, index, item );
+    opt.text.clear();
+
+    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
+
+    if ( m_view->header()->visualIndex( index.column() ) > 0 )
+        return;
+
+    const query_ptr q = item->query()->displayQuery();
+    QString artist = q->artist();
+    QString track = q->track();
+    unsigned int duration = q->duration();
+    QPixmap avatar;
+    QString lowerText;
+
+    QSize avatarSize( 32, 32 );
+    source_ptr source = item->query()->playedBy().first;
+    if ( m_mode == RecentlyPlayed && !source.isNull() )
+    {
+        avatar = source->avatar( Source::FancyStyle, avatarSize );
+        QString playtime = TomahawkUtils::ageToString( QDateTime::fromTime_t( item->query()->playedBy().second ), true );
+
+        if ( source == SourceList::instance()->getLocal() )
+            lowerText = QString( tr( "played %1 by you" ) ).arg( playtime );
+        else
+            lowerText = QString( tr( "played %1 by %2" ) ).arg( playtime ).arg( source->friendlyName() );
+    }
+
+    if ( m_mode == LatestAdditions && item->query()->numResults() )
+    {
+        QString playtime = TomahawkUtils::ageToString( QDateTime::fromTime_t( item->query()->results().first()->modificationTime() ), true );
+
+        lowerText = QString( tr( "added %1" ) ).arg( playtime );
+    }
+
+    if ( m_mode == LovedTracks )
+        lowerText = item->query()->socialActionDescription( "Love", Query::Detailed );
+
+    painter->save();
+    {
+        QRect r = opt.rect.adjusted( 3, 6, 0, -6 );
+
+        // Paint Now Playing Speaker Icon
+        if ( item->isPlaying() )
+        {
+            QPixmap nowPlayingIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker );
+            QRect npr = r.adjusted( 3, r.height() / 2 - nowPlayingIcon.height() / 2, 18 - r.width(), -r.height() / 2 + nowPlayingIcon.height() / 2 );
+            nowPlayingIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker, TomahawkUtils::Original, npr.size() );
+            painter->drawPixmap( npr, nowPlayingIcon );
+            r.adjust( 22, 0, 0, 0 );
+        }
+
+        painter->setPen( opt.palette.text().color() );
+
+        QRect pixmapRect = r.adjusted( 6, 0, -option.rect.width() + option.rect.height() - 6 + r.left(), 0 );
+        QRect avatarRect = r.adjusted( option.rect.width() - r.left() - 12 - avatarSize.width(), ( option.rect.height() - avatarSize.height() ) / 2 - 5, 0, 0 );
+        avatarRect.setSize( avatarSize );
+
+
+        if ( !m_pixmaps.contains( index ) )
+        {
+            m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->query(), pixmapRect.size(), TomahawkUtils::ScaledCover, false ) ) );
+            _detail::Closure* closure = NewClosure( m_pixmaps index , SIGNAL( repaintRequest() ), const_cast<PlaylistLargeItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) );
+            closure->setAutoDelete( false );
+        }
+
+        const QPixmap pixmap = m_pixmaps index ->currentPixmap();
+        painter->drawPixmap( pixmapRect, pixmap );
+
+        if ( !avatar.isNull() )
+            painter->drawPixmap( avatarRect, avatar );
+
+        QFont boldFont = opt.font;
+        boldFont.setPixelSize( 15 );
+        boldFont.setWeight( 99 );
+
+        QFont smallBoldFont = opt.font;
+        smallBoldFont.setPixelSize( 12 );
+        smallBoldFont.setBold( true );
+        smallBoldFont.setWeight( 60 );
+
+        QFont smallFont = opt.font;
+        smallFont.setPixelSize( 10 );
+
+        r.adjust( pixmapRect.width() + 12, 1, -28 - avatar.width(), 0 );
+        QRect leftRect = r.adjusted( 0, 0, -48, 0 );
+        QRect rightRect = r.adjusted( r.width() - 40, 0, 0, 0 );
+
+        painter->setFont( boldFont );
+        QString text = painter->fontMetrics().elidedText( track, Qt::ElideRight, leftRect.width() );
+        painter->drawText( leftRect, text, m_topOption );
+
+        painter->setFont( smallBoldFont );
+        text = painter->fontMetrics().elidedText( artist, Qt::ElideRight, leftRect.width() );
+        painter->drawText( leftRect.adjusted( 0, 19, 0, 0 ), text, m_topOption );
+
+        painter->setFont( smallFont );
+        painter->setPen( Qt::gray );
+        QTextDocument textDoc;
+        textDoc.setHtml( lowerText );
+        textDoc.setDocumentMargin( 0 );
+        textDoc.setDefaultFont( painter->font() );
+        textDoc.setDefaultTextOption( m_bottomOption );
+
+        if ( textDoc.idealWidth() > leftRect.width() )
+            textDoc.setHtml( item->query()->socialActionDescription( "Love", Query::Short ) );
+
+        drawRichText( painter, option, leftRect, Qt::AlignBottom, textDoc );
+
+        if ( duration > 0 )
+        {
+            painter->setPen( opt.palette.text().color() );
+            painter->setFont( smallBoldFont );
+            text = painter->fontMetrics().elidedText( TomahawkUtils::timeToString( duration ), Qt::ElideRight, rightRect.width() );
+            painter->drawText( rightRect, text, m_centerRightOption );
+        }
+    }
+    painter->restore();
+}
+
+
+void
+PlaylistLargeItemDelegate::doUpdateIndex( const QPersistentModelIndex& idx )
+{
+    if ( idx.isValid() )
+        emit updateIndex( idx );
+}
+
+
+void
+PlaylistLargeItemDelegate::modelChanged()
+{
+    m_pixmaps.clear();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistLargeItemDelegate.h Added

@@ -0,0 +1,75 @@
+/* === 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
+ *   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 PLAYLISTLARGEITEMDELEGATE_H
+#define PLAYLISTLARGEITEMDELEGATE_H
+
+#include <QStyledItemDelegate>
+#include <QTextDocument>
+#include <QTextOption>
+
+#include "DllMacro.h"
+#include "Typedefs.h"
+
+namespace Tomahawk {
+class PixmapDelegateFader;
+}
+
+class TrackModel;
+class PlayableItem;
+class PlayableProxyModel;
+class TrackView;
+
+class DLLEXPORT PlaylistLargeItemDelegate : public QStyledItemDelegate
+{
+Q_OBJECT
+
+public:
+    enum DisplayMode
+    { LovedTracks, RecentlyPlayed, LatestAdditions };
+
+    PlaylistLargeItemDelegate( DisplayMode mode, TrackView* parent = 0, PlayableProxyModel* proxy = 0 );
+
+protected:
+    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+signals:
+    void updateIndex( const QModelIndex& idx );
+
+private slots:
+    void modelChanged();
+    void doUpdateIndex( const QPersistentModelIndex& idx );
+
+private:
+    void prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, PlayableItem* item ) const;
+    void drawRichText( QPainter* painter, const QStyleOptionViewItem& option, const QRect& rect, int flags, QTextDocument& text ) const;
+
+    QTextOption m_topOption;
+    QTextOption m_centerRightOption;
+    QTextOption m_bottomOption;
+
+    mutable QHash< QPersistentModelIndex, QSharedPointer< Tomahawk::PixmapDelegateFader > > m_pixmaps;
+
+    TrackView* m_view;
+    PlayableProxyModel* m_model;
+    DisplayMode m_mode;
+};
+
+#endif // PLAYLISTLARGEITEMDELEGATE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistModel.cpp Added

@@ -0,0 +1,509 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "PlaylistModel.h"
+
+#include <QMimeData>
+#include <QTreeView>
+
+#include "Artist.h"
+#include "Album.h"
+#include "Pipeline.h"
+#include "Source.h"
+#include "SourceList.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_PlaybackHistory.h"
+#include "dynamic/GeneratorInterface.h"
+#include "DropJob.h"
+#include "PlayableItem.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+PlaylistModel::PlaylistModel( QObject* parent )
+    : PlayableModel( parent )
+    , m_isTemporary( false )
+    , m_changesOngoing( false )
+    , m_isLoading( false )
+    , m_savedInsertPos( -1 )
+{
+    m_dropStorage.parent = QPersistentModelIndex();
+    m_dropStorage.row = -10;
+
+    setReadOnly( true );
+}
+
+
+PlaylistModel::~PlaylistModel()
+{
+}
+
+
+void
+PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEntries )
+{
+    if ( !m_playlist.isNull() )
+    {
+        disconnect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( onRevisionLoaded( Tomahawk::PlaylistRevision ) ) );
+        disconnect( m_playlist.data(), SIGNAL( deleted( Tomahawk::playlist_ptr ) ), this, SIGNAL( playlistDeleted() ) );
+        disconnect( m_playlist.data(), SIGNAL( changed() ), this, SIGNAL( playlistChanged() ) );
+    }
+
+    m_isLoading = true;
+
+    if ( loadEntries )
+        clear();
+
+    m_playlist = playlist;
+    connect( playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), SLOT( onRevisionLoaded( Tomahawk::PlaylistRevision ) ) );
+    connect( playlist.data(), SIGNAL( deleted( Tomahawk::playlist_ptr ) ), this, SIGNAL( playlistDeleted() ) );
+    connect( playlist.data(), SIGNAL( changed() ), this, SIGNAL( playlistChanged() ) );
+
+    setReadOnly( !m_playlist->author()->isLocal() );
+    setTitle( playlist->title() );
+    setDescription( tr( "A playlist by %1, created %2" )
+                  .arg( playlist->author()->isLocal() ? tr( "you" ) : playlist->author()->friendlyName() )
+                  .arg( TomahawkUtils::ageToString( QDateTime::fromTime_t( playlist->createdOn() ), true ) ) );
+
+    m_isTemporary = false;
+    emit playlistChanged();
+
+    if ( !loadEntries )
+    {
+        m_isLoading = false;
+        return;
+    }
+
+    QList<plentry_ptr> entries = playlist->entries();
+/*    foreach ( const plentry_ptr& p, entries )
+        qDebug() << p->guid() << p->query()->track() << p->query()->artist();*/
+
+    appendEntries( entries );
+
+    m_isLoading = false;
+}
+
+
+void
+PlaylistModel::clear()
+{
+    PlayableModel::clear();
+
+    m_waitingForResolved.clear();
+}
+
+
+void
+PlaylistModel::appendEntries( const QList< plentry_ptr >& entries )
+{
+    insertEntries( entries, rowCount( QModelIndex() ) );
+}
+
+
+void
+PlaylistModel::insertAlbums( const QList< Tomahawk::album_ptr >& albums, int row )
+{
+    // FIXME: This currently appends, not inserts!
+
+    foreach ( const album_ptr& album, albums )
+    {
+        if ( album.isNull() )
+            return;
+
+        connect( album.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                                 SLOT( appendQueries( QList<Tomahawk::query_ptr> ) ) );
+
+        appendQueries( album->playlistInterface( Mixed )->tracks() );
+    }
+
+    if ( rowCount( QModelIndex() ) == 0 && albums.count() == 1 )
+    {
+        setTitle( albums.first()->name() );
+        setDescription( tr( "All tracks by %1 on album %2" ).arg( albums.first()->artist()->name() ).arg( albums.first()->name() ) );
+        m_isTemporary = true;
+    }
+}
+
+
+void
+PlaylistModel::insertArtists( const QList< Tomahawk::artist_ptr >& artists, int row )
+{
+    // FIXME: This currently appends, not inserts!
+
+    foreach ( const artist_ptr& artist, artists )
+    {
+        if ( artist.isNull() )
+            return;
+
+        connect( artist.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                                  SLOT( appendQueries( QList<Tomahawk::query_ptr> ) ) );
+
+        appendQueries( artist->playlistInterface( Mixed )->tracks() );
+    }
+
+    if ( rowCount( QModelIndex() ) == 0 && artists.count() == 1 )
+    {
+        setTitle( artists.first()->name() );
+        setDescription( tr( "All tracks by %1" ).arg( artists.first()->name() ) );
+        m_isTemporary = true;
+    }
+}
+
+
+void
+PlaylistModel::insertQueries( const QList< Tomahawk::query_ptr >& queries, int row )
+{
+    QList< Tomahawk::plentry_ptr > entries;
+    foreach ( const query_ptr& query, queries )
+    {
+        plentry_ptr entry = plentry_ptr( new PlaylistEntry() );
+
+        entry->setDuration( query->displayQuery()->duration() );
+        entry->setLastmodified( 0 );
+        QString annotation = "";
+        if ( !query->property( "annotation" ).toString().isEmpty() )
+            annotation = query->property( "annotation" ).toString();
+        entry->setAnnotation( annotation );
+
+        entry->setQuery( query );
+        entry->setGuid( uuid() );
+
+        entries << entry;
+    }
+
+    insertEntries( entries, row );
+}
+
+
+void
+PlaylistModel::insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int row )
+{
+    if ( !entries.count() )
+    {
+        emit trackCountChanged( rowCount( QModelIndex() ) );
+        finishLoading();
+        return;
+    }
+
+    int c = row;
+    QPair< int, int > crows;
+    crows.first = c;
+    crows.second = c + entries.count() - 1;
+
+    if ( !m_isLoading )
+    {
+        m_savedInsertPos = row;
+        m_savedInsertTracks = entries;
+    }
+
+    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
+
+    QList< Tomahawk::query_ptr > queries;
+    int i = 0;
+    PlayableItem* plitem;
+    foreach( const plentry_ptr& entry, entries )
+    {
+        plitem = new PlayableItem( entry, rootItem(), row + i );
+        plitem->index = createIndex( row + i, 0, plitem );
+        i++;
+
+        if ( entry->query()->id() == currentItemUuid() )
+            setCurrentItem( plitem->index );
+
+        if ( !entry->query()->resolvingFinished() && !entry->query()->playable() )
+        {
+            queries << entry->query();
+            m_waitingForResolved.append( entry->query().data() );
+            connect( entry->query().data(), SIGNAL( resolvingFinished( bool ) ), SLOT( trackResolved( bool ) ) );
+        }
+
+        connect( plitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
+    }
+
+    if ( !m_waitingForResolved.isEmpty() )
+    {
+        Pipeline::instance()->resolve( queries );
+        emit loadingStarted();
+    }
+
+    emit endInsertRows();
+    emit trackCountChanged( rowCount( QModelIndex() ) );
+    finishLoading();
+}
+
+
+void
+PlaylistModel::trackResolved( bool )
+{
+    Tomahawk::Query* q = qobject_cast< Query* >( sender() );
+    if ( !q )
+    {
+        // Track has been removed from the playlist by now
+        return;
+    }
+
+    if ( m_waitingForResolved.contains( q ) )
+    {
+        m_waitingForResolved.removeAll( q );
+        disconnect( q, SIGNAL( resolvingFinished( bool ) ), this, SLOT( trackResolved( bool ) ) );
+    }
+
+    if ( m_waitingForResolved.isEmpty() )
+    {
+        emit loadingFinished();
+    }
+}
+
+
+void
+PlaylistModel::onRevisionLoaded( Tomahawk::PlaylistRevision revision )
+{
+    if ( !m_waitForRevision.contains( revision.revisionguid ) )
+        loadPlaylist( m_playlist );
+    else
+        m_waitForRevision.removeAll( revision.revisionguid );
+}
+
+
+QMimeData*
+PlaylistModel::mimeData( const QModelIndexList& indexes ) const
+{
+    // Add the playlist id to the mime data so that we can detect dropping on ourselves
+    QMimeData* d = PlayableModel::mimeData( indexes );
+    if ( !m_playlist.isNull() )
+        d->setData( "application/tomahawk.playlist.id", m_playlist->guid().toLatin1() );
+
+    return d;
+}
+
+
+bool
+PlaylistModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent )
+{
+    Q_UNUSED( column );
+
+    if ( action == Qt::IgnoreAction || isReadOnly() )
+        return true;
+
+    if ( !DropJob::acceptsMimeData( data ) )
+        return false;
+
+    m_dropStorage.row = row;
+    m_dropStorage.parent = QPersistentModelIndex( parent );
+    m_dropStorage.action = action;
+
+    DropJob* dj = new DropJob();
+
+    if ( !DropJob::acceptsMimeData( data, DropJob::Track | DropJob::Playlist | DropJob::Album | DropJob::Artist ) )
+        return false;
+
+    dj->setDropTypes( DropJob::Track | DropJob::Playlist | DropJob::Artist | DropJob::Album );
+    dj->setDropAction( DropJob::Append );
+/*    if ( action & Qt::MoveAction )
+        dj->setDropAction( DropJob::Move ); */
+
+#ifdef Q_WS_MAC
+    // On mac, drags from outside the app are still Qt::MoveActions instead of Qt::CopyAction by default
+    // so check if the drag originated in this playlist to determine whether or not to copy
+    if ( !data->hasFormat( "application/tomahawk.playlist.id" ) ||
+       ( !m_playlist.isNull() && data->data( "application/tomahawk.playlist.id" ) != m_playlist->guid() ) )
+    {
+        dj->setDropAction( DropJob::Append );
+    }
+#endif
+
+    connect( dj, SIGNAL( tracks( QList< Tomahawk::query_ptr > ) ), SLOT( parsedDroppedTracks( QList< Tomahawk::query_ptr > ) ) );
+    dj->tracksFromMimeData( data );
+
+    return true;
+}
+
+
+void
+PlaylistModel::parsedDroppedTracks( QList< query_ptr > tracks )
+{
+    if ( m_dropStorage.row == -10  ) // nope
+        return;
+
+    int beginRow;
+    if ( m_dropStorage.row != -1 )
+        beginRow = m_dropStorage.row;
+    else if ( m_dropStorage.parent.isValid() )
+        beginRow = m_dropStorage.parent.row();
+    else
+        beginRow = rowCount( QModelIndex() );
+
+    if ( tracks.count() )
+    {
+        bool update = ( m_dropStorage.action & Qt::CopyAction || m_dropStorage.action & Qt::MoveAction );
+        if ( update )
+            beginPlaylistChanges();
+
+        insertQueries( tracks, beginRow );
+
+        if ( update && m_dropStorage.action & Qt::CopyAction )
+            endPlaylistChanges();
+    }
+
+    m_dropStorage.parent = QPersistentModelIndex();
+    m_dropStorage.row = -10;
+}
+
+
+void
+PlaylistModel::beginPlaylistChanges()
+{
+    if ( m_playlist.isNull() || !m_playlist->author()->isLocal() )
+        return;
+
+    Q_ASSERT( !m_changesOngoing );
+    m_changesOngoing = true;
+}
+
+
+void
+PlaylistModel::endPlaylistChanges()
+{
+    if ( m_playlist.isNull() || !m_playlist->author()->isLocal() )
+        return;
+
+    if ( m_changesOngoing )
+    {
+        m_changesOngoing = false;
+    }
+    else
+    {
+        tDebug() << "Called" << Q_FUNC_INFO << "unexpectedly!";
+        Q_ASSERT( false );
+    }
+
+    QList<plentry_ptr> l = playlistEntries();
+    QString newrev = uuid();
+    m_waitForRevision << newrev;
+
+    if ( dynplaylist_ptr dynplaylist = m_playlist.dynamicCast<Tomahawk::DynamicPlaylist>() )
+    {
+        if ( dynplaylist->mode() == OnDemand )
+        {
+            dynplaylist->createNewRevision( newrev );
+        }
+        else if ( dynplaylist->mode() == Static )
+        {
+            dynplaylist->createNewRevision( newrev, dynplaylist->currentrevision(), dynplaylist->type(), dynplaylist->generator()->controls(), l );
+        }
+    }
+    else
+    {
+        m_playlist->createNewRevision( newrev, m_playlist->currentrevision(), l );
+    }
+
+    if ( m_savedInsertPos >= 0 && !m_savedInsertTracks.isEmpty() &&
+         !m_savedRemoveTracks.isEmpty() )
+    {
+        // If we have *both* an insert and remove, then it's a move action
+        // However, since we got the insert before the remove (Qt...), the index we have as the saved
+        // insert position is no longer valid. Find the proper one by finding the location of the first inserted
+        // track
+        for ( int i = 0; i < rowCount( QModelIndex() ); i++ )
+        {
+            const QModelIndex idx = index( i, 0, QModelIndex() );
+            if ( !idx.isValid() )
+                continue;
+            const PlayableItem* item = itemFromIndex( idx );
+            if ( !item || item->entry().isNull() )
+                continue;
+
+//             qDebug() << "Checking for equality:" << (item->entry() == m_savedInsertTracks.first()) << m_savedInsertTracks.first()->query()->track() << m_savedInsertTracks.first()->query()->artist();
+            if ( item->entry() == m_savedInsertTracks.first() )
+            {
+                // Found our index
+                emit m_playlist->tracksMoved( m_savedInsertTracks, i );
+                break;
+            }
+        }
+        m_savedInsertPos = -1;
+        m_savedInsertTracks.clear();
+        m_savedRemoveTracks.clear();
+    }
+    else if ( m_savedInsertPos >= 0 )
+    {
+        emit m_playlist->tracksInserted( m_savedInsertTracks, m_savedInsertPos );
+        m_savedInsertPos = -1;
+        m_savedInsertTracks.clear();
+    }
+    else if ( !m_savedRemoveTracks.isEmpty() )
+    {
+        emit m_playlist->tracksRemoved( m_savedRemoveTracks );
+        m_savedRemoveTracks.clear();
+    }
+}
+
+
+QList<Tomahawk::plentry_ptr>
+PlaylistModel::playlistEntries() const
+{
+    QList<plentry_ptr> l;
+    for ( int i = 0; i < rowCount( QModelIndex() ); i++ )
+    {
+        QModelIndex idx = index( i, 0, QModelIndex() );
+        if ( !idx.isValid() )
+            continue;
+
+        PlayableItem* item = itemFromIndex( idx );
+        if ( item )
+            l << item->entry();
+    }
+
+    return l;
+}
+
+
+void
+PlaylistModel::removeIndex( const QModelIndex& index, bool moreToCome )
+{
+    PlayableItem* item = itemFromIndex( index );
+
+    if ( item && m_waitingForResolved.contains( item->query().data() ) )
+    {
+        disconnect( item->query().data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( trackResolved( bool ) ) );
+        m_waitingForResolved.removeAll( item->query().data() );
+        if ( m_waitingForResolved.isEmpty() )
+            emit loadingFinished();
+    }
+
+    if ( !m_changesOngoing )
+        beginPlaylistChanges();
+
+    if ( item && !m_isLoading )
+        m_savedRemoveTracks << item->query();
+
+    PlayableModel::removeIndex( index, moreToCome );
+
+    if ( !moreToCome )
+        endPlaylistChanges();
+}
+
+
+bool
+PlaylistModel::isTemporary() const
+{
+    return m_isTemporary;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistModel.h Added

@@ -0,0 +1,105 @@
+/* === 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
+ *   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 PLAYLISTMODEL_H
+#define PLAYLISTMODEL_H
+
+#include <QList>
+#include <QHash>
+
+#include "Typedefs.h"
+#include "PlayableModel.h"
+#include "Playlist.h"
+#include "Query.h"
+#include "PlaylistInterface.h"
+
+#include "DllMacro.h"
+
+class QMimeData;
+class QMetaData;
+
+class DLLEXPORT PlaylistModel : public PlayableModel
+{
+Q_OBJECT
+
+typedef struct {
+    int row;
+    QPersistentModelIndex parent;
+    Qt::DropAction action;
+} DropStorageData;
+
+public:
+    explicit PlaylistModel( QObject* parent = 0 );
+    ~PlaylistModel();
+
+    virtual QMimeData* mimeData( const QModelIndexList& indexes ) const;
+    virtual bool dropMimeData( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent );
+
+    Tomahawk::playlist_ptr playlist() const { return m_playlist; }
+
+    virtual void loadPlaylist( const Tomahawk::playlist_ptr& playlist, bool loadEntries = true );
+    bool isTemporary() const;
+
+public slots:
+    virtual void clear();
+
+    virtual void appendEntries( const QList< Tomahawk::plentry_ptr >& entries );
+
+    virtual void insertAlbums( const QList< Tomahawk::album_ptr >& album, int row = 0 );
+    virtual void insertArtists( const QList< Tomahawk::artist_ptr >& artist, int row = 0 );
+    virtual void insertQueries( const QList< Tomahawk::query_ptr >& queries, int row = 0 );
+    virtual void insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int row = 0 );
+
+    virtual void removeIndex( const QModelIndex& index, bool moreToCome = false );
+
+signals:
+    void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode );
+    void shuffleModeChanged( bool enabled );
+    void playlistDeleted();
+    void playlistChanged();
+
+protected:
+    bool waitForRevision( const QString& revisionguid ) const { return m_waitForRevision.contains( revisionguid ); }
+    void removeFromWaitList( const QString& revisionguid ) { m_waitForRevision.removeAll( revisionguid ); }
+
+private slots:
+    void onRevisionLoaded( Tomahawk::PlaylistRevision revision );
+    void parsedDroppedTracks( QList<Tomahawk::query_ptr> );
+    void trackResolved( bool );
+
+private:
+    void beginPlaylistChanges();
+    void endPlaylistChanges();
+
+    QList<Tomahawk::plentry_ptr> playlistEntries() const;
+
+    Tomahawk::playlist_ptr m_playlist;
+    bool m_isTemporary;
+    bool m_changesOngoing;
+    bool m_isLoading;
+    QList< Tomahawk::Query* > m_waitingForResolved;
+    QStringList m_waitForRevision;
+
+    int m_savedInsertPos;
+    QList< Tomahawk::plentry_ptr > m_savedInsertTracks;
+    QList< Tomahawk::query_ptr > m_savedRemoveTracks;
+
+    DropStorageData m_dropStorage;
+};
+
+#endif // PLAYLISTMODEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/PlaylistUpdaterInterface.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistUpdaterInterface.cpp Changed

@@ -17,83 +17,93 @@
  */
 
 #include "PlaylistUpdaterInterface.h"
-#include "tomahawksettings.h"
-#include "XspfUpdater.h"
+#include "TomahawkSettings.h"
+#include "Source.h"
+
+namespace Tomahawk {
+
+bool
+operator==( const SerializedUpdater& one, const SerializedUpdater& two )
+{
+    return one.type == two.type;
+}
+
+}
 
 using namespace Tomahawk;
 
-PlaylistUpdaterInterface*
+QMap< QString, PlaylistUpdaterFactory* > PlaylistUpdaterInterface::s_factories = QMap< QString, PlaylistUpdaterFactory* >();
+
+void
+PlaylistUpdaterInterface::registerUpdaterFactory( PlaylistUpdaterFactory* f )
+{
+    s_factories f->type()  = f;
+}
+
+
+
+void
 PlaylistUpdaterInterface::loadForPlaylist( const playlist_ptr& pl )
 {
     TomahawkSettings* s = TomahawkSettings::instance();
-    const QString key = QString( "playlistupdaters/%1" ).arg( pl->guid() );
-    if ( s->contains( QString( "%1/type" ).arg( key ) ) )
+
+    const SerializedUpdaters allUpdaters = s->playlistUpdaters();
+    if ( allUpdaters.contains( pl->guid() ) )
     {
-        // Ok, we have one we can try to load
-        const QString type = s->value( QString( "%1/type" ).arg( key ) ).toString();
-        PlaylistUpdaterInterface* updater = 0;
-        if ( type == "xspf" )
-            updater = new XspfUpdater( pl );
-
-        // You forgot to register your new updater type with the factory above. 00ps.
-        if ( !updater )
+        // Ok, we have some we can try to load
+        const SerializedUpdaterList updaters = allUpdaters.values( pl->guid() );
+        foreach ( const SerializedUpdater& info, updaters )
         {
-            Q_ASSERT( false );
-            return 0;
+            if ( !s_factories.contains( info.type ) )
+            {
+                Q_ASSERT( false );
+                // You forgot to register your new updater type with the factory....
+                continue;
+            }
+
+            // Updaters register themselves in their constructor
+            s_factories info.type ->create( pl, info.customData );
         }
-        updater->setAutoUpdate( s->value( QString( "%1/autoupdate" ).arg( key ) ).toBool() );
-        updater->setInterval( s->value( QString( "%1/interval" ).arg( key ) ).toInt() );
-        updater->loadFromSettings( key );
-
-        return updater;
     }
-
-    return 0;
 }
 
 
 PlaylistUpdaterInterface::PlaylistUpdaterInterface( const playlist_ptr& pl )
     : QObject( 0 )
-    , m_timer( new QTimer( this ) )
-    , m_autoUpdate( true )
     , m_playlist( pl )
 {
     Q_ASSERT( !m_playlist.isNull() );
 
-    m_playlist->setUpdater( this );
-    connect( m_timer, SIGNAL( timeout() ), this, SLOT( updateNow() ) );
+    m_playlist->addUpdater( this );
 
-    QTimer::singleShot( 0, this, SLOT( doSave() ) );
+    QTimer::singleShot( 0, this, SLOT( save() ) );
 }
 
-PlaylistUpdaterInterface::PlaylistUpdaterInterface( const playlist_ptr& pl, int interval, bool autoUpdate )
-    : QObject( 0 )
-    , m_timer( new QTimer( this ) )
-    , m_autoUpdate( autoUpdate )
-    , m_playlist( pl )
-{
-    Q_ASSERT( !m_playlist.isNull() );
 
-    m_playlist->setUpdater( this );
-    m_timer->setInterval( interval );
-    connect( m_timer, SIGNAL( timeout() ), this, SLOT( updateNow() ) );
-
-    QTimer::singleShot( 0, this, SLOT( doSave() ) );
+PlaylistUpdaterInterface::~PlaylistUpdaterInterface()
+{
+    if ( !m_playlist.isNull() )
+        m_playlist->removeUpdater( this );
 }
 
 
 void
-PlaylistUpdaterInterface::doSave()
+PlaylistUpdaterInterface::save()
 {
+    if ( m_playlist.isNull() )
+        return;
+
     TomahawkSettings* s = TomahawkSettings::instance();
-    const QString key = QString( "playlistupdaters/%1" ).arg( m_playlist->guid() );
-    if ( !s->contains( QString( "%1/type" ).arg( key ) ) )
-    {
-        s->setValue( QString( "%1/type" ).arg( key ), type() );
-        s->setValue( QString( "%1/autoupdate" ).arg( key ), m_autoUpdate );
-        s->setValue( QString( "%1/interval" ).arg( key ), m_timer->interval() );
-        saveToSettings( key );
-    }
+
+    SerializedUpdaters allUpdaters = s->playlistUpdaters();
+    if ( allUpdaters.contains( m_playlist->guid(), SerializedUpdater( type() ) ) )
+        allUpdaters.remove( m_playlist->guid(), SerializedUpdater( type() ) );
+
+    SerializedUpdater updater;
+    updater.type = type();
+    updater.customData = m_extraData;
+    allUpdaters.insert( m_playlist->guid(), updater );
+    s->setPlaylistUpdaters( allUpdaters );
 }
 
 void
@@ -103,39 +113,26 @@
         return;
 
     TomahawkSettings* s = TomahawkSettings::instance();
-    const QString key = QString( "playlistupdaters/%1" ).arg( m_playlist->guid() );
-    removeFromSettings( key );
-    s->remove( QString( "%1/type" ).arg( key ) );
-    s->remove( QString( "%1/autoupdate" ).arg( key ) );
-    s->remove( QString( "%1/interval" ).arg( key ) );
+    SerializedUpdaters allUpdaters = s->playlistUpdaters();
+
+    if ( allUpdaters.remove( m_playlist->guid(), SerializedUpdater( type() ) ) )
+        s->setPlaylistUpdaters( allUpdaters );
 
+    aboutToDelete();
     deleteLater();
 }
 
 
-void
-PlaylistUpdaterInterface::setAutoUpdate( bool autoUpdate )
+QVariantHash
+PlaylistUpdaterInterface::settings() const
 {
-    m_autoUpdate = autoUpdate;
-    if ( m_autoUpdate )
-        m_timer->start();
-    else
-        m_timer->stop();
-
-    const QString key = QString( "playlistupdaters/%1/autoupdate" ).arg( m_playlist->guid() );
-    TomahawkSettings::instance()->setValue( key, m_autoUpdate );
-
-    // Update immediately as well
-    if ( m_autoUpdate )
-        QTimer::singleShot( 0, this, SLOT( updateNow() ) );
+    return m_extraData;
 }
 
+
 void
-PlaylistUpdaterInterface::setInterval( int intervalMsecs )
+PlaylistUpdaterInterface::saveSettings( const QVariantHash& settings )
 {
-    const QString key = QString( "playlistupdaters/%1/interval" ).arg( m_playlist->guid() );
-    TomahawkSettings::instance()->setValue( key, intervalMsecs );
-
-    m_timer->setInterval( intervalMsecs );
+    m_extraData = settings;
+    save();
 }
-

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/PlaylistUpdaterInterface.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistUpdaterInterface.h Changed

@@ -19,62 +19,95 @@
 #ifndef PLAYLISTUPDATERINTERFACE_H
 #define PLAYLISTUPDATERINTERFACE_H
 
-#include "dllmacro.h"
-#include "typedefs.h"
-#include "playlist.h"
+#include "DllMacro.h"
+#include "Typedefs.h"
+#include "Playlist.h"
+
 #include <QTimer>
+#include <QMutex>
+
+#ifndef ENABLE_HEADLESS
+#include <QPixmap>
+#endif
 
 namespace Tomahawk
 {
 /**
-  * If a playlist needs periodic updating, implement a updater interface.
-  *
-  * Default is auto-updating.
+  * PlaylistUpdaters are attached to playlists. They usually manipulate the playlist in some way
+  * due to external input (spotify syncing) or timers (xspf updating)
   */
 
+class PlaylistUpdaterFactory;
+
+// used when loading/saving from settings
+
+
 class DLLEXPORT PlaylistUpdaterInterface : public QObject
 {
     Q_OBJECT
 public:
-    PlaylistUpdaterInterface( const playlist_ptr& pl );
-    PlaylistUpdaterInterface( const playlist_ptr& pl, int interval, bool autoUpdate );
+    explicit PlaylistUpdaterInterface( const playlist_ptr& pl );
 
-    virtual ~PlaylistUpdaterInterface(){}
+    virtual ~PlaylistUpdaterInterface();
 
     // What type you are. If you add a new updater, add the creation code as well.
     virtual QString type() const = 0;
 
-    bool autoUpdate() const { return m_autoUpdate; }
-    void setAutoUpdate( bool autoUpdate );
+#ifndef ENABLE_HEADLESS
+    // Small widget to show in playlist header that configures the updater
+    virtual QWidget* configurationWidget() const = 0;
 
-    void setInterval( int intervalMsecs ) ;
-    int intervalMsecs() const { return m_timer->interval(); }
+    // Small overlay over playlist icon in the sidebar to indicate that it has this updater type
+    // Should be around 16x16 or something
+    virtual QPixmap typeIcon() const { return QPixmap(); }
+#endif
 
     void remove();
 
     playlist_ptr playlist() const { return m_playlist; }
 
-    /// If you want to try to load a updater from the settings. Returns a valid
-    /// updater if one was saved
-    static PlaylistUpdaterInterface* loadForPlaylist( const playlist_ptr& pl );
+    /// If you want to try to load updaters for a playlist
+    static void loadForPlaylist( const playlist_ptr& pl );
+
+    static void registerUpdaterFactory( PlaylistUpdaterFactory* f );
+
+    virtual bool sync() const { return true; }
+
+signals:
+    void changed();
 
 public slots:
     virtual void updateNow() {}
 
-private slots:
-    void doSave();
+    void save();
 
 protected:
-    virtual void loadFromSettings( const QString& group ) = 0;
-    virtual void saveToSettings( const QString& group ) const = 0;
-    virtual void removeFromSettings( const QString& group ) const = 0;
+    virtual void aboutToDelete() {}
+
+    QVariantHash settings() const;
+    void saveSettings( const QVariantHash& settings );
 
 private:
-    QTimer* m_timer;
-    bool m_autoUpdate;
     playlist_ptr m_playlist;
+    QVariantHash m_extraData;
+
+    static QMap< QString, PlaylistUpdaterFactory* > s_factories;
+};
+
+
+class DLLEXPORT PlaylistUpdaterFactory
+{
+public:
+    PlaylistUpdaterFactory() {}
+    virtual ~PlaylistUpdaterFactory() {}
+
+    virtual QString type() const = 0;
+    virtual PlaylistUpdaterInterface* create( const playlist_ptr&, const QVariantHash& settings ) = 0;
 };
 
 }
 
+Q_DECLARE_METATYPE( Tomahawk::SerializedUpdater );
+Q_DECLARE_METATYPE( Tomahawk::SerializedUpdaters );
+
 #endif // PLAYLISTUPDATERINTERFACE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistView.cpp Added

@@ -0,0 +1,193 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "PlaylistView.h"
+
+#include <QKeyEvent>
+#include <QPainter>
+
+#include "ViewManager.h"
+#include "utils/Logger.h"
+#include "PlaylistUpdaterInterface.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+
+
+PlaylistView::PlaylistView( QWidget* parent )
+    : TrackView( parent )
+    , m_model( 0 )
+{
+    connect( contextMenu(), SIGNAL( triggered( int ) ), SLOT( onMenuTriggered( int ) ) );
+}
+
+
+PlaylistView::~PlaylistView()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+PlaylistView::setModel( QAbstractItemModel* model )
+{
+    Q_UNUSED( model );
+    qDebug() << "Explicitly use setPlaylistModel instead";
+    Q_ASSERT( false );
+}
+
+
+void
+PlaylistView::setPlaylistModel( PlaylistModel* model )
+{
+    m_model = model;
+
+    TrackView::setPlayableModel( m_model );
+    setColumnHidden( PlayableModel::Age, true ); // Hide age column per default
+    setColumnHidden( PlayableModel::Composer, true ); // Hide composer column per default
+
+    if ( guid().isEmpty() )
+    {
+        if ( !m_model->playlist().isNull() )
+        {
+            setGuid( QString( "playlistview/%1/%2" ).arg( m_model->columnCount() ).arg( m_model->playlist()->guid() ) );
+        }
+        else
+        {
+            setGuid( QString( "playlistview/%1" ).arg( m_model->columnCount() ) );
+        }
+    }
+
+    connect( m_model, SIGNAL( playlistDeleted() ), SLOT( onDeleted() ) );
+    connect( m_model, SIGNAL( playlistChanged() ), SLOT( onChanged() ) );
+
+    emit modelChanged();
+}
+
+
+void
+PlaylistView::keyPressEvent( QKeyEvent* event )
+{
+    TrackView::keyPressEvent( event );
+
+    if ( !model() )
+        return;
+
+    if ( ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace ) && !model()->isReadOnly() )
+    {
+        qDebug() << "Removing selected items";
+        deleteItems();
+    }
+}
+
+
+bool
+PlaylistView::eventFilter( QObject* obj, QEvent* event )
+{
+    if ( event->type() == QEvent::DragEnter )
+    {
+        QDragEnterEvent* e = static_cast<QDragEnterEvent*>(event);
+        dragEnterEvent( e );
+        return true;
+    }
+    if ( event->type() == QEvent::DragMove )
+    {
+        QDragMoveEvent* e = static_cast<QDragMoveEvent*>(event);
+        dragMoveEvent( e );
+        return true;
+    }
+    if ( event->type() == QEvent::DragLeave )
+    {
+        QDragLeaveEvent* e = static_cast<QDragLeaveEvent*>(event);
+        dragLeaveEvent( e );
+        return true;
+    }
+    if ( event->type() == QEvent::Drop )
+    {
+        QDropEvent* e = static_cast<QDropEvent*>(event);
+        dropEvent( e );
+        return true;
+    }
+
+    return QObject::eventFilter( obj, event );
+}
+
+
+void
+PlaylistView::deleteItems()
+{
+    proxyModel()->removeIndexes( selectedIndexes() );
+}
+
+
+QList<PlaylistUpdaterInterface*>
+PlaylistView::updaters() const
+{
+    if ( !m_model->playlist().isNull() )
+        return m_model->playlist()->updaters();
+
+    return QList<PlaylistUpdaterInterface*>();
+}
+
+
+void
+PlaylistView::onDeleted()
+{
+    qDebug() << Q_FUNC_INFO;
+    emit destroyed( widget() );
+}
+
+
+void
+PlaylistView::onChanged()
+{
+    if ( m_model )
+    {
+        if ( m_model->isReadOnly() )
+            setEmptyTip( tr( "This playlist is currently empty." ) );
+        else
+            setEmptyTip( tr( "This playlist is currently empty. Add some tracks to it and enjoy the music!" ) );
+        m_model->finishLoading();
+
+        if ( !m_model->playlist().isNull() && ViewManager::instance()->currentPage() == this )
+            emit nameChanged( m_model->playlist()->title() );
+    }
+}
+
+
+bool
+PlaylistView::isTemporaryPage() const
+{
+    return ( m_model && m_model->isTemporary() );
+}
+
+
+void
+PlaylistView::onMenuTriggered( int action )
+{
+    switch ( action )
+    {
+        case ContextMenu::ActionDelete:
+            deleteItems();
+            break;
+
+        default:
+            break;
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/PlaylistView.h Added

@@ -0,0 +1,68 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 PLAYLISTVIEW_H
+#define PLAYLISTVIEW_H
+
+#include "playlist/PlayableProxyModel.h"
+#include "playlist/PlaylistModel.h"
+#include "TrackView.h"
+#include "ViewPage.h"
+#include "DllMacro.h"
+
+class DLLEXPORT PlaylistView : public TrackView
+{
+Q_OBJECT
+
+public:
+    explicit PlaylistView( QWidget* parent = 0 );
+    virtual ~PlaylistView();
+
+    PlaylistModel* playlistModel() const { return m_model; }
+    virtual void setPlaylistModel( PlaylistModel* model );
+    virtual void setModel( QAbstractItemModel* model );
+
+    virtual QList<Tomahawk::PlaylistUpdaterInterface*> updaters() const;
+
+    virtual QPixmap pixmap() const { return QPixmap( RESPATH "images/playlist-icon.png" ); }
+    virtual bool isTemporaryPage() const;
+
+signals:
+    void nameChanged( const QString& title );
+    void destroyed( QWidget* widget );
+    void modelChanged();
+
+protected:
+    void keyPressEvent( QKeyEvent* event );
+    bool eventFilter( QObject* obj, QEvent* event );
+
+private slots:
+    void onMenuTriggered( int action );
+    void deleteItems();
+
+    void onDeleted();
+    void onChanged();
+
+private:
+    PlaylistModel* m_model;
+    QString m_customTitle;
+    QString m_customDescripton;
+};
+
+#endif // PLAYLISTVIEW_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/QueueProxyModel.cpp Added

@@ -0,0 +1,71 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "QueueProxyModel.h"
+
+#include "audio/AudioEngine.h"
+#include "playlist/TrackView.h"
+#include "PlayableItem.h"
+#include "ViewManager.h"
+#include "Source.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+QueueProxyModel::QueueProxyModel( TrackView* parent )
+    : PlayableProxyModel( parent )
+{
+    connect( parent, SIGNAL( itemActivated( QModelIndex ) ), SLOT( onIndexActivated( QModelIndex ) ) );
+    connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), SLOT( onPlaybackStarted( Tomahawk::result_ptr ) ) );
+}
+
+
+QueueProxyModel::~QueueProxyModel()
+{
+}
+
+
+void
+QueueProxyModel::onPlaybackStarted( const Tomahawk::result_ptr& result )
+{
+    for ( int i = 0; i < rowCount(); i++ )
+    {
+        QModelIndex idx = index( i, 0 );
+        PlayableItem* item = itemFromIndex( mapToSource( idx ) );
+        if ( item && item->query() && ( item->query()->results().contains( result ) ||
+                                        item->query()->equals( result->toQuery() ) ) )
+        {
+            removeIndex( idx );
+            if ( !rowCount() )
+                ViewManager::instance()->hideQueue();
+        }
+    }
+}
+
+
+void
+QueueProxyModel::onIndexActivated( const QModelIndex& index )
+{
+    setCurrentIndex( QModelIndex() );
+    removeIndex( index );
+
+    if ( !rowCount() )
+        ViewManager::instance()->hideQueue();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/QueueProxyModel.h Added

@@ -0,0 +1,43 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 QUEUEPROXYMODEL_H
+#define QUEUEPROXYMODEL_H
+
+#include "PlayableProxyModel.h"
+
+#include "DllMacro.h"
+
+class QMetaData;
+class TrackView;
+
+class DLLEXPORT QueueProxyModel : public PlayableProxyModel
+{
+Q_OBJECT
+
+public:
+    explicit QueueProxyModel( TrackView* parent = 0 );
+    virtual ~QueueProxyModel();
+
+private slots:
+    void onIndexActivated( const QModelIndex& index );
+    void onPlaybackStarted( const Tomahawk::result_ptr& result );
+};
+
+#endif // QUEUEPROXYMODEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/QueueView.cpp Added

@@ -0,0 +1,194 @@
+/* === 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
+ *   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 "QueueView.h"
+#include "ui_QueueView.h"
+
+#include <QVBoxLayout>
+
+#include "widgets/HeaderLabel.h"
+#include "playlist/QueueProxyModel.h"
+#include "utils/Logger.h"
+#include "PlaylistView.h"
+#include "Source.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "widgets/OverlayWidget.h"
+
+using namespace Tomahawk;
+
+
+QueueView::QueueView( AnimatedSplitter* parent )
+    : AnimatedWidget( parent )
+    , ui( new Ui::QueueView )
+    , m_dragTimer( 0 )
+{
+    ui->setupUi( this );
+    TomahawkUtils::unmarginLayout( layout() );
+    setContentsMargins( 0, 0, 0, 0 );
+
+    setHiddenSize( QSize( 0, 22 ) );
+
+    ui->queue->setProxyModel( new QueueProxyModel( ui->queue ) );
+    ui->queue->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
+
+    PlaylistModel* queueModel = new PlaylistModel( this );
+    queueModel->setStyle( PlaylistModel::Short );
+    queueModel->finishLoading();
+    ui->queue->setPlaylistModel( queueModel );
+    queueModel->setReadOnly( false );
+
+//    ui->queue->setEmptyTip( tr( "The queue is currently empty. Drop something to enqueue it!" ) );
+    ui->queue->setEmptyTip( QString() );
+
+    connect( queueModel, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( updateLabel() ) );
+    connect( ui->toggleButton, SIGNAL( clicked() ), SLOT( show() ) );
+    connect( this, SIGNAL( animationFinished() ), SLOT( onAnimationFinished() ) );
+
+    ui->toggleButton->installEventFilter( this );
+    ui->toggleButton->setCursor( Qt::PointingHandCursor );
+}
+
+
+QueueView::~QueueView()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+
+void
+QueueView::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+PlaylistView*
+QueueView::queue() const
+{
+    return ui->queue;
+}
+
+
+bool
+QueueView::eventFilter( QObject* obj, QEvent* ev )
+{
+    if ( obj == ui->toggleButton )
+    {
+        if ( ev->type() == QEvent::DragEnter )
+        {
+            ev->accept();
+
+            if ( m_dragTimer == 0 )
+            {
+                m_dragTimer = new QTimer( this );
+                m_dragTimer->setInterval( 1000 );
+                m_dragTimer->setSingleShot( true );
+                connect( m_dragTimer, SIGNAL( timeout() ), this, SLOT( show() ) );
+                m_dragTimer->start();
+            }
+        }
+        else if ( ev->type() == QEvent::DragLeave || ev->type() == QEvent::Drop )
+        {
+            delete m_dragTimer;
+            m_dragTimer = 0;
+        }
+    }
+
+    return QObject::eventFilter( obj, ev );
+}
+
+
+void
+QueueView::hide()
+{
+    disconnect( ui->toggleButton, SIGNAL( clicked() ), this, SLOT( hide() ) );
+    connect( ui->toggleButton, SIGNAL( clicked() ), SLOT( show() ) );
+    disconnect( ui->toggleButton, SIGNAL( resized( QPoint ) ), this, SIGNAL( resizeBy( QPoint ) ) );
+
+    ui->queue->overlay()->setVisible( false );
+    AnimatedWidget::hide();
+    updateLabel();
+}
+
+
+void
+QueueView::show()
+{
+    disconnect( ui->toggleButton, SIGNAL( clicked() ), this, SLOT( show() ) );
+    connect( ui->toggleButton, SIGNAL( clicked() ), SLOT( hide() ) );
+    connect( ui->toggleButton, SIGNAL( resized( QPoint ) ), SIGNAL( resizeBy( QPoint ) ) );
+
+    ui->queue->overlay()->setVisible( false );
+    AnimatedWidget::show();
+    updateLabel();
+}
+
+
+void
+QueueView::onShown( QWidget* widget, bool animated )
+{
+    if ( widget != this )
+        return;
+
+    AnimatedWidget::onShown( widget, animated );
+}
+
+
+void
+QueueView::onHidden( QWidget* widget, bool animated )
+{
+    if ( widget != this )
+        return;
+
+    AnimatedWidget::onHidden( widget, animated );
+}
+
+
+void
+QueueView::onAnimationFinished()
+{
+    ui->queue->overlay()->setVisible( true );
+}
+
+
+void
+QueueView::updateLabel()
+{
+    if ( isHidden() )
+    {
+        const unsigned int c = queue()->model()->rowCount( QModelIndex() );
+
+        if ( c )
+            ui->toggleButton->setText( tr( "Open Queue - %n item(s)", "", c ) );
+        else
+            ui->toggleButton->setText( tr( "Open Queue" ) );
+    }
+    else
+    {
+        ui->toggleButton->setText( tr( "Close Queue" ) );
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/QueueView.h Added

@@ -0,0 +1,69 @@
+/* === 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
+ *   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 QUEUEVIEW_H
+#define QUEUEVIEW_H
+
+#include <QPushButton>
+
+#include "widgets/AnimatedSplitter.h"
+
+#include "DllMacro.h"
+
+class QTimer;
+class PlaylistView;
+
+namespace Ui
+{
+    class QueueView;
+}
+
+class DLLEXPORT QueueView : public AnimatedWidget
+{
+Q_OBJECT
+
+public:
+    explicit QueueView( AnimatedSplitter* parent );
+    ~QueueView();
+
+    PlaylistView* queue() const;
+
+    QSize sizeHint() const { return QSize( 0, 200 ); }
+
+    virtual bool eventFilter( QObject* , QEvent* );
+
+public slots:
+    virtual void onShown( QWidget*, bool animated );
+    virtual void onHidden( QWidget*, bool animated );
+
+    virtual void show();
+    virtual void hide();
+
+protected:
+    void changeEvent( QEvent* e );
+
+private slots:
+    void updateLabel();
+    void onAnimationFinished();
+
+private:
+    Ui::QueueView* ui;
+    QTimer* m_dragTimer;
+};
+
+#endif // QUEUEVIEW_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/QueueView.ui Added

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QueueView</class>
+ <widget class="QWidget" name="QueueView">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>774</width>
+    <height>72</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>72</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>InfoBar</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="HeaderLabel" name="toggleButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="acceptDrops">
+      <bool>true</bool>
+     </property>
+     <property name="text">
+      <string>Open Queue</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="PlaylistView" name="queue"/>
+     </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>1</width>
+         <height>16</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>HeaderLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">widgets/HeaderLabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>PlaylistView</class>
+   <extends>QTreeView</extends>
+   <header location="global">playlist/PlaylistView.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/RecentlyAddedModel.cpp Added

@@ -0,0 +1,114 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Christian Muehlhaeuser <muesli@tomahawk-player.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 "RecentlyAddedModel.h"
+
+#include <QMimeData>
+#include <QTreeView>
+
+#include "Source.h"
+#include "SourceList.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_AllTracks.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+#define LATEST_TRACK_ITEMS 250
+
+using namespace Tomahawk;
+
+
+RecentlyAddedModel::RecentlyAddedModel( QObject* parent )
+    : PlayableModel( parent )
+    , m_limit( LATEST_TRACK_ITEMS )
+{
+}
+
+
+RecentlyAddedModel::~RecentlyAddedModel()
+{
+}
+
+
+void
+RecentlyAddedModel::loadHistory()
+{
+    if ( rowCount( QModelIndex() ) )
+    {
+        clear();
+    }
+    startLoading();
+
+    DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_source->collection() );
+    cmd->setLimit( m_limit );
+    cmd->setSortOrder( DatabaseCommand_AllTracks::ModificationTime );
+    cmd->setSortDescending( true );
+
+    connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, QVariant ) ),
+                    SLOT( appendQueries( QList<Tomahawk::query_ptr> ) ), Qt::QueuedConnection );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+RecentlyAddedModel::onSourcesReady()
+{
+    Q_ASSERT( m_source.isNull() );
+
+    loadHistory();
+
+    foreach ( const source_ptr& source, SourceList::instance()->sources() )
+        onSourceAdded( source );
+}
+
+
+void
+RecentlyAddedModel::setSource( const Tomahawk::source_ptr& source )
+{
+    m_source = source;
+
+    if ( source.isNull() )
+    {
+        if ( SourceList::instance()->isReady() )
+            onSourcesReady();
+        else
+            connect( SourceList::instance(), SIGNAL( ready() ), SLOT( onSourcesReady() ) );
+
+        connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
+    }
+    else
+    {
+        onSourceAdded( source );
+        loadHistory();
+    }
+}
+
+
+void
+RecentlyAddedModel::onSourceAdded( const Tomahawk::source_ptr& source )
+{
+    connect( source->collection().data(), SIGNAL( changed() ), SLOT( loadHistory() ) );
+}
+
+
+bool
+RecentlyAddedModel::isTemporary() const
+{
+    return true;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/RecentlyAddedModel.h Added

@@ -0,0 +1,57 @@
+/* === 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
+ *   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 RECENTLYADDEDMODEL_H
+#define RECENTLYADDEDMODEL_H
+
+#include <QList>
+#include <QHash>
+
+#include "Typedefs.h"
+#include "PlayableModel.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT RecentlyAddedModel : public PlayableModel
+{
+Q_OBJECT
+
+public:
+    explicit RecentlyAddedModel( QObject* parent = 0 );
+    ~RecentlyAddedModel();
+
+    unsigned int limit() const { return m_limit; }
+    void setLimit( unsigned int limit ) { m_limit = limit; }
+
+    bool isTemporary() const;
+
+public slots:
+    void setSource( const Tomahawk::source_ptr& source );
+
+private slots:
+    void onSourcesReady();
+    void onSourceAdded( const Tomahawk::source_ptr& source );
+
+    void loadHistory();
+
+private:
+    Tomahawk::source_ptr m_source;
+    unsigned int m_limit;
+};
+
+#endif // RECENTLYADDEDMODEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/RecentlyPlayedModel.cpp Added

@@ -0,0 +1,152 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Christian Muehlhaeuser <muesli@tomahawk-player.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 "RecentlyPlayedModel.h"
+
+#include <QMimeData>
+#include <QTreeView>
+
+#include "Source.h"
+#include "SourceList.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_PlaybackHistory.h"
+#include "PlayableItem.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+#define HISTORY_TRACK_ITEMS 25
+
+using namespace Tomahawk;
+
+
+RecentlyPlayedModel::RecentlyPlayedModel( QObject* parent )
+    : PlaylistModel( parent )
+    , m_limit( HISTORY_TRACK_ITEMS )
+{
+}
+
+
+RecentlyPlayedModel::~RecentlyPlayedModel()
+{
+}
+
+
+void
+RecentlyPlayedModel::loadHistory()
+{
+    if ( rowCount( QModelIndex() ) )
+    {
+        clear();
+    }
+    startLoading();
+
+    DatabaseCommand_PlaybackHistory* cmd = new DatabaseCommand_PlaybackHistory( m_source );
+    cmd->setLimit( m_limit );
+
+    connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ),
+                    SLOT( appendQueries( QList<Tomahawk::query_ptr> ) ), Qt::QueuedConnection );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+RecentlyPlayedModel::onSourcesReady()
+{
+    Q_ASSERT( m_source.isNull() );
+
+    loadHistory();
+
+    foreach ( const source_ptr& source, SourceList::instance()->sources() )
+        onSourceAdded( source );
+}
+
+
+void
+RecentlyPlayedModel::setSource( const Tomahawk::source_ptr& source )
+{
+    m_source = source;
+    if ( source.isNull() )
+    {
+        if ( SourceList::instance()->isReady() )
+            onSourcesReady();
+        else
+            connect( SourceList::instance(), SIGNAL( ready() ), SLOT( onSourcesReady() ) );
+
+        connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
+    }
+    else
+    {
+        onSourceAdded( source );
+        loadHistory();
+    }
+}
+
+
+void
+RecentlyPlayedModel::onSourceAdded( const Tomahawk::source_ptr& source )
+{
+    connect( source.data(), SIGNAL( playbackFinished( Tomahawk::query_ptr ) ), SLOT( onPlaybackFinished( Tomahawk::query_ptr ) ), Qt::UniqueConnection );
+}
+
+
+void
+RecentlyPlayedModel::onPlaybackFinished( const Tomahawk::query_ptr& query )
+{
+    int count = trackCount();
+    unsigned int playtime = query->playedBy().second;
+
+    if ( count )
+    {
+        PlayableItem* oldestItem = itemFromIndex( index( count - 1, 0, QModelIndex() ) );
+        if ( oldestItem->query()->playedBy().second >= playtime )
+            return;
+
+        PlayableItem* youngestItem = itemFromIndex( index( 0, 0, QModelIndex() ) );
+        if ( youngestItem->query()->playedBy().second <= playtime )
+            insertQuery( query, 0 );
+        else
+        {
+            for ( int i = 0; i < count - 1; i++ )
+            {
+                PlayableItem* item1 = itemFromIndex( index( i, 0, QModelIndex() ) );
+                PlayableItem* item2 = itemFromIndex( index( i + 1, 0, QModelIndex() ) );
+
+                if ( item1->query()->playedBy().second >= playtime && item2->query()->playedBy().second <= playtime )
+                {
+                    insertQuery( query, i + 1 );
+                    break;
+                }
+            }
+        }
+    }
+    else
+        insertQuery( query, 0 );
+
+    if ( trackCount() > (int)m_limit )
+        remove( m_limit );
+
+    ensureResolved();
+}
+
+
+bool
+RecentlyPlayedModel::isTemporary() const
+{
+    return true;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/RecentlyPlayedModel.h Added

@@ -0,0 +1,58 @@
+/* === 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
+ *   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 RECENTLYPLAYEDMODEL_H
+#define RECENTLYPLAYEDMODEL_H
+
+#include <QList>
+#include <QHash>
+
+#include "Typedefs.h"
+#include "PlaylistModel.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT RecentlyPlayedModel : public PlaylistModel
+{
+Q_OBJECT
+
+public:
+    explicit RecentlyPlayedModel( QObject* parent = 0 );
+    ~RecentlyPlayedModel();
+
+    unsigned int limit() const { return m_limit; }
+    void setLimit( unsigned int limit ) { m_limit = limit; }
+
+    bool isTemporary() const;
+
+public slots:
+    void setSource( const Tomahawk::source_ptr& source );
+
+private slots:
+    void onSourcesReady();
+    void onSourceAdded( const Tomahawk::source_ptr& source );
+
+    void onPlaybackFinished( const Tomahawk::query_ptr& query );
+    void loadHistory();
+
+private:
+    Tomahawk::source_ptr m_source;
+    unsigned int m_limit;
+};
+
+#endif // RECENTLYPLAYEDMODEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TrackView.cpp Added

@@ -0,0 +1,745 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "TrackView.h"
+
+#include <QKeyEvent>
+#include <QPainter>
+#include <QScrollBar>
+
+#include "ViewHeader.h"
+#include "ViewManager.h"
+#include "PlayableModel.h"
+#include "PlayableProxyModel.h"
+#include "PlayableItem.h"
+#include "audio/AudioEngine.h"
+#include "context/ContextWidget.h"
+#include "widgets/OverlayWidget.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "utils/Closure.h"
+#include "DropJob.h"
+#include "Artist.h"
+#include "Album.h"
+#include "Source.h"
+#include "utils/AnimatedSpinner.h"
+
+#define SCROLL_TIMEOUT 280
+
+using namespace Tomahawk;
+
+
+TrackView::TrackView( QWidget* parent )
+    : QTreeView( parent )
+    , m_model( 0 )
+    , m_proxyModel( 0 )
+    , m_delegate( 0 )
+    , m_header( new ViewHeader( this ) )
+    , m_overlay( new OverlayWidget( this ) )
+    , m_loadingSpinner( new LoadingSpinner( this ) )
+    , m_resizing( false )
+    , m_dragging( false )
+    , m_updateContextView( true )
+    , m_contextMenu( new ContextMenu( this ) )
+{
+    setFrameShape( QFrame::NoFrame );
+    setAttribute( Qt::WA_MacShowFocusRect, 0 );
+
+    setContentsMargins( 0, 0, 0, 0 );
+    setMouseTracking( true );
+    setAlternatingRowColors( true );
+    setSelectionMode( QAbstractItemView::ExtendedSelection );
+    setSelectionBehavior( QAbstractItemView::SelectRows );
+    setDragEnabled( true );
+    setDropIndicatorShown( false );
+    setDragDropMode( QAbstractItemView::InternalMove );
+    setDragDropOverwriteMode( false );
+    setAllColumnsShowFocus( true );
+    setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
+    setRootIsDecorated( false );
+    setUniformRowHeights( true );
+
+    setHeader( m_header );
+    setSortingEnabled( true );
+    sortByColumn( -1 );
+    setContextMenuPolicy( Qt::CustomContextMenu );
+
+#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
+
+    m_timer.setInterval( SCROLL_TIMEOUT );
+    connect( verticalScrollBar(), SIGNAL( rangeChanged( int, int ) ), SLOT( onViewChanged() ) );
+    connect( verticalScrollBar(), SIGNAL( valueChanged( int ) ), SLOT( onViewChanged() ) );
+    connect( &m_timer, SIGNAL( timeout() ), SLOT( onScrollTimeout() ) );
+
+    connect( this, SIGNAL( doubleClicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
+    connect( this, SIGNAL( customContextMenuRequested( const QPoint& ) ), SLOT( onCustomContextMenu( const QPoint& ) ) );
+    connect( m_contextMenu, SIGNAL( triggered( int ) ), SLOT( onMenuTriggered( int ) ) );
+
+    setProxyModel( new PlayableProxyModel( this ) );
+}
+
+
+TrackView::~TrackView()
+{
+    tDebug() << Q_FUNC_INFO;
+}
+
+
+void
+TrackView::setGuid( const QString& guid )
+{
+    m_guid = guid;
+    m_header->setGuid( guid );
+}
+
+
+void
+TrackView::setProxyModel( PlayableProxyModel* model )
+{
+    m_proxyModel = model;
+
+    m_delegate = new PlaylistItemDelegate( this, m_proxyModel );
+    setItemDelegate( m_delegate );
+
+    QTreeView::setModel( m_proxyModel );
+}
+
+
+void
+TrackView::setModel( QAbstractItemModel* model )
+{
+    Q_UNUSED( model );
+    tDebug() << "Explicitly use setPlayableModel instead";
+    Q_ASSERT( false );
+}
+
+
+void
+TrackView::setPlayableModel( PlayableModel* model )
+{
+    m_model = model;
+
+    if ( m_proxyModel )
+    {
+        m_proxyModel->setSourcePlayableModel( m_model );
+    }
+
+    connect( m_proxyModel, SIGNAL( filterChanged( QString ) ), SLOT( onFilterChanged( QString ) ) );
+    connect( m_proxyModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( onViewChanged() ) );
+
+    setAcceptDrops( true );
+    m_header->setDefaultColumnWeights( model->columnWeights() );
+
+    switch( model->style() )
+    {
+        case PlayableModel::Short:
+        case PlayableModel::ShortWithAvatars:
+        case PlayableModel::Large:
+            setHeaderHidden( true );
+            setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+        break;
+
+        default:
+            setHeaderHidden( false );
+            setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
+    }
+
+    emit modelChanged();
+}
+
+
+void
+TrackView::setEmptyTip( const QString& tip )
+{
+    m_emptyTip = tip;
+    m_overlay->setText( tip );
+}
+
+
+void
+TrackView::onViewChanged()
+{
+    if ( m_model->style() != PlayableModel::Short && m_model->style() != PlayableModel::Large ) // eventual FIXME?
+        return;
+
+    if ( m_timer.isActive() )
+        m_timer.stop();
+
+    m_timer.start();
+}
+
+
+void
+TrackView::onScrollTimeout()
+{
+    if ( m_timer.isActive() )
+        m_timer.stop();
+
+    QModelIndex left = indexAt( viewport()->rect().topLeft() );
+    while ( left.isValid() && left.parent().isValid() )
+        left = left.parent();
+
+    QModelIndex right = indexAt( viewport()->rect().bottomLeft() );
+    while ( right.isValid() && right.parent().isValid() )
+        right = right.parent();
+
+    int max = m_proxyModel->playlistInterface()->trackCount();
+    if ( right.isValid() )
+        max = right.row();
+
+    if ( !max )
+        return;
+
+    for ( int i = left.row(); i <= max; i++ )
+    {
+        m_model->updateDetailedInfo( m_proxyModel->mapToSource( m_proxyModel->index( i, 0 ) ) );
+    }
+}
+
+
+void
+TrackView::startPlayingFromStart()
+{
+    if ( m_proxyModel->rowCount() == 0 )
+        return;
+
+    const QModelIndex index = m_proxyModel->index( 0, 0 );
+    startAutoPlay( index );
+}
+
+
+void
+TrackView::autoPlayResolveFinished( const query_ptr& query, int row )
+{
+    Q_ASSERT( !query.isNull() );
+    Q_ASSERT( row >= 0 );
+
+    if ( query.isNull() || row < 0  || query != m_autoPlaying )
+        return;
+
+    const QModelIndex index = m_proxyModel->index( row, 0 );
+    if ( query->playable() )
+    {
+        onItemActivated( index );
+        return;
+    }
+
+    // Try the next one..
+    const QModelIndex sib = index.sibling( index.row() + 1, index.column() );
+    if ( sib.isValid() )
+        startAutoPlay( sib );
+
+}
+
+
+void
+TrackView::currentChanged( const QModelIndex& current, const QModelIndex& previous )
+{
+    QTreeView::currentChanged( current, previous );
+
+    if ( !m_updateContextView )
+        return;
+
+    PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( current ) );
+    if ( item )
+    {
+        ViewManager::instance()->context()->setQuery( item->query() );
+    }
+}
+
+
+void
+TrackView::onItemActivated( const QModelIndex& index )
+{
+    if ( !index.isValid() )
+        return;
+
+    tryToPlayItem( index );
+    emit itemActivated( index );
+}
+
+
+void
+TrackView::startAutoPlay( const QModelIndex& index )
+{
+    if ( tryToPlayItem( index ) )
+        return;
+
+    // item isn't playable but still resolving
+    PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
+    if ( item && !item->query().isNull() && !item->query()->resolvingFinished() )
+    {
+        m_autoPlaying = item->query(); // So we can kill it if user starts autoplaying this playlist again
+        NewClosure( item->query().data(), SIGNAL( resolvingFinished( bool ) ), this, SLOT( autoPlayResolveFinished( Tomahawk::query_ptr, int ) ),
+                    item->query(), index.row() );
+        return;
+    }
+
+    // not playable at all, try next
+    const QModelIndex sib = index.sibling( index.row() + 1, index.column() );
+    if ( sib.isValid() )
+        startAutoPlay( sib );
+}
+
+
+bool
+TrackView::tryToPlayItem( const QModelIndex& index )
+{
+    PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
+    if ( item && !item->query().isNull() )
+    {
+        m_proxyModel->setCurrentIndex( index );
+        AudioEngine::instance()->playItem( m_proxyModel->playlistInterface(), item->query() );
+
+        return true;
+    }
+
+    return false;
+}
+
+
+void
+TrackView::keyPressEvent( QKeyEvent* event )
+{
+    QTreeView::keyPressEvent( event );
+
+    if ( !model() )
+        return;
+
+    if ( event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return )
+    {
+        onItemActivated( currentIndex() );
+    }
+}
+
+
+void
+TrackView::onItemResized( const QModelIndex& index )
+{
+    tDebug() << Q_FUNC_INFO;
+    m_delegate->updateRowSize( index );
+}
+
+
+void
+TrackView::playItem()
+{
+    onItemActivated( m_contextMenuIndex );
+}
+
+
+void
+TrackView::resizeEvent( QResizeEvent* event )
+{
+    QTreeView::resizeEvent( event );
+
+    int sortSection = m_header->sortIndicatorSection();
+    Qt::SortOrder sortOrder = m_header->sortIndicatorOrder();
+
+    if ( m_header->checkState() && sortSection >= 0 )
+    {
+        // restoreState keeps overwriting our previous sort-order
+        sortByColumn( sortSection, sortOrder );
+    }
+
+    if ( !model() )
+        return;
+
+    if ( model()->columnCount() == 1 )
+    {
+        m_header->resizeSection( 0, event->size().width() );
+    }
+}
+
+
+void
+TrackView::dragEnterEvent( QDragEnterEvent* event )
+{
+    tDebug() << Q_FUNC_INFO;
+    QTreeView::dragEnterEvent( event );
+
+    if ( DropJob::acceptsMimeData( event->mimeData() ) )
+    {
+        m_dragging = true;
+        m_dropRect = QRect();
+
+        event->acceptProposedAction();
+    }
+}
+
+
+void
+TrackView::dragMoveEvent( QDragMoveEvent* event )
+{
+    QTreeView::dragMoveEvent( event );
+
+    if ( model()->isReadOnly() )
+    {
+        event->ignore();
+        return;
+    }
+
+    if ( DropJob::acceptsMimeData( event->mimeData() ) )
+    {
+        setDirtyRegion( m_dropRect );
+        const QPoint pos = event->pos();
+        QModelIndex index = indexAt( pos );
+        bool pastLast = false;
+
+        if ( !index.isValid() && proxyModel()->rowCount( QModelIndex() ) > 0 )
+        {
+            index = proxyModel()->index( proxyModel()->rowCount( QModelIndex() ) - 1, 0, QModelIndex() );
+            pastLast = true;
+        }
+
+        if ( index.isValid() )
+        {
+            const QRect rect = visualRect( index );
+            m_dropRect = rect;
+
+            // indicate that the item will be inserted above the current place
+            const int gap = 5; // FIXME constant
+            int yHeight = ( pastLast ? rect.bottom() : rect.top() ) - gap / 2;
+            m_dropRect = QRect( 0, yHeight, width(), gap );
+
+            event->acceptProposedAction();
+        }
+
+        setDirtyRegion( m_dropRect );
+    }
+}
+
+
+void
+TrackView::dropEvent( QDropEvent* event )
+{
+    QTreeView::dropEvent( event );
+
+    if ( event->isAccepted() )
+    {
+        tDebug() << "Ignoring accepted event!";
+    }
+    else
+    {
+        if ( DropJob::acceptsMimeData( event->mimeData()) )
+        {
+            const QPoint pos = event->pos();
+            const QModelIndex index = indexAt( pos );
+
+            tDebug() << Q_FUNC_INFO << "Drop Event accepted at row:" << index.row();
+            event->acceptProposedAction();
+
+            if ( !model()->isReadOnly() )
+            {
+                model()->dropMimeData( event->mimeData(), event->proposedAction(), index.row(), 0, index.parent() );
+            }
+        }
+    }
+
+    m_dragging = false;
+}
+
+
+void
+TrackView::paintEvent( QPaintEvent* event )
+{
+    QTreeView::paintEvent( event );
+    QPainter painter( viewport() );
+
+    if ( m_dragging )
+    {
+        // draw drop indicator
+        {
+            // draw indicator for inserting items
+            QBrush blendedBrush = viewOptions().palette.brush( QPalette::Normal, QPalette::Highlight );
+            QColor color = blendedBrush.color();
+
+            const int y = ( m_dropRect.top() + m_dropRect.bottom() ) / 2;
+            const int thickness = m_dropRect.height() / 2;
+
+            int alpha = 255;
+            const int alphaDec = alpha / ( thickness + 1 );
+            for ( int i = 0; i < thickness; i++ )
+            {
+                color.setAlpha( alpha );
+                alpha -= alphaDec;
+                painter.setPen( color );
+                painter.drawLine( 0, y - i, width(), y - i );
+                painter.drawLine( 0, y + i, width(), y + i );
+            }
+        }
+    }
+}
+
+
+void
+TrackView::onFilterChanged( const QString& )
+{
+    if ( selectedIndexes().count() )
+        scrollTo( selectedIndexes().at( 0 ), QAbstractItemView::PositionAtCenter );
+
+    if ( !proxyModel()->playlistInterface()->filter().isEmpty() && !proxyModel()->playlistInterface()->trackCount() && model()->trackCount() )
+    {
+        m_overlay->setText( tr( "Sorry, your filter '%1' did not match any results." ).arg( proxyModel()->playlistInterface()->filter() ) );
+        m_overlay->show();
+    }
+    else
+    {
+        if ( model()->trackCount() )
+        {
+            m_overlay->hide();
+        }
+        else
+        {
+            m_overlay->setText( m_emptyTip );
+            m_overlay->show();
+        }
+    }
+}
+
+
+void
+TrackView::startDrag( Qt::DropActions supportedActions )
+{
+    QList<QPersistentModelIndex> pindexes;
+    QModelIndexList indexes;
+    foreach( const QModelIndex& idx, selectedIndexes() )
+    {
+        if ( ( m_proxyModel->flags( idx ) & Qt::ItemIsDragEnabled ) )
+        {
+            indexes << idx;
+            pindexes << idx;
+        }
+    }
+
+    if ( indexes.count() == 0 )
+        return;
+
+    tDebug() << "Dragging" << indexes.count() << "indexes";
+    QMimeData* data = m_proxyModel->mimeData( indexes );
+    if ( !data )
+        return;
+
+    QDrag* drag = new QDrag( this );
+    drag->setMimeData( data );
+    const QPixmap p = TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeTrack, indexes.count() );
+    drag->setPixmap( p );
+    drag->setHotSpot( QPoint( -20, -20 ) );
+
+    Qt::DropAction action = drag->exec( supportedActions, Qt::CopyAction );
+    if ( action == Qt::MoveAction )
+    {
+        m_proxyModel->removeIndexes( pindexes );
+    }
+}
+
+
+void
+TrackView::onCustomContextMenu( const QPoint& pos )
+{
+    m_contextMenu->clear();
+
+    QModelIndex idx = indexAt( pos );
+    idx = idx.sibling( idx.row(), 0 );
+    setContextMenuIndex( idx );
+
+    if ( !idx.isValid() )
+        return;
+
+    if ( model() && !model()->isReadOnly() )
+        m_contextMenu->setSupportedActions( m_contextMenu->supportedActions() | ContextMenu::ActionDelete );
+
+    QList<query_ptr> queries;
+    foreach ( const QModelIndex& index, selectedIndexes() )
+    {
+        if ( index.column() )
+            continue;
+
+        PlayableItem* item = proxyModel()->itemFromIndex( proxyModel()->mapToSource( index ) );
+        if ( item && !item->query().isNull() )
+        {
+            if ( item->query()->numResults() > 0 )
+                queries << item->query()->results().first()->toQuery();
+            else
+                queries << item->query();
+        }
+    }
+
+    m_contextMenu->setQueries( queries );
+    m_contextMenu->exec( viewport()->mapToGlobal( pos ) );
+}
+
+
+void
+TrackView::onMenuTriggered( int action )
+{
+    switch ( action )
+    {
+        case ContextMenu::ActionPlay:
+            onItemActivated( m_contextMenuIndex );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+TrackView::updateHoverIndex( const QPoint& pos )
+{
+    QModelIndex idx = indexAt( pos );
+
+    if ( idx != m_hoveredIndex )
+    {
+        m_hoveredIndex = idx;
+        repaint();
+    }
+
+    if ( !m_model || m_model->style() != PlayableModel::Detailed )
+        return;
+
+    if ( idx.column() == PlayableModel::Artist || idx.column() == PlayableModel::Album || idx.column() == PlayableModel::Track )
+    {
+        if ( pos.x() > header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) - 16 &&
+             pos.x() < header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) )
+        {
+            setCursor( Qt::PointingHandCursor );
+            return;
+        }
+    }
+
+    if ( cursor().shape() != Qt::ArrowCursor )
+        setCursor( Qt::ArrowCursor );
+}
+
+
+void
+TrackView::wheelEvent( QWheelEvent* event )
+{
+    QTreeView::wheelEvent( event );
+
+    if ( m_hoveredIndex.isValid() )
+    {
+        m_hoveredIndex = QModelIndex();
+        repaint();
+    }
+}
+
+
+void
+TrackView::leaveEvent( QEvent* event )
+{
+    QTreeView::leaveEvent( event );
+    updateHoverIndex( QPoint( -1, -1 ) );
+}
+
+
+void
+TrackView::mouseMoveEvent( QMouseEvent* event )
+{
+    QTreeView::mouseMoveEvent( event );
+    updateHoverIndex( event->pos() );
+}
+
+
+void
+TrackView::mousePressEvent( QMouseEvent* event )
+{
+    QTreeView::mousePressEvent( event );
+
+    if ( !m_model || m_model->style() != PlayableModel::Detailed )
+        return;
+
+    QModelIndex idx = indexAt( event->pos() );
+    if ( event->pos().x() > header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) - 16 &&
+         event->pos().x() < header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) )
+    {
+        PlayableItem* item = proxyModel()->itemFromIndex( proxyModel()->mapToSource( idx ) );
+        switch ( idx.column() )
+        {
+            case PlayableModel::Artist:
+            {
+                ViewManager::instance()->show( Artist::get( item->query()->displayQuery()->artist() ) );
+                break;
+            }
+
+            case PlayableModel::Album:
+            {
+                artist_ptr artist = Artist::get( item->query()->displayQuery()->artist() );
+                ViewManager::instance()->show( Album::get( artist, item->query()->displayQuery()->album() ) );
+                break;
+            }
+
+            case PlayableModel::Track:
+            {
+                ViewManager::instance()->show( item->query()->displayQuery() );
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+}
+
+
+Tomahawk::playlistinterface_ptr
+TrackView::playlistInterface() const
+{
+    return proxyModel()->playlistInterface();
+}
+
+
+QString
+TrackView::title() const
+{
+    return model()->title();
+}
+
+
+QString
+TrackView::description() const
+{
+    return model()->description();
+}
+
+
+QPixmap
+TrackView::pixmap() const
+{
+    return QPixmap( RESPATH "images/music-icon.png" );
+}
+
+
+bool
+TrackView::jumpToCurrentTrack()
+{
+    scrollTo( proxyModel()->currentIndex(), QAbstractItemView::PositionAtCenter );
+    return true;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TrackView.h Added

@@ -0,0 +1,156 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TRACKVIEW_H
+#define TRACKVIEW_H
+
+#include <QtGui/QTreeView>
+#include <QtGui/QSortFilterProxyModel>
+#include <QtCore/QTimer>
+
+#include "ContextMenu.h"
+#include "PlaylistItemDelegate.h"
+#include "ViewPage.h"
+
+#include "DllMacro.h"
+
+class QAction;
+class AnimatedSpinner;
+class ViewHeader;
+class PlayableModel;
+class PlayableProxyModel;
+class OverlayWidget;
+
+class DLLEXPORT TrackView : public QTreeView, public Tomahawk::ViewPage
+{
+Q_OBJECT
+
+public:
+    explicit TrackView( QWidget* parent = 0 );
+    ~TrackView();
+
+    virtual QString guid() const { return m_guid; }
+    virtual void setGuid( const QString& guid );
+
+    virtual void setPlayableModel( PlayableModel* model );
+    virtual void setModel( QAbstractItemModel* model );
+    void setProxyModel( PlayableProxyModel* model );
+
+    virtual PlayableModel* model() const { return m_model; }
+    PlayableProxyModel* proxyModel() const { return m_proxyModel; }
+    PlaylistItemDelegate* delegate() const { return m_delegate; }
+    ViewHeader* header() const { return m_header; }
+    OverlayWidget* overlay() const { return m_overlay; }
+    Tomahawk::ContextMenu* contextMenu() const { return m_contextMenu; }
+    AnimatedSpinner* loadingSpinner() const { return m_loadingSpinner; }
+
+    void setEmptyTip( const QString& tip );
+
+    virtual QWidget* widget() { return this; }
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
+
+    virtual QString title() const;
+    virtual QString description() const;
+    virtual QPixmap pixmap() const;
+
+    virtual bool showModes() const { return true; }
+    virtual bool showFilter() const { return true; }
+
+    virtual bool jumpToCurrentTrack();
+
+    QModelIndex hoveredIndex() const { return m_hoveredIndex; }
+    QModelIndex contextMenuIndex() const { return m_contextMenuIndex; }
+    void setContextMenuIndex( const QModelIndex& idx ) { m_contextMenuIndex = idx; }
+
+    bool updatesContextView() const { return m_updateContextView; }
+    void setUpdatesContextView( bool b ) { m_updateContextView = b; }
+
+    // Starts playing from the beginning if resolved, or waits until a track is playable
+    void startPlayingFromStart();
+
+public slots:
+    virtual void onItemActivated( const QModelIndex& index );
+
+    void playItem();
+    void onMenuTriggered( int action );
+
+    void onViewChanged();
+    void onScrollTimeout();
+
+signals:
+    void itemActivated( const QModelIndex& index );
+    void modelChanged();
+
+protected:
+    virtual void resizeEvent( QResizeEvent* event );
+
+    virtual void startDrag( Qt::DropActions supportedActions );
+    virtual void dragEnterEvent( QDragEnterEvent* event );
+    virtual void dragLeaveEvent( QDragLeaveEvent* /*event*/ ) { m_dragging = false; setDirtyRegion( m_dropRect ); }
+    virtual void dragMoveEvent( QDragMoveEvent* event );
+    virtual void dropEvent( QDropEvent* event );
+
+    void wheelEvent( QWheelEvent* event );
+    void mouseMoveEvent( QMouseEvent* event );
+    void mousePressEvent( QMouseEvent* event );
+    void leaveEvent( QEvent* event );
+    void paintEvent( QPaintEvent* event );
+    void keyPressEvent( QKeyEvent* event );
+
+protected slots:
+    virtual void currentChanged( const QModelIndex& current, const QModelIndex& previous );
+
+private slots:
+    void onItemResized( const QModelIndex& index );
+    void onFilterChanged( const QString& filter );
+
+    void onCustomContextMenu( const QPoint& pos );
+
+    void autoPlayResolveFinished( const Tomahawk::query_ptr& query, int row  );
+
+private:
+    void startAutoPlay( const QModelIndex& index );
+    bool tryToPlayItem( const QModelIndex& index );
+    void updateHoverIndex( const QPoint& pos );
+
+    QString m_guid;
+    PlayableModel* m_model;
+    PlayableProxyModel* m_proxyModel;
+    PlaylistItemDelegate* m_delegate;
+    ViewHeader* m_header;
+    OverlayWidget* m_overlay;
+    AnimatedSpinner* m_loadingSpinner;
+
+    QString m_emptyTip;
+    bool m_resizing;
+    bool m_dragging;
+    QRect m_dropRect;
+
+    bool m_updateContextView;
+
+    QModelIndex m_hoveredIndex;
+    QModelIndex m_contextMenuIndex;
+
+    Tomahawk::query_ptr m_autoPlaying;
+    Tomahawk::ContextMenu* m_contextMenu;
+
+    QTimer m_timer;
+};
+
+#endif // TRACKVIEW_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TreeItemDelegate.cpp Added

@@ -0,0 +1,202 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2012       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 "TreeItemDelegate.h"
+
+#include <QApplication>
+#include <QPainter>
+#include <QAbstractItemView>
+#include <QHeaderView>
+
+#include "Query.h"
+#include "Result.h"
+
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "utils/Closure.h"
+#include "utils/PixmapDelegateFader.h"
+
+#include "PlayableItem.h"
+#include "TreeProxyModel.h"
+#include "Source.h"
+#include "TreeView.h"
+
+
+TreeItemDelegate::TreeItemDelegate( TreeView* parent, TreeProxyModel* proxy )
+    : QStyledItemDelegate( (QObject*)parent )
+    , m_view( parent )
+    , m_model( proxy )
+{
+}
+
+
+QSize
+TreeItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QSize size = QStyledItemDelegate::sizeHint( option, index );
+    return size;
+}
+
+
+void
+TreeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    PlayableItem* item = m_model->sourceModel()->itemFromIndex( m_model->mapToSource( index ) );
+    if ( !item )
+        return;
+
+    QTextOption textOption( Qt::AlignVCenter | (Qt::Alignment)index.data( Qt::TextAlignmentRole ).toUInt() );
+    textOption.setWrapMode( QTextOption::NoWrap );
+
+    QString text;
+    if ( !item->artist().isNull() )
+    {
+        text = item->artist()->name();
+    }
+    else if ( !item->album().isNull() )
+    {
+        text = item->album()->name();
+    }
+    else if ( !item->result().isNull() || !item->query().isNull() )
+    {
+        float opacity = item->result().isNull() ? 0.0 : item->result()->score();
+        opacity = qMax( (float)0.3, opacity );
+        QColor textColor = TomahawkUtils::alphaBlend( option.palette.color( QPalette::Foreground ), option.palette.color( QPalette::Background ), opacity );
+
+        {
+            QStyleOptionViewItemV4 o = option;
+            initStyleOption( &o, QModelIndex() );
+
+            painter->save();
+            o.palette.setColor( QPalette::Text, textColor );
+
+            if ( o.state & QStyle::State_Selected && o.state & QStyle::State_Active )
+            {
+                o.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) );
+            }
+
+            if ( item->isPlaying() )
+            {
+                o.palette.setColor( QPalette::Highlight, o.palette.color( QPalette::Mid ) );
+                if ( o.state & QStyle::State_Selected )
+                    o.palette.setColor( QPalette::Text, textColor );
+                o.state |= QStyle::State_Selected;
+            }
+
+            int oldX = 0;
+            if ( m_view->header()->visualIndex( index.column() ) == 0 )
+            {
+                oldX = o.rect.x();
+                o.rect.setX( 0 );
+            }
+            qApp->style()->drawControl( QStyle::CE_ItemViewItem, &o, painter );
+            if ( oldX > 0 )
+                o.rect.setX( oldX );
+
+            if ( m_view->hoveredIndex().row() == index.row() && m_view->hoveredIndex().column() == index.column() &&
+                 !index.data().toString().isEmpty() && index.column() == 0 )
+            {
+                o.rect.setWidth( o.rect.width() - 16 );
+                QRect arrowRect( o.rect.x() + o.rect.width(), o.rect.y() + 1, o.rect.height() - 2, o.rect.height() - 2 );
+
+                QPixmap infoIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::InfoIcon, TomahawkUtils::Original, arrowRect.size() );
+                painter->drawPixmap( arrowRect, infoIcon );
+            }
+
+            {
+                QRect r = o.rect.adjusted( 3, 0, 0, 0 );
+
+                // Paint Now Playing Speaker Icon
+                if ( item->isPlaying() && m_view->header()->visualIndex( index.column() ) == 0 )
+                {
+                    r.adjust( 0, 0, 0, -3 );
+                    QRect npr = r.adjusted( 3, 1, 18 - r.width(), 1 );
+                    painter->drawPixmap( npr, TomahawkUtils::defaultPixmap( TomahawkUtils::NowPlayingSpeaker, TomahawkUtils::Original, npr.size() ) );
+                    r.adjust( 25, 0, 0, 3 );
+                }
+
+                painter->setPen( o.palette.text().color() );
+
+                QString text = painter->fontMetrics().elidedText( index.data().toString(), Qt::ElideRight, r.width() - 3 );
+                painter->drawText( r.adjusted( 0, 1, 0, 0 ), text, textOption );
+            }
+            painter->restore();
+        }
+
+        return;
+    }
+    else
+        return;
+
+    if ( text.trimmed().isEmpty() )
+        text = tr( "Unknown" );
+
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, QModelIndex() );
+    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
+
+    if ( option.state & QStyle::State_Selected )
+    {
+        opt.palette.setColor( QPalette::Text, opt.palette.color( QPalette::HighlightedText ) );
+    }
+
+    if ( index.column() > 0 )
+        return;
+
+    painter->save();
+    painter->setRenderHint( QPainter::Antialiasing );
+    painter->setPen( opt.palette.color( QPalette::Text ) );
+
+    QRect r = option.rect.adjusted( 4, 4, -option.rect.width() + option.rect.height() - 4, -4 );
+//    painter->drawPixmap( r, QPixmap( RESPATH "images/cover-shadow.png" ) );
+
+    if ( !m_pixmaps.contains( index ) )
+    {
+        if ( !item->album().isNull() )
+        {
+            m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->album(), r.size(), TomahawkUtils::ScaledCover, false ) ) );
+            _detail::Closure* closure = NewClosure( m_pixmaps index , SIGNAL( repaintRequest() ), const_cast<TreeItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) );
+            closure->setAutoDelete( false );
+        }
+        else if ( !item->artist().isNull() )
+        {
+            m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->artist(), r.size(), TomahawkUtils::ScaledCover, false ) ) );
+            _detail::Closure* closure = NewClosure( m_pixmaps index , SIGNAL( repaintRequest() ), const_cast<TreeItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) );
+            closure->setAutoDelete( false );
+        }
+    }
+
+    const QPixmap cover = m_pixmaps index ->currentPixmap();
+
+    painter->drawPixmap( r, cover );
+
+    r = option.rect.adjusted( option.rect.height(), 6, -4, -option.rect.height() + 22 );
+    text = painter->fontMetrics().elidedText( text, Qt::ElideRight, r.width() );
+    painter->drawText( r, text, textOption );
+
+    painter->restore();
+}
+
+
+void
+TreeItemDelegate::doUpdateIndex( const QPersistentModelIndex& index )
+{
+    emit updateIndex( index );
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TreeItemDelegate.h Added

@@ -0,0 +1,60 @@
+/* === 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
+ *   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 TREEITEMDELEGATE_H
+#define TREEITEMDELEGATE_H
+
+#include <QStyledItemDelegate>
+
+#include "DllMacro.h"
+#include "Typedefs.h"
+
+namespace Tomahawk {
+class PixmapDelegateFader;
+}
+
+class TreeView;
+class TreeProxyModel;
+
+class DLLEXPORT TreeItemDelegate : public QStyledItemDelegate
+{
+Q_OBJECT
+
+public:
+    TreeItemDelegate( TreeView* parent = 0, TreeProxyModel* proxy = 0 );
+
+protected:
+    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+//    QWidget* createEditor( QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+signals:
+    void updateIndex( const QModelIndex& idx );
+
+private slots:
+    void doUpdateIndex( const QPersistentModelIndex& index );
+
+private:
+    TreeView* m_view;
+    TreeProxyModel* m_model;
+
+    mutable QHash< QPersistentModelIndex, QSharedPointer< Tomahawk::PixmapDelegateFader > > m_pixmaps;
+};
+
+#endif // TREEITEMDELEGATE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TreeModel.cpp Added

@@ -0,0 +1,416 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2012,      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 "TreeModel.h"
+
+#include <QMimeData>
+
+#include "Pipeline.h"
+#include "Source.h"
+#include "SourceList.h"
+#include "audio/AudioEngine.h"
+#include "database/DatabaseCommand_AllAlbums.h"
+#include "database/DatabaseCommand_AllTracks.h"
+#include "database/Database.h"
+#include "AlbumPlaylistInterface.h"
+#include "PlayableItem.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+TreeModel::TreeModel( QObject* parent )
+    : PlayableModel( parent )
+    , m_mode( DatabaseMode )
+{
+    setStyle( Collection );
+    setIcon( QPixmap( RESPATH "images/music-icon.png" ) );
+
+    connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( onPlaybackStarted( Tomahawk::result_ptr ) ), Qt::DirectConnection );
+    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ), Qt::DirectConnection );
+}
+
+
+TreeModel::~TreeModel()
+{
+    tDebug() << Q_FUNC_INFO;
+}
+
+
+void
+TreeModel::setMode( ModelMode mode )
+{
+    clear();
+    m_mode = mode;
+    emit modeChanged( mode );
+}
+
+
+Tomahawk::collection_ptr
+TreeModel::collection() const
+{
+    return m_collection;
+}
+
+
+void
+TreeModel::getCover( const QModelIndex& index )
+{
+    PlayableItem* item = itemFromIndex( index );
+
+    if ( !item->artist().isNull() && !item->artist()->coverLoaded() )
+        item->artist()->cover( QSize( 0, 0 ) );
+    else if ( !item->album().isNull() && !item->album()->coverLoaded() )
+        item->album()->cover( QSize( 0, 0 ) );
+}
+
+
+bool
+TreeModel::canFetchMore( const QModelIndex& parent ) const
+{
+    PlayableItem* parentItem = itemFromIndex( parent );
+
+    if ( parentItem->fetchingMore() )
+        return false;
+
+    if ( !parentItem->artist().isNull() )
+    {
+        return true;
+    }
+    else if ( !parentItem->album().isNull() )
+    {
+        return true;
+    }
+
+    return false;
+}
+
+
+void
+TreeModel::fetchMore( const QModelIndex& parent )
+{
+    PlayableItem* parentItem = itemFromIndex( parent );
+    if ( !parentItem || parentItem->fetchingMore() )
+        return;
+
+    parentItem->setFetchingMore( true );
+    if ( !parentItem->artist().isNull() )
+    {
+        tDebug() << Q_FUNC_INFO << "Loading Artist:" << parentItem->artist()->name();
+        fetchAlbums( parentItem->artist() );
+    }
+    else if ( !parentItem->album().isNull() )
+    {
+        tDebug() << Q_FUNC_INFO << "Loading Album:" << parentItem->album()->name();
+        addTracks( parentItem->album(), parent );
+    }
+    else
+        Q_ASSERT( false );
+}
+
+
+void
+TreeModel::addAllCollections()
+{
+    startLoading();
+
+    DatabaseCommand_AllArtists* cmd = new DatabaseCommand_AllArtists();
+
+    connect( cmd, SIGNAL( artists( QList<Tomahawk::artist_ptr> ) ),
+                    SLOT( onArtistsAdded( QList<Tomahawk::artist_ptr> ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+
+    connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ), Qt::UniqueConnection );
+
+    QList<Tomahawk::source_ptr> sources = SourceList::instance()->sources();
+    foreach ( const source_ptr& source, sources )
+    {
+        connect( source->collection().data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
+    }
+
+    setTitle( tr( "All Artists" ) );
+}
+
+
+void
+TreeModel::addArtists( const artist_ptr& artist )
+{
+    if ( artist.isNull() )
+        return;
+
+    startLoading();
+
+    QList<Tomahawk::artist_ptr> artists;
+    artists << artist;
+    onArtistsAdded( artists );
+}
+
+
+void
+TreeModel::fetchAlbums( const artist_ptr& artist )
+{
+    startLoading();
+
+    connect( artist.data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ),
+                              SLOT( onAlbumsFound( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ), Qt::UniqueConnection );
+        
+    const QModelIndex parent = indexFromArtist( artist );
+    addAlbums( parent, artist->albums( m_mode, m_collection ) );
+}
+
+
+void
+TreeModel::onAlbumsFound( const QList<Tomahawk::album_ptr>& albums, ModelMode mode )
+{
+    if ( m_mode != mode )
+        return;
+
+    Tomahawk::Artist* artist = qobject_cast< Tomahawk::Artist* >( sender() );
+    if ( !artist )
+        return;
+
+    const artist_ptr artistp = artist->weakRef().toStrongRef();
+    disconnect( artist, SIGNAL( albumsAdded( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ),
+                this,     SLOT( onAlbumsFound( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ) );
+
+    const QModelIndex parent = indexFromArtist( artistp );
+    addAlbums( parent, albums );
+}
+
+
+void
+TreeModel::addAlbums( const QModelIndex& parent, const QList<Tomahawk::album_ptr>& albums )
+{
+    finishLoading();
+    if ( !albums.count() )
+        return;
+
+    PlayableItem* parentItem = itemFromIndex( parent );
+
+    QPair< int, int > crows;
+    const int c = rowCount( parent );
+    crows.first = c;
+    crows.second = c + albums.count() - 1;
+
+    emit beginInsertRows( parent, crows.first, crows.second );
+
+    PlayableItem* albumitem = 0;
+    foreach( const album_ptr& album, albums )
+    {
+        albumitem = new PlayableItem( album, parentItem );
+        albumitem->index = createIndex( parentItem->children.count() - 1, 0, albumitem );
+        connect( albumitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
+
+        getCover( albumitem->index );
+    }
+
+    emit endInsertRows();
+}
+
+
+void
+TreeModel::addTracks( const album_ptr& album, const QModelIndex& parent, bool autoRefetch )
+{
+    Q_UNUSED( autoRefetch );
+
+    startLoading();
+
+    connect( album.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                             SLOT( onTracksFound( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ) );
+
+    if ( !album->tracks( m_mode, m_collection ).isEmpty() )
+        onTracksAdded( album->tracks( m_mode, m_collection ), parent );
+}
+
+
+void
+TreeModel::addCollection( const collection_ptr& collection )
+{
+    qDebug() << Q_FUNC_INFO << collection->name()
+                            << collection->source()->id()
+                            << collection->source()->userName();
+
+    startLoading();
+
+    m_collection = collection;
+    DatabaseCommand_AllArtists* cmd = new DatabaseCommand_AllArtists( collection );
+
+    connect( cmd, SIGNAL( artists( QList<Tomahawk::artist_ptr> ) ),
+                    SLOT( onArtistsAdded( QList<Tomahawk::artist_ptr> ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+
+    connect( collection.data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
+
+    if ( !collection->source()->avatar().isNull() )
+        setIcon( collection->source()->avatar() );
+
+    if ( collection->source()->isLocal() )
+        setTitle( tr( "My Collection" ) );
+    else
+        setTitle( tr( "Collection of %1" ).arg( collection->source()->friendlyName() ) );
+}
+
+
+void
+TreeModel::addFilteredCollection( const collection_ptr& collection, unsigned int amount, DatabaseCommand_AllArtists::SortOrder order )
+{
+    qDebug() << Q_FUNC_INFO << collection->name()
+                            << collection->source()->id()
+                            << collection->source()->userName()
+                            << amount << order;
+
+    DatabaseCommand_AllArtists* cmd = new DatabaseCommand_AllArtists( collection );
+    cmd->setLimit( amount );
+    cmd->setSortOrder( order );
+    cmd->setSortDescending( true );
+
+    connect( cmd, SIGNAL( artists( QList<Tomahawk::artist_ptr>, Tomahawk::collection_ptr ) ),
+                    SLOT( onArtistsAdded( QList<Tomahawk::artist_ptr>, Tomahawk::collection_ptr ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+
+    if ( collection->source()->isLocal() )
+        setTitle( tr( "My Collection" ) );
+    else
+        setTitle( tr( "Collection of %1" ).arg( collection->source()->friendlyName() ) );
+}
+
+
+void
+TreeModel::onSourceAdded( const Tomahawk::source_ptr& source )
+{
+    connect( source->collection().data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ), Qt::UniqueConnection );
+}
+
+
+void
+TreeModel::onCollectionChanged()
+{
+    clear();
+
+    if ( m_collection )
+        addCollection( m_collection );
+    else
+        addAllCollections();
+}
+
+
+void
+TreeModel::onArtistsAdded( const QList<Tomahawk::artist_ptr>& artists )
+{
+    finishLoading();
+
+    int c = rowCount( QModelIndex() );
+    QPair< int, int > crows;
+    crows.first = c;
+    crows.second = c + artists.count() - 1;
+
+    emit beginInsertRows( QModelIndex(), crows.first, crows.second );
+
+    PlayableItem* artistitem;
+    foreach( const artist_ptr& artist, artists )
+    {
+        artistitem = new PlayableItem( artist, rootItem() );
+        artistitem->index = createIndex( rootItem()->children.count() - 1, 0, artistitem );
+        connect( artistitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
+    }
+
+    emit endInsertRows();
+}
+
+
+void
+TreeModel::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks, const QModelIndex& parent )
+{
+    finishLoading();
+    if ( !tracks.count() )
+        return;
+
+    PlayableItem* parentItem = itemFromIndex( parent );
+
+    QPair< int, int > crows;
+    int c = rowCount( parent );
+    crows.first = c;
+    crows.second = c + tracks.count() - 1;
+
+    emit beginInsertRows( parent, crows.first, crows.second );
+
+    PlayableItem* item = 0;
+    foreach( const query_ptr& query, tracks )
+    {
+        item = new PlayableItem( query, parentItem );
+        item->index = createIndex( parentItem->children.count() - 1, 0, item );
+
+        connect( item, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
+    }
+
+    emit endInsertRows();
+}
+
+
+void
+TreeModel::onTracksFound( const QList<Tomahawk::query_ptr>& tracks, Tomahawk::ModelMode mode, Tomahawk::collection_ptr collection )
+{
+    if ( mode != m_mode || collection != m_collection )
+        return;
+
+    Tomahawk::Album* album = qobject_cast<Tomahawk::Album*>( sender() );
+
+    QModelIndex idx = indexFromAlbum( album->weakRef().toStrongRef() );
+    onTracksAdded( tracks, idx );
+}
+
+
+QModelIndex
+TreeModel::indexFromArtist( const Tomahawk::artist_ptr& artist ) const
+{
+    for ( int i = 0; i < rowCount( QModelIndex() ); i++ )
+    {
+        QModelIndex idx = index( i, 0, QModelIndex() );
+        PlayableItem* item = itemFromIndex( idx );
+        if ( item && item->artist() == artist )
+        {
+            return idx;
+        }
+    }
+
+    return QModelIndex();
+}
+
+
+QModelIndex
+TreeModel::indexFromAlbum( const Tomahawk::album_ptr& album ) const
+{
+    QModelIndex artistIdx = indexFromArtist( album->artist() );
+    for ( int i = 0; i < rowCount( artistIdx ); i++ )
+    {
+        QModelIndex idx = index( i, 0, artistIdx );
+        PlayableItem* item = itemFromIndex( idx );
+        if ( item && item->album() == album )
+        {
+            return idx;
+        }
+    }
+
+    return QModelIndex();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TreeModel.h Added

@@ -0,0 +1,93 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 TREEMODEL_H
+#define TREEMODEL_H
+
+#include <QAbstractItemModel>
+#include <QPixmap>
+
+#include "Artist.h"
+#include "Album.h"
+#include "Query.h"
+#include "Result.h"
+#include "PlayableModel.h"
+#include "PlaylistInterface.h"
+#include "database/DatabaseCommand_AllArtists.h"
+
+#include "DllMacro.h"
+#include "Typedefs.h"
+
+class QMetaData;
+
+class PlayableItem;
+
+class DLLEXPORT TreeModel : public PlayableModel
+{
+Q_OBJECT
+
+public:
+    explicit TreeModel( QObject* parent = 0 );
+    virtual ~TreeModel();
+
+    virtual Tomahawk::ModelMode mode() const { return m_mode; }
+    virtual void setMode( Tomahawk::ModelMode mode );
+
+    Tomahawk::collection_ptr collection() const;
+
+    void addAllCollections();
+    void addCollection( const Tomahawk::collection_ptr& collection );
+    void addFilteredCollection( const Tomahawk::collection_ptr& collection, unsigned int amount, DatabaseCommand_AllArtists::SortOrder order );
+
+    void addArtists( const Tomahawk::artist_ptr& artist );
+    void addTracks( const Tomahawk::album_ptr& album, const QModelIndex& parent, bool autoRefetch = false );
+    void fetchAlbums( const Tomahawk::artist_ptr& artist );
+
+    void getCover( const QModelIndex& index );
+
+    QModelIndex indexFromArtist( const Tomahawk::artist_ptr& artist ) const;
+    QModelIndex indexFromAlbum( const Tomahawk::album_ptr& album ) const;
+
+public slots:
+    void addAlbums( const QModelIndex& parent, const QList<Tomahawk::album_ptr>& albums );
+
+signals:
+    void modeChanged( Tomahawk::ModelMode mode );
+
+protected:
+    bool canFetchMore( const QModelIndex& parent ) const;
+    void fetchMore( const QModelIndex& parent );
+
+private slots:
+    void onArtistsAdded( const QList<Tomahawk::artist_ptr>& artists );
+    void onAlbumsFound( const QList<Tomahawk::album_ptr>& albums, Tomahawk::ModelMode mode );
+    void onTracksAdded( const QList<Tomahawk::query_ptr>& tracks, const QModelIndex& index );
+    void onTracksFound( const QList<Tomahawk::query_ptr>& tracks, Tomahawk::ModelMode mode, Tomahawk::collection_ptr collection );
+
+    void onSourceAdded( const Tomahawk::source_ptr& source );
+    void onCollectionChanged();
+
+private:
+    Tomahawk::ModelMode m_mode;
+    Tomahawk::collection_ptr m_collection;
+
+    QList<Tomahawk::artist_ptr> m_artistsFilter;
+};
+
+#endif // ALBUMMODEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TreeProxyModel.cpp Added

@@ -0,0 +1,367 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "TreeProxyModel.h"
+
+#include <QtGui/QListView>
+
+#include "TreeProxyModelPlaylistInterface.h"
+#include "Source.h"
+#include "Query.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "database/DatabaseCommand_AllAlbums.h"
+#include "PlayableItem.h"
+#include "utils/Logger.h"
+
+
+TreeProxyModel::TreeProxyModel( QObject* parent )
+    : PlayableProxyModel( parent )
+    , m_artistsFilterCmd( 0 )
+    , m_model( 0 )
+{
+}
+
+
+void
+TreeProxyModel::setSourcePlayableModel( TreeModel* model )
+{
+    if ( sourceModel() )
+    {
+        disconnect( m_model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), this, SLOT( onRowsInserted( QModelIndex, int, int ) ) );
+        disconnect( m_model, SIGNAL( modelReset() ), this, SLOT( onModelReset() ) );
+    }
+
+    PlayableProxyModel::setSourcePlayableModel( model );
+    m_model = model;
+
+    if ( sourceModel() )
+    {
+        connect( m_model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( onRowsInserted( QModelIndex, int, int ) ) );
+        connect( m_model, SIGNAL( modelReset() ), SLOT( onModelReset() ) );
+    }
+}
+
+
+void
+TreeProxyModel::onRowsInserted( const QModelIndex& parent, int /* start */, int /* end */ )
+{
+    if ( m_filter.isEmpty() )
+        return;
+    if ( sender() != m_model )
+        return;
+
+    PlayableItem* pi = m_model->itemFromIndex( m_model->index( parent.row(), 0, parent.parent() ) );
+    if ( pi->artist().isNull() )
+        return;
+
+    DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( m_model->collection() );
+    cmd->setArtist( pi->artist() );
+    cmd->setFilter( m_filter );
+
+    connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
+                    SLOT( onFilterAlbums( QList<Tomahawk::album_ptr> ) ) );
+
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+}
+
+
+void
+TreeProxyModel::onModelReset()
+{
+    m_cache.clear();
+    m_artistsFilter.clear();
+    m_albumsFilter.clear();
+}
+
+
+void
+TreeProxyModel::newFilterFromPlaylistInterface( const QString& pattern )
+{
+    emit filteringStarted();
+
+    m_filter = pattern;
+    m_albumsFilter.clear();
+
+    if ( m_artistsFilterCmd )
+    {
+        disconnect( m_artistsFilterCmd, SIGNAL( artists( QList<Tomahawk::artist_ptr> ) ),
+                    this,                 SLOT( onFilterArtists( QList<Tomahawk::artist_ptr> ) ) );
+
+        m_artistsFilterCmd = 0;
+    }
+
+    if ( m_filter.isEmpty() )
+    {
+        filterFinished();
+    }
+    else
+    {
+        DatabaseCommand_AllArtists* cmd = new DatabaseCommand_AllArtists( m_model->collection() );
+        cmd->setFilter( pattern );
+        m_artistsFilterCmd = cmd;
+
+        connect( cmd, SIGNAL( artists( QList<Tomahawk::artist_ptr> ) ),
+                        SLOT( onFilterArtists( QList<Tomahawk::artist_ptr> ) ) );
+
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+    }
+}
+
+
+void
+TreeProxyModel::onFilterArtists( const QList<Tomahawk::artist_ptr>& artists )
+{
+    bool finished = true;
+    m_artistsFilter = artists;
+    m_artistsFilterCmd = 0;
+
+    foreach ( const Tomahawk::artist_ptr& artist, artists )
+    {
+        QModelIndex idx = m_model->indexFromArtist( artist );
+        if ( m_model->rowCount( idx ) )
+        {
+            finished = false;
+
+            DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums( m_model->collection() );
+            cmd->setArtist( artist );
+            cmd->setFilter( m_filter );
+
+            connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
+                            SLOT( onFilterAlbums( QList<Tomahawk::album_ptr> ) ) );
+
+            Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+        }
+    }
+
+    if ( finished )
+        filterFinished();
+}
+
+
+void
+TreeProxyModel::onFilterAlbums( const QList<Tomahawk::album_ptr>& albums )
+{
+    foreach ( const Tomahawk::album_ptr& album, albums )
+        m_albumsFilter << album->id();
+
+    filterFinished();
+}
+
+
+void
+TreeProxyModel::filterFinished()
+{
+    m_artistsFilterCmd = 0;
+
+    if ( qobject_cast< Tomahawk::TreeProxyModelPlaylistInterface* >( m_playlistInterface.data() )->vanillaFilter() != m_filter )
+    {
+        emit filterChanged( m_filter );
+    }
+
+    qobject_cast< Tomahawk::TreeProxyModelPlaylistInterface* >( m_playlistInterface )->setVanillaFilter( m_filter );
+    setFilterRegExp( m_filter );
+
+    qobject_cast< Tomahawk::TreeProxyModelPlaylistInterface* >( m_playlistInterface )->sendTrackCount();
+
+    emit filteringFinished();
+}
+
+
+bool
+TreeProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
+{
+    PlayableItem* item = sourceModel()->itemFromIndex( sourceModel()->index( sourceRow, 0, sourceParent ) );
+    Q_ASSERT( item );
+
+    if ( m_model->mode() == Tomahawk::DatabaseMode && !item->query().isNull() )
+    {
+        QList< Tomahawk::query_ptr > rl = m_cache.values( sourceParent );
+        foreach ( const Tomahawk::query_ptr& cachedQuery, rl )
+        {
+            if ( cachedQuery.isNull() )
+                continue;
+
+            if ( cachedQuery->track() == item->query()->track() &&
+               ( cachedQuery->albumpos() == item->query()->albumpos() || cachedQuery->albumpos() == 0 ) )
+            {
+                return ( cachedQuery.data() == item->query().data() );
+            }
+        }
+
+        for ( int i = 0; i < sourceModel()->rowCount( sourceParent ); i++ )
+        {
+            if ( i == sourceRow )
+                continue;
+
+            PlayableItem* ti = sourceModel()->itemFromIndex( sourceModel()->index( i, 0, sourceParent ) );
+
+            if ( ti && ti->name() == item->name() && !ti->query().isNull() )
+            {
+                if ( ti->query()->albumpos() == item->query()->albumpos() || ti->query()->albumpos() == 0 || item->query()->albumpos() == 0 )
+                {
+                    if ( item->result().isNull() )
+                        return false;
+
+                    if ( !ti->result().isNull() )
+                    {
+                        if ( !item->result()->isOnline() && ti->result()->isOnline() )
+                            return false;
+
+                        if ( ( item->result()->collection().isNull() || !item->result()->collection()->source()->isLocal() ) &&
+                             !ti->result()->collection().isNull() && ti->result()->collection()->source()->isLocal() )
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    bool accepted = false;
+    if ( m_filter.isEmpty() )
+        accepted = true;
+    else if ( !item->artist().isNull() )
+        accepted = m_artistsFilter.contains( item->artist() );
+    else if ( !item->album().isNull() )
+        accepted = m_albumsFilter.contains( item->album()->id() );
+
+    if ( !accepted )
+    {
+        QStringList sl = m_filter.split( " ", QString::SkipEmptyParts );
+        foreach( const QString& s, sl )
+        {
+            if ( !item->name().contains( s, Qt::CaseInsensitive ) &&
+                 !item->albumName().contains( s, Qt::CaseInsensitive ) &&
+                 !item->artistName().contains( s, Qt::CaseInsensitive ) )
+            {
+                return false;
+            }
+        }
+    }
+
+    m_cache.insertMulti( sourceParent, item->query() );
+    return true;
+}
+
+
+bool
+TreeProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
+{
+    PlayableItem* p1 = sourceModel()->itemFromIndex( left );
+    PlayableItem* p2 = sourceModel()->itemFromIndex( right );
+
+    if ( !p1 )
+        return true;
+    if ( !p2 )
+        return false;
+
+/*    if ( !p1->result().isNull() && p2->result().isNull() )
+        return true;
+    if ( p1->result().isNull() && !p2->result().isNull() )
+        return false;*/
+
+    unsigned int albumpos1 = 0;
+    unsigned int albumpos2 = 0;
+    unsigned int discnumber1 = 0;
+    unsigned int discnumber2 = 0;
+    if ( !p1->query().isNull() )
+    {
+        albumpos1 = p1->query()->albumpos();
+        discnumber1 = p1->query()->discnumber();
+    }
+    if ( !p2->query().isNull() )
+    {
+        albumpos2 = p2->query()->albumpos();
+        discnumber2 = p2->query()->discnumber();
+    }
+    if ( !p1->result().isNull() )
+    {
+        if ( albumpos1 == 0 )
+            albumpos1 = p1->result()->albumpos();
+        if ( discnumber1 == 0 )
+            discnumber1 = p1->result()->discnumber();
+    }
+    if ( !p2->result().isNull() )
+    {
+        if ( albumpos2 == 0 )
+            albumpos2 = p2->result()->albumpos();
+        if ( discnumber2 == 0 )
+            discnumber2 = p2->result()->discnumber();
+    }
+    discnumber1 = qMax( 1, (int)discnumber1 );
+    discnumber2 = qMax( 1, (int)discnumber2 );
+
+    if ( discnumber1 != discnumber2 )
+    {
+        return discnumber1 < discnumber2;
+    }
+    else
+    {
+        if ( albumpos1 != albumpos2 )
+            return albumpos1 < albumpos2;
+    }
+
+    const QString& lefts = textForItem( p1 );
+    const QString& rights = textForItem( p2 );
+    if ( lefts == rights )
+        return (qint64)&p1 < (qint64)&p2;
+
+    return QString::localeAwareCompare( lefts, rights ) < 0;
+}
+
+
+QString
+TreeProxyModel::textForItem( PlayableItem* item ) const
+{
+    if ( !item )
+        return QString();
+
+    if ( !item->artist().isNull() )
+    {
+        return item->artist()->sortname();
+    }
+    else if ( !item->album().isNull() )
+    {
+        return DatabaseImpl::sortname( item->album()->name() );
+    }
+    else if ( !item->result().isNull() )
+    {
+        return DatabaseImpl::sortname( item->result()->track() );
+    }
+    else if ( !item->query().isNull() )
+    {
+        return item->query()->track();
+    }
+
+    return QString();
+}
+
+
+Tomahawk::playlistinterface_ptr
+TreeProxyModel::playlistInterface()
+{
+    if ( m_playlistInterface.isNull() )
+    {
+        m_playlistInterface = Tomahawk::playlistinterface_ptr( new Tomahawk::TreeProxyModelPlaylistInterface( this ) );
+    }
+
+    return m_playlistInterface;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TreeProxyModel.h Added

@@ -0,0 +1,80 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TREEPROXYMODEL_H
+#define TREEPROXYMODEL_H
+
+#include "PlaylistInterface.h"
+#include "TreeModel.h"
+#include "PlayableProxyModel.h"
+
+#include "DllMacro.h"
+
+class DatabaseCommand_AllArtists;
+
+namespace Tomahawk
+{
+    class TreeProxyModelPlaylistInterface;
+}
+
+class DLLEXPORT TreeProxyModel : public PlayableProxyModel
+{
+Q_OBJECT
+
+public:
+    explicit TreeProxyModel( QObject* parent = 0 );
+    virtual ~TreeProxyModel() {}
+
+    virtual void setSourcePlayableModel( TreeModel* model );
+
+    virtual void newFilterFromPlaylistInterface( const QString& pattern );
+
+    virtual Tomahawk::playlistinterface_ptr playlistInterface();
+
+signals:
+
+protected:
+    bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const;
+    bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
+
+private slots:
+    void onRowsInserted( const QModelIndex& parent, int start, int end );
+
+    void onFilterArtists( const QList<Tomahawk::artist_ptr>& artists );
+    void onFilterAlbums( const QList<Tomahawk::album_ptr>& albums );
+
+    void onModelReset();
+
+private:
+    void filterFinished();
+    QString textForItem( PlayableItem* item ) const;
+
+    mutable QMap< QPersistentModelIndex, Tomahawk::query_ptr > m_cache;
+
+    QList<Tomahawk::artist_ptr> m_artistsFilter;
+    QList<int> m_albumsFilter;
+    DatabaseCommand_AllArtists* m_artistsFilterCmd;
+
+    QString m_filter;
+    TreeModel* m_model;
+
+    Tomahawk::playlistinterface_ptr m_playlistInterface;
+};
+
+#endif // TREEPROXYMODEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.cpp Added

@@ -0,0 +1,169 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "TreeProxyModelPlaylistInterface.h"
+
+#include "TreeProxyModel.h"
+
+#include "Source.h"
+#include "Query.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "database/DatabaseCommand_AllAlbums.h"
+#include "PlayableItem.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+TreeProxyModelPlaylistInterface::TreeProxyModelPlaylistInterface( TreeProxyModel *proxyModel )
+    : PlaylistInterface()
+    , m_proxyModel( proxyModel )
+    , m_repeatMode( PlaylistModes::NoRepeat )
+    , m_shuffled( false )
+{
+}
+
+
+TreeProxyModelPlaylistInterface::~TreeProxyModelPlaylistInterface()
+{
+    m_proxyModel.clear();
+}
+
+
+QString
+TreeProxyModelPlaylistInterface::filter() const
+{
+    if ( m_proxyModel.isNull() )
+        return 0;
+    TreeProxyModel* proxyModel = m_proxyModel.data();
+    return proxyModel->filterRegExp().pattern();
+}
+
+
+void
+TreeProxyModelPlaylistInterface::setFilter( const QString& pattern )
+{
+    if ( m_proxyModel.isNull() )
+        return;
+    m_proxyModel.data()->newFilterFromPlaylistInterface( pattern );
+}
+
+
+int
+TreeProxyModelPlaylistInterface::unfilteredTrackCount() const
+{
+    if ( m_proxyModel.isNull() )
+        return 0;
+    TreeProxyModel* proxyModel = m_proxyModel.data();
+    return proxyModel->sourceModel()->rowCount( QModelIndex() );
+}
+
+
+int
+TreeProxyModelPlaylistInterface::trackCount() const
+{
+    if ( m_proxyModel.isNull() )
+        return 0;
+    TreeProxyModel* proxyModel = m_proxyModel.data();
+    return proxyModel->rowCount( QModelIndex() );
+}
+
+
+bool
+TreeProxyModelPlaylistInterface::hasNextItem()
+{
+    return !( siblingItem( 1, true ).isNull() );
+}
+
+
+Tomahawk::result_ptr
+TreeProxyModelPlaylistInterface::siblingItem( int itemsAway )
+{
+    return siblingItem( itemsAway, false );
+}
+
+
+Tomahawk::result_ptr
+TreeProxyModelPlaylistInterface::siblingItem( int itemsAway, bool readOnly )
+{
+    if ( m_proxyModel.isNull() )
+        return Tomahawk::result_ptr();
+    TreeProxyModel* proxyModel = m_proxyModel.data();
+
+    QModelIndex idx = proxyModel->currentIndex();
+    if ( !idx.isValid() )
+        return Tomahawk::result_ptr();
+
+    if ( m_shuffled )
+    {
+        idx = proxyModel->index( qrand() % proxyModel->rowCount( idx.parent() ), 0, idx.parent() );
+    }
+    else
+    {
+        if ( m_repeatMode != PlaylistModes::RepeatOne )
+            idx = proxyModel->index( idx.row() + ( itemsAway > 0 ? 1 : -1 ), 0, idx.parent() );
+    }
+
+    if ( !idx.isValid() && m_repeatMode == PlaylistModes::RepeatAll )
+    {
+        if ( itemsAway > 0 )
+        {
+            // reset to first item
+            idx = proxyModel->index( 0, 0, proxyModel->currentIndex().parent() );
+        }
+        else
+        {
+            // reset to last item
+            idx = proxyModel->index( proxyModel->rowCount( proxyModel->currentIndex().parent() ) - 1, 0, proxyModel->currentIndex().parent() );
+        }
+    }
+
+    // Try to find the next available PlaylistItem (with results)
+    while ( idx.isValid() )
+    {
+        PlayableItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( idx ) );
+        if ( item && !item->result().isNull() && item->result()->isOnline() )
+        {
+            qDebug() << "Next PlaylistItem found:" << item->result()->url();
+            if ( !readOnly )
+                proxyModel->setCurrentIndex( idx );
+            return item->result();
+        }
+
+        idx = proxyModel->index( idx.row() + ( itemsAway > 0 ? 1 : -1 ), 0, idx.parent() );
+    }
+
+    if ( !readOnly )
+        proxyModel->setCurrentIndex( QModelIndex() );
+    return Tomahawk::result_ptr();
+}
+
+
+Tomahawk::result_ptr
+TreeProxyModelPlaylistInterface::currentItem() const
+{
+    if ( m_proxyModel.isNull() )
+        return Tomahawk::result_ptr();
+    TreeProxyModel* proxyModel = m_proxyModel.data();
+
+    PlayableItem* item = proxyModel->itemFromIndex( proxyModel->mapToSource( proxyModel->currentIndex() ) );
+    if ( item && !item->result().isNull() && item->result()->isOnline() )
+        return item->result();
+    return Tomahawk::result_ptr();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TreeProxyModelPlaylistInterface.h Added

@@ -0,0 +1,90 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TREEPROXYMODELPLAYLISTINTERFACE_H
+#define TREEPROXYMODELPLAYLISTINTERFACE_H
+
+#include "PlaylistInterface.h"
+#include "TreeModel.h"
+
+#include "DllMacro.h"
+
+class DatabaseCommand_AllArtists;
+class TreeProxyModel;
+
+namespace Tomahawk
+{
+
+class DLLEXPORT TreeProxyModelPlaylistInterface : public Tomahawk::PlaylistInterface
+{
+Q_OBJECT
+
+public:
+    explicit TreeProxyModelPlaylistInterface( TreeProxyModel *proxyModel );
+    virtual ~TreeProxyModelPlaylistInterface();
+
+    virtual QList< Tomahawk::query_ptr > tracks() { Q_ASSERT( FALSE ); QList< Tomahawk::query_ptr > queries; return queries; }
+
+    virtual int unfilteredTrackCount() const;
+    virtual int trackCount() const;
+
+    virtual bool hasNextItem();
+    virtual Tomahawk::result_ptr currentItem() const;
+    virtual Tomahawk::result_ptr siblingItem( int direction );
+    virtual Tomahawk::result_ptr siblingItem( int direction, bool readOnly );
+
+    virtual QString filter() const;
+    virtual void setFilter( const QString& pattern );
+
+    virtual QString vanillaFilter() const { return PlaylistInterface::filter(); }
+    virtual void setVanillaFilter( const QString &filter ) { PlaylistInterface::setFilter( filter ); }
+
+    virtual void sendTrackCount() { emit trackCountChanged( trackCount() ); }
+
+    virtual PlaylistModes::RepeatMode repeatMode() const { return m_repeatMode; }
+    virtual bool shuffled() const { return m_shuffled; }
+    virtual PlaylistModes::ViewMode viewMode() const { return PlaylistModes::Tree; }
+
+signals:
+    void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode );
+    void shuffleModeChanged( bool enabled );
+
+    void trackCountChanged( unsigned int tracks );
+    void sourceTrackCountChanged( unsigned int tracks );
+
+    void filterChanged( const QString& filter );
+    void filteringStarted();
+    void filteringFinished();
+
+    void nextTrackReady();
+
+public slots:
+    virtual void setRepeatMode( Tomahawk::PlaylistModes::RepeatMode mode ) { m_repeatMode = mode; emit repeatModeChanged( mode ); }
+    virtual void setShuffled( bool enabled ) { m_shuffled = enabled; emit shuffleModeChanged( enabled ); }
+
+private:
+    QWeakPointer< TreeProxyModel > m_proxyModel;
+
+    PlaylistModes::RepeatMode m_repeatMode;
+    bool m_shuffled;
+};
+
+} //ns
+
+#endif // TREEPROXYMODELPLAYLISTINTERFACE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TreeView.cpp Added

@@ -0,0 +1,531 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "TreeView.h"
+
+#include <QHeaderView>
+#include <QKeyEvent>
+#include <QPainter>
+#include <QScrollBar>
+
+#include "audio/AudioEngine.h"
+#include "context/ContextWidget.h"
+#include "utils/AnimatedSpinner.h"
+#include "widgets/OverlayWidget.h"
+
+#include "ContextMenu.h"
+#include "TomahawkSettings.h"
+#include "ViewHeader.h"
+#include "TreeItemDelegate.h"
+#include "TreeModel.h"
+#include "PlayableItem.h"
+#include "Source.h"
+#include "ViewManager.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
+#define SCROLL_TIMEOUT 280
+
+using namespace Tomahawk;
+
+
+TreeView::TreeView( QWidget* parent )
+    : QTreeView( parent )
+    , m_header( new ViewHeader( this ) )
+    , m_overlay( new OverlayWidget( this ) )
+    , m_model( 0 )
+    , m_proxyModel( 0 )
+    , m_loadingSpinner( new LoadingSpinner( this ) )
+    , m_updateContextView( true )
+    , m_contextMenu( new ContextMenu( this ) )
+    , m_showModes( true )
+{
+    setFrameShape( QFrame::NoFrame );
+    setAttribute( Qt::WA_MacShowFocusRect, 0 );
+
+    setContentsMargins( 0, 0, 0, 0 );
+    setMouseTracking( true );
+    setAlternatingRowColors( true );
+    setDragEnabled( true );
+    setDropIndicatorShown( false );
+    setDragDropOverwriteMode( false );
+    setUniformRowHeights( false );
+    setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
+    setRootIsDecorated( true );
+    setAnimated( false );
+    setAllColumnsShowFocus( true );
+    setSelectionMode( QAbstractItemView::ExtendedSelection );
+    setSelectionBehavior( QAbstractItemView::SelectRows );
+    setContextMenuPolicy( Qt::CustomContextMenu );
+
+    setHeader( m_header );
+    setProxyModel( new TreeProxyModel( this ) );
+
+    #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
+
+    m_timer.setInterval( SCROLL_TIMEOUT );
+    connect( verticalScrollBar(), SIGNAL( rangeChanged( int, int ) ), SLOT( onViewChanged() ) );
+    connect( verticalScrollBar(), SIGNAL( valueChanged( int ) ), SLOT( onViewChanged() ) );
+    connect( &m_timer, SIGNAL( timeout() ), SLOT( onScrollTimeout() ) );
+
+    connect( this, SIGNAL( doubleClicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
+    connect( this, SIGNAL( customContextMenuRequested( QPoint ) ), SLOT( onCustomContextMenu( QPoint ) ) );
+    connect( m_contextMenu, SIGNAL( triggered( int ) ), SLOT( onMenuTriggered( int ) ) );
+}
+
+
+TreeView::~TreeView()
+{
+    tDebug() << Q_FUNC_INFO;
+}
+
+
+void
+TreeView::setProxyModel( TreeProxyModel* model )
+{
+    m_proxyModel = model;
+    TreeItemDelegate* del = new TreeItemDelegate( this, m_proxyModel );
+    connect( del, SIGNAL( updateIndex( QModelIndex ) ), this, SLOT( update( QModelIndex ) ) );
+    setItemDelegate( del );
+
+    QTreeView::setModel( m_proxyModel );
+}
+
+
+void
+TreeView::setModel( QAbstractItemModel* model )
+{
+    Q_UNUSED( model );
+    qDebug() << "Explicitly use setPlaylistModel instead";
+    Q_ASSERT( false );
+}
+
+
+void
+TreeView::setTreeModel( TreeModel* model )
+{
+    m_model = model;
+
+    if ( m_proxyModel )
+    {
+        m_proxyModel->setSourcePlayableModel( model );
+        m_proxyModel->sort( 0 );
+    }
+
+    connect( m_proxyModel, SIGNAL( filteringStarted() ), SLOT( onFilteringStarted() ) );
+    connect( m_proxyModel, SIGNAL( filteringFinished() ), m_loadingSpinner, SLOT( fadeOut() ) );
+
+    connect( m_proxyModel, SIGNAL( filteringFinished() ), SLOT( onFilterChangeFinished() ) );
+    connect( m_proxyModel, SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( onViewChanged() ) );
+
+    guid(); // this will set the guid on the header
+
+    m_header->setDefaultColumnWeights( model->columnWeights() );
+    if ( model->style() == PlayableModel::Large )
+    {
+        setHeaderHidden( true );
+        setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+    }
+    else
+    {
+        setHeaderHidden( false );
+        setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
+    }
+
+    emit modelChanged();
+    
+/*    setColumnHidden( PlayableModel::Score, true ); // Hide score column per default
+    setColumnHidden( PlayableModel::Origin, true ); // Hide origin column per default
+    setColumnHidden( PlayableModel::Composer, true ); //Hide composer column per default
+
+    setGuid( QString( "collectionview/%1" ).arg( model->columnCount() ) );
+    sortByColumn( PlayableModel::Artist, Qt::AscendingOrder );*/
+}
+
+
+void
+TreeView::setEmptyTip( const QString& tip )
+{
+    m_emptyTip = tip;
+    m_overlay->setText( tip );
+}
+
+
+void
+TreeView::onViewChanged()
+{
+    if ( m_timer.isActive() )
+        m_timer.stop();
+
+    m_timer.start();
+}
+
+
+void
+TreeView::onScrollTimeout()
+{
+    if ( m_timer.isActive() )
+        m_timer.stop();
+
+    QModelIndex left = indexAt( viewport()->rect().topLeft() );
+    while ( left.isValid() && left.parent().isValid() )
+        left = left.parent();
+
+    QModelIndex right = indexAt( viewport()->rect().bottomLeft() );
+    while ( right.isValid() && right.parent().isValid() )
+        right = right.parent();
+
+    int max = m_proxyModel->playlistInterface()->trackCount();
+    if ( right.isValid() )
+        max = right.row() + 1;
+
+    if ( !max )
+        return;
+
+    for ( int i = left.row(); i < max; i++ )
+    {
+        m_model->getCover( m_proxyModel->mapToSource( m_proxyModel->index( i, 0 ) ) );
+    }
+}
+
+
+void
+TreeView::currentChanged( const QModelIndex& current, const QModelIndex& previous )
+{
+    QTreeView::currentChanged( current, previous );
+
+    if ( !m_updateContextView )
+        return;
+
+    PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( current ) );
+    if ( item )
+    {
+        if ( !item->result().isNull() )
+            ViewManager::instance()->context()->setQuery( item->result()->toQuery() );
+        else if ( !item->artist().isNull() )
+            ViewManager::instance()->context()->setArtist( item->artist() );
+        else if ( !item->album().isNull() )
+            ViewManager::instance()->context()->setAlbum( item->album() );
+        else if ( !item->query().isNull() )
+            ViewManager::instance()->context()->setQuery( item->query() );
+    }
+}
+
+
+void
+TreeView::onItemActivated( const QModelIndex& index )
+{
+    PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
+    if ( item )
+    {
+        if ( !item->artist().isNull() )
+            ViewManager::instance()->show( item->artist() );
+        else if ( !item->album().isNull() )
+            ViewManager::instance()->show( item->album() );
+        else if ( !item->result().isNull() && item->result()->isOnline() )
+        {
+            m_model->setCurrentItem( item->index );
+            AudioEngine::instance()->playItem( m_proxyModel->playlistInterface(), item->result() );
+        }
+    }
+}
+
+
+void
+TreeView::keyPressEvent( QKeyEvent* event )
+{
+    QTreeView::keyPressEvent( event );
+
+    if ( !model() )
+        return;
+
+    if ( event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return )
+    {
+        onItemActivated( currentIndex() );
+    }
+}
+
+
+void
+TreeView::resizeEvent( QResizeEvent* event )
+{
+    QTreeView::resizeEvent( event );
+    m_header->checkState();
+
+    if ( !model() )
+        return;
+
+    if ( model()->columnCount( QModelIndex() ) == 1 )
+    {
+        m_header->resizeSection( 0, event->size().width() );
+    }
+}
+
+
+void
+TreeView::onFilterChangeFinished()
+{
+    if ( selectedIndexes().count() )
+        scrollTo( selectedIndexes().at( 0 ), QAbstractItemView::PositionAtCenter );
+
+    if ( !proxyModel()->playlistInterface()->filter().isEmpty() && !proxyModel()->playlistInterface()->trackCount() && model()->trackCount() )
+    {
+        m_overlay->setText( tr( "Sorry, your filter '%1' did not match any results." ).arg( proxyModel()->playlistInterface()->filter() ) );
+        m_overlay->show();
+    }
+    else
+    {
+        if ( model()->trackCount() )
+        {
+            m_overlay->hide();
+        }
+        else
+        {
+            m_overlay->setText( m_emptyTip );
+            m_overlay->show();
+        }
+    }
+}
+
+
+void
+TreeView::onFilteringStarted()
+{
+    m_overlay->hide();
+    m_loadingSpinner->fadeIn();
+}
+
+
+void
+TreeView::startDrag( Qt::DropActions supportedActions )
+{
+    QList<QPersistentModelIndex> pindexes;
+    QModelIndexList indexes;
+    foreach( const QModelIndex& idx, selectedIndexes() )
+    {
+        if ( ( m_proxyModel->flags( idx ) & Qt::ItemIsDragEnabled ) )
+        {
+            indexes << idx;
+            pindexes << idx;
+        }
+    }
+
+    if ( indexes.count() == 0 )
+        return;
+
+    qDebug() << "Dragging" << indexes.count() << "indexes";
+    QMimeData* data = m_proxyModel->mimeData( indexes );
+    if ( !data )
+        return;
+
+    QDrag* drag = new QDrag( this );
+    drag->setMimeData( data );
+
+    QPixmap p;
+    if ( data->hasFormat( "application/tomahawk.metadata.artist" ) )
+        p = TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeArtist, indexes.count() );
+    else if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
+        p = TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeAlbum, indexes.count() );
+    else
+        p = TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeTrack, indexes.count() );
+
+    drag->setPixmap( p );
+    drag->setHotSpot( QPoint( -20, -20 ) );
+
+    drag->exec( supportedActions, Qt::CopyAction );
+}
+
+
+void
+TreeView::onCustomContextMenu( const QPoint& pos )
+{
+    m_contextMenu->clear();
+
+    QModelIndex idx = indexAt( pos );
+    idx = idx.sibling( idx.row(), 0 );
+    m_contextMenuIndex = idx;
+
+    if ( !idx.isValid() )
+        return;
+
+    QList<query_ptr> queries;
+    QList<artist_ptr> artists;
+    QList<album_ptr> albums;
+
+    foreach ( const QModelIndex& index, selectedIndexes() )
+    {
+        if ( index.column() || selectedIndexes().contains( index.parent() ) )
+            continue;
+
+        PlayableItem* item = m_proxyModel->itemFromIndex( m_proxyModel->mapToSource( index ) );
+
+        if ( item && !item->result().isNull() )
+            queries << item->result()->toQuery();
+        else if ( item && !item->query().isNull() )
+            queries << item->query();
+        if ( item && !item->artist().isNull() )
+            artists << item->artist();
+        if ( item && !item->album().isNull() )
+            albums << item->album();
+    }
+
+    m_contextMenu->setQueries( queries );
+    m_contextMenu->setArtists( artists );
+    m_contextMenu->setAlbums( albums );
+
+    m_contextMenu->exec( viewport()->mapToGlobal( pos ) );
+}
+
+
+void
+TreeView::onMenuTriggered( int action )
+{
+    switch ( action )
+    {
+        case ContextMenu::ActionPlay:
+            onItemActivated( m_contextMenuIndex );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+bool
+TreeView::jumpToCurrentTrack()
+{
+    if ( !m_proxyModel || !m_proxyModel->sourceModel() )
+        return false;
+
+    scrollTo( m_proxyModel->currentIndex(), QAbstractItemView::PositionAtCenter );
+    return true;
+}
+
+
+void
+TreeView::updateHoverIndex( const QPoint& pos )
+{
+    QModelIndex idx = indexAt( pos );
+
+    if ( idx != m_hoveredIndex )
+    {
+        m_hoveredIndex = idx;
+        repaint();
+    }
+
+    if ( !m_model || m_model->style() != PlayableModel::Collection )
+        return;
+
+    PlayableItem* item = proxyModel()->itemFromIndex( proxyModel()->mapToSource( idx ) );
+    if ( idx.column() == 0 && !item->query().isNull() )
+    {
+        if ( pos.x() > header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) - 16 &&
+             pos.x() < header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) )
+        {
+            setCursor( Qt::PointingHandCursor );
+            return;
+        }
+    }
+
+    if ( cursor().shape() != Qt::ArrowCursor )
+        setCursor( Qt::ArrowCursor );
+}
+
+
+void
+TreeView::wheelEvent( QWheelEvent* event )
+{
+    QTreeView::wheelEvent( event );
+
+    if ( m_hoveredIndex.isValid() )
+    {
+        m_hoveredIndex = QModelIndex();
+        repaint();
+    }
+}
+
+
+void
+TreeView::leaveEvent( QEvent* event )
+{
+    QTreeView::leaveEvent( event );
+    updateHoverIndex( QPoint( -1, -1 ) );
+}
+
+
+void
+TreeView::mouseMoveEvent( QMouseEvent* event )
+{
+    QTreeView::mouseMoveEvent( event );
+    updateHoverIndex( event->pos() );
+}
+
+
+void
+TreeView::mousePressEvent( QMouseEvent* event )
+{
+    QTreeView::mousePressEvent( event );
+
+    if ( !m_model || m_model->style() != PlayableModel::Collection )
+        return;
+
+    QModelIndex idx = indexAt( event->pos() );
+    if ( event->pos().x() > header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) - 16 &&
+         event->pos().x() < header()->sectionViewportPosition( idx.column() ) + header()->sectionSize( idx.column() ) )
+    {
+        PlayableItem* item = proxyModel()->itemFromIndex( proxyModel()->mapToSource( idx ) );
+        if ( item->query().isNull() )
+            return;
+
+        switch ( idx.column() )
+        {
+            case 0:
+            {
+                ViewManager::instance()->show( item->query()->displayQuery() );
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+}
+
+
+QString
+TreeView::guid() const
+{
+    if ( m_guid.isEmpty() )
+    {
+        m_guid = QString( "artistview/%1" ).arg( m_model->columnCount( QModelIndex() ) );
+        m_header->setGuid( m_guid );
+    }
+
+    return m_guid;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/TreeView.h Added

@@ -0,0 +1,135 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TREEVIEW_H
+#define TREEVIEW_H
+
+#include <QtGui/QSortFilterProxyModel>
+#include <QtGui/QTreeView>
+#include <QtCore/QTimer>
+
+#include "TreeProxyModel.h"
+#include "ViewPage.h"
+
+#include "PlaylistInterface.h"
+
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+    class ContextMenu;
+};
+
+class ViewHeader;
+class AnimatedSpinner;
+class OverlayWidget;
+class TreeModel;
+
+class DLLEXPORT TreeView : public QTreeView, public Tomahawk::ViewPage
+{
+Q_OBJECT
+
+public:
+    explicit TreeView( QWidget* parent = 0 );
+    ~TreeView();
+
+    virtual QString guid() const;
+    virtual void setGuid( const QString& guid ) { m_guid = guid; }
+
+    void setProxyModel( TreeProxyModel* model );
+
+    TreeModel* model() const { return m_model; }
+    TreeProxyModel* proxyModel() const { return m_proxyModel; }
+    OverlayWidget* overlay() const { return m_overlay; }
+
+    void setModel( QAbstractItemModel* model );
+    void setTreeModel( TreeModel* model );
+
+    void setEmptyTip( const QString& tip );
+
+    virtual QWidget* widget() { return this; }
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return proxyModel()->playlistInterface(); }
+
+    virtual QString title() const { return m_model->title(); }
+    virtual QString description() const { return m_model->description(); }
+    virtual QPixmap pixmap() const { return m_model->icon(); }
+
+    virtual bool showStatsBar() const { return false; }
+    virtual bool showFilter() const { return true; }
+
+    virtual void setShowModes( bool b ) { m_showModes = b; }
+    virtual bool showModes() const { return m_showModes; }
+
+    virtual bool jumpToCurrentTrack();
+
+    QModelIndex hoveredIndex() const { return m_hoveredIndex; }
+
+    bool updatesContextView() const { return m_updateContextView; }
+    void setUpdatesContextView( bool b ) { m_updateContextView = b; }
+
+public slots:
+    void onItemActivated( const QModelIndex& index );
+
+signals:
+    void modelChanged();
+
+protected:
+    virtual void startDrag( Qt::DropActions supportedActions );
+    virtual void resizeEvent( QResizeEvent* event );
+
+    virtual void keyPressEvent( QKeyEvent* event );
+    void wheelEvent( QWheelEvent* event );
+    void mouseMoveEvent( QMouseEvent* event );
+    void mousePressEvent( QMouseEvent* event );
+    void leaveEvent( QEvent* event );
+
+protected slots:
+    virtual void currentChanged( const QModelIndex& current, const QModelIndex& previous );
+
+private slots:
+    void onFilterChangeFinished();
+    void onFilteringStarted();
+    void onViewChanged();
+    void onScrollTimeout();
+
+    void onCustomContextMenu( const QPoint& pos );
+    void onMenuTriggered( int action );
+
+private:
+    void updateHoverIndex( const QPoint& pos );
+
+    ViewHeader* m_header;
+    OverlayWidget* m_overlay;
+    TreeModel* m_model;
+    TreeProxyModel* m_proxyModel;
+    AnimatedSpinner* m_loadingSpinner;
+
+    bool m_updateContextView;
+
+    QModelIndex m_hoveredIndex;
+    QModelIndex m_contextMenuIndex;
+    Tomahawk::ContextMenu* m_contextMenu;
+
+    QString m_emptyTip;
+    bool m_showModes;
+    QTimer m_timer;
+    mutable QString m_guid;
+};
+
+#endif // TREEVIEW_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/ViewHeader.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/ViewHeader.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/ViewHeader.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/ViewHeader.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/XspfUpdater.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/XspfUpdater.cpp Changed

@@ -18,39 +18,79 @@
 
 #include "XspfUpdater.h"
 
-#include "playlist.h"
-#include "utils/xspfloader.h"
-#include "tomahawksettings.h"
-#include "pipeline.h"
-#include "utils/tomahawkutils.h"
+#include "Playlist.h"
+#include "utils/XspfLoader.h"
+#include "Pipeline.h"
+#include "utils/TomahawkUtils.h"
+#include "Source.h"
 
 #include <QTimer>
 
+#ifndef ENABLE_HEADLESS
+#include <QCheckBox>
+#endif
+
 using namespace Tomahawk;
 
-XspfUpdater::XspfUpdater( const playlist_ptr& pl, const QString& xUrl )
-    : PlaylistUpdaterInterface( pl )
-    , m_url( xUrl )
+PlaylistUpdaterInterface*
+XspfUpdaterFactory::create( const playlist_ptr &pl, const QVariantHash& settings )
 {
+    const bool autoUpdate = settings.value( "autoupdate" ).toBool();
+    const int interval = settings.value( "interval" ).toInt();
+    const QString url = settings.value( "xspfurl" ).toString();
+
+    XspfUpdater* updater = new XspfUpdater( pl, interval, autoUpdate, url );
+
+    return updater;
 }
 
+
 XspfUpdater::XspfUpdater( const playlist_ptr& pl, int interval, bool autoUpdate, const QString& xspfUrl )
-    : PlaylistUpdaterInterface( pl, interval, autoUpdate )
+    : PlaylistUpdaterInterface( pl )
+    , m_timer( new QTimer( this ) )
+    , m_autoUpdate( autoUpdate )
     , m_url( xspfUrl )
 {
+    m_timer->setInterval( interval );
+
+    connect( m_timer, SIGNAL( timeout() ), this, SLOT( updateNow() ) );
 
+#ifndef ENABLE_HEADLESS
+    m_toggleCheckbox = new QCheckBox( );
+    m_toggleCheckbox->setText( tr( "Automatically update from XSPF" ) );
+    m_toggleCheckbox->setLayoutDirection( Qt::RightToLeft );
+    m_toggleCheckbox->setChecked( m_autoUpdate );
+    m_toggleCheckbox->hide();
+
+    connect( m_toggleCheckbox, SIGNAL( toggled( bool ) ), this, SLOT( setAutoUpdate( bool ) ) );
+#endif
+
+    QVariantHash s = settings();
+    s "autoupdate"  = m_autoUpdate;
+    s "interval"  = interval;
+    s "xspfurl"  = xspfUrl;
+    saveSettings( s );
+
+    // Force start
+    setAutoUpdate( m_autoUpdate );
 }
 
 
-XspfUpdater::XspfUpdater( const playlist_ptr& pl )
-    : PlaylistUpdaterInterface( pl )
+XspfUpdater::~XspfUpdater()
 {
+}
 
+
+#ifndef ENABLE_HEADLESS
+
+QWidget*
+XspfUpdater::configurationWidget() const
+{
+    return m_toggleCheckbox;
 }
 
+#endif
 
-XspfUpdater::~XspfUpdater()
-{}
 
 void
 XspfUpdater::updateNow()
@@ -68,6 +108,7 @@
     connect( l, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( playlistLoaded( QList<Tomahawk::query_ptr> ) ) );
 }
 
+
 void
 XspfUpdater::playlistLoaded( const QList<Tomahawk::query_ptr>& newEntries )
 {
@@ -85,20 +126,35 @@
     playlist()->createNewRevision( uuid(), playlist()->currentrevision(), el );
 }
 
-void
-XspfUpdater::saveToSettings( const QString& group ) const
-{
-    TomahawkSettings::instance()->setValue( QString( "%1/xspfurl" ).arg( group ), m_url );
-}
 
 void
-XspfUpdater::loadFromSettings( const QString& group )
+XspfUpdater::setAutoUpdate( bool autoUpdate )
 {
-    m_url = TomahawkSettings::instance()->value( QString( "%1/xspfurl" ).arg( group ) ).toString();
+    m_autoUpdate = autoUpdate;
+
+    if ( m_autoUpdate )
+        m_timer->start();
+    else
+        m_timer->stop();
+
+    QVariantHash s = settings();
+    s "autoupdate"  = m_autoUpdate;
+    saveSettings( s );
+
+    // Update immediately as well
+    if ( m_autoUpdate )
+        QTimer::singleShot( 0, this, SLOT( updateNow() ) );
 }
 
 void
-XspfUpdater::removeFromSettings( const QString& group ) const
+XspfUpdater::setInterval( int intervalMsecs )
 {
-    TomahawkSettings::instance()->remove( QString( "%1/xspfurl" ).arg( group ) );
+    QVariantHash s = settings();
+    s "interval"  = intervalMsecs;
+    saveSettings( s );
+
+    if ( !m_timer )
+        m_timer = new QTimer( this );
+
+    m_timer->setInterval( intervalMsecs );
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/XspfUpdater.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/XspfUpdater.h Changed

@@ -20,37 +20,58 @@
 #define XSPFUPDATER_H
 
 #include "PlaylistUpdaterInterface.h"
+#include "DllMacro.h"
 
 class QTimer;
+class QCheckBox;
 
 namespace Tomahawk
 {
 
-class XspfUpdater : public PlaylistUpdaterInterface
+
+class DLLEXPORT XspfUpdater : public PlaylistUpdaterInterface
 {
     Q_OBJECT
 public:
-    XspfUpdater( const playlist_ptr& pl, const QString& xspfUrl );
     XspfUpdater( const playlist_ptr& pl, int interval, bool autoUpdate, const QString& xspfUrl );
-    explicit XspfUpdater( const playlist_ptr& pl ); // used by factory
 
     virtual ~XspfUpdater();
 
     virtual QString type() const { return "xspf"; }
 
+#ifndef ENABLE_HEADLESS
+    virtual QWidget* configurationWidget() const;
+#endif
+
+    bool autoUpdate() const { return m_autoUpdate; }
+
+    void setInterval( int intervalMsecs ) ;
+    int intervalMsecs() const { return m_timer->interval(); }
+
 public slots:
     void updateNow();
-
-protected:
-    void loadFromSettings( const QString& group );
-    void saveToSettings( const QString& group ) const;
-    virtual void removeFromSettings(const QString& group) const;
+    void setAutoUpdate( bool autoUpdate );
 
 private slots:
     void playlistLoaded( const QList<Tomahawk::query_ptr> & );
 
 private:
+    QTimer* m_timer;
+    bool m_autoUpdate;
     QString m_url;
+
+#ifndef ENABLE_HEADLESS
+    QCheckBox* m_toggleCheckbox;
+#endif
+};
+
+class DLLEXPORT XspfUpdaterFactory : public PlaylistUpdaterFactory
+{
+public:
+    XspfUpdaterFactory() {}
+
+    virtual QString type() const { return "xspf"; }
+    virtual PlaylistUpdaterInterface* create( const playlist_ptr& pl, const QVariantHash& settings );
 };
 
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicControl.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicControl.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicControl.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicControl.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicModel.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicModel.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicModel.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicModel.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp Changed

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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
@@ -18,16 +19,16 @@
 
 #include "DynamicPlaylist.h"
 
-#include "sourcelist.h"
+#include "SourceList.h"
 #include "GeneratorFactory.h"
-#include "database/database.h"
-#include "database/databasecommand.h"
-#include "database/databasecommand_createdynamicplaylist.h"
-#include "database/databasecommand_setdynamicplaylistrevision.h"
-#include "database/databasecommand_loaddynamicplaylistentries.h"
-#include "database/databasecommand_deletedynamicplaylist.h"
-#include "tomahawksettings.h"
-#include "utils/logger.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand.h"
+#include "database/DatabaseCommand_CreateDynamicPlaylist.h"
+#include "database/DatabaseCommand_SetDynamicPlaylistRevision.h"
+#include "database/DatabaseCommand_LoadDynamicPlaylistEntries.h"
+#include "database/DatabaseCommand_DeleteDynamicPlaylist.h"
+#include "TomahawkSettings.h"
+#include "utils/Logger.h"
 
 using namespace Tomahawk;
 
@@ -69,15 +70,15 @@
 
 
 // called when a new playlist is created (no currentrevision, new guid)
-DynamicPlaylist::DynamicPlaylist ( const Tomahawk::source_ptr& author,
-                                   const QString& guid,
-                                   const QString& title,
-                                   const QString& info,
-                                   const QString& creator,
-                                   const QString& type,
-                                   GeneratorMode mode,
-                                   bool shared,
-                                   bool autoLoad )
+DynamicPlaylist::DynamicPlaylist( const Tomahawk::source_ptr& author,
+                                  const QString& guid,
+                                  const QString& title,
+                                  const QString& info,
+                                  const QString& creator,
+                                  const QString& type,
+                                  GeneratorMode mode,
+                                  bool shared,
+                                  bool autoLoad )
     : Playlist ( author, guid, title, info, creator, shared )
     , m_autoLoad( autoLoad )
 {
@@ -121,6 +122,7 @@
     m_generator->setMode( (GeneratorMode)mode );
 }
 
+
 dynplaylist_ptr
 DynamicPlaylist::load( const QString& guid )
 {
@@ -132,7 +134,7 @@
         if ( p.isNull() )
             p = source->collection()->station( guid );
 
-        if( !p.isNull() )
+        if ( !p.isNull() )
             return p;
     }
 
@@ -157,7 +159,7 @@
     DatabaseCommand_CreateDynamicPlaylist* cmd = new DatabaseCommand_CreateDynamicPlaylist( author, dynplaylist, autoLoad );
     connect( cmd, SIGNAL(finished()), dynplaylist.data(), SIGNAL(created()) );
     Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
-    if( autoLoad )
+    if ( autoLoad )
         dynplaylist->reportCreated( dynplaylist );
     return dynplaylist;
 }
@@ -166,11 +168,11 @@
 void
 DynamicPlaylist::createNewRevision( const QString& newUuid )
 {
-    if( mode() == Static )
+    if ( mode() == Static )
     {
         createNewRevision( newUuid.isEmpty() ? uuid() : newUuid, currentrevision(), type(), generator()->controls(), entries() );
     }
-    else if( mode() == OnDemand )
+    else if ( mode() == OnDemand )
     {
         createNewRevision( newUuid.isEmpty() ? uuid() : newUuid, currentrevision(), type(), generator()->controls() );
     }
@@ -218,7 +220,7 @@
                                                     type,
                                                     Static,
                                                     controls );
-    if( !m_autoLoad )
+    if ( !m_autoLoad )
         cmd->setPlaylist( this );
 
     Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
@@ -253,7 +255,7 @@
                                                     type,
                                                     OnDemand,
                                                     controls );
-    if( !m_autoLoad )
+    if ( !m_autoLoad )
         cmd->setPlaylist( this );
 
     Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
@@ -268,7 +270,7 @@
     setBusy( true );
     DatabaseCommand_LoadDynamicPlaylistEntries* cmd = new DatabaseCommand_LoadDynamicPlaylistEntries( rev.isEmpty() ? currentrevision() : rev );
 
-    if( m_generator->mode() == OnDemand ) {
+    if ( m_generator->mode() == OnDemand ) {
         connect( cmd, SIGNAL( done( QString,
                                     bool,
                                     QString,
@@ -279,7 +281,7 @@
                                     QString,
                                     QList< QVariantMap >,
                                     bool) ) );
-    } else if( m_generator->mode() == Static ) {
+    } else if ( m_generator->mode() == Static ) {
         connect( cmd, SIGNAL( done( QString,
                                     QList< QString >,
                                     QList< QString >,
@@ -324,7 +326,7 @@
     // will emit Collection::playlistCreated(...)
     //    qDebug() << "Creating dynplaylist belonging to:" << author().data() << author().isNull();
     //    qDebug() << "REPORTING DYNAMIC PLAYLIST CREATED:" << this << author()->friendlyName();
-    if( self->mode() == Static )
+    if ( self->mode() == Static )
         author()->collection()->addAutoPlaylist( self );
     else
         author()->collection()->addStation( self );
@@ -337,7 +339,7 @@
 //    qDebug() << Q_FUNC_INFO;
     Q_ASSERT( self.data() == this );
     // will emit Collection::playlistDeleted(...)
-    if( self->mode() == Static )
+    if ( self->mode() == Static )
         author()->collection()->deleteAutoPlaylist( self );
     else
         author()->collection()->deleteStation( self );
@@ -347,7 +349,7 @@
 
 
 void
-DynamicPlaylist::addEntries(const QList< query_ptr >& queries, const QString& oldrev)
+DynamicPlaylist::addEntries( const QList< query_ptr >& queries, const QString& oldrev )
 {
     Q_ASSERT( m_generator->mode() == Static );
 
@@ -359,7 +361,7 @@
 
 
 void
-DynamicPlaylist::addEntry(const Tomahawk::query_ptr& query, const QString& oldrev)
+DynamicPlaylist::addEntry( const Tomahawk::query_ptr& query, const QString& oldrev )
 {
     QList<query_ptr> queries;
     queries << query;
@@ -379,7 +381,7 @@
                               bool applied )
 {
     // we're probably being called by a database worker thread
-    if( QThread::currentThread() != thread() )
+    if ( QThread::currentThread() != thread() )
     {
         QMetaObject::invokeMethod( this,
                                    "setRevision",
@@ -394,7 +396,8 @@
                                    Q_ARG( bool, applied ) );
         return;
     }
-    if( m_generator->type() != type ) { // new generator needed
+
+    if ( m_generator->type() != type ) { // new generator needed
         m_generator = GeneratorFactory::create( type );
     }
 
@@ -407,7 +410,7 @@
     dpr.type = type;
     dpr.mode = Static;
 
-    if( applied )
+    if ( applied )
         setCurrentrevision( rev );
 
     //     qDebug() << "EMITTING REVISION LOADED 1!";
@@ -426,7 +429,7 @@
                               const QMap< QString, Tomahawk::plentry_ptr >& addedmap,
                               bool applied )
 {
-    if( QThread::currentThread() != thread() )
+    if ( QThread::currentThread() != thread() )
     {
         QMetaObject::invokeMethod( this,
                                    "setRevision",
@@ -454,7 +457,7 @@
                               const QList< dyncontrol_ptr >& controls,
                               bool applied )
 {
-    if( QThread::currentThread() != thread() )
+    if ( QThread::currentThread() != thread() )
     {
         QMetaObject::invokeMethod( this,
                                    "setRevision",
@@ -466,7 +469,10 @@
                                    Q_ARG( bool, applied ) );
         return;
     }
-    if( m_generator->type() != type ) { // new generator needed
+
+    if ( m_generator->type() != type )
+    {
+        // new generator needed
         m_generator = geninterface_ptr( GeneratorFactory::create( type ) );
     }
 
@@ -480,7 +486,7 @@
     dpr.type = type;
     dpr.mode = OnDemand;
 
-    if( applied )
+    if ( applied )
         setCurrentrevision( rev );
 
     //     qDebug() << "EMITTING REVISION LOADED 2!";
@@ -496,7 +502,7 @@
                               const QList< QVariantMap >& controlsV,
                               bool applied )
 {
-    if( QThread::currentThread() != thread() )
+    if ( QThread::currentThread() != thread() )
     {
         QMetaObject::invokeMethod( this,
                                    "setRevision",
@@ -546,7 +552,7 @@
             item.oldRev = currentrevision();
         }
 
-        if( item.mode == Static )
+        if ( item.mode == Static )
             createNewRevision( item.newRev, item.oldRev, item.type, item.controls, item.entries );
         else
             createNewRevision( item.newRev, item.oldRev, item.type, item.controls );

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicPlaylist.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicPlaylistRevision.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicView.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicView.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicView.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/DynamicView.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/GeneratorFactory.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/GeneratorFactory.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/GeneratorFactory.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/GeneratorFactory.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/GeneratorInterface.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/GeneratorInterface.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/GeneratorInterface.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/database/DatabaseControl.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/database/DatabaseControl.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/database/DatabaseGenerator.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp Changed

@@ -19,13 +19,13 @@
 #include "dynamic/echonest/EchonestGenerator.h"
 #include "dynamic/echonest/EchonestControl.h"
 #include "dynamic/echonest/EchonestSteerer.h"
-#include "query.h"
-#include "utils/tomahawkutils.h"
-#include "tomahawksettings.h"
-#include "database/databasecommand_collectionattributes.h"
-#include "database/database.h"
-#include "utils/logger.h"
-#include "sourcelist.h"
+#include "Query.h"
+#include "utils/TomahawkUtils.h"
+#include "TomahawkSettings.h"
+#include "database/DatabaseCommand_CollectionAttributes.h"
+#include "database/Database.h"
+#include "utils/Logger.h"
+#include "SourceList.h"
 #include <QFile>
 #include <QDir>
 #include <EchonestCatalogSynchronizer.h>
@@ -121,7 +121,6 @@
 EchonestGenerator::EchonestGenerator ( QObject* parent )
     : GeneratorInterface ( parent )
     , m_dynPlaylist( new Echonest::DynamicPlaylist() )
-    , m_steeredSinceLastTrack( false )
 {
     m_type = "echonest";
     m_mode = OnDemand;
@@ -135,6 +134,13 @@
 
 EchonestGenerator::~EchonestGenerator()
 {
+    if ( !m_dynPlaylist->sessionId().isNull() )
+    {
+        // Running session, delete it
+        QNetworkReply* deleteReply = m_dynPlaylist->deleteSession();
+        connect( deleteReply, SIGNAL( finished() ), deleteReply, SLOT( deleteLater() ) );
+    }
+
     delete m_dynPlaylist;
 }
 
@@ -195,6 +201,13 @@
 void
 EchonestGenerator::startOnDemand()
 {
+    if ( !m_dynPlaylist->sessionId().isNull() )
+    {
+        // Running session, delete it
+        QNetworkReply* deleteReply = m_dynPlaylist->deleteSession();
+        connect( deleteReply, SIGNAL( finished() ), deleteReply, SLOT( deleteLater() ) );
+    }
+
     connect( this, SIGNAL( paramsGenerated( Echonest::DynamicPlaylist::PlaylistParams ) ), this, SLOT( doStartOnDemand( Echonest::DynamicPlaylist::PlaylistParams ) ) );
     try {
         getParams();
@@ -226,7 +239,7 @@
 {
     disconnect( this, SIGNAL( paramsGenerated( Echonest::DynamicPlaylist::PlaylistParams ) ), this, SLOT( doStartOnDemand( Echonest::DynamicPlaylist::PlaylistParams ) ) );
 
-    QNetworkReply* reply = m_dynPlaylist->start( params );
+    QNetworkReply* reply = m_dynPlaylist->create( params );
     qDebug() << "starting a dynamic playlist from echonest!" << reply->url().toString();
     connect( reply, SIGNAL( finished() ), this, SLOT( dynamicStarted() ) );
 }
@@ -241,14 +254,15 @@
         return;
     }
 
-    QNetworkReply* reply;
-    if( m_steeredSinceLastTrack ) {
-        qDebug() << "Steering dynamic playlist!" << m_steerData.first << m_steerData.second;
-        reply = m_dynPlaylist->fetchNextSong( Echonest::DynamicPlaylist::DynamicControls() << m_steerData );
-        m_steeredSinceLastTrack = false;
-    } else {
-        reply = m_dynPlaylist->fetchNextSong( rating );
+    if ( rating > -1 )
+    {
+        Echonest::DynamicPlaylist::DynamicFeedback feedback;
+        feedback.append( Echonest::DynamicPlaylist::DynamicFeedbackParamData( Echonest::DynamicPlaylist::RateSong, QString( "last^%1").arg( rating * 2 ).toUtf8() ) );
+        QNetworkReply* reply = m_dynPlaylist->feedback( feedback );
+        connect( reply, SIGNAL( finished() ), reply, SLOT( deleteLater() ) ); // we don't care about the result, just send it off
     }
+
+    QNetworkReply* reply = m_dynPlaylist->next( 1, 0 );
     qDebug() << "getting next song from echonest" << reply->url().toString();
     connect( reply, SIGNAL( finished() ), this, SLOT( dynamicFetched() ) );
 }
@@ -370,9 +384,8 @@
 
     try
     {
-        Echonest::Song song = m_dynPlaylist->parseStart( reply );
-        query_ptr songQuery = queryFromSong( song );
-        emit nextTrackGenerated( songQuery );
+        m_dynPlaylist->parseCreate( reply );
+        fetchNext();
     } catch( const Echonest::ParseError& e ) {
         qWarning() << "libechonest threw an error parsing the start of the dynamic playlist:" << e.errorType() << e.what();
         emit error( "The Echo Nest returned an error starting the station", e.what() );
@@ -387,12 +400,18 @@
     Q_ASSERT( qobject_cast< QNetworkReply* >( sender() ) );
     QNetworkReply* reply = qobject_cast< QNetworkReply* >( sender() );
 
-    resetSteering();
-
     try
     {
-        Echonest::Song song = m_dynPlaylist->parseNextSong( reply );
-        query_ptr songQuery = queryFromSong( song );
+        Echonest::DynamicPlaylist::FetchPair fetched = m_dynPlaylist->parseNext( reply );
+
+        if ( fetched.first.size() != 1 )
+        {
+            qWarning() << "Did not get any track when looking up the next song from the echo nest!";
+            emit error( "No more songs from The Echo Nest available in the station", "" );
+            return;
+        }
+
+        query_ptr songQuery = queryFromSong( fetched.first.first() );
         emit nextTrackGenerated( songQuery );
     } catch( const Echonest::ParseError& e ) {
         qWarning() << "libechonest threw an error parsing the next song of the dynamic playlist:" << e.errorType() << e.what();
@@ -401,33 +420,6 @@
 }
 
 
-void
-EchonestGenerator::steerDescription( const QString& desc )
-{
-    m_steeredSinceLastTrack = true;
-    m_steerData.first = Echonest::DynamicPlaylist::SteerDescription;
-    m_steerData.second = desc;
-}
-
-
-void
-EchonestGenerator::steerField( const QString& field )
-{
-    m_steeredSinceLastTrack = true;
-    m_steerData.first = Echonest::DynamicPlaylist::Steer;
-    m_steerData.second = field;
-}
-
-
-void
-EchonestGenerator::resetSteering()
-{
-    m_steeredSinceLastTrack = false;
-    m_steerData.first = Echonest::DynamicPlaylist::Steer;
-    m_steerData.second = QString();
-}
-
-
 QByteArray
 EchonestGenerator::catalogId(const QString &collectionId)
 {
@@ -507,21 +499,6 @@
 }
 
 
-QWidget*
-EchonestGenerator::steeringWidget()
-{
-    if( m_steerer.isNull() ) {
-        m_steerer = QWeakPointer< EchonestSteerer >( new EchonestSteerer );
-
-        connect( m_steerer.data(), SIGNAL( steerField( QString ) ), this, SLOT( steerField( QString ) ) );
-        connect( m_steerer.data(), SIGNAL( steerDescription( QString ) ), this, SLOT( steerDescription( QString ) ) );
-        connect( m_steerer.data(), SIGNAL( reset() ), this, SLOT( resetSteering() ) );
-    }
-
-    return m_steerer.data();
-}
-
-
 QString
 EchonestGenerator::sentenceSummary()
 {

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h Changed

@@ -25,9 +25,9 @@
 #include "playlist/dynamic/GeneratorInterface.h"
 #include "playlist/dynamic/GeneratorFactory.h"
 #include "playlist/dynamic/DynamicControl.h"
-#include "database/databasecommand_collectionattributes.h"
+#include "database/DatabaseCommand_CollectionAttributes.h"
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 namespace Tomahawk
 {
@@ -77,8 +77,8 @@
     virtual void startOnDemand();
     virtual void fetchNext( int rating = -1 );
     virtual QString sentenceSummary();
-    virtual bool onDemandSteerable() const { return true; }
-    virtual QWidget* steeringWidget();
+    virtual bool onDemandSteerable() const { return false; }
+    virtual QWidget* steeringWidget() { return 0; }
 
     static QStringList styles();
     static QStringList moods();
@@ -94,11 +94,6 @@
     void dynamicStarted();
     void dynamicFetched();
 
-    // steering controls
-    void steerField( const QString& field );
-    void steerDescription( const QString& desc );
-    void resetSteering();
-
     void doGenerate( const Echonest::DynamicPlaylist::PlaylistParams& params );
     void doStartOnDemand( const Echonest::DynamicPlaylist::PlaylistParams& params );
 
@@ -131,10 +126,6 @@
     // used for the intermediary song id lookup
     QSet< QNetworkReply* > m_waiting;
     Echonest::DynamicPlaylist::PlaylistParams m_storedParams;
-
-    QWeakPointer<EchonestSteerer> m_steerer;
-    bool m_steeredSinceLastTrack;
-    Echonest::DynamicPlaylist::DynamicControl m_steerData;
 };
 
 };

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/CollapsibleControls.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWrapper.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.cpp Changed

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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
@@ -28,21 +29,21 @@
 
 #include "DynamicControlList.h"
 #include "dynamic/DynamicModel.h"
-#include "trackproxymodel.h"
+#include "PlayableProxyModel.h"
+#include "PlayableItem.h"
 #include "dynamic/GeneratorInterface.h"
 #include "dynamic/GeneratorFactory.h"
-#include "pipeline.h"
-#include "source.h"
-#include "audio/audioengine.h"
+#include "Pipeline.h"
+#include "Source.h"
+#include "audio/AudioEngine.h"
 #include "ReadOrWriteWidget.h"
 #include "CollapsibleControls.h"
 #include "DynamicControlWrapper.h"
-#include "viewmanager.h"
+#include "ViewManager.h"
 #include "dynamic/DynamicView.h"
 #include "DynamicSetupWidget.h"
-#include "audiocontrols.h"
-#include "LoadingSpinner.h"
-#include "utils/logger.h"
+#include "utils/AnimatedSpinner.h"
+#include "utils/Logger.h"
 
 using namespace Tomahawk;
 
@@ -74,7 +75,7 @@
     connect( m_model, SIGNAL( collapseFromTo( int, int ) ), m_view, SLOT( collapseEntries( int, int ) ) );
     connect( m_model, SIGNAL( trackGenerationFailure( QString ) ), this, SLOT( stationFailed( QString ) ) );
 
-    m_loading = new LoadingSpinner( m_view );
+    m_loading = new AnimatedSpinner( m_view );
     connect( m_model, SIGNAL( tracksAdded() ), m_loading, SLOT( fadeOut() ) );
 
     m_setup = new DynamicSetupWidget( playlist, this );
@@ -422,7 +423,7 @@
     for ( int i = 0; i < m_view->proxyModel()->rowCount( QModelIndex() ); ++i )
     {
         const QModelIndex  cur = m_view->proxyModel()->index( i, 0, QModelIndex() );
-        TrackModelItem* item = m_view->proxyModel()->itemFromIndex( m_view->proxyModel()->mapToSource( cur ) );
+        PlayableItem* item = m_view->proxyModel()->itemFromIndex( m_view->proxyModel()->mapToSource( cur ) );
         if ( item && item->isPlaying() )
         {
             playing = cur;
@@ -441,7 +442,7 @@
         toRemove << m_view->proxyModel()->index( i, 0, QModelIndex() );
     }
 
-    m_view->proxyModel()->remove( toRemove );
+    m_view->proxyModel()->removeIndexes( toRemove );
 
     m_playlist->generator()->fetchNext();
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/DynamicWidget.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/MiscControlWidgets.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/MiscControlWidgets.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/ReadOrWriteWidget.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/dynamic/widgets/ReadOrWriteWidget.cpp Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/ClearButton.cpp Added

@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2009, Benjamin C. Meyer  <ben@meyerhome.net>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "ClearButton.h"
+
+#include <qpainter.h>
+
+ClearButton::ClearButton(QWidget *parent)
+    : QAbstractButton(parent)
+{
+    setCursor(Qt::ArrowCursor);
+    setFocusPolicy(Qt::NoFocus);
+    setToolTip(tr("Clear"));
+    setMinimumSize(22, 22);
+    setVisible(false);
+
+#if QT_VERSION >= 0x040600
+    // First check for a style icon, current KDE provides one
+    if (m_styleImage.isNull()) {
+        QLatin1String iconName = (layoutDirection() == Qt::RightToLeft)
+            ? QLatin1String("edit-clear-locationbar-ltr")
+            : QLatin1String("edit-clear-locationbar-rtl");
+        QIcon icon = QIcon::fromTheme(iconName);
+        if (!icon.isNull())
+            m_styleImage = icon.pixmap(16, 16).toImage();
+    }
+#endif
+}
+
+void ClearButton::textChanged(const QString &text)
+{
+    setVisible(!text.isEmpty());
+}
+
+void ClearButton::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    QPainter painter(this);
+
+    if (!m_styleImage.isNull()) {
+        int x = (width() - m_styleImage.width()) / 2 - 1;
+        int y = (height() - m_styleImage.height()) / 2 - 1;
+        painter.drawImage(x, y, m_styleImage);
+        return;
+    }
+
+    // Fall back to boring circle X
+    painter.setRenderHint(QPainter::Antialiasing, true);
+
+    QPalette p = palette();
+    QColor circleColor = isDown() ? p.color(QPalette::Dark) : p.color(QPalette::Mid);
+    QColor xColor = p.color(QPalette::Window);
+
+    // draw circle
+    painter.setBrush(circleColor);
+    painter.setPen(circleColor);
+    int padding = width() / 5;
+    int circleRadius = width() - (padding * 2);
+    painter.drawEllipse(padding, padding, circleRadius, circleRadius);
+
+    // draw X
+    painter.setPen(xColor);
+    padding = padding * 2;
+    painter.drawLine(padding, padding,            width() - padding, width() - padding);
+    painter.drawLine(padding, height() - padding, width() - padding, padding);
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/ClearButton.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/LineEdit.cpp Added

@@ -0,0 +1,230 @@
+/**
+ * Copyright (c) 2008 - 2009, Benjamin C. Meyer  <ben@meyerhome.net>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "LineEdit.h"
+#include "LineEdit_p.h"
+
+#include <qevent.h>
+#include <qlayout.h>
+#include <qstyleoption.h>
+#include <qpainter.h>
+
+SideWidget::SideWidget(QWidget *parent)
+    : QWidget(parent)
+{
+}
+
+bool SideWidget::event(QEvent *event)
+{
+    if (event->type() == QEvent::LayoutRequest)
+        emit sizeHintChanged();
+    return QWidget::event(event);
+}
+
+LineEdit::LineEdit(QWidget *parent)
+    : QLineEdit(parent)
+    , m_leftLayout(0)
+    , m_rightLayout(0)
+{
+    init();
+}
+
+LineEdit::LineEdit(const QString &contents, QWidget *parent)
+    : QLineEdit(contents, parent)
+    , m_leftWidget(0)
+    , m_rightWidget(0)
+    , m_leftLayout(0)
+    , m_rightLayout(0)
+{
+    init();
+}
+
+void LineEdit::init()
+{
+    m_leftWidget = new SideWidget(this);
+    m_leftWidget->resize(0, 0);
+    m_leftLayout = new QHBoxLayout(m_leftWidget);
+    m_leftLayout->setContentsMargins(0, 0, 0, 0);
+    if (isRightToLeft())
+        m_leftLayout->setDirection(QBoxLayout::RightToLeft);
+    else
+        m_leftLayout->setDirection(QBoxLayout::LeftToRight);
+    m_leftLayout->setSizeConstraint(QLayout::SetFixedSize);
+
+    m_rightWidget = new SideWidget(this);
+    m_rightWidget->resize(0, 0);
+    m_rightLayout = new QHBoxLayout(m_rightWidget);
+    if (isRightToLeft())
+        m_rightLayout->setDirection(QBoxLayout::RightToLeft);
+    else
+        m_rightLayout->setDirection(QBoxLayout::LeftToRight);
+    m_rightLayout->setContentsMargins(0, 0, 0, 0);
+
+    QSpacerItem *horizontalSpacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
+    m_rightLayout->addItem(horizontalSpacer);
+
+    setWidgetSpacing(3);
+    connect(m_leftWidget, SIGNAL(sizeHintChanged()),
+            this, SLOT(updateTextMargins()));
+    connect(m_rightWidget, SIGNAL(sizeHintChanged()),
+            this, SLOT(updateTextMargins()));
+}
+
+bool LineEdit::event(QEvent *event)
+{
+    if (event->type() == QEvent::LayoutDirectionChange) {
+        if (isRightToLeft()) {
+            m_leftLayout->setDirection(QBoxLayout::RightToLeft);
+            m_rightLayout->setDirection(QBoxLayout::RightToLeft);
+        } else {
+            m_leftLayout->setDirection(QBoxLayout::LeftToRight);
+            m_rightLayout->setDirection(QBoxLayout::LeftToRight);
+        }
+    }
+    return QLineEdit::event(event);
+}
+
+void LineEdit::addWidget(QWidget *widget, WidgetPosition position)
+{
+    if (!widget)
+        return;
+
+    bool rtl = isRightToLeft();
+    if (rtl)
+        position = (position == LeftSide) ? RightSide : LeftSide;
+    if (position == LeftSide) {
+        m_leftLayout->addWidget(widget);
+    } else {
+        m_rightLayout->insertWidget(1, widget);
+    }
+}
+
+void LineEdit::removeWidget(QWidget *widget)
+{
+    if (!widget)
+        return;
+
+    m_leftLayout->removeWidget(widget);
+    m_rightLayout->removeWidget(widget);
+    widget->hide();
+}
+
+void LineEdit::setWidgetSpacing(int spacing)
+{
+    m_leftLayout->setSpacing(spacing);
+    m_rightLayout->setSpacing(spacing);
+    updateTextMargins();
+}
+
+int LineEdit::widgetSpacing() const
+{
+    return m_leftLayout->spacing();
+}
+
+int LineEdit::textMargin(WidgetPosition position) const
+{
+    int spacing = m_rightLayout->spacing();
+    int w = 0;
+    if (position == LeftSide)
+        w = m_leftWidget->sizeHint().width();
+    else
+        w = m_rightWidget->sizeHint().width();
+    if (w == 0)
+        return 0;
+    return w + spacing * 2;
+}
+
+void LineEdit::updateTextMargins()
+{
+    int left = textMargin(LineEdit::LeftSide);
+    int right = textMargin(LineEdit::RightSide);
+    int top = 0;
+    int bottom = 0;
+    setTextMargins(left, top, right, bottom);
+    updateSideWidgetLocations();
+}
+
+void LineEdit::updateSideWidgetLocations()
+{
+    QStyleOptionFrameV2 opt;
+    initStyleOption(&opt);
+    QRect textRect = style()->subElementRect(QStyle::SE_LineEditContents, &opt, this);
+    int spacing = m_rightLayout->spacing();
+    textRect.adjust(spacing, 0, -spacing, 0);
+
+    int left = textMargin(LineEdit::LeftSide);
+
+    int midHeight = textRect.center().y() + 1;
+
+    if (m_leftLayout->count() > 0) {
+        int leftHeight = midHeight - m_leftWidget->height() / 2;
+        int leftWidth = m_leftWidget->width();
+        if (leftWidth == 0)
+            leftHeight = midHeight - m_leftWidget->sizeHint().height() / 2;
+        m_leftWidget->move(textRect.x(), leftHeight);
+    }
+    textRect.setX(left);
+    textRect.setY(midHeight - m_rightWidget->sizeHint().height() / 2);
+    textRect.setHeight(m_rightWidget->sizeHint().height());
+    m_rightWidget->setGeometry(textRect);
+}
+
+void LineEdit::resizeEvent(QResizeEvent *event)
+{
+    updateSideWidgetLocations();
+    QLineEdit::resizeEvent(event);
+}
+
+QString LineEdit::inactiveText() const
+{
+    return m_inactiveText;
+}
+
+void LineEdit::setInactiveText(const QString &text)
+{
+    m_inactiveText = text;
+}
+
+void LineEdit::paintEvent(QPaintEvent *event)
+{
+    QLineEdit::paintEvent(event);
+    if (text().isEmpty() && !m_inactiveText.isEmpty() && !hasFocus()) {
+        QStyleOptionFrameV2 panel;
+        initStyleOption(&panel);
+        QRect textRect = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this);
+        int horizontalMargin = 2;
+        textRect.adjust(horizontalMargin, 0, 0, 0);
+        int left = textMargin(LineEdit::LeftSide);
+        int right = textMargin(LineEdit::RightSide);
+        textRect.adjust(left, 0, -right, 0);
+        QPainter painter(this);
+        painter.setPen(palette().brush(QPalette::Disabled, QPalette::Text).color());
+        painter.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, m_inactiveText);
+    }
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/LineEdit.h Added

@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) 2008 - 2009, Benjamin C. Meyer  <ben@meyerhome.net>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef LINEEDIT_H
+#define LINEEDIT_H
+
+#include <QLineEdit>
+
+#include "DllMacro.h"
+class QHBoxLayout;
+
+/*
+    LineEdit is a subclass of QLineEdit that provides an easy and simple
+    way to add widgets on the left or right hand side of the text.
+
+    The layout of the widgets on either side are handled by a QHBoxLayout.
+    You can set the spacing around the widgets with setWidgetSpacing().
+
+    As widgets are added to the class they are inserted from the outside
+    into the center of the widget.
+*/
+class SideWidget;
+class DLLEXPORT LineEdit : public QLineEdit
+{
+    Q_OBJECT
+    Q_PROPERTY(QString inactiveText READ inactiveText WRITE setInactiveText)
+
+public:
+    enum WidgetPosition {
+        LeftSide,
+        RightSide
+    };
+
+    LineEdit(QWidget *parent = 0);
+    LineEdit(const QString &contents, QWidget *parent = 0);
+
+    void addWidget(QWidget *widget, WidgetPosition position);
+    void removeWidget(QWidget *widget);
+    void setWidgetSpacing(int spacing);
+    int widgetSpacing() const;
+    int textMargin(WidgetPosition position) const;
+    QString inactiveText() const;
+    void setInactiveText(const QString &text);
+
+    void paintEvent(QPaintEvent *event);
+
+protected:
+    void resizeEvent(QResizeEvent *event);
+    bool event(QEvent *event);
+
+protected slots:
+    void updateTextMargins();
+
+private:
+    void init();
+    void updateSideWidgetLocations();
+
+    SideWidget *m_leftWidget;
+    SideWidget *m_rightWidget;
+    QHBoxLayout *m_leftLayout;
+    QHBoxLayout *m_rightLayout;
+    QString m_inactiveText;
+};
+
+#endif // LINEEDIT_H
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/LineEdit_p.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/SearchButton.cpp Added

@@ -0,0 +1,116 @@
+/*
+ * Copyright 2009 Benjamin C. Meyer <ben@meyerhome.net>
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#include "SearchButton.h"
+
+#include <qcompleter.h>
+#include <qevent.h>
+#include <qlineedit.h>
+#include <qpainter.h>
+
+SearchButton::SearchButton(QWidget *parent)
+    : QAbstractButton(parent)
+    , m_showMenuTriangle(false)
+{
+    setFocusPolicy(Qt::NoFocus);
+    setCursor(Qt::ArrowCursor);
+    setMinimumSize(sizeHint());
+}
+
+QSize SearchButton::sizeHint() const
+{
+    if (!m_cache.isNull())
+        return m_cache.size();
+    if (m_showMenuTriangle)
+        return QSize(16, 16);
+    return QSize(12, 16);
+}
+
+QImage SearchButton::generateSearchImage(bool dropDown)
+{
+    QImage image(dropDown ? 16 : 12, 16, QImage::Format_ARGB32);
+    image.fill(qRgba(0, 0, 0, 0));
+    QPainterPath path;
+
+    // draw magnify glass circle
+    int radius = image.height() / 2;
+    QRect circle(1, 1, radius, radius);
+    path.addEllipse(circle);
+
+    // draw handle
+    path.arcMoveTo(circle, 300);
+    QPointF currentPosition = path.currentPosition();
+    path.moveTo(currentPosition.x() + 1, currentPosition.y() + 1);
+    if (dropDown)
+        path.lineTo(image.width()-6, image.height()-4);
+    else
+        path.lineTo(image.width()-2, image.height()-4);
+
+    QPainter painter(&image);
+    painter.setRenderHint(QPainter::Antialiasing, true);
+    painter.setPen(QPen(Qt::darkGray, 2));
+    painter.drawPath(path);
+
+    if (dropDown) {
+        // draw the dropdown triangle
+        QPainterPath dropPath;
+        dropPath.arcMoveTo(circle, 320);
+        QPointF currentPosition = dropPath.currentPosition();
+        currentPosition = QPointF(currentPosition.x() + 2, currentPosition.y() + 0.5);
+        dropPath.moveTo(currentPosition);
+        dropPath.lineTo(currentPosition.x() + 4, currentPosition.y());
+        dropPath.lineTo(currentPosition.x() + 2, currentPosition.y() + 2);
+        dropPath.closeSubpath();
+        painter.setPen(Qt::darkGray);
+        painter.setBrush(Qt::darkGray);
+        painter.setRenderHint(QPainter::Antialiasing, false);
+        painter.drawPath(dropPath);
+    }
+    painter.end();
+    return image;
+}
+
+void SearchButton::setImage(const QImage &image)
+{
+    m_cache = image;
+    setMinimumSize(sizeHint());
+    update();
+}
+
+void SearchButton::setShowMenuTriangle(bool show)
+{
+    m_showMenuTriangle = show;
+    setMinimumSize(sizeHint());
+}
+
+bool SearchButton::showMenuTriangle() const
+{
+    return m_showMenuTriangle;
+}
+
+void SearchButton::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    if (m_cache.isNull())
+        m_cache = generateSearchImage(m_showMenuTriangle);
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::SmoothPixmapTransform);
+    painter.drawImage(QPoint(0, 0), m_cache);
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/SearchButton.h Added

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2009 Benjamin C. Meyer <ben@meyerhome.net>
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#ifndef SEARCHBUTTON_H
+#define SEARCHBUTTON_H
+
+#include <qabstractbutton.h>
+
+#include "DllMacro.h"
+
+class QCompleter;
+class DLLEXPORT SearchButton : public QAbstractButton
+{
+    Q_OBJECT
+
+public:
+    SearchButton(QWidget *parent = 0);
+    void setImage(const QImage &image);
+    void setShowMenuTriangle(bool show);
+    bool showMenuTriangle() const;
+    void paintEvent(QPaintEvent *event);
+    QSize sizeHint() const;
+
+private:
+    QImage generateSearchImage(bool dropDown);
+    QImage m_cache;
+    bool m_showMenuTriangle;
+};
+
+#endif // SEARCHBUTTON_H
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/SearchLineEdit.cpp Added

@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2009, Benjamin C. Meyer
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "SearchLineEdit.h"
+
+#include "ClearButton.h"
+#include "SearchButton.h"
+
+SearchLineEdit::SearchLineEdit(QWidget *parent)
+    : LineEdit(parent)
+{
+    init();
+}
+
+void SearchLineEdit::init()
+{
+    // search button on the left
+    m_searchButton = new SearchButton(this);
+    addWidget(m_searchButton, LeftSide);
+
+    // clear button on the right
+    m_clearButton = new ClearButton(this);
+    connect(m_clearButton, SIGNAL(clicked()),
+            this, SLOT(clear()));
+    connect(this, SIGNAL(textChanged(const QString&)),
+            m_clearButton, SLOT(textChanged(const QString&)));
+    addWidget(m_clearButton, RightSide);
+    m_clearButton->hide();
+
+    setWidgetSpacing(5);
+
+    updateTextMargins();
+    setInactiveText(tr("Search"));
+}
+
+ClearButton *SearchLineEdit::clearButton() const
+{
+    return m_clearButton;
+}
+
+SearchButton *SearchLineEdit::searchButton() const
+{
+    return m_searchButton;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/SearchLineEdit.h Added

@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2009, Benjamin C. Meyer
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Benjamin Meyer nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef SEARCHLINEEDIT_H
+#define SEARCHLINEEDIT_H
+
+#include "LineEdit.h"
+
+class ClearButton;
+class SearchButton;
+
+class DLLEXPORT SearchLineEdit : public LineEdit
+{
+    Q_OBJECT
+
+public:
+    SearchLineEdit(QWidget *parent = 0);
+
+    ClearButton *clearButton() const;
+    SearchButton *searchButton() const;
+
+private:
+    void init();
+    ClearButton *m_clearButton;
+    SearchButton *m_searchButton;
+};
+
+#endif // SEARCHLINEEDIT_H
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/TopBar.cpp Added

@@ -0,0 +1,344 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "TopBar.h"
+#include "ui_TopBar.h"
+
+#include "SearchButton.h"
+
+#include <QPropertyAnimation>
+#include <QRadioButton>
+#include <QFile>
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+#define MAXDUDES 3
+#define DUDEWIDTH 10
+#define DUDEX( i ) ( DUDEWIDTH * i )
+
+using namespace Tomahawk;
+
+
+TopBar::TopBar( QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::TopBar )
+    , m_sources( 0 )
+    , m_tracks( 0 )
+    , m_artists( 0 )
+    , m_shown( 0 )
+{
+    ui->setupUi( this );
+
+    ui->statsLabelNumTracks->setFormat( "%L1 " + tr( "Tracks" ) );
+    ui->statsLabelNumArtists->setFormat( "%L1 " + tr( "Artists" ) );
+    connect( ui->filterEdit, SIGNAL( textChanged( QString ) ), SIGNAL( filterTextChanged( QString ) ) );
+
+    ui->filterEdit->setStyleSheet( "QLineEdit { border: 1px solid gray; border-radius: 6px; margin-right: 2px; }" );
+    ui->filterEdit->setInactiveText( tr( "Filter" ) );
+#ifdef Q_WS_MAC
+    ui->filterEdit->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+#endif
+
+    ui->filterEdit->searchButton()->setImage( QImage( RESPATH "images/filter.png" ) );
+
+    // initialise dudes
+    for( int i = 0; i < MAXDUDES; ++i )
+    {
+        QLabel* manlbl = new QLabel( ui->widgetMen );
+        manlbl->setPixmap( QPixmap( RESPATH "images/avatar-dude.png" ) );
+        manlbl->move( QPoint( -10,0 ) );
+        manlbl->show();
+        m_dudes.append( manlbl );
+    }
+
+    QFile f( RESPATH "stylesheets/topbar-radiobuttons.css" );
+    f.open( QFile::ReadOnly );
+    QString css = QString::fromAscii( f.readAll() );
+    f.close();
+
+    ui->widgetRadio->setStyleSheet( css );
+
+    ui->radioNormal->setFocusPolicy( Qt::NoFocus );
+    ui->radioDetailed->setFocusPolicy( Qt::NoFocus );
+    ui->radioCloud->setFocusPolicy( Qt::NoFocus );
+
+    ui->radioCloud->hide();
+
+    ui->radioNormal->setToolTip( tr( "Artist View" ) );
+    ui->radioDetailed->setToolTip( tr("Flat View" ) );
+
+    connect( ui->radioNormal, SIGNAL( clicked() ), SIGNAL( artistMode() ) );
+    connect( ui->radioDetailed, SIGNAL( clicked() ), SIGNAL( flatMode() ) );
+    connect( ui->radioCloud, SIGNAL( clicked() ), SIGNAL( albumMode() ) );
+
+    setNumSources( 0 );
+    setNumTracks( 0 );
+    setNumArtists( 0 );
+    setNumShown( 0 );
+
+    onArtistMode();
+
+    connect( ViewManager::instance(), SIGNAL( numSourcesChanged( unsigned int ) ),
+                                        SLOT( setNumSources( unsigned int ) ) );
+
+    connect( ViewManager::instance(), SIGNAL( numTracksChanged( unsigned int ) ),
+                                        SLOT( setNumTracks( unsigned int ) ) );
+
+    connect( ViewManager::instance(), SIGNAL( numArtistsChanged( unsigned int ) ),
+                                        SLOT( setNumArtists( unsigned int ) ) );
+
+    connect( ViewManager::instance(), SIGNAL( numShownChanged( unsigned int ) ),
+                                        SLOT( setNumShown( unsigned int ) ) );
+
+    connect( ViewManager::instance(), SIGNAL( statsAvailable( bool ) ),
+                                        SLOT( setStatsVisible( bool ) ) );
+
+    connect( ViewManager::instance(), SIGNAL( modesAvailable( bool ) ),
+                                        SLOT( setModesVisible( bool ) ) );
+
+    connect( ViewManager::instance(), SIGNAL( filterAvailable( bool ) ),
+                                        SLOT( setFilterVisible( bool ) ) );
+
+    connect( ViewManager::instance(), SIGNAL( modeChanged( Tomahawk::PlaylistModes::ViewMode ) ),
+                                        SLOT( onModeChanged( Tomahawk::PlaylistModes::ViewMode ) ) );
+}
+
+
+TopBar::~TopBar()
+{
+    delete ui;
+}
+
+
+void
+TopBar::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+TopBar::resizeEvent( QResizeEvent* e )
+{
+    QWidget::resizeEvent( e );
+}
+
+
+void
+TopBar::fadeInDude( unsigned int i )
+{
+//    qDebug() << Q_FUNC_INFO << i;
+
+    QLabel* dude = m_dudes.at( i );
+    QPropertyAnimation* ani = new QPropertyAnimation( dude, "pos" );
+    ani->setDuration( 1000 );
+    ani->setEasingCurve( QEasingCurve::InQuad );
+    ani->setStartValue( QPoint( -10,0 ) );
+    ani->setEndValue( QPoint( DUDEX( i+1 ), 0 ) );
+
+    qDebug() << "Animating from" << ani->startValue() << "to" << ani->endValue();
+    connect( ani, SIGNAL( finished() ), ani, SLOT( deleteLater() ) );
+    ani->start();
+}
+
+
+void
+TopBar::fadeOutDude( unsigned int i )
+{
+//    qDebug() << Q_FUNC_INFO << i;
+
+    QLabel* dude = m_dudes.at( i );
+    QPropertyAnimation* ani = new QPropertyAnimation( dude, "pos" );
+    ani->setDuration( 1000 );
+    ani->setEasingCurve( QEasingCurve::OutQuad );
+    ani->setStartValue( dude->pos() );
+    ani->setEndValue( QPoint( -10, 0 ) );
+
+    qDebug() << "Animating from" << ani->startValue() << "to" << ani->endValue();
+    connect( ani, SIGNAL( finished() ), ani, SLOT( deleteLater() ) );
+    ani->start();
+}
+
+
+void
+TopBar::setNumSources( unsigned int i )
+{
+//    qDebug() << Q_FUNC_INFO << i;
+
+    // Dude0 Dude1 Dude2
+    ui->statsLabelNumSources->setText( QString( "%L1 %2" ).arg( i ).arg( tr( "Sources" ) ) );
+
+    if( ( m_sources >= MAXDUDES && i >= MAXDUDES ) || m_sources == i )
+    {
+        m_sources = i;
+        return;
+    }
+
+    if( i > m_sources )
+    {
+        for( unsigned int k = m_sources; k < MAXDUDES && k < i; ++k )
+        {
+            fadeInDude( k );
+        }
+        m_sources = i;
+    }
+    else
+    {
+        int k = qMin( (unsigned int)MAXDUDES - 1, m_sources - 1 );
+        do
+        {
+            fadeOutDude( k );
+            m_sources--;
+        } while( (unsigned int)k-- > i );
+
+        m_sources = i;
+    }
+}
+
+
+void
+TopBar::setNumTracks( unsigned int i )
+{
+    m_tracks = i;
+    ui->statsLabelNumTracks->setVal( i );
+}
+
+
+void
+TopBar::setNumArtists( unsigned int i )
+{
+    m_artists = i;
+    ui->statsLabelNumArtists->setVisible( m_artists > 0 );
+    ui->statsLabelNumArtists->setVal( i );
+}
+
+
+void
+TopBar::setNumShown( unsigned int i )
+{
+    m_shown = i;
+    ui->statsLabelNumShown->setVisible( m_shown != m_tracks && ui->statsLabelNumTracks->isVisible() );
+    ui->statsLabelNumShown->setText( QString( "%L1 %2" ).arg( i ).arg( tr( "Shown" ) ) );
+}
+
+
+void
+TopBar::addSource()
+{
+//    qDebug() << Q_FUNC_INFO;
+    setNumSources( m_sources + 1 );
+}
+
+
+void
+TopBar::removeSource()
+{
+//    qDebug() << Q_FUNC_INFO;
+    Q_ASSERT( m_sources > 0 );
+    setNumSources( m_sources - 1 );
+}
+
+
+void
+TopBar::setStatsVisible( bool b )
+{
+    foreach( QLabel* dude, m_dudes )
+        dude->setVisible( b );
+
+//    ui->statsLabelNumArtists->setVisible( b );
+//    ui->statsLabelNumShown->setVisible( b );
+    ui->statsLabelNumSources->setVisible( b );
+    ui->statsLabelNumTracks->setVisible( b );
+}
+
+
+void
+TopBar::setModesVisible( bool b )
+{
+    ui->widgetRadio->setVisible( b );
+}
+
+
+void
+TopBar::setFilterVisible( bool b )
+{
+    ui->filterEdit->setVisible( b );
+}
+
+
+void
+TopBar::setFilter( const QString& filter )
+{
+    ui->filterEdit->setText( filter );
+}
+
+
+void
+TopBar::onModeChanged( Tomahawk::PlaylistModes::ViewMode mode )
+{
+    qDebug() << Q_FUNC_INFO << mode;
+    switch ( mode )
+    {
+        case Tomahawk::PlaylistModes::Flat:
+            onFlatMode();
+            break;
+
+        case Tomahawk::PlaylistModes::Tree:
+            onArtistMode();
+            break;
+
+        case Tomahawk::PlaylistModes::Album:
+            onAlbumMode();
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+TopBar::onFlatMode()
+{
+    ui->radioDetailed->setChecked( true );
+}
+
+
+void
+TopBar::onArtistMode()
+{
+    ui->radioNormal->setChecked( true );
+}
+
+
+void
+TopBar::onAlbumMode()
+{
+    ui->radioCloud->setChecked( true );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/TopBar.h Added

@@ -0,0 +1,87 @@
+/* === 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
+ *   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 TOPBAR_H
+#define TOPBAR_H
+
+#include <QWidget>
+#include <QLabel>
+#include <QList>
+
+#include "ViewManager.h"
+#include "SourceList.h"
+#include "DllMacro.h"
+
+namespace Ui
+{
+    class TopBar;
+}
+
+class DLLEXPORT TopBar : public QWidget
+{
+Q_OBJECT
+
+public:
+    TopBar( QWidget* parent = 0 );
+    ~TopBar();
+
+signals:
+    void filterTextChanged( const QString& newtext );
+
+    void flatMode();
+    void artistMode();
+    void albumMode();
+
+public slots:
+    void setNumSources( unsigned int );
+    void setNumTracks( unsigned int );
+    void setNumArtists( unsigned int );
+    void setNumShown( unsigned int );
+
+    void setStatsVisible( bool b );
+    void setModesVisible( bool b );
+    void setFilterVisible( bool b );
+
+    void addSource();
+    void removeSource();
+
+    void setFilter( const QString& filter );
+
+private slots:
+    void onModeChanged( Tomahawk::PlaylistModes::ViewMode mode );
+    void onFlatMode();
+    void onArtistMode();
+    void onAlbumMode();
+
+protected:
+    void changeEvent( QEvent* e );
+    void resizeEvent( QResizeEvent* e );
+
+private:
+    void fadeOutDude( unsigned int i );
+    void fadeInDude( unsigned int i );
+
+    Ui::TopBar* ui;
+
+    unsigned int m_sources, m_tracks, m_artists, m_shown;
+    QList<QLabel*> m_dudes;
+
+    Tomahawk::source_ptr m_onesource;
+};
+
+#endif // TOPBAR_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/playlist/topbar/TopBar.ui Added

@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TopBar</class>
+ <widget class="QWidget" name="TopBar">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>809</width>
+    <height>45</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>38</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>4</number>
+   </property>
+   <item>
+    <widget class="QWidget" name="widgetMen" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>36</width>
+       <height>22</height>
+      </size>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">margin-top:3px;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="statsLabelNumSources">
+     <property name="styleSheet">
+      <string notr="true"/>
+     </property>
+     <property name="text">
+      <string>0 Sources</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer_3">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>5</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="AnimatedCounterLabel" name="statsLabelNumTracks">
+     <property name="text">
+      <string>0 Tracks</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer_4">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>5</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="AnimatedCounterLabel" name="statsLabelNumArtists">
+     <property name="text">
+      <string>0 Artists</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer_5">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>5</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QLabel" name="statsLabelNumShown">
+     <property name="text">
+      <string>0 Shown</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>149</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QWidget" name="widgetRadio" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>58</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>58</width>
+       <height>30</height>
+      </size>
+     </property>
+     <widget class="QRadioButton" name="radioNormal">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>29</width>
+        <height>30</height>
+       </rect>
+      </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>29</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>29</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+     <widget class="QRadioButton" name="radioCloud">
+      <property name="geometry">
+       <rect>
+        <x>58</x>
+        <y>0</y>
+        <width>29</width>
+        <height>30</height>
+       </rect>
+      </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>29</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>29</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+     <widget class="QRadioButton" name="radioDetailed">
+      <property name="geometry">
+       <rect>
+        <x>29</x>
+        <y>0</y>
+        <width>29</width>
+        <height>30</height>
+       </rect>
+      </property>
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>29</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>29</width>
+        <height>30</height>
+       </size>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>15</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="SearchLineEdit" name="filterEdit">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>150</width>
+       <height>27</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>150</width>
+       <height>27</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AnimatedCounterLabel</class>
+   <extends>QLabel</extends>
+   <header>widgets/AnimatedCounterLabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>SearchLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>playlist/topbar/SearchLineEdit.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/libtomahawk/resolvers/QtScriptResolver.cpp Added

@@ -0,0 +1,631 @@
+/* === 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
+ *   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 "QtScriptResolver.h"
+
+#include "Artist.h"
+#include "Album.h"
+#include "config.h"
+#include "Pipeline.h"
+#include "SourceList.h"
+
+#include "network/Servent.h"
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+
+#include <QtGui/QMessageBox>
+
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+
+#include <QtCore/QMetaProperty>
+#include <QtCore/QCryptographicHash>
+
+// FIXME: bloody hack, remove this for 0.3
+// this one adds new functionality to old resolvers
+#define RESOLVER_LEGACY_CODE "var resolver = Tomahawk.resolver.instance ? Tomahawk.resolver.instance : TomahawkResolver;"
+// this one keeps old code invokable
+#define RESOLVER_LEGACY_CODE2 "var resolver = Tomahawk.resolver.instance ? Tomahawk.resolver.instance : window;"
+
+
+QtScriptResolverHelper::QtScriptResolverHelper( const QString& scriptPath, QtScriptResolver* parent )
+    : QObject( parent )
+{
+    m_scriptPath = scriptPath;
+    m_resolver = parent;
+}
+
+
+QByteArray
+QtScriptResolverHelper::readRaw( const QString& fileName )
+{
+    QString path = QFileInfo( m_scriptPath ).absolutePath();
+    // remove directories
+    QString cleanedFileName = QFileInfo( fileName ).fileName();
+    QString absoluteFilePath = path.append( "/" ).append( cleanedFileName );
+
+    QFile file( absoluteFilePath );
+    if ( !file.exists() )
+    {
+        Q_ASSERT(false);
+        return QByteArray();
+    }
+
+    file.open( QIODevice::ReadOnly );
+    return file.readAll();
+}
+
+
+QString
+QtScriptResolverHelper::compress( const QString& data )
+{
+    QByteArray comp = qCompress( data.toLatin1(), 9 );
+    return comp.toBase64();
+}
+
+
+QString
+QtScriptResolverHelper::readCompressed( const QString& fileName )
+{
+    return compress( readRaw( fileName ) );
+}
+
+
+QString
+QtScriptResolverHelper::readBase64( const QString& fileName )
+{
+    return readRaw( fileName ).toBase64();
+}
+
+
+QVariantMap
+QtScriptResolverHelper::resolverData()
+{
+    QVariantMap resolver;
+    resolver"config" = m_resolverConfig;
+    resolver"scriptPath" = m_scriptPath;
+    return resolver;
+}
+
+
+void
+QtScriptResolverHelper::log( const QString& message )
+{
+    tLog() << m_scriptPath << ":" << message;
+}
+
+
+void
+QtScriptResolverHelper::addTrackResults( const QVariantMap& results )
+{
+    qDebug() << "Resolver reporting results:" << results;
+    QList< Tomahawk::result_ptr > tracks = m_resolver->parseResultVariantList( results.value("results").toList() );
+
+    QString qid = results.value("qid").toString();
+
+    Tomahawk::Pipeline::instance()->reportResults( qid, tracks );
+}
+
+
+void
+QtScriptResolverHelper::setResolverConfig( const QVariantMap& config )
+{
+    m_resolverConfig = config;
+}
+
+
+QString
+QtScriptResolverHelper::hmac( const QByteArray& key, const QByteArray &input )
+{
+#ifdef QCA2_FOUND
+    if ( !QCA::isSupported( "hmac(md5)" ) )
+    {
+        tLog() << "HMAC(md5) not supported with qca-ossl plugin, or qca-ossl plugin is not installed! Unable to generate signature!";
+        return QByteArray();
+    }
+
+    QCA::MessageAuthenticationCode md5hmac1( "hmac(md5)", QCA::SecureArray() );
+    QCA::SymmetricKey keyObject( key );
+    md5hmac1.setup( keyObject );
+
+    md5hmac1.update( QCA::SecureArray( input ) );
+    QCA::SecureArray resultArray = md5hmac1.final();
+
+    QString result = QCA::arrayToHex( resultArray.toByteArray() );
+    return result.toUtf8();
+#else
+    tLog() << "Tomahawk compiled without QCA support, cannot generate HMAC signature";
+    return QString();
+#endif
+}
+
+
+QString
+QtScriptResolverHelper::md5( const QByteArray& input )
+{
+    QByteArray const digest = QCryptographicHash::hash( input, QCryptographicHash::Md5 );
+    return QString::fromLatin1( digest.toHex() );
+}
+
+
+void
+QtScriptResolverHelper::addCustomUrlHandler( const QString& protocol, const QString& callbackFuncName )
+{
+    boost::function<QSharedPointer<QIODevice>(Tomahawk::result_ptr)> fac = boost::bind( &QtScriptResolverHelper::customIODeviceFactory, this, _1 );
+    Servent::instance()->registerIODeviceFactory( protocol, fac );
+
+    m_urlCallback = callbackFuncName;
+}
+
+
+QByteArray
+QtScriptResolverHelper::base64Encode( const QByteArray& input )
+{
+    return input.toBase64();
+}
+
+
+QByteArray
+QtScriptResolverHelper::base64Decode( const QByteArray& input )
+{
+    return QByteArray::fromBase64( input );
+}
+
+
+QSharedPointer< QIODevice >
+QtScriptResolverHelper::customIODeviceFactory( const Tomahawk::result_ptr& result )
+{
+    QString getUrl = QString( "Tomahawk.resolver.instance.%1( '%2' );" ).arg( m_urlCallback )
+                                                                        .arg( QString( QUrl( result->url() ).toEncoded() ) );
+
+    QString urlStr = m_resolver->m_engine->mainFrame()->evaluateJavaScript( getUrl ).toString();
+
+    if ( urlStr.isEmpty() )
+        return QSharedPointer< QIODevice >();
+
+    QUrl url = QUrl::fromEncoded( urlStr.toUtf8() );
+    QNetworkRequest req( url );
+    tDebug() << "Creating a QNetowrkReply with url:" << req.url().toString();
+    QNetworkReply* reply = TomahawkUtils::nam()->get( req );
+    return QSharedPointer<QIODevice>( reply, &QObject::deleteLater );
+}
+
+
+void
+ScriptEngine::javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& sourceID )
+{
+    tLog() << "JAVASCRIPT:" << m_scriptPath << message << lineNumber << sourceID;
+#ifndef QT_NO_DEBUG
+    QMessageBox::critical( 0, "Script Resolver Error", QString( "%1 %2 %3 %4" ).arg( m_scriptPath ).arg( message ).arg( lineNumber ).arg( sourceID ) );
+#endif
+}
+
+
+QtScriptResolver::QtScriptResolver( const QString& scriptPath )
+    : Tomahawk::ExternalResolverGui( scriptPath )
+    , m_ready( false )
+    , m_stopped( true )
+    , m_error( Tomahawk::ExternalResolver::NoError )
+    , m_resolverHelper( new QtScriptResolverHelper( scriptPath, this ) )
+{
+    tLog() << Q_FUNC_INFO << "Loading JS resolver:" << scriptPath;
+
+    m_engine = new ScriptEngine( this );
+    m_name = QFileInfo( filePath() ).baseName();
+
+    if ( !QFile::exists( filePath() ) )
+    {
+        tLog() << Q_FUNC_INFO << "Failed loading JavaScript resolver:" << scriptPath;
+        m_error = Tomahawk::ExternalResolver::FileNotFound;
+    }
+    else
+    {
+        init();
+    }
+}
+
+
+QtScriptResolver::~QtScriptResolver()
+{
+    if ( !m_stopped )
+        stop();
+
+    delete m_engine;
+}
+
+
+Tomahawk::ExternalResolver* QtScriptResolver::factory( const QString& scriptPath )
+{
+    ExternalResolver* res = 0;
+
+    const QFileInfo fi( scriptPath );
+    if ( fi.suffix() == "js" || fi.suffix() == "script" )
+    {
+        res = new QtScriptResolver( scriptPath );
+        tLog() << Q_FUNC_INFO << scriptPath << "Loaded.";
+    }
+
+    return res;
+}
+
+
+bool
+QtScriptResolver::running() const
+{
+    return m_ready && !m_stopped;
+}
+
+
+void
+QtScriptResolver::reload()
+{
+    if ( QFile::exists( filePath() ) )
+    {
+        init();
+        m_error = Tomahawk::ExternalResolver::NoError;
+    } else
+    {
+        m_error = Tomahawk::ExternalResolver::FileNotFound;
+    }
+}
+
+
+void
+QtScriptResolver::init()
+{
+    QFile scriptFile( filePath() );
+    if( !scriptFile.open( QIODevice::ReadOnly ) )
+    {
+        qWarning() << "Failed to read contents of file:" << filePath() << scriptFile.errorString();
+        return;
+    }
+    const QByteArray scriptContents = scriptFile.readAll();
+
+    m_engine->mainFrame()->setHtml( "<html><body></body></html>", QUrl( "file:///invalid/file/for/security/policy" ) );
+
+    // add c++ part of tomahawk javascript library
+    m_engine->mainFrame()->addToJavaScriptWindowObject( "Tomahawk", m_resolverHelper );
+
+    // add rest of it
+    m_engine->setScriptPath( "tomahawk.js" );
+    QFile jslib( RESPATH "js/tomahawk.js" );
+    jslib.open( QIODevice::ReadOnly );
+    m_engine->mainFrame()->evaluateJavaScript( jslib.readAll() );
+    jslib.close();
+
+    // add resolver
+    m_engine->setScriptPath( filePath() );
+    m_engine->mainFrame()->evaluateJavaScript( scriptContents );
+
+    // init resolver
+    resolverInit();
+
+    QVariantMap m = resolverSettings();
+    m_name    = m.value( "name" ).toString();
+    m_weight  = m.value( "weight", 0 ).toUInt();
+    m_timeout = m.value( "timeout", 25 ).toUInt() * 1000;
+
+    // load config widget and apply settings
+    loadUi();
+    QVariantMap config = resolverUserConfig();
+    fillDataInWidgets( config );
+
+    qDebug() << "JS" << filePath() << "READY," << "name" << m_name << "weight" << m_weight << "timeout" << m_timeout;
+
+    m_ready = true;
+}
+
+
+void
+QtScriptResolver::start()
+{
+    m_stopped = false;
+    if ( m_ready )
+        Tomahawk::Pipeline::instance()->addResolver( this );
+    else
+        init();
+}
+
+
+Tomahawk::ExternalResolver::ErrorState
+QtScriptResolver::error() const
+{
+    return m_error;
+}
+
+
+void
+QtScriptResolver::resolve( const Tomahawk::query_ptr& query )
+{
+    if ( QThread::currentThread() != thread() )
+    {
+        QMetaObject::invokeMethod( this, "resolve", Qt::QueuedConnection, Q_ARG(Tomahawk::query_ptr, query) );
+        return;
+    }
+
+    QString eval;
+    if ( !query->isFullTextQuery() )
+    {
+        eval = QString( RESOLVER_LEGACY_CODE2 "resolver.resolve( '%1', '%2', '%3', '%4' );" )
+                  .arg( query->id().replace( "'", "\\'" ) )
+                  .arg( query->artist().replace( "'", "\\'" ) )
+                  .arg( query->album().replace( "'", "\\'" ) )
+                  .arg( query->track().replace( "'", "\\'" ) );
+    }
+    else
+    {
+        eval = QString( "if(Tomahawk.resolver.instance !== undefined) {"
+                        "   resolver.search( '%1', '%2' );"
+                        "} else {"
+                        "   resolve( '%1', '', '', '%2' );"
+                        "}"
+                      )
+                  .arg( query->id().replace( "'", "\\'" ) )
+                  .arg( query->fullTextQuery().replace( "'", "\\'" ) );
+    }
+
+    QVariantMap m = m_engine->mainFrame()->evaluateJavaScript( eval ).toMap();
+    if ( m.isEmpty() )
+    {
+        // if the resolver doesn't return anything, async api is used
+        return;
+    }
+
+    qDebug() << "JavaScript Result:" << m;
+
+    const QString qid = query->id();
+    const QVariantList reslist = m.value( "results" ).toList();
+
+    QList< Tomahawk::result_ptr > results = parseResultVariantList( reslist );
+
+    Tomahawk::Pipeline::instance()->reportResults( qid, results );
+}
+
+
+QList< Tomahawk::result_ptr >
+QtScriptResolver::parseResultVariantList( const QVariantList& reslist )
+{
+    QList< Tomahawk::result_ptr > results;
+
+    foreach( const QVariant& rv, reslist )
+    {
+        QVariantMap m = rv.toMap();
+        if ( m.value( "artist" ).toString().trimmed().isEmpty() || m.value( "track" ).toString().trimmed().isEmpty() )
+            continue;
+
+        Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() );
+        Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false );
+        rp->setArtist( ap );
+        rp->setAlbum( Tomahawk::Album::get( ap, m.value( "album" ).toString(), false ) );
+        rp->setTrack( m.value( "track" ).toString() );
+        rp->setAlbumPos( m.value( "albumpos" ).toUInt() );
+        rp->setBitrate( m.value( "bitrate" ).toUInt() );
+        rp->setSize( m.value( "size" ).toUInt() );
+        rp->setRID( uuid() );
+        rp->setFriendlySource( name() );
+        rp->setScore( m.value( "score" ).toFloat() );
+        rp->setDiscNumber( m.value( "discnumber" ).toUInt() );
+
+        if ( m.contains( "year" ) )
+        {
+            QVariantMap attr;
+            attr "releaseyear"  = m.value( "year" );
+            rp->setAttributes( attr );
+        }
+
+        rp->setDuration( m.value( "duration", 0 ).toUInt() );
+        if ( rp->duration() <= 0 && m.contains( "durationString" ) )
+        {
+            QTime time = QTime::fromString( m.value( "durationString" ).toString(), "hh:mm:ss" );
+            rp->setDuration( time.secsTo( QTime( 0, 0 ) ) * -1 );
+        }
+
+        rp->setMimetype( m.value( "mimetype" ).toString() );
+        if ( rp->mimetype().isEmpty() )
+        {
+            rp->setMimetype( TomahawkUtils::extensionToMimetype( m.value( "extension" ).toString() ) );
+            Q_ASSERT( !rp->mimetype().isEmpty() );
+        }
+
+        rp->setResolvedBy( this );
+        results << rp;
+    }
+
+    return results;
+}
+
+
+void
+QtScriptResolver::stop()
+{
+    m_stopped = true;
+    Tomahawk::Pipeline::instance()->removeResolver( this );
+    emit stopped();
+}
+
+
+void
+QtScriptResolver::loadUi()
+{
+    QVariantMap m = m_engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE  "resolver.getConfigUi();" ).toMap();
+    m_dataWidgets = m"fields".toList();
+
+    bool compressed = m.value( "compressed", "false" ).toBool();
+    qDebug() << "Resolver has a preferences widget! compressed?" << compressed;
+
+    QByteArray uiData = m "widget" .toByteArray();
+
+    if( compressed )
+        uiData = qUncompress( QByteArray::fromBase64( uiData ) );
+    else
+        uiData = QByteArray::fromBase64( uiData );
+
+    QVariantMap images;
+    foreach(const QVariant& item, m "images" .toList())
+    {
+        QString key = item.toMap().keys().first();
+        QVariant value = item.toMap().value(key);
+        imageskey = value;
+    }
+
+    if( m.contains( "images" ) )
+        uiData = fixDataImagePaths( uiData, compressed, images );
+
+    m_configWidget = QWeakPointer< QWidget >( widgetFromData( uiData, 0 ) );
+
+    emit changed();
+}
+
+
+QWidget*
+QtScriptResolver::configUI() const
+{
+    if( m_configWidget.isNull() )
+        return 0;
+    else
+        return m_configWidget.data();
+}
+
+
+void
+QtScriptResolver::saveConfig()
+{
+    QVariant saveData = loadDataFromWidgets();
+//    qDebug() << Q_FUNC_INFO << saveData;
+
+    m_resolverHelper->setResolverConfig( saveData.toMap() );
+    m_engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "resolver.saveUserConfig();" );
+}
+
+
+QWidget*
+QtScriptResolver::findWidget(QWidget* widget, const QString& objectName)
+{
+    if( !widget || !widget->isWidgetType() )
+        return 0;
+
+    if( widget->objectName() == objectName )
+        return widget;
+
+
+    foreach( QObject* child, widget->children() )
+    {
+        QWidget* found = findWidget(qobject_cast< QWidget* >( child ), objectName);
+
+        if( found )
+            return found;
+    }
+
+    return 0;
+}
+
+
+QVariant
+QtScriptResolver::widgetData(QWidget* widget, const QString& property)
+{
+    for( int i = 0; i < widget->metaObject()->propertyCount(); i++ )
+    {
+        if( widget->metaObject()->property( i ).name() == property )
+        {
+            return widget->property( property.toLatin1() );
+        }
+    }
+
+    return QVariant();
+}
+
+
+void
+QtScriptResolver::setWidgetData(const QVariant& value, QWidget* widget, const QString& property)
+{
+    for( int i = 0; i < widget->metaObject()->propertyCount(); i++ )
+    {
+        if( widget->metaObject()->property( i ).name() == property )
+        {
+            widget->metaObject()->property( i ).write( widget, value);
+            return;
+        }
+    }
+}
+
+
+QVariantMap
+QtScriptResolver::loadDataFromWidgets()
+{
+    QVariantMap saveData;
+    foreach(const QVariant& dataWidget, m_dataWidgets)
+    {
+        QVariantMap data = dataWidget.toMap();
+
+        QString widgetName = data"widget".toString();
+        QWidget* widget= findWidget( m_configWidget.data(), widgetName );
+
+        QVariant value = widgetData( widget, data"property".toString() );
+
+        saveData data"name".toString()  = value;
+    }
+
+    return saveData;
+}
+
+
+void
+QtScriptResolver::fillDataInWidgets( const QVariantMap& data )
+{
+    foreach(const QVariant& dataWidget, m_dataWidgets)
+    {
+        QString widgetName = dataWidget.toMap()"widget".toString();
+        QWidget* widget= findWidget( m_configWidget.data(), widgetName );
+        if( !widget )
+        {
+            tLog() << Q_FUNC_INFO << "Widget specified in resolver was not found:" << widgetName;
+            Q_ASSERT(false);
+            return;
+        }
+
+        QString propertyName = dataWidget.toMap()"property".toString();
+        QString name = dataWidget.toMap()"name".toString();
+
+        setWidgetData( data name , widget, propertyName );
+    }
+}
+
+
+QVariantMap
+QtScriptResolver::resolverSettings()
+{
+    return m_engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "if(resolver.settings) resolver.settings; else getSettings(); " ).toMap();
+}
+
+
+QVariantMap
+QtScriptResolver::resolverUserConfig()
+{
+    return m_engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "resolver.getUserConfig();" ).toMap();
+}
+
+
+QVariantMap
+QtScriptResolver::resolverInit()
+{
+    return m_engine->mainFrame()->evaluateJavaScript( RESOLVER_LEGACY_CODE "resolver.init();" ).toMap();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/resolvers/QtScriptResolver.h Added

@@ -0,0 +1,181 @@
+/* === 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
+ *   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 QTSCRIPTRESOLVER_H
+#define QTSCRIPTRESOLVER_H
+
+#include "ExternalResolverGui.h"
+#include "Query.h"
+#include "utils/TomahawkUtils.h"
+#include "config.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QThread>
+#include <QtWebKit/QWebPage>
+#include <QtWebKit/QWebFrame>
+
+#ifdef QCA2_FOUND
+#include <QtCrypto>
+#endif
+
+#include "DllMacro.h"
+
+class QtScriptResolver;
+
+class DLLEXPORT QtScriptResolverHelper : public QObject
+{
+Q_OBJECT
+
+public:
+    QtScriptResolverHelper( const QString& scriptPath, QtScriptResolver* parent );
+    void setResolverConfig( const QVariantMap& config );
+
+    // Return a HMAC (md5) signature of the input text with the desired key
+    Q_INVOKABLE QString hmac( const QByteArray& key, const QByteArray& input );
+    Q_INVOKABLE QString md5( const QByteArray& input );
+
+    Q_INVOKABLE void addCustomUrlHandler( const QString& protocol, const QString& callbackFuncName );
+
+    Q_INVOKABLE QByteArray base64Encode( const QByteArray& input );
+    Q_INVOKABLE QByteArray base64Decode( const QByteArray& input );
+
+    QSharedPointer<QIODevice> customIODeviceFactory( const Tomahawk::result_ptr& result );
+
+public slots:
+    QByteArray readRaw( const QString& fileName );
+    QString readBase64( const QString& fileName );
+    QString readCompressed( const QString& fileName );
+
+    QString compress( const QString& data );
+    QVariantMap resolverData();
+
+    void log( const QString& message );
+    bool fakeEnv() { return false; }
+
+    void addTrackResults( const QVariantMap& results );
+
+private:
+    QString m_scriptPath, m_urlCallback;
+    QVariantMap m_resolverConfig;
+    QtScriptResolver* m_resolver;
+#ifdef QCA2_FOUND
+    QCA::Initializer m_qcaInit;
+#endif
+};
+
+class DLLEXPORT ScriptEngine : public QWebPage
+{
+Q_OBJECT
+
+public:
+    explicit ScriptEngine( QtScriptResolver* parent )
+        : QWebPage( (QObject*) parent )
+        , m_parent( parent )
+    {
+        settings()->setAttribute( QWebSettings::OfflineStorageDatabaseEnabled, true );
+        settings()->setOfflineStoragePath( TomahawkUtils::appDataDir().path() );
+        settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);
+        settings()->setLocalStoragePath( TomahawkUtils::appDataDir().path() );
+        settings()->setAttribute( QWebSettings::LocalStorageDatabaseEnabled, true );
+        settings()->setAttribute( QWebSettings::LocalContentCanAccessFileUrls, true );
+        settings()->setAttribute( QWebSettings::LocalContentCanAccessRemoteUrls, true );
+    }
+
+    void setScriptPath( const QString& scriptPath )
+    {
+        m_scriptPath = scriptPath;
+    }
+
+public slots:
+    bool shouldInterruptJavaScript()
+    {
+        return true;
+    }
+
+protected:
+    virtual void javaScriptConsoleMessage( const QString& message, int lineNumber, const QString& sourceID );
+
+private:
+    QtScriptResolver* m_parent;
+    QString m_scriptPath;
+};
+
+
+class DLLEXPORT QtScriptResolver : public Tomahawk::ExternalResolverGui
+{
+Q_OBJECT
+
+friend class ::QtScriptResolverHelper;
+
+public:
+    explicit QtScriptResolver( const QString& scriptPath );
+    virtual ~QtScriptResolver();
+    static ExternalResolver* factory( const QString& scriptPath );
+
+    virtual QString name() const         { return m_name; }
+    virtual unsigned int weight() const  { return m_weight; }
+    virtual unsigned int timeout() const { return m_timeout; }
+
+    virtual QWidget* configUI() const;
+    virtual void saveConfig();
+
+    virtual ExternalResolver::ErrorState error() const;
+    virtual bool running() const;
+    virtual void reload();
+
+public slots:
+    virtual void resolve( const Tomahawk::query_ptr& query );
+    virtual void stop();
+    virtual void start();
+
+signals:
+    void stopped();
+
+private:
+    void init();
+
+    void loadUi();
+    QWidget* findWidget( QWidget* widget, const QString& objectName );
+    void setWidgetData( const QVariant& value, QWidget* widget, const QString& property );
+    QVariant widgetData( QWidget* widget, const QString& property );
+    QVariantMap loadDataFromWidgets();
+    void fillDataInWidgets( const QVariantMap& data );
+
+    // encapsulate javascript calls
+    QVariantMap resolverSettings();
+    QVariantMap resolverUserConfig();
+    QVariantMap resolverInit();
+
+    QList< Tomahawk::result_ptr > parseResultVariantList( const QVariantList& reslist );
+
+    ScriptEngine* m_engine;
+
+    QString m_name;
+    unsigned int m_weight, m_timeout;
+
+    bool m_ready, m_stopped;
+    ExternalResolver::ErrorState m_error;
+
+    QtScriptResolverHelper* m_resolverHelper;
+    QWeakPointer< QWidget > m_configWidget;
+    QList< QVariant > m_dataWidgets;
+};
+
+#endif // QTSCRIPTRESOLVER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/resolvers/ScriptResolver.cpp Added

@@ -0,0 +1,495 @@
+/* === 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
+ *   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 "ScriptResolver.h"
+
+#include <QtEndian>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkProxy>
+
+#include "Artist.h"
+#include "Album.h"
+#include "Pipeline.h"
+#include "SourceList.h"
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+#ifdef Q_OS_WIN
+#include <shlwapi.h>
+#endif
+
+ScriptResolver::ScriptResolver( const QString& exe )
+    : Tomahawk::ExternalResolverGui( exe )
+    , m_num_restarts( 0 )
+    , m_msgsize( 0 )
+    , m_ready( false )
+    , m_stopped( true )
+    , m_configSent( false )
+    , m_deleting( false )
+    , m_error( Tomahawk::ExternalResolver::NoError )
+{
+    tLog() << Q_FUNC_INFO << "Created script resolver:" << exe;
+    connect( &m_proc, SIGNAL( readyReadStandardError() ), SLOT( readStderr() ) );
+    connect( &m_proc, SIGNAL( readyReadStandardOutput() ), SLOT( readStdout() ) );
+    connect( &m_proc, SIGNAL( finished( int, QProcess::ExitStatus ) ), SLOT( cmdExited( int, QProcess::ExitStatus ) ) );
+
+    startProcess();
+
+    if ( !TomahawkUtils::nam() )
+        return;
+
+    // set the name to the binary, if we launch properly we'll get the name the resolver reports
+    m_name = QFileInfo( filePath() ).baseName();
+}
+
+
+ScriptResolver::~ScriptResolver()
+{
+    disconnect( &m_proc, SIGNAL( finished( int, QProcess::ExitStatus ) ), this, SLOT( cmdExited( int, QProcess::ExitStatus ) ) );
+    m_deleting = true;
+
+    QVariantMap msg;
+    msg "_msgtype"  = "quit";
+    sendMessage( msg );
+
+    bool finished = m_proc.state() != QProcess::Running || m_proc.waitForFinished( 2500 ); // might call handleMsg
+
+    Tomahawk::Pipeline::instance()->removeResolver( this );
+
+    if ( !finished || m_proc.state() == QProcess::Running )
+    {
+        qDebug() << "External resolver didn't exit after waiting 2s for it to die, killing forcefully";
+#ifdef Q_OS_WIN
+        m_proc.kill();
+#else
+        m_proc.terminate();
+#endif
+    }
+
+    if ( !m_configWidget.isNull() )
+        delete m_configWidget.data();
+}
+
+
+Tomahawk::ExternalResolver*
+ScriptResolver::factory( const QString& exe )
+{
+    ExternalResolver* res = 0;
+
+    const QFileInfo fi( exe );
+    if ( fi.suffix() != "js" && fi.suffix() != "script" )
+    {
+        res = new ScriptResolver( exe );
+        tLog() << Q_FUNC_INFO << exe << "Loaded.";
+    }
+
+    return res;
+}
+
+
+void
+ScriptResolver::start()
+{
+    m_stopped = false;
+    if ( m_ready )
+        Tomahawk::Pipeline::instance()->addResolver( this );
+    else if ( !m_configSent )
+        sendConfig();
+    // else, we've sent our config msg so are waiting for the resolver to react
+}
+
+
+void
+ScriptResolver::sendConfig()
+{
+    // Send a configutaion message with any information the resolver might need
+    // For now, only the proxy information is sent
+    QVariantMap m;
+    m.insert( "_msgtype", "config" );
+
+    m_configSent = true;
+
+    TomahawkUtils::NetworkProxyFactory* factory = dynamic_cast<TomahawkUtils::NetworkProxyFactory*>( TomahawkUtils::nam()->proxyFactory() );
+    QNetworkProxy proxy = factory->proxy();
+    QString proxyType = ( proxy.type() == QNetworkProxy::Socks5Proxy ? "socks5" : "none" );
+    m.insert( "proxytype", proxyType );
+    m.insert( "proxyhost", proxy.hostName() );
+    m.insert( "proxyport", proxy.port() );
+    m.insert( "proxyuser", proxy.user() );
+    m.insert( "proxypass", proxy.password() );
+
+    // QJson sucks
+    QVariantList hosts;
+    foreach ( const QString& host, factory->noProxyHosts() )
+        hosts << host;
+    m.insert( "noproxyhosts", hosts );
+
+    QByteArray data = m_serializer.serialize( m );
+    sendMsg( data );
+}
+
+
+void
+ScriptResolver::reload()
+{
+    startProcess();
+}
+
+
+bool
+ScriptResolver::running() const
+{
+    return !m_stopped;
+}
+
+
+void
+ScriptResolver::sendMessage( const QVariantMap& map )
+{
+    QByteArray data = m_serializer.serialize( map );
+    sendMsg( data );
+}
+
+
+void
+ScriptResolver::readStderr()
+{
+    tLog() << "SCRIPT_STDERR" << filePath() << m_proc.readAllStandardError();
+}
+
+
+ScriptResolver::ErrorState
+ScriptResolver::error() const
+{
+    return m_error;
+}
+
+
+void
+ScriptResolver::readStdout()
+{
+    if ( m_msgsize == 0 )
+    {
+        if ( m_proc.bytesAvailable() < 4 )
+            return;
+
+        quint32 len_nbo;
+        m_proc.read( (char*) &len_nbo, 4 );
+        m_msgsize = qFromBigEndian( len_nbo );
+    }
+
+    if ( m_msgsize > 0 )
+    {
+        m_msg.append( m_proc.read( m_msgsize - m_msg.length() ) );
+    }
+
+    if ( m_msgsize == (quint32) m_msg.length() )
+    {
+        handleMsg( m_msg );
+        m_msgsize = 0;
+        m_msg.clear();
+
+        if ( m_proc.bytesAvailable() )
+            QTimer::singleShot( 0, this, SLOT( readStdout() ) );
+    }
+}
+
+
+void
+ScriptResolver::sendMsg( const QByteArray& msg )
+{
+//     qDebug() << Q_FUNC_INFO << m_ready << msg << msg.length();
+    if ( !m_proc.isOpen() )
+        return;
+
+    quint32 len;
+    qToBigEndian( msg.length(), (uchar*) &len );
+    m_proc.write( (const char*) &len, 4 );
+    m_proc.write( msg );
+}
+
+
+void
+ScriptResolver::handleMsg( const QByteArray& msg )
+{
+//    qDebug() << Q_FUNC_INFO << msg.size() << QString::fromAscii( msg );
+
+    // Might be called from waitForFinished() in ~ScriptResolver, no database in that case, abort.
+    if ( m_deleting )
+        return;
+
+    bool ok;
+    QVariant v = m_parser.parse( msg, &ok );
+    if ( !ok || v.type() != QVariant::Map )
+    {
+        Q_ASSERT(false);
+        return;
+    }
+    QVariantMap m = v.toMap();
+    QString msgtype = m.value( "_msgtype" ).toString();
+
+    if ( msgtype == "settings" )
+    {
+        doSetup( m );
+        return;
+    }
+    else if ( msgtype == "confwidget" )
+    {
+        setupConfWidget( m );
+        return;
+    }
+    else if ( msgtype == "results" )
+    {
+        const QString qid = m.value( "qid" ).toString();
+        QList< Tomahawk::result_ptr > results;
+        const QVariantList reslist = m.value( "results" ).toList();
+
+        foreach( const QVariant& rv, reslist )
+        {
+            QVariantMap m = rv.toMap();
+            tDebug( LOGVERBOSE ) << "Found result:" << m;
+            if ( m.value( "artist" ).toString().trimmed().isEmpty() || m.value( "track" ).toString().trimmed().isEmpty() )
+                continue;
+
+            Tomahawk::result_ptr rp = Tomahawk::Result::get( m.value( "url" ).toString() );
+            Tomahawk::artist_ptr ap = Tomahawk::Artist::get( m.value( "artist" ).toString(), false );
+            rp->setArtist( ap );
+            rp->setAlbum( Tomahawk::Album::get( ap, m.value( "album" ).toString(), false ) );
+            rp->setAlbumPos( m.value( "albumpos" ).toUInt() );
+            rp->setTrack( m.value( "track" ).toString() );
+            rp->setDuration( m.value( "duration" ).toUInt() );
+            rp->setBitrate( m.value( "bitrate" ).toUInt() );
+            rp->setSize( m.value( "size" ).toUInt() );
+            rp->setRID( uuid() );
+            rp->setFriendlySource( m_name );
+            rp->setYear( m.value( "year").toUInt() );
+            rp->setDiscNumber( m.value( "discnumber" ).toUInt() );
+
+            rp->setMimetype( m.value( "mimetype" ).toString() );
+            if ( rp->mimetype().isEmpty() )
+            {
+                rp->setMimetype( TomahawkUtils::extensionToMimetype( m.value( "extension" ).toString() ) );
+                Q_ASSERT( !rp->mimetype().isEmpty() );
+            }
+
+            rp->setResolvedBy( this );
+            results << rp;
+        }
+
+        Tomahawk::Pipeline::instance()->reportResults( qid, results );
+    }
+    else
+    {
+        // Unknown message, give up for custom implementations
+        emit customMessage( msgtype, m );
+    }
+}
+
+
+void
+ScriptResolver::cmdExited( int code, QProcess::ExitStatus status )
+{
+    m_ready = false;
+    tLog() << Q_FUNC_INFO << "SCRIPT EXITED, code" << code << "status" << status << filePath();
+    Tomahawk::Pipeline::instance()->removeResolver( this );
+
+    m_error = ExternalResolver::FailedToLoad;
+    emit changed();
+
+    if ( m_stopped )
+    {
+        tLog() << "*** Script resolver stopped ";
+        emit terminated();
+
+        return;
+    }
+
+    if ( m_num_restarts < 10 )
+    {
+        m_num_restarts++;
+        tLog() << "*** Restart num" << m_num_restarts;
+        startProcess();
+        sendConfig();
+    }
+    else
+    {
+        tLog() << "*** Reached max restarts, not restarting.";
+    }
+}
+
+
+void
+ScriptResolver::resolve( const Tomahawk::query_ptr& query )
+{
+    QVariantMap m;
+    m.insert( "_msgtype", "rq" );
+
+    m.insert( "resultHint", query->resultHint() );
+
+    if ( query->isFullTextQuery() )
+    {
+        m.insert( "fulltext", query->fullTextQuery() );
+        m.insert( "artist", query->artist() );
+        m.insert( "track", query->fullTextQuery() );
+        m.insert( "qid", query->id() );
+    }
+    else
+    {
+        m.insert( "artist", query->artist() );
+        m.insert( "track", query->track() );
+        m.insert( "qid", query->id() );
+    }
+
+    const QByteArray msg = m_serializer.serialize( QVariant( m ) );
+    sendMsg( msg );
+}
+
+
+void
+ScriptResolver::doSetup( const QVariantMap& m )
+{
+//    qDebug() << Q_FUNC_INFO << m;
+
+    m_name    = m.value( "name" ).toString();
+    m_weight  = m.value( "weight", 0 ).toUInt();
+    m_timeout = m.value( "timeout", 5 ).toUInt() * 1000;
+    qDebug() << "SCRIPT" << filePath() << "READY," << "name" << m_name << "weight" << m_weight << "timeout" << m_timeout;
+
+    m_ready = true;
+    m_configSent = false;
+    m_num_restarts = 0;
+
+    if ( !m_stopped )
+        Tomahawk::Pipeline::instance()->addResolver( this );
+
+    emit changed();
+}
+
+
+void
+ScriptResolver::setupConfWidget( const QVariantMap& m )
+{
+    bool compressed = m.value( "compressed", "false" ).toString() == "true";
+    qDebug() << "Resolver has a preferences widget! compressed?" << compressed;
+
+    QByteArray uiData = m "widget" .toByteArray();
+    if( compressed )
+        uiData = qUncompress( QByteArray::fromBase64( uiData ) );
+    else
+        uiData = QByteArray::fromBase64( uiData );
+
+    if ( m.contains( "images" ) )
+        uiData = fixDataImagePaths( uiData, compressed, m "images" .toMap() );
+    m_configWidget = QWeakPointer< QWidget >( widgetFromData( uiData, 0 ) );
+
+    emit changed();
+}
+
+
+void
+ScriptResolver::startProcess()
+{
+    if ( !QFile::exists( filePath() ) )
+        m_error = Tomahawk::ExternalResolver::FileNotFound;
+    else
+    {
+        m_error = Tomahawk::ExternalResolver::NoError;
+    }
+
+    const QFileInfo fi( filePath() );
+
+    QString interpreter;
+    // have to enclose in quotes if path contains spaces...
+    const QString runPath = QString( "\"%1\"" ).arg( filePath() );
+
+    QFile file( filePath() );
+    file.setPermissions( file.permissions() | QFile::ExeOwner | QFile::ExeGroup | QFile::ExeOther );
+
+#ifdef Q_OS_WIN
+    if ( fi.suffix().toLower() != "exe" )
+    {
+        DWORD dwSize = MAX_PATH;
+
+        wchar_t pathMAX_PATH = { 0 };
+        wchar_t *ext = (wchar_t *) ("." + fi.suffix()).utf16();
+
+        HRESULT hr = AssocQueryStringW(
+                (ASSOCF) 0,
+                ASSOCSTR_EXECUTABLE,
+                ext,
+                L"open",
+                path,
+                &dwSize
+        );
+
+        if ( ! FAILED( hr ) )
+        {
+            interpreter = QString( "\"%1\"" ).arg(QString::fromUtf16((const ushort *) path));
+        }
+    }
+#endif // Q_OS_WIN
+
+    if ( interpreter.isEmpty() )
+    {
+#ifndef Q_OS_WIN
+        const QFileInfo info( filePath() );
+        m_proc.setWorkingDirectory( info.absolutePath() );
+        tLog() << "Setting working dir:" << info.absolutePath();
+#endif
+        m_proc.start( runPath );
+    }
+    else
+        m_proc.start( interpreter, QStringList() << filePath() );
+
+    sendConfig();
+}
+
+
+void
+ScriptResolver::saveConfig()
+{
+    Q_ASSERT( !m_configWidget.isNull() );
+
+    QVariantMap m;
+    m.insert( "_msgtype", "setpref" );
+    QVariant widgets = configMsgFromWidget( m_configWidget.data() );
+    m.insert( "widgets", widgets );
+    QByteArray data = m_serializer.serialize( m );
+
+    sendMsg( data );
+}
+
+
+QWidget*
+ScriptResolver::configUI() const
+{
+    if ( m_configWidget.isNull() )
+        return 0;
+    else
+        return m_configWidget.data();
+}
+
+
+void
+ScriptResolver::stop()
+{
+    m_stopped = true;
+    Tomahawk::Pipeline::instance()->removeResolver( this );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/resolvers/ScriptResolver.h Added

@@ -0,0 +1,98 @@
+/* === 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
+ *   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 SCRIPTRESOLVER_H
+#define SCRIPTRESOLVER_H
+
+#include <QProcess>
+
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+#include <qjson/qobjecthelper.h>
+
+#include "Query.h"
+#include "ExternalResolverGui.h"
+#include "DllMacro.h"
+
+class QWidget;
+
+class DLLEXPORT ScriptResolver : public Tomahawk::ExternalResolverGui
+{
+Q_OBJECT
+
+public:
+    explicit ScriptResolver( const QString& exe );
+    virtual ~ScriptResolver();
+    static ExternalResolver* factory( const QString& exe );
+
+    virtual QString name() const            { return m_name; }
+    virtual unsigned int weight() const     { return m_weight; }
+    virtual unsigned int preference() const { return m_preference; }
+    virtual unsigned int timeout() const    { return m_timeout; }
+
+    virtual QWidget* configUI() const;
+    virtual void saveConfig();
+
+    virtual ExternalResolver::ErrorState error() const;
+    virtual void reload();
+
+    virtual bool running() const;
+
+    void sendMessage( const QVariantMap& map );
+
+signals:
+    void terminated();
+    void customMessage( const QString& msgType, const QVariantMap& msg );
+
+public slots:
+    virtual void stop();
+    virtual void resolve( const Tomahawk::query_ptr& query );
+    virtual void start();
+
+private slots:
+    void readStderr();
+    void readStdout();
+    void cmdExited( int code, QProcess::ExitStatus status );
+
+private:
+    void sendConfig();
+
+    void handleMsg( const QByteArray& msg );
+    void sendMsg( const QByteArray& msg );
+    void doSetup( const QVariantMap& m );
+    void setupConfWidget( const QVariantMap& m );
+
+    void startProcess();
+
+    QProcess m_proc;
+    QString m_name;
+    unsigned int m_weight, m_preference, m_timeout, m_num_restarts;
+    QWeakPointer< QWidget > m_configWidget;
+
+    quint32 m_msgsize;
+    QByteArray m_msg;
+
+    bool m_ready, m_stopped, m_configSent, m_deleting;
+    ExternalResolver::ErrorState m_error;
+
+    QJson::Parser m_parser;
+    QJson::Serializer m_serializer;
+};
+
+#endif // SCRIPTRESOLVER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sip/SipHandler.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/sip/SipHandler.cpp Changed

@@ -1,6 +1,8 @@
 /* === 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>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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
@@ -27,14 +29,16 @@
     #include <QMessageBox>
 #endif
 
-#include "functimeout.h"
+#include "FuncTimeout.h"
 
-#include "database/database.h"
-#include "network/controlconnection.h"
-#include "network/servent.h"
-#include "sourcelist.h"
-#include "tomahawksettings.h"
-#include "utils/logger.h"
+#include "database/Database.h"
+#include "database/DatabaseImpl.h"
+#include "network/ControlConnection.h"
+#include "network/Servent.h"
+#include "SourceList.h"
+#include "TomahawkSettings.h"
+#include "utils/Logger.h"
+#include "accounts/AccountManager.h"
 
 #include "config.h"
 
@@ -53,21 +57,15 @@
 
 SipHandler::SipHandler( QObject* parent )
     : QObject( parent )
-    , m_connected( false )
 {
     s_instance = this;
-
-    loadPluginFactories( findPluginFactories() );
-
-    connect( TomahawkSettings::instance(), SIGNAL( changed() ), SLOT( onSettingsChanged() ) );
 }
 
 
 SipHandler::~SipHandler()
 {
     qDebug() << Q_FUNC_INFO;
-    disconnectAll();
-    qDeleteAll( m_allPlugins );
+    s_instance = 0;
 }
 
 
@@ -91,123 +89,19 @@
 #endif
 
 const SipInfo
-SipHandler::sipInfo(const QString& peerId) const
+SipHandler::sipInfo( const QString& peerId ) const
 {
     return m_peersSipInfos.value( peerId );
 }
 
 const QString
-SipHandler::versionString(const QString& peerId) const
+SipHandler::versionString( const QString& peerId ) const
 {
     return m_peersSoftwareVersions.value( peerId );
 }
 
 
 void
-SipHandler::onSettingsChanged()
-{
-    checkSettings();
-}
-
-
-QStringList
-SipHandler::findPluginFactories()
-{
-    QStringList paths;
-    QList< QDir > pluginDirs;
-
-    QDir appDir( qApp->applicationDirPath() );
-    #ifdef Q_WS_MAC
-    if ( appDir.dirName() == "MacOS" )
-    {
-        // Development convenience-hack
-        appDir.cdUp();
-        appDir.cdUp();
-        appDir.cdUp();
-    }
-    #endif
-
-    QDir libDir( CMAKE_INSTALL_PREFIX "/lib" );
-
-    QDir lib64Dir( appDir );
-    lib64Dir.cdUp();
-    lib64Dir.cd( "lib64" );
-
-    pluginDirs << appDir << libDir << lib64Dir << QDir( qApp->applicationDirPath() );
-    foreach ( const QDir& pluginDir, pluginDirs )
-    {
-        qDebug() << "Checking directory for plugins:" << pluginDir;
-        foreach ( QString fileName, pluginDir.entryList( QStringList() << "*tomahawk_sip*.so" << "*tomahawk_sip*.dylib" << "*tomahawk_sip*.dll", QDir::Files ) )
-        {
-            if ( fileName.startsWith( "libtomahawk_sip" ) )
-            {
-                const QString path = pluginDir.absoluteFilePath( fileName );
-                if ( !paths.contains( path ) )
-                    paths << path;
-            }
-        }
-    }
-
-    return paths;
-}
-
-
-void
-SipHandler::loadPluginFactories( const QStringList& paths )
-{
-    foreach ( QString fileName, paths )
-    {
-        if ( !QLibrary::isLibrary( fileName ) )
-            continue;
-
-        qDebug() << "Trying to load plugin:" << fileName;
-        loadPluginFactory( fileName );
-    }
-}
-
-
-SipPlugin*
-SipHandler::createPlugin( const QString& factoryId )
-{
-    Q_ASSERT( m_pluginFactories.contains( factoryId ) );
-
-    SipPlugin* sip = m_pluginFactories factoryId ->createPlugin();
-    hookUpPlugin( sip );
-
-    emit pluginAdded( sip );
-    return sip;
-}
-
-
-SipPlugin*
-SipHandler::loadPlugin( const QString& pluginId )
-{
-    QString factoryName = factoryFromId( pluginId );
-
-    Q_ASSERT( m_pluginFactories.contains( factoryName ) );
-
-    SipPlugin* sip = m_pluginFactories factoryName ->createPlugin( pluginId );
-
-    // caller responsible for calling pluginAdded() and hookupPlugin
-    return sip;
-}
-
-
-void
-SipHandler::removePlugin( SipPlugin* p )
-{
-    p->disconnectPlugin();
-
-    m_allPlugins.removeAll( p );
-    m_enabledPlugins.removeAll( p );
-
-    TomahawkSettings::instance()->removeSipPlugin( p->pluginId() );
-
-    emit pluginRemoved( p );
-}
-
-
-void
 SipHandler::hookUpPlugin( SipPlugin* sip )
 {
     QObject::connect( sip, SIGNAL( peerOnline( QString ) ), SLOT( onPeerOnline( QString ) ) );
@@ -216,298 +110,55 @@
     QObject::connect( sip, SIGNAL( sipInfoReceived( QString, SipInfo ) ), SLOT( onSipInfo( QString, SipInfo ) ) );
     QObject::connect( sip, SIGNAL( softwareVersionReceived( QString, QString ) ), SLOT( onSoftwareVersion( QString, QString ) ) );
 
-    QObject::connect( sip, SIGNAL( error( int, QString ) ), SLOT( onError( int, QString ) ) );
-    QObject::connect( sip, SIGNAL( stateChanged( SipPlugin::ConnectionState ) ), SLOT( onStateChanged( SipPlugin::ConnectionState ) ) );
-
     QObject::connect( sip, SIGNAL( avatarReceived( QString, QPixmap ) ), SLOT( onAvatarReceived( QString, QPixmap ) ) );
     QObject::connect( sip, SIGNAL( avatarReceived( QPixmap ) ), SLOT( onAvatarReceived( QPixmap ) ) );
-}
-
-
-void
-SipHandler::loadPluginFactory( const QString& path )
-{
-    QPluginLoader loader( path );
-    QObject* plugin = loader.instance();
-    if ( !plugin )
-    {
-        qDebug() << "Error loading plugin:" << loader.errorString();
-    }
-
-    SipPluginFactory* sipfactory = qobject_cast<SipPluginFactory*>(plugin);
-    if ( sipfactory )
-    {
-        qDebug() << "Loaded plugin factory:" << loader.fileName() << sipfactory->factoryId() << sipfactory->prettyName();
-        m_pluginFactories sipfactory->factoryId()  = sipfactory;
-    } else
-    {
-        qDebug() << "Loaded invalid plugin.." << loader.fileName();
-    }
-}
-
-
-bool
-SipHandler::pluginLoaded( const QString& pluginId ) const
-{
-    foreach( SipPlugin* plugin, m_allPlugins )
-    {
-        if ( plugin->pluginId() == pluginId )
-            return true;
-    }
-
-    return false;
-}
-
-
-void
-SipHandler::checkSettings()
-{
-    foreach( SipPlugin* sip, m_allPlugins )
-    {
-        sip->checkSettings();
-    }
-}
-
-
-void
-SipHandler::addSipPlugin( SipPlugin* p, bool enabled, bool startup )
-{
-    m_allPlugins << p;
-
-    hookUpPlugin( p );
-    if ( enabled )
-    {
-        p->connectPlugin( startup );
-        m_enabledPlugins << p;
-    }
-
-    emit pluginAdded( p );
-}
-
-
-void
-SipHandler::removeSipPlugin( SipPlugin* p )
-{
-    p->disconnectPlugin();
-    p->deletePlugin();
-
-    emit pluginRemoved( p );
-    // emit first so sipmodel can find the indexOf
-
-    TomahawkSettings::instance()->removeSipPlugin( p->pluginId() );
-    m_allPlugins.removeAll( p );
-    m_enabledPlugins.removeAll( p );
-}
-
-
-bool
-SipHandler::hasPluginType( const QString& factoryId ) const
-{
-    foreach( SipPlugin* p, m_allPlugins ) {
-        if( factoryFromId( p->pluginId() ) == factoryId )
-            return true;
-    }
-    return false;
-}
-
-
-void
-SipHandler::loadFromConfig( bool startup )
-{
-    QStringList pluginIds = TomahawkSettings::instance()->sipPlugins();
-    QStringList enabled = TomahawkSettings::instance()->enabledSipPlugins();
-    foreach( const QString& pluginId, pluginIds )
-    {
-        QString pluginFactory = factoryFromId( pluginId );
-        if( m_pluginFactories.contains( pluginFactory ) )
-        {
-            SipPlugin* p = loadPlugin( pluginId );
-            addSipPlugin( p, enabled.contains( pluginId ), startup );
-        }
-    }
-    m_connected = true;
-}
 
-
-void
-SipHandler::connectAll()
-{
-    foreach( SipPlugin* sip, m_enabledPlugins )
-    {
-        sip->connectPlugin();
-    }
-    m_connected = true;
-}
-
-
-void
-SipHandler::disconnectAll()
-{
-    foreach( SipPlugin* p, m_connectedPlugins )
-        p->disconnectPlugin();
-
-    SourceList::instance()->removeAllRemote();
-    m_connected = false;
-}
-
-
-void
-SipHandler::disablePlugin( SipPlugin* p )
-{
-    Q_ASSERT( m_enabledPlugins.contains( p ) );
-
-    TomahawkSettings::instance()->disableSipPlugin( p->pluginId() );
-    p->disconnectPlugin();
-
-    m_enabledPlugins.removeAll( p );
-}
-
-
-void
-SipHandler::enablePlugin( SipPlugin* p )
-{
-    Q_ASSERT( !m_enabledPlugins.contains( p ) );
-    p->connectPlugin();
-
-    TomahawkSettings::instance()->enableSipPlugin( p->pluginId() );
-    m_enabledPlugins << p;
-}
-
-
-void
-SipHandler::connectPlugin( bool startup, const QString &pluginId )
-{
-#ifndef ENABLE_HEADLESS
-    if ( !TomahawkSettings::instance()->acceptedLegalWarning() )
-    {
-        int result = QMessageBox::question(
-            //TomahawkApp::instance()->mainWindow(),
-            0, tr( "Legal Warning" ),
-            tr( "By pressing I Agree below, you agree that your use of Tomahawk will be in accordance with any applicable laws, including copyright and intellectual property laws, in effect in your country of residence, and indemnify the Tomahawk developers and project from liability should you choose to break those laws.\n\nFor more information, please see http://gettomahawk.com/legal" ),
-            tr( "I Do Not Agree" ), tr( "I Agree" )
-        );
-        if ( result != 1 )
-            return;
-        else
-            TomahawkSettings::instance()->setAcceptedLegalWarning( true );
-    }
-#endif
-    foreach( SipPlugin* sip, m_allPlugins )
-    {
-        if ( sip->pluginId() == pluginId )
-        {
-            Q_ASSERT( m_enabledPlugins.contains( sip ) ); // make sure the plugin we're connecting is enabled. should always be the case
-            //each sip should refreshProxy() or take care of that function in some other way during connection
-            sip->connectPlugin( startup );
-        }
-    }
-}
-
-
-void
-SipHandler::disconnectPlugin( const QString &pluginName )
-{
-    foreach( SipPlugin* sip, m_connectedPlugins )
-    {
-        if ( sip->name() == pluginName )
-            sip->disconnectPlugin();
-    }
-}
-
-
-QList< SipPlugin* >
-SipHandler::allPlugins() const
-{
-    return m_allPlugins;
-}
-
-
-QList< SipPlugin* >
-SipHandler::enabledPlugins() const
-{
-    return m_enabledPlugins;
-}
-
-
-QList< SipPlugin* >
-SipHandler::connectedPlugins() const
-{
-    return m_connectedPlugins;
-}
-
-
-QList< SipPluginFactory* >
-SipHandler::pluginFactories() const
-{
-    return m_pluginFactories.values();
+    QObject::connect( sip->account(), SIGNAL( configurationChanged() ), sip, SLOT( configurationChanged() ) );
 }
 
 
 void
-SipHandler::toggleConnect()
-{
-    if( m_connected )
-        disconnectAll();
-    else
-        connectAll();
-}
-
-
-void
-SipHandler::refreshProxy()
-{
-    qDebug() << Q_FUNC_INFO;
-
-    foreach( SipPlugin* sip, m_allPlugins )
-        sip->refreshProxy();
-}
-
-
-void
-SipHandler::onPeerOnline( const QString& jid )
+SipHandler::onPeerOnline( const QString& peerId )
 {
 //    qDebug() << Q_FUNC_INFO;
-    tDebug() << "SIP online:" << jid;
+    tDebug() << "SIP online:" << peerId;
 
     SipPlugin* sip = qobject_cast<SipPlugin*>(sender());
 
-    QVariantMap m;
+    SipInfo info;
     if( Servent::instance()->visibleExternally() )
     {
         QString key = uuid();
         ControlConnection* conn = new ControlConnection( Servent::instance(), QString() );
 
-        const QString& nodeid = Database::instance()->dbid();
-        conn->setName( jid.left( jid.indexOf( "/" ) ) );
+        const QString& nodeid = Database::instance()->impl()->dbid();
+        conn->setName( peerId.left( peerId.indexOf( "/" ) ) );
         conn->setId( nodeid );
 
         Servent::instance()->registerOffer( key, conn );
-        m"visible" = true;
-        m"ip" = Servent::instance()->externalAddress();
-        m"port" = Servent::instance()->externalPort();
-        m"key" = key;
-        m"uniqname" = nodeid;
+        info.setVisible( true );
+        info.setHost( Servent::instance()->externalAddress() );
+        info.setPort( Servent::instance()->externalPort() );
+        info.setKey( key );
+        info.setUniqname( nodeid );
 
-        qDebug() << "Asking them to connect to us:" << m;
+        tDebug() << "Asking them to connect to us:" << info;
     }
     else
     {
-        m"visible" = false;
-        qDebug() << "We are not visible externally:" << m;
+        info.setVisible( false );
+        tDebug() << "We are not visible externally:" << info;
     }
 
-    QJson::Serializer ser;
-    QByteArray ba = ser.serialize( m );
-
-    sip->sendMsg( jid, QString::fromAscii( ba ) );
+    sip->sendMsg( peerId, info );
 }
 
 
 void
-SipHandler::onPeerOffline( const QString& jid )
+SipHandler::onPeerOffline( const QString& peerId )
 {
 //    qDebug() << Q_FUNC_INFO;
-    qDebug() << "SIP offline:" << jid;
+    tDebug() << "SIP offline:" << peerId;
 }
 
 
@@ -516,6 +167,11 @@
 {
     tDebug() << Q_FUNC_INFO << "SIP Message:" << peerId << info;
 
+    QString barePeerId = peerId.left( peerId.indexOf( "/" ) );
+
+    //FIXME: We should probably be using barePeerId in the connectToPeer call below.
+    //But, verify this doesn't cause any problems (there is still a uniquename after all)
+
     /*
       If only one party is externally visible, connection is obvious
       If both are, peer with lowest IP address initiates the connection.
@@ -524,10 +180,11 @@
     if ( info.isVisible() )
     {
         if( !Servent::instance()->visibleExternally() ||
-            Servent::instance()->externalAddress() <= info.host().hostName() )
+            Servent::instance()->externalAddress() < info.host() ||
+            ( Servent::instance()->externalAddress() == info.host() && Servent::instance()->externalPort() < info.port() ) )
         {
-            qDebug() << "Initiate connection to" << peerId;
-            Servent::instance()->connectToPeer( info.host().hostName(),
+            tDebug() << "Initiate connection to" << peerId << "at" << info.host();
+            Servent::instance()->connectToPeer( info.host(),
                                           info.port(),
                                           info.key(),
                                           peerId,
@@ -535,18 +192,18 @@
         }
         else
         {
-            qDebug() << Q_FUNC_INFO << "They should be conecting to us...";
+            tDebug() << Q_FUNC_INFO << "They should be conecting to us...";
         }
     }
     else
     {
-        qDebug() << Q_FUNC_INFO << "They are not visible, doing nothing atm";
+        tDebug() << Q_FUNC_INFO << "They are not visible, doing nothing atm";
     }
 
     m_peersSipInfos.insert( peerId, info );
 }
 
-void SipHandler::onSoftwareVersion(const QString& peerId, const QString& versionString)
+void SipHandler::onSoftwareVersion( const QString& peerId, const QString& versionString )
 {
     m_peersSoftwareVersions.insert( peerId, versionString );
 }
@@ -557,46 +214,6 @@
     qDebug() << Q_FUNC_INFO << from << msg;
 }
 
-
-void
-SipHandler::onError( int code, const QString& msg )
-{
-    SipPlugin* sip = qobject_cast< SipPlugin* >( sender() );
-    Q_ASSERT( sip );
-
-    qWarning() << "Failed to connect to SIP:" << sip->accountName() << code << msg;
-
-    if ( code == SipPlugin::AuthError )
-    {
-        emit authError( sip );
-    }
-    else
-    {
-        QTimer::singleShot( 10000, sip, SLOT( connectPlugin() ) );
-    }
-}
-
-
-void
-SipHandler::onStateChanged( SipPlugin::ConnectionState state )
-{
-    SipPlugin* sip = qobject_cast< SipPlugin* >( sender() );
-    Q_ASSERT( sip );
-
-    if ( sip->connectionState() == SipPlugin::Disconnected )
-    {
-        m_connectedPlugins.removeAll( sip );
-        emit disconnected( sip );
-    }
-    else if ( sip->connectionState() == SipPlugin::Connected )
-    {
-        m_connectedPlugins << sip;
-        emit connected( sip );
-    }
-
-    emit stateChanged( sip, state );
-}
-
 #ifndef ENABLE_HEADLESS
 void
 SipHandler::onAvatarReceived( const QString& from, const QPixmap& avatar )
@@ -643,18 +260,3 @@
     SourceList::instance()->getLocal()->setAvatar( avatar );
 }
 #endif
-
-
-QString
-SipHandler::factoryFromId( const QString& pluginId ) const
-{
-    return pluginId.split( "_" ).first();
-}
-
-
-SipPluginFactory*
-SipHandler::factoryFromPlugin( SipPlugin* p ) const
-{
-    QString factoryId = factoryFromId( p->pluginId() );
-    return m_pluginFactories.value( factoryId, 0 );
-}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sip/SipHandler.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/sip/SipHandler.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/sip/SipInfo.cpp Added

@@ -0,0 +1,248 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "SipInfo.h"
+
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+
+#include <QVariant>
+
+
+class SipInfoPrivate : public QSharedData
+{
+public:
+    SipInfoPrivate()
+        : port( -1 )
+    {
+    }
+
+    SipInfoPrivate( const SipInfoPrivate& other ) : QSharedData( other ),
+        visible(other.visible),
+        host(other.host),
+        port(other.port),
+        uniqname(other.uniqname),
+        key(other.key)
+    {
+    }
+    ~SipInfoPrivate() { }
+
+    QVariant visible;
+    QString host;
+    int port;
+    QString uniqname;
+    QString key;
+};
+
+
+SipInfo::SipInfo()
+{
+    d = new SipInfoPrivate;
+}
+
+
+SipInfo::SipInfo(const SipInfo& other)
+    : QObject()
+    , d( other.d )
+{
+}
+
+
+SipInfo::~SipInfo()
+{
+}
+
+
+SipInfo&
+SipInfo::operator=( const SipInfo& other )
+{
+    d = other.d;
+    return *this;
+}
+
+
+void
+SipInfo::clear()
+{
+    d->visible.clear();
+    d->host = QString();
+    d->port = -1;
+    d->uniqname = QString();
+    d->key = QString();
+}
+
+
+bool
+SipInfo::isValid() const
+{
+//    qDebug() << Q_FUNC_INFO << d->visible << d->host.hostName() << d->port << d->uniqname << d->key;
+    if( !d->visible.isNull() )
+    {
+        if(
+            // visible and all data available
+            (  d->visible.toBool() && !d->host.isEmpty() && ( d->port > 0 ) && !d->uniqname.isNull() && !d->key.isNull() )
+            // invisible and no data available
+         || ( !d->visible.toBool() &&  d->host.isEmpty() && ( d->port < 0 ) && d->uniqname.isNull() &&   d->key.isNull() )
+        )
+            return true;
+    }
+
+    return false;
+}
+
+
+void
+SipInfo::setVisible( bool visible )
+{
+    d->visible.setValue(visible);
+}
+
+
+bool
+SipInfo::isVisible() const
+{
+    Q_ASSERT( isValid() );
+
+    return d->visible.toBool();
+}
+
+
+void
+SipInfo::setHost( const QString& host )
+{
+    d->host = host;
+}
+
+
+const QString
+SipInfo::host() const
+{
+    Q_ASSERT( isValid() );
+
+    return d->host;
+}
+
+
+void
+SipInfo::setPort( int port )
+{
+    d->port = port;
+}
+
+
+int
+SipInfo::port() const
+{
+    Q_ASSERT( isValid() );
+
+    return d->port;
+}
+
+
+void
+SipInfo::setUniqname( const QString& uniqname )
+{
+    d->uniqname = uniqname;
+}
+
+
+const QString
+SipInfo::uniqname() const
+{
+    Q_ASSERT( isValid() );
+
+    return d->uniqname;
+}
+
+
+void
+SipInfo::setKey( const QString& key )
+{
+    d->key = key;
+}
+
+
+const QString
+SipInfo::key() const
+{
+    Q_ASSERT( isValid() );
+
+    return d->key;
+}
+
+
+const QString
+SipInfo::toJson() const
+{
+    // build variant map
+    QVariantMap m;
+    m"visible" = isVisible();
+    if( isVisible() )
+    {
+        m"ip" = host();
+        m"port" = port();
+        m"key" = key();
+        m"uniqname" = uniqname();
+    }
+
+    // serialize
+    QJson::Serializer serializer;
+    QByteArray ba = serializer.serialize( m );
+
+    return QString::fromAscii( ba );
+}
+
+
+const SipInfo
+SipInfo::fromJson( QString json )
+{
+    SipInfo info;
+
+    QJson::Parser parser;
+    bool ok;
+    QVariant v = parser.parse( json.toAscii(), &ok );
+    if ( !ok  || v.type() != QVariant::Map )
+    {
+        qDebug() << Q_FUNC_INFO << "Invalid JSON: " << json;
+        return info;
+    }
+    QVariantMap m = v.toMap();
+
+    info.setVisible( m"visible".toBool() );
+    if( m"visible".toBool() )
+    {
+        info.setHost( m"host".toString() );
+        info.setPort( m"port".toInt() );
+        info.setUniqname( m"uniqname".toString() );
+        info.setKey( m"key".toString() );
+    }
+
+    return info;
+}
+
+
+QDebug operator<< ( QDebug dbg, const SipInfo& info )
+{
+    if( !info.isValid() )
+        dbg.nospace() << "info is invalid";
+    else
+        dbg.nospace() << info.toJson();
+
+    return dbg.maybeSpace();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/sip/SipInfo.h Added

@@ -0,0 +1,70 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *
+ *   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 SIPINFO_H
+#define SIPINFO_H
+
+#include <QSharedPointer>
+#include <QHostInfo>
+
+#include "utils/Logger.h"
+#include "DllMacro.h"
+
+class SipInfoPrivate;
+
+class DLLEXPORT SipInfo : public QObject
+{
+Q_OBJECT
+
+public:
+    SipInfo();
+    SipInfo(const SipInfo& other);
+    virtual ~SipInfo();
+    SipInfo& operator=(const SipInfo& info);
+
+    void clear();
+    bool isValid() const;
+
+    void setVisible( bool visible );
+    bool isVisible() const;
+
+    void setHost( const QString& host );
+    const QString host() const;
+
+    void setPort( int port );
+    int port() const;
+
+    void setUniqname( const QString& uniqname );
+    const QString uniqname() const;
+
+    void setKey( const QString& key );
+    const QString key() const;
+
+
+    const QString toJson() const;
+    static const SipInfo fromJson( QString json );
+
+private:
+    QSharedDataPointer<SipInfoPrivate> d;
+};
+
+DLLEXPORT QDebug operator<<( QDebug dbg, const SipInfo &info );
+
+
+
+#endif // SIPINFO_H
\ No newline at end of file

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sip/SipPlugin.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/sip/SipPlugin.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/sip/SipPlugin.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/sip/SipPlugin.h Changed

@@ -2,6 +2,8 @@
  *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *             2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *             2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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
@@ -20,93 +22,54 @@
 #ifndef SIPPLUGIN_H
 #define SIPPLUGIN_H
 
-#include "sipinfo.h"
+#include "SipInfo.h"
 
 #include <QObject>
 #include <QString>
 #include <QNetworkProxy>
 
+#include "accounts/Account.h"
 #ifndef ENABLE_HEADLESS
     #include <QMenu>
 #endif
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 class SipPlugin;
 
-class DLLEXPORT SipPluginFactory : public QObject
-{
-    Q_OBJECT
-public:
-    SipPluginFactory() {}
-    virtual ~SipPluginFactory() {}
-
-    // display name for plugin
-    virtual QString prettyName() const = 0;
-    // internal name
-    virtual QString factoryId() const = 0;
-
-#ifndef ENABLE_HEADLESS
-    // if the user can create multiple
-    virtual QIcon icon() const { return QIcon(); }
-#endif
-
-    virtual bool isUnique() const { return false; }
-
-    virtual SipPlugin* createPlugin( const QString& pluginId = QString() ) = 0;
-
-protected:
-    QString generateId();
-};
-
 class DLLEXPORT SipPlugin : public QObject
 {
     Q_OBJECT
 
 public:
-    enum SipErrorCode { AuthError, ConnectionError }; // Placeholder for errors, to be defined
-    enum ConnectionState { Disconnected, Connecting, Connected, Disconnecting };
-
     SipPlugin();
-    explicit SipPlugin( const QString& pluginId, QObject* parent = 0 );
+    explicit SipPlugin( Tomahawk::Accounts::Account *account, QObject* parent = 0 );
     virtual ~SipPlugin();
 
     // plugin id is "pluginfactoryname_someuniqueid".  get it from SipPluginFactory::generateId
     QString pluginId() const;
 
     virtual bool isValid() const = 0;
-    virtual const QString name() const = 0;
-    virtual const QString friendlyName() const = 0;
-    virtual const QString accountName() const = 0;
-    virtual ConnectionState connectionState() const = 0;
-    virtual QString errorMessage() const;
+    virtual const QString friendlyName() const;
+    virtual const QString serviceName() const;
 #ifndef ENABLE_HEADLESS
     virtual QMenu* menu();
-    virtual QWidget* configWidget();
-    virtual QIcon icon() const;
 #endif
-    virtual void saveConfig() {} // called when the widget has been edited
+    virtual Tomahawk::Accounts::Account* account() const;
 
     // peer infos
     virtual const QStringList peersOnline() const;
 
 public slots:
-    virtual bool connectPlugin( bool startup = false ) = 0;
+    virtual void connectPlugin() = 0;
     virtual void disconnectPlugin() = 0;
     virtual void checkSettings() = 0;
+    virtual void configurationChanged() = 0;
 
     virtual void addContact( const QString &jid, const QString& msg = QString() ) = 0;
-    virtual void sendMsg( const QString& to, const QString& msg ) = 0;
-
-    virtual void refreshProxy();
-
-    // so plugins can clean up after themselves
-    virtual void deletePlugin();
+    virtual void sendMsg( const QString& to, const SipInfo& info ) = 0;
 
 signals:
-    void error( int, const QString& );
-    void stateChanged( SipPlugin::ConnectionState state );
-
     void peerOnline( const QString& );
     void peerOffline( const QString& );
     void msgReceived( const QString& from, const QString& msg );
@@ -127,18 +90,14 @@
     void dataError( bool );
 
 private slots:
-    void onError( int, const QString& );
-    void onStateChange( SipPlugin::ConnectionState state );
-
     void onPeerOnline( const QString &peerId );
     void onPeerOffline( const QString &peerId );
 
+protected:
+    Tomahawk::Accounts::Account *m_account;
+
 private:
-    QString m_pluginId;
-    QString m_cachedError;
     QStringList m_peersOnline;
 };
 
-Q_DECLARE_INTERFACE( SipPluginFactory, "tomahawk.SipFactory/1.0" )
-
 #endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/taghandlers/tag.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/taghandlers/tag.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/taghandlers/tag.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/taghandlers/tag.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/thirdparty/Qocoa/qocoa_mac.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp Changed

@@ -26,13 +26,16 @@
 #include <QLineEdit>
 #include <QVBoxLayout>
 
-#include "playlist/topbar/searchlineedit.h"
-#include "utils/tomahawkutilsgui.h"
+#include "playlist/topbar/SearchLineEdit.h"
+#include "utils/TomahawkUtilsGui.h"
 
-class DLLEXPORT QSearchFieldPrivate
+class DLLEXPORT QSearchFieldPrivate : public QObject
 {
+    Q_OBJECT
 public:
-    QSearchFieldPrivate(SearchLineEdit *lineEdit) : lineEdit(lineEdit) {}
+    QSearchFieldPrivate(SearchLineEdit *lineEdit) : QObject( lineEdit ), lineEdit(lineEdit) {}
+    virtual ~QSearchFieldPrivate() {}
+
     SearchLineEdit *lineEdit;
 };
 
@@ -44,7 +47,7 @@
     connect(lineEdit, SIGNAL(returnPressed()),
             this, SIGNAL(returnPressed()));
 
-    pimpl = new QSearchFieldPrivate(lineEdit);
+    pimpl = QPointer< QSearchFieldPrivate>( new QSearchFieldPrivate( lineEdit ) );
 
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->addWidget(lineEdit);
@@ -52,34 +55,94 @@
     setContentsMargins(0, 0, 0, 0);
 
     lineEdit->setStyleSheet( "QLineEdit { border: 1px solid gray; border-radius: 6px; }" );
+    lineEdit->setMinimumHeight(27);
+    setFixedHeight(27);
 
 #ifdef Q_WS_MAC
     lineEdit->setContentsMargins(0, 0, 0, 0);
-    lineEdit->setMinimumHeight(27);
-    setFixedHeight(27);
 #else
     lineEdit->setContentsMargins(2, 2, 2, 2);
-    lineEdit->setMinimumHeight(27);
 #endif
 
 }
 
 void QSearchField::setText(const QString &text)
 {
-    pimpl->lineEdit->setText(text);
+    Q_ASSERT( !pimpl.isNull() );
+    if ( pimpl.isNull() )
+        return;
+
+    pimpl.data()->lineEdit->setText(text);
 }
 
 void QSearchField::setPlaceholderText(const QString& text)
 {
-    pimpl->lineEdit->setInactiveText( text );
+    Q_ASSERT( !pimpl.isNull() );
+    if ( pimpl.isNull() )
+        return;
+
+    pimpl.data()->lineEdit->setInactiveText( text );
 }
 
 void QSearchField::clear()
 {
-    pimpl->lineEdit->clear();
+    Q_ASSERT( !pimpl.isNull() );
+    if ( pimpl.isNull() )
+        return;
+
+    pimpl.data()->lineEdit->clear();
 }
 
 QString QSearchField::text() const
 {
-    return pimpl->lineEdit->text();
+    Q_ASSERT( !pimpl.isNull() );
+    if ( pimpl.isNull() )
+        return QString();
+
+    return pimpl.data()->lineEdit->text();
+}
+
+QString QSearchField::placeholderText() const
+{
+    Q_ASSERT( !pimpl.isNull() );
+    if ( pimpl.isNull() )
+        return QString();
+
+    return pimpl.data()->lineEdit->placeholderText();
+}
+
+void QSearchField::selectAll()
+{
+    Q_ASSERT( !pimpl.isNull() );
+    if ( pimpl.isNull() )
+        return;
+
+    pimpl.data()->lineEdit->selectAll();
+}
+
+void QSearchField::setFocus()
+{
+    Q_ASSERT( !pimpl.isNull() );
+    if ( pimpl.isNull() )
+        return;
+
+    pimpl.data()->lineEdit->setFocus();
+}
+
+void QSearchField::setFocus(Qt::FocusReason reason)
+{
+    Q_ASSERT( !pimpl.isNull() );
+    if ( pimpl.isNull() )
+        return;
+
+    pimpl.data()->lineEdit->setFocus(reason);
+}
+
+
+void QSearchField::resizeEvent(QResizeEvent* e)
+{
+    QWidget::resizeEvent(e);
 }
+
+
+#include "qsearchfield.moc"

tomahawk-0.4.2.tar.bz2/src/libtomahawk/thirdparty/Qocoa/qsearchfield.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/thirdparty/Qocoa/qsearchfield.h Changed

@@ -2,30 +2,42 @@
 #define QSEARCHFIELD_H
 
 #include <QWidget>
+#include <QPointer>
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 class QSearchFieldPrivate;
 class DLLEXPORT QSearchField : public QWidget
 {
     Q_OBJECT
+
+    Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText);
+
 public:
-    explicit QSearchField(QWidget* parent);
+    explicit QSearchField(QWidget *parent);
 
     QString text() const;
+    QString placeholderText() const;
+    void setFocus(Qt::FocusReason);
 
 public slots:
     void setText(const QString &text);
     void setPlaceholderText(const QString& text);
-
     void clear();
+    void selectAll();
+    void setFocus();
+
 signals:
     void textChanged(const QString &text);
+    void editingFinished();
     void returnPressed();
 
+protected:
+    void resizeEvent(QResizeEvent*);
+
 private:
     friend class QSearchFieldPrivate;
-    QSearchFieldPrivate *pimpl;
+    QPointer <QSearchFieldPrivate> pimpl;
 };
 
 #endif // QSEARCHFIELD_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/thirdparty/Qocoa/qsearchfield_mac.mm Changed

@@ -22,6 +22,7 @@
 */
 
 #include "qsearchfield.h"
+#include "moc_qsearchfield.cpp"
 
 #include "qocoa_mac.h"
 
@@ -29,42 +30,105 @@
 #import "Foundation/NSNotification.h"
 #import "AppKit/NSSearchField.h"
 
-class QSearchFieldPrivate
+#include <QApplication>
+#include <QClipboard>
+
+#define KEYCODE_A 0
+#define KEYCODE_X 7
+#define KEYCODE_C 8
+#define KEYCODE_V 9
+
+class QSearchFieldPrivate : public QObject
 {
 public:
     QSearchFieldPrivate(QSearchField *qSearchField, NSSearchField *nsSearchField)
-        : qSearchField(qSearchField), nsSearchField(nsSearchField) {}
+        : QObject(qSearchField), qSearchField(qSearchField), nsSearchField(nsSearchField) {}
 
     void textDidChange(const QString &text)
     {
-        emit qSearchField->textChanged(text);
+        if (qSearchField)
+            emit qSearchField->textChanged(text);
     }
 
     void textDidEndEditing()
     {
-        emit qSearchField->returnPressed();
+        if (qSearchField)
+            emit qSearchField->editingFinished();
+    }
+
+    void returnPressed()
+    {
+        if (qSearchField)
+            emit qSearchField->returnPressed();
     }
 
-    QSearchField *qSearchField;
+    QPointer<QSearchField> qSearchField;
     NSSearchField *nsSearchField;
 };
 
 @interface QSearchFieldDelegate : NSObject<NSTextFieldDelegate>
 {
 @public
-    QSearchFieldPrivate* pimpl;
+    QPointer<QSearchFieldPrivate> pimpl;
 }
 -(void)controlTextDidChange:(NSNotification*)notification;
--(void)controlTextDidEndEditing:(NSNotification*)aNotification;
+-(void)controlTextDidEndEditing:(NSNotification*)notification;
 @end
 
 @implementation QSearchFieldDelegate
 -(void)controlTextDidChange:(NSNotification*)notification {
-    pimpl->textDidChange(toQString(notification object stringValue));
+    Q_ASSERT(pimpl);
+    if (pimpl)
+        pimpl->textDidChange(toQString(notification object stringValue));
 }
 
 -(void)controlTextDidEndEditing:(NSNotification*)notification {
-    pimpl->textDidEndEditing();
+    Q_UNUSED(notification);
+    // No Q_ASSERT here as it is called on destruction.
+    if (pimpl)
+        pimpl->textDidEndEditing();
+
+    if (notification userInfo objectForKey:@"NSTextMovement" intValue == NSReturnTextMovement)
+        pimpl->returnPressed();
+}
+@end
+
+@interface QocoaSearchField : NSSearchField
+-(BOOL)performKeyEquivalent:(NSEvent*)event;
+@end
+
+@implementation QocoaSearchField
+-(BOOL)performKeyEquivalent:(NSEvent*)event {
+    if (event type == NSKeyDown && event modifierFlags & NSCommandKeyMask)
+    {
+        const unsigned short keyCode = event keyCode;
+        if (keyCode == KEYCODE_A)
+        {
+            self performSelector:@selector(selectText:);
+            return YES;
+        }
+        else if (keyCode == KEYCODE_C)
+        {
+            QClipboard* clipboard = QApplication::clipboard();
+            clipboard->setText(toQString(self stringValue));
+            return YES;
+        }
+        else if (keyCode == KEYCODE_V)
+        {
+            QClipboard* clipboard = QApplication::clipboard();
+            self setStringValue:fromQString(clipboard->text());
+            return YES;
+        }
+        else if (keyCode == KEYCODE_X)
+        {
+            QClipboard* clipboard = QApplication::clipboard();
+            clipboard->setText(toQString(self stringValue));
+            self setStringValue:@"";
+            return YES;
+        }
+    }
+
+    return NO;
 }
 @end
 
@@ -72,27 +136,30 @@
 {
     NSAutoreleasePool *pool = NSAutoreleasePool alloc init;
 
-    NSSearchField *search = NSSearchField alloc init;
-    pimpl = new QSearchFieldPrivate(this, search);
+    NSSearchField *search = QocoaSearchField alloc init;
 
     QSearchFieldDelegate *delegate = QSearchFieldDelegate alloc init;
-    delegate->pimpl = pimpl;
+    pimpl = delegate->pimpl = new QSearchFieldPrivate(this, search);
     search setDelegate:delegate;
 
-    zeroLayout(search, this);
+    setupLayout(search, this);
+
+    setFixedHeight(24);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     layout()->setContentsMargins(2, 0, 2, 0);
     setStyleSheet( "* { background: #DDE4EB; }" );
 
-    setMinimumSize(layout()->sizeHint().width(), 20);
-
     search release;
     pool drain;
 }
 
 void QSearchField::setText(const QString &text)
 {
+    Q_ASSERT(pimpl);
+    if (!pimpl)
+        return;
+
     NSAutoreleasePool *pool = NSAutoreleasePool alloc init;
     pimpl->nsSearchField setStringValue:fromQString(text);
     pool drain;
@@ -100,6 +167,10 @@
 
 void QSearchField::setPlaceholderText(const QString& text)
 {
+    Q_ASSERT(pimpl);
+    if (!pimpl)
+        return;
+
     NSAutoreleasePool *pool = NSAutoreleasePool alloc init;
     pimpl->nsSearchField cell setPlaceholderString:fromQString(text);
     pool drain;
@@ -107,10 +178,57 @@
 
 void QSearchField::clear()
 {
+    Q_ASSERT(pimpl);
+    if (!pimpl)
+        return;
+
     pimpl->nsSearchField setStringValue:@"";
+    emit textChanged(QString());
+}
+
+void QSearchField::selectAll()
+{
+    Q_ASSERT(pimpl);
+    if (!pimpl)
+        return;
+
+    pimpl->nsSearchField performSelector:@selector(selectText:);
 }
 
 QString QSearchField::text() const
 {
+    Q_ASSERT(pimpl);
+    if (!pimpl)
+        return QString();
+
     return toQString(pimpl->nsSearchField stringValue);
 }
+
+QString QSearchField::placeholderText() const
+{
+    Q_ASSERT(pimpl);
+    if (!pimpl)
+        return QString();
+
+    return toQString(pimpl->nsSearchField cell placeholderString);
+}
+
+void QSearchField::setFocus(Qt::FocusReason reason)
+{
+    Q_ASSERT(pimpl);
+    if (!pimpl)
+        return;
+
+    if (pimpl->nsSearchField acceptsFirstResponder)
+        pimpl->nsSearchField window makeFirstResponder: pimpl->nsSearchField;
+}
+
+void QSearchField::setFocus()
+{
+    setFocus(Qt::OtherFocusReason);
+}
+
+void QSearchField::resizeEvent(QResizeEvent *resizeEvent)
+{
+    QWidget::resizeEvent(resizeEvent);
+}

tomahawk-0.4.2.tar.bz2/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp Changed

@@ -31,9 +31,9 @@
 const void * KDLockedSharedMemoryPointerBase::get() const {
     return mem ? mem->data() : 0 ;
 }
-    
+
 size_t KDLockedSharedMemoryPointerBase::byteSize() const {
-    return mem->size();
+    return mem ? mem->size() : 0;
 }
 
 /*!
@@ -137,7 +137,7 @@
 
   (The exception safety of this class has not been evaluated yet.)
 
-  KDLockedSharedMemoryArray is a smart immutable pointer, which gives convenient and safe access to array data stored in a QSharedMemory 
+  KDLockedSharedMemoryArray is a smart immutable pointer, which gives convenient and safe access to array data stored in a QSharedMemory
   data segment.
   The content of a KDLockedSharedMemoryArray cannot be changed during it's lifetime.
 
@@ -248,7 +248,7 @@
 
 /*!
   \fn KDLockedSharedMemoryArray::size_type KDLockedSharedMemoryArray::size() const
-  Returns the size of this array. The size is calculated from the storage size of T and 
+  Returns the size of this array. The size is calculated from the storage size of T and
   the size of the shared memory segment.
   \since_f 2.2
 */
@@ -461,7 +461,7 @@
             assertEqual( a i .n, i );
         assertEqual( a.front().n, 0u );
         assertEqual( a.back().n, a.size() - 1 );
-        
+
         std::copy( v.begin(), v.end(), a.rbegin() );
         for( uint i = 0; i < a.size(); ++i )
             assertEqual( a i .n, a.size() - 1 - i );

tomahawk-0.4.2.tar.bz2/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp Changed

@@ -1,93 +1,301 @@
 #include "kdsingleapplicationguard.h"
 
+#if QT_VERSION >= 0x040400 || defined(DOXYGEN_RUN)
+#ifndef QT_NO_SHAREDMEMORY
+
+#include "kdsharedmemorylocker.h"
+#include "kdlockedsharedmemorypointer.h"
+
+#include <QVector>
+#include <QCoreApplication>
+#include <QSharedMemory>
+#include <QSharedData>
+#include <QBasicTimer>
+#include <QTime>
+
+#include <algorithm>
+#include <limits>
+#include <cstdlib>
+#include <cstring>
+#include <cassert>
+
+#ifndef Q_WS_WIN
+#include <csignal>
+#include <unistd.h>
+#endif
+
+#ifdef Q_WS_WIN
+#include <windows.h>
+typedef signed int ssize_t;
+#endif
+
+using namespace kdtools;
+
+#ifndef KDSINGLEAPPLICATIONGUARD_TIMEOUT_SECONDS
+#define KDSINGLEAPPLICATIONGUARD_TIMEOUT_SECONDS 10
+#endif
+
 #ifndef KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES
 #define KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES 10
 #endif
 
 #ifndef KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE
-#define KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE 1024
+#define KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE 32768
 #endif
 
+static unsigned int KDSINGLEAPPLICATIONGUARD_SHM_VERSION = 0;
 
+Q_GLOBAL_STATIC_WITH_ARGS( int, registerInstanceType,
+                           (qRegisterMetaType<KDSingleApplicationGuard::Instance>()) )
 
-KDSingleApplicationGuard::Instance::Instance( const QStringList& args, qint64 p )
-: arguments( args ),
-pid( p )
-{
-}
+/*!
+  \class KDSingleApplicationGuard::Instance
+  \relates KDSingleApplicationGuard
+  \ingroup core
+  \brief Information about instances a KDSingleApplicationGuard knows about
+
+  Instance represents instances of applications under
+  KDSingleApplicationGuard protection, and allows access to their
+  pid() and the arguments() they were started with.
+*/
+
+class KDSingleApplicationGuard::Instance::Private : public QSharedData {
+    friend class ::KDSingleApplicationGuard::Instance;
+public:
+    Private( const QStringList & args, bool truncated, qint64 pid )
+        : pid( pid ), arguments( args ), truncated( truncated ) {}
+
+private:
+    qint64 pid;
+    QStringList arguments;
+    bool truncated;
+};
 
-#if QT_VERSION < 0x040400
+struct ProcessInfo;
 
+/*!
+ \internal
+ */
 class KDSingleApplicationGuard::Private
 {
+    friend class ::KDSingleApplicationGuard;
+    friend class ::KDSingleApplicationGuard::Instance;
+    friend struct ::ProcessInfo;
+    KDSingleApplicationGuard * const q;
+public:
+    Private( Policy policy, KDSingleApplicationGuard* qq );
+    ~Private();
+
+    void create( const QStringList& arguments );
+
+    bool checkOperational( const char * function, const char * act ) const;
+    bool checkOperationalPrimary( const char * function, const char * act ) const;
+
+    struct segmentheader
+    {
+        size_t size : 16;
+    };
+
+    static void sharedmem_free( char* );
+    static char* sharedmem_malloc( size_t size );
+
+private:
+    void shutdownInstance();
+    void poll();
+
+private:
+    static KDSingleApplicationGuard* primaryInstance;
+
+private:
+    QBasicTimer timer;
+    QSharedMemory mem;
+    int id;
+    Policy policy;
+    bool operational;
+    bool exitRequested;
 };
 
-KDSingleApplicationGuard::KDSingleApplicationGuard( QCoreApplication*, Policy )
+/*!
+  \internal
+*/
+KDSingleApplicationGuard::Instance::Instance( const QStringList & args, bool truncated, qint64 p )
+    : d( new Private( args, truncated, p ) )
 {
-    qWarning( "KD Tools was compiled with a Qt version prior to 4.4. SingleApplicationGuard won't work." );
+    d->ref.ref();
+    (void)registerInstanceType();
 }
 
-KDSingleApplicationGuard::~KDSingleApplicationGuard()
+/*!
+  Default constructor. Constructs in Instance that is \link isNull()
+  null\endlink.
+
+  \sa isNull()
+*/
+KDSingleApplicationGuard::Instance::Instance() : d( 0 ) {}
+
+/*!
+  Copy constructor.
+*/
+KDSingleApplicationGuard::Instance::Instance( const Instance & other )
+    : d( other.d )
 {
+    if ( d )
+        d->ref.ref();
 }
 
-void KDSingleApplicationGuard::shutdownOtherInstances()
+/*!
+  Destructor.
+*/
+KDSingleApplicationGuard::Instance::~Instance()
 {
+    if ( d && !d->ref.deref() )
+        delete d;
 }
 
-void KDSingleApplicationGuard::killOtherInstances()
+/*!
+  \fn KDSingleApplicationGuard::Instance::swap( Instance & other )
+
+  Swaps the contents of this and \a other.
+
+  This function never throws exceptions.
+*/
+
+/*!
+  \fn KDSingleApplicationGuard::Instance::operator=( Instance other )
+
+  Assigns the contents of \a other to this.
+
+  This function is strongly exception-safe.
+*/
+
+/*!
+  \fn std::swap( KDSingleApplicationGuard::Instance & lhs, KDSingleApplicationGuard::Instance & rhs )
+  \relates KDSingleApplicationGuard::Instance
+
+  Specialisation of std::swap() for
+  KDSingleApplicationGuard::Instance. Calls swap().
+*/
+
+/*!
+  \fn qSwap( KDSingleApplicationGuard::Instance & lhs, KDSingleApplicationGuard::Instance & rhs )
+  \relates KDSingleApplicationGuard::Instance
+
+  Specialisation of qSwap() for
+  KDSingleApplicationGuard::Instance. Calls swap().
+*/
+
+/*!
+  \fn KDSingleApplicationGuard::Instance::isNull() const
+
+  Returns whether this instance is null.
+*/
+
+/*!
+  Returns whether this instance is valid. A valid instance is neither
+  null, nor does it have a negative PID.
+*/
+bool KDSingleApplicationGuard::Instance::isValid() const
 {
+    return d && d->pid >= 0 ;
 }
 
-void KDSingleApplicationGuard::timerEvent( QTimerEvent* )
+/*!
+  Returns whether the #arguments are complete (\c false) or not (\c
+  true), e.g. because they have been truncated due to limited storage
+  space.
+
+  \sa arguments()
+*/
+bool KDSingleApplicationGuard::Instance::areArgumentsTruncated() const
 {
+    return d && d->truncated;
 }
-#else
 
-#include <QCoreApplication>
-#include <QSharedMemory>
+/*!
+  Returns the arguments that this instance was started with.
 
-#include "kdsharedmemorylocker.h"
-#include "kdlockedsharedmemorypointer.h"
+  \sa areArgumentsTruncated()
+*/
+const QStringList & KDSingleApplicationGuard::Instance::arguments() const
+{
+    if ( d )
+        return d->arguments;
+    static const QStringList empty;
+    return empty;
+}
 
-#include <algorithm>
-#include <cstdlib>
-#include <cstring>
+/*!
+  Returns the process-id (PID) of this instance.
+*/
+qint64 KDSingleApplicationGuard::Instance::pid() const
+{
+    if ( d )
+        return d->pid;
+    else
+        return -1;
+}
 
-#ifndef Q_WS_WIN
-#include <csignal>
-#endif
+/*!
+  \class KDSingleApplicationGuard KDSingleApplicationGuard
+  \ingroup core
+  \brief A guard to protect an application from having several instances.
 
-using namespace kdtools;
+  KDSingleApplicationGuard can be used to make sure only one instance of an
+  application is running at the same time.
 
-/*!
- *  \class KDSingleApplicationGuard KDSingleApplicationGuard
- *  \brief A guard to protect an application from having several instances.
- *
- *  KDSingleApplicationGuard can be used to make sure only one instance of an
- *  application is running at the same time.
- *
- *  \note As KDSingleApplicationGuard uses QSharedMemory Qt 4.4 or later is required
+  \note As KDSingleApplicationGuard currently uses QSharedMemory, Qt
+  4.4 or later is required.
  */
 
 /*!
- *  \fn void KDSingleApplicationGuard::instanceStarted()
- *  This signal is emitted by the primary instance when ever one other
- *  instance was started.
+  \fn void KDSingleApplicationGuard::instanceStarted(const KDSingleApplicationGuard::Instance & instance)
+
+  This signal is emitted by the primary instance whenever another
+  instance \a instance started.
  */
 
 /*!
- *  \fn void KDSingleApplicationGuard::instanceExited()
- *  This signal is emitted by the primary instance when ever one other
- *  instance was exited.
+  \fn void KDSingleApplicationGuard::instanceExited(const KDSingleApplicationGuard::Instance & instance)
+
+  This signal is emitted by the primary instance whenever another
+  instance \a instance exited.
  */
 
 /*!
- *  \fn void KDSingleApplicationGuard::becamePrimaryInstance()
- *  This signal is emitted, when the current running application gets the new
- *  primary application. The old primary application has quit.
+  \fn void KDSingleApplicationGuard::raiseRequested()
+
+  This signal is emitted when the current running application is requested
+  to raise its main window.
+*/
+
+/*!
+  \fn void KDSingleApplicationGuard::exitRequested()
+
+  This signal is emitted when the current running application has been asked to exit
+  by calling kill on the instance.
+*/
+
+/*!
+  \fn void KDSingleApplicationGuard::becamePrimaryInstance()
+
+  This signal is emitted when the current running application becomes
+  the new primary application. The old primary application has quit.
  */
 
+/*!
+  \fn void KDSingleApplicationGuard::becameSecondaryInstance()
+
+  This signal is emmited when the primary instance became secondary instance.
+  This happens when the instance doesn't update its status for some (default 10) seconds. Another instance
+  got primary instance in that case.
+  */
+
+/*!
+  \fn void KDSingleApplicationGuard::policyChanged( KDSingleApplicationGuard::Policy policy )
+
+  This signal is emitted when the #policy of the system changes.
+*/
+
 enum Command
 {
     NoCommand = 0x00,
@@ -96,259 +304,530 @@
     FreeInstance = 0x04,
     ShutDownCommand = 0x08,
     KillCommand = 0x10,
-    BecomePrimaryCommand = 0x20
+    BecomePrimaryCommand = 0x20,
+    RaiseCommand = 0x40
 };
 
-Q_DECLARE_FLAGS( Commands, Command )
-Q_DECLARE_OPERATORS_FOR_FLAGS( Commands )
+static const quint16 PrematureEndOfOptions = -1;
+static const quint16 RegularEndOfOptions   = -2;
 
 struct ProcessInfo
 {
+    static const size_t MarkerSize = sizeof(quint16);
+
     explicit ProcessInfo( Command c = FreeInstance, const QStringList& arguments = QStringList(), qint64 p = -1 )
-    : command( c ),
-    pid( p )
+        : pid( p ),
+          command( c ),
+          timestamp( 0 ),
+          commandline( 0 )
     {
-        std::fill_n( commandline, KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE, '\0' );
-
-        int argpos = 0;
-        for( QStringList::const_iterator it = arguments.begin(); it != arguments.end(); ++it )
-        {
-            const QByteArray arg = it->toLatin1();
-            const int count = qMin( KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE - argpos, arg.count() );
-            std::copy( arg.begin(), arg.begin() + count, commandline + argpos );
-            argpos += arg.count() + 1;  // makes sure there's a \0 between every parameter
-        }
+        setArguments( arguments );
     }
 
-    QStringList arguments() const
-    {
-        QStringList result;
-
-        QByteArray arg;
-        for( int i = 0; i < KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE; ++i )
-        {
-            if( commandline i  == '\0' && !arg.isEmpty() )
-            {
-                result.push_back( QString::fromLatin1( arg ) );
-                arg.clear();
-            }
-            else if( !commandline i  == '\0' )
-            {
-                arg.push_back( commandline i  );
-            }
-        }
-
-        return result;
-    }
+    void setArguments( const QStringList & arguments );
+    QStringList arguments( bool * prematureEnd  ) const;
 
-    Commands command;
-    char commandline KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE ;
     qint64 pid;
+    quint32 command;
+    quint32 timestamp;
+    char* commandline;
 };
 
-bool operator==( const ProcessInfo& lhs, const ProcessInfo& rhs )
+static inline bool operator==( const ProcessInfo & lhs, const ProcessInfo & rhs )
 {
     return lhs.command == rhs.command &&
-    ::memcmp( lhs.commandline, rhs.commandline, KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE ) == 0;
+           ( lhs.commandline == rhs.commandline || ( lhs.commandline != 0 && rhs.commandline != 0 && ::strcmp( lhs.commandline, rhs.commandline ) == 0 ) );
 }
 
-bool operator!=( const ProcessInfo& lhs, const ProcessInfo& rhs )
+static inline bool operator!=( const ProcessInfo & lhs, const ProcessInfo & rhs )
 {
     return !operator==( lhs, rhs );
 }
 
 /*!
- *  This struct contains information about the managed process system.
- *  \internal
+  This struct contains information about the managed process system.
+  \internal
  */
 struct InstanceRegister
 {
-    InstanceRegister( KDSingleApplicationGuard::Policy policy = KDSingleApplicationGuard::NoPolicy )
-    : policy( policy )
+    explicit InstanceRegister( KDSingleApplicationGuard::Policy policy = KDSingleApplicationGuard::NoPolicy )
+        : policy( policy ),
+          maxInstances( KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES ),
+          version( 0 )
     {
-        std::fill_n( info, KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES, ProcessInfo() );
+        std::fill_n( commandLines, KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE, 0 );
         ::memcpy( magicCookie, "kdsingleapp", 12 );
     }
 
     /*!
-     *      Returns wheter this register was properly initialized by the first instance.
-     */
+      Returns whether this register was properly initialized by the first instance.
+      */
     bool isValid() const
     {
         return ::strcmp( magicCookie, "kdsingleapp" ) == 0;
     }
 
-    ProcessInfo info KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES ;
-    KDSingleApplicationGuard::Policy policy;
     char magicCookie 12 ;
+    unsigned int policy  :  8;
+    quint32 maxInstances : 20;
+    unsigned int version :  4;
+    ProcessInfo info KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES ;
+
+    char commandLines KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE ;
+
+    Q_DISABLE_COPY( InstanceRegister )
 };
 
-bool operator==( const InstanceRegister& lhs, const InstanceRegister& rhs )
+void ProcessInfo::setArguments( const QStringList & arguments )
 {
-    if( lhs.policy != rhs.policy )
-        return false;
+    if( commandline != 0 )
+        KDSingleApplicationGuard::Private::sharedmem_free( commandline );
 
-    for( int i = 0; i < KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES; ++i )
-        if( lhs.info i  != rhs.info i  )
-            return false;
+    commandline = 0;
+    if( arguments.isEmpty() )
+        return;
 
-        return true;
+    size_t totalsize = MarkerSize;
+    Q_FOREACH( const QString& arg, arguments )
+    {
+        const QByteArray utf8 = arg.toUtf8();
+        totalsize += utf8.size() + MarkerSize;
+    }
+    InstanceRegister* const reg = reinterpret_cast<InstanceRegister*>( KDSingleApplicationGuard::Private::primaryInstance->d->mem.data() );
+    this->commandline = KDSingleApplicationGuard::Private::sharedmem_malloc( totalsize );
+    if( this->commandline == 0 )
+    {
+        qWarning("KDSingleApplicationguard: out of memory when trying to save arguments.\n");
+        return;
+    }
+
+    char* const commandline = this->commandline + reinterpret_cast<long>(reg->commandLines);
+
+    int argpos = 0;
+    Q_FOREACH( const QString & arg, arguments )
+    {
+        const QByteArray utf8 = arg.toUtf8();
+        const int required = MarkerSize + utf8.size() + MarkerSize ;
+        const int available = KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE - argpos ;
+        if ( required > available || utf8.size() > std::numeric_limits<quint16>::max() ) {
+            // write a premature-eoo marker, and quit
+            memcpy( commandline + argpos, &PrematureEndOfOptions, MarkerSize );
+            argpos += MarkerSize;
+            qWarning( "KDSingleApplicationGuard: argument list is too long (bytes required: %d, used: %d, available: %d",
+                      required, argpos - 2, available );
+            return;
+        } else {
+            const quint16 len16 = utf8.size();
+            // write the size of the data...
+            memcpy( commandline + argpos, &len16, MarkerSize );
+            argpos += MarkerSize;
+            // then the data
+            memcpy( commandline + argpos, utf8.data(), len16 );
+            argpos += len16;
+        }
+    }
+    const ssize_t available = KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE - argpos;
+    assert( available >= static_cast<ssize_t>( MarkerSize ) );
+    memcpy( commandline + argpos, &RegularEndOfOptions, MarkerSize );
+    argpos += MarkerSize;
 }
 
-/*!
- * \internal
- */
-class KDSingleApplicationGuard::Private
+QStringList ProcessInfo::arguments( bool * prematureEnd  ) const
 {
-public:
-    Private( KDSingleApplicationGuard* qq )
-    : q( qq ),
-    id( -1 )
+    QStringList result;
+    if( commandline == 0 )
     {
-        if( primaryInstance == 0 )
-            primaryInstance = q;
+        if( prematureEnd )
+            *prematureEnd = true;
+        return result;
     }
 
-    ~Private()
+    InstanceRegister* const reg = reinterpret_cast<InstanceRegister*>( KDSingleApplicationGuard::Private::primaryInstance->d->mem.data() );
+    const char* const commandline = this->commandline + reinterpret_cast<long>(reg->commandLines);
+
+    int argpos = 0;
+    while ( true ) {
+        const int available = KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE - argpos ;
+        assert( available >= 2 );
+
+        quint16 marker;
+        memcpy( &marker, commandline + argpos, MarkerSize );
+        argpos += MarkerSize;
+
+        if ( marker == PrematureEndOfOptions ) {
+            if ( prematureEnd ) *prematureEnd = true;
+            break;
+        }
+        if ( marker == RegularEndOfOptions ) {
+            if ( prematureEnd ) *prematureEnd = false;
+            break;
+        }
+
+        const int requested = MarkerSize + marker + MarkerSize ;
+        if ( requested > available ) {
+            const long long int p = pid;
+            qWarning( "KDSingleApplicationGuard: inconsistency detected when parsing command-line argument for process %lld", p );
+            if ( prematureEnd ) *prematureEnd = true;
+            break;
+        }
+
+        result.push_back( QString::fromUtf8( commandline + argpos, marker ) );
+        argpos += marker;
+    }
+
+    return result;
+}
+
+KDSingleApplicationGuard::Private::~Private()
+{
+    if( primaryInstance == q )
+        primaryInstance = 0;
+}
+
+bool KDSingleApplicationGuard::Private::checkOperational( const char * function, const char * act ) const
+{
+    assert( function );
+    assert( act );
+    if ( !operational )
+        qWarning( "KDSingleApplicationGuard::%s: need to be operational to %s", function, act );
+    return operational;
+}
+
+bool KDSingleApplicationGuard::Private::checkOperationalPrimary( const char * function, const char * act ) const
+{
+    if ( !checkOperational( function, act ) )
+        return false;
+    if ( id != 0 )
+        qWarning( "KDSingleApplicationGuard::%s: need to be primary to %s", function, act );
+    return id == 0;
+}
+
+struct segmentheader
+{
+    size_t size : 16;
+};
+
+void KDSingleApplicationGuard::Private::sharedmem_free( char* pointer )
+{
+    InstanceRegister* const reg = reinterpret_cast<InstanceRegister*>( KDSingleApplicationGuard::Private::primaryInstance->d->mem.data() );
+    char* const heap = reg->commandLines;
+    char* const heap_ptr = heap + reinterpret_cast<long>(pointer) - sizeof( segmentheader );
+    const segmentheader* const header = reinterpret_cast< const segmentheader* >( heap_ptr );
+    const size_t size = header->size;
+
+    char* end = heap + KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE;
+
+    std::copy( heap_ptr + size, end, heap_ptr );
+    std::fill( end - size, end, 0 );
+
+    for( uint i = 0; i < reg->maxInstances; ++i )
     {
-        if( primaryInstance == q )
-            primaryInstance = 0;
+        if( reg->info i .commandline > pointer )
+            reg->info i .commandline -= size + sizeof( segmentheader );
     }
+}
+
+char* KDSingleApplicationGuard::Private::sharedmem_malloc( size_t size )
+{
+    InstanceRegister* const reg = reinterpret_cast<InstanceRegister*>( KDSingleApplicationGuard::Private::primaryInstance->d->mem.data() );
+    char* heap = reg->commandLines;
 
-    void shutdownInstance()
+    while( heap + sizeof( segmentheader ) + size < reg->commandLines + KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE )
     {
-        KDLockedSharedMemoryPointer< InstanceRegister > instances( &q->d->mem );
-        instances->info q->d->id .command = ExitedInstance;
+        segmentheader* const header = reinterpret_cast< segmentheader* >( heap );
+        if( header->size == 0 )
+        {
+            header->size = size;
+            return heap + sizeof( segmentheader ) - reinterpret_cast<long>(reg->commandLines);
+        }
+        heap += sizeof( header ) + header->size;
+    }
+    return 0;
+}
+
+void KDSingleApplicationGuard::Private::shutdownInstance()
+{
+    KDLockedSharedMemoryPointer< InstanceRegister > instances( &q->d->mem );
+    instances->info q->d->id .command |= ExitedInstance;
 
-        if( q->isPrimaryInstance() )
+    if( q->isPrimaryInstance() )
+    {
+        // ohh... we need a new primary instance...
+        for ( int i = 1, end = instances->maxInstances ; i  < end ; ++i )
         {
-            // ohh... we need a new primary instance...
-            for( int i = 1; i < KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES; ++i )
+            if( ( instances->info i .command & ( FreeInstance | ExitedInstance | ShutDownCommand | KillCommand ) ) == 0 )
             {
-                if( ( instances->info i .command & ( FreeInstance | ExitedInstance | ShutDownCommand | KillCommand ) ) == 0 )
-                {
-                    instances->info i .command |= BecomePrimaryCommand;
-                    return;
-                }
+                instances->info i .command |= BecomePrimaryCommand;
+                return;
             }
-            // none found? then my species is dead :-(
         }
+        // none found? then my species is dead :-(
     }
+}
 
-    static KDSingleApplicationGuard* primaryInstance;
+KDSingleApplicationGuard* KDSingleApplicationGuard::Private::primaryInstance = 0;
 
-private:
-    KDSingleApplicationGuard* const q;
+/*!
+  Requests that the instance kills itself (by emitting exitRequested).
 
-public:
-    Policy policy;
-    QSharedMemory mem;
-    int id;
-};
+  If the instance has since exited, does nothing.
+
+  \sa shutdown(), raise()
+*/
+void KDSingleApplicationGuard::Instance::kill()
+{
+    KDLockedSharedMemoryPointer< InstanceRegister > instances( &KDSingleApplicationGuard::Private::primaryInstance->d->mem );
+    for ( int i = 0, end = instances->maxInstances ; i < end ; ++i )
+    {
+        if( instances->info i .pid != d->pid )
+           continue;
+        if( ( instances->info i .command & ( FreeInstance | ExitedInstance ) ) == 0 )
+            instances->info i .command = KillCommand;
+    }
+}
+
+/*!
+  Requests that the instance shuts itself down (by calling QCoreApplication::quit()).
+
+  If the instance has since exited, does nothing.
+
+  \sa kill(), raise()
+*/
+void KDSingleApplicationGuard::Instance::shutdown()
+{
+    KDLockedSharedMemoryPointer< InstanceRegister > instances( &KDSingleApplicationGuard::Private::primaryInstance->d->mem );
+    for ( int i = 0, end = instances->maxInstances ; i < end ; ++i )
+    {
+        if( instances->info i .pid != d->pid )
+           continue;
+        if( ( instances->info i .command & ( FreeInstance | ExitedInstance ) ) == 0 )
+            instances->info i .command = ShutDownCommand;
+    }
+}
+
+/*!
+
+  Requests that the instance raises its main window.
+
+  The effects are implementation-defined: the KDSingleApplicationGuard
+  corresponding to the instance will emit its \link
+  KDSingleApplicationGuard::raiseRequested() raiseRequested()\endlink
+  signal.
+
+  If the instance has since exited, does nothing.
+
+  \sa kill(), shutdown()
+*/
+void KDSingleApplicationGuard::Instance::raise()
+{
+    KDLockedSharedMemoryPointer< InstanceRegister > instances( &KDSingleApplicationGuard::Private::primaryInstance->d->mem );
+    for ( int i = 0, end = instances->maxInstances ; i < end ; ++i )
+    {
+        if( instances->info i .pid != d->pid )
+           continue;
+        if( ( instances->info i .command & ( FreeInstance | ExitedInstance ) ) == 0 )
+            instances->info i .command = RaiseCommand;
+    }
+}
 
-KDSingleApplicationGuard* KDSingleApplicationGuard::Private::primaryInstance = 0;
 
 #ifndef Q_WS_WIN
-void SIGINT_handler( int sig )
+// static
+void KDSingleApplicationGuard::SIGINT_handler( int sig )
 {
-    if( sig == SIGINT && KDSingleApplicationGuard::Private::primaryInstance != 0 )
-        KDSingleApplicationGuard::Private::primaryInstance->d->shutdownInstance();
+    if( sig == SIGINT && Private::primaryInstance != 0 )
+        Private::primaryInstance->d->shutdownInstance();
     ::exit( 1 );
 }
 #endif
 
 /*!
- *  Creates a new KDSingleApplicationGuard guarding \a parent from mulitply instances.
- *  If \a policy is AutoKillOtherInstances (the default), all instances, which try to start,
- *  are killed automatically and instanceStarted() is emitted.
- *  If \a policy is NoPolicy, the other instance will run and instanceStarted() is emitted.
- */
-KDSingleApplicationGuard::KDSingleApplicationGuard( QCoreApplication* parent, Policy policy )
-: QObject( parent ),
-d( new Private( this ) )
+  \enum KDSingleApplicationGuard::Policy
+
+  Defines the policy that a KDSingleApplicationGuard can enforce:
+*/
+
+/*!
+  \var KDSingleApplicationGuard::NoPolicy
+
+  instanceStarted() is emitted, and the new instance allowed to continue.
+*/
+
+/*!
+  \var KDSingleApplicationGuard::AutoKillOtherInstances
+
+  instanceStarted() is emitted, and the new instance is killed (Instance::kill()).
+*/
+
+/*!
+  Creates a new KDSingleApplicationGuard with arguments
+  QCoreApplication::arguments() and policy AutoKillOtherInstances,
+  passing \a parent to the base class constructor, as usual.
+*/
+KDSingleApplicationGuard::KDSingleApplicationGuard( QObject * parent )
+    : QObject( parent ), d( new Private( AutoKillOtherInstances, this ) )
+{
+    d->create( QCoreApplication::arguments() );
+}
+
+/*!
+  Creates a new KDSingleApplicationGuard with arguments
+  QCoreApplication::arguments() and policy \a policy, passing \a
+  parent to the base class constructor, as usual.
+*/
+KDSingleApplicationGuard::KDSingleApplicationGuard( Policy policy, QObject * parent )
+    : QObject( parent ), d( new Private( policy, this ) )
+{
+    d->create( QCoreApplication::arguments() );
+}
+
+/*!
+  Creates a new KDSingleApplicationGuard with arguments \a arguments
+  and policy AutoKillOtherInstances, passing \a parent to the base
+  class constructor, as usual.
+*/
+KDSingleApplicationGuard::KDSingleApplicationGuard( const QStringList & arguments, QObject * parent )
+    : QObject( parent ), d( new Private( AutoKillOtherInstances, this ) )
+{
+    d->create( arguments );
+}
+
+/*!
+  Creates a new KDSingleApplicationGuard with arguments \a arguments
+  and policy \a policy, passing \a parent to the base class
+  constructor, as usual.
+*/
+KDSingleApplicationGuard::KDSingleApplicationGuard( const QStringList & arguments, Policy policy, QObject * parent )
+    : QObject( parent ), d( new Private( policy, this ) )
+{
+    d->create( arguments );
+}
+
+KDSingleApplicationGuard::Private::Private( Policy policy_, KDSingleApplicationGuard * qq )
+    : q( qq ),
+      id( -1 ),
+      policy( policy_ ),
+      operational( false ),
+      exitRequested( false )
+{
+}
+
+void KDSingleApplicationGuard::Private::create( const QStringList & arguments )
 {
-    const QString name = parent->applicationName();
-    Q_ASSERT_X( !name.isEmpty(), "KDSingleApplicationGuard::KDSingleApplicationGuard", "applicationName must not be emty" );
-    d->mem.setKey( name );
+    if ( !QCoreApplication::instance() ) {
+        qWarning( "KDSingleApplicationGuard: you need to construct a Q(Core)Application before you can construct a KDSingleApplicationGuard" );
+        return;
+    }
+
+    const QString name = QCoreApplication::applicationName();
+    if ( name.isEmpty() ) {
+        qWarning( "KDSingleApplicationGuard: QCoreApplication::applicationName must not be emty" );
+        return;
+    }
+
+    (void)registerInstanceType();
+    if ( primaryInstance == 0 )
+        primaryInstance = q;
+
+    mem.setKey( name );
 
     // if another instance crashed, the shared memory segment is still there on Unix
     // the following lines trigger deletion in that case
-    #ifndef Q_WS_WIN
-    d->mem.attach();
-    d->mem.detach();
-    #endif
-
-    d->policy = policy;
+#ifndef Q_WS_WIN
+    mem.attach();
+    mem.detach();
+#endif
 
-    const bool created = d->mem.create( sizeof( InstanceRegister ) );
+    const bool created = mem.create( sizeof( InstanceRegister ) );
     if( !created )
     {
-        if( !d->mem.attach() )
+        QString errorMsg;
+        if( mem.error() != QSharedMemory::NoError && mem.error() != QSharedMemory::AlreadyExists )
+            errorMsg += QString::fromLatin1( "QSharedMemomry::create() failed: %1" ).arg( mem.errorString() );
+
+        if( !mem.attach() )
         {
+            if( mem.error() != QSharedMemory::NoError )
+                errorMsg += QString::fromLatin1( "QSharedMemomry::attach() failed: %1" ).arg( mem.errorString() );
+
             qWarning( "KDSingleApplicationGuard: Could neither create nor attach to shared memory segment." );
+            qWarning( "%s\n",  errorMsg.toLocal8Bit().constData() );
             return;
         }
 
+        const int maxWaitMSecs = 1000 * 60; // stop waiting after 60 seconds
+        QTime waitTimer;
+        waitTimer.start();
+
         // lets wait till the other instance initialized the register
         bool initialized = false;
-        while( !initialized )
+        while( !initialized && waitTimer.elapsed() < maxWaitMSecs )
         {
-            const KDLockedSharedMemoryPointer< InstanceRegister > instances( &d->mem );
+            const KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem );
             initialized = instances->isValid();
+#ifdef Q_WS_WIN
+            ::Sleep(20);
+#else
+            usleep(20000);
+#endif
+        }
+
+        const KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem );
+        if ( instances->version != 0 ) {
+            qWarning( "KDSingleApplicationGuard: Detected version mismatch. "
+                      "Highest supported version: %ud, actual version: %ud",
+                      KDSINGLEAPPLICATIONGUARD_SHM_VERSION, instances->version );
+            return;
         }
+
     }
 
-    bool killMyself = false;
+
+    KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem );
+
+    if( !created )
     {
-        KDLockedSharedMemoryPointer< InstanceRegister > instances( &d->mem );
+        assert( instances->isValid() );
 
-        if( !created )
-        {
-            // we're _not_ the first instance
-            // but the
-            bool killOurSelf = false;
-
-            // find a new slot...
-            d->id = std::find( instances->info, instances->info + KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES, ProcessInfo() ) - instances->info;
-            ProcessInfo& info = instances->info d->id ;
-            info = ProcessInfo( NewInstance, parent->arguments(), QCoreApplication::applicationPid() );
-            killOurSelf = instances->policy == AutoKillOtherInstances;
-            d->policy = instances->policy;
-
-            // but the signal that we tried to start was sent to the primary application
-            if( killOurSelf )
-            {
-                info.command |= ExitedInstance;
-                killMyself = true;
-            }
-        }
-        else
-        {
-            // ok.... we are the first instance
-            InstanceRegister reg( policy );        // create a new list
-            d->id = 0;                             // our id = 0
-            // and we've no command
-            reg.info 0  = ProcessInfo( NoCommand, parent->arguments(), QCoreApplication::applicationPid() );
-            *instances = reg;                      // push this is the process list into shared memory
-        }
+        // we're _not_ the first instance
+        // but the
+        bool killOurSelf = false;
+
+        // find a new slot...
+        id = std::find( instances->info, instances->info + instances->maxInstances, ProcessInfo() ) - instances->info;
+        ProcessInfo& info = instances->info id ;
+        info = ProcessInfo( NewInstance, arguments, QCoreApplication::applicationPid() );
+        killOurSelf = instances->policy == AutoKillOtherInstances;
+        policy = static_cast<Policy>( instances->policy );
+
+        // but the signal that we tried to start was sent to the primary application
+        if( killOurSelf )
+            exitRequested = true;
     }
-    // call exit after we let the locker release our memory, as exit() is not guaranteed to clean up objects on the stack
-    if ( killMyself )
-        exit( 1 );
+    else
+    {
+        // ok.... we are the first instance
+        new ( instances.get() ) InstanceRegister( policy ); // create a new list (in shared memory)
+        id = 0;                                             // our id = 0
+        // and we've no command
+        instances->info 0  = ProcessInfo( NoCommand, arguments, QCoreApplication::applicationPid() );
+    }
+
+#ifndef Q_WS_WIN
+    ::signal( SIGINT, SIGINT_handler );
+#endif
 
-    #ifndef Q_WS_WIN
-        ::signal( SIGINT, SIGINT_handler );
-        #endif
+    // now listen for commands
+    timer.start( 750, q );
 
-        // now listen for commands
-        startTimer( 250 );
+    operational = true;
 }
 
 /*!
- *  Destroys this SingleApplicationGuard.
- *  If this instance has been the primary instance and no other instance is existing anymore,
- *  the application is shut down completely. Otherwise the destructor selects another instance to
- *  be the primary instances.
+  Destroys this SingleApplicationGuard.
+  If this instance has been the primary instance and no other instance is existing anymore,
+  the application is shut down completely. Otherwise the destructor selects another instance to
+  be the primary instances.
  */
 KDSingleApplicationGuard::~KDSingleApplicationGuard()
 {
@@ -359,14 +838,48 @@
 }
 
 /*!
- *  \property KDSingleApplicationGuard::primaryInstance
- *   Determines wheter this instance is the primary instance.
- *   The primary instance is the first instance which was started or an instance which
- *   got selected by KDSingleApplicationGuard's destructor, when the primary instance was
- *   shut down.
- *
- *   Get this property's value using %isPrimaryInstance(), and monitor changes to it
- *   using becamePrimaryInstance().
+  \property KDSingleApplicationGuard::operational
+
+  Contains whether this KDSingleApplicationGuard is operational.
+
+  A non-operational KDSingleApplicationGuard cannot be used in any meaningful way.
+
+  Reasons for a KDSingleApplicationGuard being non-operational include:
+  \li it was constructed before QApplication (or at least QCoreApplication) was constructed
+  \li it failed to create or attach to the shared memory segment that is used for communication
+
+  Get this property's value using %isOperational().
+*/
+bool KDSingleApplicationGuard::isOperational() const
+{
+    return d->operational;
+}
+
+/*!
+  \property KDSingleApplicationGuard::exitRequested
+
+  Contains wheter this istance has been requested to exit. This will happen when this instance
+  was just started, but the policy is AutoKillOtherInstances or by explicitely calling kill on
+  this instance().
+
+  Get this property's value using %isExitRequested().
+*/
+bool KDSingleApplicationGuard::isExitRequested() const
+{
+    return d->exitRequested;
+};
+
+/*!
+  \property KDSingleApplicationGuard::primaryInstance
+
+   Contains whether this instance is the primary instance.
+
+   The primary instance is the first instance which was started or else the instance which
+   got selected by KDSingleApplicationGuard's destructor, when the primary instance was
+   shut down.
+
+   Get this property's value using %isPrimaryInstance(), and monitor changes to it
+   using becamePrimaryInstance().
  */
 bool KDSingleApplicationGuard::isPrimaryInstance() const
 {
@@ -374,12 +887,12 @@
 }
 
 /*!
- * \property KDSingleApplicationGuard::Policy
- * Specifies the policy KDSingleApplicationGuard is using when new instances are started.
- * This can only be set in the primary instance.
- *
- * Get this property's value using %policy(), set it using %setPolicy(), and monitor changes
- * to it using policyChanged().
+ \property KDSingleApplicationGuard::policy
+ Specifies the policy KDSingleApplicationGuard is using when new instances are started.
+ This can only be set in the primary instance.
+
+ Get this property's value using %policy(), set it using %setPolicy(), and monitor changes
+ to it using policyChanged().
  */
 KDSingleApplicationGuard::Policy KDSingleApplicationGuard::policy() const
 {
@@ -388,42 +901,58 @@
 
 void KDSingleApplicationGuard::setPolicy( Policy policy )
 {
-    Q_ASSERT( isPrimaryInstance() );
+    if ( !d->checkOperationalPrimary( "setPolicy", "change the policy" ) )
+        return;
+
     if( d->policy == policy )
         return;
 
     d->policy = policy;
-    emit policyChanged();
+    emit policyChanged( policy );
     KDLockedSharedMemoryPointer< InstanceRegister > instances( &d->mem );
     instances->policy = policy;
 }
 
 /*!
- * Returns a list of all currently running instances.
+ Returns a list of all currently running instances.
  */
-QList< KDSingleApplicationGuard::Instance > KDSingleApplicationGuard::instances() const
+QVector<KDSingleApplicationGuard::Instance>
+KDSingleApplicationGuard::instances() const
 {
-    QList< Instance > result;
+    if ( !d->checkOperational( "instances", "report on other instances" ) )
+        return QVector<Instance>();
+
+    if ( Private::primaryInstance == 0 ) {
+        Private::primaryInstance = const_cast<KDSingleApplicationGuard*>( this );
+    }
+
+    QVector<Instance> result;
     const KDLockedSharedMemoryPointer< InstanceRegister > instances( const_cast< QSharedMemory* >( &d->mem ) );
-    for( int i = 0; i < KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES; ++i )
+    for ( int i = 0, end = instances->maxInstances ; i < end ; ++i )
     {
         const ProcessInfo& info = instances->info i ;
         if( ( info.command & ( FreeInstance | ExitedInstance ) ) == 0 )
-            result.push_back( Instance( info.arguments(), info.pid ) );
+        {
+            bool truncated;
+            const QStringList arguments = info.arguments( &truncated );
+            result.push_back( Instance( arguments, truncated, info.pid ) );
+        }
     }
     return result;
 }
 
 /*!
- *  Shuts down all other instances. This can only be called from the
- *  the primary instance.
- *  Shut down is done gracefully via QCoreApplication::quit().
+  Shuts down all other instances. This can only be called from the
+  the primary instance.
+  Shut down is done gracefully via QCoreApplication::quit().
  */
 void KDSingleApplicationGuard::shutdownOtherInstances()
 {
-    Q_ASSERT( isPrimaryInstance() );
+    if ( !d->checkOperationalPrimary( "shutdownOtherInstances", "shut other instances down" ) )
+        return;
+
     KDLockedSharedMemoryPointer< InstanceRegister > instances( &d->mem );
-    for( int i = 1; i < KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES; ++i )
+    for ( int i = 1, end = instances->maxInstances ; i < end ; ++i )
     {
         if( ( instances->info i .command & ( FreeInstance | ExitedInstance ) ) == 0 )
             instances->info i .command = ShutDownCommand;
@@ -431,58 +960,91 @@
 }
 
 /*!
- *  Kills all other instances. This can only be called from the
- *  the primary instance.
- *  Killing is done via exit(1)
+  Kills all other instances. This can only be called from the
+  the primary instance.
+  Killing is done via emitting exitRequested. It's up to the receiving
+  instance to react properly.
  */
 void KDSingleApplicationGuard::killOtherInstances()
 {
-    Q_ASSERT( isPrimaryInstance() );
+    if ( !d->checkOperationalPrimary( "killOtherInstances", "kill other instances" ) )
+        return;
+
     KDLockedSharedMemoryPointer< InstanceRegister > instances( &d->mem );
-    for( int i = 1; i < KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES; ++i )
+    for ( int i = 1, end = instances->maxInstances ; i < end ; ++i )
     {
         if( ( instances->info i .command & ( FreeInstance | ExitedInstance ) ) == 0 )
             instances->info i .command = KillCommand;
     }
 }
 
-/*!
- *  \reimp
- */
-void KDSingleApplicationGuard::timerEvent( QTimerEvent* event )
+bool KDSingleApplicationGuard::event( QEvent * event )
 {
-    Q_UNUSED( event )
+    if ( event->type() == QEvent::Timer ) {
+        const QTimerEvent * const te = static_cast<QTimerEvent*>( event );
+        if ( te->timerId() == d->timer.timerId() ) {
+            d->poll();
+            return true;
+        }
+    }
+    return QObject::event( event );
+}
 
-    if( isPrimaryInstance() )
+void KDSingleApplicationGuard::Private::poll() {
+
+    const quint32 now = QDateTime::currentDateTime().toTime_t();
+
+    if ( primaryInstance == 0 ) {
+        primaryInstance = q;
+    }
+
+    if ( q->isPrimaryInstance() )
     {
         // only the primary instance will get notified about new instances
-        QList< Instance > exitedInstances;
-        QList< Instance > startedInstances;
+        QVector< Instance > exitedInstances;
+        QVector< Instance > startedInstances;
 
         {
-            KDLockedSharedMemoryPointer< InstanceRegister > instances( &d->mem );
+            KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem );
 
-            for( int i = 1; i < KDSINGLEAPPLICATIONGUARD_NUMBER_OF_PROCESSES; ++i )
+            if( instances->info id .pid != QCoreApplication::applicationPid() )
+            {
+                for ( int i = 1, end = instances->maxInstances ; i < end && id == 0 ; ++i )
+                {
+                    if( instances->info i .pid == QCoreApplication::applicationPid() )
+                        id = i;
+                }
+                emit q->becameSecondaryInstance();
+                return;
+            }
+
+            instances->info id .timestamp = now;
+
+            for ( int i = 1, end = instances->maxInstances ; i < end ; ++i )
             {
                 ProcessInfo& info = instances->info i ;
                 if( info.command & NewInstance )
                 {
-                    startedInstances.push_back( Instance( info.arguments(), info.pid ) );
+                    bool truncated;
+                    const QStringList arguments = info.arguments( &truncated );
+                    startedInstances.push_back( Instance( arguments, truncated, info.pid ) );
                     info.command &= ~NewInstance;  // clear NewInstance flag
                 }
-                else if( info.command & ExitedInstance )
+                if( info.command & ExitedInstance )
                 {
-                    exitedInstances.push_back( Instance( info.arguments(), info.pid ) );
+                    bool truncated;
+                    const QStringList arguments = info.arguments( &truncated );
+                    exitedInstances.push_back( Instance( arguments, truncated, info.pid ) );
                     info.command = FreeInstance;   // set FreeInstance flag
                 }
             }
         }
 
         // one signal for every new instance - _after_ the memory segment was unlocked again
-        for( QList< Instance >::const_iterator it = startedInstances.begin(); it != startedInstances.end(); ++it )
-            emit instanceStarted( *it );
-        for( QList< Instance >::const_iterator it = exitedInstances.begin(); it != exitedInstances.end(); ++it )
-            emit instanceExited( *it );
+        for( QVector< Instance >::const_iterator it = startedInstances.constBegin(); it != startedInstances.constEnd(); ++it )
+            emit q->instanceStarted( *it );
+        for( QVector< Instance >::const_iterator it = exitedInstances.constBegin(); it != exitedInstances.constEnd(); ++it )
+            emit q->instanceExited( *it );
     }
     else
     {
@@ -492,58 +1054,83 @@
         bool policyDidChange = false;
 
         {
-            KDLockedSharedMemoryPointer< InstanceRegister > instances( &d->mem );
+            KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem );
 
-            policyDidChange = instances->policy != d->policy;
-            d->policy = instances->policy;
+            const Policy oldPolicy = policy;
+            policy = static_cast<Policy>( instances->policy );
+            policyDidChange = policy != oldPolicy;
 
-            if( instances->info d->id .command & BecomePrimaryCommand )
+            // check for the primary instance health status
+            if( now - instances->info 0 .timestamp > KDSINGLEAPPLICATIONGUARD_TIMEOUT_SECONDS )
+            {
+                std::swap( instances->info 0 , instances->info id  );
+                id = 0;
+                instances->info id .timestamp = now;
+                emit q->becamePrimaryInstance();
+                instances->info id .command &= ~BecomePrimaryCommand;  // afterwards, reset the flag
+            }
+
+            if( instances->info id .command & BecomePrimaryCommand )
             {
                 // we became primary!
-                instances->info 0  = instances->info d->id ;
-                instances->info d->id  = ProcessInfo();  // change our id to 0 and declare the old slot as free
-                d->id = 0;
-                emit becamePrimaryInstance();
+                instances->info 0  = instances->info id ;
+                instances->info id  = ProcessInfo();  // change our id to 0 and declare the old slot as free
+                id = 0;
+                instances->info id .timestamp = now;
+                emit q->becamePrimaryInstance();
+            }
+
+            if( instances->info id .command & RaiseCommand )
+            {
+               // raise ourself!
+               emit q->raiseRequested();
+               instances->info id .command &= ~RaiseCommand;  // afterwards, reset the flag
             }
 
-            killOurSelf = instances->info d->id .command & KillCommand;            // check for kill command
-            shutDownOurSelf = instances->info d->id .command & ShutDownCommand;    // check for shut down command
-            instances->info d->id .command &= ~( KillCommand | ShutDownCommand | BecomePrimaryCommand );  // reset both flags
+
+            killOurSelf = instances->info id .command & KillCommand;            // check for kill command
+            shutDownOurSelf = instances->info id .command & ShutDownCommand;    // check for shut down command
+            instances->info id .command &= ~( KillCommand | ShutDownCommand | BecomePrimaryCommand );  // reset both flags
             if( killOurSelf )
             {
-                instances->info d->id .command |= ExitedInstance;  // upon kill, we have to set the ExitedInstance flag
-                d->id = -1;                                          // becauso our d'tor won't be called anymore
+                instances->info id .command |= ExitedInstance;  // upon kill, we have to set the ExitedInstance flag
+                id = -1;                                          // becauso our d'tor won't be called anymore
             }
         }
 
         if( killOurSelf )  // kill our self takes precedence
-            exit( 1 );
+        {
+            exitRequested = true;
+            emit q->exitRequested();
+        }
         else if( shutDownOurSelf )
             qApp->quit();
         else if( policyDidChange )
-            emit policyChanged();
+            emit q->policyChanged( policy );
     }
 }
 
+#include "moc_kdsingleapplicationguard.cpp"
+
 #ifdef KDTOOLSCORE_UNITTESTS
 
 #include <kdunittest/test.h>
 
+#include "kdautopointer.h"
+
 #include <iostream>
 
 #include <QtCore/QTime>
 #include <QtCore/QUuid>
 #include <QtTest/QSignalSpy>
 
-Q_DECLARE_METATYPE( KDSingleApplicationGuard::Instance );
-
-static void wait( int msec )
+static void wait( int msec, QSignalSpy * spy=0, int expectedCount=INT_MAX )
 {
     QTime t;
     t.start();
-    while( t.elapsed() < msec )
+    while ( ( !spy || spy->count() < expectedCount ) && t.elapsed() < msec )
     {
-        qApp->processEvents( QEventLoop::WaitForMoreEvents, msec - t.elapsed() );
+        qApp->processEvents( QEventLoop::WaitForMoreEvents, qMax( 10, msec - t.elapsed() ) );
     }
 }
 
@@ -560,19 +1147,33 @@
     return stream;
 }
 
+namespace {
+    class ApplicationNameSaver {
+        Q_DISABLE_COPY( ApplicationNameSaver )
+        const QString oldname;
+    public:
+        explicit ApplicationNameSaver( const QString & name )
+            : oldname( QCoreApplication::applicationName() )
+        {
+            QCoreApplication::setApplicationName( name );
+        }
+        ~ApplicationNameSaver() {
+            QCoreApplication::setApplicationName( oldname );
+        }
+    };
+}
 
 KDAB_UNITTEST_SIMPLE( KDSingleApplicationGuard, "kdcoretools" ) {
 
     // set it to an unique name
-    qApp->setApplicationName( QUuid::createUuid().toString() );
-
-    qRegisterMetaType< KDSingleApplicationGuard::Instance >();
+    const ApplicationNameSaver saver( QUuid::createUuid().toString() );
 
-    KDSingleApplicationGuard* guard3 = 0;
-    QSignalSpy* spy3 = 0;
+    KDAutoPointer<KDSingleApplicationGuard> guard3;
+    KDAutoPointer<QSignalSpy> spy3;
+    KDAutoPointer<QSignalSpy> spy4;
 
     {
-        KDSingleApplicationGuard guard1( qApp );
+        KDSingleApplicationGuard guard1;
         assertEqual( guard1.policy(), KDSingleApplicationGuard::AutoKillOtherInstances );
         assertEqual( guard1.instances().count(), 1 );
         assertTrue( guard1.isPrimaryInstance() );
@@ -580,48 +1181,67 @@
         guard1.setPolicy( KDSingleApplicationGuard::NoPolicy );
         assertEqual( guard1.policy(), KDSingleApplicationGuard::NoPolicy );
 
-        QSignalSpy spy1( &guard1, SIGNAL( instanceStarted( KDSingleApplicationGuard::Instance ) ) );
+        QSignalSpy spy1( &guard1, SIGNAL(instanceStarted(KDSingleApplicationGuard::Instance)) );
 
-        KDSingleApplicationGuard guard2( qApp );
+        KDSingleApplicationGuard guard2;
         assertEqual( guard1.instances().count(), 2 );
         assertEqual( guard2.instances().count(), 2 );
         assertEqual( guard2.policy(), KDSingleApplicationGuard::NoPolicy );
         assertFalse( guard2.isPrimaryInstance() );
 
-        wait( 1000 );
+        wait( 1000, &spy1, 1 );
 
         assertEqual( spy1.count(), 1 );
-        guard3 = new KDSingleApplicationGuard( qApp );
-        spy3 = new QSignalSpy( guard3, SIGNAL( becamePrimaryInstance() ) );
+        guard3.reset( new KDSingleApplicationGuard );
+        spy3.reset( new QSignalSpy( guard3.get(), SIGNAL(becamePrimaryInstance()) ) );
+        spy4.reset( new QSignalSpy( guard3.get(), SIGNAL(instanceExited(KDSingleApplicationGuard::Instance) ) ) );
         assertFalse( guard3->isPrimaryInstance() );
     }
 
-    wait( 1000 );
+    wait( 1000, spy3.get(), 1 );
+    wait( 1000, spy4.get(), 1 );
     assertEqual( spy3->count(), 1 );
     assertEqual( guard3->instances().count(), 1 );
     assertTrue( guard3->isPrimaryInstance() );
+    guard3.reset( new KDSingleApplicationGuard );
 
-    assertEqual( guard3->instances().first().arguments, qApp->arguments() );
+    assertEqual( guard3->instances().first().arguments(), qApp->arguments() );
 
-    QSignalSpy spyStarted( guard3, SIGNAL( instanceStarted( KDSingleApplicationGuard::Instance ) ) );
-    QSignalSpy spyExited( guard3, SIGNAL( instanceExited( KDSingleApplicationGuard::Instance ) ) );
+    QSignalSpy spyStarted( guard3.get(), SIGNAL(instanceStarted(KDSingleApplicationGuard::Instance)) );
+    QSignalSpy spyExited(  guard3.get(), SIGNAL(instanceExited(KDSingleApplicationGuard::Instance)) );
 
     {
-        KDSingleApplicationGuard guard1( qApp );
-        KDSingleApplicationGuard guard2( qApp );
+        KDSingleApplicationGuard guard1;
+        KDSingleApplicationGuard guard2;
 
-        wait( 1000 );
+        wait( 1000, &spyStarted, 2 );
 
         assertEqual( spyStarted.count(), 2 );
     }
 
-    wait( 1000 );
+    wait( 1000, &spyExited, 2 );
     assertEqual( spyExited.count(), 2 );
 
-    delete spy3;
-    delete guard3;
+    spyStarted.clear();
+    spyExited.clear();
+
+    {
+        // check arguments-too-long handling:
+        QStringList args;
+        for ( unsigned int i = 0, end = KDSINGLEAPPLICATIONGUARD_MAX_COMMAND_LINE/16 ; i != end ; ++i )
+            args.push_back( QLatin1String( "0123456789ABCDEF" ) );
+        KDSingleApplicationGuard guard3( args );
+
+        wait( 1000, &spyStarted, 1 );
+
+        const QVector<KDSingleApplicationGuard::Instance> instances = guard3.instances();
+        assertEqual( instances.size(), 2 );
+
+        assertTrue( instances1.areArgumentsTruncated() );
+    }
 }
 
 #endif // KDTOOLSCORE_UNITTESTS
 
-#endif // QT_VERSION < 0x040400
+#endif // QT_NO_SHAREDMEMORY
+#endif // QT_VERSION >= 0x040400 || defined(DOXYGEN_RUN)

tomahawk-0.4.2.tar.bz2/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h Changed

@@ -2,24 +2,29 @@
 #define __KDTOOLSCORE_KDSINGLEAPPLICATIONGUARD_H__
 
 #include <QtCore/QObject>
+
+#if QT_VERSION >= 0x040400 || defined(DOXYGEN_RUN)
+#ifndef QT_NO_SHAREDMEMORY
+
 #include <QtCore/QStringList>
+#include <QtCore/QMetaType>
 
 #include "pimpl_ptr.h"
-#include "dllmacro.h"
+#include "DllMacro.h"
 
-class QCoreApplication;
+#include <algorithm>
 
-#ifndef Q_WS_WIN
-void SIGINT_handler( int sig );
-#endif
+template <typename T> class QVector;
+class QCoreApplication;
 
 class DLLEXPORT KDSingleApplicationGuard : public QObject
 {
     Q_OBJECT
-#ifndef Q_WS_WIN
-    friend void ::SIGINT_handler( int );
-#endif
-
+    Q_ENUMS( Policy )
+    Q_PROPERTY( bool operational READ isOperational )
+    Q_PROPERTY( bool exitRequested READ isExitRequested )
+    Q_PROPERTY( bool primaryInstance READ isPrimaryInstance NOTIFY becamePrimaryInstance )
+    Q_PROPERTY( Policy policy READ policy WRITE setPolicy NOTIFY policyChanged )
 public:
     enum Policy
     {
@@ -27,49 +32,112 @@
         AutoKillOtherInstances = 1
     };
 
-    Q_PROPERTY( bool primaryInstance READ isPrimaryInstance NOTIFY becamePrimaryInstance )
-    Q_PROPERTY( Policy policy READ policy WRITE setPolicy NOTIFY policyChanged )
-
-    explicit KDSingleApplicationGuard( QCoreApplication* parent, Policy policy = AutoKillOtherInstances );
+    explicit KDSingleApplicationGuard( QObject * parent=0 );
+    explicit KDSingleApplicationGuard( Policy policy, QObject * parent=0 );
+    explicit KDSingleApplicationGuard( const QStringList & arguments, QObject * parent=0 );
+    explicit KDSingleApplicationGuard( const QStringList & arguments, Policy policy, QObject * parent=0 );
     ~KDSingleApplicationGuard();
 
+    bool isOperational() const;
+
+    bool isExitRequested() const;
+
     bool isPrimaryInstance() const;
-    
+
     Policy policy() const;
     void setPolicy( Policy policy );
 
-    struct Instance 
-    {
-        Instance( const QStringList& arguments = QStringList(), qint64 pid = -1 );
-
-        QStringList arguments;
-        qint64 pid;
-    };
+    class Instance;
 
-    QList< Instance > instances() const;
+    QVector<Instance> instances() const;
 
 Q_SIGNALS:
-    void instanceStarted( KDSingleApplicationGuard::Instance instance );
-    void instanceExited( KDSingleApplicationGuard::Instance instance );
+    void instanceStarted( const KDSingleApplicationGuard::Instance & instance );
+    void instanceExited( const KDSingleApplicationGuard::Instance & instance );
+    void exitRequested();
+    void raiseRequested();
     void becamePrimaryInstance();
-    void policyChanged();
+    void becameSecondaryInstance();
+    void policyChanged( KDSingleApplicationGuard::Policy policy );
 
 public Q_SLOTS:
     void shutdownOtherInstances();
     void killOtherInstances();
 
 protected:
-    void timerEvent( QTimerEvent* event );
+    /*! \reimp */ bool event( QEvent * event );
+
+private:
+#ifndef Q_WS_WIN
+    static void SIGINT_handler( int );
+#endif
 
 private:
+    friend struct ProcessInfo;
+
     class Private;
     kdtools::pimpl_ptr< Private > d;
 };
 
-#if QT_VERSION < 0x040400
-#ifdef Q_CC_GNU
-#warning "Can't use KDSingleApplicationGuard with Qt versions prior to 4.4"
-#endif
-#endif
+class DLLEXPORT KDSingleApplicationGuard::Instance {
+    friend class ::KDSingleApplicationGuard;
+    friend class ::KDSingleApplicationGuard::Private;
+    Instance( const QStringList &, bool, qint64 );
+public:
+    Instance();
+    Instance( const Instance & other );
+    ~Instance();
 
-#endif
+    void swap( Instance & other ) {
+        std::swap( d, other.d );
+    }
+
+    Instance & operator=( Instance other ) {
+        swap( other );
+        return *this;
+    }
+
+    bool isNull() const { return !d; }
+    bool isValid() const;
+
+    bool areArgumentsTruncated() const;
+
+    const QStringList & arguments() const;
+    qint64 pid() const;
+
+    void shutdown();
+    void kill();
+    void raise();
+
+private:
+    class Private;
+    Private * d;
+};
+
+namespace std {
+    template <>
+    inline void swap( KDSingleApplicationGuard::Instance & lhs,
+                      KDSingleApplicationGuard::Instance & rhs )
+    {
+        lhs.swap( rhs );
+    }
+} // namespace std
+
+QT_BEGIN_NAMESPACE
+
+template <>
+inline void qSwap( KDSingleApplicationGuard::Instance & lhs,
+                   KDSingleApplicationGuard::Instance & rhs )
+{
+    lhs.swap( rhs );
+}
+Q_DECLARE_METATYPE( KDSingleApplicationGuard::Instance )
+Q_DECLARE_TYPEINFO( KDSingleApplicationGuard::Instance, Q_MOVABLE_TYPE );
+
+QT_END_NAMESPACE
+
+
+#endif // QT_NO_SHAREDMEMORY
+#endif // QT_VERSION >= 0x040400 || defined(DOXYGEN_RUN)
+
+#endif /* __KDTOOLSCORE_KDSINGLEAPPLICATIONGUARD_H__ */

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/AnimatedSpinner.cpp Added

@@ -0,0 +1,286 @@
+/*
+    Copyright (C) 2012  Leo Franchi <leo.franchi@kdab.com>
+
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "AnimatedSpinner.h"
+
+#include <QtCore/QPoint>
+#include <QTimeLine>
+#include <QDebug>
+#include <QDateTime>
+
+#include <QtGui/QApplication>
+#include <QtGui/QHideEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QShowEvent>
+
+#include "utils/Logger.h"
+
+
+AnimatedSpinner::AnimatedSpinner( QWidget* parent )
+    : QWidget( parent )
+    , m_showHide( new QTimeLine )
+    , m_animation( new QTimeLine )
+    , m_currentIndex( -1 )
+{
+    init();
+}
+
+
+AnimatedSpinner::AnimatedSpinner( const QSize& size, bool autoStart )
+    : QWidget()
+    , m_showHide( new QTimeLine )
+    , m_animation( new QTimeLine )
+    , m_currentIndex( -1 )
+{
+    m_pixmap = QPixmap( size );
+    m_pixmap.fill( Qt::transparent );
+
+    init();
+
+    if ( autoStart )
+        fadeIn();
+}
+
+
+void
+AnimatedSpinner::init()
+{
+    m_autoCenter = true;
+
+    m_showHide->setDuration( 300 );
+    m_showHide->setStartFrame( 0 );
+    m_showHide->setEndFrame( 100 );
+    m_showHide->setUpdateInterval( 20 );
+
+    if ( parentWidget() )
+        connect( m_showHide, SIGNAL( frameChanged( int ) ), this, SLOT( update() ) );
+    else
+        connect( m_showHide, SIGNAL( frameChanged( int ) ), this, SLOT( updatePixmap() ) );
+
+    connect( m_showHide, SIGNAL( finished() ), this, SLOT( hideFinished() ) );
+
+    m_animation->setDuration( 1000 );
+    m_animation->setStartFrame( 0 );
+    m_animation->setEndFrame( segmentCount() );
+    m_animation->setUpdateInterval( 20 );
+    m_animation->setLoopCount( 0 );
+    m_animation->setDirection( QTimeLine::Forward );
+    m_animation->setCurveShape( QTimeLine::LinearCurve );
+    connect( m_animation, SIGNAL( frameChanged( int ) ), this, SLOT( frameChanged( int ) ) );
+
+    m_colors.resize( segmentCount() );
+
+    QSize size;
+    if ( parentWidget() )
+        size = sizeHint();
+    else
+        size = m_pixmap.size();
+
+    /// Radius is best-fit line with points (13x13, 2), (28x28, 5), (48x48, 10)
+    m_radius = qRound( ( 23. * ( size.width() - 5. ) ) / 100. );
+    m_armLength = size.width() / 2 - m_radius;
+
+    /// Arm width is best-fit line with points (13x13, 1), (28x28, 2), (48x48, 5)
+    m_armWidth = qRound( ( 116. * size.width() - 781. ) / 1000. );
+    m_border = 2;
+    m_armRect = QRect( m_radius, 0, m_armLength, m_armWidth );
+
+    hide();
+}
+
+
+void
+AnimatedSpinner::paintEvent( QPaintEvent* event )
+{
+    Q_UNUSED( event );
+    if ( m_autoCenter && parentWidget() )
+    {
+        QPoint center = parentWidget()->contentsRect().center() - QPoint( sizeHint().width() / 2, sizeHint().height() / 2 );
+        if ( center != pos() )
+        {
+            move( center );
+            return;
+        }
+    }
+
+    QPainter p( this );
+    drawFrame( &p, rect() );
+}
+
+
+void
+AnimatedSpinner::updatePixmap()
+{
+    Q_ASSERT( !m_pixmap.isNull() );
+
+    QPainter p( &m_pixmap );
+    m_pixmap.fill( Qt::transparent );
+    drawFrame( &p, m_pixmap.rect() );
+    p.end();
+
+    emit requestUpdate();
+}
+
+
+void
+AnimatedSpinner::drawFrame( QPainter* p, const QRect& rect )
+{
+    if ( m_showHide->state() == QTimeLine::Running )
+    {
+        // showing or hiding
+        p->setOpacity( (qreal)m_showHide->currentValue() );
+    }
+
+    p->setRenderHint( QPainter::Antialiasing, true );
+    p->translate( rect.center() + QPoint( 0, 1 ) ); // center
+
+    const qreal stepRadius = (360 + 2*m_armWidth) / segmentCount();
+    p->rotate( stepRadius );
+
+    for (int segment = 0; segment < segmentCount(); ++segment) {
+        p->rotate(stepRadius);
+        QPainterPath arm;
+        arm.addRoundedRect( m_armRect.adjusted( 0, -m_armWidth/2., 0, -m_armWidth/2 ), m_border, m_border );
+
+        p->fillPath( arm, colorForSegment( segment ) );
+    }
+}
+
+
+void
+AnimatedSpinner::fadeIn()
+{
+    if ( parentWidget() && isVisible() )
+        return;
+
+    m_animation->start();
+
+    m_showHide->setDirection( QTimeLine::Forward );
+
+    if ( m_showHide->state() != QTimeLine::Running )
+        m_showHide->start();
+
+    if ( parentWidget() )
+        show();
+    else
+        updatePixmap();
+}
+
+
+void
+AnimatedSpinner::fadeOut()
+{
+    m_showHide->setDirection( QTimeLine::Backward );
+
+    if ( m_showHide->state() != QTimeLine::Running )
+        m_showHide->start();
+}
+
+
+void
+AnimatedSpinner::hideFinished()
+{
+    if ( m_showHide->direction() == QTimeLine::Backward )
+    {
+        m_animation->stop();
+        if ( parentWidget() )
+            hide();
+        else
+            updatePixmap();
+    }
+}
+
+
+QSize
+AnimatedSpinner::sizeHint() const
+{
+    return QSize( 48, 48 );
+}
+
+
+void
+AnimatedSpinner::frameChanged( int frame )
+{
+    if ( m_currentIndex == frame || frame > segmentCount() - 1 )
+        return;
+
+    m_currentIndex = frame;
+    Q_ASSERT( frame >= 0 && frame < m_colors.size() );
+
+    // calculate colors, save a factor from 1 to 0 behind the current item
+    m_colors.fill( -1 );
+    int cur = m_currentIndex, running = 0, tailLength = 5;
+
+    while ( m_colorscur == -1 )
+    {
+        if ( running > tailLength )
+            m_colorscur = 0.; // beyond the tail, draw at base color
+        else
+            m_colorscur = 1. - ((qreal)running/tailLength); // scale from 1 to 0 along tail
+
+        ++running;
+        cur = --cur < 0 ? m_colors.size() - 1 : cur;
+    }
+
+    if ( parentWidget() )
+        update();
+    else
+        updatePixmap();
+}
+
+
+QColor
+AnimatedSpinner::colorForSegment( int seg ) const
+{
+    // Highlight color is 227, 227, 227
+    // Base color is      101, 101, 101
+    Q_ASSERT( seg < m_colors.size() );
+    const int comp = 101 + m_colorsseg * ( 126 );
+    return QColor( comp, comp, comp, 255 );
+}
+
+
+int
+AnimatedSpinner::segmentCount() const
+{
+    return 11;
+}
+
+
+LoadingSpinner::LoadingSpinner( QAbstractItemView* parent )
+    : AnimatedSpinner( parent )
+    , m_parent( parent )
+{
+    if ( m_parent->model() )
+    {
+        connect( m_parent->model(), SIGNAL( loadingStarted() ), SLOT( fadeIn() ), Qt::UniqueConnection );
+        connect( m_parent->model(), SIGNAL( loadingFinished() ), SLOT( fadeOut() ), Qt::UniqueConnection );
+    }
+    connect( m_parent, SIGNAL( modelChanged() ), SLOT( onViewModelChanged() ) );
+}
+
+
+void
+LoadingSpinner::onViewModelChanged()
+{
+    if ( m_parent->model() )
+    {
+        connect( m_parent->model(), SIGNAL( loadingStarted() ), SLOT( fadeIn() ), Qt::UniqueConnection );
+        connect( m_parent->model(), SIGNAL( loadingFinished() ), SLOT( fadeOut() ), Qt::UniqueConnection );
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/AnimatedSpinner.h Added

@@ -0,0 +1,107 @@
+/*
+    Copyright (C) 2012  Leo Franchi <leo.franchi@kdab.com>
+
+    This program 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.
+
+    This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef ANIMATED_SPINNER_H
+#define ANIMATED_SPINNER_H
+
+#include "DllMacro.h"
+
+#include <QtGui/QWidget>
+
+#include <QtCore/QSize>
+#include <QtGui/QColor>
+#include <QtGui/QPixmap>
+#include <QPainter>
+#include <QAbstractItemView>
+
+class QTimeLine;
+class QHideEvent;
+class QShowEvent;
+class QPaintEvent;
+class QTimerEvent;
+
+/**
+ If you don't pass a parent QWidget, this spinner will
+   draw into the pixmap instead. If you do, the pixmap will
+   be invalid.
+
+ */
+class DLLEXPORT AnimatedSpinner : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit AnimatedSpinner( QWidget* parent = 0 ); // widget mode
+    AnimatedSpinner( const QSize& size, bool autoStart ); // pixmap mode
+
+    QSize sizeHint() const;
+
+    QPixmap pixmap() const { return m_pixmap; }
+    
+    void setAutoCenter( bool enabled ) { m_autoCenter = enabled; }
+
+public slots:
+    void fadeIn();
+    void fadeOut();
+
+signals:
+    void requestUpdate();
+
+protected:
+    void paintEvent(QPaintEvent *event);
+
+private slots:
+    void updatePixmap();
+    void hideFinished();
+
+    void frameChanged( int );
+
+private:
+    void init();
+    void drawFrame( QPainter* p, const QRect& rect );
+    int segmentCount() const;
+    QColor colorForSegment( int segment ) const;
+
+    QTimeLine* m_showHide;
+    QTimeLine* m_animation;
+
+    // to tweak
+    int m_radius, m_armLength, m_armWidth, m_border;
+    QRect m_armRect;
+
+    int m_currentIndex;
+    QVector<qreal> m_colors;
+    QPixmap m_pixmap;
+    bool m_autoCenter;
+};
+
+
+class LoadingSpinner : public AnimatedSpinner
+{
+    Q_OBJECT
+
+public:
+    explicit LoadingSpinner( QAbstractItemView* parent = 0 ); // widget mode
+    
+private slots:
+    void onViewModelChanged();
+
+private:
+    QAbstractItemView* m_parent;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/BinaryExtractWorker.cpp Added

@@ -0,0 +1,71 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "BinaryExtractWorker.h"
+
+#include <QVariant>
+#include <QDir>
+#include <QProcess>
+#include <QCoreApplication>
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+
+namespace TomahawkUtils
+{
+
+void
+BinaryExtractWorker::run()
+{
+    ScopedDeleter deleter( this );
+    // We unzip directly to the target location, just like normal attica resolvers
+    Q_ASSERT( m_receiver );
+    if ( !m_receiver )
+        return;
+
+    const QString resolverId = m_receiver->property( "resolverid" ).toString();
+
+    Q_ASSERT( !resolverId.isEmpty() );
+    if ( resolverId.isEmpty() )
+        return;
+
+    const QDir resolverPath( extractScriptPayload( m_zipFileName, resolverId ) );
+
+#ifdef Q_OS_WIN
+    const QStringList files = resolverPath.entryList( QStringList() << "*.exe", QDir::Files );
+#else
+    const QStringList files = resolverPath.entryList( QStringList() << "*_tomahawkresolver", QDir::Files );
+#endif
+
+    qDebug() << "Found executables in unzipped binary resolver dir:" << files;
+    Q_ASSERT( files.size() == 1 );
+    if ( files.size() < 1 )
+        return;
+
+    const QString resolverToUse = resolverPath.absoluteFilePath( files.first() );
+
+    QFile file( resolverToUse );
+    file.setPermissions( file.permissions() | QFile::ExeOwner | QFile::ExeGroup | QFile::ExeOther );
+
+    QMetaObject::invokeMethod( m_receiver, "installSucceeded", Qt::QueuedConnection, Q_ARG( QString, resolverToUse ) );
+}
+
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/BinaryExtractWorker.h Added

@@ -0,0 +1,59 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 BINARYEXTRACTWORKER_H
+#define BINARYEXTRACTWORKER_H
+
+#include <QThread>
+
+#include "DllMacro.h"
+
+namespace TomahawkUtils
+{
+
+class ScopedDeleter
+{
+public:
+    ScopedDeleter( QObject* o ) : m_o( 0 ) {}
+    ~ScopedDeleter() { m_o->deleteLater(); }
+
+private:
+    QObject* m_o;
+};
+
+
+class BinaryExtractWorker : public QThread
+{
+    Q_OBJECT
+public:
+    BinaryExtractWorker( const QString& zipFilename, QObject* receiver ) : m_zipFileName( zipFilename ), m_receiver( receiver ) {}
+    virtual ~BinaryExtractWorker() {}
+
+protected:
+    virtual void run();
+
+private:
+    QString m_zipFileName;
+    QObject* m_receiver;
+};
+
+}
+
+#endif
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/BinaryInstallerHelper.cpp Added

@@ -0,0 +1,83 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012 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 "BinaryInstallerHelper.h"
+
+#include "accounts/AccountManager.h"
+#include "TomahawkSettingsGui.h"
+#include <QTemporaryFile>
+
+BinaryInstallerHelper::BinaryInstallerHelper( QTemporaryFile* tempFile, const QString& resolverId, bool createAccount, AtticaManager* manager )
+    : QObject( manager )
+    , m_tempFile( tempFile )
+    , m_resolverId( resolverId )
+    , m_createAccount( createAccount )
+    , m_manager( QWeakPointer< AtticaManager >( manager ) )
+{
+    Q_ASSERT( m_tempFile );
+    Q_ASSERT( !m_resolverId.isEmpty() );
+    Q_ASSERT( !m_manager.isNull() );
+
+    setProperty( "resolverid", m_resolverId );
+}
+
+
+BinaryInstallerHelper::~BinaryInstallerHelper()
+{
+    Q_ASSERT( m_tempFile );
+    delete m_tempFile;
+}
+
+
+void
+BinaryInstallerHelper::installSucceeded( const QString& path )
+{
+    qDebug() << Q_FUNC_INFO << "install of binary resolver succeeded, enabling: " << path;
+
+    if ( m_manager.isNull() )
+        return;
+
+    if ( m_createAccount )
+    {
+        Tomahawk::Accounts::Account* acct = Tomahawk::Accounts::AccountManager::instance()->accountFromPath( path );
+
+        Tomahawk::Accounts::AccountManager::instance()->addAccount( acct );
+        TomahawkSettings::instance()->addAccount( acct->accountId() );
+        Tomahawk::Accounts::AccountManager::instance()->enableAccount( acct );
+    }
+
+    m_manager.data()->m_resolverStates m_resolverId .scriptPath = path;
+    m_manager.data()->m_resolverStates m_resolverId .state = AtticaManager::Installed;
+
+    TomahawkSettingsGui::instanceGui()->setAtticaResolverStates( m_manager.data()->m_resolverStates );
+    emit m_manager.data()->resolverInstalled( m_resolverId );
+    emit m_manager.data()->resolverStateChanged( m_resolverId );
+
+    deleteLater();
+}
+void BinaryInstallerHelper::installFailed()
+{
+    qDebug() << Q_FUNC_INFO << "install failed";
+
+    if ( m_manager.isNull() )
+        return;
+
+    m_manager.data()->resolverInstallationFailed( m_resolverId );
+
+    deleteLater();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/BinaryInstallerHelper.h Added

@@ -0,0 +1,45 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012 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 BINARY_INSTALLER_HELPER
+#define BINARY_INSTALLER_HELPER
+
+#include "AtticaManager.h"
+
+#include <QWeakPointer>
+
+class QTemporaryFile;
+class BinaryInstallerHelper : public QObject
+{
+    Q_OBJECT
+public:
+    explicit BinaryInstallerHelper( QTemporaryFile* tempFile, const QString& resolverId, bool createAccount, AtticaManager* manager );
+
+    virtual ~BinaryInstallerHelper();
+
+public slots:
+    void installSucceeded( const QString& path );
+    void installFailed();
+
+private:
+    QTemporaryFile* m_tempFile;
+    QString m_resolverId;
+    bool m_createAccount;
+    QWeakPointer<AtticaManager> m_manager;
+};
+
+#endif
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/Closure.cpp Added

@@ -0,0 +1,102 @@
+/* This file is part of Clementine.
+   Copyright 2011, David Sansome <me@davidsansome.com>
+
+   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/>.
+*/
+
+#include "Closure.h"
+
+namespace _detail {
+
+Closure::Closure(QObject* sender,
+                 const char* signal,
+                 QObject* receiver,
+                 const char* slot,
+                 const ClosureArgumentWrapper* val0,
+                 const ClosureArgumentWrapper* val1,
+                 const ClosureArgumentWrapper* val2,
+                 const ClosureArgumentWrapper* val3)
+    : QObject(receiver),
+      callback_(NULL),
+      autoDelete_( true ),
+      val0_(val0),
+      val1_(val1),
+      val2_(val2),
+      val3_(val3) {
+  const QMetaObject* meta_receiver = receiver->metaObject();
+
+  QByteArray normalised_slot = QMetaObject::normalizedSignature(slot + 1);
+  const int index = meta_receiver->indexOfSlot(normalised_slot.constData());
+  Q_ASSERT(index != -1);
+  slot_ = meta_receiver->method(index);
+
+  Connect(sender, signal);
+}
+
+Closure::Closure(QObject* sender,
+                 const char* signal,
+                 std::tr1::function<void()> callback)
+    : callback_(callback) {
+  Connect(sender, signal);
+}
+
+Closure::~Closure() {
+}
+
+
+void Closure::forceInvoke()
+{
+    Invoked();
+}
+
+
+void Closure::Connect(QObject* sender, const char* signal) {
+  if (!sender)
+      return;
+
+  bool success = connect(sender, signal, SLOT(Invoked()));
+  Q_ASSERT(success);
+  success = connect(sender, SIGNAL(destroyed()), SLOT(Cleanup()));
+  Q_ASSERT(success);
+  Q_UNUSED(success);
+}
+
+void Closure::Invoked() {
+  if (callback_) {
+    callback_();
+  } else {
+    slot_.invoke(
+        parent(),
+        val0_ ? val0_->arg() : QGenericArgument(),
+        val1_ ? val1_->arg() : QGenericArgument(),
+        val2_ ? val2_->arg() : QGenericArgument(),
+        val3_ ? val3_->arg() : QGenericArgument());
+  }
+
+  if ( autoDelete_ )
+    deleteLater();
+}
+
+void Closure::Cleanup() {
+  disconnect();
+  deleteLater();
+}
+
+}  // namespace _detail
+
+_detail::Closure* NewClosure(
+    QObject* sender, const char* signal,
+    QObject* receiver, const char* slot) {
+  return new _detail::Closure(sender, signal, receiver, slot);
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/Closure.h Added

@@ -0,0 +1,240 @@
+/* This file is part of Tomabawk.
+   Copyright 2011, David Sansome <me@davidsansome.com>
+   Copyright 2012, Leo Franchi <lfranchi@kde.org>
+
+   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/>.
+*/
+
+#ifndef CLOSURE_H
+#define CLOSURE_H
+
+#include "DllMacro.h"
+
+#include <tr1/functional>
+
+#include <QMetaMethod>
+#include <QObject>
+#include <QSharedPointer>
+
+#include <boost/noncopyable.hpp>
+#include <boost/scoped_ptr.hpp>
+
+namespace _detail {
+
+class DLLEXPORT ClosureArgumentWrapper {
+ public:
+  virtual ~ClosureArgumentWrapper() {}
+
+  virtual QGenericArgument arg() const = 0;
+};
+
+template<typename T>
+class ClosureArgument : public ClosureArgumentWrapper {
+ public:
+  explicit ClosureArgument(const T& data) : data_(data) {}
+
+  virtual QGenericArgument arg() const {
+      return QArgument<T>(QMetaType::typeName(qMetaTypeId<T>()), data_);
+  }
+
+ private:
+  T data_;
+};
+
+class DLLEXPORT Closure : public QObject, boost::noncopyable {
+  Q_OBJECT
+
+ public:
+  Closure(QObject* sender, const char* signal,
+          QObject* receiver, const char* slot,
+          const ClosureArgumentWrapper* val0 = 0,
+          const ClosureArgumentWrapper* val1 = 0,
+          const ClosureArgumentWrapper* val2 = 0,
+          const ClosureArgumentWrapper* val3 = 0);
+
+  Closure(QObject* sender, const char* signal,
+          std::tr1::function<void()> callback);
+
+  void setAutoDelete( bool autoDelete ) { autoDelete_ = autoDelete; }
+
+  virtual ~Closure();
+
+  /**
+   * If you don't this Closure to act on a signal, but just act like
+   *  a closure in that it saves some args and delivers them on demand later
+   *
+   * Only call this is you passed a null QObject* as a sender! Otherwise you
+   *  might delete your object twice :)
+   */
+  void forceInvoke();
+
+ private slots:
+  void Invoked();
+  void Cleanup();
+
+ private:
+  void Connect(QObject* sender, const char* signal);
+
+  QMetaMethod slot_;
+  std::tr1::function<void()> callback_;
+  bool autoDelete_;
+
+  boost::scoped_ptr<const ClosureArgumentWrapper> val0_;
+  boost::scoped_ptr<const ClosureArgumentWrapper> val1_;
+  boost::scoped_ptr<const ClosureArgumentWrapper> val2_;
+  boost::scoped_ptr<const ClosureArgumentWrapper> val3_;
+};
+
+class DLLEXPORT SharedPointerWrapper {
+ public:
+  virtual ~SharedPointerWrapper() {}
+  virtual QObject* data() const = 0;
+};
+
+template<typename T>
+class SharedPointer : public SharedPointerWrapper {
+ public:
+  explicit SharedPointer(QSharedPointer<T> ptr)
+      : ptr_(ptr) {
+  }
+
+  QObject* data() const {
+    return ptr_.data();
+  }
+
+ private:
+  QSharedPointer<T> ptr_;
+};
+
+// For use with a QSharedPointer as a sender.
+class SharedClosure : public Closure {
+  Q_OBJECT
+
+ public:
+  SharedClosure(SharedPointerWrapper* sender, const char* signal,
+                QObject* receiver, const char* slot,
+                const ClosureArgumentWrapper* val0 = 0,
+                const ClosureArgumentWrapper* val1 = 0,
+                const ClosureArgumentWrapper* val2 = 0,
+                const ClosureArgumentWrapper* val3 = 0)
+      : Closure(sender->data(), signal,
+                receiver, slot,
+                val0, val1, val2, val3),
+        shared_sender_(sender) {
+  }
+
+ private:
+  boost::scoped_ptr<SharedPointerWrapper> shared_sender_;
+};
+
+}  // namespace _detail
+
+#define C_ARG(type, data) new _detail::ClosureArgument<type>(data)
+
+_detail::Closure* NewClosure(
+    QObject* sender,
+    const char* signal,
+    QObject* receiver,
+    const char* slot);
+
+template <typename T>
+_detail::Closure* NewClosure(
+    QObject* sender,
+    const char* signal,
+    QObject* receiver,
+    const char* slot,
+    const T& val0) {
+  return new _detail::Closure(
+      sender, signal, receiver, slot,
+      C_ARG(T, val0));
+}
+
+template <typename T0, typename T1>
+_detail::Closure* NewClosure(
+    QObject* sender,
+    const char* signal,
+    QObject* receiver,
+    const char* slot,
+    const T0& val0,
+    const T1& val1) {
+  return new _detail::Closure(
+      sender, signal, receiver, slot,
+      C_ARG(T0, val0), C_ARG(T1, val1));
+}
+
+template <typename T0, typename T1, typename T2>
+_detail::Closure* NewClosure(
+    QObject* sender,
+    const char* signal,
+    QObject* receiver,
+    const char* slot,
+    const T0& val0,
+    const T1& val1,
+    const T2& val2) {
+  return new _detail::Closure(
+      sender, signal, receiver, slot,
+      C_ARG(T0, val0), C_ARG(T1, val1), C_ARG(T2, val2));
+}
+
+template <typename T0, typename T1, typename T2, typename T3>
+_detail::Closure* NewClosure(
+    QObject* sender,
+    const char* signal,
+    QObject* receiver,
+    const char* slot,
+    const T0& val0,
+    const T1& val1,
+    const T2& val2,
+    const T3& val3) {
+  return new _detail::Closure(
+      sender, signal, receiver, slot,
+      C_ARG(T0, val0), C_ARG(T1, val1), C_ARG(T2, val2), C_ARG(T3, val3));
+}
+
+template <typename TP>
+_detail::Closure* NewClosure(
+    QSharedPointer<TP> sender,
+    const char* signal,
+    QObject* receiver,
+    const char* slot) {
+  return new _detail::SharedClosure(
+      new _detail::SharedPointer<TP>(sender), signal, receiver, slot);
+}
+
+template <typename TP, typename T0>
+_detail::Closure* NewClosure(
+    QSharedPointer<TP> sender,
+    const char* signal,
+    QObject* receiver,
+    const char* slot,
+    const T0& val0) {
+  return new _detail::SharedClosure(
+        new _detail::SharedPointer<TP>(sender), signal, receiver, slot,
+        C_ARG(T0, val0));
+}
+
+template <typename TP, typename T0, typename T1>
+_detail::Closure* NewClosure(
+    QSharedPointer<TP> sender,
+    const char* signal,
+    QObject* receiver,
+    const char* slot,
+    const T0& val0,
+    const T1& val1) {
+  return new _detail::SharedClosure(
+        new _detail::SharedPointer<TP>(sender), signal, receiver, slot,
+        C_ARG(T0, val0), C_ARG(T1, val1));
+}
+
+#endif  // CLOSURE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/DropJobNotifier.cpp Added

@@ -0,0 +1,119 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "DropJobNotifier.h"
+
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+#include "Query.h"
+#include "SourceList.h"
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "DropJob.h"
+#include <qjson/parser.h>
+#include "DropJobNotifier.h"
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+
+using namespace Tomahawk;
+
+
+DropJobNotifier::DropJobNotifier( QPixmap servicePixmap, QString service, DropJob::DropType type, QNetworkReply* job )
+    : JobStatusItem()
+    , m_type( "unknown" )
+    , m_job( 0 )
+    , m_pixmap( servicePixmap )
+    , m_service( service )
+{
+    init( type );
+
+    if ( m_service.isEmpty() )
+        m_service = "DropJob";
+
+    connect( job, SIGNAL( finished() ), this, SLOT( setFinished() ) );
+}
+
+
+DropJobNotifier::DropJobNotifier( QPixmap pixmap, DropJob::DropType type )
+    : JobStatusItem()
+    , m_job( 0 )
+    , m_pixmap( pixmap )
+{
+    init( type );
+}
+
+
+DropJobNotifier::~DropJobNotifier()
+{
+}
+
+
+void
+DropJobNotifier::init( DropJob::DropType type )
+{
+    if ( type == DropJob::Playlist )
+        m_type = tr( "playlist" );
+
+    if ( type == DropJob::Artist )
+        m_type = tr( "artist" );
+
+    if ( type == DropJob::Track )
+        m_type = tr( "track" );
+
+    if ( type == DropJob::Album )
+        m_type = tr( "album" );
+}
+
+
+QString
+DropJobNotifier::rightColumnText() const
+{
+    return QString();
+}
+
+
+QPixmap
+DropJobNotifier::icon() const
+{
+    return m_pixmap;
+}
+
+
+QString
+DropJobNotifier::mainText() const
+{
+    if ( m_service.isEmpty() )
+    {
+        return tr( "Fetching %1 from database" ).arg( m_type );
+    }
+    else
+    {
+        return tr( "Parsing %1 %2" ).arg( m_service )
+                                    .arg( m_type );
+    }
+}
+
+
+void
+DropJobNotifier::setFinished()
+{
+    emit finished();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/DropJobNotifier.h Added

@@ -0,0 +1,67 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   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 DROPJOBNOTIFIER_H
+#define DROPJOBNOTIFIER_H
+
+#include "DllMacro.h"
+#include "DropJob.h"
+#include "Typedefs.h"
+#include "Query.h"
+#include "jobview/JobStatusItem.h"
+
+#include <QObject>
+#include <QSet>
+#include <QStringList>
+#include <QPixmap>
+
+class QNetworkReply;
+namespace Tomahawk
+{
+
+class DLLEXPORT DropJobNotifier : public JobStatusItem
+{
+    Q_OBJECT
+public:
+    DropJobNotifier( QPixmap pixmap, QString service, DropJob::DropType type, QNetworkReply* job );
+
+    // No QNetworkReply, needs manual finished call
+    DropJobNotifier( QPixmap pixmap, DropJob::DropType type );
+    virtual ~DropJobNotifier();
+
+    virtual QString rightColumnText() const;
+    virtual QString mainText() const;
+    virtual QPixmap icon() const;
+    virtual QString type() const { return m_type; }
+    virtual bool collapseItem() const { return true; }
+
+public slots:
+    void setFinished();
+
+private:
+    void init( DropJob::DropType type );
+
+    QString m_type;
+    QNetworkReply* m_job;
+    QPixmap m_pixmap;
+    QString m_service;
+};
+
+}
+
+#endif // DROPJOBNOTIFIER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/GroovesharkParser.cpp Added

@@ -0,0 +1,328 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2010-2012, Stefan Derkits <stefan@derkits.at>
+ *
+ *   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 "GroovesharkParser.h"
+
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+#include "Query.h"
+#include "SourceList.h"
+#include "DropJob.h"
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+#include "DropJobNotifier.h"
+#include "ViewManager.h"
+
+#include <qjson/parser.h>
+
+#include <QtCrypto>
+
+#include <QCoreApplication>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+
+#include <QWebPage>
+#include <QWebFrame>
+#include <QWebElement>
+
+using namespace Tomahawk;
+
+QPixmap* GroovesharkParser::s_pixmap = 0;
+
+const char* enApiSecret = "erCj5s0Vebyqtc9Aduyotc1CLListJ9HfO2os5hBeew=";
+
+GroovesharkParser::GroovesharkParser( const QStringList& trackUrls, bool createNewPlaylist, QObject* parent )
+    : QObject ( parent )
+    , m_limit ( 40 )
+    , m_trackMode( true )
+    , m_createNewPlaylist( createNewPlaylist )
+    , m_browseJob( 0 )
+{
+    QByteArray magic = QByteArray::fromBase64( enApiSecret );
+
+    QByteArray wand = QByteArray::fromBase64( QCoreApplication::applicationName().toLatin1() );
+    int length = magic.length(), n2 = wand.length();
+    for ( int i=0; i<length; i++ ) magici = magici ^ wandi%n2;
+
+    m_apiKey = QCA::SymmetricKey( magic );
+
+    foreach ( const QString& url, trackUrls )
+        lookupUrl( url );
+}
+
+GroovesharkParser::~GroovesharkParser()
+{
+
+}
+
+void
+GroovesharkParser::lookupUrl( const QString& link )
+{
+    if ( link.contains( "playlist" ) )
+    {
+        if ( !m_createNewPlaylist )
+            m_trackMode = true;
+        else
+            m_trackMode = false;
+
+        lookupGroovesharkPlaylist( link );
+    }
+    else if ( link.contains( "grooveshark.com/s/" ) || link.contains( "grooveshark.com/#/s/" ) )
+        lookupGroovesharkTrack( link );
+    else
+        return;
+
+}
+
+
+void
+GroovesharkParser::lookupGroovesharkPlaylist( const QString& linkRaw )
+{
+    tLog() << "Parsing Grooveshark Playlist URI:" << linkRaw;
+
+    QString urlFragment = QUrl( linkRaw ).fragment( );
+    if ( urlFragment.isEmpty() ) {
+        tDebug() << "no fragment, setting fragment to path";
+        urlFragment = QUrl(linkRaw).path();
+    }
+
+    tDebug() << urlFragment;
+
+    int paramStartingPostition = urlFragment.indexOf( "?" );
+
+    if ( paramStartingPostition != -1 )
+        urlFragment.truncate( paramStartingPostition );
+
+    bool ok;
+
+    QStringList urlParts = urlFragment.split( "/", QString::SkipEmptyParts );
+
+    tDebug() << urlParts;
+
+    int playlistID = urlParts.at( 2 ).toInt( &ok, 10 );
+    if (!ok)
+    {
+        tDebug() << "incorrect grooveshark url";
+        return;
+    }
+
+
+
+    m_title = urlParts.at( 1 );
+
+    tDebug() << "should get playlist " << playlistID;
+
+    DropJob::DropType type;
+
+    type = DropJob::Playlist;
+
+    QString base_url( "http://api.grooveshark.com/ws3.php?sig=" );
+
+    QByteArray data = QString( "{\"method\":\"getPlaylistSongs\",\"parameters\":{\"playlistID\":\"%1\"},\"header\":{\"wsKey\":\"tomahawkplayer\"}}" ).arg( playlistID ).toLocal8Bit();
+
+
+    QCA::MessageAuthenticationCode hmac( "hmac(md5)", m_apiKey );
+
+    QCA::SecureArray secdata( data );
+    hmac.update(secdata);
+    QCA::SecureArray resultArray = hmac.final();
+
+    QString hash = QCA::arrayToHex( resultArray.toByteArray() );
+    QUrl url = QUrl( base_url + hash );
+
+    tDebug() << "Looking up URL..." << url.toString();
+
+    QNetworkReply* reply = TomahawkUtils::nam()->post( QNetworkRequest( url ), data );
+    connect( reply, SIGNAL( finished() ), this, SLOT( groovesharkLookupFinished() ) );
+
+    m_browseJob = new DropJobNotifier( pixmap(), "Grooveshark", type, reply );
+    JobStatusView::instance()->model()->addJob( m_browseJob );
+
+    m_queries.insert( reply );
+}
+
+
+void
+GroovesharkParser::lookupGroovesharkTrack( const QString& track )
+{
+    tLog() << "Parsing Grooveshark Track Page:" << track;
+
+    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( QUrl( track ) ) );
+    connect( reply, SIGNAL( finished() ), this, SLOT( trackPageFetchFinished() ) );
+
+    m_browseJob = new DropJobNotifier( pixmap(), "Grooveshark", DropJob::Track, reply );
+    JobStatusView::instance()->model()->addJob( m_browseJob );
+
+    m_queries << reply;
+}
+
+
+void
+GroovesharkParser::trackPageFetchFinished()
+{
+    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
+    Q_ASSERT( r );
+
+    m_queries.remove( r );
+    r->deleteLater();
+
+    QWebPage page;
+    page.settings()->setAttribute( QWebSettings::JavascriptEnabled, false );
+    page.settings()->setAttribute( QWebSettings::PluginsEnabled, false );
+    page.settings()->setAttribute( QWebSettings::JavaEnabled, false );
+    page.settings()->setAttribute( QWebSettings::AutoLoadImages, false );
+    page.mainFrame()->setHtml( QString::fromUtf8( r->readAll() ) );
+    QWebElement title = page.mainFrame()->findFirstElement("spanitemprop='name'");
+    QWebElement artist = page.mainFrame()->findFirstElement("noscript spanitemprop='byArtist'");
+    QWebElement album = page.mainFrame()->findFirstElement("noscript spanitemprop='inAlbum'");
+
+    if ( !title.toPlainText().isEmpty() && !artist.toPlainText().isEmpty() )
+    {
+        tDebug() << "Got track info from grooveshark, enough to create a query:" << title.toPlainText() << artist.toPlainText() << album.toPlainText();
+
+        Tomahawk::query_ptr q = Tomahawk::Query::get( artist.toPlainText(), title.toPlainText(), album.toPlainText(), uuid(), true );
+        if ( !q.isNull() )
+            m_tracks << q;
+    }
+
+    checkTrackFinished();
+}
+
+
+void
+GroovesharkParser::groovesharkLookupFinished()
+{
+    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
+    Q_ASSERT( r );
+
+    m_queries.remove( r );
+    r->deleteLater();
+
+    if ( r->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        QVariantMap res = p.parse( r, &ok ).toMap();
+
+        if ( !ok )
+        {
+            tLog() << "Failed to parse json from Grooveshark browse item :" << p.errorString() << "On line" << p.errorLine();
+            checkTrackFinished();
+            return;
+        }
+
+        QVariantList list = res.value( "result" ).toMap().value( "songs" ).toList();
+        foreach (const QVariant& var, list)
+        {
+            QVariantMap trackResult = var.toMap();
+
+            QString title, artist, album;
+
+            title = trackResult.value( "SongName", QString() ).toString();
+            artist = trackResult.value( "ArtistName", QString() ).toString();
+            album = trackResult.value( "AlbumName", QString() ).toString();
+
+            if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
+            {
+                tLog() << "Didn't get an artist and track name from grooveshark, not enough to build a query on. Aborting" << title << artist << album;
+                return;
+            }
+
+            Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), m_trackMode );
+            m_tracks << q;
+        }
+
+
+    } else
+    {
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching Grooveshark information from the network!" ) ) );
+        tLog() << "Error in network request to grooveshark for track decoding:" << r->errorString();
+    }
+
+    if ( m_trackMode )
+        checkTrackFinished();
+    else
+        checkPlaylistFinished();
+}
+
+void
+GroovesharkParser::checkPlaylistFinished()
+{
+    tDebug() << "Checking for grooveshark batch playlist job finished" << m_queries.isEmpty() << m_createNewPlaylist;
+    if ( m_queries.isEmpty() ) // we're done
+    {
+        if ( m_browseJob )
+            m_browseJob->setFinished();
+
+        if( m_createNewPlaylist && !m_tracks.isEmpty() )
+        {
+            m_playlist = Playlist::create( SourceList::instance()->getLocal(),
+                                       uuid(),
+                                       m_title,
+                                       m_info,
+                                       m_creator,
+                                       false,
+                                       m_tracks );
+            connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
+            return;
+        }
+
+
+        emit tracks( m_tracks );
+
+        deleteLater();
+    }
+}
+
+void
+GroovesharkParser::checkTrackFinished()
+{
+    tDebug() << "Checking for grooveshark batch track job finished" << m_queries.isEmpty();
+    if ( m_queries.isEmpty() ) // we're done
+    {
+        if ( m_browseJob )
+            m_browseJob->setFinished();
+
+        emit tracks( m_tracks );
+
+        deleteLater();
+    }
+
+}
+
+void
+GroovesharkParser::playlistCreated()
+{
+
+    ViewManager::instance()->show( m_playlist );
+
+    deleteLater();
+}
+
+
+QPixmap
+GroovesharkParser::pixmap() const
+{
+    if ( !s_pixmap )
+        s_pixmap = new QPixmap( RESPATH "images/grooveshark.png" );
+
+    return *s_pixmap;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/GroovesharkParser.h Added

@@ -0,0 +1,90 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2011, Stefan Derkits <stefan@derkits.at>
+ *
+ *   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 GROOVESHARKPARSER_H
+#define GROOVESHARKPARSER_H
+
+#include "DllMacro.h"
+#include "Typedefs.h"
+#include "Query.h"
+#include "jobview/JobStatusItem.h"
+
+#include <qca_basic.h>
+
+#include <QObject>
+#include <QSet>
+#include <QtCore/QStringList>
+
+/**
+ * Small class to parse grooveshark links into query_ptrs
+ *
+ * Connect to the signals to get the results
+ */
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+class DropJobNotifier;
+
+class DLLEXPORT GroovesharkParser : public QObject
+{
+    Q_OBJECT
+public:
+    explicit GroovesharkParser( const QStringList& trackUrls, bool createNewPlaylist = false, QObject* parent = 0 );
+    virtual ~GroovesharkParser();
+signals:
+    void track( const Tomahawk::query_ptr& track );
+    void tracks( const QList< Tomahawk::query_ptr > tracks );
+    void playlist( const Tomahawk::query_ptr& playlist );
+
+private slots:
+    void groovesharkLookupFinished();
+    void trackPageFetchFinished();
+
+    void playlistCreated();
+private:
+    QPixmap pixmap() const;
+
+    void lookupUrl( const QString& url );
+    void lookupGroovesharkPlaylist( const QString& playlist );
+    void lookupGroovesharkTrack( const QString& track );
+
+    void checkTrackFinished();
+    void checkPlaylistFinished();
+    int  m_limit;
+    bool m_trackMode;
+    bool m_createNewPlaylist;
+    QList< query_ptr > m_tracks;
+    QSet< QNetworkReply* > m_queries;
+    QString m_title, m_info, m_creator;
+    Tomahawk::playlist_ptr m_playlist;
+    DropJobNotifier* m_browseJob;
+
+    QCA::SymmetricKey m_apiKey;
+
+    static QPixmap* s_pixmap;
+
+};
+
+}
+
+#endif // GROOVESHARKPARSER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/GuiHelpers.cpp Added

@@ -0,0 +1,172 @@
+/* === 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 "GuiHelpers.h"
+
+#include <QObject>
+
+#include "accounts/Account.h"
+#include "accounts/AccountManager.h"
+#include "accounts/DelegateConfigWrapper.h"
+#include "TomahawkSettings.h"
+
+namespace TomahawkUtils
+{
+
+void
+handleAccountAdded( Tomahawk::Accounts::Account* account, bool added )
+{
+    if ( added )
+    {
+        account->setEnabled( true );
+        account->saveConfig();
+
+        TomahawkSettings::instance()->addAccount( account->accountId() );
+        Tomahawk::Accounts::AccountManager::instance()->addAccount( account );
+        Tomahawk::Accounts::AccountManager::instance()->hookupAndEnable( account );
+    }
+    else
+    {
+        // user pressed cancel
+        delete account;
+    }
+}
+
+
+class UtilsObject : public QObject
+{
+    Q_OBJECT
+public:
+    UtilsObject( DelegateConfigWrapper* w ) : QObject( w ), m_w( w ) {}
+
+public slots:
+    void
+    accountCreateConfigClosed( int ret )
+    {
+        Tomahawk::Accounts::Account* account = qobject_cast< Tomahawk::Accounts::Account* >( m_w->property( "accountplugin" ).value< QObject* >() );
+        Q_ASSERT( account );
+
+        bool added = ( ret == QDialog::Accepted );
+
+        handleAccountAdded( account, added );
+    }
+
+    void
+    accountConfigClosed( int ret )
+    {
+        if( ret == QDialog::Accepted )
+        {
+            Tomahawk::Accounts::Account* account = qobject_cast< Tomahawk::Accounts::Account* >( m_w->property( "accountplugin" ).value< QObject* >() );
+            account->saveConfig();
+        }
+    }
+
+    void
+    accountConfigDelete()
+    {
+        Tomahawk::Accounts::Account* account = qobject_cast< Tomahawk::Accounts::Account* >( m_w->property( "accountplugin" ).value< QObject* >() );
+        Q_ASSERT( account );
+        Tomahawk::Accounts::AccountManager::instance()->removeAccount( account );
+    }
+private:
+    DelegateConfigWrapper* m_w;
+
+};
+
+
+void
+createAccountFromFactory( Tomahawk::Accounts::AccountFactory* factory, QWidget* parent )
+{
+    //if exited with OK, create it, if not, delete it immediately!
+    Tomahawk::Accounts::Account* account = factory->createAccount();
+    bool added = false;
+    if( account->configurationWidget() )
+    {
+#ifdef Q_WS_MAC
+        // on osx a sheet needs to be non-modal
+        DelegateConfigWrapper* dialog = new DelegateConfigWrapper( account->configurationWidget(), account->aboutWidget(), QString("%1 Config" ).arg( account->accountFriendlyName() ), parent, Qt::Sheet );
+        dialog->setProperty( "accountplugin", QVariant::fromValue< QObject* >( account ) );
+
+        UtilsObject* obj = new UtilsObject( dialog );
+        QObject::connect( dialog, SIGNAL( finished( int ) ), obj, SLOT( accountCreateConfigClosed( int ) ) );
+
+        if( account->configurationWidget()->metaObject()->indexOfSignal( "dataError(bool)" ) > -1 )
+            QObject::connect( account->configurationWidget(), SIGNAL( dataError( bool ) ), dialog, SLOT( toggleOkButton( bool ) ), Qt::UniqueConnection );
+
+        dialog->show();
+#else
+        DelegateConfigWrapper dialog( account->configurationWidget(), account->aboutWidget(), QString("%1 Config" ).arg( account->accountFriendlyName() ), parent );
+        QWeakPointer< DelegateConfigWrapper > watcher( &dialog );
+
+        if( account->configurationWidget()->metaObject()->indexOfSignal( "dataError(bool)" ) > -1 )
+            QObject::connect( account->configurationWidget(), SIGNAL( dataError( bool ) ), &dialog, SLOT( toggleOkButton( bool ) ), Qt::UniqueConnection );
+
+        int ret = dialog.exec();
+        if( !watcher.isNull() && ret == QDialog::Accepted ) // send changed config to account
+            added = true;
+        else // canceled, delete it
+            added = false;
+
+        handleAccountAdded( account, added );
+#endif
+    }
+    else
+    {
+        // no config, so just add it
+        added = true;
+        handleAccountAdded( account, added );
+    }
+}
+
+void
+openAccountConfig( Tomahawk::Accounts::Account* account, QWidget* parent, bool showDelete )
+{
+    if( account->configurationWidget() )
+    {
+#ifndef Q_OS_MAC
+        DelegateConfigWrapper dialog( account->configurationWidget(), account->aboutWidget(), QString("%1 Configuration" ).arg( account->accountFriendlyName() ), parent );
+        dialog.setShowDelete( showDelete );
+        QWeakPointer< DelegateConfigWrapper > watcher( &dialog );
+        int ret = dialog.exec();
+        if ( !watcher.isNull() && dialog.deleted() )
+        {
+            Tomahawk::Accounts::AccountManager::instance()->removeAccount( account );
+        }
+        else if( !watcher.isNull() && ret == QDialog::Accepted )
+        {
+            // send changed config to resolver
+            account->saveConfig();
+        }
+#else
+        // on osx a sheet needs to be non-modal
+        DelegateConfigWrapper* dialog = new DelegateConfigWrapper( account->configurationWidget(), account->aboutWidget(), QString("%1 Configuration" ).arg( account->accountFriendlyName() ), parent, Qt::Sheet );
+        dialog->setShowDelete( showDelete );
+        dialog->setProperty( "accountplugin", QVariant::fromValue< QObject* >( account ) );
+        UtilsObject* obj = new UtilsObject( dialog );
+
+        QObject::connect( dialog, SIGNAL( finished( int ) ),    obj, SLOT( accountConfigClosed( int ) ) );
+        QObject::connect( dialog, SIGNAL( closedWithDelete() ), obj, SLOT( accountConfigDelete() ) );
+
+        dialog->show();
+#endif
+    }
+}
+
+} // namespace TomahawkUtils
+
+#include "GuiHelpers.moc"

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/GuiHelpers.h Added

@@ -0,0 +1,38 @@
+/* === 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 TOMAHAWK_GUI_HELPERS_H
+#define TOMAHAWK_GUI_HELPERS_H
+
+#include "DllMacro.h"
+
+class QWidget;
+namespace Tomahawk {
+    namespace Accounts {
+        class AccountFactory;
+        class Account;
+    }
+}
+
+namespace TomahawkUtils
+{
+    DLLEXPORT void createAccountFromFactory( Tomahawk::Accounts::AccountFactory*, QWidget* parent );
+    DLLEXPORT void openAccountConfig( Tomahawk::Accounts::Account*, QWidget* parent, bool showDelete = false );
+}
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/ItunesParser.cpp Added

@@ -0,0 +1,205 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Written by Hugo Lindström <hugolm84@gmail.com>
+ *   But based on Leo Franchi's work from spotifyParser
+ *   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 "ItunesParser.h"
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+#include "Query.h"
+#include "SourceList.h"
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+
+#include <qjson/parser.h>
+
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QRegExp>
+
+using namespace Tomahawk;
+
+QPixmap* ItunesParser::s_pixmap = 0;
+
+
+ItunesParser::ItunesParser( const QStringList& urls, QObject* parent )
+    : QObject ( parent )
+    , m_single( false )
+{
+    foreach ( const QString& url, urls )
+    {
+        lookupItunesUri( url );
+    }
+}
+
+
+ItunesParser::ItunesParser( const QString& Url, QObject* parent )
+    : QObject ( parent )
+    , m_single( true )
+{
+    lookupItunesUri( Url );
+}
+
+
+ItunesParser::~ItunesParser()
+{
+}
+
+
+void
+ItunesParser::lookupItunesUri( const QString& link )
+{
+    // Itunes uri parsing, using regex
+    // (\d+)(?:\?i=*)(\d+) = AlbumId and trackId
+    // (\d+)(?:\s*) = id
+    QRegExp rxAlbumTrack( "(\\d+)(?:\\?i=*)(\\d+)" );
+    QRegExp rxId( "(\\d+)(?:\\s*)" );
+    QString id, trackId;
+
+    // Doing a parse on regex in 2 stages,
+    // first, look if we have both album and track id
+    int pos = rxAlbumTrack.indexIn( link );
+    if ( pos > -1 )
+    {
+        id = rxAlbumTrack.cap( 1 );
+        trackId = rxAlbumTrack.cap( 2 );
+    }
+    else
+    {
+        // Second, if we dont have trackId, check for just Id
+        int pos = rxId.indexIn( link );
+        if ( pos > -1 )
+        {
+            id = rxId.cap( 1 );
+        }
+        else
+            return;
+    }
+    tLog() << "Parsing itunes track:" << link;
+
+    QUrl url;
+    DropJob::DropType type;
+    if ( link.contains( "artist" ) )
+    {
+        type = DropJob::Artist;
+        url = QUrl( QString( "http://ax.phobos.apple.com.edgesuite.net/WebObjects/MZStoreServices.woa/wa/wsLookup?id=%1&entity=song&limit=30" ).arg( id ) );
+    }
+    else
+    {
+        type = ( trackId.isEmpty() ? DropJob::Album : DropJob::Track );
+        url = QUrl( QString( "http://ax.phobos.apple.com.edgesuite.net/WebObjects/MZStoreServices.woa/wa/wsLookup?id=%1&entity=song" ).arg( ( trackId.isEmpty() ? id : trackId ) ) );
+    }
+    qDebug() << "Looking up..." << url.toString();
+
+    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    connect( reply, SIGNAL( finished() ), this, SLOT( itunesResponseLookupFinished() ) );
+
+    DropJobNotifier* j = new DropJobNotifier( pixmap(), QString( "Itunes" ), type, reply );
+    JobStatusView::instance()->model()->addJob( j );
+
+    m_queries.insert( reply );
+}
+
+
+void
+ItunesParser::itunesResponseLookupFinished()
+{
+    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
+    Q_ASSERT( r );
+    m_queries.remove( r );
+    r->deleteLater();
+
+    if ( r->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        QVariantMap res = p.parse( r, &ok ).toMap();
+
+        if ( !ok )
+        {
+            tLog() << "Failed to parse json from Spotify track lookup:" << p.errorString() << "On line" << p.errorLine();
+            checkTrackFinished();
+            return;
+        }
+        else if ( !res.contains( "results" ) )
+        {
+            tLog() << "No 'results' item in the itunes track lookup result... not doing anything";
+            checkTrackFinished();
+            return;
+        }
+        QVariantList itunesResponse = res.value( "results" ).toList();
+
+        foreach ( QVariant itune, itunesResponse )
+        {
+            QString title, artist, album;
+            QVariantMap ituneMap = itune.toMap();
+
+            if ( ituneMap.value( "wrapperType" ).toString().contains( "track" ) )
+            {
+                title = ituneMap.value( "trackName" ).toString();
+                artist = ituneMap.value( "artistName" ).toString();
+                album = ituneMap.value( "collectionName" ).toString();
+                if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
+                {
+                    tLog() << "Didn't get an artist and track name from itunes, not enough to build a query on. Aborting" << title << artist << album;
+                }
+                else
+                {
+                    Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), true );
+                    if ( q.isNull() )
+                        continue;
+
+                    m_tracks << q;
+                }
+            }
+        }
+    }
+    else
+    {
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching iTunes information from the network!" ) ) );
+        tLog() << "Error in network request to Itunes for track decoding:" << r->errorString();
+    }
+
+    checkTrackFinished();
+}
+
+
+void
+ItunesParser::checkTrackFinished()
+{
+    if ( m_queries.isEmpty() ) // we're done
+    {
+        if ( m_single && !m_tracks.isEmpty() )
+            emit track( m_tracks.first() );
+        else if ( !m_single && !m_tracks.isEmpty() )
+            emit tracks( m_tracks );
+
+        deleteLater();
+    }
+}
+
+
+QPixmap
+ItunesParser::pixmap() const
+{
+    if ( !s_pixmap )
+        s_pixmap = new QPixmap( RESPATH "images/itunes.png" );
+
+    return *s_pixmap;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/ItunesParser.h Added

@@ -0,0 +1,76 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Written by Hugo Lindström <hugolm84@gmail.com>
+ *   But based on Leo Franchi's work from spotifyParser
+ *   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 ITUNES_PARSER_H
+#define ITUNES_PARSER_H
+
+#include "DllMacro.h"
+#include "Typedefs.h"
+#include "Query.h"
+#include "DropJobNotifier.h"
+
+#include <QObject>
+#include <QSet>
+#include <QtCore/QStringList>
+
+class QNetworkReply;
+class TrackModel;
+
+namespace Tomahawk
+{
+
+/**
+ * Small class to parse itunes links into query_ptrs
+ *
+ * Connect to the signals to get the results
+ */
+class DLLEXPORT ItunesParser : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ItunesParser( const QString& trackUrl, QObject* parent = 0 );
+    explicit ItunesParser( const QStringList& trackUrls, QObject* parent = 0 );
+    virtual ~ItunesParser();
+
+signals:
+    void track( const Tomahawk::query_ptr& track );
+    void tracks( const QList< Tomahawk::query_ptr > tracks );
+
+private slots:
+    void itunesResponseLookupFinished();
+
+private:
+    QPixmap pixmap() const;
+    void lookupItunesUri( const QString& track );
+    void checkTrackFinished();
+
+    bool m_single;
+    QList< query_ptr > m_tracks;
+    QSet< QNetworkReply* > m_queries;
+    QString m_title, m_info, m_creator;
+    Tomahawk::playlist_ptr m_playlist;
+
+    DropJobNotifier* m_browseJob;
+    static QPixmap* s_pixmap;
+};
+
+}
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/JspfLoader.cpp Added

@@ -0,0 +1,217 @@
+/* === 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 "JspfLoader.h"
+
+
+#include <QApplication>
+#include <QDomDocument>
+#include <QMessageBox>
+
+#include <qjson/parser.h>
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+#include "SourceList.h"
+#include "Playlist.h"
+
+using namespace Tomahawk;
+
+
+JSPFLoader::JSPFLoader( bool autoCreate, QObject* parent )
+    : QObject( parent )
+    , m_autoCreate( autoCreate )
+    , m_autoDelete( true )
+{
+}
+
+
+JSPFLoader::~JSPFLoader()
+{
+}
+
+
+QList< Tomahawk::query_ptr >
+JSPFLoader::entries() const
+{
+    return m_entries;
+}
+
+
+void
+JSPFLoader::load( const QUrl& url )
+{
+    QNetworkRequest request( url );
+    Q_ASSERT( TomahawkUtils::nam() != 0 );
+    QNetworkReply* reply = TomahawkUtils::nam()->get( request );
+
+    // isn't there a race condition here? something could happen before we connect()
+    // no---the event loop is needed to make the request, i think (leo)
+    connect( reply, SIGNAL( finished() ),
+             SLOT( networkLoadFinished() ) );
+
+    connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ),
+             SLOT( networkError( QNetworkReply::NetworkError ) ) );
+}
+
+
+void
+JSPFLoader::load( QFile& file )
+{
+    if( file.open( QFile::ReadOnly ) )
+    {
+        m_body = file.readAll();
+        gotBody();
+    }
+    else
+    {
+        tLog() << "Failed to open jspf file";
+        reportError();
+    }
+}
+
+
+void
+JSPFLoader::reportError()
+{
+    emit failed();
+
+    if ( m_autoDelete )
+        deleteLater();
+}
+
+
+void
+JSPFLoader::networkLoadFinished()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
+    m_body = reply->readAll();
+    gotBody();
+}
+
+
+void
+JSPFLoader::networkError( QNetworkReply::NetworkError e )
+{
+    tLog() << Q_FUNC_INFO << "Network error loading jspf" << e;
+    reportError();
+}
+
+
+void
+JSPFLoader::gotBody()
+{
+    QJson::Parser p;
+    bool retOk;
+    QVariantMap wrapper = p.parse( m_body, &retOk ).toMap();
+
+    if ( !retOk )
+    {
+        tLog() << "Failed to parse jspf json:" << p.errorString() << "on line" << p.errorLine();
+        return;
+    }
+
+    if ( !wrapper.contains( "playlist" ) )
+    {
+        tLog() << "No playlist element in JSPF!";
+        return;
+    }
+
+    QVariantMap pl = wrapper.value( "playlist" ).toMap();
+    QString origTitle = pl.value( "title" ).toString();
+    m_info = pl.value( "info" ).toString();
+    m_creator = pl.value( "creator" ).toString();
+
+    m_title = origTitle;
+    if ( m_title.isEmpty() )
+        m_title = tr( "New Playlist" );
+    if ( !m_overrideTitle.isEmpty() )
+        m_title = m_overrideTitle;
+
+    if ( pl.contains( "track" ) )
+    {
+        QVariantList tracks = pl.value( "track" ).toList();
+
+        bool shownError = false;
+        foreach ( const QVariant& currentTrack, tracks )
+        {
+            QVariantMap tM = currentTrack.toMap();
+            QString artist, album, track, duration, annotation, url;
+
+            artist = tM.value( "creator" ).toString();
+            album = tM.value( "album" ).toString();
+            track = tM.value( "title" ).toString();
+            duration = tM.value( "duration" ).toString();
+            annotation = tM.value( "annotation" ).toString();
+            if ( tM.value( "location" ).toList().size() > 0 )
+                url = tM.value( "location" ).toList().first().toString();
+
+            if ( artist.isEmpty() || track.isEmpty() )
+            {
+                if ( !shownError )
+                {
+                    QMessageBox::warning( 0, tr( "Failed to save tracks" ), tr( "Some tracks in the playlist do not contain an artist and a title. They will be ignored." ), QMessageBox::Ok );
+                    shownError = true;
+                }
+                continue;
+            }
+
+            query_ptr q = Tomahawk::Query::get( artist, track, album, uuid() );
+            if ( q.isNull() )
+                continue;
+
+            q->setDuration( duration.toInt() / 1000 );
+            if( !url.isEmpty() )
+                q->setResultHint( url );
+
+            m_entries << q;
+        }
+    }
+
+    if ( origTitle.isEmpty() && m_entries.isEmpty() )
+    {
+        if ( m_autoCreate )
+        {
+            QMessageBox::critical( 0, tr( "XSPF Error" ), tr( "This is not a valid XSPF playlist." ) );
+            return;
+        }
+        else
+        {
+            emit failed();
+            return;
+        }
+    }
+
+    if ( m_autoCreate )
+    {
+        m_playlist = Playlist::create( SourceList::instance()->getLocal(),
+                                       uuid(),
+                                       m_title,
+                                       m_info,
+                                       m_creator,
+                                       false,
+                                       m_entries );
+    }
+
+    emit ok( m_playlist );
+
+    if ( m_autoDelete )
+        deleteLater();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/JspfLoader.h Added

@@ -0,0 +1,76 @@
+/* === 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 JSPFLOADER_H
+#define JSPFLOADER_H
+
+#include <QObject>
+#include <QUrl>
+#include <QFile>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+
+#include "Playlist.h"
+#include "Typedefs.h"
+
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+
+class DLLEXPORT JSPFLoader : public QObject
+{
+Q_OBJECT
+
+public:
+    explicit JSPFLoader( bool autoCreate = true, QObject* parent = 0 );
+
+    virtual ~JSPFLoader();
+
+    QList< Tomahawk::query_ptr > entries() const;
+    void setOverrideTitle( const QString& newTitle ) { m_overrideTitle = newTitle; }
+
+    void setAutoDelete( bool autoDelete ) { m_autoDelete = autoDelete; }
+
+signals:
+    void failed();
+    void ok( const Tomahawk::playlist_ptr& );
+
+public slots:
+    void load( const QUrl& url );
+    void load( QFile& file );
+
+private slots:
+    void networkLoadFinished();
+    void networkError( QNetworkReply::NetworkError e );
+
+private:
+    void reportError();
+    void gotBody();
+
+    bool m_autoCreate, m_autoDelete;
+    QList< Tomahawk::query_ptr > m_entries;
+    QString m_title, m_info, m_creator, m_overrideTitle;
+
+    QByteArray m_body;
+    Tomahawk::playlist_ptr m_playlist;
+};
+
+}
+
+#endif // JSPFLOADER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/Logger.cpp Added

@@ -0,0 +1,175 @@
+/* === 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
+ *   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 "Logger.h"
+
+#include <iostream>
+#include <fstream>
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QFileInfo>
+#include <QMutex>
+#include <QTime>
+#include <QVariant>
+
+#include "utils/TomahawkUtils.h"
+
+#define LOGFILE_SIZE 1024 * 256
+
+#define RELEASE_LEVEL_THRESHOLD 0
+#define DEBUG_LEVEL_THRESHOLD LOGEXTRA
+#define LOG_SQL_QUERIES 1
+
+using namespace std;
+
+ofstream logfile;
+static int s_threshold = -1;
+QMutex s_mutex;
+
+namespace Logger
+{
+
+static void
+log( const char *msg, unsigned int debugLevel, bool toDisk = true )
+{
+    if ( s_threshold < 0 )
+    {
+        if ( qApp->arguments().contains( "--verbose" ) )
+            s_threshold = LOGTHIRDPARTY;
+        else
+            #ifdef QT_NO_DEBUG
+            s_threshold = RELEASE_LEVEL_THRESHOLD;
+            #else
+            s_threshold = DEBUG_LEVEL_THRESHOLD;
+            #endif
+    }
+
+    #ifdef QT_NO_DEBUG
+    if ( debugLevel > RELEASE_LEVEL_THRESHOLD )
+        toDisk = false;
+    #else
+    if ( debugLevel > DEBUG_LEVEL_THRESHOLD )
+        toDisk = false;
+    #endif
+
+    #ifdef LOG_SQL_QUERIES
+    if ( debugLevel == LOGSQL )
+        toDisk = true;
+    #endif
+
+    if ( toDisk || (int)debugLevel <= s_threshold )
+    {
+        QMutexLocker lock( &s_mutex );
+
+        #ifdef LOG_SQL_QUERIES
+        if ( debugLevel == LOGSQL )
+            logfile << "TSQLQUERY: ";
+        #endif
+
+        logfile << QTime::currentTime().toString().toAscii().data() << " " << QString::number( debugLevel ).toAscii().data() << ": " << msg << endl;
+        logfile.flush();
+    }
+
+    if ( debugLevel <= LOGEXTRA || (int)debugLevel <= s_threshold )
+    {
+        QMutexLocker lock( &s_mutex );
+
+        cout << msg << endl;
+        cout.flush();
+    }
+}
+
+
+void
+TomahawkLogHandler( QtMsgType type, const char* msg )
+{
+    static QMutex s_mutex;
+
+    QMutexLocker locker( &s_mutex );
+    switch( type )
+    {
+        case QtDebugMsg:
+            log( msg, LOGTHIRDPARTY );
+            break;
+
+        case QtCriticalMsg:
+            log( msg, 0 );
+            break;
+
+        case QtWarningMsg:
+            log( msg, 0 );
+            break;
+
+        case QtFatalMsg:
+            log( msg, 0 );
+            break;
+    }
+}
+
+
+QString
+logFile()
+{
+    return TomahawkUtils::appLogDir().filePath( "Tomahawk.log" );
+}
+
+
+void
+setupLogfile()
+{
+    if ( QFileInfo( logFile().toLocal8Bit() ).size() > LOGFILE_SIZE )
+    {
+        QByteArray lc;
+        {
+            QFile f( logFile().toLocal8Bit() );
+            f.open( QIODevice::ReadOnly | QIODevice::Text );
+            lc = f.readAll();
+            f.close();
+        }
+
+        QFile::remove( logFile().toLocal8Bit() );
+
+        {
+            QFile f( logFile().toLocal8Bit() );
+            f.open( QIODevice::WriteOnly | QIODevice::Text );
+            f.write( lc.right( LOGFILE_SIZE - ( LOGFILE_SIZE / 4 ) ) );
+            f.close();
+        }
+    }
+
+    logfile.open( logFile().toLocal8Bit(), ios::app );
+    qInstallMsgHandler( TomahawkLogHandler );
+}
+
+}
+
+using namespace Logger;
+
+TLog::TLog( unsigned int debugLevel )
+    : QDebug( &m_msg )
+    , m_debugLevel( debugLevel )
+{
+}
+
+
+TLog::~TLog()
+{
+    log( m_msg.toAscii().data(), m_debugLevel );
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/Logger.h Added

@@ -0,0 +1,72 @@
+/* === 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
+ *   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 TOMAHAWK_LOGGER_H
+#define TOMAHAWK_LOGGER_H
+
+#include <QDebug>
+#include <QStringList>
+
+#include "DllMacro.h"
+
+#define LOGDEBUG 1
+#define LOGINFO 2
+#define LOGEXTRA 5
+#define LOGVERBOSE 8
+#define LOGTHIRDPARTY 9
+#define LOGSQL 10
+
+namespace Logger
+{
+    class DLLEXPORT TLog : public QDebug
+    {
+    public:
+        TLog( unsigned int debugLevel = 0 );
+        virtual ~TLog();
+
+    private:
+        QString m_msg;
+        unsigned int m_debugLevel;
+    };
+
+    class DLLEXPORT TDebug : public TLog
+    {
+    public:
+        TDebug( unsigned int debugLevel = LOGDEBUG ) : TLog( debugLevel )
+        {
+        }
+    };
+
+    class DLLEXPORT TSqlLog : public TLog
+    {
+    public:
+        TSqlLog() : TLog( LOGSQL )
+        {
+        }
+    };
+
+    DLLEXPORT void TomahawkLogHandler( QtMsgType type, const char* msg );
+    DLLEXPORT void setupLogfile();
+    DLLEXPORT QString logFile();
+}
+
+#define tLog Logger::TLog
+#define tDebug Logger::TDebug
+#define tSqlLog Logger::TSqlLog
+
+#endif // TOMAHAWK_LOGGER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/M3uLoader.cpp Added

@@ -0,0 +1,155 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 "M3uLoader.h"
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+#include "Query.h"
+#include "SourceList.h"
+
+#include "Playlist.h"
+#include "DropJob.h"
+
+#include <QFileInfo>
+#include <QFile>
+
+/* taglib */
+#include <taglib/fileref.h>
+#include <taglib/tag.h>
+
+using namespace Tomahawk;
+
+
+M3uLoader::M3uLoader( const QStringList& urls, bool createNewPlaylist, QObject* parent )
+    : QObject( parent )
+    , m_single( false )
+    , m_trackMode( true )
+    , m_createNewPlaylist( createNewPlaylist )
+    , m_urls( urls )
+{
+}
+
+
+M3uLoader::M3uLoader( const QString& url, bool createNewPlaylist, QObject* parent )
+    : QObject( parent )
+    , m_single( false )
+    , m_trackMode( true )
+    , m_createNewPlaylist( createNewPlaylist )
+    , m_urls( url )
+{
+}
+
+
+M3uLoader::~M3uLoader()
+{
+}
+
+
+void
+M3uLoader::parse()
+{
+    foreach ( const QString& url, m_urls )
+        parseM3u( url );
+}
+
+
+void
+M3uLoader::getTags( const QFileInfo& info )
+{
+    QByteArray fileName = QFile::encodeName( info.canonicalFilePath() );
+    const char *encodedName = fileName.constData();
+
+    TagLib::FileRef f( encodedName );
+    TagLib::Tag *tag = f.tag();
+
+    QString artist = TStringToQString( tag->artist() ).trimmed();
+    QString album  = TStringToQString( tag->album() ).trimmed();
+    QString track  = TStringToQString( tag->title() ).trimmed();
+
+    if ( artist.isEmpty() || track.isEmpty() )
+    {
+        qDebug() << "Error parsing" << info.fileName();
+        return;
+    }
+    else
+    {
+        qDebug() << Q_FUNC_INFO << artist << track << album;
+        Tomahawk::query_ptr q = Tomahawk::Query::get( artist, track, album, uuid(), !m_createNewPlaylist );
+        if ( !q.isNull() )
+            m_tracks << q;
+    }
+}
+
+
+void
+M3uLoader::parseM3u( const QString& fileLink )
+{
+    QFileInfo fileInfo( fileLink );
+    QFile file( QUrl::fromUserInput( fileLink ).toLocalFile() );
+
+    if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) )
+    {
+        tDebug() << "Error opening m3u:" << file.errorString();
+        return;
+    }
+
+    m_title = fileInfo.baseName();
+    while ( !file.atEnd() )
+    {
+         QByteArray line = file.readLine();
+         /// If anyone wants to take on the regex for parsing EXT, go ahead
+         /// But the notion that users does not tag by a common rule. that seems hard
+         if ( line.contains( "EXT" ) )
+             continue;
+
+         QFileInfo tmpFile( QUrl::fromUserInput( QString( line.simplified() ) ).toLocalFile() );
+
+         if( tmpFile.exists() )
+             getTags( tmpFile );
+         else
+         {
+             QFileInfo tmpFile( QUrl::fromUserInput( QString( fileInfo.canonicalPath() + "/" + line.simplified() ) ).toLocalFile() );
+             if ( tmpFile.exists() )
+                getTags( tmpFile );
+         }
+    }
+
+    if ( m_tracks.isEmpty() )
+    {
+        tDebug() << Q_FUNC_INFO << "Could not parse M3U!";
+        return;
+    }
+
+    if ( m_createNewPlaylist )
+    {
+        m_playlist = Playlist::create( SourceList::instance()->getLocal(),
+                                       uuid(),
+                                       m_title,
+                                       m_info,
+                                       m_creator,
+                                       false,
+                                       m_tracks );
+
+        connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
+    }
+    else
+        emit tracks( m_tracks );
+
+    m_tracks.clear();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/M3uLoader.h Added

@@ -0,0 +1,68 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *   Copyright 2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 M3U_LOADER_H
+#define M3U_LOADER_H
+
+
+#include <QtCore/QFileInfo>
+#include "DllMacro.h"
+#include "Typedefs.h"
+#include "Query.h"
+#include "Playlist.h"
+#include <QObject>
+#include <QSet>
+#include <QtCore/QStringList>
+
+class TrackModel;
+
+namespace Tomahawk
+{
+
+class DLLEXPORT M3uLoader : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit M3uLoader( const QString& url, bool createNewPlaylist = false, QObject* parent = 0 );
+    explicit M3uLoader( const QStringList& urls, bool createNewPlaylist = false, QObject* parent = 0 );
+    virtual ~M3uLoader();
+
+public slots:
+    void parse();
+
+signals:
+    void track( const Tomahawk::query_ptr& track );
+    void tracks( const QList< Tomahawk::query_ptr > tracks );
+
+private:
+    void parseM3u( const QString& track );
+    void getTags( const QFileInfo& info );
+    QList< query_ptr > m_tracks;
+    QString m_title, m_info, m_creator;
+    bool m_single;
+    bool m_trackMode;
+    bool m_createNewPlaylist;
+    playlist_ptr m_playlist;
+    QStringList m_urls;
+};
+
+}
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/PixmapDelegateFader.cpp Added

@@ -0,0 +1,316 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2012, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2010-2012, Christian Muehlhaeuser <muesli@tomahawk-player.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 "PixmapDelegateFader.h"
+#include "TomahawkUtilsGui.h"
+#include "Source.h"
+
+#include <QPainter>
+#include <QBuffer>
+#include <QPaintEngine>
+#include <QTimer>
+
+using namespace Tomahawk;
+
+QWeakPointer< TomahawkUtils::SharedTimeLine > PixmapDelegateFader::s_stlInstance = QWeakPointer< TomahawkUtils::SharedTimeLine >();
+
+
+QWeakPointer< TomahawkUtils::SharedTimeLine >
+PixmapDelegateFader::stlInstance()
+{
+    if ( s_stlInstance.isNull() )
+        s_stlInstance = QWeakPointer< TomahawkUtils::SharedTimeLine> ( new TomahawkUtils::SharedTimeLine() );
+
+    return s_stlInstance;
+}
+
+
+PixmapDelegateFader::PixmapDelegateFader( const artist_ptr& artist, const QSize& size, TomahawkUtils::ImageMode mode, bool forceLoad )
+    : m_artist( artist )
+    , m_size( size )
+    , m_mode( mode )
+{
+    if ( !m_artist.isNull() )
+    {
+        connect( m_artist.data(), SIGNAL( updated() ), SLOT( artistChanged() ) );
+        connect( m_artist.data(), SIGNAL( coverChanged() ), SLOT( artistChanged() ) );
+
+        m_currentReference = m_artist->cover( size, forceLoad );
+    }
+
+    init();
+}
+
+
+PixmapDelegateFader::PixmapDelegateFader( const album_ptr& album, const QSize& size, TomahawkUtils::ImageMode mode, bool forceLoad )
+    : m_album( album )
+    , m_size( size )
+    , m_mode( mode )
+{
+    if ( !m_album.isNull() )
+    {
+        connect( m_album.data(), SIGNAL( updated() ), SLOT( albumChanged() ) );
+        connect( m_album.data(), SIGNAL( coverChanged() ), SLOT( albumChanged() ) );
+
+        m_currentReference = m_album->cover( size, forceLoad );
+    }
+
+    init();
+}
+
+
+PixmapDelegateFader::PixmapDelegateFader( const query_ptr& track, const QSize& size, TomahawkUtils::ImageMode mode, bool forceLoad )
+    : m_track( track )
+    , m_size( size )
+    , m_mode( mode )
+{
+    if ( !m_track.isNull() )
+    {
+        connect( m_track.data(), SIGNAL( updated() ), SLOT( trackChanged() ) );
+        connect( m_track.data(), SIGNAL( resultsChanged() ), SLOT( trackChanged() ) );
+        connect( m_track->displayQuery().data(), SIGNAL( coverChanged() ), SLOT( trackChanged() ) );
+
+        m_currentReference = m_track->displayQuery()->cover( size, forceLoad );
+    }
+
+    init();
+}
+
+
+PixmapDelegateFader::~PixmapDelegateFader()
+{
+}
+
+
+void
+PixmapDelegateFader::init()
+{
+    if ( m_currentReference.isNull() )
+        m_defaultImage = true;
+    else
+        m_defaultImage = false;
+
+    m_startFrame = 0;
+    m_fadePct = 100;
+    m_connectedToStl = false;
+
+    m_current = QPixmap( m_size );
+    m_current.fill( Qt::transparent );
+
+    setSize( m_size );
+    if ( m_defaultImage )
+        return;
+
+    stlInstance().data()->setUpdateInterval( 20 );
+    m_startFrame = stlInstance().data()->currentFrame();
+    m_connectedToStl = true;
+    m_fadePct = 0;
+    connect( stlInstance().data(), SIGNAL( frameChanged( int ) ), SLOT( onAnimationStep( int ) ) );
+}
+
+
+void
+PixmapDelegateFader::setSize( const QSize& size )
+{
+    m_size = size;
+
+    if ( m_defaultImage )
+    {
+        // No cover loaded yet, use default and don't fade in
+        if ( !m_album.isNull() )
+            m_current = m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, m_mode, m_size );
+        else if ( !m_artist.isNull() )
+            m_current = m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, m_mode, m_size );
+        else if ( !m_track.isNull() )
+            m_current = m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, m_mode, m_size );
+    }
+    else
+    {
+        if ( !m_album.isNull() )
+            m_currentReference = m_album->cover( m_size );
+        else if ( !m_artist.isNull() )
+            m_currentReference = m_artist->cover( m_size );
+        else if ( !m_track.isNull() )
+            m_currentReference = m_track->displayQuery()->cover( m_size );
+    }
+
+    emit repaintRequest();
+}
+
+
+void
+PixmapDelegateFader::albumChanged()
+{
+    if ( m_album.isNull() )
+        return;
+
+    QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_album->cover( m_size ) ) );
+}
+
+
+void
+PixmapDelegateFader::artistChanged()
+{
+    if ( m_artist.isNull() )
+        return;
+
+    QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_artist->cover( m_size ) ) );
+}
+
+
+void
+PixmapDelegateFader::trackChanged()
+{
+    if ( m_track.isNull() )
+        return;
+
+    connect( m_track->displayQuery().data(), SIGNAL( coverChanged() ), SLOT( trackChanged() ) );
+    QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_track->displayQuery()->cover( m_size ) ) );
+}
+
+
+void
+PixmapDelegateFader::setPixmap( const QPixmap& pixmap )
+{
+    if ( pixmap.isNull() )
+        return;
+
+    m_defaultImage = false;
+    QCryptographicHash hash( QCryptographicHash::Md5 );
+    const QImage img = pixmap.toImage();
+    hash.addData( (const char*)img.constBits(), img.byteCount() );
+    const QString newImageMd5 = hash.result();
+
+    if ( m_oldImageMd5 == newImageMd5 )
+        return;
+
+    m_oldImageMd5 = newImageMd5;
+
+    if ( m_connectedToStl )
+    {
+        m_pixmapQueue.enqueue( pixmap );
+        return;
+    }
+
+    m_oldReference = m_currentReference;
+    m_currentReference = pixmap;
+
+    stlInstance().data()->setUpdateInterval( 20 );
+    m_startFrame = stlInstance().data()->currentFrame();
+    m_connectedToStl = true;
+    m_fadePct = 0;
+    connect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
+}
+
+
+void
+PixmapDelegateFader::onAnimationStep( int step )
+{
+    m_fadePct = (float)( step - m_startFrame ) / 10.0;
+    if ( m_fadePct > 100.0 )
+        m_fadePct = 100.0;
+
+    if ( m_fadePct == 100.0 )
+        QTimer::singleShot( 0, this, SLOT( onAnimationFinished() ) );
+
+    const qreal opacity = m_fadePct / 100.0;
+    const qreal oldOpacity =  ( 100.0 - m_fadePct ) / 100.0;
+    m_current.fill( Qt::transparent );
+
+    // Update our pixmap with the new opacity
+    QPainter p( &m_current );
+
+    if ( !m_oldReference.isNull() )
+    {
+        p.setOpacity( oldOpacity );
+        p.drawPixmap( 0, 0, m_oldReference );
+    }
+
+    Q_ASSERT( !m_currentReference.isNull() );
+    if ( !m_currentReference.isNull() ) // Should never be null..
+    {
+        p.setOpacity( opacity );
+        p.drawPixmap( 0, 0, m_currentReference );
+    }
+
+    p.end();
+
+    emit repaintRequest();
+    /**
+     * Avoids using setOpacity that is slow on X11 (turns off graphics-backed painting, forces fallback to
+     * software rasterizer.
+     *
+     * but a bit buggy.
+     */
+    /*
+     const int opacity = ((float)step* / 1000.) * 255;
+     const int oldOpacity = 255 - opacity;
+    if ( !m_oldReference.isNull() )
+    {
+        p.setCompositionMode( QPainter::CompositionMode_Source );
+        p.drawPixmap( 0, 0, m_oldReference );
+
+        // Reduce the source opacity by the value of the alpha channel
+        p.setCompositionMode( QPainter::CompositionMode_DestinationIn );
+        qDebug() << Q_FUNC_INFO << "Drawing old pixmap w/ opacity;" << oldOpacity;
+        p.fillRect( m_current.rect(), QColor( 0, 0, 0, oldOpacity ) );
+    }
+
+    Q_ASSERT( !m_currentReference.isNull() );
+    if ( !m_currentReference.isNull() ) // Should never be null..
+    {
+        QPixmap temp( m_size );
+        temp.fill( Qt::transparent );
+
+        QPainter p2( &temp );
+        p2.drawPixmap( 0, 0, m_currentReference );
+
+        p2.setCompositionMode( QPainter::CompositionMode_DestinationIn );
+        qDebug() << Q_FUNC_INFO << "Drawing NEW pixmap w/ opacity;" << opacity;
+
+        p2.fillRect( temp.rect(), QColor( 0, 0, 0, opacity ) );
+        p2.end();
+
+        p.setCompositionMode( QPainter::CompositionMode_Source );
+        p.drawPixmap( 0, 0, temp );
+    }
+    */
+
+}
+
+
+void
+PixmapDelegateFader::onAnimationFinished()
+{
+    m_oldReference = QPixmap();
+
+    m_connectedToStl = false;
+    disconnect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
+
+    if ( !m_pixmapQueue.isEmpty() )
+        QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_pixmapQueue.dequeue() ) );
+}
+
+
+QPixmap
+PixmapDelegateFader::currentPixmap() const
+{
+    return m_current;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/PixmapDelegateFader.h Added

@@ -0,0 +1,96 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011-2012, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2012, Jeff Mitchell <jeff@tomahawk-player.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 PIXMAPDELEGATEFADER_H
+#define PIXMAPDELEGATEFADER_H
+
+#include "Artist.h"
+#include "Album.h"
+#include "Query.h"
+#include "utils/SharedTimeLine.h"
+
+#include <QObject>
+#include <QTimeLine>
+#include <QQueue>
+#include <QWeakPointer>
+
+namespace Tomahawk
+{
+
+/**
+ * No parent, manage it yourself!
+ *
+ * TODO: Handle changing sizes
+ */
+
+class PixmapDelegateFader : public QObject
+{
+    Q_OBJECT
+
+    static QWeakPointer< TomahawkUtils::SharedTimeLine > stlInstance();
+    
+public:
+    PixmapDelegateFader( const artist_ptr& artist, const QSize& size, TomahawkUtils::ImageMode mode = TomahawkUtils::Original, bool forceLoad = true );
+    PixmapDelegateFader( const album_ptr& album, const QSize& size, TomahawkUtils::ImageMode mode = TomahawkUtils::Original, bool forceLoad = true );
+    PixmapDelegateFader( const query_ptr& track, const QSize& size, TomahawkUtils::ImageMode mode = TomahawkUtils::Original, bool forceLoad = true );
+
+    virtual ~PixmapDelegateFader();
+    
+    QSize size() const { return m_size; }
+    QPixmap currentPixmap() const;
+
+public slots:
+    void setSize( const QSize& size );
+
+signals:
+    void repaintRequest();
+
+private slots:
+    void artistChanged();
+    void albumChanged();
+    void trackChanged();
+
+    void onAnimationStep( int );
+    void onAnimationFinished();
+    void setPixmap( const QPixmap& pixmap );
+
+private:
+    void init();
+
+    artist_ptr m_artist;
+    album_ptr m_album;
+    query_ptr m_track;
+    QSize m_size;
+    TomahawkUtils::ImageMode m_mode;
+    int m_startFrame;
+    bool m_connectedToStl;
+    float m_fadePct;
+    QString m_oldImageMd5;
+    bool m_defaultImage;
+    
+    QQueue<QPixmap> m_pixmapQueue;
+    
+    QPixmap m_currentReference, m_oldReference, m_current;
+
+    static QWeakPointer< TomahawkUtils::SharedTimeLine > s_stlInstance;
+};
+
+}
+
+#endif // PIXMAPDELEGATEFADER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/ProxyStyle.cpp Added

@@ -0,0 +1,84 @@
+/* === 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
+ *   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 "ProxyStyle.h"
+
+#include <QPainter>
+#include <QSplitter>
+#include <QStyleOption>
+#include <QWidget>
+
+#include "utils/Logger.h"
+
+#define ARROW_WIDTH 7
+#define ARROW_HEIGHT 7
+
+
+void
+ProxyStyle::drawPrimitive( PrimitiveElement pe, const QStyleOption* opt, QPainter* p, const QWidget* w ) const
+{
+    if ( pe == PE_IndicatorBranch )
+    {
+        if ( opt->state & QStyle::State_Children && !w->property( "flattenBranches" ).toBool() )
+        {
+            int hd = ( opt->rect.height() - ARROW_HEIGHT ) / 2;
+            int wd = ( opt->rect.width() - ARROW_WIDTH ) / 2;
+
+            QRect r = opt->rect.adjusted( wd, hd, 0, 0 );
+            QPointF pointsOpened3 = { QPointF( r.x(), r.y() ), QPointF( r.x() + ARROW_WIDTH, r.y() ), QPointF( r.x() + ARROW_WIDTH / 2, r.y() + ARROW_HEIGHT ) };
+            QPointF pointsClosed3 = { QPointF( r.x(), r.y() ), QPointF( r.x() + ARROW_WIDTH, r.y() + ARROW_HEIGHT / 2 ), QPointF( r.x(), r.y() + ARROW_HEIGHT ) };
+
+            p->save();
+            p->setRenderHint( QPainter::Antialiasing );
+
+            p->setPen( opt->palette.dark().color() );
+            p->setBrush( opt->palette.dark().color() );
+            if ( !( opt->state & QStyle::State_Open ) )
+            {
+                p->drawPolygon( pointsClosed, 3 );
+            }
+            else
+            {
+                p->drawPolygon( pointsOpened, 3 );
+            }
+
+            p->restore();
+        }
+        return;
+    }
+
+    if ( pe != PE_FrameStatusBar )
+        QProxyStyle::drawPrimitive( pe, opt, p, w );
+}
+
+
+void
+ProxyStyle::drawControl( ControlElement ce, const QStyleOption* opt, QPainter* p, const QWidget* w ) const
+{
+    if ( ce == CE_Splitter )
+    {
+        const QSplitter* splitter = qobject_cast< const QSplitter* >( w );
+        if ( !splitter->sizes().contains( 0 ) )
+        {
+            p->setPen( QColor( 0x8c, 0x8c, 0x8c ) );
+            p->drawLine( opt->rect.topLeft(), opt->rect.bottomRight() );
+        }
+    }
+    else
+        QProxyStyle::drawControl( ce, opt, p, w );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/ProxyStyle.h Added

@@ -0,0 +1,36 @@
+/* === 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
+ *   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 PROXYSTYLE_H
+#define PROXYSTYLE_H
+
+#include <QtGlobal>
+#include <QProxyStyle>
+
+#include "DllMacro.h"
+
+class DLLEXPORT ProxyStyle : public QProxyStyle
+{
+public:
+    ProxyStyle() {}
+
+    virtual void drawPrimitive( PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w = 0 ) const;
+    virtual void drawControl( ControlElement ce, const QStyleOption *opt, QPainter *p, const QWidget *w = 0 ) const;
+};
+
+#endif // PROXYSTYLE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/Qnr_IoDeviceStream.cpp Added

@@ -0,0 +1,86 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2007 Matthias Kretz <kretz@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "Qnr_IoDeviceStream.h"
+
+#include <QtNetwork/QNetworkReply>
+
+using namespace Tomahawk;
+
+QNR_IODeviceStream::QNR_IODeviceStream(QIODevice* ioDevice, QObject* parent)
+    : Phonon::AbstractMediaStream( parent ),
+      _ioDevice(ioDevice),
+      _networkReply(0)
+{
+    _ioDevice->reset();
+    if (!_ioDevice->isOpen()) {
+        _ioDevice->open(QIODevice::ReadOnly);
+    }
+
+    Q_ASSERT(ioDevice->isOpen());
+    Q_ASSERT(ioDevice->isReadable());
+//     streamSize = ioDevice->size();
+//     streamSeekable = !ioDevice->isSequential();
+//
+    // Allow handling of QNetworkReplies WRT its isFinished() function..
+    _networkReply = qobject_cast<QNetworkReply *>(_ioDevice);
+}
+
+
+QNR_IODeviceStream::~QNR_IODeviceStream()
+{
+}
+
+void QNR_IODeviceStream::reset()
+{
+    _ioDevice->reset();
+    //resetDone();
+}
+
+void QNR_IODeviceStream::needData()
+{
+    quint32 size = 4096;
+    const QByteArray data = _ioDevice->read(size);
+// #ifdef __GNUC__
+// #warning TODO 4.5 - make sure we do not break anything without this, it is preventing IODs from working when they did not yet emit readyRead()
+// #endif
+//    if (data.isEmpty() && !d->ioDevice->atEnd()) {
+//        error(Phonon::NormalError, d->ioDevice->errorString());
+//    }
+    writeData(data);
+    if (_ioDevice->atEnd()) {
+        // If the IO device was identified as QNetworkReply also take its
+        // isFinished() into account, when triggering EOD.
+        if (!_networkReply || _networkReply->isFinished()) {
+            endOfData();
+        }
+    }
+}
+
+void QNR_IODeviceStream::seekStream(qint64 offset)
+{
+    _ioDevice->seek(offset);
+    //seekStreamDone();
+}
+
+
+// vim: sw=4 sts=4 et tw=100

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/Qnr_IoDeviceStream.h Added

@@ -0,0 +1,54 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2007 Matthias Kretz <kretz@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef QNR_IODEVICESTREAM_H
+#define QNR_IODEVICESTREAM_H
+
+#include "DllMacro.h"
+
+#include <phonon/abstractmediastream.h>
+
+class QNetworkReply;
+class QIODevice;
+
+namespace Tomahawk
+{
+
+class DLLEXPORT QNR_IODeviceStream : public Phonon::AbstractMediaStream
+{
+    Q_OBJECT
+public:
+    explicit QNR_IODeviceStream(QIODevice *ioDevice, QObject *parent = 0);
+    ~QNR_IODeviceStream();
+
+    void reset();
+    void needData();
+    void seekStream(qint64);
+
+private:
+    QIODevice *_ioDevice;
+    QNetworkReply *_networkReply;
+};
+
+} // namespace Tomahawk
+
+#endif // QNR_IODEVICESTREAM_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/RdioParser.cpp Added

@@ -0,0 +1,388 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *
+ *   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 "RdioParser.h"
+
+#include "ShortenedLinkParser.h"
+#include "config.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "DropJob.h"
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+#include "DropJobNotifier.h"
+#include "ViewManager.h"
+#include "SourceList.h"
+
+#include <qjson/parser.h>
+#include <QDateTime>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+#include <QUrl>
+#include <QStringList>
+
+#include <QtCore/QCryptographicHash>
+
+using namespace Tomahawk;
+
+QPixmap* RdioParser::s_pixmap = 0;
+
+#ifdef QCA2_FOUND
+QCA::Initializer RdioParser::m_qcaInit = QCA::Initializer();
+#endif
+
+
+RdioParser::RdioParser( QObject* parent )
+    : QObject( parent )
+    , m_count( 0 )
+    , m_browseJob( 0 )
+    , m_createPlaylist( false )
+{
+}
+
+
+RdioParser::~RdioParser()
+{
+}
+
+
+void
+RdioParser::parse( const QString& url )
+{
+    m_multi = false;
+    m_total = 1;
+    parseUrl( url );
+}
+
+
+void
+RdioParser::parse( const QStringList& urls )
+{
+    m_multi = true;
+    m_total = urls.count();
+
+    foreach( const QString& url, urls )
+        parseUrl( url );
+}
+
+
+void
+RdioParser::parseUrl( const QString& url )
+{
+    if ( url.contains( "rd.io" ) ) // shortened
+    {
+        ShortenedLinkParser* p = new ShortenedLinkParser( QStringList() << url, this );
+        connect( p, SIGNAL( urls( QStringList ) ), this, SLOT( expandedLinks( QStringList ) ) );
+        return;
+    }
+
+    if ( url.contains( "artist" ) && url.contains( "album" ) && url.contains( "track" ) )
+        parseTrack( url );
+    else
+    {
+        DropJob::DropType type = DropJob::None;
+        if ( url.contains( "artist" ) && url.contains( "album" ) )
+            type = DropJob::Album;
+        else if ( url.contains( "artist" ) )
+            type = DropJob::Artist;
+        else if ( url.contains( "people" ) && url.contains( "playlist" ) )
+            type = DropJob::Playlist;
+        else
+        {
+            tLog() << "Got Rdio URL I can't parse!" << url;
+            return;
+        }
+
+        // artist, album, or playlist link requre fetching
+        fetchObjectsFromUrl( url, type );
+    }
+}
+
+
+void
+RdioParser::fetchObjectsFromUrl( const QString& url, DropJob::DropType type )
+{
+    QList< QPair< QByteArray, QByteArray > > params;
+    params.append( QPair<QByteArray, QByteArray>( "extras", "tracks" ) );
+
+    QString cleanedUrl = url;
+    cleanedUrl.replace("#/", "");
+
+    QByteArray data;
+    QNetworkRequest request = generateRequest( "getObjectFromUrl", cleanedUrl, params, &data );
+
+    request.setHeader( QNetworkRequest::ContentTypeHeader, QLatin1String( "application/x-www-form-urlencoded" ) );
+    QNetworkReply* reply = TomahawkUtils::nam()->post( request, data  );
+    connect( reply, SIGNAL( finished() ), this, SLOT( rdioReturned() ) );
+
+    m_browseJob = new DropJobNotifier( pixmap(), QString( "Rdio" ), type, reply );
+    JobStatusView::instance()->model()->addJob( m_browseJob );
+
+    m_reqQueries.insert( reply );
+}
+
+
+void
+RdioParser::rdioReturned()
+{
+    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
+    Q_ASSERT( r );
+    m_reqQueries.remove( r );
+    m_count++;
+    r->deleteLater();
+
+    if ( r->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        QVariantMap res = p.parse( r, &ok ).toMap();
+        QVariantMap result = res.value( "result" ).toMap();
+
+        if ( !ok || result.isEmpty() )
+        {
+            tLog() << "Failed to parse json from Rdio browse item :" << p.errorString() << "On line" << p.errorLine() << "With data:" << res;
+
+            return;
+        }
+
+        QVariantList tracks = result.value( "tracks" ).toList();
+        if ( tracks.isEmpty() )
+        {
+            tLog() << "Got no tracks in result, ignoring!" << result;
+            return;
+        }
+
+        // Playlists will have these
+        m_title = result "name" .toString();
+        m_creator = result "owner" .toString();
+
+        foreach( QVariant track, tracks )
+        {
+            QVariantMap rdioResult = track.toMap();
+            QString title, artist, album;
+
+            title = rdioResult.value( "name", QString() ).toString();
+            artist = rdioResult.value( "artist", QString() ).toString();
+            album = rdioResult.value( "album", QString() ).toString();
+
+            if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
+            {
+                tLog() << "Didn't get an artist and track name from Rdio, not enough to build a query on. Aborting" << title << artist << album;
+                return;
+            }
+
+            Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), !m_createPlaylist );
+            if ( q.isNull() )
+                continue;
+
+            m_tracks << q;
+        }
+    }
+    else
+    {
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching Rdio information from the network!" ) ) );
+        tLog() << "Error in network request to Rdio for track decoding:" << r->errorString();
+    }
+
+    checkFinished();
+}
+
+
+void
+RdioParser::parseTrack( const QString& origUrl )
+{
+    QString url = origUrl;
+    QString artist, trk, album, playlist;
+    QString realUrl = url.replace( "_", " " );
+    QString matchStr = "/%1/(^/*)/";
+    QString matchPlStr = "/%1/(?:^/*)/(^/*)/";
+
+    QRegExp r( QString( matchStr ).arg( "artist" ) );
+
+    int loc = r.indexIn( realUrl );
+    if ( loc >= 0 )
+        artist = r.cap( 1 );
+
+    r = QRegExp( QString( matchStr ).arg( "album" ) );
+    loc = r.indexIn( realUrl );
+    if ( loc >= 0 )
+        album = r.cap( 1 );
+
+    r = QRegExp( QString( matchStr ).arg( "track" ) );
+    loc = r.indexIn( realUrl );
+    if ( loc >= 0 )
+        trk = r.cap( 1 );
+
+    r = QRegExp( QString( matchPlStr ).arg( "playlists" ) );
+    loc = r.indexIn( realUrl );
+    if ( loc >= 0 )
+        playlist = r.cap( 1 );
+
+    if ( trk.isEmpty() || artist.isEmpty() )
+    {
+        tLog() << "Parsed Rdio track url but it's missing artist or track!" << url;
+        return;
+    }
+
+    query_ptr q = Query::get( artist, trk, album, uuid(), !m_createPlaylist );
+    m_count++;
+    m_tracks << q;
+
+    checkFinished();
+}
+
+
+QNetworkRequest
+RdioParser::generateRequest( const QString& method, const QString& url, const QList< QPair< QByteArray, QByteArray > >& extraParams, QByteArray* data )
+{
+    QUrl fetchUrl( "http://api.rdio.com/1/" );
+    QUrl toSignUrl = fetchUrl;
+
+    QPair<QByteArray, QByteArray> param;
+    foreach( param, extraParams )
+    {
+        toSignUrl.addEncodedQueryItem( param.first, param.second );
+    }
+    toSignUrl.addQueryItem( "method", method );
+    toSignUrl.addEncodedQueryItem("oauth_consumer_key", "gk8zmyzj5xztt8aj48csaart" );
+    QString nonce;
+    for ( int i = 0; i < 8; i++ )
+        nonce += QString::number( qrand() % 10 );
+    toSignUrl.addQueryItem("oauth_nonce", nonce );
+    toSignUrl.addEncodedQueryItem("oauth_signature_method", "HMAC-SHA1");
+    toSignUrl.addQueryItem("oauth_timestamp", QString::number(QDateTime::currentMSecsSinceEpoch() / 1000 ) );
+    toSignUrl.addEncodedQueryItem("oauth_version",  "1.0");
+    toSignUrl.addEncodedQueryItem( "url", QUrl::toPercentEncoding( url ) );
+    int size = toSignUrl.encodedQueryItems().size();
+    for( int i = 0; i < size; i++ ) {
+        const QPair< QByteArray, QByteArray > item = toSignUrl.encodedQueryItems().at( i );
+        data->append( item.first + "=" + item.second + "&" );
+    }
+    data->truncate( data->size() - 1 ); // remove extra &
+
+    QByteArray toSign = "POST&" + QUrl::toPercentEncoding( fetchUrl.toEncoded() ) + '&' + QUrl::toPercentEncoding( *data );
+    qDebug() << "Rdio" << toSign;
+
+    toSignUrl.addEncodedQueryItem( "oauth_signature", QUrl::toPercentEncoding( hmacSha1("yt35kakDyW&", toSign ) ) );
+
+    data->clear();
+    size = toSignUrl.encodedQueryItems().size();
+    for( int i = 0; i < size; i++ ) {
+        const QPair< QByteArray, QByteArray > item = toSignUrl.encodedQueryItems().at( i );
+        data->append( item.first + "=" + item.second + "&" );
+    }
+    data->truncate( data->size() - 1 ); // remove extra &
+
+    qDebug() << "POST data:" << *data;
+
+    QNetworkRequest request = QNetworkRequest( fetchUrl );
+    request.setHeader( QNetworkRequest::ContentTypeHeader, QLatin1String( "application/x-www-form-urlencoded" ) );
+
+    return request;
+}
+
+
+QByteArray
+RdioParser::hmacSha1(QByteArray key, QByteArray baseString)
+{
+#ifdef QCA2_FOUND
+    QCA::MessageAuthenticationCode hmacsha1( "hmac(sha1)", QCA::SecureArray() );
+    QCA::SymmetricKey keyObject( key );
+    hmacsha1.setup( keyObject );
+
+    hmacsha1.update( QCA::SecureArray( baseString ) );
+    QCA::SecureArray resultArray = hmacsha1.final();
+
+    QByteArray result = resultArray.toByteArray().toBase64();
+    return result;
+#else
+    tLog() << "Tomahawk compiled without QCA support, cannot generate HMAC signature";
+    return QByteArray();
+#endif
+}
+
+
+void
+RdioParser::checkFinished()
+{
+    tDebug() << "Checking for Rdio batch playlist job finished" << m_reqQueries.isEmpty();
+    if ( m_reqQueries.isEmpty() ) // we're done
+    {
+        if ( m_browseJob )
+            m_browseJob->setFinished();
+
+        if ( m_tracks.isEmpty() )
+            return;
+
+        if ( m_createPlaylist )
+        {
+            m_playlist = Playlist::create( SourceList::instance()->getLocal(),
+                                           uuid(),
+                                           m_title,
+                                           "",
+                                           m_creator,
+                                           false,
+                                           m_tracks );
+
+            connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
+
+            return;
+        }
+        else
+        {
+            if ( !m_multi )
+                emit track( m_tracks.first() );
+            else if ( m_multi && m_count == m_total )
+                emit tracks( m_tracks );
+
+            m_tracks.clear();
+        }
+
+        deleteLater();
+    }
+}
+
+
+void
+RdioParser::playlistCreated( Tomahawk::PlaylistRevision )
+{
+    ViewManager::instance()->show( m_playlist );
+}
+
+
+void
+RdioParser::expandedLinks( const QStringList& urls )
+{
+    foreach( const QString& url, urls )
+    {
+        if ( url.contains( "rdio.com" ) || url.contains( "rd.io" ) )
+            parseUrl( url );
+    }
+}
+
+
+QPixmap
+RdioParser::pixmap() const
+{
+    if ( !s_pixmap )
+        s_pixmap = new QPixmap( RESPATH "images/rdio.png" );
+
+    return *s_pixmap;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/RdioParser.h Added

@@ -0,0 +1,103 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *
+ *   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 RDIOPARSER_H
+#define RDIOPARSER_H
+
+#include "jobview/JobStatusItem.h"
+#include "Query.h"
+#include "config.h"
+#include "DropJob.h"
+#include "Typedefs.h"
+#include "Playlist.h"
+
+#include <QtCore/QObject>
+#include <QStringList>
+#include <QSet>
+
+#include <QNetworkRequest>
+
+#ifdef QCA2_FOUND
+#include <QtCrypto>
+#endif
+
+class QNetworkReply;
+namespace Tomahawk
+{
+
+class DropJobNotifier;
+/**
+ * Small class to parse spotify links into query_ptrs
+ *
+ * Connect to the signals to get the results
+ */
+
+class RdioParser : public QObject
+{
+    Q_OBJECT
+public:
+
+    explicit RdioParser( QObject* parent = 0 );
+    virtual ~RdioParser();
+
+    void parse( const QString& url );
+    void parse( const QStringList& urls );
+
+    void setCreatePlaylist( bool createPlaylist ) { m_createPlaylist = createPlaylist; }
+
+signals:
+    void track( const Tomahawk::query_ptr& track );
+    void tracks( const QList< Tomahawk::query_ptr > tracks );
+
+private slots:
+    void expandedLinks( const QStringList& );
+    void rdioReturned();
+
+    void playlistCreated( Tomahawk::PlaylistRevision );
+private:
+    void parseTrack( const QString& url );
+    void fetchObjectsFromUrl( const QString& url, DropJob::DropType type );
+
+    QByteArray hmacSha1(QByteArray key, QByteArray baseString);
+    QNetworkRequest generateRequest( const QString& method, const QString& url, const QList< QPair< QByteArray, QByteArray > >& extraParams, QByteArray* postData );
+    QPixmap pixmap() const;
+    void checkFinished();
+    void parseUrl( const QString& url );
+
+    bool m_multi;
+    int m_count, m_total;
+    QSet< QNetworkReply* > m_reqQueries;
+    DropJobNotifier* m_browseJob;
+
+    QString m_title, m_creator;
+    playlist_ptr m_playlist;
+
+    static QPixmap* s_pixmap;
+
+    bool m_createPlaylist;
+    QList< query_ptr > m_tracks;
+
+#ifdef QCA2_FOUND
+    static QCA::Initializer m_qcaInit;
+#endif
+};
+
+}
+
+#endif // RDIOPARSER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/SharedTimeLine.cpp Added

@@ -0,0 +1,64 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "SharedTimeLine.h"
+
+
+namespace TomahawkUtils
+{
+
+SharedTimeLine::SharedTimeLine()
+    : QObject( 0 )
+    , m_refcount( 0 )
+{
+    m_timeline.setCurveShape( QTimeLine::LinearCurve );
+    m_timeline.setFrameRange( 0, INT_MAX );
+    m_timeline.setDuration( INT_MAX );
+    m_timeline.setUpdateInterval( 40 );
+    connect( &m_timeline, SIGNAL( frameChanged( int ) ), SIGNAL( frameChanged( int ) ) );
+}
+
+
+void
+SharedTimeLine::connectNotify( const char* signal )
+{
+    if ( signal == QMetaObject::normalizedSignature( SIGNAL( frameChanged( int ) ) ) ) {
+        m_refcount++;
+        if ( m_timeline.state() != QTimeLine::Running )
+            m_timeline.start();
+    }
+}
+
+
+void
+SharedTimeLine::disconnectNotify( const char* signal )
+{
+    if ( signal == QMetaObject::normalizedSignature( SIGNAL( frameChanged( int ) ) ) )
+    {
+        m_refcount--;
+        if ( m_timeline.state() == QTimeLine::Running && m_refcount == 0 )
+        {
+            m_timeline.stop();
+            deleteLater();
+        }
+    }
+}
+
+}
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/SharedTimeLine.h Added

@@ -0,0 +1,60 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 SHAREDTIMELINE_H
+#define SHAREDTIMELINE_H
+
+#include <QObject>
+#include <QTimeLine>
+
+#include "DllMacro.h"
+
+namespace TomahawkUtils
+{
+
+class DLLEXPORT SharedTimeLine : public QObject
+{
+    Q_OBJECT
+
+    public:
+        SharedTimeLine();
+
+        virtual ~SharedTimeLine() {}
+
+        int currentFrame() { return m_timeline.currentFrame(); }
+
+        void setUpdateInterval( int msec ) { if ( msec != m_timeline.updateInterval() ) m_timeline.setUpdateInterval( msec ); }
+
+    signals:
+        void frameChanged( int );
+
+    protected slots:
+        virtual void connectNotify( const char *signal );
+
+        virtual void disconnectNotify( const char *signal );
+
+    private:
+        int m_refcount;
+        QTimeLine m_timeline;
+};
+
+}
+
+#endif
\ No newline at end of file

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/ShortenedLinkParser.cpp Added

@@ -0,0 +1,144 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 "ShortenedLinkParser.h"
+
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+#include "DropJobNotifier.h"
+#include "Query.h"
+#include "jobview/ErrorStatusMessage.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/JobStatusView.h"
+#include "Source.h"
+
+#include <qjson/parser.h>
+
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+
+using namespace Tomahawk;
+
+QPixmap* ShortenedLinkParser::s_pixmap = 0;
+
+ShortenedLinkParser::ShortenedLinkParser ( const QStringList& urls, QObject* parent )
+    : QObject( parent )
+{
+    foreach ( const QString& url, urls )
+        if ( handlesUrl( url ) )
+            lookupUrl( url ) ;
+}
+
+
+ShortenedLinkParser::~ShortenedLinkParser()
+{
+}
+
+
+bool
+ShortenedLinkParser::handlesUrl( const QString& url )
+{
+    // Whitelisted links
+    return ( url.contains( "t.co" ) ||
+             url.contains( "bit.ly" ) ||
+             url.contains( "j.mp" ) ||
+             url.contains( "spoti.fi" ) ||
+             url.contains( "ow.ly" ) ||
+             url.contains( "fb.me" ) ||
+             url.contains( "itun.es" ) ||
+             url.contains( "tinyurl.com" ) ||
+             url.contains( "tinysong.com" ) ||
+             url.contains( "grooveshark.com/s/~/" ) || // These redirect to the 'real' grooveshark track url
+             url.contains( "grooveshark.com/#/s/~/" ) ||
+             url.contains( "rd.io" ) );
+}
+
+
+void
+ShortenedLinkParser::lookupUrl( const QString& url )
+{
+    tDebug() << "Looking up..." << url;
+    QString cleaned = url;
+    if ( cleaned.contains( "/#/s/" ) )
+        cleaned.replace( "/#", "" );
+
+    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( QUrl( cleaned ) ) );
+    connect( reply, SIGNAL( finished() ), this, SLOT( lookupFinished() ) );
+
+    m_queries.insert( reply );
+
+    m_expandJob = new DropJobNotifier( pixmap(), "shortened", DropJob::Track, reply );
+    JobStatusView::instance()->model()->addJob( m_expandJob );
+
+}
+
+
+void
+ShortenedLinkParser::lookupFinished()
+{
+    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
+    Q_ASSERT( r );
+
+    if ( r->error() != QNetworkReply::NoError )
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Network error parsing shortened link!" ) ) );
+
+    QVariant redir = r->attribute( QNetworkRequest::RedirectionTargetAttribute );
+    if ( redir.isValid() && !redir.toUrl().isEmpty() )
+    {
+        tDebug() << "RedirectionTargetAttribute set on " << redir;
+        m_queries.remove( r );
+        r->deleteLater();
+        lookupUrl( redir.toUrl().toString() );
+    }
+    else
+    {
+        tLog() << "Got a redirected url:" << r->url().toString();
+        m_links << r->url().toString();
+        m_queries.remove( r );
+        r->deleteLater();
+        checkFinished();
+    }
+}
+
+
+void
+ShortenedLinkParser::checkFinished()
+{
+    if ( m_queries.isEmpty() ) // we're done
+    {
+        qDebug() << "DONE and found redirected urls:" << m_links;
+        emit urls( m_links );
+
+        deleteLater();
+    }
+}
+
+
+#ifndef ENABLE_HEADLESS
+
+QPixmap
+ShortenedLinkParser::pixmap()
+{
+    if ( !s_pixmap )
+        s_pixmap = new QPixmap( RESPATH "images/add.png" );
+
+    return *s_pixmap;
+}
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/ShortenedLinkParser.h Added

@@ -0,0 +1,79 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.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 SNORTENED_LINK_PARSER_H
+#define SNORTENED_LINK_PARSER_H
+
+#include "DllMacro.h"
+#include "Typedefs.h"
+
+#include <QObject>
+#include <QSet>
+#include <QStringList>
+
+#ifndef ENABLE_HEADLESS
+    #include <QPixmap>
+#endif
+
+class QNetworkReply;
+
+namespace Tomahawk
+{
+
+class DropJobNotifier;
+
+/**
+ * Small class to parse whitelisted shortened links into the redirected urls
+ *
+ * Connect to urls() to get the result
+ *
+ */
+class DLLEXPORT ShortenedLinkParser : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ShortenedLinkParser( const QStringList& urls, QObject* parent = 0 );
+    virtual ~ShortenedLinkParser();
+
+    static bool handlesUrl( const QString& url );
+
+public slots:
+    void lookupFinished();
+
+signals:
+    void urls( const QStringList& urls );
+
+private:
+    void lookupUrl( const QString& url );
+    void checkFinished();
+
+#ifndef ENABLE_HEADLESS
+    static QPixmap pixmap();
+    static QPixmap* s_pixmap;
+#endif
+
+    QStringList m_links;
+    QSet< QNetworkReply* > m_queries;
+    DropJobNotifier* m_expandJob;
+};
+
+}
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/SmartPointerList.h Added

@@ -0,0 +1,214 @@
+/****************************************************************************************
+ * Copyright (c) 2009 Mark Kretschmann <kretschmann@kde.org>                            *
+ * Copyright (c) 2009 Ian Monroe <ian@monroe.nu>                                        *
+ * Copyright (c) 2009 Max Howell <max@last.fm>                                          *
+ *                                                                                      *
+ * This program 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 2 of the License, or (at your option) any later           *
+ * version.                                                                             *
+ *                                                                                      *
+ * This program 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         *
+ * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+
+#ifndef SMART_POINTER_LIST_H
+#define SMART_POINTER_LIST_H
+
+#include <QList>   //baseclass
+#include <QObject> //baseclass
+
+#include "DllMacro.h"
+
+class DLLEXPORT SmartPointerListDaddy : public QObject
+{
+    Q_OBJECT
+    QList<QObject*>& m_list;
+
+public:
+    SmartPointerListDaddy( QList<QObject*>* list ) : m_list( *list )
+    {}
+
+private slots:
+    void onDestroyed()
+    {
+        m_list.removeAll( sender() );
+    }
+};
+
+/** QList has no virtual functions, so we inherit privately and define the
+  * interface exactly to ensure users can't write code that breaks the
+  * class's internal behaviour.
+  *
+  * I deliberately didn't define clear. I worried people would assume it
+  * deleted the pointers. Or assume it didn't. I didn't expose a few other
+  * functions for that reason.
+  *
+  * non-const iterator functions are not exposed as they access the QList
+  * baseclass, and then the Daddy wouldn't be watching newly inserted items.
+  *
+  * --mxcl
+  * Exposed clear. This class doesn't have a QPtrList autodelete functionality
+  * ever, so if people think that, they're really confused! -- Ian Monroe
+  *
+  * NOTE:
+  *       This class is NOT implicitly shared like QList. Passing it around
+  *       ***will*** cause it to iterate and copy all the elements in the copy
+  *       constructor!
+  *
+  */
+template <class T> class SmartPointerList : private QList<T*>
+{
+    class SmartPointerListDaddy* m_daddy;
+
+public:
+    SmartPointerList() : m_daddy( new SmartPointerListDaddy( (QList<QObject*>*)this ) )
+    {}
+
+    ~SmartPointerList()
+    {
+        delete m_daddy;
+    }
+
+    SmartPointerList( const SmartPointerList<T>& that )
+            : QList<T*>()
+            , m_daddy( new SmartPointerListDaddy( (QList<QObject*>*)this ) )
+    {
+        QListIterator<T*> i( that );
+        while (i.hasNext())
+            append( i.next() );
+    }
+
+    SmartPointerList& operator=( const SmartPointerList<T>& that )
+    {
+        QListIterator<T*> i( *this);
+        while (i.hasNext())
+            QObject::disconnect( m_daddy, 0, i.next(), 0 );
+
+        QList<T*>::operator=( that );
+
+        if (this != &that) {
+            QListIterator<T*> i( that );
+            while (i.hasNext())
+                m_daddy->connect( i.next(), SIGNAL(destroyed()), SLOT(onDestroyed()) );
+        }
+
+        return *this;
+    }
+
+    // keep same function names as Qt
+    void append( T* o )
+    {
+        m_daddy->connect( o, SIGNAL(destroyed()), SLOT(onDestroyed()) );
+        QList<T*>::append( o );
+    }
+
+    void prepend( T* o )
+    {
+        m_daddy->connect( o, SIGNAL(destroyed()), SLOT(onDestroyed()) );
+        QList<T*>::prepend( o );
+    }
+
+    SmartPointerList& operator+=( T* o )
+    {
+        append( o );
+        return *this;
+    }
+
+    SmartPointerList& operator<<( T* o )
+    {
+        return operator+=( o );
+    }
+
+    SmartPointerList operator+( const SmartPointerList that )
+    {
+        SmartPointerList<T> copy = *this;
+        QListIterator<T*> i( that );
+        while (i.hasNext())
+            copy.append( i.next() );
+        return copy;
+    }
+
+    SmartPointerList& operator+=( const SmartPointerList that )
+    {
+        QListIterator<T*> i( that );
+        while (i.hasNext())
+            append( i.next() );
+        return *this;
+    }
+
+    bool operator==( const SmartPointerList& that )
+    {
+        return QList<T*>::operator==( that );
+    }
+
+    void push_back( T* o )
+    {
+        append( o );
+    }
+
+    void push_front( T* o )
+    {
+        prepend( o );
+    }
+
+    void replace( int i, T* o )
+    {
+        QList<T*>::replace( i, o );
+        m_daddy->connect( o, SIGNAL(destroyed()), SLOT(onDestroyed()) );
+    }
+
+    /** this is a "safe" class. We always bounds check */
+    inline T* operator( int index ) const { return QList<T*>::value( index ); }
+    inline T* at( int index ) const { return QList<T*>::value( index ); }
+
+    // make public safe functions again
+    using QList<T*>::back;
+    using QList<T*>::constBegin;
+    using QList<T*>::constEnd;
+    using typename QList<T*>::const_iterator;
+    using QList<T*>::contains;
+    using QList<T*>::count;
+    using QList<T*>::empty;
+    using QList<T*>::erase;
+    using QList<T*>::first;
+    using QList<T*>::front;
+    using QList<T*>::indexOf;
+    using QList<T*>::insert;
+    using QList<T*>::isEmpty;
+    using QList<T*>::last;
+    using QList<T*>::lastIndexOf;
+    using QList<T*>::mid;
+    using QList<T*>::move;
+    using QList<T*>::pop_back;
+    using QList<T*>::pop_front;
+    using QList<T*>::size;
+    using QList<T*>::swap;
+    using QList<T*>::value;
+    using QList<T*>::operator!=;
+//     using QList<T*>::operator==;
+
+    // can't use using directive here since we only want the const versions
+    typename QList<T*>::const_iterator begin() const { return QList<T*>::constBegin(); }
+    typename QList<T*>::const_iterator end() const { return QList<T*>::constEnd(); }
+
+    // it can lead to poor performance situations if we don't disconnect
+    // but I think it's not worth making this class more complicated for such
+    // an edge case
+    using QList<T*>::clear;
+    using QList<T*>::removeAll;
+    using QList<T*>::removeAt;
+    using QList<T*>::removeFirst;
+    using QList<T*>::removeLast;
+    using QList<T*>::removeOne;
+    using QList<T*>::takeAt;
+    using QList<T*>::takeFirst;
+    using QList<T*>::takeLast;
+};
+
+#endif //HEADER_GUARD
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/SpotifyParser.cpp Added

@@ -0,0 +1,370 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *
+ *   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 "SpotifyParser.h"
+
+#include "utils/Logger.h"
+#include "utils/TomahawkUtils.h"
+#include "Query.h"
+#include "SourceList.h"
+#include "DropJob.h"
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+#include "DropJobNotifier.h"
+#include "ViewManager.h"
+
+#include <qjson/parser.h>
+
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkReply>
+
+using namespace Tomahawk;
+
+QPixmap* SpotifyParser::s_pixmap = 0;
+
+
+SpotifyParser::SpotifyParser( const QStringList& Urls, bool createNewPlaylist, QObject* parent )
+    : QObject ( parent )
+    , m_limit ( 40 )
+    , m_single( false )
+    , m_trackMode( true )
+    , m_createNewPlaylist( createNewPlaylist )
+    , m_browseJob( 0 )
+
+{
+    foreach ( const QString& url, Urls )
+        lookupUrl( url );
+}
+
+
+SpotifyParser::SpotifyParser( const QString& Url, bool createNewPlaylist, QObject* parent )
+    : QObject ( parent )
+    , m_limit ( 40 )
+    , m_single( true )
+    , m_trackMode( true )
+    , m_createNewPlaylist( createNewPlaylist )
+    , m_browseJob( 0 )
+{
+    lookupUrl( Url );
+}
+
+
+SpotifyParser::~SpotifyParser()
+{
+}
+
+
+void
+SpotifyParser::lookupUrl( const QString& link )
+{
+    if ( link.contains( "track" ) )
+    {
+        m_trackMode = true;
+        lookupTrack( link );
+    }
+    else if ( link.contains( "playlist" ) ||  link.contains( "album" ) || link.contains( "artist" ) )
+    {
+        if( !m_createNewPlaylist )
+            m_trackMode = true;
+        else
+            m_trackMode = false;
+
+        lookupSpotifyBrowse( link );
+    }
+    else
+        return; // Not valid spotify item
+}
+
+
+void
+SpotifyParser::lookupSpotifyBrowse( const QString& linkRaw )
+{
+    tLog() << "Parsing Spotify Browse URI:" << linkRaw;
+    QString browseUri = linkRaw;
+    if ( browseUri.contains( "open.spotify.com/" ) ) // convert to a URI
+    {
+        browseUri.replace( "http://open.spotify.com/", "" );
+        browseUri.replace( "/", ":" );
+        browseUri = "spotify:" + browseUri;
+    }
+
+    DropJob::DropType type;
+
+    if ( browseUri.contains( "spotify:user" ) )
+        type = DropJob::Playlist;
+    if ( browseUri.contains( "spotify:artist" ) )
+        type = DropJob::Artist;
+    if ( browseUri.contains( "spotify:album" ) )
+        type = DropJob::Album;
+    if ( browseUri.contains( "spotify:track" ) )
+        type = DropJob::Track;
+
+    QUrl url;
+
+    if( type != DropJob::Artist )
+         url = QUrl( QString( SPOTIFY_PLAYLIST_API_URL "/browse/%1" ).arg( browseUri ) );
+    else
+         url = QUrl( QString( SPOTIFY_PLAYLIST_API_URL "/browse/%1/%2" ).arg( browseUri )
+                                                                        .arg ( m_limit ) );
+    tDebug() << "Looking up URL..." << url.toString();
+
+    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    connect( reply, SIGNAL( finished() ), this, SLOT( spotifyBrowseFinished() ) );
+
+    m_browseJob = new DropJobNotifier( pixmap(), "Spotify", type, reply );
+    JobStatusView::instance()->model()->addJob( m_browseJob );
+
+    m_queries.insert( reply );
+}
+
+
+void
+SpotifyParser::lookupTrack( const QString& link )
+{
+    tDebug() << "Got a QString " << link;
+    if ( !link.contains( "track" )) // we only support track links atm
+        return;
+
+    // we need Spotify URIs such as spotify:track:XXXXXX, so if we by chance get a http://open.spotify.com url, convert it
+    QString uri = link;
+    if ( link.contains( "open.spotify.com" ) )
+    {
+        QString hash = link;
+        hash.replace( "http://open.spotify.com/track/", "" );
+        uri = QString( "spotify:track:%1" ).arg( hash );
+    }
+
+    QUrl url = QUrl( QString( "http://ws.spotify.com/lookup/1/.json?uri=%1" ).arg( uri ) );
+    tDebug() << "Looking up URL..." << url.toString();
+
+    QNetworkReply* reply = TomahawkUtils::nam()->get( QNetworkRequest( url ) );
+    connect( reply, SIGNAL( finished() ), this, SLOT( spotifyTrackLookupFinished() ) );
+
+    DropJobNotifier* j = new DropJobNotifier( pixmap(), QString( "Spotify" ), DropJob::Track, reply );
+    JobStatusView::instance()->model()->addJob( j );
+
+    m_queries.insert( reply );
+}
+
+
+void
+SpotifyParser::spotifyBrowseFinished()
+{
+    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
+    Q_ASSERT( r );
+
+    m_queries.remove( r );
+    r->deleteLater();
+
+    if ( r->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        QVariantMap res = p.parse( r, &ok ).toMap();
+
+        if ( !ok )
+        {
+            tLog() << "Failed to parse json from Spotify browse item :" << p.errorString() << "On line" << p.errorLine();
+            checkTrackFinished();
+            return;
+        }
+
+        QVariantMap resultResponse = res.value( res.value( "type" ).toString() ).toMap();
+        if ( !resultResponse.isEmpty() )
+        {
+            m_title = resultResponse.value( "name" ).toString();
+            m_single = false;
+
+            if ( res.value( "type" ).toString() == "playlist" )
+                m_creator = resultResponse.value( "creator" ).toString();
+
+            // TODO for now only take the first artist
+            foreach ( QVariant result, resultResponse.value( "result" ).toList() )
+            {
+                QVariantMap trackResult = result.toMap();
+
+                QString title, artist, album;
+
+                title = trackResult.value( "title", QString() ).toString();
+                artist = trackResult.value( "artist", QString() ).toString();
+                album = trackResult.value( "album", QString() ).toString();
+
+                if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
+                {
+                    tLog() << "Didn't get an artist and track name from spotify, not enough to build a query on. Aborting" << title << artist << album;
+                    return;
+                }
+
+                Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), m_trackMode );
+                if ( q.isNull() )
+                    continue;
+
+                tLog() << "Setting resulthint to " << trackResult.value( "trackuri" );
+                q->setResultHint( trackResult.value("trackuri").toString() );
+
+                m_tracks << q;
+            }
+        }
+    }
+    else
+    {
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Error fetching Spotify information from the network!" ) ) );
+        tLog() << "Error in network request to Spotify for track decoding:" << r->errorString();
+    }
+
+    if ( m_trackMode )
+        checkTrackFinished();
+    else
+        checkBrowseFinished();
+}
+
+
+void
+SpotifyParser::spotifyTrackLookupFinished()
+{
+    QNetworkReply* r = qobject_cast< QNetworkReply* >( sender() );
+    Q_ASSERT( r );
+    m_queries.remove( r );
+    r->deleteLater();
+
+    if ( r->error() == QNetworkReply::NoError )
+    {
+        QJson::Parser p;
+        bool ok;
+        QVariantMap res = p.parse( r, &ok ).toMap();
+
+        if ( !ok )
+        {
+            tLog() << "Failed to parse json from Spotify track lookup:" << p.errorString() << "On line" << p.errorLine();
+            checkTrackFinished();
+            return;
+        }
+        else if ( !res.contains( "track" ) )
+        {
+            tLog() << "No 'track' item in the spotify track lookup result... not doing anything";
+            checkTrackFinished();
+            return;
+        }
+
+        // lets parse this baby
+        QVariantMap t = res.value( "track" ).toMap();
+        QString title, artist, album;
+
+        title = t.value( "name", QString() ).toString();
+        // TODO for now only take the first artist
+        if ( t.contains( "artists" ) && t "artists" .canConvert< QVariantList >() && t "artists" .toList().size() > 0 )
+            artist = t "artists" .toList().first().toMap().value( "name", QString() ).toString();
+        if ( t.contains( "album" ) && t "album" .canConvert< QVariantMap >() )
+            album = t "album" .toMap().value( "name", QString() ).toString();
+
+        if ( title.isEmpty() && artist.isEmpty() ) // don't have enough...
+        {
+            tLog() << "Didn't get an artist and track name from spotify, not enough to build a query on. Aborting" << title << artist << album;
+            return;
+        }
+
+        Tomahawk::query_ptr q = Tomahawk::Query::get( artist, title, album, uuid(), m_trackMode );
+        if ( !q.isNull() )
+        {
+            tLog() << "Setting resulthint to " << t.value( "trackuri" );
+            q->setResultHint( t.value("trackuri").toString() );
+            m_tracks << q;
+        }
+    }
+    else
+    {
+        tLog() << "Error in network request to Spotify for track decoding:" << r->errorString();
+    }
+
+    if ( m_trackMode )
+        checkTrackFinished();
+    else
+        checkBrowseFinished();
+}
+
+
+void
+SpotifyParser::checkBrowseFinished()
+{
+    tDebug() << "Checking for spotify batch playlist job finished" << m_queries.isEmpty() << m_createNewPlaylist;
+    if ( m_queries.isEmpty() ) // we're done
+    {
+        if ( m_browseJob )
+            m_browseJob->setFinished();
+
+        if ( m_createNewPlaylist && !m_tracks.isEmpty() )
+        {
+            m_playlist = Playlist::create( SourceList::instance()->getLocal(),
+                                       uuid(),
+                                       m_title,
+                                       m_info,
+                                       m_creator,
+                                       false,
+                                       m_tracks );
+            connect( m_playlist.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistCreated() ) );
+            return;
+        }
+
+        else if ( m_single && !m_tracks.isEmpty() )
+            emit track( m_tracks.first() );
+        else if ( !m_single && !m_tracks.isEmpty() )
+            emit tracks( m_tracks );
+
+        deleteLater();
+    }
+}
+
+
+void
+SpotifyParser::checkTrackFinished()
+{
+    tDebug() << "Checking for spotify batch track job finished" << m_queries.isEmpty();
+    if ( m_queries.isEmpty() ) // we're done
+    {
+        if ( m_browseJob )
+            m_browseJob->setFinished();
+
+        if ( m_single && !m_tracks.isEmpty() )
+            emit track( m_tracks.first() );
+        else if ( !m_single && !m_tracks.isEmpty() )
+            emit tracks( m_tracks );
+
+        deleteLater();
+    }
+}
+
+
+void
+SpotifyParser::playlistCreated()
+{
+    ViewManager::instance()->show( m_playlist );
+
+    deleteLater();
+}
+
+
+QPixmap
+SpotifyParser::pixmap() const
+{
+    if ( !s_pixmap )
+        s_pixmap = new QPixmap( RESPATH "images/spotify-logo.png" );
+
+    return *s_pixmap;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/SpotifyParser.h Added

@@ -0,0 +1,93 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Hugo Lindström <hugolm84@gmail.com>
+ *
+ *   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 SPOTIFY_PARSER_H
+#define SPOTIFY_PARSER_H
+
+#include "DllMacro.h"
+#include "Typedefs.h"
+#include "Query.h"
+#include "jobview/JobStatusItem.h"
+
+#include <QObject>
+#include <QSet>
+#include <QtCore/QStringList>
+
+#define SPOTIFY_PLAYLIST_API_URL "http://spotikea.tomahawk-player.org"
+
+/**
+ * Small class to parse spotify links into query_ptrs
+ *
+ * Connect to the signals to get the results
+ */
+
+class QNetworkReply;
+namespace Tomahawk
+{
+
+class DropJobNotifier;
+
+class DLLEXPORT SpotifyParser : public QObject
+{
+    Q_OBJECT
+public:
+    friend class SpotifyJobNotifier;
+    explicit SpotifyParser( const QString& trackUrl, bool createNewPlaylist = false, QObject* parent = 0 );
+    explicit SpotifyParser( const QStringList& trackUrls, bool createNewPlaylist = false, QObject* parent = 0 );
+    virtual ~SpotifyParser();
+
+    // if true, emits track(), if false, emits tracks().
+    // only matters if you're using the QStrin constructor and explicityl dont' want
+    // the single track signal
+    void setSingleMode( bool single ) { m_single = single; }
+
+signals:
+    void track( const Tomahawk::query_ptr& track );
+    void tracks( const QList< Tomahawk::query_ptr > tracks );
+    void playlist( const Tomahawk::query_ptr& playlist );
+
+private slots:
+    void spotifyTrackLookupFinished();
+    void spotifyBrowseFinished();
+
+    void playlistCreated();
+private:
+    QPixmap pixmap() const;
+
+    void lookupUrl( const QString& url );
+    void lookupTrack( const QString& track );
+    void lookupSpotifyBrowse( const QString& playlist );
+    void checkTrackFinished();
+    void checkBrowseFinished();
+    int  m_limit;
+    bool m_single;
+    bool m_trackMode;
+    bool m_createNewPlaylist;
+    QList< query_ptr > m_tracks;
+    QSet< QNetworkReply* > m_queries;
+    QString m_title, m_info, m_creator;
+    Tomahawk::playlist_ptr m_playlist;
+    DropJobNotifier* m_browseJob;
+
+    static QPixmap* s_pixmap;
+};
+
+}
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/StyleHelper.cpp Added

@@ -0,0 +1,177 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Casey Link <unnamedrambler@gmail.com>
+ *
+ *   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 "StyleHelper.h"
+
+#include <QPainter>
+#include <QPixmapCache>
+#include <QApplication>
+
+
+QColor
+StyleHelper::headerUpperColor()
+{
+    return QColor( "#464e57" );
+}
+
+
+QColor
+StyleHelper::headerLowerColor()
+{
+    return QColor( "#3f4650" );
+}
+
+
+QColor
+StyleHelper::headerHighlightColor()
+{
+    return QColor( "#333" );
+}
+
+
+void
+StyleHelper::horizontalHeader( QPainter* painter, const QRect& r )
+{
+    painter->save();
+
+    QRect upperHalf( 0, 0, r.width(), r.height() / 2 );
+    QRect lowerHalf( 0, upperHalf.height(), r.width(), r.height() );
+    painter->fillRect( upperHalf, StyleHelper::headerUpperColor() );
+    painter->fillRect( lowerHalf, StyleHelper::headerLowerColor() );
+
+    {
+        QColor lineColor( 100, 100, 100 );
+        QLine line( 0, 0, r.width(), 0 );
+        painter->setPen( lineColor );
+        painter->drawLine( line );
+    }
+    {
+        QColor lineColor( 30, 30, 30 );
+        QLine line( 0, r.height() - 1, r.width(), r.height() - 1 );
+        painter->setPen( lineColor );
+        painter->drawLine( line );
+    }
+
+    painter->restore();
+}
+
+
+QColor
+StyleHelper::headerTextColor()
+{
+    return Qt::white;
+}
+
+
+/*
+ * This implementation is from QWindowsStyle (Qt 7.2)
+ *
+ * It is licensed under the GPL 3:
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ * Contact: Nokia Corporation (qt-info@nokia.com)
+ */
+void StyleHelper::drawArrow( QStyle::PrimitiveElement element, QPainter* p, const QStyleOption* opt )
+{
+    if ( opt->rect.width() <= 1 || opt->rect.height() <= 1 )
+        return;
+
+    QRect r = opt->rect;
+    int size = qMin( r.height(), r.width() );
+    QPixmap pixmap;
+    QString pixmapName;
+
+    pixmapName.sprintf( "arrow-%s-%d-%d-%d-%lld", "$qt_ia", uint(opt->state), element, size, opt->palette.cacheKey() );
+    if ( !QPixmapCache::find( pixmapName, pixmap) )
+    {
+        int border = size / 5;
+        int sqsize = 2 * ( size / 2 );
+
+        QImage image( sqsize, sqsize, QImage::Format_ARGB32 );
+        image.fill( 0 );
+        QPainter imagePainter( &image );
+        imagePainter.setRenderHint( QPainter::Antialiasing, true );
+        QPolygon a;
+
+        switch ( element )
+        {
+            case QStyle::PE_IndicatorArrowUp:
+                a.setPoints( 3, border, sqsize / 2, sqsize / 2, border, sqsize - border, sqsize / 2 );
+                break;
+
+            case QStyle::PE_IndicatorArrowDown:
+                a.setPoints( 3, border, sqsize / 2, sqsize / 2, sqsize - border,  sqsize - border, sqsize / 2 );
+                break;
+
+            case QStyle::PE_IndicatorArrowRight:
+                a.setPoints( 3, sqsize - border, sqsize / 2, sqsize / 2, border, sqsize / 2, sqsize - border );
+                break;
+
+            case QStyle::PE_IndicatorArrowLeft:
+                a.setPoints( 3, border, sqsize / 2, sqsize / 2, border, sqsize / 2, sqsize - border );
+                break;
+
+            default:
+                break;
+        }
+
+        int bsx = 0;
+        int bsy = 0;
+
+        if ( opt->state & QStyle::State_Sunken )
+        {
+            bsx = qApp->style()->pixelMetric( QStyle::PM_ButtonShiftHorizontal );
+            bsy = qApp->style()->pixelMetric( QStyle::PM_ButtonShiftVertical );
+        }
+
+        QRect bounds = a.boundingRect();
+        int sx = sqsize / 2 - bounds.center().x() - 1;
+        int sy = sqsize / 2 - bounds.center().y() - 1;
+        imagePainter.translate( sx + bsx, sy + bsy );
+        imagePainter.setPen( opt->palette.buttonText().color() );
+        imagePainter.setBrush( opt->palette.buttonText() );
+
+        if ( !( opt->state & QStyle::State_Enabled ) )
+        {
+            QColor foreGround( 150, 150, 150, 150 );
+            imagePainter.setBrush( opt->palette.mid().color() );
+            imagePainter.setPen( opt->palette.mid().color() );
+        }
+        else
+        {
+            QColor shadow( 0, 0, 0, 100 );
+            imagePainter.translate( 0, 1 );
+            imagePainter.setPen( shadow );
+            imagePainter.setBrush( shadow );
+            QColor foreGround( 255, 255, 255, 210 );
+            imagePainter.drawPolygon( a );
+            imagePainter.translate( 0, -1 );
+            imagePainter.setPen( foreGround );
+            imagePainter.setBrush( foreGround );
+        }
+
+        imagePainter.drawPolygon( a );
+        imagePainter.end();
+
+        pixmap = QPixmap::fromImage( image );
+        QPixmapCache::insert( pixmapName, pixmap );
+    }
+
+    int xOffset = r.x() + ( r.width() - size ) / 2;
+    int yOffset = r.y() + ( r.height() - size ) / 2;
+    p->drawPixmap( xOffset, yOffset, pixmap );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/StyleHelper.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/TomahawkCache.cpp Added

@@ -0,0 +1,153 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Casey Link <unnamedrambler@gmail.com>
+ *
+ *   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 "TomahawkCache.h"
+
+#include "TomahawkSettings.h"
+#include "Source.h"
+#include "utils/Logger.h"
+
+#include <QDateTime>
+#include <QSettings>
+#include <QMutexLocker>
+
+using namespace TomahawkUtils;
+
+Cache*Cache::s_instance = 0;
+
+Cache* Cache::instance()
+{
+    if ( !s_instance )
+        s_instance = new Cache();
+
+    return s_instance;
+}
+
+Cache::Cache()
+    : QObject ( 0 )
+    , m_cacheBaseDir ( TomahawkSettings::instance()->storageCacheLocation() + "/GenericCache/" )
+    , m_cacheManifest ( m_cacheBaseDir + "cachemanifest.ini", QSettings::IniFormat )
+{
+    m_pruneTimer.setInterval ( 300000 );
+    m_pruneTimer.setSingleShot ( false );
+    connect ( &m_pruneTimer, SIGNAL ( timeout() ), SLOT ( pruneTimerFired() ) );
+    m_pruneTimer.start();
+}
+
+Cache::~Cache()
+{
+
+}
+
+void Cache::pruneTimerFired()
+{
+    QMutexLocker mutex_locker( &m_mutex );
+
+    qDebug() << Q_FUNC_INFO << "Pruning tomahawkcache";
+    qlonglong currentMSecsSinceEpoch = QDateTime::currentMSecsSinceEpoch();
+
+    QVariantList clients = m_cacheManifest.value ( "clients" ).toList();
+    foreach ( const QVariant &client, clients ) {
+        const QString client_identifier = client.toString();
+        const QString cache_dir = m_cacheBaseDir + client_identifier;
+
+        QSettings cached_settings ( cache_dir, QSettings::IniFormat );
+        const QStringList keys = cached_settings.allKeys();
+        foreach ( const QString &key, keys ) {
+            CacheData data = cached_settings.value ( key ).value<TomahawkUtils::CacheData>();
+            if ( data.maxAge < currentMSecsSinceEpoch ) {
+                cached_settings.remove ( key );
+                tLog() << Q_FUNC_INFO << "Removed stale entry: " << client_identifier << key;
+            }
+        }
+        cached_settings.sync();
+        if ( cached_settings.allKeys().size() == 0 )
+            removeClient ( client_identifier );
+    }
+}
+
+
+QVariant Cache::getData ( const QString& identifier, const QString& key )
+{
+    QMutexLocker mutex_locker( &m_mutex );
+
+    const QString cacheDir = m_cacheBaseDir + identifier;
+    QSettings cached_settings ( cacheDir, QSettings::IniFormat );
+
+    if ( cached_settings.contains ( key ) ) {
+        CacheData data = cached_settings.value ( key ).value<TomahawkUtils::CacheData>();
+
+        if ( data.maxAge < QDateTime::currentMSecsSinceEpoch() ) {
+            cached_settings.remove ( key );
+            tLog() << Q_FUNC_INFO << "Removed stale entry: " << identifier << key;
+            return QVariant();
+        }
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Fetched data for" << identifier << key;
+        return data.data;
+
+    }
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "No such key" << key;
+    return QVariant();
+}
+
+void Cache::putData ( const QString& identifier, qint64 maxAge, const QString& key, const QVariant& value )
+{
+    QMutexLocker mutex_locker( &m_mutex );
+
+    const QString cacheDir = m_cacheBaseDir + identifier;
+    addClient ( identifier );
+    QSettings cached_settings ( cacheDir, QSettings::IniFormat );
+    cached_settings.setValue ( key, QVariant::fromValue ( CacheData ( QDateTime::currentMSecsSinceEpoch() + maxAge, value ) ) );
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Storing from client " << identifier << maxAge << key << value;
+}
+
+void Cache::addClient ( const QString& identifier )
+{
+    QVariantList clients = m_cacheManifest.value ( "clients" ).toList();
+    foreach ( const QVariant &client, clients ) {
+        const QString client_identifier = client.toString();
+        if ( identifier == client_identifier ) return;
+    }
+
+    tLog() << Q_FUNC_INFO << "adding client" << identifier;
+    clients.append ( identifier );
+    m_cacheManifest.setValue ( "clients", clients );
+    m_cacheManifest.sync();
+}
+
+void Cache::removeClient ( const QString& identifier )
+{
+    QVariantList clients = m_cacheManifest.value ( "clients" ).toList();
+    QVariantList::iterator it = clients.begin();
+    while ( it != clients.end() ) {
+        const QString client_identifier = it->toString();
+        if ( identifier == client_identifier ) {
+            tLog() << Q_FUNC_INFO << "removing client" << identifier;
+            clients.erase ( it );
+            break;
+        }
+        ++it;
+    }
+    m_cacheManifest.setValue ( "clients", clients );
+    m_cacheManifest.sync();
+}
+
+
+
+
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/TomahawkCache.h Added

@@ -0,0 +1,122 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Casey Link <unnamedrambler@gmail.com>
+ *
+ *   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 TOMAHAWKCACHE_H
+#define TOMAHAWKCACHE_H
+
+#include "DllMacro.h"
+#include "utils/TomahawkUtils.h"
+
+#include <QMutex>
+#include <QSettings>
+#include <QObject>
+#include <QTimer>
+
+namespace TomahawkUtils {
+
+/**
+ * Internal data structure. Don't use.
+ */
+struct CacheData {
+    CacheData(){}
+    CacheData( qint64 maxAg, QVariant dat )
+    : maxAge( maxAg )
+    , data( dat )
+    {}
+
+    qint64 maxAge; //!< milliseconds
+    QVariant data;
+};
+
+/**
+ * A simple generic cache for anyone to use.
+ *
+ * Data is segmented according to clients, which specify
+ * a client identifier.
+ *
+ * Structure is a basic key-value store with associated max lifetime in
+ * milliseconds.
+ */
+class DLLEXPORT Cache : public QObject
+{
+Q_OBJECT
+
+public:
+    static Cache* instance();
+    virtual ~Cache();
+
+    /**
+     * Store data in the cache.
+     * @param identifier your unique identifier, used to segment your data.
+     * @param maxAge lifetime of data in milliseconds (e.g, 3600000 = 1 hour)
+     * @param key the key to store the data
+     * @param value the data to store
+     */
+    void putData( const QString &identifier, qint64 maxAge, const QString &key, const QVariant& value );
+
+    /**
+     * Retrieve data from the cache.
+     * @param identifier your unique identifier, used to segment your data.
+     * @param key the key to store the data
+     * @return the data, if found, if not found an invalid QVariant is returned.
+     */
+    QVariant getData( const QString &identifier, const QString &key );
+
+private slots:
+    void pruneTimerFired();
+
+private:
+    Cache();
+    static Cache* s_instance;
+
+    /**
+     * Adds a client to the manifest.
+     * Does not lock the mutex.
+     */
+    void addClient( const QString &identifier );
+
+    /**
+     * Removes a client to the manifest.
+     * Does not lock the mutex.
+     */
+    void removeClient( const QString &identifier );
+
+    QString m_cacheBaseDir;
+    QSettings m_cacheManifest;
+    QTimer m_pruneTimer;
+    QMutex m_mutex;
+};
+
+}
+
+inline QDataStream& operator<< ( QDataStream& in, const TomahawkUtils::CacheData& data )
+{
+   in << data.data << data.maxAge;
+   return in;
+}
+
+inline QDataStream& operator>> ( QDataStream& out, TomahawkUtils::CacheData& data )
+{
+    out >> data.data;
+    out >> data.maxAge;
+    return out;
+}
+
+Q_DECLARE_METATYPE( TomahawkUtils::CacheData );
+
+#endif // TOMAHAWKCACHE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/TomahawkUtils.cpp Added

@@ -0,0 +1,941 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "config.h"
+#include "HeadlessCheck.h"
+#include "TomahawkSettings.h"
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "Source.h"
+#include "BinaryExtractWorker.h"
+#include "SharedTimeLine.h"
+
+#ifdef LIBLASTFM_FOUND
+    #include <lastfm/ws.h>
+#endif
+
+#include <QNetworkConfiguration>
+#include <QNetworkAccessManager>
+#include <QNetworkProxy>
+
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QDir>
+#include <QMutex>
+#include <QCryptographicHash>
+#include <QProcess>
+
+#include <quazip.h>
+#include <quazipfile.h>
+
+#ifdef Q_OS_WIN
+    #include <windows.h>
+    #include <shlobj.h>
+#endif
+
+#ifdef Q_WS_MAC
+    #include <Carbon/Carbon.h>
+    #include <sys/sysctl.h>
+#endif
+
+#ifdef QCA2_FOUND
+    #include <QtCrypto>
+#endif
+
+namespace TomahawkUtils
+{
+static quint64 s_infosystemRequestId = 0;
+static QMutex s_infosystemRequestIdMutex;
+static bool s_headless = false;
+
+#ifdef Q_WS_MAC
+QString
+appSupportFolderPath()
+{
+    // honestly, it is *always* this --mxcl
+    return QDir::home().filePath( "Library/Application Support" );
+}
+#endif // Q_WS_MAC
+
+
+bool
+headless()
+{
+    return s_headless;
+}
+
+
+void
+setHeadless( bool headless )
+{
+    tLog() << Q_FUNC_INFO << "headless is" << (headless? "true" : "false");
+    s_headless = headless;
+}
+
+
+QString
+appFriendlyVersion()
+{
+    QStringList l = QString( TOMAHAWK_VERSION ).split( ".", QString::SkipEmptyParts );
+    while ( l.count() > 3 )
+        l.removeLast();
+
+    return l.join( "." );
+}
+
+
+QDir
+appConfigDir()
+{
+    QDir ret;
+
+#ifdef Q_WS_MAC
+    if ( getenv( "HOME" ) )
+    {
+        return QDir( QString( "%1" ).arg( getenv( "HOME" ) ) );
+    }
+    else
+    {
+        qDebug() << "Error, $HOME not set.";
+        throw "$HOME not set";
+        return QDir( "/tmp" );
+    }
+
+#elif defined(Q_WS_WIN)
+    throw "TODO";
+    return QDir( "c:\\" ); //TODO refer to Qt documentation to get code to do this
+
+#else
+    if ( getenv( "XDG_CONFIG_HOME" ) )
+    {
+        ret = QDir( QString( "%1/Tomahawk" ).arg( getenv( "XDG_CONFIG_HOME" ) ) );
+    }
+    else if ( getenv( "HOME" ) )
+    {
+        ret = QDir( QString( "%1/.config/Tomahawk" ).arg( getenv( "HOME" ) ) );
+    }
+    else
+    {
+        qDebug() << "Error, $HOME or $XDG_CONFIG_HOME not set.";
+        throw "Error, $HOME or $XDG_CONFIG_HOME not set.";
+        ret = QDir( "/tmp" );
+    }
+
+    if ( !ret.exists() )
+    {
+        ret.mkpath( ret.canonicalPath() );
+    }
+
+    return ret;
+#endif
+}
+
+
+QDir
+appDataDir()
+{
+    QString path;
+
+    #ifdef Q_WS_WIN
+        if ( ( QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based ) == 0 )
+        {
+            // Use this for non-DOS-based Windowses
+            char acPathMAX_PATH;
+            HRESULT h = SHGetFolderPathA( NULL, CSIDL_LOCAL_APPDATA | CSIDL_FLAG_CREATE,
+                                          NULL, 0, acPath );
+            if ( h == S_OK )
+            {
+                path = QString::fromLocal8Bit( acPath );
+            }
+        }
+    #elif defined(Q_WS_MAC)
+        path = appSupportFolderPath();
+    #elif defined(Q_WS_X11)
+        path = QDir::home().filePath( ".local/share" );
+    #else
+        path = QCoreApplication::applicationDirPath();
+    #endif
+
+    path += "/" + QCoreApplication::organizationName();
+    QDir d( path );
+    d.mkpath( path );
+
+    return d;
+}
+
+
+QDir
+appLogDir()
+{
+#ifndef Q_WS_MAC
+    return appDataDir();
+#else
+    return QDir( QDir::homePath() + "/Library/Logs" );
+#endif
+}
+
+
+QString
+timeToString( int seconds )
+{
+    int hrs  = seconds / 60 / 60;
+    int mins = seconds / 60 % 60;
+    int secs = seconds % 60;
+
+    if ( seconds < 0 )
+    {
+        hrs = mins = secs = 0;
+    }
+
+    return QString( "%1%2:%3" ).arg( hrs > 0 ? hrs  < 10 ? "0" + QString::number( hrs ) + ":" : QString::number( hrs ) + ":" : "" )
+                               .arg( mins < 10 ? "0" + QString::number( mins ) : QString::number( mins ) )
+                               .arg( secs < 10 ? "0" + QString::number( secs ) : QString::number( secs ) );
+}
+
+
+QString
+ageToString( const QDateTime& time, bool appendAgoString )
+{
+    if ( time.toTime_t() == 0 )
+        return QString();
+
+    QDateTime now = QDateTime::currentDateTime();
+    int mins = time.secsTo( now ) / 60;
+    int hours = mins / 60;
+    int days = time.daysTo( now );
+    int weeks = days / 7;
+    int months = days / 30.42;
+    int years = months / 12;
+
+    if ( mins > 0 )
+    {
+        if ( years )
+        {
+            if ( appendAgoString )
+                return QObject::tr( "%n year(s) ago", "", years );
+            else
+                return QObject::tr( "%n year(s)", "", years );
+        }
+
+        if ( months )
+        {
+            if ( appendAgoString )
+                return QObject::tr( "%n month(s) ago", "", months );
+            else
+                return QObject::tr( "%n month(s)", "", months );
+        }
+
+        if ( weeks )
+        {
+            if ( appendAgoString )
+                return QObject::tr( "%n week(s) ago", "", weeks );
+            else
+                return QObject::tr( "%n week(s)", "", weeks );
+        }
+
+        if ( days )
+        {
+            if ( appendAgoString )
+                return QObject::tr( "%n day(s) ago", "", days );
+            else if ( hours >= 24 )
+                return QObject::tr( "%n day(s)", "", days );
+        }
+
+        if ( hours )
+        {
+            if ( appendAgoString )
+                return QObject::tr( "%n hour(s) ago", "", hours );
+            else
+                return QObject::tr( "%n hour(s)", "", hours );
+        }
+
+        if ( mins > 1 )
+        {
+            if ( appendAgoString )
+                return QObject::tr( "%1 minutes ago" ).arg( mins );
+            else
+                return QObject::tr( "%1 minutes" ).arg( mins );
+        }
+    }
+
+    return QObject::tr( "just now" );
+}
+
+
+QString
+filesizeToString( unsigned int size )
+{
+    if ( size == 0 )
+        return QString();
+
+    int kb = size / 1024;
+    int mb = kb / 1024;
+
+    if ( mb )
+    {
+        return QString( "%1.%2 Mb" ).arg( mb ).arg( int( ( kb % 1024 ) / 102.4 ) );
+    }
+    else if ( kb )
+    {
+        return QString( "%1 Kb" ).arg( kb );
+    }
+    else
+        return QString::number( size );
+}
+
+
+QString
+extensionToMimetype( const QString& extension )
+{
+    static QMap<QString, QString> s_ext2mime;
+    if ( s_ext2mime.isEmpty() )
+    {
+        s_ext2mime.insert( "mp3",  "audio/mpeg" );
+        s_ext2mime.insert( "ogg",  "application/ogg" );
+        s_ext2mime.insert( "oga",  "application/ogg" );
+        s_ext2mime.insert( "mpc",  "audio/x-musepack" );
+        s_ext2mime.insert( "wma",  "audio/x-ms-wma" );
+        s_ext2mime.insert( "aac",  "audio/mp4" );
+        s_ext2mime.insert( "m4a",  "audio/mp4" );
+        s_ext2mime.insert( "mp4",  "audio/mp4" );
+        s_ext2mime.insert( "flac", "audio/flac" );
+        s_ext2mime.insert( "aiff", "audio/aiff" );
+        s_ext2mime.insert( "aif",  "audio/aiff" );
+    }
+
+    return s_ext2mime.value( extension, "unknown" );
+}
+
+
+void
+msleep( unsigned int ms )
+{
+  #ifdef WIN32
+    Sleep( ms );
+  #else
+    ::usleep( ms * 1000 );
+  #endif
+}
+
+
+int
+levenshtein( const QString& source, const QString& target )
+{
+    // Step 1
+    const int n = source.length();
+    const int m = target.length();
+
+    if ( n == 0 )
+        return m;
+    if ( m == 0 )
+        return n;
+
+    // Good form to declare a TYPEDEF
+    typedef QVector< QVector<int> > Tmatrix;
+    Tmatrix matrix;
+    matrix.resize( n + 1 );
+
+    // Size the vectors in the 2.nd dimension. Unfortunately C++ doesn't
+    // allow for allocation on declaration of 2.nd dimension of vec of vec
+    for ( int i = 0; i <= n; i++ )
+    {
+        QVector<int> tmp;
+        tmp.resize( m + 1 );
+        matrix.insert( i, tmp );
+    }
+
+    // Step 2
+    for ( int i = 0; i <= n; i++ )
+        matrixi0 = i;
+    for ( int j = 0; j <= m; j++ )
+        matrix0j = j;
+
+    // Step 3
+    for ( int i = 1; i <= n; i++ )
+    {
+        const QChar s_i = sourcei - 1;
+
+        // Step 4
+        for ( int j = 1; j <= m; j++ )
+        {
+            const QChar t_j = targetj - 1;
+
+            // Step 5
+            int cost;
+            if ( s_i == t_j )
+                cost = 0;
+            else
+                cost = 1;
+
+            // Step 6
+            const int above = matrixi - 1j;
+            const int left = matrixij - 1;
+            const int diag = matrixi - 1j - 1;
+
+            int cell = ( ( ( left + 1 ) > ( diag + cost ) ) ? diag + cost : left + 1 );
+            if ( above + 1 < cell )
+                cell = above + 1;
+
+            // Step 6A: Cover transposition, in addition to deletion,
+            // insertion and substitution. This step is taken from:
+            // Berghel, Hal ; Roach, David : "An Extension of Ukkonen's
+            // Enhanced Dynamic Programming ASM Algorithm"
+            // (http://www.acm.org/~hlb/publications/asm/asm.html)
+            if ( i > 2 && j > 2 )
+            {
+                int trans = matrixi - 2j - 2 + 1;
+
+                if ( source i - 2  != t_j ) trans++;
+                if ( s_i != target j - 2  ) trans++;
+                if ( cell > trans ) cell = trans;
+            }
+            matrixij = cell;
+        }
+    }
+
+    // Step 7
+    return matrixnm;
+}
+
+
+static QMutex s_noProxyHostsMutex;
+static QStringList s_noProxyHosts;
+
+NetworkProxyFactory::NetworkProxyFactory( const NetworkProxyFactory& other )
+{
+    m_proxy = QNetworkProxy( other.m_proxy );
+}
+
+
+QList< QNetworkProxy >
+NetworkProxyFactory::queryProxy( const QNetworkProxyQuery& query )
+{
+    //tDebug() << Q_FUNC_INFO << "query hostname is" << query.peerHostName() << ", proxy host is" << m_proxy.hostName();
+
+    QList< QNetworkProxy > proxies;
+    QString hostname = query.peerHostName();
+    s_noProxyHostsMutex.lock();
+    if ( !hostname.isEmpty() && s_noProxyHosts.contains( hostname ) )
+        proxies << QNetworkProxy::NoProxy << systemProxyForQuery( query );
+    else if ( m_proxy.hostName().isEmpty() || TomahawkSettings::instance()->proxyType() == QNetworkProxy::NoProxy )
+        proxies << systemProxyForQuery( query );
+    else
+        proxies << m_proxy << systemProxyForQuery( query );
+    s_noProxyHostsMutex.unlock();
+    return proxies;
+}
+
+
+void
+NetworkProxyFactory::setNoProxyHosts( const QStringList& hosts )
+{
+    QStringList newList;
+    tDebug() << Q_FUNC_INFO << "No-proxy hosts:" << hosts;
+    foreach ( const QString& host, hosts )
+    {
+        QString munge = host.simplified();
+        newList << munge;
+        //TODO: wildcard support
+    }
+
+    tDebug() << Q_FUNC_INFO << "New no-proxy hosts:" << newList;
+
+    s_noProxyHostsMutex.lock();
+    s_noProxyHosts = newList;
+    s_noProxyHostsMutex.unlock();
+}
+
+
+void
+NetworkProxyFactory::setProxy( const QNetworkProxy& proxy )
+{
+    m_proxy = proxy;
+    QFlags< QNetworkProxy::Capability > proxyCaps;
+    proxyCaps |= QNetworkProxy::TunnelingCapability;
+    proxyCaps |= QNetworkProxy::ListeningCapability;
+    if ( TomahawkSettings::instance()->proxyDns() )
+        proxyCaps |= QNetworkProxy::HostNameLookupCapability;
+    m_proxy.setCapabilities( proxyCaps );
+    tDebug() << Q_FUNC_INFO << "Proxy using host" << proxy.hostName() << "and port" << proxy.port();
+    tDebug() << Q_FUNC_INFO << "setting proxy to use proxy DNS?" << (TomahawkSettings::instance()->proxyDns() ? "true" : "false");
+}
+
+
+NetworkProxyFactory&
+NetworkProxyFactory::operator=( const NetworkProxyFactory& rhs )
+{
+    tDebug() << Q_FUNC_INFO;
+    if ( this != &rhs )
+    {
+        m_proxy = QNetworkProxy( rhs.m_proxy );
+    }
+
+    return *this;
+}
+
+
+bool NetworkProxyFactory::operator==( const NetworkProxyFactory& other ) const
+{
+    tDebug() << Q_FUNC_INFO;
+    if ( m_proxy != other.m_proxy )
+        return false;
+
+    return true;
+}
+
+static QMap< QThread*, QNetworkAccessManager* > s_threadNamHash;
+static QMap< QThread*, NetworkProxyFactory* > s_threadProxyFactoryHash;
+static QMutex s_namAccessMutex;
+
+NetworkProxyFactory*
+proxyFactory( bool makeClone, bool noMutexLocker )
+{
+    // Don't lock if being called from nam()
+    tDebug() << Q_FUNC_INFO;
+    QMutex otherMutex;
+    QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
+
+    if ( !makeClone )
+    {
+        if ( s_threadProxyFactoryHash.contains( QThread::currentThread() ) )
+            return s_threadProxyFactoryHash QThread::currentThread() ;
+    }
+
+    // create a new proxy factory for this thread
+    TomahawkUtils::NetworkProxyFactory *newProxyFactory = new TomahawkUtils::NetworkProxyFactory();
+    if ( s_threadProxyFactoryHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
+    {
+        TomahawkUtils::NetworkProxyFactory *mainProxyFactory = s_threadProxyFactoryHash TOMAHAWK_APPLICATION::instance()->thread() ;
+        *newProxyFactory = *mainProxyFactory;
+    }
+
+    if ( !makeClone )
+        s_threadProxyFactoryHash QThread::currentThread()  = newProxyFactory;
+
+    return newProxyFactory;
+}
+
+
+void
+setProxyFactory( NetworkProxyFactory* factory, bool noMutexLocker )
+{
+    tDebug() << Q_FUNC_INFO;
+    Q_ASSERT( factory );
+    // Don't lock if being called from setNam()
+    QMutex otherMutex;
+    QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
+
+    if ( !s_threadProxyFactoryHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
+        return;
+
+    if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
+    {
+        foreach ( QThread* thread, s_threadProxyFactoryHash.keys() )
+        {
+            if ( thread != QThread::currentThread() )
+            {
+                TomahawkUtils::NetworkProxyFactory *currFactory = s_threadProxyFactoryHash thread ;
+                *currFactory = *factory;
+            }
+        }
+        QNetworkProxyFactory::setApplicationProxyFactory( factory );
+    }
+
+    *s_threadProxyFactoryHash QThread::currentThread()  = *factory;
+}
+
+
+QNetworkAccessManager*
+nam()
+{
+    QMutexLocker locker( &s_namAccessMutex );
+    if ( s_threadNamHash.contains(  QThread::currentThread() ) )
+    {
+        //tDebug() << Q_FUNC_INFO << "Found current thread in nam hash";
+        return s_threadNamHash QThread::currentThread() ;
+    }
+
+    if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) )
+    {
+        if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
+        {
+            setNam( new QNetworkAccessManager(), true );
+            return s_threadNamHash QThread::currentThread() ;
+        }
+        else
+            return 0;
+    }
+    tDebug() << Q_FUNC_INFO << "Found gui thread in nam hash";
+
+    // Create a nam for this thread based on the main thread's settings but with its own proxyfactory
+    QNetworkAccessManager *mainNam = s_threadNamHash TOMAHAWK_APPLICATION::instance()->thread() ;
+    QNetworkAccessManager* newNam = new QNetworkAccessManager();
+
+    newNam->setConfiguration( QNetworkConfiguration( mainNam->configuration() ) );
+    newNam->setNetworkAccessible( mainNam->networkAccessible() );
+    newNam->setProxyFactory( proxyFactory( false, true ) );
+
+    s_threadNamHash QThread::currentThread()  = newNam;
+
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO << "created new nam for thread" << QThread::currentThread();
+    //QNetworkProxy proxy = dynamic_cast< TomahawkUtils::NetworkProxyFactory* >( newNam->proxyFactory() )->proxy();
+    //tDebug() << Q_FUNC_INFO << "reply proxy properties:" << proxy.type() << proxy.hostName() << proxy.port();
+
+    return newNam;
+}
+
+
+void
+setNam( QNetworkAccessManager* nam, bool noMutexLocker )
+{
+    Q_ASSERT( nam );
+    // Don't lock if being called from nam()()
+    QMutex otherMutex;
+    QMutexLocker locker( noMutexLocker ? &otherMutex : &s_namAccessMutex );
+    if ( !s_threadNamHash.contains( TOMAHAWK_APPLICATION::instance()->thread() ) &&
+            QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
+    {
+        tDebug( LOGEXTRA ) << "creating initial gui thread (" << TOMAHAWK_APPLICATION::instance()->thread() << ") nam";
+        // Should only get here on first initialization of the nam
+        TomahawkSettings *s = TomahawkSettings::instance();
+        TomahawkUtils::NetworkProxyFactory* proxyFactory = new TomahawkUtils::NetworkProxyFactory();
+        if ( s->proxyType() != QNetworkProxy::NoProxy && !s->proxyHost().isEmpty() )
+        {
+            tDebug( LOGEXTRA ) << "Setting proxy to saved values";
+            QNetworkProxy proxy( s->proxyType(), s->proxyHost(), s->proxyPort(), s->proxyUsername(), s->proxyPassword() );
+            proxyFactory->setProxy( proxy );
+            //FIXME: Jreen is broke without this
+            //QNetworkProxy::setApplicationProxy( proxy );
+            s_noProxyHostsMutex.lock();
+            if ( !s->proxyNoProxyHosts().isEmpty() && s_noProxyHosts.isEmpty() )
+            {
+                s_noProxyHostsMutex.unlock();
+                proxyFactory->setNoProxyHosts( s->proxyNoProxyHosts().split( ',', QString::SkipEmptyParts ) );
+            }
+            else
+                s_noProxyHostsMutex.unlock();
+        }
+
+        QNetworkProxyFactory::setApplicationProxyFactory( proxyFactory );
+        nam->setProxyFactory( proxyFactory );
+        s_threadNamHash QThread::currentThread()  = nam;
+        s_threadProxyFactoryHash QThread::currentThread()  = proxyFactory;
+        return;
+    }
+
+    s_threadNamHash QThread::currentThread()  = nam;
+
+    if ( QThread::currentThread() == TOMAHAWK_APPLICATION::instance()->thread() )
+        setProxyFactory( dynamic_cast< TomahawkUtils::NetworkProxyFactory* >( nam->proxyFactory() ), true );
+}
+
+
+bool
+newerVersion( const QString& oldVersion, const QString& newVersion )
+{
+    if ( oldVersion.isEmpty() || newVersion.isEmpty() )
+        return false;
+
+    QStringList oldVList = oldVersion.split( ".", QString::SkipEmptyParts );
+    QStringList newVList = newVersion.split( ".", QString::SkipEmptyParts );
+
+    int i = 0;
+    foreach ( const QString& nvPart, newVList )
+    {
+        if ( i + 1 > oldVList.count() )
+            return true;
+
+        int nviPart = nvPart.toInt();
+        int oviPart = oldVList.at( i++ ).toInt();
+
+        if ( nviPart > oviPart )
+            return true;
+
+        if ( nviPart < oviPart )
+            return false;
+    }
+
+    return false;
+}
+
+
+QList< Tomahawk::query_ptr >
+mergePlaylistChanges( const QList< Tomahawk::query_ptr >& orig, const QList< Tomahawk::query_ptr >& newTracks, bool& changed )
+{
+    int sameCount = 0;
+    QList< Tomahawk::query_ptr > tosave = newTracks;
+    changed = false;
+
+    foreach ( const Tomahawk::query_ptr& newquery, newTracks )
+    {
+        foreach ( const Tomahawk::query_ptr& oldq, orig )
+        {
+            if ( newquery->track() == oldq->track() &&
+                newquery->artist() == oldq->artist() &&
+                newquery->album() == oldq->album() )
+            {
+                sameCount++;
+                if ( tosave.contains( newquery ) )
+                    tosave.replace( tosave.indexOf( newquery ), oldq );
+
+                break;
+            }
+        }
+    }
+
+    // No work to be done if all are the same
+    if ( orig.size() == newTracks.size() && sameCount == orig.size() )
+        return orig;
+
+    changed = true;
+    return tosave;
+}
+
+
+// taken from util/fileutils.cpp in kdevplatform
+bool
+removeDirectory( const QString& dir )
+{
+    const QDir aDir( dir );
+
+    tLog() << "Deleting DIR:" << dir;
+    bool has_err = false;
+    if ( aDir.exists() )
+    {
+        foreach ( const QFileInfo& entry, aDir.entryInfoList( QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::NoSymLinks ) )
+        {
+            QString path = entry.absoluteFilePath();
+            if ( entry.isDir() )
+            {
+                has_err = !removeDirectory( path ) || has_err;
+            }
+            else if ( !QFile::remove( path ) )
+            {
+                has_err = true;
+            }
+        }
+        if ( !aDir.rmdir( aDir.absolutePath() ) )
+        {
+            has_err = true;
+        }
+    }
+
+    return !has_err;
+}
+
+
+quint64
+infosystemRequestId()
+{
+    QMutexLocker locker( &s_infosystemRequestIdMutex );
+    quint64 result = s_infosystemRequestId;
+    s_infosystemRequestId++;
+    return result;
+}
+
+
+QString
+md5( const QByteArray& data )
+{
+    QByteArray const digest = QCryptographicHash::hash( data, QCryptographicHash::Md5 );
+    return QString::fromLatin1( digest.toHex() ).rightJustified( 32, '0' );
+}
+
+
+void
+crash()
+{
+    volatile int* a = (int*)(NULL);
+    *a = 1;
+}
+
+
+bool
+verifyFile( const QString& filePath, const QString& signature )
+{
+    QCA::Initializer init;
+
+    if ( !QCA::isSupported( "sha1" ) )
+    {
+        qWarning() << "SHA1 not supported by QCA, aborting.";
+        return false;
+    }
+
+    // The signature for the resolver.zip was created like so:
+    // openssl dgst -sha1 -binary < "#{tarball}" | openssl dgst -dss1 -sign "#{ARGV2}" | openssl enc -base64
+    // which means we need to decode it with QCA's DSA public key signature verification tools
+    // The input data is:
+    // file -> SHA1 binary format -> DSS1/DSA signed -> base64 encoded.
+
+    // Step 1: Load the public key
+    // Public key is in :/data/misc/tomahawk_pubkey.pem
+    QFile f( ":/data/misc/tomahawk_pubkey.pem" );
+    if ( !f.open( QIODevice::ReadOnly ) )
+    {
+        qWarning() << "Unable to read public key from resources!";
+        return false;
+    }
+
+    const QString pubkeyData = QString::fromUtf8( f.readAll() );
+    QCA::ConvertResult conversionResult;
+    QCA::PublicKey publicKey = QCA::PublicKey::fromPEM( pubkeyData, &conversionResult );
+    if ( QCA::ConvertGood != conversionResult)
+    {
+        qWarning() << "Public key reading/loading failed! Tried to load public key:" << pubkeyData;
+        return false;
+    }
+
+    if ( !publicKey.canVerify() )
+    {
+        qWarning() << "Loaded Tomahawk public key but cannot use it to verify! What is up....";
+        return false;
+    }
+
+    // Step 2: Get the SHA1 of the file contents
+    QFile toVerify( filePath );
+    if ( !toVerify.exists() || !toVerify.open( QIODevice::ReadOnly ) )
+    {
+        qWarning() << "Failed to open file we are trying to verify!" << filePath;
+        return false;
+    }
+
+    const QByteArray fileHashData = QCA::Hash( "sha1" ).hash( toVerify.readAll() ).toByteArray();
+    toVerify.close();
+
+    // Step 3: Base64 decode the signature
+    QCA::Base64 decoder( QCA::Decode );
+    const QByteArray decodedSignature = decoder.decode( QCA::SecureArray( signature.trimmed().toUtf8() ) ).toByteArray();
+    if ( decodedSignature.isEmpty() )
+    {
+        qWarning() << "Got empty signature after we tried to decode it from Base64:" << signature.trimmed().toUtf8() << decodedSignature.toBase64();
+        return false;
+    }
+
+    // Step 4: Do the actual verifying!
+    const bool result = publicKey.verifyMessage( fileHashData, decodedSignature, QCA::EMSA1_SHA1, QCA::DERSequence );
+    if ( !result )
+    {
+        qWarning() << "File" << filePath << "FAILED VERIFICATION against our input signature!";
+        return false;
+    }
+
+    qDebug() << "Successfully verified signature of downloaded file:" << filePath;
+
+    return true;
+}
+
+
+QString
+extractScriptPayload( const QString& filename, const QString& resolverId )
+{
+    // uses QuaZip to extract the temporary zip file to the user's tomahawk data/resolvers directory
+    QDir resolverDir = appDataDir();
+    if ( !resolverDir.mkpath( QString( "atticaresolvers/%1" ).arg( resolverId ) ) )
+    {
+        tLog() << "Failed to mkdir resolver save dir:" << TomahawkUtils::appDataDir().absoluteFilePath( QString( "atticaresolvers/%1" ).arg( resolverId ) );
+        return QString();
+    }
+    resolverDir.cd( QString( "atticaresolvers/%1" ).arg( resolverId ) );
+
+    if ( !unzipFileInFolder( filename, resolverDir ) )
+    {
+        qWarning() << "Failed to unzip resolver. Ooops.";
+        return QString();
+    }
+
+    return resolverDir.absolutePath();
+}
+
+
+bool
+unzipFileInFolder( const QString& zipFileName, const QDir& folder )
+{
+    Q_ASSERT( !zipFileName.isEmpty() );
+    Q_ASSERT( folder.exists() );
+
+    QuaZip zipFile( zipFileName );
+    if ( !zipFile.open( QuaZip::mdUnzip ) )
+    {
+        qWarning() << "Failed to QuaZip open:" << zipFile.getZipError();
+        return false;
+    }
+
+    if ( !zipFile.goToFirstFile() )
+    {
+        tLog() << "Failed to go to first file in zip archive:" << zipFile.getZipError();
+        return false;
+    }
+
+    tDebug() << "Unzipping files to:" << folder.absolutePath();
+
+    QuaZipFile fileInZip( &zipFile );
+    do
+    {
+        QuaZipFileInfo info;
+        zipFile.getCurrentFileInfo( &info );
+
+        if ( !fileInZip.open( QIODevice::ReadOnly ) )
+        {
+            tLog() << "Failed to open file inside zip archive:" << info.name << zipFile.getZipName() << "with error:" << zipFile.getZipError();
+            continue;
+        }
+
+        QFile out( folder.absoluteFilePath( fileInZip.getActualFileName() ) );
+
+        // make dir if there is one needed
+        QStringList parts = fileInZip.getActualFileName().split( "/" );
+        if ( parts.size() > 1 )
+        {
+            QStringList dirs = parts.mid( 0, parts.size() - 1 );
+            QString dirPath = dirs.join( "/" ); // QDir translates / to \ internally if necessary
+            folder.mkpath( dirPath );
+        }
+
+        tDebug() << "Writing to output file..." << out.fileName();
+        if ( !out.open( QIODevice::WriteOnly ) )
+        {
+            tLog() << "Failed to open zip extract file:" << out.errorString() << info.name;
+            fileInZip.close();
+            continue;
+        }
+
+
+        out.write( fileInZip.readAll() );
+        out.close();
+        fileInZip.close();
+
+    } while ( zipFile.goToNextFile() );
+
+    return true;
+}
+
+
+void
+extractBinaryResolver( const QString& zipFilename, QObject* receiver )
+{
+    BinaryExtractWorker* worker = new BinaryExtractWorker( zipFilename, receiver );
+    worker->start( QThread::LowPriority );
+}
+
+
+} // ns
+
+#include "TomahawkUtils.moc"

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/TomahawkUtils.h Added

@@ -0,0 +1,142 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 TOMAHAWKUTILS_H
+#define TOMAHAWKUTILS_H
+
+#include "DllMacro.h"
+
+#include <QtCore/QThread>
+#include <QtNetwork/QNetworkProxy>
+#include <QtCore/QStringList>
+#include <Typedefs.h>
+
+#define RESPATH ":/data/"
+
+class QDir;
+class QNetworkAccessManager;
+
+namespace TomahawkUtils
+{
+    enum MediaType
+    {
+        MediaTypeArtist,
+        MediaTypeAlbum,
+        MediaTypeTrack
+    };
+
+    enum ImageType
+    {
+        DefaultAlbumCover,
+        DefaultArtistImage,
+        DefaultTrackImage,
+        DefaultSourceAvatar,
+        NowPlayingSpeaker,
+        InfoIcon
+    };
+
+    enum ImageMode
+    {
+        Original,
+        CoverInCase,
+        AvatarInFrame,
+        ScaledCover,
+        Grid
+    };
+
+
+    class DLLEXPORT NetworkProxyFactory : public QNetworkProxyFactory
+    {
+    public:
+        NetworkProxyFactory()
+            : m_proxy( QNetworkProxy::NoProxy )
+        {}
+
+        NetworkProxyFactory( const NetworkProxyFactory &other );
+        virtual ~NetworkProxyFactory() {}
+
+        virtual QList< QNetworkProxy > queryProxy( const QNetworkProxyQuery & query = QNetworkProxyQuery() );
+
+        virtual void setNoProxyHosts( const QStringList &hosts );
+        virtual QStringList noProxyHosts() const { return m_noProxyHosts; }
+        virtual void setProxy( const QNetworkProxy &proxy );
+        virtual QNetworkProxy proxy() { return m_proxy; }
+
+        virtual NetworkProxyFactory& operator=( const NetworkProxyFactory &rhs );
+        virtual bool operator==( const NetworkProxyFactory &other ) const;
+
+    private:
+        QStringList m_noProxyHosts;
+        QNetworkProxy m_proxy;
+    };
+
+    DLLEXPORT bool headless();
+    DLLEXPORT void setHeadless( bool headless );
+
+    DLLEXPORT QString appFriendlyVersion();
+
+    DLLEXPORT QDir appConfigDir();
+    DLLEXPORT QDir appDataDir();
+    DLLEXPORT QDir appLogDir();
+
+    DLLEXPORT QString timeToString( int seconds );
+    DLLEXPORT QString ageToString( const QDateTime& time, bool appendAgoString = false );
+    DLLEXPORT QString filesizeToString( unsigned int size );
+    DLLEXPORT QString extensionToMimetype( const QString& extension );
+
+    DLLEXPORT void msleep( unsigned int ms );
+    DLLEXPORT bool newerVersion( const QString& oldVersion, const QString& newVersion );
+    DLLEXPORT int levenshtein( const QString& source, const QString& target );
+
+    DLLEXPORT NetworkProxyFactory* proxyFactory( bool makeClone = false, bool noMutexLocker = false );
+    DLLEXPORT void setProxyFactory( TomahawkUtils::NetworkProxyFactory* factory, bool noMutexLocker = false );
+    DLLEXPORT QNetworkAccessManager* nam();
+    DLLEXPORT void setNam( QNetworkAccessManager* nam, bool noMutexLocker = false );
+    DLLEXPORT quint64 infosystemRequestId();
+
+    DLLEXPORT QString md5( const QByteArray& data );
+    DLLEXPORT bool removeDirectory( const QString& dir );
+
+    DLLEXPORT bool verifyFile( const QString& filePath, const QString& signature );
+    DLLEXPORT QString extractScriptPayload( const QString& filename, const QString& resolverId );
+    DLLEXPORT bool unzipFileInFolder( const QString& zipFileName, const QDir& folder );
+
+    // Extracting may be asynchronous, pass in a receiver object with the following slots:
+    //  extractSucceeded( const QString& path ) and extractFailed() to be notified/
+    DLLEXPORT void extractBinaryResolver( const QString& zipFilename, QObject* receiver );
+
+    // Used by the above, not exported
+    void copyWithAuthentication( const QString& srcFile, const QDir dest, QObject* receiver );
+
+    /**
+     * This helper is designed to help "update" an existing playlist with a newer revision of itself.
+     * To avoid re-loading the whole playlist and re-resolving tracks that are the same in the old playlist,
+     * it goes through the new playlist and adds only new tracks.
+     *
+     * The new list of tracks is returned
+     *
+     * \return true if some changes were made, false if the new tracks are the same as the current tracks in \param orig
+     */
+    DLLEXPORT QList< Tomahawk::query_ptr > mergePlaylistChanges( const QList< Tomahawk::query_ptr >& orig, const QList< Tomahawk::query_ptr >& newTracks, bool& changed );
+
+    DLLEXPORT void crash();
+}
+
+#endif // TOMAHAWKUTILS_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/TomahawkUtilsGui.cpp Added

@@ -0,0 +1,531 @@
+/* === 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
+ *   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 "TomahawkUtilsGui.h"
+
+#include "config.h"
+#include "Query.h"
+#include "Result.h"
+#include "Logger.h"
+#include "PlayableItem.h"
+#include "Source.h"
+
+#include <QtGui/QLayout>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPalette>
+#include <QtGui/QApplication>
+#include <QtGui/QScrollBar>
+#include <QtGui/QWidget>
+#include <QStyleOption>
+#include <QDesktopServices>
+
+#ifdef Q_WS_X11
+    #include <QtGui/QX11Info>
+    #include <libqnetwm/netwm.h>
+#endif
+
+#ifdef Q_WS_WIN
+    #include <windows.h>
+    #include <windowsx.h>
+    #include <shellapi.h>
+#endif
+
+
+namespace TomahawkUtils
+{
+static int s_headerHeight = 0;
+
+
+QPixmap
+createDragPixmap( MediaType type, int itemCount )
+{
+    // If more than one item is dragged, align the items inside a
+    // rectangular grid. The maximum grid size is limited to 5 x 5 items.
+    int xCount = 3;
+    int size = 32;
+
+    if ( itemCount > 16 )
+    {
+        xCount = 5;
+        size = 16;
+    }
+    else if( itemCount > 9 )
+    {
+        xCount = 4;
+        size = 22;
+    }
+
+    if ( itemCount < xCount )
+    {
+        xCount = itemCount;
+    }
+
+    int yCount = itemCount / xCount;
+    if ( itemCount % xCount != 0 )
+    {
+        ++yCount;
+    }
+    if ( yCount > xCount )
+    {
+        yCount = xCount;
+    }
+    // Draw the selected items into the grid cells
+    QPixmap dragPixmap( xCount * size + xCount - 1, yCount * size + yCount - 1 );
+    dragPixmap.fill( Qt::transparent );
+
+    QPainter painter( &dragPixmap );
+    painter.setRenderHint( QPainter::Antialiasing );
+
+    QPixmap pixmap;
+    switch ( type )
+    {
+        case MediaTypeArtist:
+            pixmap = QPixmap( ":/data/images/artist-icon.png" ).scaledToWidth( size, Qt::SmoothTransformation );
+            break;
+        case MediaTypeAlbum:
+            pixmap = QPixmap( ":/data/images/album-icon.png" ).scaledToWidth( size, Qt::SmoothTransformation );
+            break;
+        case MediaTypeTrack:
+            pixmap = QPixmap( QString( ":/data/images/track-icon-%2x%2.png" ).arg( size ) );
+            break;
+    }
+
+    int x = 0;
+    int y = 0;
+    for ( int i = 0; i < itemCount; ++i )
+    {
+
+        painter.drawPixmap( x, y, pixmap );
+
+        x += size + 1;
+        if ( x >= dragPixmap.width() )
+        {
+            x = 0;
+            y += size + 1;
+        }
+        if ( y >= dragPixmap.height() )
+        {
+            break;
+        }
+    }
+
+    return dragPixmap;
+}
+
+
+void
+drawShadowText( QPainter* painter, const QRect& rect, const QString& text, const QTextOption& textOption )
+{
+    painter->save();
+
+    painter->drawText( rect, text, textOption );
+
+/*    QFont font = painter->font();
+    font.setPixelSize( font.pixelSize() + 2 );
+    painter->setFont( font );
+
+    painter->setPen( Qt::black );
+    painter->drawText( rect, text, textOption );*/
+
+    painter->restore();
+}
+
+
+void
+drawBackgroundAndNumbers( QPainter* painter, const QString& text, const QRect& figRectIn )
+{
+    painter->save();
+
+    QRect figRect = figRectIn;
+    if ( text.length() == 1 )
+        figRect.adjust( -painter->fontMetrics().averageCharWidth(), 0, 0, 0 );
+
+    QPen origpen = painter->pen();
+    QPen pen = origpen;
+    pen.setWidth( 1.0 );
+    painter->setPen( pen );
+    painter->drawRect( figRect );
+
+    // circles look bad. make it an oval. (thanks, apple)
+    const int bulgeWidth = 8;
+    const int offset = 0; // number of pixels to begin, counting inwards from figRect.x() and figRect.width(). 0 means start at each end, negative means start inside the rect.
+
+    QPainterPath ppath;
+    ppath.moveTo( QPoint( figRect.x() + offset, figRect.y() + figRect.height() / 2 ) );
+    QRect leftArcRect( figRect.x() + offset - bulgeWidth, figRect.y(), 2*bulgeWidth, figRect.height() );
+    ppath.arcTo( leftArcRect, 90, 180 );
+    painter->drawPath( ppath );
+
+    ppath = QPainterPath();
+    ppath.moveTo( figRect.x() + figRect.width() - offset, figRect.y() + figRect.height() / 2 );
+    leftArcRect = QRect( figRect.x() + figRect.width() - offset - bulgeWidth, figRect.y(), 2*bulgeWidth, figRect.height() );
+    ppath.arcTo( leftArcRect, 270, 180 );
+    painter->drawPath( ppath );
+
+    figRect.adjust( -1, 0, 0, 0 );
+
+    painter->setPen( origpen );
+    painter->setPen( Qt::white );
+    painter->drawText( figRect.adjusted( -5, 0, 6, 0 ), text, QTextOption( Qt::AlignCenter ) );
+
+    painter->restore();
+}
+
+
+void
+drawQueryBackground( QPainter* p, const QPalette& palette, const QRect& r, qreal lightnessFactor )
+{
+    p->setPen( palette.highlight().color().lighter( lightnessFactor * 100 ) );
+    p->setBrush( palette.highlight().color().lighter( lightnessFactor * 100 ) );
+    p->drawRoundedRect( r, 4.0, 4.0 );
+}
+
+
+void
+unmarginLayout( QLayout* layout )
+{
+    layout->setContentsMargins( 0, 0, 0, 0 );
+    layout->setMargin( 0 );
+    layout->setSpacing( 0 );
+
+    for ( int i = 0; i < layout->count(); i++ )
+    {
+        QLayout* childLayout = layout->itemAt( i )->layout();
+        if ( childLayout )
+            unmarginLayout( childLayout );
+    }
+}
+
+
+QWidget*
+tomahawkWindow()
+{
+    QWidgetList widgetList = qApp->topLevelWidgets();
+    int i = 0;
+    while( i < widgetList.count() && widgetList.at( i )->objectName() != "TH_Main_Window" )
+        i++;
+
+    if ( i == widgetList.count() )
+    {
+        qDebug() << Q_FUNC_INFO << "could not find main Tomahawk mainwindow";
+        Q_ASSERT( false );
+        return 0;
+    }
+
+    QWidget *widget = widgetList.at( i );
+    return widget;
+}
+
+
+#ifndef Q_WS_MAC
+void
+bringToFront()
+{
+#if defined(Q_WS_X11)
+    {
+        qDebug() << Q_FUNC_INFO;
+
+        QWidget* widget = tomahawkWindow();
+        if ( !widget )
+            return;
+
+        widget->show();
+        widget->activateWindow();
+        widget->raise();
+
+        WId wid = widget->winId();
+        NETWM::init();
+
+        XEvent e;
+        e.xclient.type = ClientMessage;
+        e.xclient.message_type = NETWM::NET_ACTIVE_WINDOW;
+        e.xclient.display = QX11Info::display();
+        e.xclient.window = wid;
+        e.xclient.format = 32;
+        e.xclient.data.l0 = 2;
+        e.xclient.data.l1 = QX11Info::appTime();
+        e.xclient.data.l2 = 0;
+        e.xclient.data.l3 = 0l;
+        e.xclient.data.l4 = 0l;
+
+        XSendEvent( QX11Info::display(), RootWindow( QX11Info::display(), DefaultScreen( QX11Info::display() ) ), False, SubstructureRedirectMask | SubstructureNotifyMask, &e );
+    }
+#elif defined(Q_WS_WIN)
+    {
+        qDebug() << Q_FUNC_INFO;
+
+        QWidget* widget = tomahawkWindow();
+        if ( !widget )
+            return;
+
+        widget->show();
+        widget->activateWindow();
+        widget->raise();
+
+        WId wid = widget->winId();
+
+        HWND hwndActiveWin = GetForegroundWindow();
+        int  idActive      = GetWindowThreadProcessId(hwndActiveWin, NULL);
+        if ( AttachThreadInput(GetCurrentThreadId(), idActive, TRUE) )
+        {
+            SetForegroundWindow( wid );
+            SetFocus( wid );
+            AttachThreadInput(GetCurrentThreadId(), idActive, FALSE);
+        }
+    }
+#endif
+}
+#endif
+
+
+void
+openUrl( const QUrl& url )
+{
+#ifdef Q_OS_WIN
+    ShellExecuteW( 0, 0, (LPCWSTR)url.toString().utf16(), 0, 0, SW_SHOWNORMAL );
+#else
+    QDesktopServices::openUrl( url );
+#endif
+}
+
+
+QPixmap
+createAvatarFrame( const QPixmap &avatar )
+{
+    QPixmap frame( ":/data/images/avatar_frame.png" );
+    QPixmap scaledAvatar = avatar.scaled( frame.height() * 75 / 100, frame.width() * 75 / 100, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+
+    QPainter painter( &frame );
+    painter.drawPixmap( ( frame.height() - scaledAvatar.height() ) / 2, ( frame.width() - scaledAvatar.width() ) / 2, scaledAvatar );
+
+    return frame;
+}
+
+
+int
+headerHeight()
+{
+    return s_headerHeight;
+}
+
+
+void
+setHeaderHeight( int height )
+{
+    s_headerHeight = height;
+}
+
+
+QColor
+alphaBlend( const QColor& colorFrom, const QColor& colorTo, float opacity )
+{
+    opacity = qMax( (float)0.3, opacity );
+    int r = colorFrom.red(), g = colorFrom.green(), b = colorFrom.blue();
+    r = opacity * r + ( 1 - opacity ) * colorTo.red();
+    g = opacity * g + ( 1 - opacity ) * colorTo.green();
+    b = opacity * b + ( 1 - opacity ) * colorTo.blue();
+
+    return QColor( r, g, b );
+}
+
+
+QPixmap
+defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
+{
+    QPixmap pixmap;
+    QHash< int, QPixmap > subsubcache;
+    QHash< int, QHash< int, QPixmap > > subcache;
+    static QHash< int, QHash< int, QHash< int, QPixmap > > > cache;
+
+    if ( cache.contains( type ) )
+    {
+        subcache = cache.value( type );
+
+        if ( subcache.contains( mode ) )
+        {
+            subsubcache = subcache.value( mode );
+
+            if ( subsubcache.contains( size.width() ) )
+                return subsubcache.value( size.width() );
+        }
+    }
+
+    switch ( type )
+    {
+        case DefaultAlbumCover:
+            if ( mode == CoverInCase )
+                pixmap = QPixmap( RESPATH "images/no-album-art-placeholder.png" );
+            else if ( mode == Grid )
+                pixmap = QPixmap( RESPATH "images/album-placeholder-grid.png" );
+            else
+                pixmap = QPixmap( RESPATH "images/no-album-no-case.png" );
+            break;
+
+        case DefaultArtistImage:
+            if ( mode == Grid )
+                pixmap = QPixmap( RESPATH "images/artist-placeholder-grid.png" );
+            else
+                pixmap = QPixmap( RESPATH "images/no-artist-image-placeholder.png" );
+            break;
+
+        case DefaultTrackImage:
+                pixmap = QPixmap( RESPATH "images/track-placeholder.png" );
+            break;
+
+        case DefaultSourceAvatar:
+            if ( mode == AvatarInFrame )
+                pixmap = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/user-avatar.png" ) );
+            else
+                pixmap = QPixmap( RESPATH "images/user-avatar.png" );
+            break;
+
+        case NowPlayingSpeaker:
+            pixmap = QPixmap( RESPATH "images/now-playing-speaker.png" );
+            break;
+
+        case InfoIcon:
+            pixmap = QPixmap( RESPATH "images/info.png" );
+
+        default:
+            break;
+    }
+
+    if ( pixmap.isNull() )
+    {
+        Q_ASSERT( false );
+        return QPixmap();
+    }
+
+    if ( !size.isNull() )
+        pixmap = pixmap.scaled( size, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+
+    subsubcache.insert( size.width(), pixmap );
+    subcache.insert( mode, subsubcache );
+    cache.insert( type, subcache );
+
+    return pixmap;
+}
+
+
+void
+prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, PlayableItem* item )
+{
+    Q_UNUSED( index );
+
+    if ( item->isPlaying() )
+    {
+        option->palette.setColor( QPalette::Highlight, option->palette.color( QPalette::Mid ) );
+
+        option->backgroundBrush = option->palette.color( QPalette::Mid );
+        option->palette.setColor( QPalette::Text, option->palette.color( QPalette::Text ) );
+
+    }
+
+    if ( option->state & QStyle::State_Selected && !item->isPlaying() )
+    {
+        option->palette.setColor( QPalette::Text, option->palette.color( QPalette::HighlightedText ) );
+    }
+    else
+    {
+        float opacity = 0.0;
+        if ( !item->query()->results().isEmpty() )
+            opacity = item->query()->results().first()->score();
+
+        opacity = qMax( (float)0.3, opacity );
+        QColor textColor = alphaBlend( option->palette.color( QPalette::Text ), option->palette.color( QPalette::BrightText ), opacity );
+
+        option->palette.setColor( QPalette::Text, textColor );
+    }
+}
+
+
+void
+drawRoundedButton( QPainter* painter, const QRect& btnRect, const QColor& color, const QColor &gradient1bottom, const QColor& gradient2top, const QColor& gradient2bottom )
+{
+    QPainterPath btnPath;
+    const int radius = 3;
+    // draw top half gradient
+    const int btnCenter = btnRect.bottom() - ( btnRect.height() / 2 );
+    btnPath.moveTo( btnRect.left(), btnCenter );
+    btnPath.lineTo( btnRect.left(), btnRect.top() + radius );
+    btnPath.quadTo( QPoint( btnRect.topLeft() ), QPoint( btnRect.left() + radius, btnRect.top() ) );
+    btnPath.lineTo( btnRect.right() - radius, btnRect.top() );
+    btnPath.quadTo( QPoint( btnRect.topRight() ), QPoint( btnRect.right(), btnRect.top() + radius ) );
+    btnPath.lineTo( btnRect.right(),btnCenter );
+    btnPath.lineTo( btnRect.left(), btnCenter );
+
+    QLinearGradient g;
+    if ( gradient1bottom.isValid() )
+    {
+        g.setColorAt( 0, color );
+        g.setColorAt( 0.5, gradient1bottom );
+        painter->fillPath( btnPath, g );
+    }
+    else
+        painter->fillPath( btnPath, color );
+    //painter->setPen( bg.darker() );
+
+    //painter->drawPath( btnPath );
+
+    btnPath = QPainterPath();
+    btnPath.moveTo( btnRect.left(), btnCenter );
+    btnPath.lineTo( btnRect.left(), btnRect.bottom() - radius );
+    btnPath.quadTo( QPoint( btnRect.bottomLeft() ), QPoint( btnRect.left() + radius, btnRect.bottom() ) );
+    btnPath.lineTo( btnRect.right() - radius, btnRect.bottom() );
+    btnPath.quadTo( QPoint( btnRect.bottomRight() ), QPoint( btnRect.right(), btnRect.bottom() - radius ) );
+    btnPath.lineTo( btnRect.right(), btnCenter );
+    btnPath.lineTo( btnRect.left(), btnCenter );
+
+    if ( gradient2top.isValid() && gradient2bottom.isValid() )
+    {
+        g.setColorAt( 0, gradient2top );
+        g.setColorAt( 0.5, gradient2bottom );
+        painter->fillPath( btnPath, g );
+    }
+    else
+        painter->fillPath( btnPath, color );
+
+}
+
+
+void
+styleScrollBar( QScrollBar* scrollBar )
+{
+    scrollBar->setStyleSheet(
+        "QScrollBar:horizontal { background-color: transparent; }"
+        "QScrollBar::handle:horizontal { border-height: 9px; margin-bottom: 6px;"
+            "border-image: url(" RESPATH "images/scrollbar-horizontal-handle.png) 3 3 3 3 stretch stretch;"
+            "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }"
+        "QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { width: 0px; height: 0px; background: none; }"
+        "QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { width: 0px; height: 0px; background: none; }"
+        "QScrollBar:left-arrow:horizontal, QScrollBar::right-arrow:horizontal {"
+            "border: 0px; width: 0px; height: 0px; background: none; background-color: transparent; }"
+
+        "QScrollBar:vertical { background-color: transparent; }"
+        "QScrollBar::handle:vertical { border-width: 9px; margin-right: 6px;"
+            "border-image: url(" RESPATH "images/scrollbar-vertical-handle.png) 3 3 3 3 stretch stretch;"
+            "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }"
+        "QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { width: 0px; height: 0px; background: none; }"
+        "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { width: 0px; height: 0px; background: none; }"
+        "QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical {"
+            "border: 0px; width: 0px; height: 0px; background: none; background-color: transparent; }" );
+}
+
+} // ns

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/TomahawkUtilsGui.h Added

@@ -0,0 +1,72 @@
+/* === 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
+ *   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 TOMAHAWKUTILSGUI_H
+#define TOMAHAWKUTILSGUI_H
+
+#include <QSize>
+#include <QModelIndex>
+#include <QColor>
+#include <QRect>
+#include <QTextOption>
+
+#include "TomahawkUtils.h"
+#include "DllMacro.h"
+
+class PlayableItem;
+class QStyleOptionViewItemV4;
+class QPainter;
+class QPixmap;
+class QLayout;
+class QPalette;
+class QRect;
+class QScrollBar;
+
+namespace TomahawkUtils
+{
+    DLLEXPORT void drawQueryBackground( QPainter* p, const QPalette& palette, const QRect& r, qreal lightnessFactor = 1 );
+    DLLEXPORT QWidget* tomahawkWindow();
+    /// Platform-specific bringing tomahawk mainwindow to front, b/c qt's activate() and such don't seem to work well enough for us
+    DLLEXPORT void bringToFront();
+
+    DLLEXPORT void openUrl( const QUrl& url );
+
+    DLLEXPORT QPixmap createAvatarFrame( const QPixmap &avatar );
+
+    DLLEXPORT QColor alphaBlend( const QColor& colorFrom, const QColor& colorTo, float opacity );
+    DLLEXPORT QPixmap createDragPixmap( MediaType type, int itemCount = 1 );
+
+    DLLEXPORT void drawShadowText( QPainter* p, const QRect& rect, const QString& text, const QTextOption& textOption );
+    DLLEXPORT void drawBackgroundAndNumbers( QPainter* p, const QString& text, const QRect& rect );
+
+    DLLEXPORT void unmarginLayout( QLayout* layout );
+
+    DLLEXPORT int headerHeight();
+    DLLEXPORT void setHeaderHeight( int height );
+
+    DLLEXPORT QPixmap defaultPixmap( ImageType type, ImageMode mode = TomahawkUtils::Original, const QSize& size = QSize( 0, 0 ) );
+
+    DLLEXPORT void prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, PlayableItem* item );
+
+    DLLEXPORT void drawRoundedButton( QPainter* painter, const QRect& btnRect, const QColor& color, const QColor &gradient1bottom = QColor(), const QColor& gradient2top = QColor(), const QColor& gradient2bottom = QColor() );
+
+    DLLEXPORT void styleScrollBar( QScrollBar* scrollBar );
+}
+
+#endif // TOMAHAWKUTILSGUI_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/TomahawkUtils_Mac.h Added

@@ -0,0 +1,37 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, 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 TOMAHAWKUTILS_MAC_H
+#define TOMAHAWKUTILS_MAC_H
+
+#include <QObject>
+
+#import <Foundation/Foundation.h>
+
+@interface MoveDelegate : NSObject
+{
+    QObject* receiver;
+    QString path;
+}
+- (void)setReceiver:(QObject*)receiver;
+- (void)setMoveTo:(QString)path;
+- (void)moveFinished;
+- (void)moveFailedWithError:(NSError *)error;
+@end
+
+#endif // TOMAHAWKUTILS_MAC_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/TomahawkUtils_Mac.mm Added

@@ -0,0 +1,111 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, 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 "mac/FileHelpers.h"
+
+#import <AppKit/NSApplication.h>
+#import <Foundation/Foundation.h>
+
+#include "TomahawkUtils.h"
+#include "TomahawkUtils_Mac.h"
+
+#include <QDir>
+#include <QTemporaryFile>
+
+@implementation MoveDelegate
+
+
+-(void) setReceiver:(QObject*) object
+{
+    receiver = object;
+}
+
+-(void) setMoveTo:(QString) p
+{
+    path = p;
+}
+
+- (void)moveFinished
+{
+    // HACK since I can't figure out how to get QuaZip to maintain executable permissions after unzip (nor find the info)
+    // we set the binary to executable here
+
+    NSLog(@"Move succeeded!, handling result");
+
+    NSFileManager *manager = NSFileManager alloc init autorelease;
+    NSError* error;
+    NSDictionary* attrs = NSDictionary dictionaryWithObjectsAndKeys:NSNumber numberWithInt:0755, NSFilePosixPermissions, nil;
+
+    NSString* target = NSString alloc initWithBytes:path.toUtf8() length:path.length() encoding: NSUTF8StringEncoding;
+    NSLog(@"Changing permissions to executable for: %@", target);
+    BOOL success = manager setAttributes:attrs ofItemAtPath:target error:&error;
+    if (!success) {
+        NSLog( @"Failed to do chmod +x of moved resolver! %@", error userInfo objectForKey: NSLocalizedDescriptionKey );
+    }
+
+    if ( receiver )
+        QMetaObject::invokeMethod(receiver, "installSucceeded", Qt::DirectConnection, Q_ARG(QString, path));
+
+    target release;
+
+}
+
+- (void)moveFailedWithError:(NSError *)error
+{
+    NSLog(@"Move failed, handling result");
+    if ( receiver )
+        QMetaObject::invokeMethod(receiver, "installFailed", Qt::DirectConnection);
+}
+@end
+
+namespace TomahawkUtils
+{
+
+void
+bringToFront() {
+    NSApp activateIgnoringOtherApps:YES;
+}
+
+void
+copyWithAuthentication( const QString& srcFile, const QDir dest, QObject* receiver )
+{
+  /**
+    On OS X, we have to do the following:
+    1) Authenticate to be able to have write access to the /Applications folder
+    2) Copy file to dest
+    5) Call result slots on receiver object
+  */
+
+    MoveDelegate* del = MoveDelegate alloc init;
+    del setReceiver: receiver;
+
+    // Get the filename + path to save for later
+    QFileInfo srcInfo( srcFile );
+    const QString resultingPath = dest.absoluteFilePath( srcInfo.fileName() );
+    del setMoveTo: resultingPath;
+
+    const QFileInfo info( srcFile );
+    const QString destPath = dest.absoluteFilePath( info.fileName() );
+
+    NSString* src = NSString alloc initWithBytes: srcFile.toUtf8() length: srcFile.length() encoding: NSUTF8StringEncoding;
+    NSString* destStr = NSString alloc initWithBytes: destPath.toUtf8() length: destPath.length() encoding: NSUTF8StringEncoding;
+    FileHelpers moveFile:src to:destStr withDelegate:del;
+}
+
+
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/WidgetDragFilter.cpp Added

@@ -0,0 +1,123 @@
+/* === 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
+ *   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 "WidgetDragFilter.h"
+
+#include <QMouseEvent>
+#include <QApplication>
+#include <QMenuBar>
+
+#include "utils/Logger.h"
+
+
+WidgetDragFilter::WidgetDragFilter( QObject* parent )
+    : QObject( parent )
+    , m_dragStarted( false )
+{
+    Q_ASSERT( parent->isWidgetType() );
+    m_target = QWeakPointer<QWidget>(static_cast<QWidget*>(parent));
+    m_target.data()->installEventFilter( this );
+}
+
+
+bool
+WidgetDragFilter::eventFilter( QObject* obj, QEvent* event )
+{
+    if ( m_target.isNull() || m_target.data() != obj )
+        return false;
+
+    if ( event->type() == QEvent::MouseButtonPress )
+    {
+        QMouseEvent *mouseEvent = static_cast<QMouseEvent*>( event );
+        if ( !canDrag( obj, mouseEvent ) )
+            return false;
+        if ( !( mouseEvent->modifiers() == Qt::NoModifier && mouseEvent->button() == Qt::LeftButton ) )
+            return false;
+
+        m_dragPoint = mouseEvent->pos();
+        m_dragStarted = true;
+        return false;
+    }
+    else if ( event->type() == QEvent::MouseMove )
+    {
+        if ( !m_dragStarted )
+            return false;
+
+        QMouseEvent* e = static_cast<QMouseEvent* >(event);
+        if ( !canDrag( obj, e ) )
+        {
+            m_dragStarted = false;
+            return false;
+        }
+
+        if ( e->buttons().testFlag( Qt::LeftButton ) )
+        {
+            m_target.data()->window()->move( m_target.data()->window()->pos() + ( e->pos() - m_dragPoint ) );
+            return true;
+        }
+    }
+    else if ( event->type() == QEvent::MouseButtonRelease )
+        m_dragStarted = false;
+
+    return false;
+}
+
+
+/**
+ * Make sure we can really drag this widget. Checks inspired by Oxygen's oxygenwindowmanager.cpp
+ */
+bool
+WidgetDragFilter::canDrag( QObject* obj, QMouseEvent* ev ) const
+{
+    if ( !obj->isWidgetType() )
+        return false;
+
+    QWidget* w = static_cast< QWidget* >( obj );
+
+    if ( QWidget::mouseGrabber() )
+        return false;
+
+    if ( w->cursor().shape() != Qt::ArrowCursor )
+        return false;
+
+    // Now we check various things about the child position and mouse
+    QPoint position( ev->pos() );
+    QWidget* child = w->childAt( position );
+
+    if ( child && child->cursor().shape() != Qt::ArrowCursor )
+        return false;
+
+    // Don't want to drag menubars when selecting an action
+    if ( QMenuBar* menuBar = qobject_cast<QMenuBar*>( w ) )
+    {
+        // check if there is an active action
+        if ( menuBar->activeAction() && menuBar->activeAction()->isEnabled() )
+            return false;
+
+        // check if action at position exists and is enabled
+        if ( QAction* action = menuBar->actionAt( position ) )
+        {
+            if ( action->isSeparator() )
+                return true;
+            if ( action->isEnabled() )
+                return false;
+        }
+    }
+
+    return true;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/WidgetDragFilter.h Added

@@ -0,0 +1,50 @@
+/* === 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
+ *   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 WIDGET_DRAG_FILTER_H
+#define WIDGET_DRAG_FILTER_H
+
+#include <QObject>
+#include <QPoint>
+#include <QWidget>
+
+#include "DllMacro.h"
+
+class QMouseEvent;
+class QEvent;
+
+/**
+ * This class encapsulates an event filter on a widget that lets any drag events over the widget
+ *  translate into move events for the whole application.
+ */
+class DLLEXPORT WidgetDragFilter : public QObject
+{
+    Q_OBJECT
+public:
+    explicit WidgetDragFilter(QObject* parent = 0);  
+
+    virtual bool eventFilter(QObject* , QEvent* );
+private:
+    bool canDrag( QObject* obj, QMouseEvent* ev ) const;
+    
+    QWeakPointer<QWidget> m_target; // in case it's deleted under us
+    QPoint m_dragPoint;
+    bool m_dragStarted;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/XspfGenerator.cpp Added

@@ -0,0 +1,77 @@
+/*
+    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
+
+    This program 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+#include "XspfGenerator.h"
+
+#include <QXmlStreamWriter>
+#include <QDateTime>
+#include <QTimer>
+
+#include "Playlist.h"
+#include "Query.h"
+#include "utils/Logger.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+
+
+XSPFGenerator::XSPFGenerator( const playlist_ptr& pl, QObject* parent )
+    : QObject( parent )
+    , m_playlist( pl )
+{
+     QTimer::singleShot( 0, this, SLOT( generate() ) );
+}
+
+
+XSPFGenerator::~XSPFGenerator()
+{
+}
+
+
+void
+XSPFGenerator::generate()
+{
+    Q_ASSERT( !m_playlist.isNull() );
+
+    QByteArray xspf;
+    QXmlStreamWriter w( &xspf );
+    w.setAutoFormatting( true );
+    w.writeStartDocument();
+
+    w.writeStartElement( "playlist" );
+    w.writeAttribute( "version", "1" );
+    w.writeAttribute( "xmlns", "http://xspf.org/ns/0/" );
+
+    w.writeTextElement( "title", m_playlist->title() );
+    w.writeTextElement( "creator", m_playlist->creator() );
+    w.writeTextElement( "date", QDateTime::fromTime_t( m_playlist->createdOn() ).toString( Qt::ISODate ) );
+
+    w.writeStartElement( "trackList" );
+    foreach ( const plentry_ptr& q, m_playlist->entries() )
+    {
+        w.writeStartElement( "track" );
+        w.writeTextElement( "title", q->query()->track() );
+        w.writeTextElement( "creator", q->query()->artist() );
+        w.writeTextElement( "album", q->query()->album() );
+        w.writeEndElement();
+    }
+    w.writeEndDocument(); // will close all open elements
+
+    emit generated( xspf );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/XspfGenerator.h Added

@@ -0,0 +1,45 @@
+/*
+    Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
+
+    This program 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+#ifndef XSPFGENERATOR_H
+#define XSPFGENERATOR_H
+
+#include "Typedefs.h"
+
+#include <QtCore/qobject.h>
+
+
+class XSPFGenerator : public QObject
+{
+    Q_OBJECT
+public:
+    explicit XSPFGenerator( const Tomahawk::playlist_ptr& pl, QObject* parent = 0 );
+    virtual ~XSPFGenerator();
+
+signals:
+    void generated( const QByteArray& xspf );
+
+private slots:
+    void generate();
+
+private:
+    Tomahawk::playlist_ptr m_playlist;
+};
+
+#endif // XSPFGENERATOR_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/XspfLoader.cpp Added

@@ -0,0 +1,288 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011-2012, Leo Franchi            <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "XspfLoader.h"
+
+#include "HeadlessCheck.h"
+
+#include <QDomDocument>
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+#ifndef ENABLE_HEADLESS
+#include "jobview/JobStatusView.h"
+#include "jobview/JobStatusModel.h"
+#include "jobview/ErrorStatusMessage.h"
+#endif
+
+#include "SourceList.h"
+#include "Playlist.h"
+#include <XspfUpdater.h>
+#include <Pipeline.h>
+
+using namespace Tomahawk;
+
+
+QString
+XSPFLoader::errorToString( XSPFErrorCode error )
+{
+    switch ( error )
+    {
+    case ParseError:
+        return tr( "Failed to parse contents of XSPF playlist" );
+    case InvalidTrackError:
+        return tr( "Some playlist entries were found without artist and track name, they will be omitted");
+    case FetchError:
+        return tr( "Failed to fetch the desired playlist from the network, or the desired file does not exist" );
+    default:
+        return QString();
+    }
+}
+
+
+XSPFLoader::XSPFLoader( bool autoCreate, bool autoUpdate, QObject* parent )
+    : QObject( parent )
+    , m_autoCreate( autoCreate )
+    , m_autoUpdate( autoUpdate )
+    , m_autoResolve( true )
+    , m_autoDelete( true )
+    , m_NS("http://xspf.org/ns/0/")
+{
+    qRegisterMetaType< XSPFErrorCode >("XSPFErrorCode");
+}
+
+
+XSPFLoader::~XSPFLoader()
+{
+}
+
+
+void
+XSPFLoader::setOverrideTitle( const QString& newTitle )
+{
+    m_overrideTitle = newTitle;
+}
+
+
+QList< Tomahawk::query_ptr >
+XSPFLoader::entries() const
+{
+    return m_entries;
+}
+
+
+void
+XSPFLoader::load( const QUrl& url )
+{
+    QNetworkRequest request( url );
+    m_url = url;
+
+    Q_ASSERT( TomahawkUtils::nam() != 0 );
+    QNetworkReply* reply = TomahawkUtils::nam()->get( request );
+
+    connect( reply, SIGNAL( finished() ),
+                      SLOT( networkLoadFinished() ) );
+
+    connect( reply, SIGNAL( error( QNetworkReply::NetworkError ) ),
+                      SLOT( networkError( QNetworkReply::NetworkError ) ) );
+}
+
+
+void
+XSPFLoader::load( QFile& file )
+{
+    if ( file.open( QFile::ReadOnly ) )
+    {
+        m_body = file.readAll();
+        gotBody();
+    }
+    else
+    {
+        reportError();
+    }
+}
+
+
+void
+XSPFLoader::reportError()
+{
+    emit error( FetchError );
+#ifndef ENABLE_HEADLESS
+    const QString errorMsg = errorToString( FetchError);
+    if ( !m_errorTitle.isEmpty() )
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( QString( "%1: %2" ).arg( m_errorTitle ).arg( errorMsg ) ) );
+    else
+        JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( errorMsg ) );
+#endif
+    deleteLater();
+}
+
+
+void
+XSPFLoader::networkLoadFinished()
+{
+    QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
+    if ( reply->error() != QNetworkReply::NoError )
+        return;
+
+    m_body = reply->readAll();
+    gotBody();
+}
+
+
+void
+XSPFLoader::networkError( QNetworkReply::NetworkError /* error */ )
+{
+    reportError();
+}
+
+
+void
+XSPFLoader::gotBody()
+{
+    QDomDocument xmldoc;
+    bool namespaceProcessing = true;
+    xmldoc.setContent( m_body, namespaceProcessing );
+    QDomElement docElement( xmldoc.documentElement() );
+
+    QString origTitle;
+    QDomNodeList tracklist;
+    QDomElement n = docElement.firstChildElement();
+    for ( ; !n.isNull(); n = n.nextSiblingElement() )
+    {
+        if ( n.namespaceURI() == m_NS && n.localName() == "title" )
+        {
+            origTitle = n.text();
+        }
+        else if ( n.namespaceURI() == m_NS && n.localName() == "creator" )
+        {
+            m_creator = n.text();
+        }
+        else if ( n.namespaceURI() == m_NS && n.localName() == "info" )
+        {
+            m_info = n.text();
+        }
+        else if ( n.namespaceURI() == m_NS && n.localName() == "trackList" )
+        {
+            tracklist = n.childNodes();
+        }
+    }
+
+    m_title = origTitle;
+    if ( m_title.isEmpty() )
+        m_title = tr( "New Playlist" );
+    if ( !m_overrideTitle.isEmpty() )
+        m_title = m_overrideTitle;
+
+    bool shownError = false;
+    for ( unsigned int i = 0; i < tracklist.length(); i++ )
+    {
+        QDomNode e = tracklist.at( i );
+
+        QString artist, album, track, duration, annotation, url;
+        QDomElement n = e.firstChildElement();
+        for ( ; !n.isNull(); n = n.nextSiblingElement() )
+        {
+            if ( n.namespaceURI() == m_NS && n.localName() == "duration" )
+            {
+                duration = n.text();
+            }
+            else if ( n.namespaceURI() == m_NS && n.localName() == "annotation" )
+            {
+                annotation = n.text();
+            }
+            else if ( n.namespaceURI() == m_NS && n.localName() == "creator" )
+            {
+                artist = n.text();
+            }
+            else if ( n.namespaceURI() == m_NS && n.localName() == "album" )
+            {
+                album = n.text();
+            }
+            else if ( n.namespaceURI() == m_NS && n.localName() == "title" )
+            {
+                track = n.text();
+            }
+            else if ( n.namespaceURI() == m_NS && n.localName() == "url" )
+            {
+                url = n.text();
+            }
+        }
+
+        if ( artist.isEmpty() || track.isEmpty() )
+        {
+            if ( !shownError )
+            {
+                emit error( InvalidTrackError );
+                shownError = true;
+            }
+            continue;
+        }
+
+        query_ptr q = Tomahawk::Query::get( artist, track, album, uuid(), false );
+        if ( q.isNull() )
+            continue;
+
+        q->setDuration( duration.toInt() / 1000 );
+        if ( !url.isEmpty() )
+            q->setResultHint( url );
+
+        m_entries << q;
+    }
+
+    if ( m_autoResolve )
+    {
+        for ( int i = m_entries.size() - 1; i >= 0; i-- )
+            Pipeline::instance()->resolve( m_entries i  );
+    }
+
+    if ( origTitle.isEmpty() && m_entries.isEmpty() )
+    {
+        emit error( ParseError );
+        if ( m_autoCreate )
+            deleteLater();
+        return;
+    }
+
+    if ( m_autoCreate )
+    {
+        m_playlist = Playlist::create( SourceList::instance()->getLocal(),
+                                       uuid(),
+                                       m_title,
+                                       m_info,
+                                       m_creator,
+                                       false,
+                                       m_entries );
+
+        // 10 minute default---for now, no way to change it
+        new Tomahawk::XspfUpdater( m_playlist, 600000, m_autoUpdate, m_url.toString() );
+        emit ok( m_playlist );
+    }
+    else
+    {
+
+        if( !m_entries.isEmpty() )
+            emit tracks( m_entries );
+    }
+
+    if ( m_autoDelete )
+        deleteLater();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/utils/XspfLoader.h Added

@@ -0,0 +1,84 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011-2012, 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/>.
+ */
+
+/*
+    Fetches and parses an XSPF document from a QFile or QUrl.
+ */
+
+#ifndef XSPFLOADER_H
+#define XSPFLOADER_H
+
+#include <QObject>
+#include <QUrl>
+#include <QFile>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+
+#include "Playlist.h"
+#include "Typedefs.h"
+
+#include "DllMacro.h"
+
+class DLLEXPORT XSPFLoader : public QObject
+{
+Q_OBJECT
+
+public:
+    enum XSPFErrorCode { ParseError, InvalidTrackError, FetchError };
+    explicit XSPFLoader( bool autoCreate = true, bool autoUpdate = false, QObject* parent = 0 );
+
+    virtual ~XSPFLoader();
+    QList< Tomahawk::query_ptr > entries() const;
+
+    void setOverrideTitle( const QString& newTitle );
+    void setAutoResolveTracks( bool autoResolve ) { m_autoResolve = autoResolve; }
+    void setAutoDelete( bool autoDelete ) { m_autoDelete = autoDelete; }
+    void setErrorTitle( const QString& error ) { m_errorTitle = error; }
+
+    static QString errorToString( XSPFErrorCode error );
+
+signals:
+    void error( XSPFLoader::XSPFErrorCode error );
+    void ok( const Tomahawk::playlist_ptr& );
+    void track( const Tomahawk::query_ptr& track );
+    void tracks( const QList< Tomahawk::query_ptr > tracks );
+
+public slots:
+    void load( const QUrl& url );
+    void load( QFile& file );
+
+private slots:
+    void networkLoadFinished();
+    void networkError( QNetworkReply::NetworkError e );
+
+private:
+    void reportError();
+    void gotBody();
+
+    bool m_autoCreate, m_autoUpdate, m_autoResolve, m_autoDelete;
+    QString m_NS,m_overrideTitle;
+    QList< Tomahawk::query_ptr > m_entries;
+    QString m_title, m_info, m_creator, m_errorTitle;
+
+    QUrl m_url;
+    QByteArray m_body;
+    Tomahawk::playlist_ptr m_playlist;
+};
+
+#endif // XSPFLOADER_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/AnimatedCounterLabel.cpp Added

@@ -0,0 +1,106 @@
+/* === 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
+ *   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 "AnimatedCounterLabel.h"
+
+
+AnimatedCounterLabel::AnimatedCounterLabel(QWidget* parent, Qt::WindowFlags f)
+    : QLabel( parent, f )
+    , m_displayed( 0 )
+    , m_val( 0 )
+    , m_oldval( 0 )
+    , m_format( "%L1" )
+{
+    connect( &m_timer, SIGNAL( frameChanged( int ) ), SLOT( frame( int ) ) );
+    connect( &m_timer, SIGNAL( finished() ), SLOT( showDiff() ) );
+}
+
+
+void AnimatedCounterLabel::setFormat(const QString& f)
+{
+    m_format = f;
+    setText( m_format.arg( m_displayed ) );
+}
+
+
+void AnimatedCounterLabel::setVisible(bool b)
+{
+    QLabel::setVisible( b );
+    if ( !m_diff.isNull() )
+        m_diff.data()->setVisible( b );
+}
+
+
+void AnimatedCounterLabel::frame(int f)
+{
+    m_displayed = f;
+    QLabel::setText( m_format.arg( m_displayed ) );
+    QLabel::update();
+}
+
+
+void AnimatedCounterLabel::setVal(unsigned int v)
+{
+    if( v == m_val )
+        return;
+
+    m_oldval = m_val;
+    m_val = v;
+    m_timer.stop();
+    unsigned int dur = 1000;
+    unsigned int r = abs( v - m_oldval );
+
+    if( r > 1000 )        dur = 1500;
+    else if( r > 10000 )  dur = 2000;
+    else if( r > 25000 )  dur = 2250;
+    else if( r > 50000 )  dur = 2750;
+    else if( r > 100000 ) dur = 3000;
+    else if( r > 500000 ) dur = 5000;
+
+    m_timer.setDuration( dur );
+    m_timer.setFrameRange( m_displayed, v );
+    m_timer.setEasingCurve( QEasingCurve( QEasingCurve::OutCubic ) );
+    m_timer.start();
+}
+
+
+void AnimatedCounterLabel::showDiff()
+{
+    int differ = m_val - m_oldval;
+    m_diff = new QLabel( QString("%1 %L2" ).arg( differ > 0 ? "+" : "" )
+    .arg( (int)m_val - (int)m_oldval ),
+                                 this->parentWidget() );
+
+    m_diff.data()->setStyleSheet( "font-size:9px; color:grey;" );
+    m_diff.data()->move( QPoint( this->pos().x(), this->pos().y() ) );
+    QPropertyAnimation* a = new QPropertyAnimation( m_diff.data(), "pos" );
+    a->setEasingCurve( QEasingCurve( QEasingCurve::InQuad ) );
+    a->setStartValue( m_diff.data()->pos() + QPoint( 0, -10 ) );
+    a->setEndValue( QPoint( m_diff.data()->pos().x(), m_diff.data()->pos().y() - 25 ) );
+    a->setDuration( 1000 );
+    //        qDebug() << "ANIMATING DIFF:" << a->startValue() << a->endValue();
+
+    connect( a, SIGNAL( finished() ), m_diff.data(), SLOT( hide() ) );
+    connect( a, SIGNAL( finished() ), m_diff.data(), SLOT( deleteLater() ) );
+    connect( a, SIGNAL( finished() ), a, SLOT( deleteLater() ) );
+
+    m_diff.data()->show();
+    m_diff.data()->setVisible( this->isVisible() );
+    a->start();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/AnimatedCounterLabel.h Added

@@ -0,0 +1,58 @@
+/* === 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
+ *   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 ANIMATEDCOUNTERLABEL_H
+#define ANIMATEDCOUNTERLABEL_H
+
+#include <QLabel>
+#include <QTimeLine>
+#include <QPropertyAnimation>
+#include <QEasingCurve>
+#include <cmath>
+
+#include "DllMacro.h"
+
+class DLLEXPORT AnimatedCounterLabel : public QLabel
+{
+Q_OBJECT
+
+public:
+    explicit AnimatedCounterLabel( QWidget* parent = 0, Qt::WindowFlags f = 0 );
+
+    void setFormat( const QString& f );
+
+public slots:
+    void setVisible( bool b );
+    void frame( int f );
+    void setVal( unsigned int v );
+    void showDiff();
+
+private:
+    QTimeLine m_timer;
+
+    // what's in the label text:
+    unsigned int m_displayed;
+
+    // current value we are storing (and displaying, or animating towards displaying)
+    unsigned int m_val, m_oldval;
+
+    QString m_format;
+    QWeakPointer<QLabel> m_diff;
+};
+
+#endif // ANIMATEDCOUNTERLABEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/AnimatedSplitter.cpp Added

@@ -0,0 +1,306 @@
+/* === 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
+ *   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 "AnimatedSplitter.h"
+
+#include "utils/Logger.h"
+
+#define ANIMATION_TIME 400
+
+
+AnimatedSplitter::AnimatedSplitter( QWidget* parent )
+    : QSplitter( parent )
+    , m_greedyIndex( 0 )
+{
+    setHandleWidth( 1 );
+}
+
+
+void
+AnimatedSplitter::show( int index, bool animate )
+{
+    QWidget* w = widget( index );
+    emit shown( w, animate );
+}
+
+
+void
+AnimatedSplitter::hide( int index, bool animate )
+{
+    QWidget* w = widget( index );
+    emit hidden( w, animate );
+}
+
+
+void
+AnimatedSplitter::addWidget( QWidget* widget )
+{
+    QSplitter::addWidget( widget );
+}
+
+
+void
+AnimatedSplitter::addWidget( AnimatedWidget* widget )
+{
+    QSplitter::addWidget( widget );
+
+    connect( widget, SIGNAL( showWidget() ), SLOT( onShowRequest() ) );
+    connect( widget, SIGNAL( hideWidget() ), SLOT( onHideRequest() ) );
+    connect( widget, SIGNAL( sizeHintChanged( QSize ) ), SLOT( onShowRequest() ) );
+    connect( widget, SIGNAL( sizeChanged( QSize ) ), SLOT( onSizeChanged( QSize ) ) );
+    connect( widget, SIGNAL( resizeBy( QPoint ) ), SLOT( onResizeRequest( QPoint ) ) );
+
+    connect( this, SIGNAL( shown( QWidget*, bool ) ), widget, SLOT( onShown( QWidget*, bool ) ) );
+    connect( this, SIGNAL( hidden( QWidget*, bool ) ), widget, SLOT( onHidden( QWidget*, bool ) ) );
+}
+
+
+void
+AnimatedSplitter::changeSize( QWidget* child, const QSize& size )
+{
+    int wi = indexOf( child );
+
+    QList< int > sizes;
+    for ( int i = 0; i < count(); i ++ )
+    {
+        int j = 0;
+
+        if ( i == m_greedyIndex )
+        {
+            j = height() - size.height();
+            for ( int x = 0; x < count(); x++ )
+            {
+                if ( x != i && x != wi )
+                    j -= widget( x )->height();
+            }
+        }
+        else if ( i == wi )
+        {
+            j = size.height();
+        }
+        else
+        {
+            j = widget( i )->height();
+        }
+
+        sizes << j;
+    }
+
+    setSizes( sizes );
+}
+
+
+void
+AnimatedSplitter::onResizeRequest( const QPoint& delta )
+{
+    AnimatedWidget* w = (AnimatedWidget*)(sender());
+    if ( indexOf( w ) > 0 )
+    {
+        int newheight = w->height() + delta.y();
+        if ( newheight <= w->hiddenSize().height() )
+        {
+            w->hide();
+        }
+        else
+            changeSize( w, QSize( w->width(), newheight ) );
+    }
+    else
+        Q_ASSERT( false );
+}
+
+
+void
+AnimatedSplitter::onShowRequest()
+{
+    AnimatedWidget* w = (AnimatedWidget*)(sender());
+    if ( indexOf( w ) > 0 )
+        show( indexOf( w ) );
+    else
+        Q_ASSERT( false );
+}
+
+
+void
+AnimatedSplitter::onHideRequest()
+{
+    AnimatedWidget* w = (AnimatedWidget*)(sender());
+    if ( indexOf( w ) > 0 )
+        hide( indexOf( w ) );
+    else
+        Q_ASSERT( false );
+}
+
+
+void
+AnimatedSplitter::onSizeChanged( const QSize& size )
+{
+    AnimatedWidget* w = (AnimatedWidget*)(sender());
+    if ( indexOf( w ) > 0 )
+        changeSize( w, size );
+    else
+        Q_ASSERT( false );
+}
+
+
+void
+AnimatedSplitter::setGreedyWidget( int index )
+{
+    if( !widget( index ) )
+        return;
+
+    m_greedyIndex = index;
+
+    QSizePolicy policy = widget( m_greedyIndex )->sizePolicy();
+    if( orientation() == Qt::Horizontal )
+        policy.setHorizontalStretch( 1 );
+    else
+        policy.setVerticalStretch( 1 );
+
+    widget( m_greedyIndex )->setSizePolicy( policy );
+
+}
+
+
+QSplitterHandle*
+AnimatedSplitter::createHandle()
+{
+    return new AnimatedSplitterHandle( orientation(), this );
+}
+
+
+AnimatedWidget::AnimatedWidget( AnimatedSplitter* parent )
+    : m_parent( parent )
+    , m_isHidden( false )
+{
+    m_timeLine = new QTimeLine( ANIMATION_TIME, this );
+    m_timeLine->setUpdateInterval( 20 );
+    m_timeLine->setEasingCurve( QEasingCurve::OutCubic );
+
+    connect( m_timeLine, SIGNAL( frameChanged( int ) ), SLOT( onAnimationStep( int ) ) );
+    connect( m_timeLine, SIGNAL( finished() ), SLOT( onAnimationFinished() ) );
+}
+
+
+AnimatedWidget::~AnimatedWidget()
+{
+}
+
+
+void
+AnimatedWidget::onShown( QWidget* widget, bool animated )
+{
+    if ( widget != this )
+        return;
+
+    m_animateForward = true;
+    if ( animated )
+    {
+        if ( m_timeLine->state() == QTimeLine::Running )
+            m_timeLine->stop();
+
+        m_timeLine->setFrameRange( height(), sizeHint().height() );
+        m_timeLine->setDirection( QTimeLine::Forward );
+        m_timeLine->start();
+    }
+    else
+    {
+        onAnimationStep( sizeHint().height() );
+        onAnimationFinished();
+    }
+
+    m_isHidden = false;
+}
+
+
+void
+AnimatedWidget::onHidden( QWidget* widget, bool animated )
+{
+    if ( widget != this )
+        return;
+
+    m_animateForward = false;
+    int minHeight = hiddenSize().height();
+
+    if ( animated )
+    {
+        if ( m_timeLine->state() == QTimeLine::Running )
+            m_timeLine->stop();
+
+        m_timeLine->setFrameRange( minHeight, height() );
+        m_timeLine->setDirection( QTimeLine::Backward );
+        m_timeLine->start();
+    }
+    else
+    {
+        onAnimationStep( minHeight );
+        onAnimationFinished();
+    }
+
+    m_isHidden = true;
+}
+
+
+void
+AnimatedWidget::onAnimationStep( int frame )
+{
+    setFixedHeight( frame );
+
+    QSize s( 0, frame ); //FIXME
+    emit sizeChanged( s );
+}
+
+
+void
+AnimatedWidget::onAnimationFinished()
+{
+    if ( m_animateForward )
+    {
+        setMinimumHeight( hiddenSize().height() );
+        setMaximumHeight( QWIDGETSIZE_MAX );
+    }
+    else
+    {
+        setFixedHeight( hiddenSize().height() );
+    }
+    
+    emit animationFinished();
+}
+
+
+QSize
+AnimatedSplitterHandle::sizeHint() const
+{
+    // Re-calculate our position if the items in the splitter changed, or if we haven't calculated it yet
+    if ( m_indexInSplitter == -1 || m_lastCount != splitter()->count() )
+    {
+        for ( int i = 0; i < splitter()->count(); i++ )
+        {
+            if ( splitter()->handle( i ) == this )
+            {
+                m_indexInSplitter = i;
+            }
+        }
+        m_lastCount = splitter()->count();
+    }
+
+    // sizeHint is 0,0 if widget below handle has size 0 or is hidden
+    if ( splitter()->widget( m_indexInSplitter )->height() == 0 )
+        return QSize( 0, 0 );
+    else
+        return QSize( 1, 1 );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/AnimatedSplitter.h Added

@@ -0,0 +1,130 @@
+/* === 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
+ *   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 ANIMATEDSPLITTER_H
+#define ANIMATEDSPLITTER_H
+
+#include <QSplitter>
+#include <QTimeLine>
+
+#include "DllMacro.h"
+
+class AnimatedWidget;
+
+class DLLEXPORT AnimatedSplitter : public QSplitter
+{
+Q_OBJECT
+
+public:
+    explicit AnimatedSplitter( QWidget* parent = 0 );
+
+    void show( int index, bool animate = true );
+    void hide( int index, bool animate = true );
+
+    void setGreedyWidget( int index );
+
+    void addWidget( QWidget* widget );
+    void addWidget( AnimatedWidget* widget );
+
+signals:
+    void shown( QWidget*, bool animated );
+    void hidden( QWidget*, bool animated );
+
+protected:
+    virtual QSplitterHandle* createHandle();
+
+private slots:
+    void changeSize( QWidget* child, const QSize& size );
+    
+    void onShowRequest();
+    void onHideRequest();
+
+    void onSizeChanged( const QSize& size );
+    void onResizeRequest( const QPoint& delta );
+    
+private:
+    int m_greedyIndex;
+};
+
+
+class DLLEXPORT AnimatedSplitterHandle : public QSplitterHandle
+{
+Q_OBJECT
+public:
+    explicit AnimatedSplitterHandle( Qt::Orientation orientation, QSplitter* parent )
+        : QSplitterHandle( orientation, parent )
+        , m_indexInSplitter( -1 )
+        , m_lastCount( -1 )
+    {
+        setCursor( Qt::ArrowCursor );
+    }
+
+    virtual QSize sizeHint() const;
+
+private:
+    mutable int m_indexInSplitter;
+    mutable int m_lastCount;
+};
+
+
+class DLLEXPORT AnimatedWidget : public QWidget
+{
+Q_OBJECT
+public:
+    explicit AnimatedWidget( AnimatedSplitter* parent );
+    virtual ~AnimatedWidget();
+
+    QSize hiddenSize() const { return m_hiddenSize; }
+    void setHiddenSize( const QSize& size ) { m_hiddenSize = size; emit hiddenSizeChanged(); }
+
+    bool isHidden() const { return m_isHidden; }
+
+public slots:
+    virtual void onShown( QWidget*, bool animated );
+    virtual void onHidden( QWidget*, bool animated );
+
+    virtual void hide() { emit hideWidget(); }
+    virtual void show() { emit showWidget(); }
+
+signals:
+    void showWidget();
+    void hideWidget();
+    
+    void animationFinished();
+
+    void resizeBy( const QPoint& delta );
+    void sizeChanged( const QSize& size );
+    void sizeHintChanged( const QSize& size );
+    void hiddenSizeChanged();
+
+private slots:
+    void onAnimationStep( int frame );
+    void onAnimationFinished();
+
+protected:
+    AnimatedSplitter* splitter() { return m_parent; }
+
+private:
+    AnimatedSplitter* m_parent;
+    bool m_animateForward;
+    QSize m_hiddenSize;
+    bool m_isHidden;
+    QTimeLine* m_timeLine;
+};
+
+#endif //ANIMATEDSPLITTER_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/Breadcrumb.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/Breadcrumb.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/BreadcrumbButton.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/BreadcrumbButton.cpp Changed

@@ -20,10 +20,10 @@
 #include "BreadcrumbButton.h"
 
 #include "Breadcrumb.h"
-#include "combobox.h"
-#include "utils/stylehelper.h"
-#include "utils/tomahawkutilsgui.h"
-#include "utils/logger.h"
+#include "ComboBox.h"
+#include "utils/StyleHelper.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
 
 #include <QPaintEvent>
 #include <QPainter>
@@ -31,21 +31,71 @@
 
 using namespace Tomahawk;
 
+class BreadcrumbArrow : public QWidget
+{
+public:
+    BreadcrumbArrow( QWidget* parent )
+        : QWidget(parent)
+    {
+        setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
+    }
+
+protected:
+    virtual void paintEvent( QPaintEvent* ) {
+        QPainter p( this );
+        QStyleOption opt;
+        opt.initFrom( this );
+        QRect r = rect();
+
+        const bool reverse = opt.direction == Qt::RightToLeft;
+        const int menuButtonWidth = 12;
+        const int rightSpacing = 10;
+        const int right = !reverse ? r.right() - rightSpacing : r.left() + menuButtonWidth;
+        const int height = r.height();
+
+        QLine l1( 1, 0, right, height / 2 );
+        QLine l2( 1, height, right, height / 2 );
+
+        p.setRenderHint( QPainter::Antialiasing, true );
+
+        // Draw the shadow
+        QColor shadow( 0, 0, 0, 100 );
+        p.translate( 0, 1 );
+        p.setPen( shadow );
+        p.drawLine( l1 );
+        p.drawLine( l2 );
+
+        // Draw the main arrow
+        QColor foreGround( "#747474" );
+        p.translate( 0, -1 );
+        p.setPen( foreGround );
+        p.drawLine( l1 );
+        p.drawLine( l2 );
+    }
+    virtual QSize sizeHint() const {
+        return QSize( 20, TomahawkUtils::headerHeight() );
+
+    }
+
+};
+
 BreadcrumbButton::BreadcrumbButton( Breadcrumb* parent, QAbstractItemModel* model )
     : QWidget( parent )
     , m_breadcrumb( parent )
     , m_model( model )
     , m_combo( new ComboBox( this ) )
+    , m_arrow( new BreadcrumbArrow( this ) )
 {
     setLayout( new QHBoxLayout );
-    layout()->setContentsMargins( 0, 0, 0, 0 );
-    layout()->setSpacing( 0 );
+
+    TomahawkUtils::unmarginLayout( layout() );
     layout()->addWidget( m_combo );
+    layout()->addWidget( m_arrow );
 
     setFixedHeight( TomahawkUtils::headerHeight() );
     m_combo->setSizeAdjustPolicy( QComboBox::AdjustToContents );
 
-    setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding );
+    setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Expanding );
 
     connect( m_combo, SIGNAL( activated( int ) ), SLOT( comboboxActivated( int ) ) );
 }
@@ -55,44 +105,9 @@
 BreadcrumbButton::paintEvent( QPaintEvent* )
 {
     QPainter p( this );
-    QStyleOption opt;
-    opt.initFrom( this );
-    QRect r = rect();
-
-    StyleHelper::horizontalHeader( &p, r ); // draw the background
-
-    if ( !hasChildren() )
-        return;
-
-    bool reverse = opt.direction == Qt::RightToLeft;
-    int menuButtonWidth = 12;
-    int rightSpacing = 10;
-    int left = !reverse ? r.right() - rightSpacing - menuButtonWidth : r.left();
-    int right = !reverse ? r.right() - rightSpacing : r.left() + menuButtonWidth;
-    int height = r.height();
-    QRect arrowRect( ( left + right ) / 2 + ( reverse ? 6 : -6 ), 0, height, height );
-
-    QStyleOption arrowOpt = opt;
-    arrowOpt.rect = arrowRect;
-
-    QLine l1( left, 0, right, height / 2 );
-    QLine l2( left, height, right, height / 2 );
-
-    p.setRenderHint( QPainter::Antialiasing, true );
-
-    // Draw the shadow
-    QColor shadow( 0, 0, 0, 100 );
-    p.translate( 0, -1 );
-    p.setPen( shadow );
-    p.drawLine( l1 );
-    p.drawLine( l2 );
-
-    // Draw the main arrow
-    QColor foreGround( "#747474" );
-    p.translate( 0, 1 );
-    p.setPen( foreGround );
-    p.drawLine( l1 );
-    p.drawLine( l2 );
+
+    StyleHelper::horizontalHeader( &p, rect() ); // draw the background
+    m_arrow->setVisible( hasChildren() );
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/BreadcrumbButton.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/BreadcrumbButton.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/ChartDataLoader.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/ChartDataLoader.cpp Changed

@@ -17,6 +17,8 @@
  */
 #include "ChartDataLoader.h"
 
+#include "Source.h"
+
 using namespace Tomahawk;
 
 
@@ -25,48 +27,52 @@
 {
 }
 
+
 void
 ChartDataLoader::go()
 {
     switch ( m_type )
     {
-    case Track:
-    {
-        QList< query_ptr > track_ptrs;
-        foreach ( const Tomahawk::InfoSystem::InfoStringHash& track, m_data )
+        case Track:
         {
-            track_ptrs << Query::get( track "artist" , track "track" , QString(), uuid(), false );
-        }
+            QList< query_ptr > track_ptrs;
+            foreach ( const Tomahawk::InfoSystem::InfoStringHash& track, m_data )
+            {
+                query_ptr q = Query::get( track "artist" , track "track" , QString(), uuid(), false );
+                if ( q.isNull() )
+                    continue;
 
-        emit tracks( this, track_ptrs );
-        break;
-    }
-    case Artist:
-    {
-        QList< artist_ptr > artist_ptrs;
+                track_ptrs << q;
+            }
 
-        foreach ( const QString& artistname, m_artists )
-        {
-            artist_ptrs << Artist::get( artistname, false );
+            emit tracks( this, track_ptrs );
+            break;
         }
+        case Artist:
+        {
+            QList< artist_ptr > artist_ptrs;
 
-        emit artists( this, artist_ptrs );
-        break;
-    }
-    case Album:
-    {
-        QList< album_ptr > album_ptrs;
+            foreach ( const QString& artistname, m_artists )
+            {
+                artist_ptrs << Artist::get( artistname, false );
+            }
 
-        foreach ( const Tomahawk::InfoSystem::InfoStringHash& album, m_data )
-        {
-            tDebug( LOGVERBOSE) << Q_FUNC_INFO << "Getting album" << album "album"  << "By" << album "artist" ;
-            artist_ptr artistPtr = Artist::get( album "artist" , false );
-            album_ptr albumPtr = Album::get( artistPtr, album "album" , false );
-            album_ptrs << albumPtr;
+            emit artists( this, artist_ptrs );
+            break;
         }
+        case Album:
+        {
+            QList< album_ptr > album_ptrs;
 
-        emit albums( this, album_ptrs );
-        break;
-    }
+            foreach ( const Tomahawk::InfoSystem::InfoStringHash& album, m_data )
+            {
+                artist_ptr artistPtr = Artist::get( album "artist" , false );
+                album_ptr albumPtr = Album::get( artistPtr, album "album" , false );
+                album_ptrs << albumPtr;
+            }
+
+            emit albums( this, album_ptrs );
+            break;
+        }
     }
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/ChartDataLoader.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/ChartDataLoader.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/CheckDirTree.cpp Added

@@ -0,0 +1,397 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 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 "CheckDirTree.h"
+
+#include "utils/Logger.h"
+#include "TomahawkSettings.h"
+#include "Source.h"
+
+#include <QCoreApplication>
+#include <QProcess>
+
+static QString s_macVolumePath = "/Volumes";
+
+CheckDirModel::CheckDirModel( QWidget* parent )
+    : QFileSystemModel( parent )
+    , m_shownVolumes( false )
+{
+#ifdef Q_OS_MAC
+    m_setFilePath = QString( "%1/SetFile" )        .arg( QCoreApplication::applicationDirPath() );
+    m_getFileInfoPath = QString( "%1/GetFileInfo" ).arg( QCoreApplication::applicationDirPath() );
+
+    QProcess* checkVolumeVisible = new QProcess( this );
+    connect( checkVolumeVisible, SIGNAL( readyReadStandardOutput() ), this, SLOT( getFileInfoResult() ) );
+    qDebug() << "Running GetFileInfo:" << m_getFileInfoPath << "-aV" << s_macVolumePath;
+    checkVolumeVisible->start( m_getFileInfoPath, QStringList() <<  "-aV" << s_macVolumePath );
+#endif
+}
+
+CheckDirModel::~CheckDirModel()
+{
+#ifdef Q_OS_MAC
+    // reset to previous state
+    if ( m_shownVolumes )
+        QProcess::startDetached( QString( "%1 -a V %2" ).arg( m_setFilePath).arg( s_macVolumePath ) );
+#endif
+}
+
+void
+CheckDirModel::getFileInfoResult()
+{
+#ifdef Q_OS_MAC
+    QProcess* p = qobject_cast< QProcess* >( sender() );
+    Q_ASSERT( p );
+
+    QByteArray res = p->readAll().trimmed();
+    qDebug() << "Got output from GetFileInfo:" << res;
+    // 1 means /Volumes is hidden, so we show it while the dialog is visible
+    if ( res == "1" )
+    {
+        // Remove the hidden flag for the /Volumnes folder so all mount points are visible in the default (Q)FileSystemModel
+        QProcess* showProcess = new QProcess( this );
+        qDebug() << "Running SetFile:" << QString( "%1 -a v %2" ).arg( m_setFilePath ).arg( s_macVolumePath );
+        showProcess->start( QString( "%1 -a v %2" ).arg( m_setFilePath ).arg( s_macVolumePath ) );
+        connect( showProcess, SIGNAL( readyReadStandardError() ), this, SLOT( processErrorOutput() ) );
+        m_shownVolumes = true;
+
+        QTimer::singleShot( 500, this, SLOT( volumeShowFinished() ) );
+    }
+
+    p->terminate();
+    p->deleteLater();
+#endif
+}
+
+void
+CheckDirModel::volumeShowFinished()
+{
+    reset();
+}
+
+
+void
+CheckDirModel::processErrorOutput()
+{
+    QProcess* p = qobject_cast< QProcess* >( sender() );
+    Q_ASSERT( p );
+    qDebug() << "Got ERROR OUTPUT from subprocess in CheckDirModel:" << p->readAll();
+}
+
+
+Qt::ItemFlags
+CheckDirModel::flags( const QModelIndex& index ) const
+{
+    return QFileSystemModel::flags( index ) | Qt::ItemIsUserCheckable;
+}
+
+
+QVariant
+CheckDirModel::data( const QModelIndex& index, int role ) const
+{
+#ifdef Q_WS_MAC
+    // return the 'My Computer' icon for the /Volumes folder
+    if ( index.column() == 0 && filePath( index ) == s_macVolumePath )
+    {
+        switch ( role )
+        {
+            case Qt::DecorationRole:
+                return myComputer( role );
+            default:
+                break;
+        }
+    }
+#endif
+
+    if ( role == Qt::CheckStateRole )
+    {
+        return m_checkTable.contains( index ) ? m_checkTable.value( index ) : Qt::Unchecked;
+    }
+    else
+    {
+        return QFileSystemModel::data( index, role );
+    }
+}
+
+
+bool
+CheckDirModel::setData( const QModelIndex& index, const QVariant& value, int role )
+{
+    bool b = QFileSystemModel::setData( index, value, role );
+
+    if ( role == Qt::CheckStateRole )
+    {
+        m_checkTable.insert( index, (Qt::CheckState)value.toInt() );
+        emit dataChanged( index, index );
+        emit dataChangedByUser( index );
+    }
+
+    return b;
+}
+
+
+void
+CheckDirModel::setCheck( const QModelIndex& index, const QVariant& value )
+{
+    QFileSystemModel::setData( index, value, Qt::CheckStateRole );
+    m_checkTable.insert( index, (Qt::CheckState)value.toInt() );
+    emit dataChanged( index, index );
+}
+
+
+Qt::CheckState
+CheckDirModel::getCheck( const QModelIndex& index )
+{
+    return (Qt::CheckState)data( index, Qt::CheckStateRole ).toInt();
+}
+
+
+CheckDirTree::CheckDirTree( QWidget* parent )
+    : QTreeView( parent )
+{
+    m_dirModel.setFilter( QDir::Dirs | QDir::NoDotAndDotDot );
+    m_dirModel.setRootPath( "/" );
+
+    m_dirModel.setNameFilters( QStringList() << "^\\.*" );
+
+    setModel( &m_dirModel );
+    setColumnHidden( 1, true );
+    setColumnHidden( 2, true );
+    setColumnHidden( 3, true );
+    //header()->hide();
+
+    connect( &m_dirModel, SIGNAL( dataChangedByUser( QModelIndex ) ),
+                            SLOT( updateNode( QModelIndex ) ) );
+    connect( &m_dirModel, SIGNAL( dataChangedByUser( const QModelIndex& ) ),
+                          SIGNAL( changed() ) );
+    connect( &m_dirModel, SIGNAL( modelReset() ),
+                            SLOT( modelReset() ) );
+
+    connect( this, SIGNAL( collapsed( QModelIndex ) ),
+                     SLOT( onCollapse( QModelIndex ) ) );
+    connect( this, SIGNAL( expanded( QModelIndex ) ),
+                     SLOT( onExpand( QModelIndex ) ) );
+}
+
+
+void
+CheckDirTree::checkPath( const QString& path, Qt::CheckState state )
+{
+    QModelIndex index = m_dirModel.index( path );
+    m_dirModel.setCheck( index, state );
+    updateNode( index );
+}
+
+
+void
+CheckDirTree::setExclusions( const QStringList& list )
+{
+    foreach ( const QString& path, list )
+    {
+        checkPath( path, Qt::Unchecked );
+    }
+}
+
+
+QStringList
+CheckDirTree::getCheckedPaths()
+{
+    QStringList checks;
+    QModelIndex root = rootIndex();
+
+    getChecksForNode( root, checks );
+    return checks;
+}
+
+
+void
+CheckDirTree::getChecksForNode( const QModelIndex& index, QStringList& checks )
+{
+    // Look at first node
+    // Is it checked?
+    //  - move on to next node
+    // Is it unchecked?
+    //  - add to list
+    //  - move to next node
+    // Is it partially checked?
+    //  - recurse
+
+    int numChildren = m_dirModel.rowCount( index );
+    for ( int i = 0; i < numChildren; ++i )
+    {
+        QModelIndex kid = m_dirModel.index( i, 0, index );
+        Qt::CheckState check = m_dirModel.getCheck( kid );
+        if ( check == Qt::Checked )
+        {
+            checks.append( m_dirModel.filePath( kid ) );
+        }
+        else if ( check == Qt::Unchecked )
+        {
+            continue;
+        }
+        else if ( check == Qt::PartiallyChecked )
+        {
+            getChecksForNode( kid, checks );
+        }
+        else
+        {
+            Q_ASSERT( false );
+        }
+    }
+}
+
+
+QStringList
+CheckDirTree::getExclusions()
+{
+    QStringList exclusions;
+    QModelIndex root = rootIndex();
+
+    getExclusionsForNode( root, exclusions );
+    return exclusions;
+}
+
+
+void
+CheckDirTree::getExclusionsForNode( const QModelIndex& index, QStringList& exclusions )
+{
+    // Look at first node
+    // Is it checked?
+    //  - move on to next node
+    // Is it unchecked?
+    //  - add to list
+    //  - move to next node
+    // Is it partially checked?
+    //  - recurse
+
+    int numChildren = m_dirModel.rowCount( index );
+    for ( int i = 0; i < numChildren; ++i )
+    {
+        QModelIndex kid = m_dirModel.index( i, 0, index );
+        Qt::CheckState check = m_dirModel.getCheck( kid );
+        if ( check == Qt::Checked )
+        {
+            continue;
+        }
+        else if ( check == Qt::Unchecked )
+        {
+            exclusions.append( m_dirModel.filePath( kid ) );
+        }
+        else if ( check == Qt::PartiallyChecked )
+        {
+            getExclusionsForNode( kid, exclusions );
+        }
+        else
+        {
+            Q_ASSERT( false );
+        }
+    }
+}
+
+
+void
+CheckDirTree::onCollapse( const QModelIndex& /*idx*/ )
+{
+
+}
+
+
+void
+CheckDirTree::onExpand( const QModelIndex& idx )
+{
+    // If the node is partially checked, that means we have been below it
+    // setting some stuff, so only fill down if we are unchecked.
+    if ( m_dirModel.getCheck( idx ) != Qt::PartiallyChecked )
+    {
+        fillDown( idx );
+    }
+}
+
+
+void
+CheckDirTree::updateNode( const QModelIndex& idx )
+{
+    // Start by recursing down to the bottom and then work upwards
+    fillDown( idx );
+    updateParent( idx );
+}
+
+
+void
+CheckDirTree::modelReset()
+{
+    foreach ( const QString& dir, TomahawkSettings::instance()->scannerPaths() )
+    {
+        checkPath( dir, Qt::Checked );
+    }
+}
+
+
+void
+CheckDirTree::fillDown( const QModelIndex& parent )
+{
+    // Recursion stops when we reach a directory which has never been expanded
+    // or one that has no children.
+    if ( !isExpanded( parent ) || !m_dirModel.hasChildren( parent ) )
+    {
+        return;
+    }
+
+    Qt::CheckState state = m_dirModel.getCheck( parent );
+    int numChildren = m_dirModel.rowCount( parent );
+    for ( int i = 0; i < numChildren; ++i )
+    {
+        QModelIndex kid = m_dirModel.index( i, 0, parent );
+        m_dirModel.setCheck( kid, state );
+        fillDown( kid );
+    }
+}
+
+
+void
+CheckDirTree::updateParent( const QModelIndex& index )
+{
+    QModelIndex parent = index.parent();
+    if ( !parent.isValid() )
+    {
+        // We have reached the root
+        return;
+    }
+
+    // Initialise overall state to state of first child
+    QModelIndex kid = m_dirModel.index( 0, 0, parent );
+    Qt::CheckState overall = m_dirModel.getCheck( kid );
+
+    int numChildren = m_dirModel.rowCount( parent );
+    for ( int i = 1; i <= numChildren; ++i )
+    {
+        kid = m_dirModel.index( i, 0, parent );
+        Qt::CheckState state = m_dirModel.getCheck( kid );
+        if ( state != overall )
+        {
+            // If we ever come across a state different than the first child,
+            // we are partially checked
+            overall = Qt::PartiallyChecked;
+            break;
+        }
+    }
+
+    m_dirModel.setCheck( parent, overall );
+    updateParent( parent );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/CheckDirTree.h Added

@@ -0,0 +1,91 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright      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 CHECKDIRTREE_H
+#define CHECKDIRTREE_H
+
+#include "DllMacro.h"
+
+#include <QFileSystemModel>
+#include <QTreeView>
+
+class DLLEXPORT CheckDirModel : public QFileSystemModel
+{
+    Q_OBJECT
+
+public:
+    CheckDirModel( QWidget* parent = 0 );
+    virtual ~CheckDirModel();
+
+    virtual Qt::ItemFlags flags( const QModelIndex& index ) const;
+    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
+    virtual bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole );
+
+    void setCheck( const QModelIndex& index, const QVariant& value );
+    Qt::CheckState getCheck( const QModelIndex& index );
+
+signals:
+    void dataChangedByUser( const QModelIndex & index );
+
+private slots:
+    void getFileInfoResult();
+    void volumeShowFinished();
+    void processErrorOutput();
+private:
+    QHash<QPersistentModelIndex, Qt::CheckState> m_checkTable;
+
+    bool m_shownVolumes;
+    QString m_setFilePath;
+    QString m_getFileInfoPath;
+};
+
+
+class DLLEXPORT CheckDirTree : public QTreeView
+{
+    Q_OBJECT
+
+public:
+    CheckDirTree( QWidget* parent );
+
+    void checkPath( const QString& path, Qt::CheckState state );
+
+    void setExclusions( const QStringList& list );
+    QStringList getExclusions();
+    QStringList getCheckedPaths();
+
+signals:
+    void changed();
+
+private slots:
+    void onCollapse( const QModelIndex& idx );
+    void onExpand( const QModelIndex& idx );
+    void updateNode( const QModelIndex& idx );
+
+    void modelReset();
+private:
+    CheckDirModel m_dirModel;
+    QSet<qint64> m_expandedSet;
+
+    void fillDown( const QModelIndex& index );
+    void updateParent( const QModelIndex& index );
+    void getExclusionsForNode( const QModelIndex& index, QStringList& exclusions );
+    void getChecksForNode( const QModelIndex& index, QStringList& checks );
+};
+
+#endif // CHECKDIRTREE_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/ComboBox.cpp Added

@@ -0,0 +1,93 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Casey Link <unnamedrambler@gmail.com>
+ *
+ *   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 "ComboBox.h"
+
+#include "utils/StyleHelper.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
+#include <QStyle>
+#include <QTextOption>
+#include <QStylePainter>
+#include <QStyleOptionComboBox>
+
+
+ComboBox::ComboBox( QWidget* parent )
+    : QComboBox( parent )
+{
+}
+
+
+ComboBox::~ComboBox()
+{
+}
+
+
+QSize
+ComboBox::sizeHint() const
+{
+    return QComboBox::sizeHint() + QSize( 8, 0 );
+}
+
+
+void
+ComboBox::paintEvent( QPaintEvent* )
+{
+    QStylePainter p( this );
+    p.setPen( palette().color( QPalette::Text ) );
+    QStyleOptionComboBox cb;
+    initStyleOption( &cb );
+    QRect r = cb.rect;
+    r.setHeight( TomahawkUtils::headerHeight() );
+
+    StyleHelper::horizontalHeader( &p, r );
+
+    if ( cb.state & QStyle::State_MouseOver )
+    {
+        p.save();
+        QRect highlightRect( r );
+        QSize shrink( 3, 4 );
+        QSize hS( highlightRect.size() );
+        hS -= shrink;
+        highlightRect.setSize( hS );
+        highlightRect.translate( 0, 2 );
+        p.setRenderHint( QPainter::Antialiasing );
+        p.setBrush( StyleHelper::headerHighlightColor() );
+        p.drawRoundedRect( highlightRect, 10.0, 10.0 );
+        p.restore();
+    }
+
+    p.save();
+    QTextOption to( Qt::AlignVCenter );
+    r.adjust( 8, 0, -8, 0 );
+    p.setPen( Qt::white );
+    p.setBrush( StyleHelper::headerTextColor() );
+    p.drawText( r, cb.currentText, to );
+
+    bool reverse = cb.direction == Qt::RightToLeft;
+    int menuButtonWidth = 12;
+    int left = !reverse ? r.right() - menuButtonWidth : r.left();
+    int right = !reverse ? r.right() : r.left() + menuButtonWidth;
+    QRect arrowRect( ( left + right ) / 2 + ( reverse ? 6 : -6 ), r.center().y() - 3, 9, 9 ); //FIXME: no consts please
+
+    QStyleOption arrowOpt = cb;
+    arrowOpt.rect = arrowRect;
+    StyleHelper::drawArrow( QStyle::PE_IndicatorArrowDown, &p, &arrowOpt );
+    p.restore();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/ComboBox.h Added

@@ -0,0 +1,45 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Casey Link <unnamedrambler@gmail.com>
+ *
+ *   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 COMBOBOX_H
+#define COMBOBOX_H
+
+#include <QComboBox>
+#include <QPaintEvent>
+
+#include "DllMacro.h"
+
+/**
+ * \class ComboBox
+ * \brief A styled combo box that has a header background.
+ */
+class DLLEXPORT ComboBox : public QComboBox
+{
+Q_OBJECT
+
+public:
+    ComboBox( QWidget* parent = 0 );
+    virtual ~ComboBox();
+
+    virtual QSize sizeHint() const;
+
+protected:
+    virtual void paintEvent( QPaintEvent* );
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/ElidedLabel.cpp Added

@@ -0,0 +1,246 @@
+/* === 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
+ *   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 "ElidedLabel.h"
+
+#include <QEvent>
+#include <QPainter>
+#include <QFontMetrics>
+#include <QApplication>
+#include <QRect>
+#include <QTextLayout>
+
+#include "utils/Logger.h"
+
+
+ElidedLabel::ElidedLabel( QWidget* parent, Qt::WindowFlags flags )
+    : QFrame( parent, flags )
+{
+    init();
+}
+
+
+ElidedLabel::ElidedLabel( const QString& text, QWidget* parent, Qt::WindowFlags flags )
+    : QFrame( parent, flags )
+{
+    init( text );
+}
+
+
+ElidedLabel::~ElidedLabel()
+{
+}
+
+
+QString
+ElidedLabel::text() const
+{
+    return m_text;
+}
+
+
+void
+ElidedLabel::setText( const QString& text )
+{
+    if ( m_text != text )
+    {
+        m_text = text;
+        updateLabel();
+        emit textChanged( text );
+    }
+}
+
+
+Qt::Alignment
+ElidedLabel::alignment() const
+{
+    return m_align;
+}
+
+
+void
+ElidedLabel::setAlignment( Qt::Alignment alignment )
+{
+    if ( m_align != alignment )
+    {
+        m_align = alignment;
+        update(); // no geometry change, repaint is sufficient
+    }
+}
+
+
+Qt::TextElideMode
+ElidedLabel::elideMode() const
+{
+    return m_mode;
+}
+
+
+void
+ElidedLabel::setElideMode( Qt::TextElideMode mode )
+{
+    if ( m_mode != mode )
+    {
+        m_mode = mode;
+        updateLabel();
+    }
+}
+
+
+void
+ElidedLabel::setMargin( int margin )
+{
+    m_margin = margin;
+}
+
+
+int
+ElidedLabel::margin() const
+{
+    return m_margin;
+}
+
+
+void
+ElidedLabel::setFont( const QFont& font )
+{
+    QWidget::setFont( font );
+    updateLabel();
+}
+
+
+void
+ElidedLabel::init( const QString& txt )
+{
+    m_text = txt;
+    m_align = Qt::AlignLeft;
+    m_mode = Qt::ElideMiddle;
+    m_margin = 0;
+    m_multiLine = false;
+
+    setContentsMargins( 0, 0, 0, 0 );
+}
+
+
+void
+ElidedLabel::updateLabel()
+{
+    updateGeometry();
+    update();
+}
+
+
+QSize
+ElidedLabel::sizeHint() const
+{
+    const QFontMetrics& fm = fontMetrics();
+    return QSize( fm.width( m_text ) + m_margin * 2, fm.height() + m_margin * 2 );
+}
+
+
+QSize
+ElidedLabel::minimumSizeHint() const
+{
+    switch ( m_mode )
+    {
+        case Qt::ElideNone:
+            return sizeHint();
+
+        default:
+        {
+            const QFontMetrics& fm = fontMetrics();
+            QSize size( fm.width( "..." ), fm.height() );
+            return size;
+        }
+    }
+}
+
+
+void
+ElidedLabel::paintEvent( QPaintEvent* event )
+{
+    QFrame::paintEvent( event );
+    QPainter p( this );
+    QRect r = contentsRect();
+    r.adjust( m_margin, m_margin, -m_margin, -m_margin );
+
+    if ( m_multiLine )
+    {
+        QTextLayout textLayout( m_text );
+        textLayout.setFont( p.font() );
+        int widthUsed = 0;
+        int lineCount = 0;
+        int lineLimit = r.height() / fontMetrics().height();
+
+        textLayout.beginLayout();
+        while ( ++lineCount < lineLimit )
+        {
+            QTextLine line = textLayout.createLine();
+            if ( !line.isValid() )
+                break;
+
+            line.setLineWidth( r.width() );
+            widthUsed += line.naturalTextWidth();
+        }
+        textLayout.endLayout();
+        widthUsed += r.width();
+
+        const QString elidedText = fontMetrics().elidedText( m_text, Qt::ElideRight, widthUsed );
+        p.drawText( r, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, elidedText );
+    }
+    else
+    {
+        const QString elidedText = fontMetrics().elidedText( m_text, m_mode, r.width() );
+        p.drawText( r, m_align, elidedText );
+    }
+}
+
+
+void
+ElidedLabel::changeEvent( QEvent* event )
+{
+    QFrame::changeEvent( event );
+    switch ( event->type() )
+    {
+        case QEvent::FontChange:
+        case QEvent::ApplicationFontChange:
+            updateLabel();
+            break;
+
+        default:
+            // nothing to do
+            break;
+    }
+}
+
+
+void
+ElidedLabel::mousePressEvent( QMouseEvent* event )
+{
+    QFrame::mousePressEvent( event );
+    m_time.start();
+}
+
+
+void
+ElidedLabel::mouseReleaseEvent( QMouseEvent* event )
+{
+    QFrame::mouseReleaseEvent( event );
+    if ( m_time.elapsed() < qApp->doubleClickInterval() )
+        emit clicked();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/ElidedLabel.h Added

@@ -0,0 +1,81 @@
+/* === 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
+ *   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 ELIDEDLABEL_H
+#define ELIDEDLABEL_H
+
+#include <QFrame>
+#include <QTime>
+
+#include "DllMacro.h"
+
+class DLLEXPORT ElidedLabel : public QFrame
+{
+    Q_OBJECT
+    Q_PROPERTY( QString text READ text WRITE setText NOTIFY textChanged )
+    Q_PROPERTY( Qt::Alignment alignment READ alignment WRITE setAlignment )
+    Q_PROPERTY( Qt::TextElideMode elideMode READ elideMode WRITE setElideMode )
+
+public:
+    explicit ElidedLabel( QWidget* parent = 0, Qt::WindowFlags flags = 0 );
+    explicit ElidedLabel( const QString& text, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
+    virtual ~ElidedLabel();
+
+    QString text() const;
+
+    Qt::Alignment alignment() const;
+    void setAlignment( Qt::Alignment alignment );
+
+    Qt::TextElideMode elideMode() const;
+    void setElideMode( Qt::TextElideMode mode );
+
+    void setFont( const QFont& font );
+
+    void setMargin( int margin );
+    int margin() const;
+
+    virtual QSize sizeHint() const;
+    virtual QSize minimumSizeHint() const;
+
+    void init( const QString& txt = QString() );
+    void updateLabel();
+
+public slots:
+    void setText( const QString& text );
+    void setWordWrap( bool b ) { m_multiLine = b; }
+
+signals:
+    void clicked();
+    void textChanged( const QString& text );
+
+protected:
+    virtual void changeEvent( QEvent* event );
+    virtual void mousePressEvent( QMouseEvent* event );
+    virtual void mouseReleaseEvent( QMouseEvent* event );
+    virtual void paintEvent( QPaintEvent* event );
+
+private:
+    QTime m_time;
+    QString m_text;
+    Qt::Alignment m_align;
+    Qt::TextElideMode m_mode;
+    int m_margin;
+    bool m_multiLine;
+};
+
+#endif // ELIDEDLABEL_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/FadingPixmap.cpp Added

@@ -0,0 +1,149 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011 - 2012, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2012, Jeff Mitchell <jeff@tomahawk-player.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 "FadingPixmap.h"
+
+#include "utils/Logger.h"
+
+#include <QTimer>
+#include <QBuffer>
+#include <QPainter>
+
+#define ANIMATION_TIME 1000
+
+QWeakPointer< TomahawkUtils::SharedTimeLine > FadingPixmap::s_stlInstance = QWeakPointer< TomahawkUtils::SharedTimeLine >();
+
+QWeakPointer< TomahawkUtils::SharedTimeLine >
+FadingPixmap::stlInstance()
+{
+    if ( s_stlInstance.isNull() )
+        s_stlInstance = QWeakPointer< TomahawkUtils::SharedTimeLine> ( new TomahawkUtils::SharedTimeLine() );
+
+    return s_stlInstance;
+}
+
+
+FadingPixmap::FadingPixmap( QWidget* parent )
+    : QLabel( parent )
+    , m_oldPixmap( QPixmap() )
+    , m_fadePct( 100 )
+    , m_startFrame( 0 )
+    , m_isDefault( false )
+{
+//    setCursor( Qt::PointingHandCursor );
+}
+
+
+FadingPixmap::~FadingPixmap()
+{
+}
+
+
+void
+FadingPixmap::onAnimationStep( int frame )
+{
+    m_fadePct = (float)( frame - m_startFrame ) / 10.0;
+    if ( m_fadePct > 100.0 )
+        m_fadePct = 100.0;
+
+    repaint();
+
+    if ( m_fadePct == 100.0 )
+        QTimer::singleShot( 0, this, SLOT( onAnimationFinished() ) );
+}
+
+
+void
+FadingPixmap::onAnimationFinished()
+{
+    tDebug() << Q_FUNC_INFO;
+
+    m_oldPixmap = QPixmap();
+    repaint();
+
+    disconnect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
+
+    if ( m_pixmapQueue.count() )
+        QMetaObject::invokeMethod( this, "setPixmap", Qt::QueuedConnection, Q_ARG( QPixmap, m_pixmapQueue.takeFirst() ), Q_ARG( bool, false ) );
+}
+
+
+void
+FadingPixmap::setPixmap( const QPixmap& pixmap, bool isDefault )
+{
+    if ( !m_oldPixmap.isNull() && !isDefault )
+    {
+        m_pixmapQueue.clear();
+        m_pixmapQueue << pixmap;
+        if ( m_isDefault )
+            QTimer::singleShot( 0, this, SLOT( onAnimationFinished() ) );
+        return;
+    }
+
+    if ( m_isDefault && isDefault )
+        return;
+
+    QByteArray ba;
+    QBuffer buffer( &ba );
+    buffer.open( QIODevice::WriteOnly );
+    pixmap.save( &buffer, "PNG" );
+    QString newImageMd5 = TomahawkUtils::md5( buffer.data() );
+    if ( m_oldImageMd5 == newImageMd5 )
+        return;
+
+    m_oldImageMd5 = newImageMd5;
+    m_oldPixmap = m_pixmap;
+    m_pixmap = pixmap;
+
+    stlInstance().data()->setUpdateInterval( 20 );
+    m_startFrame = stlInstance().data()->currentFrame();
+    m_fadePct = 0;
+    m_isDefault = isDefault;
+    connect( stlInstance().data(), SIGNAL( frameChanged( int ) ), this, SLOT( onAnimationStep( int ) ) );
+}
+
+
+void
+FadingPixmap::mouseReleaseEvent( QMouseEvent* event )
+{
+    QFrame::mouseReleaseEvent( event );
+
+    emit clicked();
+}
+
+
+void
+FadingPixmap::paintEvent( QPaintEvent* event )
+{
+    Q_UNUSED( event );
+
+    QPainter p( this );
+    QRect r = contentsRect();
+
+    p.save();
+    p.setRenderHint( QPainter::Antialiasing );
+
+    p.setOpacity( float( 100.0 - m_fadePct ) / 100.0 );
+    p.drawPixmap( r, m_oldPixmap );
+
+    p.setOpacity( float( m_fadePct ) / 100.0 );
+    p.drawPixmap( r, m_pixmap );
+
+    p.restore();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/FadingPixmap.h Added

@@ -0,0 +1,76 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011 - 2012, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2012, Jeff Mitchell <jeff@tomahawk-player.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 FADINGPIXMAP_H
+#define FADINGPIXMAP_H
+
+#include "utils/SharedTimeLine.h"
+#include "utils/TomahawkUtils.h"
+
+#include <QLabel>
+#include <QPaintEvent>
+#include <QTimeLine>
+#include <QWeakPointer>
+
+#include "DllMacro.h"
+
+/**
+ * \class FadingPixmap
+ * \brief Fades to the new image when calling setPixmap.
+ */
+class DLLEXPORT FadingPixmap : public QLabel
+{
+Q_OBJECT
+
+    static QWeakPointer< TomahawkUtils::SharedTimeLine > stlInstance();
+
+public:
+    FadingPixmap( QWidget* parent = 0 );
+    virtual ~FadingPixmap();
+
+public slots:
+    virtual void setPixmap( const QPixmap& pixmap, bool isDefault );
+    void onAnimationStep( int frame );
+
+signals:
+    void clicked();
+
+protected:
+    virtual void paintEvent( QPaintEvent* );
+    void mouseReleaseEvent( QMouseEvent* event );
+
+private slots:
+    void onAnimationFinished();
+
+private:
+    QPixmap m_pixmap;
+    QPixmap m_oldPixmap;
+
+    QString m_oldImageMd5;
+    
+    QList<QPixmap> m_pixmapQueue;
+    
+    int m_fadePct;
+    int m_startFrame;
+    bool m_isDefault;
+
+    static QWeakPointer< TomahawkUtils::SharedTimeLine > s_stlInstance;
+};
+
+#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/HeaderLabel.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/HeaderLabel.cpp Changed

@@ -20,17 +20,20 @@
 
 #include <QApplication>
 #include <QPainter>
+#include <QMouseEvent>
 
-#include "utils/logger.h"
-#include "utils/stylehelper.h"
-#include "utils/tomahawkutilsgui.h"
-
+#include "utils/Logger.h"
+#include "utils/StyleHelper.h"
+#include "utils/TomahawkUtilsGui.h"
 
 static const int s_defaultFontSize = 12;
 
+
 HeaderLabel::HeaderLabel( QWidget* parent )
     : QLabel( parent )
     , m_parent( parent )
+    , m_pressed( false )
+    , m_moved( false )
 {
     QFont f( font() );
     f.setBold( true );
@@ -38,6 +41,7 @@
 
     setFont( f );
     setFixedHeight( TomahawkUtils::headerHeight() );
+    setMouseTracking( true );
 }
 
 
@@ -52,6 +56,7 @@
     return QLabel::sizeHint();
 }
 
+
 int
 HeaderLabel::defaultFontSize()
 {
@@ -63,7 +68,14 @@
 HeaderLabel::mousePressEvent( QMouseEvent* event )
 {
     QFrame::mousePressEvent( event );
-    m_time.start();
+    
+    if ( !m_moved )
+    {
+        m_time.start();
+        
+        m_pressed = true;
+        m_dragPoint = event->pos();
+    }
 }
 
 
@@ -71,8 +83,27 @@
 HeaderLabel::mouseReleaseEvent( QMouseEvent* event )
 {
     QFrame::mouseReleaseEvent( event );
-    if ( m_time.elapsed() < qApp->doubleClickInterval() )
+
+    if ( !m_moved && m_time.elapsed() < qApp->doubleClickInterval() )
         emit clicked();
+
+    m_pressed = false;
+    m_moved = false;
+}
+
+
+void
+HeaderLabel::mouseMoveEvent( QMouseEvent* event )
+{
+    if ( m_pressed )
+    {
+        QPoint delta = m_dragPoint - event->pos();
+        if ( abs( delta.y() ) > 3 )
+        {
+            m_moved = true;
+            emit resized( delta );
+        }
+    }
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/HeaderLabel.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/HeaderLabel.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/HeaderWidget.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/HeaderWidget.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/HeaderWidget.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/HeaderWidget.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/ImageButton.cpp Added

@@ -0,0 +1,108 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "ImageButton.h"
+
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QLayout>
+#include <QtGui/QPixmap>
+#include <QtGui/QIcon>
+#include <QtCore/QString>
+
+#include "utils/Logger.h"
+
+
+ImageButton::ImageButton( QWidget* parent )
+    : QAbstractButton( parent )
+{
+}
+
+
+ImageButton::ImageButton( const QPixmap& rest, QWidget* parent )
+    : QAbstractButton( parent )
+{
+    init( rest );
+}
+
+
+ImageButton::ImageButton( const QString& path, QWidget* parent )
+    : QAbstractButton( parent )
+{
+    init( QPixmap( path ) );
+}
+
+
+void
+ImageButton::init( const QPixmap& p )
+{
+    setPixmap( p, QIcon::Off );
+    m_sizeHint = p.size();
+    updateGeometry();
+}
+
+
+void
+ImageButton::setPixmap( const QString& path )
+{
+    init( QPixmap( path ) );
+}
+
+
+void
+ImageButton::setPixmap( const QPixmap& pixmap )
+{
+    init( pixmap );
+}
+
+
+void
+ImageButton::paintEvent( QPaintEvent* event )
+{
+    QPainter p( this );
+    p.setClipRect( event->rect() );
+
+    QIcon::Mode mode = isDown()
+        ? QIcon::Active
+        : isEnabled()
+            ? QIcon::Normal
+            : QIcon::Disabled;
+
+    QIcon::State state = isChecked()
+        ? QIcon::On
+        : QIcon::Off;
+
+    icon().paint( &p, rect(), Qt::AlignCenter, mode, state );
+}
+
+
+void
+ImageButton::setPixmap( const QString& path, const QIcon::State state, const QIcon::Mode mode )
+{
+    setPixmap( QPixmap( path ), state, mode );
+}
+
+
+void
+ImageButton::setPixmap( const QPixmap& p, const QIcon::State state, const QIcon::Mode mode )
+{
+    QIcon i = icon();
+    i.addPixmap( p, mode, state );
+    setIcon( i );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/ImageButton.h Added

@@ -0,0 +1,56 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ * 
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 IMAGE_BUTTON_H
+#define IMAGE_BUTTON_H
+
+#include <QtGui/QAbstractButton>
+#include <QtGui/QIcon>
+#include <QtCore/QMap>
+
+#include "DllMacro.h"
+
+class DLLEXPORT ImageButton : public QAbstractButton
+{
+Q_OBJECT
+
+public:
+    /** this pixmap becomes the rest state pixmap and defines the size of the eventual widget */
+    explicit ImageButton( QWidget* parent = 0 );
+    explicit ImageButton( const QPixmap& pixmap, QWidget* parent = 0 );
+    explicit ImageButton( const QString& path, QWidget* parent = 0 );
+    
+    void setPixmap( const QString& path );
+    void setPixmap( const QPixmap& pixmap );
+
+    void setPixmap( const QString&, const QIcon::State, QIcon::Mode = QIcon::Normal );
+    void setPixmap( const QPixmap&, const QIcon::State, QIcon::Mode = QIcon::Normal );
+    
+    virtual QSize sizeHint() const { return m_sizeHint; }
+    
+protected:
+    virtual void paintEvent( QPaintEvent* event );
+    
+private:
+    void init( const QPixmap& );
+
+    QSize m_sizeHint;
+};
+
+#endif //IMAGE_BUTTON_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/NewPlaylistWidget.cpp Added

@@ -0,0 +1,151 @@
+/* === 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
+ *   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 "NewPlaylistWidget.h"
+#include "ui_NewPlaylistWidget.h"
+
+#include <QPushButton>
+#include <QDialogButtonBox>
+
+#include "SourceList.h"
+#include "ViewManager.h"
+#include "playlist/PlaylistModel.h"
+#include "widgets/OverlayWidget.h"
+
+#include "utils/XspfLoader.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+
+#define FILTER_TIMEOUT 280
+
+
+NewPlaylistWidget::NewPlaylistWidget( QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::NewPlaylistWidget )
+{
+    ui->setupUi( this );
+
+    m_saveButton = new QPushButton( tr( "&Create Playlist" ) );
+    m_saveButton->setDefault( true );
+    m_saveButton->setEnabled( false );
+
+    ui->buttonBox->addButton( m_saveButton, QDialogButtonBox::AcceptRole );
+
+    connect( ui->titleEdit, SIGNAL( textChanged( QString ) ), SLOT( onTitleChanged( QString ) ) );
+    connect( ui->tagEdit, SIGNAL( textChanged( QString ) ), SLOT( onTagChanged() ) );
+    connect( ui->buttonBox, SIGNAL( accepted() ), SLOT( savePlaylist() ) );
+    connect( ui->buttonBox, SIGNAL( rejected() ), SLOT( cancel() ) );
+
+    m_suggestionsModel = new PlaylistModel( ui->suggestionsView );
+    ui->suggestionsView->setPlaylistModel( m_suggestionsModel );
+    ui->suggestionsView->overlay()->setEnabled( false );
+
+    connect( &m_filterTimer, SIGNAL( timeout() ), SLOT( updateSuggestions() ) );
+
+    ui->titleEdit->setFocus();
+}
+
+
+NewPlaylistWidget::~NewPlaylistWidget()
+{
+    delete ui;
+}
+
+
+void
+NewPlaylistWidget::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+NewPlaylistWidget::onTitleChanged( const QString& title )
+{
+    m_saveButton->setEnabled( !title.isEmpty() );
+}
+
+
+void
+NewPlaylistWidget::onTagChanged()
+{
+    m_tag = ui->tagEdit->text();
+
+    m_filterTimer.stop();
+    m_filterTimer.setInterval( FILTER_TIMEOUT );
+    m_filterTimer.setSingleShot( true );
+    m_filterTimer.start();
+}
+
+
+void
+NewPlaylistWidget::updateSuggestions()
+{
+    QUrl url( QString( "http://ws.audioscrobbler.com/1.0/tag/%1/toptracks.xspf" ).arg( m_tag ) );
+
+    XSPFLoader* loader = new XSPFLoader( false );
+    connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( suggestionsFound() ) );
+
+    loader->load( url );
+}
+
+
+void
+NewPlaylistWidget::suggestionsFound()
+{
+    XSPFLoader* loader = qobject_cast<XSPFLoader*>( sender() );
+
+    m_queries = loader->entries();
+
+    delete m_suggestionsModel;
+    m_suggestionsModel = new PlaylistModel( ui->suggestionsView );
+    ui->suggestionsView->setPlaylistModel( m_suggestionsModel );
+
+    m_suggestionsModel->appendQueries( m_queries );
+
+    loader->deleteLater();
+}
+
+
+void
+NewPlaylistWidget::savePlaylist()
+{
+    Tomahawk::playlist_ptr playlist;
+
+    playlist = Tomahawk::Playlist::create( SourceList::instance()->getLocal(), uuid(), ui->titleEdit->text(), "", "", false, m_queries );
+
+    ViewManager::instance()->show( playlist );
+    cancel();
+}
+
+
+void
+NewPlaylistWidget::cancel()
+{
+    // will be deleted by viewmanager
+    emit destroyed( this );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/NewPlaylistWidget.h Added

@@ -0,0 +1,84 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 NEWPLAYLISTWIDGET_H
+#define NEWPLAYLISTWIDGET_H
+
+#include <QtGui/QWidget>
+#include <QtCore/QTimer>
+
+#include "PlaylistInterface.h"
+#include "ViewPage.h"
+
+#include "DllMacro.h"
+
+class QPushButton;
+class PlaylistModel;
+
+namespace Ui
+{
+    class NewPlaylistWidget;
+}
+
+class DLLEXPORT NewPlaylistWidget : public QWidget, public Tomahawk::ViewPage
+{
+Q_OBJECT
+
+public:
+    NewPlaylistWidget( QWidget* parent = 0 );
+    ~NewPlaylistWidget();
+
+    virtual QWidget* widget() { return this; }
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return Tomahawk::playlistinterface_ptr(); }
+
+    virtual QString title() const { return tr( "Create a new playlist" ); }
+    virtual QString description() const { return QString(); }
+
+    virtual bool showStatsBar() const { return false; }
+
+    virtual bool jumpToCurrentTrack() { return false; }
+
+protected:
+    void changeEvent( QEvent* e );
+
+signals:
+    void destroyed( QWidget* widget );
+
+private slots:
+    void onTitleChanged( const QString& title );
+    void onTagChanged();
+
+    void updateSuggestions();
+    void suggestionsFound();
+
+    void savePlaylist();
+    void cancel();
+
+private:
+    Ui::NewPlaylistWidget *ui;
+
+    PlaylistModel* m_suggestionsModel;
+    QList< Tomahawk::query_ptr > m_queries;
+
+    QTimer m_filterTimer;
+    QString m_tag;
+    QPushButton* m_saveButton;
+};
+
+#endif // NEWPLAYLISTWIDGET_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/NewPlaylistWidget.ui Added

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NewPlaylistWidget</class>
+ <widget class="QWidget" name="NewPlaylistWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>729</width>
+    <height>460</height>
+   </rect>
+  </property>
+  <property name="focusPolicy">
+   <enum>Qt::TabFocus</enum>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Enter a title for the new playlist:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="titleEdit">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>26</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Just enter a genre or tag name and Tomahawk will suggest a few songs to get you started with your new playlist:</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="tagEdit">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>26</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="PlaylistView" name="suggestionsView"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>PlaylistView</class>
+   <extends>QTreeView</extends>
+   <header>playlist/PlaylistView.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/NewReleasesWidget.cpp Added

@@ -0,0 +1,363 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Casey Link <unnamedrambler@gmail.com>
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011, Jeff Mitchell <jeff@tomahawk-player.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 "NewReleasesWidget.h"
+#include "WhatsHotWidget_p.h"
+#include "ui_NewReleasesWidget.h"
+
+#include <QPainter>
+#include <QStandardItemModel>
+#include <QStandardItem>
+
+#include "ViewManager.h"
+#include "SourceList.h"
+#include "TomahawkSettings.h"
+#include "RecentPlaylistsModel.h"
+#include "ChartDataLoader.h"
+
+#include "audio/AudioEngine.h"
+#include "dynamic/GeneratorInterface.h"
+#include "playlist/PlaylistModel.h"
+#include "playlist/TreeProxyModel.h"
+#include "playlist/PlaylistChartItemDelegate.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "Pipeline.h"
+
+#define HISTORY_TRACK_ITEMS 25
+#define HISTORY_PLAYLIST_ITEMS 10
+#define HISTORY_RESOLVING_TIMEOUT 2500
+
+using namespace Tomahawk;
+
+static QString s_newReleasesIdentifier = QString( "NewReleasesWidget" );
+
+
+NewReleasesWidget::NewReleasesWidget( QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::NewReleasesWidget )
+    , m_sortedProxy( 0 )
+    , m_workerThread( 0 )
+{
+    ui->setupUi( this );
+
+    TomahawkUtils::unmarginLayout( layout() );
+    TomahawkUtils::unmarginLayout( ui->verticalLayout_2 );
+    TomahawkUtils::unmarginLayout( ui->breadCrumbLeft->layout() );
+
+    m_crumbModelLeft = new QStandardItemModel( this );
+    m_sortedProxy = new QSortFilterProxyModel( this );
+    m_sortedProxy->setDynamicSortFilter( true );
+    m_sortedProxy->setFilterCaseSensitivity( Qt::CaseInsensitive );
+
+    ui->breadCrumbLeft->setRootIcon( QPixmap( RESPATH "images/new-releases.png" ) );
+
+    connect( ui->breadCrumbLeft, SIGNAL( activateIndex( QModelIndex ) ), SLOT( leftCrumbIndexChanged(QModelIndex) ) );
+
+    //m_playlistInterface = Tomahawk::playlistinterface_ptr( new ChartsPlaylistInterface( this ) );
+
+    m_workerThread = new QThread( this );
+    m_workerThread->start();
+
+    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 ) ) );
+}
+
+
+NewReleasesWidget::~NewReleasesWidget()
+{
+    qDeleteAll( m_workers );
+    m_workers.clear();
+    m_workerThread->exit(0);
+    m_playlistInterface.clear();
+    delete ui;
+}
+
+
+Tomahawk::playlistinterface_ptr
+NewReleasesWidget::playlistInterface() const
+{
+    return m_playlistInterface;
+}
+
+
+bool
+NewReleasesWidget::isBeingPlayed() const
+{
+    return false;
+}
+
+
+bool
+NewReleasesWidget::jumpToCurrentTrack()
+{
+    return false;
+}
+
+
+void
+NewReleasesWidget::fetchData()
+{
+    Tomahawk::InfoSystem::InfoStringHash artistInfo;
+
+    Tomahawk::InfoSystem::InfoRequestData requestData;
+    requestData.caller = s_newReleasesIdentifier;
+    requestData.customData = QVariantMap();
+    requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
+    requestData.type = Tomahawk::InfoSystem::InfoNewReleaseCapabilities;
+    requestData.timeoutMillis = 20000;
+    requestData.allSources = true;
+    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+
+    tDebug( LOGVERBOSE ) << "NewReleases: requested InfoNewReleaseCapabilities";
+}
+
+
+void
+NewReleasesWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
+{
+    if ( requestData.caller != s_newReleasesIdentifier )
+        return;
+
+    if ( !output.canConvert< QVariantMap >() )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "NewReleases: Could not parse output";
+        return;
+    }
+
+    QVariantMap returnedData = output.toMap();
+    switch ( requestData.type )
+    {
+        case InfoSystem::InfoNewReleaseCapabilities:
+        {
+            tLog() << "NewReleases: got InfoNewReleaseCapabilities";
+            QStandardItem *rootItem= m_crumbModelLeft->invisibleRootItem();
+
+            foreach ( const QString label, returnedData.keys() )
+            {
+                QStandardItem *childItem = parseNode( rootItem, label, returnedDatalabel );
+                rootItem->appendRow(childItem);
+                tLog() << "NewReleases: " << label;
+            }
+
+            m_sortedProxy->setSourceModel( m_crumbModelLeft );
+            m_sortedProxy->sort( 0, Qt::AscendingOrder );
+            ui->breadCrumbLeft->setModel( m_sortedProxy );
+            break;
+        }
+
+        case InfoSystem::InfoNewRelease:
+        {
+            if( !returnedData.contains("type") )
+                break;
+            const QString type = returnedData"type".toString();
+            if( !returnedData.contains(type) )
+                break;
+            const QString side = requestData.customData"whatshot_side".toString();
+            const QString releaseId = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >().value( "nr_id" );
+
+            m_queuedFetches.remove( releaseId );
+
+            ChartDataLoader* loader = new ChartDataLoader();
+            loader->setProperty( "nrid", releaseId );
+            loader->moveToThread( m_workerThread );
+
+            if ( type == "albums" )
+            {
+                loader->setType( ChartDataLoader::Album );
+                loader->setData( returnedData "albums" .value< QList< Tomahawk::InfoSystem::InfoStringHash > >() );
+
+                connect( loader, SIGNAL( albums( Tomahawk::ChartDataLoader*, QList< Tomahawk::album_ptr > ) ), this, SLOT( newReleasesLoaded( Tomahawk::ChartDataLoader*, QList<Tomahawk::album_ptr> ) ) );
+
+                PlayableModel* albumModel = new PlayableModel( ui->albumsView );
+
+                m_albumModels releaseId  = albumModel;
+
+                if ( m_queueItemToShow == releaseId )
+                    setLeftViewAlbums( albumModel );
+            }
+            else
+            {
+                // intentionally unhandled
+            }
+
+            QMetaObject::invokeMethod( loader, "go", Qt::QueuedConnection );
+
+            break;
+        }
+
+        default:
+            return;
+    }
+}
+
+
+void
+NewReleasesWidget::infoSystemFinished( QString target )
+{
+    Q_UNUSED( target );
+}
+
+
+void
+NewReleasesWidget::leftCrumbIndexChanged( QModelIndex index )
+{
+    tDebug( LOGVERBOSE ) << "NewReleases:: left crumb changed" << index.data();
+    QStandardItem* item = m_crumbModelLeft->itemFromIndex( m_sortedProxy->mapToSource( index ) );
+    if( !item )
+        return;
+    if( !item->data( Breadcrumb::ChartIdRole ).isValid() )
+        return;
+
+
+    QList<QModelIndex> indexes;
+    while ( index.parent().isValid() )
+    {
+        indexes.prepend(index);
+        index = index.parent();
+    }
+
+
+    const QString nrId = item->data( Breadcrumb::ChartIdRole ).toString();
+
+    if ( m_albumModels.contains( nrId ) )
+    {
+        setLeftViewAlbums( m_albumModels nrId  );
+        return;
+    }
+
+    if ( m_queuedFetches.contains( nrId ) )
+    {
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria.insert( "nr_id", nrId );
+    /// Remember to lower the source!
+    criteria.insert( "nr_source",  index.data().toString().toLower() );
+
+    Tomahawk::InfoSystem::InfoRequestData requestData;
+    QVariantMap customData;
+    customData.insert( "newrelease_side", "left" );
+    requestData.caller = s_newReleasesIdentifier;
+    requestData.customData = customData;
+    requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( criteria );
+    requestData.type = Tomahawk::InfoSystem::InfoNewRelease;
+    requestData.timeoutMillis = 20000;
+    requestData.allSources = true;
+
+    qDebug() << "Making infosystem request for chart of type:" <<nrId;
+    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+
+    m_queuedFetches.insert( nrId );
+    m_queueItemToShow = nrId;
+}
+
+
+void
+NewReleasesWidget::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+QStandardItem*
+NewReleasesWidget::parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data )
+{
+    Q_UNUSED( parentItem );
+//     tDebug( LOGVERBOSE ) << "NewReleases:: parsing " << label;
+
+    QStandardItem *sourceItem = new QStandardItem(label);
+
+    if ( data.canConvert< QList< Tomahawk::InfoSystem::InfoStringHash > >() )
+    {
+        QList< Tomahawk::InfoSystem::InfoStringHash > charts = data.value< QList< Tomahawk::InfoSystem::InfoStringHash > >();
+        foreach ( Tomahawk::InfoSystem::InfoStringHash chart, charts )
+        {
+            QStandardItem *childItem= new QStandardItem( chart "label"  );
+            childItem->setData( chart "id" , Breadcrumb::ChartIdRole );
+            if ( chart.value( "default", "" ) == "true")
+            {
+                childItem->setData( true, Breadcrumb::DefaultRole );
+            }
+            sourceItem->appendRow( childItem );
+        }
+    }
+    else if ( data.canConvert<QVariantMap>() )
+    {
+        QVariantMap dataMap = data.toMap();
+        foreach ( const QString childLabel,dataMap.keys() )
+        {
+            QStandardItem *childItem  = parseNode( sourceItem, childLabel, dataMapchildLabel );
+            sourceItem->appendRow( childItem );
+        }
+    }
+    else if ( data.canConvert<QVariantList>() )
+    {
+        QVariantList dataList = data.toList();
+
+        foreach ( const QVariant value, dataList )
+        {
+            QStandardItem *childItem= new QStandardItem(value.toString());
+            sourceItem->appendRow(childItem);
+        }
+    }
+    else
+    {
+        QStandardItem *childItem= new QStandardItem( data.toString() );
+        sourceItem->appendRow( childItem );
+    }
+    return sourceItem;
+}
+
+
+void
+NewReleasesWidget::setLeftViewAlbums( PlayableModel* model )
+{
+    ui->albumsView->setPlayableModel( model );
+    ui->albumsView->proxyModel()->sort( -1 ); // disable sorting, must be called after artistsViewLeft->setTreeModel
+}
+
+
+void
+NewReleasesWidget::newReleasesLoaded( ChartDataLoader* loader, const QList< album_ptr >& albums )
+{
+    QString chartId = loader->property( "nrid" ).toString();
+    Q_ASSERT( m_albumModels.contains( chartId ) );
+
+    if ( m_albumModels.contains( chartId ) )
+        m_albumModels chartId ->appendAlbums( albums );
+
+    m_workers.remove( loader );
+    loader->deleteLater();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/NewReleasesWidget.h Added

@@ -0,0 +1,124 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2012, Casey Link <unnamedrambler@gmail.com>
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011, Jeff Mitchell <jeff@tomahawk-player.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 NEWRELEASESWIDGET_H
+#define NEWRELEASESWIDGET_H
+
+#include <QtGui/QWidget>
+#include <QtGui/QListWidgetItem>
+#include <QtGui/QStyledItemDelegate>
+
+#include "PlaylistInterface.h"
+#include "infosystem/InfoSystem.h"
+#include "ViewPage.h"
+
+#include "DllMacro.h"
+
+class QSortFilterProxyModel;
+class QStandardItemModel;
+class QStandardItem;
+class TreeModel;
+class PlaylistModel;
+class TreeProxyModel;
+class AlbumModel;
+class PlayableModel;
+
+namespace Ui
+{
+    class NewReleasesWidget;
+}
+
+namespace Tomahawk
+{
+    class ChartDataLoader;
+    class ChartsPlaylistInterface;
+    class ChartDataLoader;
+}
+
+/**
+ * \class
+ * \brief The tomahawk page that shows music charts.
+ */
+class DLLEXPORT NewReleasesWidget : public QWidget, public Tomahawk::ViewPage
+{
+Q_OBJECT
+
+public:
+    NewReleasesWidget( QWidget* parent = 0 );
+    ~NewReleasesWidget();
+
+    virtual QWidget* widget() { return this; }
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
+
+    virtual QString title() const { return tr( "New Releases" ); }
+    virtual QString description() const { return QString(); }
+
+    virtual bool showStatsBar() const { return false; }
+    virtual bool showInfoBar() const { return false; }
+
+    virtual bool jumpToCurrentTrack();
+    virtual bool isBeingPlayed() const;
+
+protected:
+    void changeEvent( QEvent* e );
+
+signals:
+    void destroyed( QWidget* widget );
+
+public slots:
+    void fetchData();
+
+private slots:
+    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void infoSystemFinished( QString target );
+    void leftCrumbIndexChanged( QModelIndex );
+
+    void newReleasesLoaded( Tomahawk::ChartDataLoader*, const QList< Tomahawk::album_ptr >& );
+
+private:
+    void setLeftViewArtists( TreeModel* artistModel );
+    void setLeftViewAlbums( PlayableModel* albumModel );
+    void setLeftViewTracks( PlaylistModel* trackModel );
+
+
+    QStandardItem* parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data );
+    Ui::NewReleasesWidget *ui;
+    Tomahawk::playlistinterface_ptr m_playlistInterface;
+
+    QStandardItemModel* m_crumbModelLeft;
+    QSortFilterProxyModel* m_sortedProxy;
+
+    // Load artist, album, and track objects in a thread
+    // {Artist,Album,Track}::get() calls are all synchronous db calls
+    // and we don't want to lock up out UI in case the db is busy (e.g. on startup)
+    QThread* m_workerThread;
+    QSet< Tomahawk::ChartDataLoader* > m_workers;
+
+    // Cache our model data
+    QHash< QString, PlayableModel* > m_albumModels;
+    QString m_queueItemToShow;
+    QSet< QString > m_queuedFetches;
+    QTimer* m_timer;
+
+    friend class Tomahawk::ChartsPlaylistInterface;
+};
+
+#endif // NEWRELEASESWIDGET_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/NewReleasesWidget.ui Added

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NewReleasesWidget</class>
+ <widget class="QWidget" name="NewReleasesWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>875</width>
+    <height>513</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="Tomahawk::Breadcrumb" name="breadCrumbLeft" native="true">
+    </widget>
+   </item>
+   <item>
+    <widget class="GridView" name="albumsView">
+     <property name="dragEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>GridView</class>
+   <extends>QListView</extends>
+   <header location="global">playlist/GridView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>Tomahawk::Breadcrumb</class>
+   <extends>QWidget</extends>
+   <header>widgets/Breadcrumb.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/OverlayButton.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/OverlayButton.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/OverlayButton.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/OverlayButton.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/OverlayWidget.cpp Added

@@ -0,0 +1,254 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "OverlayWidget.h"
+
+#include <QPainter>
+#include <QPropertyAnimation>
+
+#include "PlayableProxyModel.h"
+#include "utils/Logger.h"
+
+#define CORNER_ROUNDNESS 8.0
+#define FADING_DURATION 500
+#define FONT_SIZE 16
+#define OPACITY 0.70
+
+
+OverlayWidget::OverlayWidget( QWidget* parent )
+    : QWidget( parent ) // this is on purpose!
+    , m_parent( parent )
+    , m_itemView( 0 )
+{
+    init();
+}
+
+
+OverlayWidget::OverlayWidget( QAbstractItemView* parent )
+    : QWidget( parent ) // this is on purpose!
+    , m_parent( parent )
+    , m_itemView( parent )
+{
+    init();
+
+    if ( m_itemView->model() )
+    {
+        connect( m_itemView->model(), SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( onViewChanged() ), Qt::UniqueConnection );
+        connect( m_itemView->model(), SIGNAL( rowsRemoved( QModelIndex, int, int ) ), SLOT( onViewChanged() ), Qt::UniqueConnection );
+        connect( m_itemView->model(), SIGNAL( loadingStarted() ), SLOT( onViewChanged() ), Qt::UniqueConnection );
+        connect( m_itemView->model(), SIGNAL( loadingFinished() ), SLOT( onViewChanged() ), Qt::UniqueConnection );
+    }
+    connect( m_itemView, SIGNAL( modelChanged() ), SLOT( onViewModelChanged() ) );
+}
+
+
+OverlayWidget::~OverlayWidget()
+{
+}
+
+
+void
+OverlayWidget::init()
+{
+    installEventFilter( m_parent );
+    setAcceptDrops( true );
+
+    setAttribute( Qt::WA_TranslucentBackground, true );
+    m_opacity = 0.00;
+    setOpacity( m_opacity );
+
+    m_timer.setSingleShot( true );
+    connect( &m_timer, SIGNAL( timeout() ), this, SLOT( hide() ) );
+    
+#ifdef Q_WS_MAC
+    QFont f( font() );
+    f.setPointSize( f.pointSize() - 2 );
+    setFont( f );
+#endif
+}
+
+
+void
+OverlayWidget::setOpacity( qreal opacity )
+{
+    m_opacity = opacity;
+
+    if ( m_opacity == 0.00 && !isHidden() )
+    {
+        QWidget::hide();
+    }
+    else if ( m_opacity > 0.00 && isHidden() )
+    {
+        QWidget::show();
+    }
+
+    repaint();
+}
+
+
+void
+OverlayWidget::setText( const QString& text )
+{
+    m_text = text;
+    onViewChanged();
+}
+
+
+void
+OverlayWidget::show( int timeoutSecs )
+{
+    if ( !isEnabled() )
+        return;
+
+    QPropertyAnimation* animation = new QPropertyAnimation( this, "opacity" );
+    animation->setDuration( FADING_DURATION );
+    animation->setEndValue( 1.0 );
+    animation->start();
+
+    if ( timeoutSecs > 0 )
+        m_timer.start( timeoutSecs * 1000 );
+}
+
+
+void
+OverlayWidget::hide()
+{
+    if ( !isEnabled() )
+        return;
+
+    QPropertyAnimation* animation = new QPropertyAnimation( this, "opacity" );
+    animation->setDuration( FADING_DURATION );
+    animation->setEndValue( 0.00 );
+    animation->start();
+}
+
+
+bool
+OverlayWidget::shown() const
+{
+    if ( !isEnabled() )
+        return false;
+
+    return m_opacity == OPACITY;
+}
+
+
+void
+OverlayWidget::onViewChanged()
+{
+    if ( !m_itemView )
+        return;
+
+    PlayableProxyModel* model = qobject_cast<PlayableProxyModel*>( m_itemView->model() );
+    if ( !model )
+        return;
+
+    if ( m_text.isEmpty() || model->rowCount( QModelIndex() ) || model->isLoading() )
+    {
+        hide();
+    }
+    else
+    {
+        show();
+    }
+}
+
+
+void
+OverlayWidget::onViewModelChanged()
+{
+    if ( !m_itemView )
+        return;
+
+    if ( m_itemView->model() )
+    {
+        connect( m_itemView->model(), SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( onViewChanged() ), Qt::UniqueConnection );
+        connect( m_itemView->model(), SIGNAL( rowsRemoved( QModelIndex, int, int ) ), SLOT( onViewChanged() ), Qt::UniqueConnection );
+        connect( m_itemView->model(), SIGNAL( loadingStarted() ), SLOT( onViewChanged() ), Qt::UniqueConnection );
+        connect( m_itemView->model(), SIGNAL( loadingFinished() ), SLOT( onViewChanged() ), Qt::UniqueConnection );
+
+        onViewChanged();
+    }
+}
+
+
+void
+OverlayWidget::paintEvent( QPaintEvent* event )
+{
+    Q_UNUSED( event );
+
+    {
+        QSize maxiSize = QSize( (double)m_parent->width() * 0.70, (double)m_parent->height() * 0.70 );
+        QSize prefSize = QSize( 380, 128 );
+        int width = qMin( maxiSize.width(), prefSize.width() );
+        int height = qMin( maxiSize.height(), prefSize.height() );
+        QSize newSize = QSize( width, height );
+        
+        if ( newSize != size() )
+            resize( newSize );
+    }
+
+    QPoint center( ( m_parent->width() - width() ) / 2, ( m_parent->height() - height() ) / 2 );
+    if ( center != pos() )
+    {
+        move( center );
+        return;
+    }
+
+    QPainter p( this );
+    QRect r = contentsRect();
+
+    p.setBackgroundMode( Qt::TransparentMode );
+    p.setRenderHint( QPainter::Antialiasing );
+    p.setOpacity( m_opacity );
+
+    QPen pen( palette().dark().color(), .5 );
+    p.setPen( pen );
+    p.setBrush( QColor( 30, 30, 30, 255.0 * OPACITY ) );
+
+    p.drawRoundedRect( r, CORNER_ROUNDNESS, CORNER_ROUNDNESS );
+
+    QTextOption to( Qt::AlignCenter );
+    to.setWrapMode( QTextOption::WrapAtWordBoundaryOrAnywhere );
+
+    // shrink to fit if needed
+    QFont f( font() );
+    f.setPointSize( FONT_SIZE );
+    f.setBold( true );
+
+    QRectF textRect = r.adjusted( 8, 8, -8, -8 );
+    qreal availHeight = textRect.height();
+
+    QFontMetricsF fm( f );
+    qreal textHeight = fm.boundingRect( textRect, Qt::AlignCenter | Qt::TextWordWrap, text() ).height();
+    while( textHeight > availHeight )
+    {
+        if( f.pointSize() <= 4 ) // don't try harder
+            break;
+
+        f.setPointSize( f.pointSize() - 1 );
+        fm = QFontMetricsF( f );
+        textHeight = fm.boundingRect( textRect, Qt::AlignCenter | Qt::TextWordWrap, text() ).height();
+    }
+
+    p.setFont( f );
+//    p.setPen( palette().highlightedText().color() );
+    p.setPen( Qt::white );
+    p.drawText( r.adjusted( 8, 8, -8, -8 ), text(), to );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/OverlayWidget.h Added

@@ -0,0 +1,70 @@
+/* === 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
+ *   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 OVERLAYWIDGET_H
+#define OVERLAYWIDGET_H
+
+#include <QWidget>
+#include <QAbstractItemView>
+#include <QTimer>
+
+#include "DllMacro.h"
+
+class DLLEXPORT OverlayWidget : public QWidget
+{
+Q_OBJECT
+Q_PROPERTY( qreal opacity READ opacity WRITE setOpacity )
+
+public:
+    OverlayWidget( QWidget* parent );
+    OverlayWidget( QAbstractItemView* parent );
+    ~OverlayWidget();
+
+    qreal opacity() const { return m_opacity; }
+    void setOpacity( qreal opacity );
+
+    QString text() const { return m_text; }
+    void setText( const QString& text );
+
+    bool shown() const;
+
+public slots:
+    void show( int timeoutSecs = 0 );
+    void hide();
+
+protected:
+//    void changeEvent( QEvent* e );
+    void paintEvent( QPaintEvent* event );
+    
+private slots:
+    void onViewChanged();
+    void onViewModelChanged();
+
+private:
+    void init();
+
+    QString m_text;
+    qreal m_opacity;
+
+    QWidget* m_parent;
+    QAbstractItemView* m_itemView;
+
+    QTimer m_timer;
+};
+
+#endif // OVERLAYWIDGET_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/PlaylistTypeSelectorDialog.cpp Added

@@ -0,0 +1,92 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Christopher Reichert <creichert07@gmail.com>
+ *
+ *   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 "PlaylistTypeSelectorDialog.h"
+#include "ui_PlaylistTypeSelectorDialog.h"
+
+#include "widgets/NewPlaylistWidget.h"
+#include "ViewManager.h"
+#include "ViewPage.h"
+#include "SourceList.h"
+
+#include "utils/Logger.h"
+
+
+PlaylistTypeSelectorDlg::PlaylistTypeSelectorDlg( QWidget* parent, Qt::WindowFlags f )
+    : QDialog( parent, f )
+    , ui( new Ui::PlaylistTypeSelectorDlg )
+{
+    ui->setupUi( this );
+
+#ifdef Q_WS_MAC
+//    ui->
+    ui->verticalLayout->setContentsMargins( 4, 0, 4, 4 );
+
+    setSizeGripEnabled( false );
+    resize( width(), 150 );
+    setMinimumSize( size() );
+    setMaximumSize( size() ); // to remove the resize grip on osx this is the only way
+#else
+    ui->verticalLayout->setContentsMargins( 9, 0, 9, 9 );
+#endif
+
+    ui->line->setMaximumHeight( ui->label->height() );
+    ui->line->setContentsMargins( 0, 0, 0, 0 );
+    m_isAutoPlaylist = false;
+
+    connect( ui->manualPlaylistButton, SIGNAL( clicked() ),
+             this, SLOT( createNormalPlaylist() ));
+    connect( ui->autoPlaylistButton, SIGNAL( clicked() ),
+             this, SLOT( createAutomaticPlaylist() ));
+}
+
+
+PlaylistTypeSelectorDlg::~PlaylistTypeSelectorDlg()
+{
+    delete ui;
+}
+
+
+void
+PlaylistTypeSelectorDlg::createNormalPlaylist()
+{
+    m_isAutoPlaylist = false;
+    done( QDialog::Accepted ); // return code is used to vaidate we did not exit out of the Dialog
+}
+
+
+void
+PlaylistTypeSelectorDlg::createAutomaticPlaylist()
+{
+    m_isAutoPlaylist = true;
+    done( QDialog::Accepted ); // return code is used to vaidate we did not exit out of the Dialog successfully
+}
+
+
+QString
+PlaylistTypeSelectorDlg::playlistName() const
+{
+    return ui->playlistNameLine->text();
+}
+
+
+bool
+PlaylistTypeSelectorDlg::playlistTypeIsAuto() const
+{
+    return m_isAutoPlaylist;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/PlaylistTypeSelectorDialog.h Added

@@ -0,0 +1,53 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Christopher Reichert <creichert07@gmail.com>
+ *
+ *   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 PLAYLISTTYPESELECTORDLG_H
+#define PLAYLISTTYPESELECTORDLG_H
+
+#include <QDialog>
+
+#include "DllMacro.h"
+
+namespace Ui
+{
+    class PlaylistTypeSelectorDlg;
+}
+
+class DLLEXPORT PlaylistTypeSelectorDlg : public QDialog
+{
+Q_OBJECT
+
+public:
+    PlaylistTypeSelectorDlg( QWidget* parent = 0, Qt::WindowFlags = 0 );
+    ~PlaylistTypeSelectorDlg();
+    bool playlistTypeIsNormal() const;
+    bool playlistTypeIsAuto() const;
+    QString playlistName() const;
+
+private slots:
+    void createNormalPlaylist();
+    void createAutomaticPlaylist();
+
+private:
+    bool m_isAutoPlaylist; // if not an auto playlist then its a normal playlist
+
+    Ui::PlaylistTypeSelectorDlg *ui;
+
+};
+
+#endif // PlaylistTypeSelectorDlg_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/PlaylistTypeSelectorDialog.ui Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/QueryLabel.cpp Added

@@ -0,0 +1,757 @@
+/* === 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
+ *   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 "QueryLabel.h"
+
+#include <QApplication>
+#include <QEvent>
+#include <QFontMetrics>
+#include <QMouseEvent>
+#include <QPainter>
+
+#include "Artist.h"
+#include "Album.h"
+#include "Query.h"
+#include "ContextMenu.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "ViewManager.h"
+#include "Source.h"
+
+#define BOXMARGIN 2
+#define DASH "  -  "
+
+using namespace Tomahawk;
+
+
+QueryLabel::QueryLabel( QWidget* parent, Qt::WindowFlags flags )
+    : QFrame( parent, flags )
+    , m_type( Complete )
+{
+    init();
+}
+
+
+QueryLabel::QueryLabel( DisplayType type, QWidget* parent, Qt::WindowFlags flags )
+    : QFrame( parent, flags )
+    , m_type( type )
+{
+    init();
+}
+
+
+QueryLabel::QueryLabel( const Tomahawk::result_ptr& result, DisplayType type, QWidget* parent, Qt::WindowFlags flags )
+    : QFrame( parent, flags )
+    , m_type( type )
+    , m_result( result )
+{
+    init();
+}
+
+
+QueryLabel::QueryLabel( const Tomahawk::query_ptr& query, DisplayType type, QWidget* parent, Qt::WindowFlags flags )
+    : QFrame( parent, flags )
+    , m_type( type )
+    , m_query( query )
+{
+    init();
+}
+
+
+QueryLabel::~QueryLabel()
+{
+}
+
+
+void
+QueryLabel::init()
+{
+    m_contextMenu = new ContextMenu( this );
+    m_contextMenu->setSupportedActions( ContextMenu::ActionQueue | ContextMenu::ActionCopyLink | ContextMenu::ActionStopAfter | ContextMenu::ActionLove | ContextMenu::ActionPage );
+
+    m_hoverType = None;
+    setContentsMargins( 0, 0, 0, 0 );
+    setMouseTracking( true );
+
+    m_useCustomPen = false;
+    m_useCustomFont = false;
+    m_align = Qt::AlignLeft | Qt::AlignVCenter;
+    m_mode = Qt::ElideMiddle;
+
+    m_jumpLinkVisible = false;
+    m_jumpPixmap = QPixmap( RESPATH "images/jump-link.png" ).scaled( QSize( fontMetrics().height(), fontMetrics().height() ), Qt::KeepAspectRatio, Qt::SmoothTransformation );
+}
+
+
+QString
+QueryLabel::text() const
+{
+    QString text;
+
+    if ( m_result.isNull() && m_query.isNull() && m_artist.isNull() && m_album.isNull() )
+        return m_text;
+
+    if ( !m_result.isNull() )
+    {
+        if ( m_type & Artist )
+        {
+            text += m_result->artist()->name();
+        }
+        if ( m_type & Album )
+        {
+            smartAppend( text, m_result->album()->name() );
+        }
+        if ( m_type & Track )
+        {
+            smartAppend( text, m_result->track() );
+        }
+    }
+    else if ( !m_query.isNull() )
+    {
+        if ( m_type & Artist )
+        {
+            text += m_query->artist();
+        }
+        if ( m_type & Album )
+        {
+            smartAppend( text, m_query->album() );
+        }
+        if ( m_type & Track )
+        {
+            smartAppend( text, m_query->track() );
+        }
+    }
+    else if ( !m_artist.isNull() )
+    {
+        text += m_artist->name();
+    }
+    else if ( !m_album.isNull() )
+    {
+        text += m_album->name();
+    }
+
+    return text;
+}
+
+
+QString
+QueryLabel::track() const
+{
+    if ( m_result.isNull() && m_query.isNull() )
+        return QString();
+
+    if ( !m_result.isNull() )
+        return m_result->track();
+    else
+        return m_query->track();
+}
+
+
+void
+QueryLabel::setText( const QString& text )
+{
+    setContentsMargins( m_textMargins );
+
+    m_result.clear();
+    m_query.clear();
+    m_artist.clear();
+    m_album.clear();
+    m_text = text;
+
+    updateLabel();
+
+    emit textChanged( m_text );
+    emit resultChanged( m_result );
+}
+
+
+void
+QueryLabel::setResult( const Tomahawk::result_ptr& result )
+{
+    if ( result.isNull() )
+        return;
+
+    if ( !m_text.isEmpty() && contentsMargins().left() != 0 ) // FIXME: hacky
+        m_textMargins = contentsMargins();
+
+    setContentsMargins( BOXMARGIN * 2, BOXMARGIN / 2, BOXMARGIN * 2, BOXMARGIN / 2);
+
+    if ( m_result.isNull() || m_result.data() != result.data() )
+    {
+        m_result = result;
+        m_query = m_result->toQuery();
+        m_artist = result->artist();
+        m_album = result->album();
+
+        updateLabel();
+
+        emit textChanged( text() );
+        emit resultChanged( m_result );
+    }
+}
+
+
+void
+QueryLabel::setQuery( const Tomahawk::query_ptr& query )
+{
+    if ( query.isNull() )
+        return;
+
+    setContentsMargins( BOXMARGIN * 2, BOXMARGIN / 2, BOXMARGIN * 2, BOXMARGIN / 2 );
+
+    if ( m_query.isNull() || m_query.data() != query.data() )
+    {
+        m_query = query;
+        m_artist = Artist::get( query->artist() );
+        m_album = Album::get( m_artist, query->album() );
+        m_result.clear();
+
+        updateLabel();
+
+        emit textChanged( text() );
+        emit queryChanged( m_query );
+    }
+}
+
+
+void
+QueryLabel::setArtist( const artist_ptr& artist )
+{
+    m_artist = artist;
+
+    updateLabel();
+    emit textChanged( text() );
+}
+
+
+void
+QueryLabel::setAlbum( const album_ptr& album )
+{
+    m_album = album;
+
+    updateLabel();
+    emit textChanged( text() );
+}
+
+
+void
+QueryLabel::setJumpLinkVisible( bool visible )
+{
+    m_jumpLinkVisible = visible;
+    repaint();
+}
+
+
+Qt::Alignment
+QueryLabel::alignment() const
+{
+    return m_align;
+}
+
+
+void
+QueryLabel::setAlignment( Qt::Alignment alignment )
+{
+    if ( m_align != alignment )
+    {
+        m_align = alignment;
+        update(); // no geometry change, repaint is sufficient
+    }
+}
+
+
+void
+QueryLabel::setTextPen( const QPen & pen )
+{
+    m_useCustomPen = true;
+    m_textPen = pen;
+}
+
+
+QPen
+QueryLabel::textPen() const
+{
+    return m_textPen;
+}
+
+
+Qt::TextElideMode
+QueryLabel::elideMode() const
+{
+    return m_mode;
+}
+
+
+void
+QueryLabel::setElideMode( Qt::TextElideMode mode )
+{
+    if ( m_mode != mode )
+    {
+        m_mode = mode;
+        updateLabel();
+    }
+}
+
+
+QFont
+QueryLabel::font() const
+{
+    return m_font;
+}
+
+
+void
+QueryLabel::setFont( const QFont& font )
+{
+    m_useCustomFont = true;
+    m_font = font;
+}
+
+
+void
+QueryLabel::updateLabel()
+{
+    m_hoverArea = QRect();
+    m_hoverType = None;
+
+    updateGeometry();
+    update();
+}
+
+
+void
+QueryLabel::setExtraContentsMargins( int left, int top, int right, int bottom )
+{
+    QMargins margins = contentsMargins();
+    margins.setLeft( margins.left() + left );
+    margins.setTop( margins.top() + top );
+    margins.setRight( margins.right() + right );
+    margins.setBottom( margins.bottom() + bottom );
+    setContentsMargins( margins );
+}
+
+
+QSize
+QueryLabel::sizeHint() const
+{
+    const QFontMetrics& fm = fontMetrics();
+    QSize size( fm.width( text() ) + contentsMargins().left() * 2, fm.height() + contentsMargins().top() * 2 );
+    return size;
+}
+
+
+QSize
+QueryLabel::minimumSizeHint() const
+{
+    switch ( m_mode )
+    {
+        case Qt::ElideNone:
+            return sizeHint();
+
+        default:
+        {
+            const QFontMetrics& fm = fontMetrics();
+            QSize size( fm.width( "..." ), fm.height() + contentsMargins().top() * 2  );
+            return size;
+        }
+    }
+}
+
+
+void
+QueryLabel::paintEvent( QPaintEvent* event )
+{
+    QFrame::paintEvent( event );
+    QPainter p( this );
+    QRect r = contentsRect();
+    QString s = text();
+    const QString elidedText = fontMetrics().elidedText( s, m_mode, r.width() );
+
+    p.save();
+    p.setRenderHint( QPainter::Antialiasing );
+
+    QFontMetrics fm = fontMetrics();
+    if ( m_useCustomFont )
+    {
+        p.setFont( m_font );
+        fm = QFontMetrics( m_font );
+    }
+
+    if ( m_hoverArea.width() )
+    {
+        if ( elidedText != s )
+        {
+            m_hoverArea.setLeft( 0 );
+            m_hoverArea.setRight( fm.width( elidedText ) + contentsMargins().left() * 2 );
+            m_hoverType = Track;
+        }
+
+        TomahawkUtils::drawQueryBackground( &p, palette(), m_hoverArea );
+    }
+
+    if ( elidedText != s || ( m_result.isNull() && m_query.isNull() && m_artist.isNull() && m_album.isNull() ) )
+    {
+        if ( m_hoverArea.width() )
+        {
+            p.setPen( palette().highlightedText().color() );
+            p.setBrush( palette().highlight() );
+        }
+        else
+        {
+            p.setBrush( palette().window() );
+            p.setPen( palette().color( foregroundRole() ) );
+        }
+        p.drawText( r, m_align, elidedText );
+    }
+    else
+    {
+        int dashX = fm.width( DASH );
+        int artistX = m_type & Artist ? fm.width( artist()->name() ) : 0;
+        int albumX = m_type & Album ? fm.width( album()->name() ) : 0;
+        int trackX = m_type & Track ? fm.width( track() ) : 0;
+
+        if ( m_useCustomPen )
+            p.setPen( m_textPen );
+
+        if ( m_type & Artist )
+        {
+            p.setBrush( palette().window() );
+            if ( !m_useCustomPen )
+                p.setPen( palette().color( foregroundRole() ) );
+
+            if ( m_hoverType == Artist )
+            {
+                p.setPen( palette().highlightedText().color() );
+                p.setBrush( palette().highlight() );
+            }
+
+            p.drawText( r, m_align, artist()->name() );
+            r.adjust( artistX, 0, 0, 0 );
+        }
+        if ( m_type & Album )
+        {
+            p.setBrush( palette().window() );
+            if ( !m_useCustomPen )
+                p.setPen( palette().color( foregroundRole() ) );
+
+            if ( m_type & Artist )
+            {
+                p.drawText( r, m_align, DASH );
+                r.adjust( dashX, 0, 0, 0 );
+            }
+            if ( m_hoverType == Album )
+            {
+                p.setPen( palette().highlightedText().color() );
+                p.setBrush( palette().highlight() );
+            }
+
+            p.drawText( r, m_align, album()->name() );
+            r.adjust( albumX, 0, 0, 0 );
+        }
+        if ( m_type & Track )
+        {
+            p.setBrush( palette().window() );
+            if ( !m_useCustomPen )
+                p.setPen( palette().color( foregroundRole() ) );
+
+            if ( m_type & Artist || m_type & Album )
+            {
+                p.drawText( r, m_align, DASH );
+                r.adjust( dashX, 0, 0, 0 );
+            }
+            if ( m_hoverType == Track )
+            {
+                p.setPen( palette().highlightedText().color() );
+                p.setBrush( palette().highlight() );
+            }
+
+            p.drawText( r, m_align, track() );
+            r.adjust( trackX, 0, 0, 0 );
+        }
+
+        if ( m_jumpLinkVisible )
+        {
+            r.adjust( 6, 0, 0, 0 );
+            r.setWidth( r.height() );
+            p.drawPixmap( r, m_jumpPixmap.scaled( r.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
+        }
+    }
+
+    p.restore();
+}
+
+
+void
+QueryLabel::changeEvent( QEvent* event )
+{
+    QFrame::changeEvent( event );
+    switch ( event->type() )
+    {
+        case QEvent::FontChange:
+        case QEvent::ApplicationFontChange:
+            updateLabel();
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+void
+QueryLabel::contextMenuEvent( QContextMenuEvent* event )
+{
+    m_contextMenu->clear();
+
+    switch( m_hoverType )
+    {
+        case Artist:
+        {
+            m_contextMenu->setArtist( artist() );
+            break;
+        }
+        case Album:
+        {
+            m_contextMenu->setAlbum( album() );
+            break;
+        }
+
+        default:
+            m_contextMenu->setQuery( m_query );
+    }
+
+    m_contextMenu->exec( event->globalPos() );
+}
+
+
+void
+QueryLabel::mousePressEvent( QMouseEvent* event )
+{
+    QFrame::mousePressEvent( event );
+    m_time.restart();
+    m_dragPos = event->pos();
+}
+
+
+void
+QueryLabel::mouseReleaseEvent( QMouseEvent* event )
+{
+    QFrame::mouseReleaseEvent( event );
+
+    m_dragPos = QPoint();
+    if ( m_time.elapsed() < qApp->doubleClickInterval() )
+    {
+        switch( m_hoverType )
+        {
+            case Artist:
+                emit clickedArtist();
+                break;
+            case Album:
+                emit clickedAlbum();
+                break;
+            case Track:
+                emit clickedTrack();
+                break;
+
+            case Complete:
+                ViewManager::instance()->showCurrentTrack();
+                break;
+
+            default:
+                emit clicked();
+        }
+    }
+}
+
+
+void
+QueryLabel::mouseMoveEvent( QMouseEvent* event )
+{
+    QFrame::mouseMoveEvent( event );
+    int x = event->x();
+
+    if ( event->buttons() & Qt::LeftButton &&
+       ( m_dragPos - event->pos() ).manhattanLength() >= QApplication::startDragDistance() )
+    {
+        startDrag();
+        leaveEvent( 0 );
+        return;
+    }
+
+    if ( m_query.isNull() && m_result.isNull() && m_artist.isNull() && m_album.isNull() )
+    {
+        m_hoverArea = QRect();
+        m_hoverType = None;
+        return;
+    }
+
+    QFontMetrics fm = fontMetrics();
+    if ( m_useCustomFont )
+        fm = QFontMetrics( m_font );
+
+    int dashX = fm.width( DASH );
+    int artistX = m_type & Artist ? fm.width( artist()->name() ) : 0;
+    int albumX = m_type & Album ? fm.width( album()->name() ) : 0;
+    int trackX = m_type & Track ? fm.width( track() ) : 0;
+
+    if ( m_type & Track )
+    {
+        trackX += contentsMargins().left();
+    }
+    if ( m_type & Album )
+    {
+        trackX += albumX + dashX;
+        albumX += contentsMargins().left();
+    }
+    if ( m_type & Artist )
+    {
+        albumX += artistX + dashX;
+        trackX += artistX + dashX;
+        artistX += contentsMargins().left();
+    }
+
+    QRect hoverArea;
+    m_hoverType = None;
+
+    if ( m_align & Qt::AlignLeft )
+    {
+        if ( m_type & Artist && x < artistX )
+        {
+            m_hoverType = Artist;
+            hoverArea.setLeft( 0 );
+            hoverArea.setRight( artistX + contentsMargins().left() - 1 );
+        }
+        else if ( m_type & Album && x < albumX && x > artistX )
+        {
+            m_hoverType = Album;
+            int spacing = ( m_type & Artist ) ? dashX : 0;
+            hoverArea.setLeft( artistX + spacing );
+            hoverArea.setRight( albumX + spacing + contentsMargins().left() - 1 );
+        }
+        else if ( m_type & Track && x < trackX && x > albumX )
+        {
+            m_hoverType = Track;
+            int spacing = ( m_type & Album ) ? dashX : 0;
+            hoverArea.setLeft( albumX + spacing );
+            hoverArea.setRight( trackX + contentsMargins().left() - 1 );
+        }
+        else if ( m_jumpLinkVisible && x < trackX + 6 + m_jumpPixmap.width() && x > trackX + 6 )
+        {
+            m_hoverType = Complete;
+        }
+    }
+    else
+    {
+        hoverArea.setLeft( 0 );
+        hoverArea.setRight( width() - 1 );
+
+        if ( m_type & Artist )
+            m_hoverType = Artist;
+        else if ( m_type & Album )
+            m_hoverType = Album;
+        else if ( m_type & Track )
+            m_hoverType = Track;
+    }
+
+    if ( hoverArea.width() )
+    {
+        hoverArea.setY( 1 );
+        hoverArea.setHeight( height() - 2 );
+    }
+
+    if ( m_hoverType != None )
+        setCursor( Qt::PointingHandCursor );
+    else
+        setCursor( Qt::ArrowCursor );
+
+    if ( hoverArea != m_hoverArea )
+    {
+        m_hoverArea = hoverArea;
+        repaint();
+    }
+}
+
+
+void
+QueryLabel::leaveEvent( QEvent* event )
+{
+    Q_UNUSED( event );
+    m_hoverArea = QRect();
+    m_hoverType = None;
+    repaint();
+}
+
+
+void
+QueryLabel::startDrag()
+{
+    if ( m_query.isNull() && m_album.isNull() && m_artist.isNull() )
+        return;
+
+    QDrag *drag = new QDrag( this );
+    QByteArray data;
+    QDataStream dataStream( &data, QIODevice::WriteOnly );
+    QMimeData* mimeData = new QMimeData();
+    mimeData->setText( text() );
+
+    switch( m_hoverType )
+    {
+            case Artist:
+            {
+                dataStream << artist()->name();
+                mimeData->setData( "application/tomahawk.metadata.artist", data );
+                drag->setPixmap( TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeArtist ) );
+                break;
+            }
+            case Album:
+            {
+                dataStream << artist()->name();
+                dataStream << album()->name();
+                mimeData->setData( "application/tomahawk.metadata.album", data );
+                drag->setPixmap( TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeAlbum ) );
+                break;
+            }
+
+            default:
+            {
+                dataStream << qlonglong( &m_query );
+                mimeData->setData( "application/tomahawk.query.list", data );
+                drag->setPixmap( TomahawkUtils::createDragPixmap( TomahawkUtils::MediaTypeTrack ) );
+                break;
+            }
+    }
+
+    drag->setMimeData( mimeData );
+
+//    QPoint hotSpot = event->pos() - child->pos();
+//    drag->setHotSpot( hotSpot );
+
+    drag->exec( Qt::CopyAction );
+}
+
+
+QString
+QueryLabel::smartAppend( QString& text, const QString& appendage ) const
+{
+    QString s;
+    if ( !text.isEmpty() )
+        s = DASH;
+
+    text += s + appendage;
+    return text;
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/QueryLabel.h Added

@@ -0,0 +1,152 @@
+/* === 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
+ *   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 QUERYLABEL_H
+#define QUERYLABEL_H
+
+#include <QFrame>
+#include <QTime>
+#include <QPen>
+#include <QPixmap>
+
+#include "Result.h"
+#include "Query.h"
+#include "Typedefs.h"
+#include "DllMacro.h"
+
+namespace Tomahawk
+{
+    class ContextMenu;
+};
+
+class DLLEXPORT QueryLabel : public QFrame
+{
+Q_OBJECT
+
+public:
+    enum DisplayType
+    {
+        None = 0,
+        Artist = 1,
+        Album = 2,
+        Track = 4,
+        ArtistAndAlbum = 3,
+        ArtistAndTrack = 5,
+        AlbumAndTrack = 6,
+        Complete = 7
+    };
+
+    explicit QueryLabel( QWidget* parent = 0, Qt::WindowFlags flags = 0 );
+    explicit QueryLabel( DisplayType type = Complete, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
+    explicit QueryLabel( const Tomahawk::result_ptr& result, DisplayType type = Complete, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
+    explicit QueryLabel( const Tomahawk::query_ptr& query, DisplayType type = Complete, QWidget* parent = 0, Qt::WindowFlags flags = 0 );
+    virtual ~QueryLabel();
+
+    QString text() const;
+    QString track() const;
+
+    Tomahawk::result_ptr result() const { return m_result; }
+    Tomahawk::query_ptr query() const { return m_query; }
+    Tomahawk::artist_ptr artist() const { return m_artist; }
+    Tomahawk::album_ptr album() const { return m_album; }
+
+    DisplayType type() const { return m_type; }
+    void setType( DisplayType type ) { m_type = type; }
+
+    Qt::Alignment alignment() const;
+    void setAlignment( Qt::Alignment alignment );
+
+    Qt::TextElideMode elideMode() const;
+    void setElideMode( Qt::TextElideMode mode );
+
+    void setTextPen( const QPen& );
+    QPen textPen() const;
+
+    void setFont( const QFont& );
+    QFont font() const;
+
+    void setExtraContentsMargins( int left, int top, int right, int bottom );
+    void setJumpLinkVisible( bool visible );
+
+    virtual QSize sizeHint() const;
+    virtual QSize minimumSizeHint() const;
+
+    void init();
+    void updateLabel();
+
+public slots:
+    void setText( const QString& text );
+    void setResult( const Tomahawk::result_ptr& result );
+    void setQuery( const Tomahawk::query_ptr& query );
+    void setArtist( const Tomahawk::artist_ptr& artist );
+    void setAlbum( const Tomahawk::album_ptr& album );
+
+signals:
+    void clicked();
+    void clickedArtist();
+    void clickedAlbum();
+    void clickedTrack();
+
+    void textChanged( const QString& text );
+    void resultChanged( const Tomahawk::result_ptr& result );
+    void queryChanged( const Tomahawk::query_ptr& query );
+
+protected:
+    virtual void contextMenuEvent( QContextMenuEvent* event );
+
+    virtual void mousePressEvent( QMouseEvent* event );
+    virtual void mouseReleaseEvent( QMouseEvent* event );
+    virtual void mouseMoveEvent( QMouseEvent* event );
+    virtual void leaveEvent( QEvent* event );
+
+    virtual void changeEvent( QEvent* event );
+    virtual void paintEvent( QPaintEvent* event );
+
+    virtual void startDrag();
+
+private:
+    QString smartAppend( QString& text, const QString& appendage ) const;
+    QTime m_time;
+
+    DisplayType m_type;
+    QString m_text;
+
+    Tomahawk::result_ptr m_result;
+    Tomahawk::query_ptr m_query;
+    Tomahawk::artist_ptr m_artist;
+    Tomahawk::album_ptr m_album;
+
+    Tomahawk::ContextMenu* m_contextMenu;
+
+    Qt::Alignment m_align;
+    Qt::TextElideMode m_mode;
+
+    bool m_useCustomPen, m_useCustomFont;
+    QPen m_textPen;
+    QFont m_font;
+
+    DisplayType m_hoverType;
+    QRect m_hoverArea;
+    QPoint m_dragPos;
+    QMargins m_textMargins;
+
+    bool m_jumpLinkVisible;
+    QPixmap m_jumpPixmap;
+};
+
+#endif // QUERYLABEL_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/RecentPlaylistsModel.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/RecentPlaylistsModel.cpp Changed

@@ -19,15 +19,15 @@
 
 #include "RecentPlaylistsModel.h"
 
-#include "tomahawksettings.h"
-#include "audio/audioengine.h"
-#include "sourcelist.h"
-#include "utils/logger.h"
+#include "TomahawkSettings.h"
+#include "audio/AudioEngine.h"
+#include "SourceList.h"
+#include "utils/Logger.h"
 #include "dynamic/DynamicPlaylist.h"
-#include "database/database.h"
-#include "database/databasecommand_loadallsortedplaylists.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_LoadAllSortedPlaylists.h"
 #include "RecentlyPlayedPlaylistsModel.h"
-#include <network/servent.h>
+#include <network/Servent.h>
 
 #define REFRESH_TIMEOUT 1000
 
@@ -63,6 +63,8 @@
     if ( m_timer->isActive() )
         m_timer->stop();
 
+    emit loadingStarted();
+   
     DatabaseCommand_LoadAllSortedPlaylists* cmd = new DatabaseCommand_LoadAllSortedPlaylists( source_ptr() );
     cmd->setLimit( 15 );
     cmd->setSortOrder( DatabaseCommand_LoadAllPlaylists::ModificationTime );
@@ -117,6 +119,7 @@
     endResetModel();
 
     emit emptinessChanged( m_playlists.isEmpty() );
+    emit loadingFinished();
 }
 
 
@@ -191,6 +194,9 @@
 
     for ( int i = 0; i < m_playlists.size(); i++ )
     {
+        if ( m_playlists i .isNull() )
+            continue;
+
         if ( m_playlists i ->guid() == p->guid() )
         {
             QModelIndex idx = index( i, 0, QModelIndex() );

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/RecentPlaylistsModel.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/RecentPlaylistsModel.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.cpp Changed

@@ -1,5 +1,6 @@
 /*
     Copyright (C) 2011  Leo Franchi <lfranchi@kde.org>
+    Copyright (C) 2011  Jeff Mitchell <jeff@tomahawk-player.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,11 +20,12 @@
 
 #include "RecentlyPlayedPlaylistsModel.h"
 
-#include "tomahawksettings.h"
-#include "audio/audioengine.h"
-#include "sourcelist.h"
-#include "utils/logger.h"
+#include "TomahawkSettings.h"
+#include "audio/AudioEngine.h"
+#include "SourceList.h"
+#include "utils/Logger.h"
 #include "dynamic/DynamicPlaylist.h"
+#include "Playlist.h"
 
 using namespace Tomahawk;
 
@@ -36,7 +38,7 @@
     loadFromSettings();
 
     connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), this, SLOT( onSourceAdded( Tomahawk::source_ptr ) ), Qt::QueuedConnection );
-    connect( TomahawkSettings::instance(), SIGNAL( recentlyPlayedPlaylistAdded( Tomahawk::playlist_ptr ) ), this, SLOT( plAdded( Tomahawk::playlist_ptr ) ) );
+    connect( TomahawkSettings::instance(), SIGNAL( recentlyPlayedPlaylistAdded( QString, int ) ), this, SLOT( plAdded( QString, int ) ) );
     connect( AudioEngine::instance(),SIGNAL( playlistChanged( Tomahawk::playlistinterface_ptr ) ), this, SLOT( playlistChanged( Tomahawk::playlistinterface_ptr ) ), Qt::QueuedConnection );
 
     emit emptinessChanged( m_recplaylists.isEmpty() );
@@ -216,8 +218,21 @@
 
 
 void
-RecentlyPlayedPlaylistsModel::plAdded( const playlist_ptr& pl )
+RecentlyPlayedPlaylistsModel::plAdded( const QString& plguid, int sId )
 {
+    source_ptr source = SourceList::instance()->get( sId );
+    if ( source.isNull() )
+        return;
+
+    playlist_ptr pl = source->collection()->playlist( plguid );
+    if ( pl.isNull() )
+        pl = source->collection()->autoPlaylist( plguid );
+    if ( pl.isNull() )
+        pl = source->collection()->station( plguid );
+
+    if ( pl.isNull() )
+        return;
+
     onPlaylistsRemoved( QList< playlist_ptr >() << pl );
 
     beginInsertRows( QModelIndex(), 0, 0 );
@@ -234,7 +249,7 @@
     // ARG
     if ( pli.isNull() )
         return;
-    
+
     if ( Playlist *pl = dynamic_cast< Playlist* >( pli.data() ) ) {
         // look for it, qsharedpointer fail
         playlist_ptr ptr;

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/RecentlyPlayedPlaylistsModel.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/SearchWidget.cpp Added

@@ -0,0 +1,209 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2012       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 "SearchWidget.h"
+#include "ui_SearchWidget.h"
+
+#include <QPushButton>
+#include <QDialogButtonBox>
+
+#include "SourceList.h"
+#include "ViewManager.h"
+#include "playlist/PlayableModel.h"
+#include "playlist/PlaylistModel.h"
+#include "utils/AnimatedSpinner.h"
+
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
+
+SearchWidget::SearchWidget( const QString& search, QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::SearchWidget )
+    , m_search( search )
+{
+    ui->setupUi( this );
+
+    ui->resultsView->setGuid( "searchwidget" );
+    m_resultsModel = new PlaylistModel( ui->resultsView );
+    ui->resultsView->setPlaylistModel( m_resultsModel );
+    ui->resultsView->sortByColumn( PlaylistModel::Score, Qt::DescendingOrder );
+
+    m_albumsModel = new PlayableModel( ui->albumView );
+    ui->albumView->setPlayableModel( m_albumsModel );
+
+    m_artistsModel = new PlayableModel( ui->artistView );
+    ui->artistView->setPlayableModel( m_artistsModel );
+
+    ui->artistView->proxyModel()->sort( -1 );
+    ui->albumView->proxyModel()->sort( -1 );
+    ui->artistView->proxyModel()->setHideDupeItems( true );
+    ui->albumView->proxyModel()->setHideDupeItems( true );
+
+    TomahawkUtils::unmarginLayout( ui->verticalLayout );
+
+    m_resultsModel->startLoading();
+    m_queries << Tomahawk::Query::get( search, uuid() );
+
+    ui->splitter_2->setStretchFactor( 0, 0 );
+    ui->splitter_2->setStretchFactor( 1, 1 );
+
+    foreach ( const Tomahawk::query_ptr& query, m_queries )
+    {
+        connect( query.data(), SIGNAL( artistsAdded( QList<Tomahawk::artist_ptr> ) ), SLOT( onArtistsFound( QList<Tomahawk::artist_ptr> ) ) );
+        connect( query.data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr> ) ), SLOT( onAlbumsFound( QList<Tomahawk::album_ptr> ) ) );
+        connect( query.data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ), SLOT( onResultsFound( QList<Tomahawk::result_ptr> ) ) );
+        connect( query.data(), SIGNAL( resolvingFinished( bool ) ), SLOT( onQueryFinished() ) );
+    }
+}
+
+
+SearchWidget::~SearchWidget()
+{
+    delete ui;
+}
+
+
+void
+SearchWidget::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+Tomahawk::playlistinterface_ptr
+SearchWidget::playlistInterface() const
+{
+    return ui->resultsView->playlistInterface();
+}
+
+
+bool
+SearchWidget::jumpToCurrentTrack()
+{
+    return ui->resultsView->jumpToCurrentTrack();
+}
+
+
+void
+SearchWidget::onResultsFound( const QList<Tomahawk::result_ptr>& results )
+{
+    foreach( const Tomahawk::result_ptr& result, results )
+    {
+        if ( !result->collection().isNull() && !result->isOnline() )
+            continue;
+
+        QList< Tomahawk::result_ptr > rl;
+        rl << result;
+
+        Tomahawk::query_ptr q = result->toQuery();
+        q->addResults( rl );
+
+        m_resultsModel->appendQuery( q );
+
+        m_artists << result->artist();
+        m_albums << result->album();
+    }
+}
+
+
+void
+SearchWidget::onAlbumsFound( const QList<Tomahawk::album_ptr>& albums )
+{
+    m_albums << albums;
+}
+
+
+void
+SearchWidget::onArtistsFound( const QList<Tomahawk::artist_ptr>& artists )
+{
+    m_artists << artists;
+}
+
+
+void
+SearchWidget::onQueryFinished()
+{
+    sortAlbums();
+    sortArtists();
+    m_resultsModel->finishLoading();
+}
+
+
+void
+SearchWidget::sortArtists()
+{
+    QMap< float, Tomahawk::artist_ptr > ars;
+    QList< Tomahawk::artist_ptr > sortedArtists;
+    foreach ( const Tomahawk::artist_ptr& artist, m_artists )
+    {
+        int distance = TomahawkUtils::levenshtein( m_search, artist->name() );
+        int maxlen = qMax( m_search.length(), artist->name().length() );
+        float score = (float)( maxlen - distance ) / maxlen;
+
+        ars.insert( score, artist );
+    }
+
+    QList< float > floats = ars.keys();
+    qSort( floats.begin(), floats.end() );
+
+    for ( int i = floats.count() - 1; i >= 0; i-- )
+    {
+        sortedArtists << ars.value( floats.at( i ) );
+    }
+
+    m_artistsModel->clear();
+    m_artistsModel->appendArtists( sortedArtists );
+}
+
+
+void
+SearchWidget::sortAlbums()
+{
+    QMap< float, Tomahawk::album_ptr > ars;
+    QList< Tomahawk::album_ptr > sortedAlbums;
+    foreach ( const Tomahawk::album_ptr& album, m_albums )
+    {
+        int distance = TomahawkUtils::levenshtein( m_search, album->name() );
+        int maxlen = qMax( m_search.length(), album->name().length() );
+        float score = (float)( maxlen - distance ) / maxlen;
+
+        ars.insert( score, album );
+    }
+
+    QList< float > floats = ars.keys();
+    qSort( floats.begin(), floats.end() );
+
+    for ( int i = floats.count() - 1; i >= 0; i-- )
+    {
+        sortedAlbums << ars.value( floats.at( i ) );
+    }
+
+    m_albumsModel->clear();
+    m_albumsModel->appendAlbums( sortedAlbums );
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/SearchWidget.h Added

@@ -0,0 +1,92 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2012       Leo Franchi            <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 SEARCHWIDGET_H
+#define SEARCHWIDGET_H
+
+#include <QWidget>
+#include <QTimer>
+
+#include "Result.h"
+#include "PlaylistInterface.h"
+#include "ViewPage.h"
+
+#include "DllMacro.h"
+
+class QPushButton;
+class PlayableModel;
+class PlaylistModel;
+
+namespace Ui
+{
+    class SearchWidget;
+}
+
+class DLLEXPORT SearchWidget : public QWidget, public Tomahawk::ViewPage
+{
+Q_OBJECT
+
+public:
+    SearchWidget( const QString& search, QWidget* parent = 0 );
+    ~SearchWidget();
+
+    virtual QWidget* widget() { return this; }
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
+    virtual bool isTemporaryPage() const { return true; }
+
+    virtual QString title() const { return QString( tr( "Search: %1" ) ).arg( m_search ); }
+    virtual QString description() const { return tr( "Results for '%1'" ).arg( m_search ); }
+    virtual QPixmap pixmap() const { return QPixmap( RESPATH "images/search-icon.png" ); }
+
+    virtual bool showStatsBar() const { return false; }
+
+    virtual bool jumpToCurrentTrack();
+
+protected:
+    void changeEvent( QEvent* e );
+
+signals:
+    void destroyed( QWidget* widget );
+
+private slots:
+    void onResultsFound( const QList<Tomahawk::result_ptr>& results );
+    void onAlbumsFound( const QList<Tomahawk::album_ptr>& albums );
+    void onArtistsFound( const QList<Tomahawk::artist_ptr>& artists );
+
+    void onQueryFinished();
+
+private:
+    void sortArtists();
+    void sortAlbums();
+
+    Ui::SearchWidget *ui;
+
+    QString m_search;
+
+    PlayableModel* m_artistsModel;
+    PlayableModel* m_albumsModel;
+    PlaylistModel* m_resultsModel;
+
+    QList< Tomahawk::query_ptr > m_queries;
+    QList< Tomahawk::artist_ptr > m_artists;
+    QList< Tomahawk::album_ptr > m_albums;
+};
+
+#endif // NEWPLAYLISTWIDGET_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/SearchWidget.ui Added

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SearchWidget</class>
+ <widget class="QWidget" name="SearchWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>985</width>
+    <height>460</height>
+   </rect>
+  </property>
+  <property name="focusPolicy">
+   <enum>Qt::TabFocus</enum>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QSplitter" name="splitter_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="handleWidth">
+      <number>1</number>
+     </property>
+     <widget class="QSplitter" name="splitter">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="handleWidth">
+       <number>1</number>
+      </property>
+      <widget class="GridView" name="artistView"/>
+      <widget class="GridView" name="albumView"/>
+     </widget>
+     <widget class="PlaylistView" name="resultsView"/>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>PlaylistView</class>
+   <extends>QTreeView</extends>
+   <header>playlist/PlaylistView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>GridView</class>
+   <extends>QListView</extends>
+   <header>playlist/GridView.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/SeekSlider.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/SeekSlider.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/SeekSlider.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/SeekSlider.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/SocialPlaylistWidget.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/SocialPlaylistWidget.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/SocialPlaylistWidget.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/SocialPlaylistWidget.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/SocialPlaylistWidget.ui -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/SocialPlaylistWidget.ui Changed

@@ -36,7 +36,7 @@
          </widget>
         </item>
         <item>
-         <widget class="AlbumView" name="newAlbumsView"/>
+         <widget class="GridView" name="newAlbumsView"/>
         </item>
        </layout>
       </widget>
@@ -84,7 +84,7 @@
   <customwidget>
    <class>PlaylistView</class>
    <extends>QTreeView</extends>
-   <header>playlist/playlistview.h</header>
+   <header>playlist/PlaylistView.h</header>
   </customwidget>
   <customwidget>
    <class>HeaderLabel</class>
@@ -92,14 +92,14 @@
    <header location="global">widgets/HeaderLabel.h</header>
   </customwidget>
   <customwidget>
-   <class>AlbumView</class>
+   <class>GridView</class>
    <extends>QListView</extends>
-   <header location="global">playlist/albumview.h</header>
+   <header location="global">playlist/GridView.h</header>
   </customwidget>
   <customwidget>
    <class>PlaylistWidget</class>
    <extends>QListWidget</extends>
-   <header>widgets/welcomewidget.h</header>
+   <header>widgets/WelcomeWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/ToggleButton.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/ToggleButton.cpp Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/ToggleButton.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/ToggleButton.h Changed

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/WelcomeWidget.cpp Added

@@ -0,0 +1,322 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "WelcomeWidget.h"
+#include "ui_WelcomeWidget.h"
+
+#include <QtGui/QPainter>
+
+#include "ViewManager.h"
+#include "SourceList.h"
+#include "TomahawkSettings.h"
+#include "RecentPlaylistsModel.h"
+
+#include "audio/AudioEngine.h"
+#include "playlist/AlbumModel.h"
+#include "playlist/RecentlyPlayedModel.h"
+#include "widgets/OverlayWidget.h"
+#include "utils/AnimatedSpinner.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "dynamic/GeneratorInterface.h"
+#include "RecentlyPlayedPlaylistsModel.h"
+
+#define HISTORY_PLAYLIST_ITEMS 10
+
+using namespace Tomahawk;
+
+
+WelcomeWidget::WelcomeWidget( QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::WelcomeWidget )
+{
+    ui->setupUi( this );
+    ui->splitter_2->setStretchFactor( 0, 3 );
+    ui->splitter_2->setStretchFactor( 1, 1 );
+
+    RecentPlaylistsModel* model = new RecentPlaylistsModel( HISTORY_PLAYLIST_ITEMS, this );
+
+    ui->playlistWidget->setFrameShape( QFrame::NoFrame );
+    ui->playlistWidget->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+
+    TomahawkUtils::unmarginLayout( layout() );
+    TomahawkUtils::unmarginLayout( ui->verticalLayout->layout() );
+    TomahawkUtils::unmarginLayout( ui->verticalLayout_2->layout() );
+    TomahawkUtils::unmarginLayout( ui->verticalLayout_3->layout() );
+    TomahawkUtils::unmarginLayout( ui->verticalLayout_4->layout() );
+
+    ui->playlistWidget->setItemDelegate( new PlaylistDelegate() );
+    ui->playlistWidget->setModel( model );
+    ui->playlistWidget->overlay()->resize( 380, 86 );
+    ui->playlistWidget->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
+    updatePlaylists();
+
+    m_tracksModel = new RecentlyPlayedModel( ui->tracksView );
+    m_tracksModel->setStyle( PlayableModel::ShortWithAvatars );
+    ui->tracksView->overlay()->setEnabled( false );
+    ui->tracksView->setPlaylistModel( m_tracksModel );
+    m_tracksModel->setSource( source_ptr() );
+
+    m_recentAlbumsModel = new AlbumModel( ui->additionsView );
+    ui->additionsView->setPlayableModel( m_recentAlbumsModel );
+    ui->additionsView->proxyModel()->sort( -1 );
+
+    connect( SourceList::instance(), SIGNAL( ready() ), SLOT( onSourcesReady() ) );
+    connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
+    connect( ui->playlistWidget, SIGNAL( activated( QModelIndex ) ), SLOT( onPlaylistActivated( QModelIndex ) ) );
+    connect( model, SIGNAL( emptinessChanged( bool ) ), this, SLOT( updatePlaylists() ) );
+}
+
+
+WelcomeWidget::~WelcomeWidget()
+{
+    delete ui;
+}
+
+
+void
+WelcomeWidget::loadData()
+{
+    m_recentAlbumsModel->addFilteredCollection( collection_ptr(), 20, DatabaseCommand_AllAlbums::ModificationTime, true );
+}
+
+
+Tomahawk::playlistinterface_ptr
+WelcomeWidget::playlistInterface() const
+{
+    return ui->tracksView->playlistInterface();
+}
+
+
+bool
+WelcomeWidget::jumpToCurrentTrack()
+{
+    return ui->tracksView->jumpToCurrentTrack();
+}
+
+
+bool
+WelcomeWidget::isBeingPlayed() const
+{
+    return AudioEngine::instance()->currentTrackPlaylist() == ui->tracksView->playlistInterface();
+}
+
+
+void
+WelcomeWidget::onSourcesReady()
+{
+    foreach ( const source_ptr& source, SourceList::instance()->sources() )
+        onSourceAdded( source );
+}
+
+
+void
+WelcomeWidget::onSourceAdded( const Tomahawk::source_ptr& source )
+{
+    connect( source->collection().data(), SIGNAL( changed() ), SLOT( updateRecentAdditions() ), Qt::UniqueConnection );
+}
+
+
+void
+WelcomeWidget::updateRecentAdditions()
+{
+    m_recentAlbumsModel->addFilteredCollection( collection_ptr(), 20, DatabaseCommand_AllAlbums::ModificationTime, true );
+}
+
+
+void
+WelcomeWidget::updatePlaylists()
+{
+    int num = ui->playlistWidget->model()->rowCount( QModelIndex() );
+    if ( num == 0 )
+    {
+        ui->playlistWidget->overlay()->setText( tr( "No recently created playlists in your network." ) );
+        ui->playlistWidget->overlay()->show();
+    }
+    else
+        ui->playlistWidget->overlay()->hide();
+}
+
+
+void
+WelcomeWidget::onPlaylistActivated( const QModelIndex& item )
+{
+    Tomahawk::playlist_ptr pl = item.data( RecentlyPlayedPlaylistsModel::PlaylistRole ).value< Tomahawk::playlist_ptr >();
+    if( Tomahawk::dynplaylist_ptr dynplaylist = pl.dynamicCast< Tomahawk::DynamicPlaylist >() )
+        ViewManager::instance()->show( dynplaylist );
+    else
+        ViewManager::instance()->show( pl );
+}
+
+
+void
+WelcomeWidget::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+QSize
+PlaylistDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    Q_UNUSED( option );
+    Q_UNUSED( index );
+    return QSize( 0, 64 );
+}
+
+
+void
+PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QStyleOptionViewItemV4 opt = option;
+    initStyleOption( &opt, QModelIndex() );
+    qApp->style()->drawControl( QStyle::CE_ItemViewItem, &opt, painter );
+
+    if ( option.state & QStyle::State_Selected && option.state & QStyle::State_Active )
+    {
+        opt.palette.setColor( QPalette::Text, opt.palette.color( QPalette::HighlightedText ) );
+    }
+
+    painter->save();
+    painter->setRenderHint( QPainter::Antialiasing );
+    painter->setPen( opt.palette.color( QPalette::Text ) );
+
+    QTextOption to;
+    to.setAlignment( Qt::AlignCenter );
+    QFont font = opt.font;
+    font.setPixelSize( 10 );
+
+    QFont boldFont = font;
+    boldFont.setBold( true );
+    boldFont.setPixelSize( 11 );
+
+    QFont figFont = boldFont;
+    figFont.setPixelSize( 10 );
+
+    QPixmap icon;
+    RecentlyPlayedPlaylistsModel::PlaylistTypes type = (RecentlyPlayedPlaylistsModel::PlaylistTypes)index.data( RecentlyPlayedPlaylistsModel::PlaylistTypeRole ).toInt();
+    if( type == RecentlyPlayedPlaylistsModel::StaticPlaylist )
+        icon = m_playlistIcon;
+    else if( type == RecentlyPlayedPlaylistsModel::AutoPlaylist )
+        icon = m_autoIcon;
+    else if( type == RecentlyPlayedPlaylistsModel::Station )
+        icon = m_stationIcon;
+
+    QRect pixmapRect = option.rect.adjusted( 10, 13, -option.rect.width() + 48, -13 );
+    icon = icon.scaled( pixmapRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation );
+
+    painter->drawPixmap( pixmapRect, icon );
+
+    if ( type != RecentlyPlayedPlaylistsModel::Station )
+    {
+        painter->save();
+        painter->setFont( figFont );
+        QString tracks = index.data( RecentlyPlayedPlaylistsModel::TrackCountRole ).toString();
+        int width = painter->fontMetrics().width( tracks );
+//         int bottomEdge = pixmapRect
+        // right edge 10px past right edge of pixmapRect
+        // bottom edge flush with bottom of pixmap
+        QRect rect( pixmapRect.right() - width , 0, width - 8, 0 );
+        rect.adjust( -2, 0, 0, 0 );
+        rect.setTop( pixmapRect.bottom() - painter->fontMetrics().height() - 1 );
+        rect.setBottom( pixmapRect.bottom() + 1 );
+
+        QColor figColor( "#464b55" );
+        painter->setPen( figColor );
+        painter->setBrush( figColor );
+
+        TomahawkUtils::drawBackgroundAndNumbers( painter, tracks, rect );
+        painter->restore();
+    }
+
+    QPixmap avatar = index.data( RecentlyPlayedPlaylistsModel::PlaylistRole ).value< Tomahawk::playlist_ptr >()->author()->avatar( Source::FancyStyle );
+    if ( avatar.isNull() )
+        avatar = m_defaultAvatar;
+    QRect r( option.rect.width() - avatar.width() - 10, option.rect.top() + option.rect.height()/2 - avatar.height()/2, avatar.width(), avatar.height() );
+    painter->drawPixmap( r, avatar );
+
+    painter->setFont( font );
+    QString author = index.data( RecentlyPlayedPlaylistsModel::PlaylistRole ).value< Tomahawk::playlist_ptr >()->author()->friendlyName();
+    if ( author.indexOf( '@' ) > 0 )
+        author = author.mid( 0, author.indexOf( '@' ) );
+
+    const int w = painter->fontMetrics().width( author ) + 2;
+    QRect avatarNameRect( opt.rect.width() - 10 - w, r.bottom(), w, opt.rect.bottom() - r.bottom() );
+    painter->drawText( avatarNameRect, author, QTextOption( Qt::AlignCenter ) );
+
+    const int leftEdge = opt.rect.width() - qMin( avatarNameRect.left(), r.left() );
+    QString descText;
+    if ( type == RecentlyPlayedPlaylistsModel::Station )
+    {
+        descText = index.data( RecentlyPlayedPlaylistsModel::DynamicPlaylistRole ).value< Tomahawk::dynplaylist_ptr >()->generator()->sentenceSummary();
+    }
+    else
+    {
+        descText = index.data( RecentlyPlayedPlaylistsModel::ArtistRole ).toString();
+    }
+
+    QColor c = painter->pen().color();
+    if ( !( option.state & QStyle::State_Selected && option.state & QStyle::State_Active ) )
+    {
+        painter->setPen( QColor( Qt::gray ).darker() );
+    }
+
+    QRect rectText = option.rect.adjusted( 66, 20, -leftEdge - 10, -8 );
+#ifdef Q_WS_MAC
+    rectText.adjust( 0, 1, 0, 0 );
+#elif defined Q_WS_WIN
+    rectText.adjust( 0, 2, 0, 0 );
+#endif
+
+    painter->drawText( rectText, descText );
+    painter->setPen( c );
+    painter->setFont( font );
+
+    painter->setFont( boldFont );
+    painter->drawText( option.rect.adjusted( 56, 6, -100, -option.rect.height() + 20 ), index.data().toString() );
+
+    painter->restore();
+}
+
+
+PlaylistWidget::PlaylistWidget( QWidget* parent )
+    : QListView( parent )
+{
+    m_overlay = new OverlayWidget( this );
+    LoadingSpinner* spinner = new LoadingSpinner( this );
+}
+
+
+void
+PlaylistWidget::setModel( QAbstractItemModel* model )
+{
+    QListView::setModel( model );
+    emit modelChanged();
+}
+

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/WelcomeWidget.h Added

@@ -0,0 +1,131 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 WELCOMEWIDGET_H
+#define WELCOMEWIDGET_H
+
+#include <QWidget>
+#include <QListWidgetItem>
+#include <QStyledItemDelegate>
+
+#include "PlaylistInterface.h"
+
+#include "Query.h"
+#include "Source.h"
+#include "ViewPage.h"
+
+#include "utils/TomahawkUtilsGui.h"
+
+#include "DllMacro.h"
+
+class AlbumModel;
+class RecentlyPlayedModel;
+class OverlayWidget;
+
+namespace Ui
+{
+    class WelcomeWidget;
+}
+
+class DLLEXPORT PlaylistDelegate : public QStyledItemDelegate
+{
+Q_OBJECT
+
+public:
+    PlaylistDelegate()
+    {
+        m_playlistIcon = QPixmap( RESPATH "images/playlist-icon.png" );
+        m_autoIcon = QPixmap( RESPATH "images/automatic-playlist.png" );
+        m_stationIcon = QPixmap( RESPATH "images/station.png" );
+        m_defaultAvatar = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/user-avatar.png" ) );
+    }
+
+protected:
+    void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+private:
+    QPixmap m_playlistIcon, m_autoIcon, m_stationIcon, m_defaultAvatar;
+};
+
+
+class DLLEXPORT PlaylistWidget : public QListView
+{
+Q_OBJECT
+
+public:
+    PlaylistWidget( QWidget* parent = 0 );
+
+    OverlayWidget* overlay() const { return m_overlay; }
+    
+    virtual void setModel( QAbstractItemModel* model );
+
+signals:
+    void modelChanged();
+
+private:
+    OverlayWidget* m_overlay;
+};
+
+
+class DLLEXPORT WelcomeWidget : public QWidget, public Tomahawk::ViewPage
+{
+Q_OBJECT
+
+public:
+    WelcomeWidget( QWidget* parent = 0 );
+    virtual ~WelcomeWidget();
+
+    virtual QWidget* widget() { return this; }
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
+
+    virtual QString title() const { return tr( "Welcome to Tomahawk" ); }
+    virtual QString description() const { return QString(); }
+
+    virtual bool showStatsBar() const { return false; }
+    virtual bool showInfoBar() const { return false; }
+
+    virtual bool jumpToCurrentTrack();
+    virtual bool isBeingPlayed() const;
+
+protected:
+    void changeEvent( QEvent* e );
+
+signals:
+    void destroyed( QWidget* widget );
+
+public slots:
+    void updatePlaylists();
+    void updateRecentAdditions();
+
+    void loadData();
+
+private slots:
+    void onSourcesReady();
+    void onSourceAdded( const Tomahawk::source_ptr& source );
+    void onPlaylistActivated( const QModelIndex& );
+
+private:
+    Ui::WelcomeWidget *ui;
+
+    RecentlyPlayedModel* m_tracksModel;
+    AlbumModel* m_recentAlbumsModel;
+};
+
+#endif // WELCOMEWIDGET_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/WelcomeWidget.ui Added

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WelcomeWidget</class>
+ <widget class="QWidget" name="WelcomeWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>875</width>
+    <height>513</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <item>
+    <widget class="QSplitter" name="splitter_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="handleWidth">
+      <number>1</number>
+     </property>
+     <widget class="QSplitter" name="splitter">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="handleWidth">
+       <number>1</number>
+      </property>
+      <widget class="QWidget" name="layoutWidget1">
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="HeaderLabel" name="label_4">
+          <property name="text">
+           <string>Recent Additions</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="GridView" name="additionsView">
+          <property name="dragEnabled">
+           <bool>true</bool>
+          </property>
+          <property name="selectionMode">
+           <enum>QAbstractItemView::ExtendedSelection</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="layoutWidget2">
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="HeaderLabel" name="label_2">
+          <property name="text">
+           <string>Newest Stations &amp; Playlists</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="PlaylistWidget" name="playlistWidget"/>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+     <widget class="QWidget" name="layoutWidget">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="HeaderLabel" name="label_3">
+         <property name="text">
+          <string>Recently Played Tracks</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="PlaylistView" name="tracksView">
+         <property name="minimumSize">
+          <size>
+           <width>320</width>
+           <height>0</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>HeaderLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">widgets/HeaderLabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>GridView</class>
+   <extends>QListView</extends>
+   <header>playlist/GridView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>PlaylistView</class>
+   <extends>QTreeView</extends>
+   <header>playlist/PlaylistView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>PlaylistWidget</class>
+   <extends>QListWidget</extends>
+   <header>widgets/WelcomeWidget.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/WhatsHotWidget.cpp Added

@@ -0,0 +1,533 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011, Jeff Mitchell <jeff@tomahawk-player.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 "WhatsHotWidget.h"
+#include "WhatsHotWidget_p.h"
+#include "ui_WhatsHotWidget.h"
+
+#include <QPainter>
+#include <QStandardItemModel>
+#include <QStandardItem>
+
+#include "ViewManager.h"
+#include "SourceList.h"
+#include "TomahawkSettings.h"
+#include "RecentPlaylistsModel.h"
+#include "ChartDataLoader.h"
+
+#include "audio/AudioEngine.h"
+#include "dynamic/GeneratorInterface.h"
+#include "playlist/PlayableModel.h"
+#include "playlist/PlaylistModel.h"
+#include "playlist/TreeProxyModel.h"
+#include "playlist/PlaylistChartItemDelegate.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "Pipeline.h"
+
+#define HISTORY_TRACK_ITEMS 25
+#define HISTORY_PLAYLIST_ITEMS 10
+#define HISTORY_RESOLVING_TIMEOUT 2500
+
+using namespace Tomahawk;
+
+static QString s_whatsHotIdentifier = QString( "WhatsHotWidget" );
+
+
+WhatsHotWidget::WhatsHotWidget( QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::WhatsHotWidget )
+    , m_sortedProxy( 0 )
+    , m_workerThread( 0 )
+{
+    ui->setupUi( this );
+
+    TomahawkUtils::unmarginLayout( layout() );
+    TomahawkUtils::unmarginLayout( ui->stackLeft->layout() );
+    TomahawkUtils::unmarginLayout( ui->horizontalLayout->layout() );
+    TomahawkUtils::unmarginLayout( ui->horizontalLayout_2->layout() );
+    TomahawkUtils::unmarginLayout( ui->breadCrumbLeft->layout() );
+    TomahawkUtils::unmarginLayout( ui->verticalLayout->layout() );
+
+    m_crumbModelLeft = new QStandardItemModel( this );
+    m_sortedProxy = new QSortFilterProxyModel( this );
+    m_sortedProxy->setDynamicSortFilter( true );
+    m_sortedProxy->setFilterCaseSensitivity( Qt::CaseInsensitive );
+
+    ui->breadCrumbLeft->setRootIcon( QPixmap( RESPATH "images/charts.png" ) );
+
+    connect( ui->breadCrumbLeft, SIGNAL( activateIndex( QModelIndex ) ), SLOT( leftCrumbIndexChanged(QModelIndex) ) );
+
+    ui->tracksViewLeft->setHeaderHidden( true );
+    ui->tracksViewLeft->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+    PlaylistChartItemDelegate* del = new PlaylistChartItemDelegate( ui->tracksViewLeft, ui->tracksViewLeft->proxyModel() );
+    connect( del, SIGNAL( updateRequest( QModelIndex ) ), ui->tracksViewLeft, SLOT( update( QModelIndex ) ) );
+    ui->tracksViewLeft->setItemDelegate( del );
+    ui->tracksViewLeft->setUniformRowHeights( false );
+
+    TreeProxyModel* artistsProxy = new TreeProxyModel( ui->artistsViewLeft );
+    artistsProxy->setFilterCaseSensitivity( Qt::CaseInsensitive );
+    artistsProxy->setDynamicSortFilter( true );
+
+    ui->artistsViewLeft->setProxyModel( artistsProxy );
+
+    ui->artistsViewLeft->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+    ui->artistsViewLeft->header()->setVisible( true );
+
+    m_playlistInterface = Tomahawk::playlistinterface_ptr( new ChartsPlaylistInterface( this ) );
+
+    m_workerThread = new QThread( this );
+    m_workerThread->start();
+
+    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 ) ) );
+}
+
+
+WhatsHotWidget::~WhatsHotWidget()
+{
+    qDeleteAll( m_workers );
+    m_workers.clear();
+    m_workerThread->exit(0);
+    m_playlistInterface.clear();
+    delete ui;
+}
+
+
+Tomahawk::playlistinterface_ptr
+WhatsHotWidget::playlistInterface() const
+{
+    return m_playlistInterface;
+}
+
+
+bool
+WhatsHotWidget::isBeingPlayed() const
+{
+    if ( AudioEngine::instance()->currentTrackPlaylist() == ui->artistsViewLeft->playlistInterface() )
+        return true;
+
+    if ( AudioEngine::instance()->currentTrackPlaylist() == ui->tracksViewLeft->playlistInterface() )
+        return true;
+
+    return false;
+}
+
+
+bool
+WhatsHotWidget::jumpToCurrentTrack()
+{
+    if ( ui->artistsViewLeft->jumpToCurrentTrack() )
+        return true;
+
+    if ( ui->tracksViewLeft->jumpToCurrentTrack() )
+        return true;
+
+    return false;
+}
+
+
+void
+WhatsHotWidget::fetchData()
+{
+    Tomahawk::InfoSystem::InfoStringHash artistInfo;
+
+    Tomahawk::InfoSystem::InfoRequestData requestData;
+    requestData.caller = s_whatsHotIdentifier;
+    requestData.customData = QVariantMap();
+    requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
+    requestData.type = Tomahawk::InfoSystem::InfoChartCapabilities;
+    requestData.timeoutMillis = 20000;
+    requestData.allSources = true;
+    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+
+    tDebug( LOGVERBOSE ) << "WhatsHot: requested InfoChartCapabilities";
+}
+
+
+void
+WhatsHotWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
+{
+    if ( requestData.caller != s_whatsHotIdentifier )
+        return;
+
+    if ( output.isNull() )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Info came back empty";
+        return;
+    }
+
+    if ( !output.canConvert< QVariantMap >() )
+    {
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "WhatsHot: Could not parse output into a map";
+        return;
+    }
+
+    QVariantMap returnedData = output.toMap();
+    switch ( requestData.type )
+    {
+        case InfoSystem::InfoChartCapabilities:
+        {
+            QStandardItem *rootItem= m_crumbModelLeft->invisibleRootItem();
+            QVariantMap defaults;
+            if ( returnedData.contains( "defaults" ) )
+                defaults = returnedData.take( "defaults" ).toMap();
+            QString defaultSource = returnedData.take( "defaultSource" ).toString();
+
+            foreach ( const QString label, returnedData.keys() )
+            {
+                QStandardItem *childItem = parseNode( rootItem, label, returnedDatalabel );
+                rootItem->appendRow(childItem);
+            }
+
+            // Set the default source
+            // Set the default chart for each source
+            for ( int i = 0; i < rootItem->rowCount(); i++ )
+            {
+                QStandardItem* source = rootItem->child( i, 0 );
+                if ( defaultSource.toLower() == source->text().toLower() )
+                {
+                    source->setData( true, Breadcrumb::DefaultRole );
+                }
+
+                if ( defaults.contains( source->text().toLower() ) )
+                {
+                    QStringList defaultIndices = defaults source->text().toLower() .toStringList();
+                    QStandardItem* cur = source;
+
+                    foreach( const QString& index, defaultIndices )
+                    {
+                        // Go through the children of the current item, marking the default one as default
+                        for ( int k = 0; k < cur->rowCount(); k++ )
+                        {
+                            if ( cur->child( k, 0 )->text() == index )
+                            {
+                                cur = cur->child( k, 0 ); // this is the default, drill down into the default to pick the next default
+                                cur->setData( true, Breadcrumb::DefaultRole );
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            m_sortedProxy->setSourceModel( m_crumbModelLeft );
+            m_sortedProxy->sort( 0, Qt::AscendingOrder );
+            ui->breadCrumbLeft->setModel( m_sortedProxy );
+            break;
+        }
+
+        case InfoSystem::InfoChart:
+        {
+            if( !returnedData.contains("type") )
+                break;
+            const QString type = returnedData"type".toString();
+            if( !returnedData.contains(type) )
+                break;
+            const QString side = requestData.customData"whatshot_side".toString();
+            const QString chartId = requestData.input.value< Tomahawk::InfoSystem::InfoStringHash >().value( "chart_id" );
+
+            m_queuedFetches.remove( chartId );
+
+            ChartDataLoader* loader = new ChartDataLoader();
+            loader->setProperty( "chartid", chartId );
+            loader->moveToThread( m_workerThread );
+
+            if ( type == "artists" )
+            {
+                loader->setType( ChartDataLoader::Artist );
+                loader->setData( returnedData "artists" .value< QStringList >() );
+
+                connect( loader, SIGNAL( artists( Tomahawk::ChartDataLoader*, QList< Tomahawk::artist_ptr > ) ), this, SLOT( chartArtistsLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::artist_ptr > ) ) );
+
+                TreeModel* artistsModel = new TreeModel( ui->artistsViewLeft );
+                artistsModel->setMode( InfoSystemMode );
+                artistsModel->setStyle( PlayableModel::Collection );
+                artistsModel->startLoading();
+
+                m_artistModels chartId  = artistsModel;
+
+                if ( m_queueItemToShow == chartId )
+                    setLeftViewArtists( artistsModel );
+            }
+            else if ( type == "albums" )
+            {
+                loader->setType( ChartDataLoader::Album );
+                loader->setData( returnedData "albums" .value< QList< Tomahawk::InfoSystem::InfoStringHash > >() );
+
+                connect( loader, SIGNAL( albums( Tomahawk::ChartDataLoader*, QList< Tomahawk::album_ptr > ) ), this, SLOT( chartAlbumsLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::album_ptr > ) ) );
+
+                PlayableModel* albumModel = new PlayableModel( ui->albumsView );
+                albumModel->startLoading();
+
+                m_albumModels chartId  = albumModel;
+
+                if ( m_queueItemToShow == chartId )
+                    setLeftViewAlbums( albumModel );
+            }
+            else if ( type == "tracks" )
+            {
+                loader->setType( ChartDataLoader::Track );
+                loader->setData( returnedData "tracks" .value< QList< Tomahawk::InfoSystem::InfoStringHash > >() );
+
+                connect( loader, SIGNAL( tracks( Tomahawk::ChartDataLoader*, QList< Tomahawk::query_ptr > ) ), this, SLOT( chartTracksLoaded( Tomahawk::ChartDataLoader*, QList< Tomahawk::query_ptr > ) ) );
+
+                PlaylistModel* trackModel = new PlaylistModel( ui->tracksViewLeft );
+                trackModel->setStyle( PlayableModel::Large );
+                trackModel->startLoading();
+
+                m_trackModels chartId  = trackModel;
+
+                if ( m_queueItemToShow == chartId )
+                    setLeftViewTracks( trackModel );
+            }
+
+            QMetaObject::invokeMethod( loader, "go", Qt::QueuedConnection );
+
+            break;
+        }
+
+        default:
+            return;
+    }
+}
+
+
+void
+WhatsHotWidget::infoSystemFinished( QString target )
+{
+    Q_UNUSED( target );
+}
+
+
+void
+WhatsHotWidget::leftCrumbIndexChanged( QModelIndex index )
+{
+    tDebug( LOGVERBOSE ) << "WhatsHot:: left crumb changed" << index.data();
+    QStandardItem* item = m_crumbModelLeft->itemFromIndex( m_sortedProxy->mapToSource( index ) );
+    if( !item )
+        return;
+    if( !item->data( Breadcrumb::ChartIdRole ).isValid() )
+        return;
+
+
+    QList<QModelIndex> indexes;
+    while ( index.parent().isValid() )
+    {
+        indexes.prepend(index);
+        index = index.parent();
+    }
+
+
+    const QString chartId = item->data( Breadcrumb::ChartIdRole ).toString();
+
+    if ( m_artistModels.contains( chartId ) )
+    {
+        setLeftViewArtists( m_artistModels chartId  );
+        return;
+    }
+    else if ( m_albumModels.contains( chartId ) )
+    {
+        setLeftViewAlbums( m_albumModels chartId  );
+        return;
+    }
+    else if ( m_trackModels.contains( chartId ) )
+    {
+        setLeftViewTracks( m_trackModels chartId  );
+        return;
+    }
+
+    if ( m_queuedFetches.contains( chartId ) )
+    {
+        return;
+    }
+
+    Tomahawk::InfoSystem::InfoStringHash criteria;
+    criteria.insert( "chart_id", chartId );
+    /// Remember to lower the source!
+    criteria.insert( "chart_source",  index.data().toString().toLower() );
+
+    Tomahawk::InfoSystem::InfoRequestData requestData;
+    QVariantMap customData;
+    customData.insert( "whatshot_side", "left" );
+    requestData.caller = s_whatsHotIdentifier;
+    requestData.customData = customData;
+    requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( criteria );
+    requestData.type = Tomahawk::InfoSystem::InfoChart;
+    requestData.timeoutMillis = 20000;
+    requestData.allSources = true;
+
+    qDebug() << "Making infosystem request for chart of type:" <<chartId;
+    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+
+    m_queuedFetches.insert( chartId );
+    m_queueItemToShow = chartId;
+}
+
+
+void
+WhatsHotWidget::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}
+
+
+QStandardItem*
+WhatsHotWidget::parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data )
+{
+    Q_UNUSED( parentItem );
+//     tDebug( LOGVERBOSE ) << "WhatsHot:: parsing " << label;
+
+    QStandardItem *sourceItem = new QStandardItem(label);
+
+    if ( data.canConvert< QList< Tomahawk::InfoSystem::InfoStringHash > >() )
+    {
+        QList< Tomahawk::InfoSystem::InfoStringHash > charts = data.value< QList< Tomahawk::InfoSystem::InfoStringHash > >();
+        foreach ( Tomahawk::InfoSystem::InfoStringHash chart, charts )
+        {
+            QStandardItem *childItem= new QStandardItem( chart "label"  );
+            childItem->setData( chart "id" , Breadcrumb::ChartIdRole );
+            if ( chart.value( "default", "" ) == "true")
+            {
+                childItem->setData( true, Breadcrumb::DefaultRole );
+            }
+            sourceItem->appendRow( childItem );
+        }
+    }
+    else if ( data.canConvert<QVariantMap>() )
+    {
+        QVariantMap dataMap = data.toMap();
+        foreach ( const QString childLabel,dataMap.keys() )
+        {
+            QStandardItem *childItem  = parseNode( sourceItem, childLabel, dataMapchildLabel );
+            sourceItem->appendRow( childItem );
+        }
+    }
+    else if ( data.canConvert<QVariantList>() )
+    {
+        QVariantList dataList = data.toList();
+
+        foreach ( const QVariant value, dataList )
+        {
+            QStandardItem *childItem= new QStandardItem(value.toString());
+            sourceItem->appendRow(childItem);
+        }
+    }
+    else
+    {
+        QStandardItem *childItem= new QStandardItem( data.toString() );
+        sourceItem->appendRow( childItem );
+    }
+    return sourceItem;
+}
+
+
+void
+WhatsHotWidget::setLeftViewAlbums( PlayableModel* model )
+{
+    ui->albumsView->setPlayableModel( model );
+    ui->albumsView->proxyModel()->sort( -1 ); // disable sorting, must be called after artistsViewLeft->setTreeModel
+    ui->stackLeft->setCurrentIndex( 2 );
+}
+
+
+void
+WhatsHotWidget::setLeftViewArtists( TreeModel* model )
+{
+    ui->artistsViewLeft->setTreeModel( model );
+    ui->artistsViewLeft->proxyModel()->sort( -1 ); // disable sorting, must be called after artistsViewLeft->setTreeModel
+    ui->stackLeft->setCurrentIndex( 1 );
+}
+
+
+void
+WhatsHotWidget::setLeftViewTracks( PlaylistModel* model )
+{
+    ui->tracksViewLeft->setPlaylistModel( model );
+    ui->tracksViewLeft->proxyModel()->sort( -1 );
+    ui->stackLeft->setCurrentIndex( 0 );
+}
+
+
+void
+WhatsHotWidget::chartArtistsLoaded( ChartDataLoader* loader, const QList< artist_ptr >& artists )
+{
+    QString chartId = loader->property( "chartid" ).toString();
+    Q_ASSERT( m_artistModels.contains( chartId ) );
+
+    if ( m_artistModels.contains( chartId ) )
+    {
+        foreach( const artist_ptr& artist, artists )
+        {
+            m_artistModels chartId ->addArtists( artist );
+            m_artistModels chartId ->finishLoading();
+        }
+    }
+
+    m_workers.remove( loader );
+    loader->deleteLater();
+}
+
+
+void
+WhatsHotWidget::chartTracksLoaded( ChartDataLoader* loader, const QList< query_ptr >& tracks )
+{
+    QString chartId = loader->property( "chartid" ).toString();
+    Q_ASSERT( m_trackModels.contains( chartId ) );
+
+    if ( m_trackModels.contains( chartId ) )
+    {
+        Pipeline::instance()->resolve( tracks );
+        m_trackModels chartId ->appendQueries( tracks );
+        m_trackModels chartId ->finishLoading();
+    }
+
+    m_workers.remove( loader );
+    loader->deleteLater();
+}
+
+
+void
+WhatsHotWidget::chartAlbumsLoaded( ChartDataLoader* loader, const QList< album_ptr >& albums )
+{
+    QString chartId = loader->property( "chartid" ).toString();
+    Q_ASSERT( m_albumModels.contains( chartId ) );
+
+    if ( m_albumModels.contains( chartId ) )
+    {
+        m_albumModels chartId ->appendAlbums( albums );
+        m_albumModels chartId ->finishLoading();
+    }
+
+    m_workers.remove( loader );
+    loader->deleteLater();
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/WhatsHotWidget.h Added

@@ -0,0 +1,126 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011, Jeff Mitchell <jeff@tomahawk-player.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 WHATSHOTWIDGET_H
+#define WHATSHOTWIDGET_H
+
+#include <QtGui/QWidget>
+#include <QtGui/QListWidgetItem>
+#include <QtGui/QStyledItemDelegate>
+
+#include "PlaylistInterface.h"
+#include "infosystem/InfoSystem.h"
+#include "ViewPage.h"
+
+#include "DllMacro.h"
+
+class QSortFilterProxyModel;
+class QStandardItemModel;
+class QStandardItem;
+class TreeModel;
+class PlaylistModel;
+class TreeProxyModel;
+class PlayableModel;
+
+namespace Ui
+{
+    class WhatsHotWidget;
+}
+
+namespace Tomahawk
+{
+    class ChartDataLoader;
+    class ChartsPlaylistInterface;
+    class ChartDataLoader;
+}
+
+/**
+ * \class
+ * \brief The tomahawk page that shows music charts.
+ */
+class DLLEXPORT WhatsHotWidget : public QWidget, public Tomahawk::ViewPage
+{
+Q_OBJECT
+
+public:
+    WhatsHotWidget( QWidget* parent = 0 );
+    ~WhatsHotWidget();
+
+    virtual QWidget* widget() { return this; }
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
+
+    virtual QString title() const { return tr( "Charts" ); }
+    virtual QString description() const { return QString(); }
+
+    virtual bool showStatsBar() const { return false; }
+    virtual bool showInfoBar() const { return false; }
+
+    virtual bool jumpToCurrentTrack();
+    virtual bool isBeingPlayed() const;
+
+protected:
+    void changeEvent( QEvent* e );
+
+signals:
+    void destroyed( QWidget* widget );
+
+public slots:
+    void fetchData();
+
+private slots:
+    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void infoSystemFinished( QString target );
+    void leftCrumbIndexChanged( QModelIndex );
+
+    void chartArtistsLoaded( Tomahawk::ChartDataLoader*, const QList< Tomahawk::artist_ptr >& );
+    void chartAlbumsLoaded( Tomahawk::ChartDataLoader*, const QList< Tomahawk::album_ptr >& );
+    void chartTracksLoaded( Tomahawk::ChartDataLoader*, const QList< Tomahawk::query_ptr >& );
+
+private:
+    void setLeftViewArtists( TreeModel* artistModel );
+    void setLeftViewAlbums( PlayableModel* albumModel );
+    void setLeftViewTracks( PlaylistModel* trackModel );
+
+
+    QStandardItem* parseNode( QStandardItem* parentItem, const QString &label, const QVariant &data );
+    Ui::WhatsHotWidget *ui;
+    Tomahawk::playlistinterface_ptr m_playlistInterface;
+
+    QStandardItemModel* m_crumbModelLeft;
+    QSortFilterProxyModel* m_sortedProxy;
+
+    // Load artist, album, and track objects in a thread
+    // {Artist,Album,Track}::get() calls are all synchronous db calls
+    // and we don't want to lock up out UI in case the db is busy (e.g. on startup)
+    QThread* m_workerThread;
+    QSet< Tomahawk::ChartDataLoader* > m_workers;
+
+    // Cache our model data
+    QHash< QString, PlayableModel* > m_albumModels;
+    QHash< QString, TreeModel* > m_artistModels;
+    QHash< QString, PlaylistModel* > m_trackModels;
+    QString m_queueItemToShow;
+    QSet< QString > m_queuedFetches;
+    QTimer* m_timer;
+
+    friend class Tomahawk::ChartsPlaylistInterface;
+};
+
+#endif // WHATSHOTWIDGET_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/WhatsHotWidget.ui Added

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WhatsHotWidget</class>
+ <widget class="QWidget" name="WhatsHotWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>875</width>
+    <height>513</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="Tomahawk::Breadcrumb" name="breadCrumbLeft" native="true"/>
+   </item>
+   <item>
+    <widget class="QStackedWidget" name="stackLeft">
+     <widget class="QWidget" name="page">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="PlaylistView" name="tracksViewLeft">
+         <property name="minimumSize">
+          <size>
+           <width>320</width>
+           <height>0</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page1">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="TreeView" name="artistsViewLeft">
+         <property name="minimumSize">
+          <size>
+           <width>320</width>
+           <height>0</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page2">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="GridView" name="albumsView">
+         <property name="dragEnabled">
+          <bool>true</bool>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::ExtendedSelection</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>GridView</class>
+   <extends>QListView</extends>
+   <header location="global">playlist/GridView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>TreeView</class>
+   <extends>QTreeView</extends>
+   <header>TreeView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>PlaylistView</class>
+   <extends>QTreeView</extends>
+   <header>playlist/PlaylistView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>Tomahawk::Breadcrumb</class>
+   <extends>QWidget</extends>
+   <header>widgets/Breadcrumb.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/WhatsHotWidget_p.h Added

@@ -0,0 +1,113 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011-2012, Jeff Mitchell <jeff@tomahawk-player.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 WHATSHOTWIDGET_P_H
+#define WHATSHOTWIDGET_P_H
+
+#include "WhatsHotWidget.h"
+#include "PlaylistInterface.h"
+#include "ui_WhatsHotWidget.h"
+#include "TreeProxyModel.h"
+#include "PlaylistView.h"
+#include "Result.h"
+
+#include <QObject>
+
+namespace Tomahawk
+{
+
+class ChartsPlaylistInterface : public Tomahawk::PlaylistInterface
+{
+    Q_OBJECT
+public:
+    explicit ChartsPlaylistInterface( WhatsHotWidget* w )
+        : PlaylistInterface()
+        , m_w( w )
+    {
+        connect( m_w->ui->tracksViewLeft->proxyModel()->playlistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ),
+                 SLOT( anyRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
+        connect( m_w->ui->artistsViewLeft->proxyModel()->playlistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ),
+                 SLOT( anyRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
+
+        connect( m_w->ui->tracksViewLeft->proxyModel()->playlistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ),
+                 SLOT( anyShuffleChanged( bool ) ) );
+        connect( m_w->ui->artistsViewLeft->proxyModel()->playlistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ),
+                 SLOT( anyShuffleChanged( bool ) ) );
+    }
+    virtual ~ChartsPlaylistInterface() {}
+
+    // Any one is fine, we keep them all synched
+    virtual PlaylistModes::RepeatMode repeatMode() const { return m_w->ui->tracksViewLeft->proxyModel()->playlistInterface()->repeatMode(); }
+
+    virtual bool shuffled() const { return m_w->ui->tracksViewLeft->proxyModel()->playlistInterface()->shuffled(); }
+
+    // Do nothing
+    virtual Tomahawk::result_ptr currentItem() const { return Tomahawk::result_ptr(); }
+    virtual Tomahawk::result_ptr siblingItem( int ) { return Tomahawk::result_ptr(); }
+    virtual int trackCount() const { return 0; }
+    virtual QList< Tomahawk::query_ptr > tracks() { return QList< Tomahawk::query_ptr >(); }
+    virtual int unfilteredTrackCount() const { return 0; }
+
+    virtual bool hasChildInterface( Tomahawk::playlistinterface_ptr other )
+    {
+        return m_w->ui->tracksViewLeft->playlistInterface() == other ||
+               m_w->ui->artistsViewLeft->playlistInterface() == other;
+
+    }
+
+public slots:
+    virtual void setRepeatMode( PlaylistModes::RepeatMode mode )
+    {
+        m_w->ui->tracksViewLeft->proxyModel()->playlistInterface()->setRepeatMode( mode );
+        m_w->ui->artistsViewLeft->proxyModel()->playlistInterface()->setRepeatMode( mode );
+    }
+
+    virtual void setShuffled( bool enabled )
+    {
+        m_w->ui->tracksViewLeft->proxyModel()->playlistInterface()->setShuffled( enabled );
+        m_w->ui->artistsViewLeft->proxyModel()->playlistInterface()->setShuffled( enabled );
+    }
+
+signals:
+    void repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode );
+    void shuffleModeChanged( bool enabled );
+
+    void trackCountChanged( unsigned int tracks );
+    void sourceTrackCountChanged( unsigned int tracks );
+    void nextTrackReady();
+
+private slots:
+    void anyRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode )
+    {
+        emit repeatModeChanged( mode );
+    }
+
+    void anyShuffleChanged( bool enabled )
+    {
+        emit shuffleModeChanged( enabled );
+    }
+
+private:
+    WhatsHotWidget* m_w;
+
+};
+
+} //ns
+
+#endif

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.cpp Changed

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -20,74 +21,48 @@
 #include "AlbumInfoWidget.h"
 #include "ui_AlbumInfoWidget.h"
 
-#include "audio/audioengine.h"
-#include "viewmanager.h"
-#include "database/database.h"
-#include "playlist/treemodel.h"
-#include "playlist/albummodel.h"
+#include "audio/AudioEngine.h"
+#include "ViewManager.h"
+#include "database/Database.h"
+#include "playlist/TreeModel.h"
+#include "playlist/PlayableModel.h"
+#include "Source.h"
 
-#include "database/databasecommand_alltracks.h"
-#include "database/databasecommand_allalbums.h"
+#include "database/DatabaseCommand_AllTracks.h"
+#include "database/DatabaseCommand_AllAlbums.h"
 
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include "widgets/OverlayButton.h"
-#include "widgets/overlaywidget.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
 
 using namespace Tomahawk;
 
 
-AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, ModelMode startingMode, QWidget* parent )
+AlbumInfoWidget::AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* parent )
     : QWidget( parent )
     , ui( new Ui::AlbumInfoWidget )
-    , m_infoId( uuid() )
 {
     ui->setupUi( this );
 
-    ui->albumsView->setFrameShape( QFrame::NoFrame );
-    ui->albumsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    ui->tracksView->setFrameShape( QFrame::NoFrame );
-    ui->tracksView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-
     TomahawkUtils::unmarginLayout( layout() );
     TomahawkUtils::unmarginLayout( ui->verticalLayout );
     TomahawkUtils::unmarginLayout( ui->verticalLayout_2 );
 
-    m_albumsModel = new AlbumModel( ui->albumsView );
-    ui->albumsView->setAlbumModel( m_albumsModel );
+    m_albumsModel = new PlayableModel( ui->albumsView );
+    ui->albumsView->setPlayableModel( m_albumsModel );
+    ui->albumsView->setEmptyTip( tr( "Sorry, we could not find any other albums for this artist!" ) );
+    ui->albumsView->proxyModel()->setHideDupeItems( true );
 
     m_tracksModel = new TreeModel( ui->tracksView );
-    m_tracksModel->setMode( startingMode );
+    m_tracksModel->setMode( Mixed );
     ui->tracksView->setTreeModel( m_tracksModel );
     ui->tracksView->setRootIsDecorated( false );
+    ui->tracksView->setEmptyTip( tr( "Sorry, we could not find any tracks for this album!" ) );
 
     m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, QSize( 48, 48 ) );
 
-    m_button = new OverlayButton( ui->tracksView );
-    m_button->setCheckable( true );
-    m_button->setChecked( m_tracksModel->mode() == InfoSystemMode );
-    if ( m_button->isChecked() )
-        m_button->setText( tr( "Click to show SuperCollection Tracks" ) );
-    else
-        m_button->setText( tr( "Click to show Official Tracks" ) );
-
-    m_buttonAlbums = new OverlayButton( ui->albumsView );
-    m_buttonAlbums->setCheckable( true );
-    m_buttonAlbums->setChecked( true );
-    m_buttonAlbums->setText( tr( "Click to show SuperCollection Albums" ) );
-    m_buttonAlbums->show();
-
-    connect( m_button, SIGNAL( clicked() ), SLOT( onModeToggle() ) );
-    connect( m_buttonAlbums, SIGNAL( clicked() ), SLOT( onAlbumsModeToggle() ) );
-    connect( m_tracksModel, SIGNAL( modeChanged( Tomahawk::ModelMode ) ), SLOT( setMode( Tomahawk::ModelMode ) ) );
     connect( m_tracksModel, SIGNAL( loadingStarted() ), SLOT( onLoadingStarted() ) );
     connect( m_tracksModel, SIGNAL( loadingFinished() ), SLOT( onLoadingFinished() ) );
 
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(),
-             SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-             SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-
     load( album );
 }
 
@@ -106,53 +81,14 @@
 
 
 void
-AlbumInfoWidget::setMode( ModelMode mode )
-{
-    m_button->setChecked( mode == InfoSystemMode );
-
-    if ( m_tracksModel->mode() != mode )
-        onModeToggle();
-
-    if ( mode == InfoSystemMode )
-        m_button->setText( tr( "Click to show SuperCollection Tracks" ) );
-    else
-        m_button->setText( tr( "Click to show Official Tracks" ) );
-}
-
-
-void
-AlbumInfoWidget::onModeToggle()
-{
-    m_tracksModel->setMode( m_button->isChecked() ? InfoSystemMode : DatabaseMode );
-    m_tracksModel->addTracks( m_album, QModelIndex() );
-}
-
-
-void
-AlbumInfoWidget::onAlbumsModeToggle()
-{
-    if ( m_buttonAlbums->isChecked() )
-        m_buttonAlbums->setText( tr( "Click to show SuperCollection Albums" ) );
-    else
-        m_buttonAlbums->setText( tr( "Click to show Official Albums" ) );
-
-    loadAlbums();
-}
-
-
-void
 AlbumInfoWidget::onLoadingStarted()
 {
-    m_button->setEnabled( false );
-    m_button->hide();
 }
 
 
 void
 AlbumInfoWidget::onLoadingFinished()
 {
-    m_button->setEnabled( true );
-    m_button->show();
 }
 
 
@@ -214,30 +150,19 @@
 void
 AlbumInfoWidget::loadAlbums( bool autoRefetch )
 {
+    Q_UNUSED( autoRefetch );
+
     m_albumsModel->clear();
 
-    if ( !m_buttonAlbums->isChecked() )
-    {
-        DatabaseCommand_AllAlbums* cmd = new DatabaseCommand_AllAlbums();
-        cmd->setArtist( m_album->artist() );
+    connect( m_album->artist().data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ),
+                                         SLOT( gotAlbums( QList<Tomahawk::album_ptr> ) ) );
 
-        connect( cmd, SIGNAL( albums( QList<Tomahawk::album_ptr>, QVariant ) ),
-                        SLOT( gotAlbums( QList<Tomahawk::album_ptr> ) ) );
+    if ( !m_album->artist()->albums( Mixed ).isEmpty() )
+        gotAlbums( m_album->artist()->albums( Mixed ) );
 
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
-    }
-    else
-    {
-        Tomahawk::InfoSystem::InfoStringHash artistInfo;
-        artistInfo"artist" = m_album->artist()->name();
-
-        Tomahawk::InfoSystem::InfoRequestData requestData;
-        requestData.customData"refetch" = autoRefetch;
-        requestData.caller = m_infoId;
-        requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
-        requestData.type = Tomahawk::InfoSystem::InfoArtistReleases;
-        Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-    }
+/*                tDebug() << "Auto refetching";
+                m_buttonAlbums->setChecked( false );
+                onAlbumsModeToggle();*/
 }
 
 
@@ -259,69 +184,7 @@
     if ( al.contains( m_album ) )
         al.removeAll( m_album );
 
-    m_albumsModel->addAlbums( al );
-}
-
-
-void
-AlbumInfoWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
-{
-    if ( requestData.caller != m_infoId )
-    {
-        return;
-    }
-
-    InfoSystem::InfoStringHash trackInfo;
-    trackInfo = requestData.input.value< InfoSystem::InfoStringHash >();
-
-    if ( output.canConvert< QVariantMap >() )
-    {
-        if ( requestData.type == InfoSystem::InfoArtistReleases && trackInfo"artist" != m_album->artist()->name() )
-        {
-            qDebug() << "Returned info was for:" << trackInfo"artist" << "- was looking for:" << m_album->artist()->name();
-            return;
-        }
-    }
-
-    QVariantMap returnedData = output.value< QVariantMap >();
-    switch ( requestData.type )
-    {
-        case Tomahawk::InfoSystem::InfoArtistReleases:
-        {
-            QStringList albums = returnedData "albums" .toStringList();
-            QList<album_ptr> al;
-
-            Tomahawk::InfoSystem::InfoStringHash inputInfo;
-            inputInfo = requestData.input.value< InfoSystem::InfoStringHash >();
-            artist_ptr artist = Artist::get( inputInfo "artist" , false );
-
-            if ( artist.isNull() )
-                return;
-
-            foreach ( const QString& albumName, albums )
-            {
-                Tomahawk::album_ptr album = Tomahawk::Album::get( artist, albumName, false );
-                al << album;
-            }
-
-            if ( al.count() )
-            {
-                tDebug() << "Adding" << al.count() << "albums";
-                gotAlbums( al );
-            }
-            else if ( requestData.customData "refetch" .toBool() )
-            {
-                tDebug() << "Auto refetching";
-                m_buttonAlbums->setChecked( false );
-                onAlbumsModeToggle();
-            }
-
-            break;
-        }
-
-        default:
-            return;
-    }
+    m_albumsModel->appendAlbums( al );
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.h Changed

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
  *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -31,16 +32,15 @@
 
 #include <QtGui/QWidget>
 
-#include "playlistinterface.h"
-#include "viewpage.h"
-#include "infosystem/infosystem.h"
+#include "PlaylistInterface.h"
+#include "ViewPage.h"
+#include "infosystem/InfoSystem.h"
 
-#include "dllmacro.h"
-#include "typedefs.h"
+#include "DllMacro.h"
+#include "Typedefs.h"
 
-class AlbumModel;
+class PlayableModel;
 class TreeModel;
-class OverlayButton;
 
 namespace Ui
 {
@@ -52,9 +52,11 @@
 Q_OBJECT
 
 public:
-    AlbumInfoWidget( const Tomahawk::album_ptr& album, Tomahawk::ModelMode startingMode = Tomahawk::InfoSystemMode, QWidget* parent = 0 );
+    AlbumInfoWidget( const Tomahawk::album_ptr& album, QWidget* parent = 0 );
     ~AlbumInfoWidget();
 
+    Tomahawk::album_ptr album() const { return m_album; }
+
     virtual QWidget* widget() { return this; }
     virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
 
@@ -72,8 +74,6 @@
     virtual bool isBeingPlayed() const;
 
 public slots:
-    void setMode( Tomahawk::ModelMode mode );
-
     /** \brief Loads information for a given album.
      *  \param album The album that you want to load information for.
      *
@@ -97,31 +97,21 @@
     void gotAlbums( const QList<Tomahawk::album_ptr>& albums );
     void onAlbumCoverUpdated();
 
-    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-
-    void onModeToggle();
-    void onAlbumsModeToggle();
-
     void onLoadingStarted();
     void onLoadingFinished();
 
 private:
-    Ui::AlbumInfoWidget *ui;
+    Ui::AlbumInfoWidget* ui;
 
     Tomahawk::album_ptr m_album;
 
-    AlbumModel* m_albumsModel;
+    PlayableModel* m_albumsModel;
     TreeModel* m_tracksModel;
 
-    OverlayButton* m_button;
-    OverlayButton* m_buttonAlbums;
-
     QString m_title;
     QString m_description;
     QString m_longDescription;
     QPixmap m_pixmap;
-
-    QString m_infoId;
 };
 
 #endif // ALBUMINFOWIDGET_H

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui Changed

@@ -22,7 +22,7 @@
      <property name="handleWidth">
       <number>1</number>
      </property>
-     <widget class="ArtistView" name="tracksView"/>
+     <widget class="TreeView" name="tracksView"/>
      <widget class="QWidget" name="">
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
@@ -33,7 +33,7 @@
         </widget>
        </item>
        <item>
-        <widget class="AlbumView" name="albumsView"/>
+        <widget class="GridView" name="albumsView"/>
        </item>
       </layout>
      </widget>
@@ -48,14 +48,14 @@
    <header location="global">widgets/HeaderLabel.h</header>
   </customwidget>
   <customwidget>
-   <class>ArtistView</class>
+   <class>TreeView</class>
    <extends>QTreeView</extends>
-   <header location="global">artistview.h</header>
+   <header location="global">TreeView.h</header>
   </customwidget>
   <customwidget>
-   <class>AlbumView</class>
+   <class>GridView</class>
    <extends>QListView</extends>
-   <header>playlist/albumview.h</header>
+   <header>playlist/GridView.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp Changed

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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
@@ -20,23 +21,23 @@
 #include "ArtistInfoWidget_p.h"
 #include "ui_ArtistInfoWidget.h"
 
-#include "audio/audioengine.h"
-#include "playlist/trackheader.h"
-#include "playlist/treemodel.h"
-#include "playlist/playlistmodel.h"
-#include "playlist/treeproxymodel.h"
+#include <QScrollArea>
+#include <QScrollBar>
 
-#include "database/databasecommand_alltracks.h"
-#include "database/databasecommand_allalbums.h"
+#include "audio/AudioEngine.h"
+#include "playlist/PlayableModel.h"
+#include "playlist/TreeModel.h"
+#include "playlist/PlaylistModel.h"
+#include "playlist/TreeProxyModel.h"
+#include "Source.h"
 
-#include "utils/stylehelper.h"
-#include "utils/tomahawkutilsgui.h"
-#include "utils/logger.h"
+#include "database/DatabaseCommand_AllTracks.h"
+#include "database/DatabaseCommand_AllAlbums.h"
 
-#include "widgets/OverlayButton.h"
-#include "widgets/overlaywidget.h"
-
-#include "pipeline.h"
+#include "Pipeline.h"
+#include "utils/StyleHelper.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
 
 using namespace Tomahawk;
 
@@ -45,55 +46,111 @@
     : QWidget( parent )
     , ui( new Ui::ArtistInfoWidget )
     , m_artist( artist )
-    , m_infoId( uuid() )
 {
-    ui->setupUi( this );
+    QWidget* widget = new QWidget;
+    ui->setupUi( widget );
 
-    m_plInterface = Tomahawk::playlistinterface_ptr( new MetaPlaylistInterface( this ) );
+    QPalette pal = palette();
+    pal.setColor( QPalette::Window, QColor( "#454e59" ) );
 
-    ui->albums->setFrameShape( QFrame::NoFrame );
-    ui->albums->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    ui->relatedArtists->setFrameShape( QFrame::NoFrame );
-    ui->relatedArtists->setAttribute( Qt::WA_MacShowFocusRect, 0 );
-    ui->topHits->setFrameShape( QFrame::NoFrame );
-    ui->topHits->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+    widget->setPalette( pal );
+    widget->setAutoFillBackground( true );
 
-    TomahawkUtils::unmarginLayout( layout() );
-    TomahawkUtils::unmarginLayout( ui->layoutWidget->layout() );
+    m_plInterface = Tomahawk::playlistinterface_ptr( new MetaPlaylistInterface( this ) );
+
+/*    TomahawkUtils::unmarginLayout( ui->layoutWidget->layout() );
     TomahawkUtils::unmarginLayout( ui->layoutWidget1->layout() );
     TomahawkUtils::unmarginLayout( ui->layoutWidget2->layout() );
-    TomahawkUtils::unmarginLayout( ui->albumHeader->layout() );
+    TomahawkUtils::unmarginLayout( ui->albumHeader->layout() );*/
 
-    m_albumsModel = new TreeModel( ui->albums );
-    m_albumsModel->setMode( InfoSystemMode );
-    ui->albums->setTreeModel( m_albumsModel );
+    m_albumsModel = new PlayableModel( ui->albums );
+    ui->albums->setPlayableModel( m_albumsModel );
+    ui->topHits->setEmptyTip( tr( "Sorry, we could not find any albums for this artist!" ) );
 
-    m_relatedModel = new TreeModel( ui->relatedArtists );
-    m_relatedModel->setColumnStyle( TreeModel::TrackOnly );
-    ui->relatedArtists->setTreeModel( m_relatedModel );
-    ui->relatedArtists->setSortingEnabled( false );
+    m_relatedModel = new PlayableModel( ui->relatedArtists );
+    ui->relatedArtists->setPlayableModel( m_relatedModel );
     ui->relatedArtists->proxyModel()->sort( -1 );
+    ui->topHits->setEmptyTip( tr( "Sorry, we could not find any related artists!" ) );
 
     m_topHitsModel = new PlaylistModel( ui->topHits );
-    m_topHitsModel->setStyle( TrackModel::Short );
-    ui->topHits->setTrackModel( m_topHitsModel );
+    m_topHitsModel->setStyle( PlayableModel::Short );
+    ui->topHits->setPlayableModel( m_topHitsModel );
     ui->topHits->setSortingEnabled( false );
+    ui->topHits->setEmptyTip( tr( "Sorry, we could not find any top hits for this artist!" ) );
+
+    ui->relatedArtists->setAutoFitItems( false );
+    ui->relatedArtists->setWrapping( false );
+    ui->relatedArtists->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+    ui->relatedArtists->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
+    m_relatedModel->setItemSize( QSize( 170, 170 ) );
+
+    ui->albums->setAutoFitItems( false );
+    ui->albums->setWrapping( false );
+    ui->albums->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+    ui->albums->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
+    m_albumsModel->setItemSize( QSize( 170, 170 ) );
+    ui->albums->proxyModel()->setHideDupeItems( true );
+
+    ui->topHits->setFrameShape( QFrame::StyledPanel );
+    ui->topHits->setAttribute( Qt::WA_MacShowFocusRect, 0 );
 
     m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::ScaledCover, QSize( 48, 48 ) );
-
-    m_button = new OverlayButton( ui->albums );
-    m_button->setText( tr( "Click to show SuperCollection Albums" ) );
-    m_button->setCheckable( true );
-    m_button->setChecked( true );
-
-    connect( m_button, SIGNAL( clicked() ), SLOT( onModeToggle() ) );
-    connect( m_albumsModel, SIGNAL( modeChanged( Tomahawk::ModelMode ) ), SLOT( setMode( Tomahawk::ModelMode ) ) );
-    connect( m_albumsModel, SIGNAL( loadingStarted() ), SLOT( onLoadingStarted() ) );
-    connect( m_albumsModel, SIGNAL( loadingFinished() ), SLOT( onLoadingFinished() ) );
-
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(),
-             SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-             SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
+    ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::ScaledCover, QSize( ui->cover->sizeHint() ) ) );
+
+    ui->biography->setFrameShape( QFrame::NoFrame );
+    ui->biography->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+    TomahawkUtils::styleScrollBar( ui->biography->verticalScrollBar() );
+
+    QFont f = font();
+    f.setBold( true );
+    f.setPixelSize( 18 );
+    ui->artistLabel->setFont( f );
+
+    QPalette p = ui->biography->palette();
+    p.setColor( QPalette::Foreground, Qt::white );
+    p.setColor( QPalette::Text, Qt::white );
+
+    ui->artistLabel->setPalette( p );
+    ui->biography->setPalette( p );
+    ui->label->setPalette( p );
+    ui->label_2->setPalette( p );
+    ui->label_3->setPalette( p );
+
+    QScrollArea* area = new QScrollArea();
+    area->setWidgetResizable( true );
+    area->setWidget( widget );
+
+    area->setStyleSheet( "QScrollArea { background-color: #454e59; }" );
+    area->setFrameShape( QFrame::NoFrame );
+    area->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+
+    QVBoxLayout* layout = new QVBoxLayout();
+    layout->addWidget( area );
+    setLayout( layout );
+    TomahawkUtils::unmarginLayout( layout );
+
+    TomahawkUtils::styleScrollBar( ui->albums->horizontalScrollBar() );
+    TomahawkUtils::styleScrollBar( ui->relatedArtists->horizontalScrollBar() );
+
+    ui->biography->setStyleSheet( "QTextBrowser#biography { background-color: transparent; }" );
+
+    ui->albums->setStyleSheet( "QListView { background-color: transparent; }" );
+    ui->albumFrame->setStyleSheet( "QFrame#albumFrame { background-color: transparent; }"
+                               "QFrame#albumFrame { "
+                               "border-image: url(" RESPATH "images/scrollbar-vertical-handle.png) 3 3 3 3 stretch stretch;"
+                               "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" );
+
+    ui->relatedArtists->setStyleSheet( "QListView { background-color: transparent; }" );
+    ui->artistFrame->setStyleSheet( "QFrame#artistFrame { background-color: transparent; }"
+                               "QFrame#artistFrame { "
+                               "border-image: url(" RESPATH "images/scrollbar-vertical-handle.png) 3 3 3 3 stretch stretch;"
+                               "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" );
+
+//    ui->topHits->setStyleSheet( "QTreeView#topHits { background-color: transparent; }" );
+    ui->trackFrame->setStyleSheet( "QFrame#trackFrame { background-color: transparent; }"
+                               "QFrame#trackFrame { "
+                               "border-image: url(" RESPATH "images/scrollbar-vertical-handle.png) 3 3 3 3 stretch stretch;"
+                               "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" );
 
     load( artist );
 }
@@ -112,45 +169,6 @@
 }
 
 
-void
-ArtistInfoWidget::setMode( ModelMode mode )
-{
-    m_button->setChecked( mode == InfoSystemMode );
-
-    if ( m_albumsModel->mode() != mode )
-        onModeToggle();
-
-    if ( mode == InfoSystemMode )
-        m_button->setText( tr( "Click to show SuperCollection Albums" ) );
-    else
-        m_button->setText( tr( "Click to show Official Albums" ) );
-}
-
-
-void
-ArtistInfoWidget::onModeToggle()
-{
-    m_albumsModel->setMode( m_button->isChecked() ? InfoSystemMode : DatabaseMode );
-    m_albumsModel->addAlbums( m_artist, QModelIndex() );
-}
-
-
-void
-ArtistInfoWidget::onLoadingStarted()
-{
-    m_button->setEnabled( false );
-    m_button->hide();
-}
-
-
-void
-ArtistInfoWidget::onLoadingFinished()
-{
-    m_button->setEnabled( true );
-    m_button->show();
-}
-
-
 bool
 ArtistInfoWidget::isBeingPlayed() const
 {
@@ -187,105 +205,80 @@
 ArtistInfoWidget::load( const artist_ptr& artist )
 {
     if ( !m_artist.isNull() )
+    {
         disconnect( m_artist.data(), SIGNAL( updated() ), this, SLOT( onArtistImageUpdated() ) );
+        disconnect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), this, SLOT( onSimilarArtistsLoaded() ) );
+        disconnect( m_artist.data(), SIGNAL( biographyLoaded() ), this, SLOT( onBiographyLoaded() ) );
+        disconnect( m_artist.data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ),
+                    this,              SLOT( onAlbumsFound( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ) );
+        disconnect( m_artist.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                    this,              SLOT( onTracksFound( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode ) ) );
+    }
 
     m_artist = artist;
     m_title = artist->name();
-    m_albumsModel->addAlbums( artist, QModelIndex(), true );
 
-    Tomahawk::InfoSystem::InfoStringHash artistInfo;
-    artistInfo"artist" = artist->name();
+    connect( m_artist.data(), SIGNAL( biographyLoaded() ), SLOT( onBiographyLoaded() ) );
+    connect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), SLOT( onSimilarArtistsLoaded() ) );
+    connect( m_artist.data(), SIGNAL( updated() ), SLOT( onArtistImageUpdated() ) );
+    connect( m_artist.data(), SIGNAL( albumsAdded( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ),
+                                SLOT( onAlbumsFound( QList<Tomahawk::album_ptr>, Tomahawk::ModelMode ) ) );
+    connect( m_artist.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode, Tomahawk::collection_ptr ) ),
+                                SLOT( onTracksFound( QList<Tomahawk::query_ptr>, Tomahawk::ModelMode ) ) );
 
-    Tomahawk::InfoSystem::InfoRequestData requestData;
-    requestData.caller = m_infoId;
-    requestData.customData = QVariantMap();
+    ui->artistLabel->setText( artist->name() );
 
-    requestData.input = artist->name();
-    requestData.type = Tomahawk::InfoSystem::InfoArtistBiography;
-    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+    m_topHitsModel->startLoading();
 
-    requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoStringHash >( artistInfo );
+    if ( !m_artist->albums( Mixed ).isEmpty() )
+        onAlbumsFound( m_artist->albums( Mixed ), Mixed );
 
-    requestData.type = Tomahawk::InfoSystem::InfoArtistSimilars;
-    requestData.requestId = TomahawkUtils::infosystemRequestId();
-    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+    if ( !m_artist->tracks().isEmpty() )
+        onTracksFound( m_artist->tracks(), Mixed );
 
-    requestData.type = Tomahawk::InfoSystem::InfoArtistSongs;
-    requestData.requestId = TomahawkUtils::infosystemRequestId();
-    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
+    if ( !m_artist->similarArtists().isEmpty() )
+        onSimilarArtistsLoaded();
+
+    if ( !m_artist->biography().isEmpty() )
+        onBiographyLoaded();
 
-    connect( m_artist.data(), SIGNAL( updated() ), SLOT( onArtistImageUpdated() ) );
     onArtistImageUpdated();
 }
 
 
 void
-ArtistInfoWidget::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
+ArtistInfoWidget::onAlbumsFound( const QList<Tomahawk::album_ptr>& albums, ModelMode mode )
 {
-    if ( requestData.caller != m_infoId )
-        return;
+    Q_UNUSED( mode );
 
-    InfoSystem::InfoStringHash trackInfo;
-    trackInfo = requestData.input.value< InfoSystem::InfoStringHash >();
+    m_albumsModel->appendAlbums( albums );
+}
 
-    if ( output.canConvert< QVariantMap >() )
-    {
-        const QString artist = requestData.input.toString();
-        if ( trackInfo"artist" != m_artist->name() && artist != m_artist->name() )
-        {
-            qDebug() << "Returned info was for:" << trackInfo"artist" << "- was looking for:" << m_artist->name();
-            return;
-        }
-    }
 
-    QVariantMap returnedData = output.value< QVariantMap >();
-    switch ( requestData.type )
-    {
-        case InfoSystem::InfoArtistBiography:
-        {
-            QVariantMap bmap = output.toMap();
-
-            foreach ( const QString& source, bmap.keys() )
-            {
-                if ( m_longDescription.isEmpty() || source == "last.fm" )
-                    m_longDescription = bmap source .toHash() "text" .toString();
-            }
-            emit longDescriptionChanged( m_longDescription );
-            break;
-        }
+void
+ArtistInfoWidget::onTracksFound( const QList<Tomahawk::query_ptr>& queries, ModelMode mode )
+{
+    Q_UNUSED( mode );
 
-        case InfoSystem::InfoArtistSongs:
-        {
-            const QStringList tracks = returnedData"tracks".toStringList();
+    m_topHitsModel->finishLoading();
+    m_topHitsModel->appendQueries( queries );
+}
 
-            QList< query_ptr > queries;
-            int i = 0;
-            foreach ( const QString& track, tracks )
-            {
-                queries << Query::get( m_artist->name(), track, QString() );
-                Pipeline::instance()->resolve( queries );
 
-                if ( ++i == 15 )
-                    break;
-            }
+void
+ArtistInfoWidget::onSimilarArtistsLoaded()
+{
+    m_relatedModel->appendArtists( m_artist->similarArtists() );
+}
 
-            m_topHitsModel->append( queries );
-            break;
-        }
-
-        case InfoSystem::InfoArtistSimilars:
-        {
-            const QStringList artists = returnedData"artists".toStringList();
-            foreach ( const QString& artist, artists )
-            {
-                m_relatedModel->addArtists( Artist::get( artist ) );
-            }
-            break;
-        }
 
-        default:
-            return;
-    }
+void
+ArtistInfoWidget::onBiographyLoaded()
+{
+    m_longDescription = m_artist->biography();
+    emit longDescriptionChanged( m_longDescription );
+
+    ui->biography->setHtml( m_artist->biography() );
 }
 
 
@@ -297,6 +290,8 @@
 
     m_pixmap = m_artist->cover( QSize( 0, 0 ) );
     emit pixmapChanged( m_pixmap );
+
+    ui->cover->setPixmap( m_artist->cover( ui->cover->sizeHint() ) );
 }

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.h Changed

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui Changed

@@ -6,115 +6,365 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>902</width>
-    <height>696</height>
+    <width>965</width>
+    <height>912</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
-    <widget class="QSplitter" name="splitter_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="leftMargin">
+      <number>12</number>
      </property>
-     <property name="handleWidth">
-      <number>1</number>
+     <property name="topMargin">
+      <number>12</number>
      </property>
-     <widget class="QSplitter" name="splitter">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="handleWidth">
-       <number>1</number>
-      </property>
-      <widget class="QWidget" name="layoutWidget">
-       <layout class="QVBoxLayout" name="verticalLayout_2">
-        <item>
-         <widget class="HeaderLabel" name="label">
-          <property name="text">
-           <string>Top Hits</string>
+     <property name="rightMargin">
+      <number>16</number>
+     </property>
+     <property name="bottomMargin">
+      <number>12</number>
+     </property>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QFrame" name="trackFrame">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_6">
+          <property name="spacing">
+           <number>4</number>
           </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="PlaylistView" name="topHits">
-          <property name="headerHidden">
-           <bool>true</bool>
+          <property name="leftMargin">
+           <number>8</number>
           </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="layoutWidget1">
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="HeaderLabel" name="label_2">
-          <property name="text">
-           <string>Related Artists</string>
+          <property name="topMargin">
+           <number>4</number>
           </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="ArtistView" name="relatedArtists">
-          <property name="headerHidden">
-           <bool>true</bool>
+          <property name="rightMargin">
+           <number>8</number>
           </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-     <widget class="QWidget" name="layoutWidget2">
-      <layout class="QVBoxLayout" name="verticalLayout_5">
+          <property name="bottomMargin">
+           <number>8</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="font">
+             <font>
+              <pointsize>18</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>Top Hits</string>
+            </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="PlaylistView" name="topHits">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>300</height>
+             </size>
+            </property>
+            <property name="headerHidden">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
-        <widget class="HeaderWidget" name="albumHeader" native="true">
-         <layout class="QHBoxLayout" name="horizontalLayout">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>16</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QFrame" name="albumFrame">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <property name="spacing">
+           <number>4</number>
+          </property>
+          <property name="leftMargin">
+           <number>8</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>8</number>
+          </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
           <item>
-           <widget class="HeaderLabel" name="label_3">
+           <widget class="QLabel" name="label_3">
+            <property name="font">
+             <font>
+              <family>Arial</family>
+              <pointsize>18</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
             <property name="text">
              <string>Albums</string>
             </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="GridView" name="albums">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>190</height>
+             </size>
+            </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item>
-        <widget class="ArtistView" name="albums"/>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>16</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QFrame" name="artistFrame">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <property name="spacing">
+           <number>4</number>
+          </property>
+          <property name="leftMargin">
+           <number>8</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>8</number>
+          </property>
+          <property name="bottomMargin">
+           <number>4</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="label_2">
+            <property name="font">
+             <font>
+              <family>Arial</family>
+              <pointsize>18</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>Related Artists</string>
+            </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="GridView" name="relatedArtists">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>190</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="leftMargin">
+        <number>16</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="cover">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>220</width>
+           <height>220</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Cover</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>8</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="artistLabel">
+         <property name="text">
+          <string>Artist</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>12</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QTextBrowser" name="biography">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>240</height>
+          </size>
+         </property>
+         <property name="horizontalScrollBarPolicy">
+          <enum>Qt::ScrollBarAlwaysOff</enum>
+         </property>
+        </widget>
        </item>
       </layout>
-     </widget>
-    </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>PlaylistView</class>
-   <extends>QTreeView</extends>
-   <header>playlist/playlistview.h</header>
+   <class>GridView</class>
+   <extends>QListView</extends>
+   <header location="global">GridView.h</header>
   </customwidget>
   <customwidget>
-   <class>HeaderLabel</class>
-   <extends>QLabel</extends>
-   <header location="global">widgets/HeaderLabel.h</header>
-  </customwidget>
-  <customwidget>
-   <class>HeaderWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">widgets/HeaderWidget.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ToggleButton</class>
-   <extends>QPushButton</extends>
-   <header location="global">widgets/ToggleButton.h</header>
-  </customwidget>
-  <customwidget>
-   <class>ArtistView</class>
+   <class>PlaylistView</class>
    <extends>QTreeView</extends>
-   <header location="global">artistview.h</header>
+   <header>playlist/PlaylistView.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

tomahawk-0.4.2.tar.bz2/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h -> tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget_p.h Changed

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011-2012, Jeff Mitchell <jeff@tomahawk-player.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
@@ -21,9 +22,10 @@
 
 #include "ArtistInfoWidget.h"
 #include "ui_ArtistInfoWidget.h"
-#include "playlistinterface.h"
-#include "treeproxymodel.h"
-#include "result.h"
+#include "PlaylistInterface.h"
+#include "TreeProxyModel.h"
+#include "Result.h"
+#include "Typedefs.h"
 
 #include <QObject>
 
@@ -35,12 +37,12 @@
         : PlaylistInterface()
         , m_w( w )
     {
-        connect( m_w->ui->albums->proxyModel()->playlistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
-                 SLOT( anyRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
-        connect( m_w->ui->relatedArtists->proxyModel()->playlistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
-                 SLOT( anyRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
-        connect( m_w->ui->topHits->proxyModel()->playlistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ),
-                 SLOT( anyRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode ) ) );
+        connect( m_w->ui->albums->proxyModel()->playlistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ),
+                 SLOT( anyRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
+        connect( m_w->ui->relatedArtists->proxyModel()->playlistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ),
+                 SLOT( anyRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
+        connect( m_w->ui->topHits->proxyModel()->playlistInterface().data(), SIGNAL( repeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ),
+                 SLOT( anyRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode ) ) );
 
         connect( m_w->ui->albums->proxyModel()->playlistInterface().data(), SIGNAL( shuffleModeChanged( bool ) ),
                  SLOT( anyShuffleChanged( bool ) ) );
@@ -53,7 +55,7 @@
 
 
     // Any one is fine, we keep them all synched
-    virtual RepeatMode repeatMode() const { return m_w->ui->albums->proxyModel()->playlistInterface()->repeatMode(); }
+    virtual Tomahawk::PlaylistModes::RepeatMode repeatMode() const { return m_w->ui->albums->proxyModel()->playlistInterface()->repeatMode(); }
 
     virtual bool shuffled() const { return m_w->ui->albums->proxyModel()->playlistInterface()->shuffled(); }
 
@@ -72,7 +74,7 @@
     }
 
 public slots:
-    virtual void setRepeatMode( RepeatMode mode )
+    virtual void setRepeatMode( Tomahawk::PlaylistModes::RepeatMode mode )
     {
         m_w->ui->albums->proxyModel()->playlistInterface()->setRepeatMode( mode );
         m_w->ui->relatedArtists->proxyModel()->playlistInterface()->setRepeatMode( mode );
@@ -87,15 +89,10 @@
     }
 
 signals:
-    void repeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
-    void shuffleModeChanged( bool enabled );
-
-    void trackCountChanged( unsigned int tracks );
-    void sourceTrackCountChanged( unsigned int tracks );
     void nextTrackReady();
 
 private slots:
-    void anyRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode )
+    void anyRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode )
     {
         emit repeatModeChanged( mode );
     }

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.cpp Added

@@ -0,0 +1,117 @@
+/* === 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
+ *   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 "SourceInfoWidget.h"
+#include "ui_SourceInfoWidget.h"
+
+#include "Source.h"
+#include "ViewManager.h"
+
+#include "playlist/AlbumModel.h"
+#include "playlist/RecentlyAddedModel.h"
+#include "playlist/RecentlyPlayedModel.h"
+
+#include "database/Database.h"
+#include "database/DatabaseCommand_AllAlbums.h"
+
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
+
+SourceInfoWidget::SourceInfoWidget( const Tomahawk::source_ptr& source, QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::SourceInfoWidget )
+    , m_source( source )
+{
+    ui->setupUi( this );
+
+    TomahawkUtils::unmarginLayout( layout() );
+    TomahawkUtils::unmarginLayout( ui->horizontalLayout );
+    TomahawkUtils::unmarginLayout( ui->verticalLayout );
+    TomahawkUtils::unmarginLayout( ui->verticalLayout_2 );
+    TomahawkUtils::unmarginLayout( ui->verticalLayout_3 );
+
+    ui->splitter->setStretchFactor( 0, 0 );
+    ui->splitter->setStretchFactor( 1, 1 );
+
+    m_recentTracksModel = new RecentlyAddedModel( ui->recentCollectionView );
+    m_recentTracksModel->setStyle( PlayableModel::Short );
+    ui->recentCollectionView->setPlayableModel( m_recentTracksModel );
+    ui->recentCollectionView->sortByColumn( PlayableModel::Age, Qt::DescendingOrder );
+    m_recentTracksModel->setSource( source );
+
+    m_historyModel = new RecentlyPlayedModel( ui->historyView );
+    m_historyModel->setStyle( PlayableModel::Short );
+    ui->historyView->setPlaylistModel( m_historyModel );
+    m_historyModel->setSource( source );
+
+    m_recentAlbumModel = new AlbumModel( ui->recentAlbumView );
+    ui->recentAlbumView->setPlayableModel( m_recentAlbumModel );
+    ui->recentAlbumView->proxyModel()->sort( -1 );
+
+    onCollectionChanged();
+    connect( source->collection().data(), SIGNAL( changed() ), SLOT( onCollectionChanged() ) );
+
+    m_title = tr( "New Additions" );
+    if ( source->isLocal() )
+    {
+        m_description = tr( "My recent activity" );
+    }
+    else
+    {
+        m_description = tr( "Recent activity from %1" ).arg( source->friendlyName() );
+    }
+
+    m_pixmap.load( RESPATH "images/new-additions.png" );
+}
+
+
+SourceInfoWidget::~SourceInfoWidget()
+{
+    delete ui;
+}
+
+
+void
+SourceInfoWidget::onCollectionChanged()
+{
+    loadRecentAdditions();
+}
+
+
+void
+SourceInfoWidget::loadRecentAdditions()
+{
+    m_recentAlbumModel->addFilteredCollection( m_source->collection(), 20, DatabaseCommand_AllAlbums::ModificationTime, true );
+}
+
+
+void
+SourceInfoWidget::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.h Added

@@ -0,0 +1,81 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 SOURCEINFOWIDGET_H
+#define SOURCEINFOWIDGET_H
+
+#include <QWidget>
+
+#include "PlaylistInterface.h"
+#include "ViewPage.h"
+
+#include "DllMacro.h"
+
+class AlbumModel;
+class CollectionFlatModel;
+class RecentlyAddedModel;
+class RecentlyPlayedModel;
+
+namespace Ui
+{
+    class SourceInfoWidget;
+}
+
+class DLLEXPORT SourceInfoWidget : public QWidget, public Tomahawk::ViewPage
+{
+Q_OBJECT
+
+public:
+    SourceInfoWidget( const Tomahawk::source_ptr& source, QWidget* parent = 0 );
+    ~SourceInfoWidget();
+
+    virtual QWidget* widget() { return this; }
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const { return Tomahawk::playlistinterface_ptr(); }
+
+    virtual QString title() const { return m_title; }
+    virtual QString description() const { return m_description; }
+    virtual QPixmap pixmap() const { return m_pixmap; }
+
+    virtual bool showStatsBar() const { return false; }
+
+    virtual bool jumpToCurrentTrack() { return false; }
+
+protected:
+    void changeEvent( QEvent* e );
+
+private slots:
+    void loadRecentAdditions();
+
+    void onCollectionChanged();
+
+private:
+    Ui::SourceInfoWidget *ui;
+
+    RecentlyAddedModel* m_recentTracksModel;
+    RecentlyPlayedModel* m_historyModel;
+    AlbumModel* m_recentAlbumModel;
+
+    Tomahawk::source_ptr m_source;
+
+    QString m_title;
+    QString m_description;
+    QPixmap m_pixmap;
+};
+
+#endif // SOURCEINFOWIDGET_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/SourceInfoWidget.ui Added

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SourceInfoWidget</class>
+ <widget class="QWidget" name="SourceInfoWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>831</width>
+    <height>460</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="handleWidth">
+      <number>1</number>
+     </property>
+     <widget class="QWidget" name="">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="HeaderLabel" name="label_2">
+         <property name="text">
+          <string>Recent Albums</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="GridView" name="recentAlbumView">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>192</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="dragEnabled">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::DragDrop</enum>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::ExtendedSelection</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <item>
+          <widget class="HeaderLabel" name="label">
+           <property name="text">
+            <string>Latest Additions</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="TrackView" name="recentCollectionView"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="HeaderLabel" name="label_3">
+           <property name="text">
+            <string>Recently Played Tracks</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="PlaylistView" name="historyView"/>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>HeaderLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">widgets/HeaderLabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>GridView</class>
+   <extends>QListView</extends>
+   <header>playlist/GridView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>PlaylistView</class>
+   <extends>QTreeView</extends>
+   <header>playlist/PlaylistView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>TrackView</class>
+   <extends>QTreeView</extends>
+   <header>playlist/TrackView.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp Added

@@ -0,0 +1,287 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@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 "TrackInfoWidget.h"
+#include "ui_TrackInfoWidget.h"
+
+#include <QScrollArea>
+#include <QScrollBar>
+
+#include "ViewManager.h"
+#include "SourceList.h"
+#include "playlist/PlayableModel.h"
+#include "audio/AudioEngine.h"
+
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* parent )
+    : QWidget( parent )
+    , ui( new Ui::TrackInfoWidget )
+{
+    QWidget* widget = new QWidget;
+    ui->setupUi( widget );
+
+    QPalette pal = palette();
+    pal.setColor( QPalette::Window, QColor( "#454e59" ) );
+
+    widget->setPalette( pal );
+    widget->setAutoFillBackground( true );
+    ui->rightBar->setPalette( pal );
+    ui->rightBar->setAutoFillBackground( true );
+
+    ui->statsLabel->setStyleSheet( "QLabel { background-image:url(); border: 2px solid #dddddd; background-color: #faf9f9; border-radius: 4px; padding: 12px; }" );
+    ui->lyricsView->setStyleSheet( "QTextBrowser#lyricsView { background-color: transparent; }" );
+
+    ui->lyricsView->setFrameShape( QFrame::NoFrame );
+    ui->lyricsView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+
+    ui->similarTracksView->setAutoResize( true );
+    ui->similarTracksView->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+//    TomahawkUtils::styleScrollBar( ui->similarTracksView->verticalScrollBar() );
+    TomahawkUtils::styleScrollBar( ui->lyricsView->verticalScrollBar() );
+
+    QFont f = font();
+    f.setBold( true );
+    f.setPixelSize( 18 );
+    ui->trackLabel->setFont( f );
+//    ui->similarTracksLabel->setFont( f );
+
+    f.setPixelSize( 14 );
+    ui->artistLabel->setFont( f );
+    ui->albumLabel->setFont( f );
+
+    f.setPixelSize( 12 );
+    ui->statsLabel->setFont( f );
+
+//    ui->similarTracksView->setStyleSheet( "QListView { background-color: transparent; } QListView::item { background-color: transparent; }" );
+
+    QPalette p = ui->trackLabel->palette();
+    p.setColor( QPalette::Foreground, Qt::white );
+    p.setColor( QPalette::Text, Qt::white );
+
+    ui->trackLabel->setPalette( p );
+    ui->artistLabel->setPalette( p );
+    ui->albumLabel->setPalette( p );
+    ui->lyricsView->setPalette( p );
+    ui->label->setPalette( p );
+//    ui->similarTracksLabel->setPalette( p );
+
+    ui->artistLabel->setType( QueryLabel::Artist );
+    ui->albumLabel->setType( QueryLabel::Album );
+
+    m_relatedTracksModel = new PlayableModel( ui->similarTracksView );
+    ui->similarTracksView->setPlayableModel( m_relatedTracksModel );
+    ui->similarTracksView->proxyModel()->sort( -1 );
+    ui->similarTracksView->setEmptyTip( tr( "Sorry, but we could not find similar tracks for this song!" ) );
+
+    m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, QSize( 48, 48 ) );
+    ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::ScaledCover, QSize( ui->cover->sizeHint() ) ) );
+
+    QScrollArea* area = new QScrollArea();
+    area->setWidgetResizable( true );
+    area->setWidget( widget );
+    area->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
+
+    area->setStyleSheet( "QScrollArea { background-color: #454e59 }" );
+    area->setFrameShape( QFrame::NoFrame );
+    area->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+
+    QVBoxLayout* layout = new QVBoxLayout();
+    layout->addWidget( area );
+    setLayout( layout );
+    TomahawkUtils::unmarginLayout( layout );
+
+    ui->similarTracksView->setStyleSheet( "QListView { background-color: transparent; }" );
+    ui->frame->setStyleSheet( "QFrame#frame { background-color: transparent; }"
+                              "QFrame#frame { "
+                              "border-image: url(" RESPATH "images/scrollbar-vertical-handle.png) 3 3 3 3 stretch stretch;"
+                              "border-top: 3px transparent; border-bottom: 3px transparent; border-right: 3px transparent; border-left: 3px transparent; }" );
+
+    load( query );
+
+    connect( ui->artistLabel, SIGNAL( clickedArtist() ), SLOT( onArtistClicked() ) );
+    connect( ui->albumLabel,  SIGNAL( clickedAlbum() ),  SLOT( onAlbumClicked() ) );
+}
+
+
+TrackInfoWidget::~TrackInfoWidget()
+{
+    delete ui;
+}
+
+
+Tomahawk::playlistinterface_ptr
+TrackInfoWidget::playlistInterface() const
+{
+    return ui->similarTracksView->playlistInterface();
+}
+
+
+bool
+TrackInfoWidget::isBeingPlayed() const
+{
+    //tDebug() << Q_FUNC_INFO << "audioengine playlistInterface = " << AudioEngine::instance()->currentTrackPlaylist()->id();
+    //tDebug() << Q_FUNC_INFO << "albumsView playlistInterface = " << ui->albumsView->playlistInterface()->id();
+    //tDebug() << Q_FUNC_INFO << "tracksView playlistInterface = " << ui->tracksView->playlistInterface()->id();
+    if ( ui->similarTracksView->playlistInterface() == AudioEngine::instance()->currentTrackPlaylist() )
+        return true;
+
+    return false;
+}
+
+
+void
+TrackInfoWidget::load( const query_ptr& query )
+{
+    m_query = query;
+    m_artist = Artist::get( m_query->artist() );
+    m_title = QString( "%1 - %2" ).arg( query->artist() ).arg( query->track() );
+
+    if ( !m_query.isNull() )
+    {
+        disconnect( m_query.data(), SIGNAL( lyricsLoaded() ), this, SLOT( onLyricsLoaded() ) );
+        disconnect( m_query.data(), SIGNAL( similarTracksLoaded() ), this, SLOT( onSimilarTracksLoaded() ) );
+        disconnect( m_query.data(), SIGNAL( statsLoaded() ), this, SLOT( onStatsLoaded() ) );
+        disconnect( m_query.data(), SIGNAL( updated() ), this, SLOT( onCoverUpdated() ) );
+        disconnect( m_artist.data(), SIGNAL( statsLoaded() ), this, SLOT( onStatsLoaded() ) );
+        disconnect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), this, SLOT( onSimilarArtistsLoaded() ) );
+    }
+
+    connect( m_artist.data(), SIGNAL( similarArtistsLoaded() ), SLOT( onSimilarArtistsLoaded() ) );
+    connect( m_artist.data(), SIGNAL( statsLoaded() ), SLOT( onStatsLoaded() ) );
+    connect( m_query.data(), SIGNAL( lyricsLoaded() ), SLOT( onLyricsLoaded() ) );
+    connect( m_query.data(), SIGNAL( similarTracksLoaded() ), SLOT( onSimilarTracksLoaded() ) );
+    connect( m_query.data(), SIGNAL( updated() ), SLOT( onCoverUpdated() ) );
+    connect( m_query.data(), SIGNAL( statsLoaded() ), SLOT( onStatsLoaded() ) );
+
+    m_artist->loadStats();
+    m_query->loadStats();
+//    m_query->lyrics();
+    onCoverUpdated();
+
+    ui->trackLabel->setText( query->track() );
+    ui->artistLabel->setQuery( query );
+    ui->albumLabel->setQuery( query );
+    ui->albumLabel->setVisible( !query->album().isEmpty() );
+
+    m_relatedTracksModel->clear();
+    m_relatedTracksModel->startLoading();
+
+    if ( !m_query->similarTracks().isEmpty() )
+        onSimilarTracksLoaded();
+}
+
+
+void
+TrackInfoWidget::onCoverUpdated()
+{
+    if ( m_query->cover( QSize( 0, 0 ) ).isNull() )
+        return;
+
+    m_pixmap = m_query->cover( ui->cover->size() );
+    ui->cover->setPixmap( m_pixmap );
+}
+
+
+void
+TrackInfoWidget::onStatsLoaded()
+{
+    QList< Tomahawk::PlaybackLog > history = m_query->playbackHistory( SourceList::instance()->getLocal() );
+    const unsigned int trackCounter = m_query->playbackCount( SourceList::instance()->getLocal() );
+    const unsigned int artistCounter = m_artist->playbackCount( SourceList::instance()->getLocal() );
+
+    QString stats;
+
+    if ( trackCounter )
+        stats = tr( "You've listened to this track %n time(s).", "", trackCounter );
+    else
+        stats = tr( "You've never listened to this track before." );
+
+    if ( history.count() )
+    {
+        stats += "\n" + tr( "You first listened to it on %1." ).arg( QDateTime::fromTime_t( history.first().timestamp ).toString( "dd MMM yyyy" ) );
+    }
+
+    if ( artistCounter )
+        stats += "\n" + tr( "You've listened to %1 %n time(s).", "", artistCounter ).arg( m_artist->name() );
+    else
+        stats += "\n" + tr( "You've never listened to %1 before." ).arg( m_artist->name() );
+
+    ui->statsLabel->setText( stats );
+}
+
+
+void
+TrackInfoWidget::onSimilarArtistsLoaded()
+{
+/*    Artist* artist = qobject_cast<Artist*>( sender() );
+
+    m_relatedArtistsModel->addArtists( artist->similarArtists() );*/
+}
+
+
+void
+TrackInfoWidget::onSimilarTracksLoaded()
+{
+    m_relatedTracksModel->appendQueries( m_query->similarTracks() );
+    m_relatedTracksModel->finishLoading();
+}
+
+
+void
+TrackInfoWidget::onLyricsLoaded()
+{
+    ui->lyricsView->setHtml( m_query->lyrics().join( "<br/>" ) );
+}
+
+
+void
+TrackInfoWidget::onArtistClicked()
+{
+    ViewManager::instance()->show( Artist::get( m_query->artist(), false ) );
+}
+
+
+void
+TrackInfoWidget::onAlbumClicked()
+{
+    artist_ptr artist = Artist::get( m_query->artist(), false );
+    ViewManager::instance()->show( Album::get( artist, m_query->album(), false ) );
+}
+
+
+void
+TrackInfoWidget::changeEvent( QEvent* e )
+{
+    QWidget::changeEvent( e );
+    switch ( e->type() )
+    {
+        case QEvent::LanguageChange:
+            ui->retranslateUi( this );
+            break;
+
+        default:
+            break;
+    }
+}

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.h Added

@@ -0,0 +1,101 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@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/>.
+ */
+
+/**
+ * \class TrackInfoWidget
+ * \brief ViewPage, which displays a track
+ *
+ * This Tomahawk ViewPage displays a track
+ * It is our default ViewPage when showing an track via ViewManager.
+ *
+ */
+
+#ifndef TRACKINFOWIDGET_H
+#define TRACKINFOWIDGET_H
+
+#include <QtGui/QWidget>
+
+#include "PlaylistInterface.h"
+#include "ViewPage.h"
+#include "infosystem/InfoSystem.h"
+
+#include "DllMacro.h"
+#include "Typedefs.h"
+
+class PlayableModel;
+
+namespace Ui
+{
+    class TrackInfoWidget;
+}
+
+class DLLEXPORT TrackInfoWidget : public QWidget, public Tomahawk::ViewPage
+{
+Q_OBJECT
+
+public:
+    TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* parent = 0 );
+    ~TrackInfoWidget();
+
+    Tomahawk::query_ptr query() const { return m_query; }
+
+    virtual QWidget* widget() { return this; }
+    virtual Tomahawk::playlistinterface_ptr playlistInterface() const;
+
+    virtual QString title() const { return m_title; }
+    virtual QString description() const { return QString(); }
+    virtual QString longDescription() const { return QString(); }
+    virtual QPixmap pixmap() const { if ( m_pixmap.isNull() ) return Tomahawk::ViewPage::pixmap(); else return m_pixmap; }
+
+    virtual bool isTemporaryPage() const { return true; }
+    virtual bool showStatsBar() const { return false; }
+    virtual bool showInfoBar() const { return false; }
+
+    virtual bool jumpToCurrentTrack() { return false; }
+    virtual bool isBeingPlayed() const;
+
+public slots:
+    void load( const Tomahawk::query_ptr& query );
+
+protected:
+    void changeEvent( QEvent* e );
+
+private slots:
+    void onCoverUpdated();
+    void onStatsLoaded();
+    void onSimilarArtistsLoaded();
+    void onSimilarTracksLoaded();
+    void onLyricsLoaded();
+
+    void onArtistClicked();
+    void onAlbumClicked();
+
+private:
+    Ui::TrackInfoWidget *ui;
+
+    Tomahawk::query_ptr m_query;
+    Tomahawk::artist_ptr m_artist;
+
+    PlayableModel* m_relatedTracksModel;
+    QString m_title;
+    QPixmap m_pixmap;
+};
+
+#endif // TRACKINFOWIDGET_H

tomahawk-0.5.5.tar.bz2/src/libtomahawk/widgets/infowidgets/TrackInfoWidget.ui Added

@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TrackInfoWidget</class>
+ <widget class="QWidget" name="TrackInfoWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>951</width>
+    <height>771</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <property name="leftMargin">
+      <number>12</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>12</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>12</number>
+       </property>
+       <item>
+        <widget class="QFrame" name="frame">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Raised</enum>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_6">
+          <property name="spacing">
+           <number>4</number>
+          </property>
+          <property name="leftMargin">
+           <number>8</number>
+          </property>
+          <property name="topMargin">
+           <number>4</number>
+          </property>
+          <property name="rightMargin">
+           <number>8</number>
+          </property>
+          <property name="bottomMargin">
+           <number>8</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="label">
+            <property name="font">
+             <font>
+              <family>Arial</family>
+              <pointsize>18</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>Similar Tracks</string>
+            </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="GridView" name="similarTracksView">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>4</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QWidget" name="rightBar" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>300</width>
+           <height>500</height>
+          </size>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="leftMargin">
+           <number>16</number>
+          </property>
+          <property name="topMargin">
+           <number>12</number>
+          </property>
+          <property name="rightMargin">
+           <number>16</number>
+          </property>
+          <property name="bottomMargin">
+           <number>12</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="cover">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>220</width>
+              <height>220</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Cover</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_4">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>8</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout">
+            <property name="spacing">
+             <number>4</number>
+            </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="trackLabel">
+              <property name="text">
+               <string>Track</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout">
+              <property name="spacing">
+               <number>4</number>
+              </property>
+              <property name="margin">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QueryLabel" name="artistLabel">
+                <property name="text">
+                 <string>Artist</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_2">
+              <property name="spacing">
+               <number>4</number>
+              </property>
+              <property name="margin">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QueryLabel" name="albumLabel">
+                <property name="text">
+                 <string>Album</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>16</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QLabel" name="statsLabel">
+            <property name="text">
+             <string>Statistics</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>12</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item>
+           <widget class="QTextBrowser" name="lyricsView">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>300</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="openLinks">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>GridView</class>
+   <extends>QListView</extends>
+   <header location="global">GridView.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QueryLabel</class>
+   <extends>QLabel</extends>
+   <header>widgets/QueryLabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

tomahawk-0.5.5.tar.bz2/src/mac/MacDelegate.h Added

@@ -0,0 +1,40 @@
+#ifndef MACDELEGATE_H
+#define MACDELEGATE_H
+
+// This file inspired by clementine's MacDelegate.h
+
+#import <AppKit/NSApplication.h>
+
+#include "SPMediaKeyTap.h"
+
+namespace Tomahawk {
+    class MacShortcutHandler;
+    class PlatformInterface;
+}
+
+#if ( defined MAC_OS_X_VERSION_10_7 || defined SNOW_LEOPARD )
+@interface AppDelegate :NSObject <NSApplicationDelegate> {
+#else
+@interface AppDelegate :NSObject {
+#endif
+  Tomahawk::PlatformInterface* application_handler_;
+  NSMenu* dock_menu_;
+  SPMediaKeyTap* key_tap_;
+  Tomahawk::MacShortcutHandler* shortcut_handler_;
+}
+
+- (id) initWithHandler: (Tomahawk::PlatformInterface*)handler;
+// NSApplicationDelegate
+- (BOOL) applicationShouldHandleReopen: (NSApplication*)app hasVisibleWindows:(BOOL)flag;
+- (NSMenu*) applicationDockMenu: (NSApplication*)sender;
+- (void) setDockMenu: (NSMenu*)menu;
+- (Tomahawk::MacShortcutHandler*) shortcutHandler;
+- (void) setShortcutHandler: (Tomahawk::MacShortcutHandler*)backend;
+- (void)applicationDidFinishLaunching:(NSNotification*)aNotification;
+- (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication*)sender;
+- (void) mediaKeyTap: (SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
+@end
+
+
+
+#endif // MACDELEGATE_H

tomahawk-0.5.5.tar.bz2/src/mac/MacShortcutHandler.cpp Added

@@ -0,0 +1,50 @@
+/* === 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
+ *   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 "MacShortcutHandler.h"
+
+#include <IOKit/hidsystem/ev_keymap.h>
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+MacShortcutHandler::MacShortcutHandler(QObject *parent) :
+    Tomahawk::ShortcutHandler(parent)
+{
+
+}
+
+void
+MacShortcutHandler::macMediaKeyPressed( int key )
+{
+    switch (key) {
+      case NX_KEYTYPE_PLAY:
+        qDebug() << "emitting PlayPause pressed";
+        emit playPause();
+        break;
+      case NX_KEYTYPE_FAST:
+        qDebug() << "emitting next pressed";
+        emit next();
+        break;
+      case NX_KEYTYPE_REWIND:
+        qDebug() << "emitting prev pressed";
+        emit previous();
+        break;
+    }
+}

tomahawk-0.5.5.tar.bz2/src/mac/MacShortcutHandler.h Added

@@ -0,0 +1,40 @@
+/* === 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
+ *   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 MACSHORTCUTHANDLER_H
+#define MACSHORTCUTHANDLER_H
+
+#include "ShortcutHandler.h"
+
+#include <QObject>
+
+namespace Tomahawk {
+
+
+class MacShortcutHandler : public ShortcutHandler
+{
+    Q_OBJECT
+public:
+    explicit MacShortcutHandler(QObject *parent = 0);
+
+    void macMediaKeyPressed( int key );
+};
+
+}
+
+#endif // MACSHORTCUTHANDLER_H

tomahawk-0.5.5.tar.bz2/src/mac/TomahawkApp_Mac.h Added

@@ -0,0 +1,53 @@
+/* === 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 TOMAHAWKAPP_MAC_H
+#define TOMAHAWKAPP_MAC_H
+
+// this file and tomahawk_app.mm copied and inspired by mac_startup.* in clementine player,
+// copyright David Sansome 2010
+
+class QString;
+class QObject;
+
+namespace Tomahawk {
+
+class MacShortcutHandler;
+
+/// Interface between cocoa and tomahawk
+class PlatformInterface {
+ public:
+  // Called when the application should show itself.
+  virtual void activate() = 0;
+  virtual bool loadUrl( const QString& url ) = 0;
+
+  virtual ~PlatformInterface() {}
+};
+
+void macMain();
+void setShortcutHandler(Tomahawk::MacShortcutHandler* engine);
+// used for opening files with tomahawk
+void setApplicationHandler(PlatformInterface* handler);
+void checkForUpdates();
+
+// Pass in a QObject with slots "fullScreenEntered() and fullScreenExited() in order to be notified
+void enableFullscreen( QObject* notifier );
+
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/mac/TomahawkApp_Mac.mm Added

@@ -0,0 +1,303 @@
+/* === 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 "TomahawkApp_Mac.h"
+
+#include "MacDelegate.h"
+#include "MacShortcutHandler.h"
+#include "config.h"
+#include "TomahawkWindow.h"
+#include "audio/AudioEngine.h"
+
+#import <AppKit/NSApplication.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSError.h>
+#import <Foundation/NSFileManager.h>
+#import <Foundation/NSPathUtilities.h>
+#import <Foundation/NSThread.h>
+#import <Foundation/NSTimer.h>
+#import <Foundation/NSAppleEventManager.h>
+#import <Foundation/NSURL.h>
+#import <AppKit/NSEvent.h>
+#import <AppKit/NSNibDeclarations.h>
+
+#ifdef HAVE_SPARKLE
+#import <Sparkle/SUUpdater.h>
+#endif
+
+#include <QDebug>
+#include <QApplication>
+#include <QObject>
+#include <QMetaObject>
+
+@interface MacApplication :NSApplication {
+    AppDelegate* delegate_;
+    Tomahawk::MacShortcutHandler* shortcut_handler_;
+    Tomahawk::PlatformInterface* application_handler_;
+}
+
+- (Tomahawk::MacShortcutHandler*) shortcutHandler;
+- (void) setShortcutHandler: (Tomahawk::MacShortcutHandler*)handler;
+
+- (Tomahawk::PlatformInterface*) application_handler;
+- (void) setApplicationHandler: (Tomahawk::PlatformInterface*)handler;
+
+#ifdef HAVE_SPARKLE
+// SUUpdaterDelegate
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update;
+#endif
+
+@end
+
+
+@implementation AppDelegate
+
+- (id) init {
+  if ((self = super init)) {
+      application_handler_ = nil;
+      shortcut_handler_ = nil;
+      //dock_menu_ = nil;
+  }
+  return self;
+}
+
+- (id) initWithHandler: (Tomahawk::PlatformInterface*)handler {
+  application_handler_ = handler;
+
+  // Register defaults for the whitelist of apps that want to use media keys
+  NSUserDefaults standardUserDefaults registerDefaults:NSDictionary dictionaryWithObjectsAndKeys:
+     SPMediaKeyTap defaultMediaKeyUserBundleIdentifiers, @"SPApplicationsNeedingMediaKeys",
+      nil;
+
+
+  return self;
+}
+
+- (BOOL) applicationShouldHandleReopen: (NSApplication*)app hasVisibleWindows:(BOOL)flag {
+  if (application_handler_) {
+    application_handler_->activate();
+  }
+  return YES;
+}
+
+- (void) setDockMenu: (NSMenu*)menu {
+  dock_menu_ = menu;
+}
+
+- (NSMenu*) applicationDockMenu: (NSApplication*)sender {
+  return dock_menu_;
+}
+
+
+- (Tomahawk::MacShortcutHandler*) shortcutHandler {
+    return shortcut_handler_;
+}
+
+- (void) setShortcutHandler: (Tomahawk::MacShortcutHandler*)handler {
+    // should be the same as MacApplication's
+  shortcut_handler_ = handler;
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
+  key_tap_ = SPMediaKeyTap alloc initWithDelegate:self;
+  if(SPMediaKeyTap usesGlobalMediaKeyTap)
+    key_tap_ startWatchingMediaKeys;
+  else
+    qWarning()<<"Media key monitoring disabled";
+
+}
+
+- (void) mediaKeyTap: (SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event {
+  NSAssert(event type == NSSystemDefined && event subtype == SPSystemDefinedEventMediaKeys, @"Unexpected NSEvent in mediaKeyTap:receivedMediaKeyEvent:");
+
+  int key_code = ((event data1 & 0xFFFF0000) >> 16);
+  int key_flags = (event data1 & 0x0000FFFF);
+  BOOL key_is_pressed = (((key_flags & 0xFF00) >> 8)) == 0xA;
+  // not used. keep just in case
+  //  int key_repeat = (key_flags & 0x1);
+
+  if (!shortcut_handler_) {
+    qWarning() << "No shortcut handler when we get a media key event...";
+    return;
+  }
+  if (key_is_pressed) {
+    shortcut_handler_->macMediaKeyPressed(key_code);
+  }
+}
+
+- (BOOL) application: (NSApplication*)app openFile:(NSString*)filename {
+
+  if (application_handler_->loadUrl(QString::fromUtf8(filename UTF8String))) {
+    return YES;
+  }
+
+  return NO;
+}
+
+- (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication*) sender {
+  return NSTerminateNow;
+}
+
+@end
+
+@implementation MacApplication
+
+- (id) init {
+  if ((self = super init)) {
+      self setShortcutHandler:nil;
+      self setApplicationHandler:nil;
+
+      NSAppleEventManager *em = NSAppleEventManager sharedAppleEventManager;
+      em
+        setEventHandler:self
+            andSelector:@selector(getUrl:withReplyEvent:)
+          forEventClass:kInternetEventClass
+             andEventID:kAEGetURL;
+      em
+        setEventHandler:self
+            andSelector:@selector(getUrl:withReplyEvent:)
+          forEventClass:'WWW!'
+             andEventID:'OURL';
+      NSString *bundleID = NSBundle mainBundle bundleIdentifier;
+      OSStatus httpResult = LSSetDefaultHandlerForURLScheme((CFStringRef)@"tomahawk", (CFStringRef)bundleID);
+
+      Q_UNUSED(httpResult);
+      //TODO: Check httpResult and httpsResult for errors
+  }
+  return self;
+}
+
+- (Tomahawk::MacShortcutHandler*) shortcutHandler {
+    return shortcut_handler_;
+}
+
+- (void) setShortcutHandler: (Tomahawk::MacShortcutHandler*)handler {
+    // should be the same as AppDelegate's
+  shortcut_handler_ = handler;
+}
+
+- (Tomahawk::PlatformInterface*) application_handler {
+  return application_handler_;
+}
+
+- (void) setApplicationHandler: (Tomahawk::PlatformInterface*)handler {
+  delegate_ = AppDelegate alloc initWithHandler:handler;
+  // App-shortcut-handler set before delegate is set.
+  // this makes sure the delegate's shortcut_handler is set
+  delegate_ setShortcutHandler:shortcut_handler_;
+  self setDelegate:delegate_;
+}
+
+-(void) sendEvent: (NSEvent*)event {
+    // If event tap is not installed, handle events that reach the app instead
+    BOOL shouldHandleMediaKeyEventLocally = !SPMediaKeyTap usesGlobalMediaKeyTap;
+
+    if(shouldHandleMediaKeyEventLocally && event type == NSSystemDefined && event subtype == SPSystemDefinedEventMediaKeys) {
+      (id)self delegate mediaKeyTap: nil receivedMediaKeyEvent: event;
+    }
+
+    super sendEvent: event;
+}
+
+#ifdef HAVE_SPARKLE
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
+{
+    tLog() << "NSApp in willInstallUpdate, deleting Phonon objects";
+    AudioEngine::instance()->stop();
+    delete AudioEngine::instance();
+}
+#endif
+
+@end
+
+void Tomahawk::macMain() {
+  NSAutoreleasePool alloc init;
+  // Creates and sets the magic global variable so QApplication will find it.
+  MacApplication sharedApplication;
+#ifdef HAVE_SPARKLE
+    // Creates and sets the magic global variable for Sparkle.
+    SUUpdater sharedUpdater setDelegate: NSApp;
+#endif
+}
+
+
+void Tomahawk::setShortcutHandler(Tomahawk::MacShortcutHandler* handler) {
+  NSApp setShortcutHandler: handler;
+}
+
+void Tomahawk::setApplicationHandler(Tomahawk::PlatformInterface* handler) {
+  NSApp setApplicationHandler: handler;
+}
+
+void Tomahawk::checkForUpdates() {
+#ifdef HAVE_SPARKLE
+  SUUpdater sharedUpdater checkForUpdates: NSApp;
+#endif
+}
+
+#ifdef LION
+#define SET_LION_FULLSCREEN NSWindowCollectionBehaviorFullScreenPrimary
+#define LION_FULLSCREEN_ENTER_NOTIFICATION_VALUE NSWindowWillEnterFullScreenNotification
+#define LION_FULLSCREEN_EXIT_NOTIFICATION_VALUE NSWindowDidExitFullScreenNotification
+#else
+#define SET_LION_FULLSCREEN (NSUInteger)(1 << 7) // Defined as NSWindowCollectionBehaviorFullScreenPrimary in lion's NSWindow.h
+#define LION_FULLSCREEN_ENTER_NOTIFICATION_VALUE @"NSWindowWillEnterFullScreenNotification"
+#define LION_FULLSCREEN_EXIT_NOTIFICATION_VALUE @"NSWindowDidExitFullScreenNotification"
+#endif
+
+void Tomahawk::enableFullscreen( QObject* receiver )
+{
+    // We don't support anything below leopard, so if it's not snow leopard it must be lion
+    // Can't check for lion as Qt 4.7 doesn't have the enum val, not checking for Unknown as it will be lion
+    // on 4.8
+    if ( QSysInfo::MacintoshVersion != QSysInfo::MV_SNOWLEOPARD &&
+         QSysInfo::MacintoshVersion != QSysInfo::MV_LEOPARD   )
+    {
+        qDebug() << "Enabling Lion Full-screeen";
+        // Can't include TomahawkApp.h in a .mm file, pulls in InfoSystem.h which uses
+        // the objc keyword 'id'
+        foreach( QWidget* w, QApplication::topLevelWidgets() )
+        {
+            if ( qobject_cast< TomahawkWindow* >( w ) )
+            {
+                NSView *nsview = (NSView *)w->winId();
+                NSWindow *nswindow = nsview window;
+                nswindow setCollectionBehavior:SET_LION_FULLSCREEN;
+
+                if ( !receiver )
+                    continue;
+
+                NSNotificationCenter defaultCenter addObserverForName:LION_FULLSCREEN_ENTER_NOTIFICATION_VALUE
+                                                                  object:nswindow
+                                                                   queue:nil
+                                                              usingBlock:^(NSNotification * note) {
+                    NSLog(@"Became Full Screen!");
+                    QMetaObject::invokeMethod( receiver, "fullScreenEntered", Qt::DirectConnection );
+                };
+                NSNotificationCenter defaultCenter addObserverForName:LION_FULLSCREEN_EXIT_NOTIFICATION_VALUE
+                                                                  object:nswindow
+                                                                   queue:nil
+                                                              usingBlock:^(NSNotification * note) {
+                    NSLog(@"Left Full Screen!");
+                    QMetaObject::invokeMethod( receiver, "fullScreenExited", Qt::DirectConnection );
+                };
+            }
+        }
+    }
+}

tomahawk-0.4.2.tar.bz2/src/main.cpp -> tomahawk-0.5.5.tar.bz2/src/main.cpp Changed

@@ -17,16 +17,17 @@
  */
 
 
-#include "tomahawkapp.h"
+#include "TomahawkApp.h"
 
 #include "thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h"
-#include "ubuntuunityhack.h"
-#include "tomahawksettings.h"
-
-#include <QTranslator>
+#include "UbuntuUnityHack.h"
+#include "TomahawkSettings.h"
+#include "utils/TomahawkUtils.h"
+#include "config.h"
+#include "utils/Logger.h"
 
 #ifdef Q_WS_MAC
-    #include "tomahawkapp_mac.h"
+    #include "TomahawkApp_Mac.h"
     #include </System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/Headers/AppleEvents.h>
     static pascal OSErr appleEventHandler( const AppleEvent*, AppleEvent*, long );
 #endif
@@ -36,97 +37,149 @@
     #include "breakpad/BreakPad.h"
 #endif
 
+
 #ifdef Q_OS_WIN
+// code from patch attached to QTBUG-19064 by Honglei Zhang
+LRESULT QT_WIN_CALLBACK qt_LowLevelKeyboardHookProc( int nCode, WPARAM wParam, LPARAM lParam );
+HHOOK hKeyboardHook;
+HINSTANCE hGuiLibInstance;
+
+LRESULT QT_WIN_CALLBACK qt_LowLevelKeyboardHookProc( int nCode, WPARAM wParam, LPARAM lParam )
+{
+    LPKBDLLHOOKSTRUCT kbHookStruct = reinterpret_cast<LPKBDLLHOOKSTRUCT>(lParam);
+
+    switch(kbHookStruct->vkCode)
+    {
+        case VK_VOLUME_MUTE:
+        case VK_VOLUME_DOWN:
+        case VK_VOLUME_UP:
+        case VK_MEDIA_NEXT_TRACK:
+        case VK_MEDIA_PREV_TRACK:
+        case VK_MEDIA_STOP:
+        case VK_MEDIA_PLAY_PAUSE:
+        case VK_LAUNCH_MEDIA_SELECT:
+            // send message
+            {
+                HWND hWnd = NULL;
+                foreach ( QWidget *widget, QApplication::topLevelWidgets() )
+                {
+                    // relay message to each top level widgets(window)
+                    // if the window has focus, we don't send a duplicate message
+                    if ( QApplication::activeWindow() == widget )
+                        continue;
+
+                    hWnd = widget->winId();
+
+                    // generate message and post it to the message queue
+                    LPKBDLLHOOKSTRUCT pKeyboardHookStruct = reinterpret_cast<LPKBDLLHOOKSTRUCT>(lParam);
+                    WPARAM _wParam = pKeyboardHookStruct->vkCode;
+                    LPARAM _lParam = MAKELPARAM( pKeyboardHookStruct->scanCode, pKeyboardHookStruct->flags );
+                    PostMessage( hWnd, wParam, _wParam, _lParam );
+                }
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    return CallNextHookEx( 0, nCode, wParam, lParam );
+}
+
 #include <io.h>
 #define argc __argc
 #define argv __argv
 // code taken from AbiWord, (c) AbiSource Inc.
 
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance,
-    PSTR szCmdLine, int iCmdShow)
+int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow )
 {
-    if (fileno (stdout) != -1 && _get_osfhandle (fileno (stdout)) != -1)
+    hKeyboardHook = NULL;
+    hGuiLibInstance = hInstance;
+
+    // setup keyboard hook to receive multimedia key events when application is at background
+    hKeyboardHook = SetWindowsHookEx( WH_KEYBOARD_LL,(HOOKPROC) qt_LowLevelKeyboardHookProc, hGuiLibInstance, 0 );
+
+    if ( fileno( stdout ) != -1 && _get_osfhandle( fileno( stdout ) ) != -1 )
     {
         /* stdout is fine, presumably redirected to a file or pipe */
     }
     else
     {
         typedef BOOL (WINAPI * AttachConsole_t) (DWORD);
+        AttachConsole_t p_AttachConsole = (AttachConsole_t) GetProcAddress( GetModuleHandleW( L"kernel32.dll" ), "AttachConsole" );
 
-        AttachConsole_t p_AttachConsole = (AttachConsole_t) GetProcAddress (GetModuleHandleW(L"kernel32.dll"), "AttachConsole");
-
-        if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS))
+        if ( p_AttachConsole != NULL && p_AttachConsole( ATTACH_PARENT_PROCESS ) )
         {
-            _wfreopen (L"CONOUT$", L"w", stdout);
-            dup2 (fileno (stdout), 1);
-            _wfreopen (L"CONOUT$", L"w", stderr);
-            dup2 (fileno (stderr), 2);
+            _wfreopen ( L"CONOUT$", L"w", stdout );
+            dup2( fileno( stdout ), 1 );
+            _wfreopen ( L"CONOUT$", L"w", stderr );
+            dup2( fileno( stderr ), 2 );
         }
     }
 #else // Q_OS_WIN
+
 int
 main( int argc, char *argv )
 {
-    #ifdef Q_WS_MAC
+#ifdef Q_WS_MAC
     // Do Mac specific startup to get media keys working.
     // This must go before QApplication initialisation.
     Tomahawk::macMain();
 
+    // Fixes focus issue with NSSearchField, see QTBUG-11401
+    // code taken from clementine:main.cpp:336
+    QCoreApplication::setAttribute( Qt::AA_NativeWindows, true );
+
     // used for url handler
     AEEventHandlerUPP h = AEEventHandlerUPP( appleEventHandler );
     AEInstallEventHandler( 'GURL', 'GURL', h, 0, false );
     #endif // Q_WS_MAC
 #endif //Q_OS_WIN
 
-/*    // Unity hack taken from Clementine's main.cpp
-#ifdef Q_OS_LINUX
-    // In 11.04 Ubuntu decided that the system tray should be reserved for certain
-    // whitelisted applications.  Tomahawk will override this setting and insert
-    // itself into the list of whitelisted apps.
-    setenv( "QT_X11_NO_NATIVE_MENUBAR", "1", true );
-    UbuntuUnityHack hack;
-#endif*/
-
     TomahawkApp a( argc, argv );
 
+    // MUST register StateHash ****before*** initing TomahawkSettingsGui as constructor of settings does upgrade before Gui subclass registers type
+    TomahawkSettings::registerCustomSettingsHandlers();
+    TomahawkSettingsGui::registerCustomSettingsHandlers();
+
 #ifdef ENABLE_HEADLESS
     new TomahawkSettings( &a );
 #else
     new TomahawkSettingsGui( &a );
 #endif
 
-#ifndef ENABLE_HEADLESS
-    new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() );
+#ifndef ENABLE_HEADLESSs
+#ifdef WITH_BREAKPAD
+    new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() && !TomahawkUtils::headless() );
+#endif
 #endif
 
-    KDSingleApplicationGuard guard( &a, KDSingleApplicationGuard::AutoKillOtherInstances );
-    QObject::connect( &guard, SIGNAL( instanceStarted( KDSingleApplicationGuard::Instance ) ), &a, SLOT( instanceStarted( KDSingleApplicationGuard::Instance )  ) );
+    KDSingleApplicationGuard guard( KDSingleApplicationGuard::AutoKillOtherInstances );
+    QObject::connect( &guard, SIGNAL( instanceStarted( KDSingleApplicationGuard::Instance ) ), &a, SLOT( instanceStarted( KDSingleApplicationGuard::Instance ) ) );
 
     if ( guard.isPrimaryInstance() )
         a.init();
 
-    QString locale = QLocale::system().name();
-    if ( locale == "C" )
-        locale = "en";
-    QTranslator translator;
-    if ( translator.load( QString( ":/lang/tomahawk_" ) + locale ) )
-    {
-        tDebug() << "Using system locale:" << locale;
-    }
-    else
-    {
-        tDebug() << "Using default locale, system locale one not found:" << locale;
-        translator.load( QString( ":/lang/tomahawk_en" ) );
-    }
-    a.installTranslator( &translator );
-
     if ( argc > 1 )
     {
         QString arg = a.arguments() 1 ;
         a.loadUrl( arg );
     }
 
-    return a.exec();
+    int returnCode = 0;
+    if ( guard.isPrimaryInstance() )
+        returnCode = a.exec();
+
+#ifdef Q_OS_WIN
+    // clean up keyboard hook
+    if ( hKeyboardHook )
+    {
+        UnhookWindowsHookEx( hKeyboardHook );
+        hKeyboardHook = NULL;
+    }
+#endif
+
+    return returnCode;
 }

tomahawk-0.5.5.tar.bz2/src/sourcetree/AnimationHelper.cpp Added

@@ -0,0 +1,130 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Michael Zanetti <mzanetti@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 "AnimationHelper.h"
+
+#include "QDebug"
+
+AnimationHelper::AnimationHelper( const QModelIndex& index, QObject *parent )
+    :QObject( parent )
+    , m_index( index )
+    , m_fullyExpanded( false )
+    , m_expandAnimation( 0 )
+{
+    m_expandTimer.setSingleShot( true );
+    m_expandTimer.setInterval( 600 );
+    connect( &m_expandTimer, SIGNAL(timeout()), SLOT(expandTimeout()));
+
+    m_collapseTimer.setSingleShot( true );
+    m_collapseTimer.setInterval( 600 );
+    connect( &m_collapseTimer, SIGNAL(timeout()), SLOT(collapseTimeout()));
+}
+
+bool AnimationHelper::initialized() const
+{
+    return m_expandAnimation != 0;
+}
+
+void AnimationHelper::initialize( const QSize& startValue, const QSize& endValue, int duration )
+{
+    m_size = startValue;
+    m_targetSize = endValue;
+    m_startSize = startValue;
+
+    m_expandAnimation = new QPropertyAnimation( this, "size", this );
+    m_expandAnimation->setStartValue( startValue );
+    m_expandAnimation->setEndValue( endValue );
+    m_expandAnimation->setDuration( duration );
+    m_expandAnimation->setEasingCurve( QEasingCurve::OutExpo );
+    qDebug() << "starting animation" << startValue << endValue << duration;
+    connect( m_expandAnimation, SIGNAL( finished() ), SLOT(expandAnimationFinished()));
+
+    m_collapseAnimation= new QPropertyAnimation( this, "size", this );
+    m_collapseAnimation->setStartValue( endValue );
+    m_collapseAnimation->setEndValue( startValue );
+    m_collapseAnimation->setDuration( duration );
+    m_collapseAnimation->setEasingCurve( QEasingCurve::InExpo );
+    connect( m_collapseAnimation, SIGNAL( finished() ), SLOT(collapseAnimationFinished()));
+
+}
+
+void AnimationHelper::setSize( const QSize& size )
+{
+    m_size = size;
+    emit sizeChanged();
+    //qDebug() << "animaton setting size to" << size;
+}
+
+void AnimationHelper::expand()
+{
+    m_collapseTimer.stop();
+    m_expandTimer.start();
+}
+
+void AnimationHelper::collapse( bool immediately )
+{
+    if ( m_expandTimer.isActive() )
+    {
+        m_expandTimer.stop();
+        emit finished( m_index );
+        return;
+    }
+
+    if ( immediately )
+    {
+        m_fullyExpanded = false;
+        m_collapseAnimation->start();
+    }
+    else
+        m_collapseTimer.start();
+}
+
+bool AnimationHelper::partlyExpanded()
+{
+    return m_size != m_startSize;
+//    return m_fullyExpanded
+//            || ( m_expandAnimation->state() == QPropertyAnimation::Running && m_expandAnimation->currentTime() > 250 )
+//            || ( m_collapseAnimation->state() == QPropertyAnimation::Running && m_collapseAnimation->currentTime() < 100 );
+}
+
+bool AnimationHelper::fullyExpanded()
+{
+    return m_fullyExpanded;
+}
+
+void AnimationHelper::expandTimeout()
+{
+    m_expandAnimation->start();
+}
+
+void AnimationHelper::collapseTimeout()
+{
+    m_fullyExpanded = false;
+    m_collapseAnimation->start();
+}
+
+void AnimationHelper::expandAnimationFinished()
+{
+    m_fullyExpanded = true;
+}
+
+void AnimationHelper::collapseAnimationFinished()
+{
+    emit finished( m_index );
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/AnimationHelper.h Changed

tomahawk-0.5.5.tar.bz2/src/sourcetree/SourceDelegate.cpp Added

@@ -0,0 +1,751 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011, Michael Zanetti <mzanetti@kde.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "SourceDelegate.h"
+
+#include "items/SourceTreeItem.h"
+#include "items/SourceItem.h"
+#include "items/PlaylistItems.h"
+#include "items/CategoryItems.h"
+#include "items/TemporaryPageItem.h"
+
+#include "utils/TomahawkUtilsGui.h"
+#include "AnimationHelper.h"
+#include "Source.h"
+#include "TomahawkSettings.h"
+
+#include <QtGui/QApplication>
+#include <QtGui/QPainter>
+#include <QtGui/QMouseEvent>
+#include <audio/AudioEngine.h>
+#include <ActionCollection.h>
+
+#define TREEVIEW_INDENT_ADD 12
+
+
+SourceDelegate::SourceDelegate( QAbstractItemView* parent )
+    : QStyledItemDelegate( parent )
+    , m_parent( parent )
+    , m_lastClicked( -1 )
+{
+    m_dropTypeMap.insert( 0, SourceTreeItem::DropTypeThisTrack );
+    m_dropTypeMap.insert( 1, SourceTreeItem::DropTypeThisAlbum );
+    m_dropTypeMap.insert( 2, SourceTreeItem::DropTypeAllFromArtist );
+    m_dropTypeMap.insert( 3, SourceTreeItem::DropTypeLocalItems );
+    m_dropTypeMap.insert( 4, SourceTreeItem::DropTypeTop50 );
+
+    m_dropTypeTextMap.insert( 0, tr( "Track" ) );
+    m_dropTypeTextMap.insert( 1, tr( "Album" ) );
+    m_dropTypeTextMap.insert( 2, tr( "Artist" ) );
+    m_dropTypeTextMap.insert( 3, tr( "Local" ) );
+    m_dropTypeTextMap.insert( 4, tr( "Top 10" ) );
+
+    m_dropTypeImageMap.insert( 0, QPixmap( RESPATH "images/drop-song.png" ).scaledToWidth( 32, Qt::SmoothTransformation ) );
+    m_dropTypeImageMap.insert( 1, QPixmap( RESPATH "images/drop-album.png" ).scaledToWidth( 32, Qt::SmoothTransformation ) );
+    m_dropTypeImageMap.insert( 2, QPixmap( RESPATH "images/drop-all-songs.png" ).scaledToHeight( 32, Qt::SmoothTransformation ) );
+    m_dropTypeImageMap.insert( 3, QPixmap( RESPATH "images/drop-local-songs.png" ).scaledToWidth( 32, Qt::SmoothTransformation ) );
+    m_dropTypeImageMap.insert( 4, QPixmap( RESPATH "images/drop-top-songs.png" ).scaledToWidth( 32, Qt::SmoothTransformation ) );
+
+    m_dropMimeData = new QMimeData();
+
+    m_headphonesOff.load( RESPATH "images/headphones-off.png" );
+    m_headphonesOn.load( RESPATH "images/headphones-sidebar.png" );
+    m_realtimeLocked.load( RESPATH "images/closed-padlock.png" );
+    m_realtimeUnlocked.load( RESPATH "images/open-padlock.png" );
+    m_nowPlayingSpeaker.load( RESPATH "images/now-playing-speaker.png" );
+    m_nowPlayingSpeakerDark.load( RESPATH "images/now-playing-speaker-dark.png" );
+}
+
+
+SourceDelegate::~SourceDelegate()
+{
+    delete m_dropMimeData;
+}
+
+
+QSize
+SourceDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
+    SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() );
+
+    if ( type == SourcesModel::Collection )
+    {
+        return QSize( option.rect.width(), 40 );
+    }
+    else if ( type == SourcesModel::Divider )
+    {
+        return QSize( option.rect.width(), 6 );
+    }
+    else if ( type == SourcesModel::Group && index.row() > 0 )
+    {
+        return QSize( option.rect.width(), 24 );
+    }
+    else if ( m_expandedMap.contains( index ) )
+    {
+        if ( !m_expandedMap.value( index )->initialized() )
+        {
+            int dropTypes = dropTypeCount( item );
+            QSize originalSize = QStyledItemDelegate::sizeHint( option, index );
+            QSize targetSize = originalSize + QSize( 0, dropTypes == 0 ? 0 : 56 );
+            m_expandedMap.value( index )->initialize( originalSize, targetSize, 300 );
+            m_expandedMap.value( index )->expand();
+        }
+        QMetaObject::invokeMethod( m_parent, "update", Qt::QueuedConnection, Q_ARG( QModelIndex, index ) );
+        return m_expandedMap.value( index )->size();
+    }
+    else
+        return QStyledItemDelegate::sizeHint( option, index );
+}
+
+
+void
+SourceDelegate::paintDecorations( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() );
+    SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
+
+    // Paint the speaker icon next to the currently-playing playlist
+    const bool playable = ( type == SourcesModel::StaticPlaylist ||
+        type == SourcesModel::AutomaticPlaylist ||
+        type == SourcesModel::Station ||
+        type == SourcesModel::TemporaryPage ||
+        type == SourcesModel::GenericPage );
+    const bool playing = ( AudioEngine::instance()->isPlaying() || AudioEngine::instance()->isPaused() );
+
+    if ( playable && playing && item->isBeingPlayed() )
+    {
+        int iconW = option.rect.height() - 4;
+        if ( m_expandedMap.contains( index ) )
+        {
+            AnimationHelper* ah = m_expandedMap.value( index );
+            if ( ah->initialized() )
+            {
+                iconW = ah->originalSize().height() - 4;
+            }
+        }
+ 
+        QRect iconRect = QRect( 4, option.rect.y() + 2, iconW, iconW );
+        QPixmap speaker = option.state & QStyle::State_Selected ? m_nowPlayingSpeaker : m_nowPlayingSpeakerDark;
+        speaker = speaker.scaledToHeight( iconW, Qt::SmoothTransformation );
+        painter->drawPixmap( iconRect, speaker );
+    }
+}
+
+
+void
+SourceDelegate::paintCollection( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QFont normal = option.font;
+    QFont bold = option.font;
+    bold.setBold( true );
+
+    QFont figFont = bold;
+    figFont.setFamily( "Arial Bold" );
+    figFont.setWeight( QFont::Black );
+    figFont.setPixelSize( 10 );
+
+    SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
+    SourceItem* colItem = qobject_cast< SourceItem* >( item );
+    Q_ASSERT( colItem );
+    bool status = !( !colItem || colItem->source().isNull() || !colItem->source()->isOnline() );
+
+    QString tracks;
+    QString name = index.data().toString();
+    int figWidth = 0;
+
+    if ( status && colItem && !colItem->source().isNull() )
+    {
+        tracks = QString::number( colItem->source()->trackCount() );
+        figWidth = QFontMetrics( figFont ).width( tracks );
+        name = colItem->source()->friendlyName();
+    }
+
+    QRect iconRect = option.rect.adjusted( 4, 6, -option.rect.width() + option.rect.height() - 12 + 4, -6 );
+
+    QPixmap avatar = colItem->icon().pixmap( iconRect.size() );
+    painter->drawPixmap( iconRect, avatar.scaledToHeight( iconRect.height(), Qt::SmoothTransformation ) );
+
+    if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected )
+    {
+        painter->setPen( option.palette.color( QPalette::HighlightedText ) );
+    }
+
+    QRect textRect = option.rect.adjusted( iconRect.width() + 8, 6, -figWidth - 28, 0 );
+    if ( status || colItem->source().isNull() )
+        painter->setFont( bold );
+    QString text = painter->fontMetrics().elidedText( name, Qt::ElideRight, textRect.width() );
+    painter->drawText( textRect, text );
+
+    bool isPlaying = !( colItem->source()->currentTrack().isNull() );
+    QString desc = colItem->source()->textStatus();
+    if ( colItem->source().isNull() )
+        desc = tr( "All available tracks" );
+
+    painter->setFont( normal );
+    textRect = option.rect.adjusted( iconRect.width() + 8, option.rect.height() / 2, -figWidth - 24, -6 );
+
+    bool privacyOn = TomahawkSettings::instance()->privateListeningMode() == TomahawkSettings::FullyPrivate;
+    if ( !colItem->source().isNull() && colItem->source()->isLocal() && privacyOn )
+    {
+        QRect pmRect = textRect;
+        pmRect.setRight( pmRect.left() + pmRect.height() );
+        ActionCollection::instance()->getAction( "togglePrivacy" )->icon().paint( painter, pmRect );
+        textRect.adjust( pmRect.width() + 3, 0, 0, 0 );
+    }
+    if ( isPlaying || ( !colItem->source().isNull() && colItem->source()->isLocal() ) )
+    {
+        // Show a listen icon
+        QPixmap listenAlongPixmap;
+        QPixmap realtimeListeningAlongPixmap;
+        if ( index.data( SourcesModel::LatchedOnRole ).toBool() )
+        {
+            // Currently listening along
+            listenAlongPixmap = m_headphonesOn;
+            if ( !colItem->source()->isLocal() )
+            {
+                realtimeListeningAlongPixmap =
+                    colItem->source()->playlistInterface()->latchMode() == Tomahawk::PlaylistModes::RealTime ?
+                        m_realtimeLocked : m_realtimeUnlocked;
+            }
+        }
+        else if ( !colItem->source()->isLocal() )
+        {
+            listenAlongPixmap = m_headphonesOff;
+        }
+
+        if ( !listenAlongPixmap.isNull() )
+        {
+            QRect pmRect = textRect;
+            pmRect.setRight( pmRect.left() + pmRect.height() );
+            painter->drawPixmap( pmRect, listenAlongPixmap.scaledToHeight( pmRect.height(), Qt::SmoothTransformation ) );
+            textRect.adjust( pmRect.width() + 3, 0, 0, 0 );
+        }
+
+        if ( !realtimeListeningAlongPixmap.isNull() )
+        {
+            QRect pmRect = textRect;
+            pmRect.setRight( pmRect.left() + pmRect.height() );
+            painter->drawPixmap( pmRect, realtimeListeningAlongPixmap.scaledToHeight( pmRect.height(), Qt::SmoothTransformation ) );
+            textRect.adjust( pmRect.width() + 3, 0, 0, 0 );
+        }
+    }
+
+    textRect.adjust( 0, 0, 0, 2 );
+    text = painter->fontMetrics().elidedText( desc, Qt::ElideRight, textRect.width() - 8 );
+    QTextOption to( Qt::AlignVCenter );
+    to.setWrapMode( QTextOption::NoWrap );
+    painter->drawText( textRect, text, to );
+
+    if ( status )
+    {
+        painter->setRenderHint( QPainter::Antialiasing );
+
+        QRect figRect = option.rect.adjusted( option.rect.width() - figWidth - 13, 0, -14, -option.rect.height() + 16 );
+        int hd = ( option.rect.height() - figRect.height() ) / 2;
+        figRect.adjust( 0, hd, 0, hd );
+
+        painter->setFont( figFont );
+
+        QColor figColor( 167, 183, 211 );
+        painter->setPen( figColor );
+        painter->setBrush( figColor );
+
+        TomahawkUtils::drawBackgroundAndNumbers( painter, tracks, figRect );
+    }
+}
+
+
+void
+SourceDelegate::paintCategory( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QTextOption to( Qt::AlignVCenter );
+
+    painter->setPen( option.palette.color( QPalette::Base ) );
+    painter->setBrush( option.palette.color( QPalette::Base ) );
+    painter->drawRect( option.rect );
+    painter->setRenderHint( QPainter::Antialiasing );
+
+    painter->setPen( Qt::white );
+    painter->drawText( option.rect.translated( 4, 1 ), index.data().toString().toUpper(), to );
+    painter->setPen( QColor( 99, 113, 128 ) );
+    painter->drawText( option.rect.translated( 4, 0 ), index.data().toString().toUpper(), to );
+
+    if ( option.state & QStyle::State_MouseOver )
+    {
+        QString text = tr( "Show" );
+        if ( option.state & QStyle::State_Open )
+            text = tr( "Hide" );
+
+        QFont font = painter->font();
+        font.setPixelSize( 11 );
+        font.setBold( true );
+        painter->setFont( font );
+        QTextOption to( Qt::AlignVCenter | Qt::AlignRight );
+
+        // draw close icon
+        painter->setPen( Qt::white );
+        painter->drawText( option.rect.translated( -4, 1 ), text, to );
+        painter->setPen( QColor( 99, 113, 128 ) );
+        painter->drawText( option.rect.translated( -4, 0 ), text, to );
+    }
+}
+
+
+void
+SourceDelegate::paintGroup( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QFont font = painter->font();
+    font.setPixelSize( 12 );
+    font.setBold( true );
+    painter->setFont( font );
+
+    QTextOption to( Qt::AlignBottom );
+
+    painter->setPen( option.palette.color( QPalette::Base ) );
+    painter->setBrush( option.palette.color( QPalette::Base ) );
+    painter->drawRect( option.rect );
+    painter->setRenderHint( QPainter::Antialiasing );
+
+    painter->setPen( Qt::white );
+    painter->drawText( option.rect.translated( 4, 1 ), index.data().toString().toUpper(), to );
+    painter->setPen( QColor( 99, 113, 128 ) );
+    painter->drawText( option.rect.translated( 4, 0 ), index.data().toString().toUpper(), to );
+
+    if ( option.state & QStyle::State_MouseOver )
+    {
+        QString text = tr( "Show" );
+        if ( option.state & QStyle::State_Open )
+            text = tr( "Hide" );
+
+        font.setPixelSize( font.pixelSize() - 1 );
+        painter->setFont( font );
+        QTextOption to( Qt::AlignBottom | Qt::AlignRight );
+
+        // draw close icon
+        painter->setPen( Qt::white );
+        painter->drawText( option.rect.translated( -4, 1 ), text, to );
+        painter->setPen( QColor( 99, 113, 128 ) );
+        painter->drawText( option.rect.translated( -4, 0 ), text, to );
+    }
+}
+
+
+void
+SourceDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QStyleOptionViewItem o = option;
+    QStyleOptionViewItemV4 o3 = option;
+
+    painter->save();
+
+    QFont font = painter->font();
+    font.setPixelSize( 11 );
+    painter->setFont( font );
+    o.font = font;
+    o3.font = font;
+
+    SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() );
+    SourceTreeItem* item = index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
+    Q_ASSERT( item );
+
+    if ( ( option.state & QStyle::State_Enabled ) == QStyle::State_Enabled )
+    {
+        o.state = QStyle::State_Enabled;
+
+        if ( ( option.state & QStyle::State_MouseOver ) == QStyle::State_MouseOver )
+        {
+            o.state |= QStyle::State_MouseOver;
+            o3.state |= QStyle::State_MouseOver;
+        }
+
+        if ( ( option.state & QStyle::State_Open ) == QStyle::State_Open )
+        {
+            o.state |= QStyle::State_Open;
+        }
+
+        if ( ( option.state & QStyle::State_Selected ) == QStyle::State_Selected )
+        {
+            if ( type != SourcesModel::Collection )
+                o3.state |= QStyle::State_Selected;
+            else
+                o3.state &= ~QStyle::State_Selected;
+
+            o.palette.setColor( QPalette::Base, QColor( 0, 0, 0, 0 ) );
+            o.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) );
+            o3.palette.setColor( QPalette::Text, o.palette.color( QPalette::HighlightedText ) );
+        }
+    }
+
+    // shrink the indentations
+    {
+        int indentMult = 0;
+        QModelIndex counter = index;
+        while ( counter.parent().isValid() )
+        {
+            indentMult++;
+            counter = counter.parent();
+        }
+
+        int indentDelta = o.rect.x() - m_parent->viewport()->x();
+        o.rect.setX( o.rect.x() - indentDelta + indentMult * TREEVIEW_INDENT_ADD );
+        o3.rect.setX( 0 );
+    }
+
+    if ( type != SourcesModel::Group && type != SourcesModel::Category && type != SourcesModel::Divider )
+        QApplication::style()->drawControl( QStyle::CE_ItemViewItem, &o3, painter );
+
+    if ( type == SourcesModel::Collection )
+    {
+        paintCollection( painter, o, index );
+    }
+    else if ( ( type == SourcesModel::StaticPlaylist || type == SourcesModel::CategoryAdd ) &&
+              m_expandedMap.contains( index ) && m_expandedMap.value( index )->partlyExpanded() && dropTypeCount( item ) > 0 )
+    {
+        // Let Qt paint the original item. We add our stuff after it
+        o.state &= ~QStyle::State_Selected;
+        o.showDecorationSelected = false;
+        o.rect.adjust( 0, 0, 0, - option.rect.height() + m_expandedMap.value( index )->originalSize().height() );
+        QStyledItemDelegate::paint( painter, o, index );
+
+        // Get whole rect for the menu
+        QRect itemsRect = option.rect.adjusted( -option.rect.x(), m_expandedMap.value( index )->originalSize().height(), 0, 0 );
+        QPoint cursorPos = m_parent->mapFromGlobal( QCursor::pos() );
+        bool cursorInRect = itemsRect.contains( cursorPos );
+
+        // draw the background
+        if ( m_gradient.finalStop() != itemsRect.bottomLeft() )
+        {
+            m_gradient = QLinearGradient( itemsRect.topLeft(), itemsRect.bottomLeft() );
+            m_gradient.setColorAt( 0.0, Qt::white );
+            m_gradient.setColorAt( 0.9, QColor( 0x88, 0x88, 0x88 ) );
+            m_gradient.setColorAt( 1.0, QColor( 0x99, 0x99, 0x99 ) ); // dark grey
+        }
+
+        QPen pen = painter->pen();
+        painter->setPen( QPen( Qt::NoPen ) );
+        painter->setBrush( m_gradient );
+        painter->drawRect( itemsRect );
+
+        // calculate sizes for the icons
+        int totalCount = dropTypeCount( item );
+        int itemWidth = itemsRect.width() / totalCount;
+        int iconSpacing = ( itemWidth - 32 ) / 2;
+
+        // adjust to one single entry
+        itemsRect.adjust( 0, 0, -itemsRect.width() + itemWidth, 0 );
+
+        pen.setColor( Qt::white );
+        painter->setPen( pen );
+
+        QFont font = painter->font();
+        font.setPixelSize( 12 );
+        painter->setFont( font );
+        QFont fontBold = painter->font();
+        fontBold.setBold( true );
+
+        QRect textRect;
+        QRect imageRect;
+        SourceTreeItem::DropTypes dropTypes = item->supportedDropTypes( m_dropMimeData );
+
+        int count = 0;
+        for ( int i = 0; i < 5; ++i )
+        {
+            if ( !dropTypes.testFlag( m_dropTypeMap.value( i ) ) )
+                continue;
+
+            if ( count > 0 )
+                itemsRect.adjust( itemWidth, 0, itemWidth, 0 );
+
+            if ( itemsRect.contains( cursorPos ) | !cursorInRect )
+            {
+                painter->setFont( fontBold );
+                m_hoveredDropType = m_dropTypeMap.value( i );
+                cursorInRect = true;
+            }
+            else
+                painter->setFont( font );
+
+            int textSpacing = ( itemWidth - painter->fontMetrics().width( m_dropTypeTextMap.value( i ) ) ) / 2;
+            textRect = itemsRect.adjusted( textSpacing - 1, itemsRect.height() - painter->fontMetrics().height() - 2, 0, 0 );
+            painter->drawText( textRect, m_dropTypeTextMap.value( i ) );
+
+            int maxHeight = itemsRect.height() - textRect.height() - 2;
+            int verticalOffset = qMax( 0, maxHeight - 32 );
+            if ( itemsRect.bottom() - textRect.height() - 2 > itemsRect.top() )
+            {
+                imageRect = itemsRect.adjusted( iconSpacing, verticalOffset, -iconSpacing, -textRect.height() - 2 );
+                painter->drawPixmap( imageRect.x(), imageRect.y(), m_dropTypeImageMap.value( i ).copy( 0, 32 - imageRect.height(), 32, imageRect.height() ) );
+            }
+
+            count++;
+        }
+    }
+    else if ( type == SourcesModel::Group )
+    {
+        paintGroup( painter, o3, index );
+    }
+    else if ( type == SourcesModel::Category )
+    {
+        paintCategory( painter, o, index );
+    }
+    else if ( type == SourcesModel::Divider )
+    {
+        QRect middle = o.rect.adjusted( 0, 2, 0, -2 );
+        painter->setRenderHint( QPainter::Antialiasing, false );
+
+        QColor bgcolor = o3.palette.color( QPalette::Base );
+
+        painter->setPen( bgcolor.darker( 120 ) );
+        painter->drawLine( middle.topLeft(), middle.topRight() );
+        painter->setPen( bgcolor.lighter( 120 ) );
+        painter->drawLine( middle.bottomLeft(), middle.bottomRight() );
+    }
+    else
+    {
+        o.state &= ~QStyle::State_MouseOver;
+        if ( !index.parent().parent().isValid() )
+            o.rect.adjust( 7, 0, 0, 0 );
+
+        if ( type == SourcesModel::TemporaryPage )
+        {
+            TemporaryPageItem* gpi = qobject_cast< TemporaryPageItem* >( item );
+            Q_ASSERT( gpi );
+
+            if ( gpi && o3.state & QStyle::State_MouseOver )
+            {
+                int padding = 3;
+                m_iconHeight = ( o3.rect.height() - 2 * padding );
+
+                o.rect.adjust( 0, 0, -( padding + m_iconHeight ), 0 );
+                QStyledItemDelegate::paint( painter, o, index );
+
+                // draw close icon
+                QPixmap p( RESPATH "images/list-remove.png" );
+                p = p.scaledToHeight( m_iconHeight, Qt::SmoothTransformation );
+
+                QRect r( o3.rect.right() - padding - m_iconHeight, padding + o3.rect.y(), m_iconHeight, m_iconHeight );
+                painter->drawPixmap( r, p );
+            }
+            else
+                QStyledItemDelegate::paint( painter, o, index );
+        }
+        else
+            QStyledItemDelegate::paint( painter, o, index );
+    }
+
+    paintDecorations( painter, o3, index );
+
+    painter->restore();
+}
+
+
+void
+SourceDelegate::updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    if ( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() == SourcesModel::StaticPlaylist )
+        editor->setGeometry( option.rect.adjusted( 20, 0, 0, 0 ) );
+    else
+        QStyledItemDelegate::updateEditorGeometry( editor, option, index );
+
+    editor->setGeometry( editor->geometry().adjusted( 2 * TREEVIEW_INDENT_ADD, 0, 0, 0 ) );
+}
+
+
+bool
+SourceDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
+{
+    if ( event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseButtonPress )
+    {
+        SourcesModel::RowType type = static_cast< SourcesModel::RowType >( index.data( SourcesModel::SourceTreeItemTypeRole ).toInt() );
+        if ( type == SourcesModel::TemporaryPage )
+        {
+            TemporaryPageItem* gpi = qobject_cast< TemporaryPageItem* >( index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
+            Q_ASSERT( gpi );
+            QMouseEvent* ev = static_cast< QMouseEvent* >( event );
+
+            QStyleOptionViewItemV4 o = option;
+            initStyleOption( &o, index );
+            int padding = 3;
+            QRect r ( o.rect.right() - padding - m_iconHeight, padding + o.rect.y(), m_iconHeight, m_iconHeight );
+
+            if ( r.contains( ev->pos() ) )
+            {
+                if ( event->type() == QEvent::MouseButtonRelease )
+                {
+                    gpi->removeFromList();
+
+                    // Send a new mouse event to the view, since if the mouse is now over another item's delete area we want it to show up
+                    QMouseEvent* ev = new QMouseEvent( QEvent::MouseMove, m_parent->viewport()->mapFromGlobal( QCursor::pos() ), Qt::NoButton, Qt::NoButton, Qt::NoModifier );
+                    QApplication::postEvent( m_parent->viewport(), ev );
+                }
+
+                return true;
+            }
+        }
+        else if ( type == SourcesModel::Collection )
+        {
+            SourceItem* colItem = qobject_cast< SourceItem* >( index.data( SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
+            Q_ASSERT( colItem );
+
+            if ( !colItem->source().isNull() && !colItem->source()->currentTrack().isNull() && !colItem->source()->isLocal() )
+            {
+                QMouseEvent* ev = static_cast< QMouseEvent* >( event );
+
+                QStyleOptionViewItemV4 o = option;
+                initStyleOption( &o, index );
+                QFontMetrics fm( o.font );
+                const int height = fm.height() + 3;
+
+                QRect headphonesRect( option.rect.height() + 10, o.rect.bottom() - height, height, height );
+                bool headphonesRectContainsClick = headphonesRect.contains( ev->pos() );
+                QRect lockRect( option.rect.height() + 20, o.rect.bottom() - height, height, height );
+                bool lockRectContainsClick = lockRect.contains( ev->pos() );
+                if ( headphonesRectContainsClick || lockRectContainsClick )
+                {
+                    if ( event->type() == QEvent::MouseButtonRelease )
+                    {
+                        if ( headphonesRectContainsClick )
+                        {
+                            if ( index.data( SourcesModel::LatchedOnRole ).toBool() )
+                                // unlatch
+                                emit latchOff( colItem->source() );
+                            else
+                                emit latchOn( colItem->source() );
+                        }
+                        else // it's in the lock rect
+                            emit toggleRealtimeLatch( colItem->source(), !index.data( SourcesModel::LatchedRealtimeRole ).toBool() );
+                    }
+                    return true;
+                }
+            }
+        }
+    }
+
+    // We emit our own clicked() signal instead of relying on QTreeView's, because that is fired whether or not a delegate accepts
+    // a mouse press event. Since we want to swallow click events when they are on headphones other action items, here wemake sure we only
+    // emit if we really want to
+    if ( event->type() == QEvent::MouseButtonRelease )
+    {
+        if ( m_lastClicked == -1 )
+        {
+            m_lastClicked = QDateTime::currentMSecsSinceEpoch();
+            emit clicked( index );
+        }
+        else
+        {
+            qint64 elapsed = QDateTime::currentMSecsSinceEpoch() - m_lastClicked;
+            if ( elapsed < QApplication::doubleClickInterval() )
+            {
+                m_lastClicked = -1;
+                emit doubleClicked( index );
+            } else
+            {
+                m_lastClicked = QDateTime::currentMSecsSinceEpoch();
+                emit clicked( index );
+            }
+        }
+
+    }
+
+    return QStyledItemDelegate::editorEvent ( event, model, option, index );
+}
+
+
+int
+SourceDelegate::dropTypeCount( SourceTreeItem* item ) const
+{
+    int menuCount = 0;
+    if ( item->supportedDropTypes( m_dropMimeData ).testFlag( SourceTreeItem::DropTypeThisTrack ) )
+        menuCount++;
+
+    if ( item->supportedDropTypes( m_dropMimeData ).testFlag( SourceTreeItem::DropTypeThisAlbum ) )
+        menuCount++;
+
+    if ( item->supportedDropTypes( m_dropMimeData ).testFlag( SourceTreeItem::DropTypeAllFromArtist ) )
+        menuCount++;
+
+    if ( item->supportedDropTypes( m_dropMimeData ).testFlag( SourceTreeItem::DropTypeLocalItems ) )
+        menuCount++;
+
+    if ( item->supportedDropTypes( m_dropMimeData ).testFlag( SourceTreeItem::DropTypeTop50 ) )
+        menuCount++;
+
+    return menuCount;
+}
+
+
+SourceTreeItem::DropType
+SourceDelegate::hoveredDropType() const
+{
+    return m_hoveredDropType;
+}
+
+
+void
+SourceDelegate::hovered( const QModelIndex& index, const QMimeData* mimeData )
+{
+    if ( !index.isValid() )
+    {
+        foreach ( AnimationHelper *helper, m_expandedMap )
+        {
+            helper->collapse();
+        }
+        return;
+    }
+
+    if ( !m_expandedMap.contains( index ) )
+    {
+        foreach ( AnimationHelper *helper, m_expandedMap )
+        {
+            helper->collapse();
+        }
+
+        m_newDropHoverIndex = index;
+        m_dropMimeData->clear();
+        foreach ( const QString &mimeDataFormat, mimeData->formats() )
+        {
+            m_dropMimeData->setData( mimeDataFormat, mimeData->data( mimeDataFormat ) );
+        }
+
+        m_expandedMap.insert( m_newDropHoverIndex, new AnimationHelper( m_newDropHoverIndex ) );
+        connect( m_expandedMap.value( m_newDropHoverIndex ), SIGNAL( finished( QModelIndex ) ), SLOT( animationFinished( QModelIndex ) ) );
+    }
+    else
+        qDebug() << "expandedMap already contains index" << index;
+}
+
+
+void
+SourceDelegate::dragLeaveEvent()
+{
+    foreach ( AnimationHelper* helper, m_expandedMap )
+    {
+        helper->collapse( true );
+    }
+}
+
+
+void
+SourceDelegate::animationFinished( const QModelIndex& index )
+{
+    delete m_expandedMap.take( index );
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/SourceDelegate.h Added

@@ -0,0 +1,86 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2011, Michael Zanetti <mzanetti@kde.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 SOURCEDELEGATE_H
+#define SOURCEDELEGATE_H
+
+#include "SourceTreeView.h"
+#include "items/SourceTreeItem.h"
+
+#include <QtGui/QStyledItemDelegate>
+#include <QtCore/QPropertyAnimation>
+
+class AnimationHelper;
+
+class SourceDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+public:
+    SourceDelegate( QAbstractItemView* parent = 0 );
+    ~SourceDelegate();
+
+    void hovered( const QModelIndex &index, const QMimeData *mimeData );
+    void dragLeaveEvent();
+
+    SourceTreeItem::DropType hoveredDropType() const;
+
+signals:
+    void clicked( const QModelIndex& idx );
+    void doubleClicked( const QModelIndex& idx );
+    void latchOn( const Tomahawk::source_ptr& idx );
+    void latchOff( const Tomahawk::source_ptr& idx );
+    void toggleRealtimeLatch( const Tomahawk::source_ptr& idx, bool realtime );
+
+protected:
+    virtual QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    virtual void updateEditorGeometry( QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    virtual int dropTypeCount( SourceTreeItem* item ) const;
+    virtual bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
+
+private slots:
+    void animationFinished( const QModelIndex& );
+
+private:
+    void paintDecorations( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+    void paintCollection( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    void paintCategory( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+    void paintGroup( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+    QAbstractItemView* m_parent;
+    mutable int m_iconHeight;
+    QModelIndex m_dropHoverIndex;
+    QModelIndex m_newDropHoverIndex;
+    QMimeData *m_dropMimeData;
+    mutable SourceTreeItem::DropType m_hoveredDropType; // Hack to keep easily track of the current highlighted DropType in paint()
+    QMap< QModelIndex, AnimationHelper* > m_expandedMap;
+    QPixmap m_headphonesOn, m_headphonesOff, m_realtimeLocked, m_realtimeUnlocked, m_nowPlayingSpeaker, m_nowPlayingSpeakerDark;
+    qint64 m_lastClicked;
+
+    QMap< int, SourceTreeItem::DropType > m_dropTypeMap;
+    QMap< int, QString > m_dropTypeTextMap;
+    QMap< int, QPixmap > m_dropTypeImageMap;
+
+    mutable QLinearGradient m_gradient;
+};
+
+#endif // SOURCEDELEGATE_H

tomahawk-0.5.5.tar.bz2/src/sourcetree/SourceTreeView.cpp Added

@@ -0,0 +1,826 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2010-2012, 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 "SourceTreeView.h"
+
+#include <QtGui/QAction>
+#include <QtGui/QApplication>
+#include <QtGui/QContextMenuEvent>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QHeaderView>
+#include <QtGui/QPainter>
+#include <QtGui/QStyledItemDelegate>
+#include <QtGui/QFileDialog>
+#include <QtGui/QMessageBox>
+#include <QtCore/QSize>
+
+#include "ActionCollection.h"
+#include "Playlist.h"
+#include "ViewManager.h"
+#include "SourcesProxyModel.h"
+#include "SourceList.h"
+#include "SourceDelegate.h"
+#include "sourcetree/items/PlaylistItems.h"
+#include "sourcetree/items/SourceItem.h"
+#include "audio/AudioEngine.h"
+#include "SourcePlaylistInterface.h"
+#include "TomahawkSettings.h"
+#include "GlobalActionManager.h"
+#include "DropJob.h"
+#include "items/GenericPageItems.h"
+#include "items/TemporaryPageItem.h"
+#include "database/DatabaseCommand_SocialAction.h"
+#include "database/Database.h"
+#include "LatchManager.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+SourceTreeView::SourceTreeView( QWidget* parent )
+    : QTreeView( parent )
+    , m_latchManager( new LatchManager( this ) )
+    , m_dragging( false )
+{
+    setProperty( "flattenBranches", QVariant( true ) );
+
+    setFrameShape( QFrame::NoFrame );
+    setAttribute( Qt::WA_MacShowFocusRect, 0 );
+    setContentsMargins( 0, 0, 0, 0 );
+    setMinimumWidth( 220 );
+
+    setHeaderHidden( true );
+    setRootIsDecorated( true );
+    setExpandsOnDoubleClick( false );
+
+    setSelectionBehavior( QAbstractItemView::SelectRows );
+    setDragDropMode( QAbstractItemView::DropOnly );
+    setAcceptDrops( true );
+    setDropIndicatorShown( false );
+    setAllColumnsShowFocus( true );
+    setUniformRowHeights( false );
+    setIndentation( 0 );
+    setSortingEnabled( true );
+    sortByColumn( 0, Qt::AscendingOrder );
+    setVerticalScrollMode( QTreeView::ScrollPerPixel );
+    setMouseTracking( true );
+    setEditTriggers( NoEditTriggers );
+
+    // TODO animation conflicts with the expanding-playlists-when-collection-is-null
+    // so investigate
+//     setAnimated( true );
+
+    m_delegate = new SourceDelegate( this );
+    connect( m_delegate, SIGNAL( latchOn( Tomahawk::source_ptr ) ), SLOT( latchOnOrCatchUp( Tomahawk::source_ptr ) ) );
+    connect( m_delegate, SIGNAL( latchOff( Tomahawk::source_ptr ) ), SLOT( latchOff( Tomahawk::source_ptr ) ) );
+    connect( m_delegate, SIGNAL( toggleRealtimeLatch( Tomahawk::source_ptr, bool ) ), m_latchManager, SLOT( latchModeChangeRequest( Tomahawk::source_ptr,bool ) ) );
+    connect( m_delegate, SIGNAL( clicked( QModelIndex ) ), SLOT( onItemActivated( QModelIndex ) ) );
+    connect( m_delegate, SIGNAL( doubleClicked( QModelIndex ) ), SLOT( onItemDoubleClicked( QModelIndex ) ) );
+
+    setItemDelegate( m_delegate );
+
+    setContextMenuPolicy( Qt::CustomContextMenu );
+    connect( this, SIGNAL( customContextMenuRequested( QPoint ) ), SLOT( onCustomContextMenu( QPoint ) ) );
+
+    m_model = new SourcesModel( this );
+    m_proxyModel = new SourcesProxyModel( m_model, this );
+    connect( m_proxyModel, SIGNAL( selectRequest( QPersistentModelIndex ) ), SLOT( selectRequest( QPersistentModelIndex ) ), Qt::QueuedConnection );
+    connect( m_proxyModel, SIGNAL( expandRequest( QPersistentModelIndex ) ), SLOT( expandRequest( QPersistentModelIndex ) ) );
+    connect( m_proxyModel, SIGNAL( toggleExpandRequest( QPersistentModelIndex ) ), SLOT( toggleExpandRequest( QPersistentModelIndex ) ) );
+
+    setModel( m_proxyModel );
+
+    header()->setStretchLastSection( false );
+    header()->setResizeMode( 0, QHeaderView::Stretch );
+
+    connect( this, SIGNAL( expanded( QModelIndex ) ), SLOT( onItemExpanded( QModelIndex ) ) );
+    connect( selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ), SLOT( onSelectionChanged() ) );
+
+    showOfflineSources( TomahawkSettings::instance()->showOfflineSources() );
+
+    // Light-blue sourcetree on osx
+#ifdef Q_WS_MAC
+    setStyleSheet( "SourceTreeView:active { background: #DDE4EB; } "
+                   "SourceTreeView        { background: #EDEDED; } " );
+#endif
+
+    connect( this, SIGNAL( latchRequest( Tomahawk::source_ptr ) ), m_latchManager, SLOT( latchRequest( Tomahawk::source_ptr ) ) );
+    connect( this, SIGNAL( unlatchRequest( Tomahawk::source_ptr ) ), m_latchManager, SLOT( unlatchRequest( Tomahawk::source_ptr ) ) );
+    connect( this, SIGNAL( catchUpRequest() ), m_latchManager, SLOT( catchUpRequest() ) );
+    connect( this, SIGNAL( latchModeChangeRequest( Tomahawk::source_ptr, bool ) ), m_latchManager, SLOT( latchModeChangeRequest( Tomahawk::source_ptr, bool ) ) );
+
+    connect( ActionCollection::instance(), SIGNAL( privacyModeChanged() ), SLOT( repaint() ) );
+}
+
+
+SourceTreeView::~SourceTreeView()
+{
+}
+
+
+void
+SourceTreeView::setupMenus()
+{
+    m_playlistMenu.clear();
+    m_roPlaylistMenu.clear();
+    m_latchMenu.clear();
+    m_privacyMenu.clear();
+
+    bool readonly = true;
+    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
+
+    if ( type == SourcesModel::StaticPlaylist || type == SourcesModel::AutomaticPlaylist || type == SourcesModel::Station )
+    {
+        const PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
+        const playlist_ptr playlist = item->playlist();
+
+        if ( !playlist.isNull() )
+        {
+            readonly = !playlist->author()->isLocal();
+        }
+    }
+
+    QAction* latchOnAction = ActionCollection::instance()->getAction( "latchOn" );
+    m_latchMenu.addAction( latchOnAction );
+
+    m_privacyMenu.addAction( ActionCollection::instance()->getAction( "togglePrivacy" ) );
+
+    if ( type == SourcesModel::Collection )
+    {
+        SourceItem* item = itemFromIndex< SourceItem >( m_contextMenuIndex );
+        source_ptr source = item->source();
+        if ( !source.isNull() )
+        {
+            if ( m_latchManager->isLatched( source ) )
+            {
+                QAction* latchOffAction = ActionCollection::instance()->getAction( "latchOff" );
+                m_latchMenu.addAction( latchOffAction );
+                connect( latchOffAction, SIGNAL( triggered() ), SLOT( latchOff() ) );
+                m_latchMenu.addSeparator();
+                QAction* latchRealtimeAction = ActionCollection::instance()->getAction( "realtimeFollowingAlong" );
+                latchRealtimeAction->setChecked( source->playlistInterface()->latchMode() == Tomahawk::PlaylistModes::RealTime );
+                m_latchMenu.addAction( latchRealtimeAction );
+                connect( latchRealtimeAction, SIGNAL( toggled( bool ) ), SLOT( latchModeToggled( bool ) ) );
+            }
+        }
+    }
+
+    QAction* loadPlaylistAction = ActionCollection::instance()->getAction( "loadPlaylist" );
+    m_playlistMenu.addAction( loadPlaylistAction );
+    QAction* renamePlaylistAction = ActionCollection::instance()->getAction( "renamePlaylist" );
+    m_playlistMenu.addAction( renamePlaylistAction );
+    m_playlistMenu.addSeparator();
+
+    QAction* copyPlaylistAction = m_playlistMenu.addAction( tr( "&Copy Link" ) );
+
+    if ( type == SourcesModel::StaticPlaylist )
+    {
+        QAction* exportPlaylist = m_playlistMenu.addAction( tr( "&Export Playlist") );
+        connect( exportPlaylist, SIGNAL( triggered() ), this, SLOT( exportPlaylist() ) );
+    }
+
+    QAction* deletePlaylistAction = m_playlistMenu.addAction( tr( "&Delete %1" ).arg( SourcesModel::rowTypeToString( type ) ) );
+
+    QString addToText;
+    if ( type == SourcesModel::StaticPlaylist )
+        addToText = tr( "Add to my Playlists" );
+    if ( type == SourcesModel::AutomaticPlaylist )
+        addToText = tr( "Add to my Automatic Playlists" );
+    else if ( type == SourcesModel::Station )
+        addToText = tr( "Add to my Stations" );
+
+    QAction* addToLocalAction = m_roPlaylistMenu.addAction( addToText );
+
+    m_roPlaylistMenu.addAction( copyPlaylistAction );
+    deletePlaylistAction->setEnabled( !readonly );
+    renamePlaylistAction->setEnabled( !readonly );
+    addToLocalAction->setEnabled( readonly );
+
+    // Handle any custom actions registered for playlists
+    if ( type == SourcesModel::StaticPlaylist && !readonly &&
+        !ActionCollection::instance()->getAction( ActionCollection::LocalPlaylists ).isEmpty() )
+    {
+        m_playlistMenu.addSeparator();
+
+        const PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
+        const playlist_ptr playlist = item->playlist();
+        foreach ( QAction* action, ActionCollection::instance()->getAction( ActionCollection::LocalPlaylists ) )
+        {
+            if ( QObject* notifier = ActionCollection::instance()->actionNotifier( action ) )
+            {
+                QMetaObject::invokeMethod( notifier, "aboutToShow", Qt::DirectConnection, Q_ARG( QAction*, action ), Q_ARG( Tomahawk::playlist_ptr, playlist ) );
+            }
+
+            action->setProperty( "payload", QVariant::fromValue< playlist_ptr >( playlist ) );
+            m_playlistMenu.addAction( action );
+        }
+    }
+
+    connect( loadPlaylistAction,   SIGNAL( triggered() ), SLOT( loadPlaylist() ) );
+    connect( renamePlaylistAction, SIGNAL( triggered() ), SLOT( renamePlaylist() ) );
+    connect( deletePlaylistAction, SIGNAL( triggered() ), SLOT( deletePlaylist() ) );
+    connect( copyPlaylistAction,   SIGNAL( triggered() ), SLOT( copyPlaylistLink() ) );
+    connect( addToLocalAction,     SIGNAL( triggered() ), SLOT( addToLocal() ) );
+    connect( latchOnAction,        SIGNAL( triggered() ), SLOT( latchOnOrCatchUp() ), Qt::QueuedConnection );
+}
+
+
+void
+SourceTreeView::showOfflineSources( bool offlineSourcesShown )
+{
+    m_proxyModel->showOfflineSources( offlineSourcesShown );
+}
+
+
+void
+SourceTreeView::onSelectionChanged()
+{
+    if ( currentIndex() != m_selectedIndex )
+    {
+        selectionModel()->blockSignals( true );
+        selectionModel()->select( m_selectedIndex, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Current );
+        selectionModel()->blockSignals( false );
+    }
+}
+
+
+void
+SourceTreeView::onItemActivated( const QModelIndex& index )
+{
+    if ( !index.isValid() || !index.flags().testFlag( Qt::ItemIsEnabled ) )
+        return;
+
+    SourceTreeItem* item = itemFromIndex< SourceTreeItem >( index );
+    item->activate();
+}
+
+
+void
+SourceTreeView::onItemDoubleClicked( const QModelIndex& idx )
+{
+    if ( !selectionModel()->selectedIndexes().contains( idx ) )
+        onItemActivated( idx );
+
+    SourceTreeItem* item = itemFromIndex< SourceTreeItem >( idx );
+    item->doubleClicked();
+}
+
+
+void
+SourceTreeView::onItemExpanded( const QModelIndex& idx )
+{
+    // make sure to expand children nodes for collections
+    if ( idx.data( SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::Collection )
+    {
+       for( int i = 0; i < model()->rowCount( idx ); i++ )
+       {
+           setExpanded( model()->index( i, 0, idx ), true );
+       }
+    }
+}
+
+
+void
+SourceTreeView::selectRequest( const QPersistentModelIndex& idx )
+{
+    m_selectedIndex = idx;
+
+    if ( !selectionModel()->selectedIndexes().contains( idx ) )
+    {
+        scrollTo( idx, QTreeView::EnsureVisible );
+        selectionModel()->select( idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Current );
+    }
+}
+
+
+void
+SourceTreeView::expandRequest( const QPersistentModelIndex& idx )
+{
+    expand( idx );
+}
+
+
+void
+SourceTreeView::toggleExpandRequest( const QPersistentModelIndex& idx )
+{
+    if ( isExpanded( idx ) )
+        collapse( idx );
+    else
+        expand( idx );
+}
+
+
+void
+SourceTreeView::loadPlaylist()
+{
+    onItemActivated( m_contextMenuIndex );
+}
+
+
+void
+SourceTreeView::deletePlaylist( const QModelIndex& idxIn )
+{
+    QModelIndex idx = idxIn.isValid() ? idxIn : m_contextMenuIndex;
+    if ( !idx.isValid() )
+        return;
+
+    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( idx, SourcesModel::SourceTreeItemTypeRole ).toInt();
+    QString typeDesc;
+    switch ( type )
+    {
+        case SourcesModel::StaticPlaylist:
+            typeDesc = tr( "playlist" );
+            break;
+
+        case SourcesModel::AutomaticPlaylist:
+            typeDesc = tr( "automatic playlist" );
+            break;
+
+        case SourcesModel::Station:
+            typeDesc = tr( "station" );
+            break;
+
+        default:
+            Q_ASSERT( false );
+    }
+
+    QMessageBox askDelete( QMessageBox::Question, tr( "Delete %1?", "playlist/station/..." ).arg( typeDesc ),
+                           tr( "Would you like to delete the %1 <b>\"%2\"</b>?", "e.g. Would you like to delete the playlist named Foobar?" )
+                             .arg( typeDesc ).arg( idx.data().toString() ),
+                           QMessageBox::Yes | QMessageBox::No, this );
+
+#ifdef Q_OS_MAC
+    askDelete.setWindowModality( Qt::WindowModal );
+#endif
+
+    int r = askDelete.exec();
+    if ( r != QMessageBox::Yes )
+        return;
+
+    if ( type == SourcesModel::StaticPlaylist )
+    {
+        PlaylistItem* item = itemFromIndex< PlaylistItem >( idx );
+        playlist_ptr playlist = item->playlist();
+        Playlist::remove( playlist );
+    }
+    else if ( type == SourcesModel::AutomaticPlaylist || type == SourcesModel::Station )
+    {
+        DynamicPlaylistItem* item = itemFromIndex< DynamicPlaylistItem >( idx );
+        dynplaylist_ptr playlist = item->dynPlaylist();
+        DynamicPlaylist::remove( playlist );
+    }
+}
+
+
+void
+SourceTreeView::copyPlaylistLink()
+{
+    QModelIndex idx = m_contextMenuIndex;
+    if ( !idx.isValid() )
+        return;
+
+    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
+    if ( type == SourcesModel::AutomaticPlaylist || type == SourcesModel::Station )
+    {
+        DynamicPlaylistItem* item = itemFromIndex< DynamicPlaylistItem >( m_contextMenuIndex );
+        dynplaylist_ptr playlist = item->dynPlaylist();
+        GlobalActionManager::instance()->copyPlaylistToClipboard( playlist );
+    }
+    else if ( type == SourcesModel::StaticPlaylist )
+    {
+       const PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
+       const playlist_ptr playlist = item->playlist();
+
+       GlobalActionManager::instance()->getShortLink( playlist );
+    }
+}
+
+
+void
+SourceTreeView::exportPlaylist()
+{
+    const QModelIndex idx = m_contextMenuIndex;
+    if ( !idx.isValid() )
+        return;
+
+    const SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
+    Q_ASSERT( type == SourcesModel::StaticPlaylist );
+    if ( type != SourcesModel::StaticPlaylist )
+        return;
+
+    const PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
+    const playlist_ptr playlist = item->playlist();
+
+    const QString suggestedFilename = TomahawkSettings::instance()->playlistDefaultPath() + "/" + playlist->title();
+    const QString filename = QFileDialog::getSaveFileName( TomahawkUtils::tomahawkWindow(), tr( "Save XSPF" ),
+                                                     suggestedFilename, tr( "Playlists (*.xspf)" ) );
+    if ( !filename.isEmpty() )
+    {
+        const  QFileInfo playlistAbsoluteFilePath( filename );
+        TomahawkSettings::instance()->setPlaylistDefaultPath( playlistAbsoluteFilePath.absolutePath() );
+        GlobalActionManager::instance()->savePlaylistToFile( playlist, filename );
+    }
+}
+
+
+void
+SourceTreeView::addToLocal()
+{
+    QModelIndex idx = m_contextMenuIndex;
+    if ( !idx.isValid() )
+        return;
+
+    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
+    if ( type == SourcesModel::AutomaticPlaylist || type == SourcesModel::Station )
+    {
+        DynamicPlaylistItem* item = itemFromIndex< DynamicPlaylistItem >( m_contextMenuIndex );
+        dynplaylist_ptr playlist = item->dynPlaylist();
+
+        // copy to a link and then generate a new playlist from that
+        // this way we cheaply regenerate the needed controls
+        QString link = GlobalActionManager::instance()->copyPlaylistToClipboard( playlist );
+        GlobalActionManager::instance()->parseTomahawkLink( link );
+    }
+    else if ( type == SourcesModel::StaticPlaylist )
+    {
+        PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
+        playlist_ptr playlist = item->playlist();
+
+        // just create the new playlist with the same values
+        QList< query_ptr > queries;
+        foreach( const plentry_ptr& e, playlist->entries() )
+            queries << e->query();
+
+        playlist_ptr newpl = Playlist::create( SourceList::instance()->getLocal(), uuid(), playlist->title(), playlist->info(), playlist->creator(), playlist->shared(), queries );
+    }
+}
+
+
+void
+SourceTreeView::latchOnOrCatchUp()
+{
+    disconnect( this, SLOT( latchOnOrCatchUp() ) );
+    if ( !m_contextMenuIndex.isValid() )
+        return;
+
+    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
+    if ( type != SourcesModel::Collection )
+        return;
+
+    SourceItem* item = itemFromIndex< SourceItem >( m_contextMenuIndex );
+    source_ptr source = item->source();
+
+    latchOnOrCatchUp( source );
+}
+
+
+void
+SourceTreeView::latchOff()
+{
+    disconnect( this, SLOT( latchOff() ) );
+    qDebug() << Q_FUNC_INFO;
+    if ( !m_contextMenuIndex.isValid() )
+        return;
+
+    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
+    if ( type != SourcesModel::Collection )
+        return;
+
+    const SourceItem* item = itemFromIndex< SourceItem >( m_contextMenuIndex );
+    const source_ptr source = item->source();
+
+    latchOff( source );
+}
+
+
+void
+SourceTreeView::latchOnOrCatchUp( const Tomahawk::source_ptr& source )
+{
+    if ( m_latchManager->isLatched( source ) )
+        emit catchUpRequest();
+    else
+        emit latchRequest( source );
+}
+
+
+void
+SourceTreeView::latchOff( const Tomahawk::source_ptr& source )
+{
+    emit unlatchRequest( source );
+}
+
+
+void
+SourceTreeView::latchModeToggled( bool checked )
+{
+
+    disconnect( this, SLOT( latchOff() ) );
+    qDebug() << Q_FUNC_INFO;
+    if ( !m_contextMenuIndex.isValid() )
+        return;
+
+    SourcesModel::RowType type = ( SourcesModel::RowType )model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ).toInt();
+    if ( type != SourcesModel::Collection )
+        return;
+
+    const SourceItem* item = itemFromIndex< SourceItem >( m_contextMenuIndex );
+    const source_ptr source = item->source();
+    emit latchModeChangeRequest( source, checked );
+}
+
+
+void
+SourceTreeView::renamePlaylist()
+{
+    if ( !m_contextMenuIndex.isValid() && !selectionModel()->selectedIndexes().isEmpty() )
+        edit( selectionModel()->selectedIndexes().first() );
+    else
+        edit( m_contextMenuIndex );
+}
+
+
+void
+SourceTreeView::onCustomContextMenu( const QPoint& pos )
+{
+    qDebug() << Q_FUNC_INFO;
+
+    QModelIndex idx = m_contextMenuIndex = indexAt( pos );
+    if ( !idx.isValid() )
+        return;
+
+    setupMenus();
+
+    const QList< QAction* > customActions = model()->data( m_contextMenuIndex, SourcesModel::CustomActionRole ).value< QList< QAction* > >();
+
+    if ( model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::StaticPlaylist ||
+         model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::AutomaticPlaylist ||
+         model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::Station )
+    {
+        PlaylistItem* item = itemFromIndex< PlaylistItem >( m_contextMenuIndex );
+        if ( item->playlist()->author()->isLocal() )
+            m_playlistMenu.exec( mapToGlobal( pos ) );
+        else
+            m_roPlaylistMenu.exec( mapToGlobal( pos ) );
+    }
+    else if ( model()->data( m_contextMenuIndex, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::Collection )
+    {
+        SourceItem* item = itemFromIndex< SourceItem >( m_contextMenuIndex );
+        if ( !item->source().isNull() && !item->source()->isLocal() )
+            m_latchMenu.exec( mapToGlobal( pos ) );
+        else if ( !item->source().isNull() )
+            m_privacyMenu.exec( mapToGlobal( pos ) );
+    }
+    else if ( !customActions.isEmpty() )
+    {
+        QMenu customMenu;
+        customMenu.addActions( customActions );
+        customMenu.exec( mapToGlobal( pos ) );
+    }
+}
+
+
+void
+SourceTreeView::dragEnterEvent( QDragEnterEvent* event )
+{
+    qDebug() << Q_FUNC_INFO;
+    QTreeView::dragEnterEvent( event );
+
+    if ( DropJob::acceptsMimeData( event->mimeData(), DropJob::Track | DropJob::Artist | DropJob::Album | DropJob::Playlist,  DropJob::Create ) )
+    {
+           m_dragging = true;
+           m_dropRect = QRect();
+           m_dropIndex = QPersistentModelIndex();
+
+           qDebug() << Q_FUNC_INFO << "Accepting Drag Event";
+           event->setDropAction( Qt::CopyAction );
+           event->acceptProposedAction();
+     }
+}
+
+
+void
+SourceTreeView::dragLeaveEvent( QDragLeaveEvent* event )
+{
+    QTreeView::dragLeaveEvent( event );
+
+    m_dragging = false;
+    setDirtyRegion( m_dropRect );
+
+    m_delegate->dragLeaveEvent();
+    dataChanged( m_dropIndex, m_dropIndex );
+    m_dropIndex = QPersistentModelIndex();
+}
+
+
+void
+SourceTreeView::dragMoveEvent( QDragMoveEvent* event )
+{
+    bool accept = false;
+
+    // Don't highlight the drop for a playlist, as it won't get added to the playlist but created generally
+    if ( DropJob::isDropType( DropJob::Playlist, event->mimeData()  ) )
+    {
+        event->accept();
+        return;
+    }
+
+    QTreeView::dragMoveEvent( event );
+
+    if ( DropJob::acceptsMimeData( event->mimeData(),  DropJob::Track, DropJob::Append ) )
+    {
+        setDirtyRegion( m_dropRect );
+        const QPoint pos = event->pos();
+        const QModelIndex index = indexAt( pos );
+        dataChanged( m_dropIndex, m_dropIndex );
+        m_dropIndex = QPersistentModelIndex( index );
+
+        if ( index.isValid() )
+        {
+            const QRect rect = visualRect( index );
+            m_dropRect = rect;
+
+            SourceTreeItem* item = itemFromIndex< SourceTreeItem >( index );
+
+            if ( item->willAcceptDrag( event->mimeData() ) )
+            {
+                accept = true;
+
+                switch ( model()->data( index, SourcesModel::SourceTreeItemTypeRole ).toInt() )
+                {
+                    case SourcesModel::StaticPlaylist:
+                    case SourcesModel::CategoryAdd:
+                        m_delegate->hovered( index, event->mimeData() );
+                        dataChanged( index, index );
+                        break;
+
+                    default:
+                        break;
+                }
+
+            }
+            else
+                m_delegate->hovered( QModelIndex(), 0 );
+        }
+        else
+        {
+            m_dropRect = QRect();
+        }
+
+        if ( accept || DropJob::isDropType( DropJob::Playlist, event->mimeData() ) )
+        {
+            // Playlists are accepted always since they can be dropped anywhere
+            //tDebug() << Q_FUNC_INFO << "Accepting";
+            event->setDropAction( Qt::CopyAction );
+            event->accept();
+        }
+        else
+        {
+//             tDebug() << Q_FUNC_INFO << "Ignoring";
+            event->ignore();
+        }
+    }
+    else if ( DropJob::acceptsMimeData( event->mimeData(),  DropJob::Playlist | DropJob::Artist | DropJob::Album, DropJob::Create ) )
+    {
+        event->setDropAction( Qt::CopyAction );
+        event->accept();
+    }
+    setDirtyRegion( m_dropRect );
+}
+
+
+void
+SourceTreeView::dropEvent( QDropEvent* event )
+{
+    const QPoint pos = event->pos();
+    const QModelIndex index = indexAt( pos );
+
+    if ( model()->data( index, SourcesModel::SourceTreeItemTypeRole ).toInt() == SourcesModel::StaticPlaylist
+         || model()->data( index, SourcesModel::SourceTreeItemTypeRole ).toInt() == SourcesModel::CategoryAdd )
+    {
+        SourceTreeItem* item = itemFromIndex< SourceTreeItem >( index );
+        Q_ASSERT( item );
+
+        item->setDropType( m_delegate->hoveredDropType() );
+        qDebug() << Q_FUNC_INFO << "dropType is " << m_delegate->hoveredDropType();
+    }
+
+    // if it's a playlist drop, accept it anywhere in the sourcetree by manually parsing it.
+    if ( DropJob::isDropType( DropJob::Playlist, event->mimeData()  ) )
+    {
+        qDebug() << Q_FUNC_INFO << "Current Event";
+        DropJob* dropThis = new DropJob;
+        dropThis->setDropTypes( DropJob::Playlist );
+        dropThis->setDropAction( DropJob::Create );
+        dropThis->parseMimeData( event->mimeData() );
+
+        // Don't add it to the playlist under drop, it's a new playlist now
+        return;
+    }
+
+    // Need to fake the dropevent because the treeview would reject it if it is outside the item (on the tree)
+    if ( pos.x() < 100 )
+    {
+        QDropEvent* newEvent = new QDropEvent( pos + QPoint( 100, 0 ), event->possibleActions(), event->mimeData(), event->mouseButtons(), event->keyboardModifiers(), event->type() );
+        QTreeView::dropEvent( newEvent );
+        delete newEvent;
+    }
+    else
+    {
+        QTreeView::dropEvent( event );
+    }
+
+    m_dragging = false;
+    m_dropIndex = QPersistentModelIndex();
+    m_delegate->dragLeaveEvent();
+    dataChanged( index, index );
+}
+
+
+void
+SourceTreeView::keyPressEvent( QKeyEvent* event )
+{
+    if ( ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace ) && !selectionModel()->selectedIndexes().isEmpty() )
+    {
+        QModelIndex idx = selectionModel()->selectedIndexes().first();
+        if ( model()->data( idx, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::StaticPlaylist ||
+             model()->data( idx, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::AutomaticPlaylist ||
+             model()->data( idx, SourcesModel::SourceTreeItemTypeRole ) == SourcesModel::Station )
+        {
+            PlaylistItem* item = itemFromIndex< PlaylistItem >( idx );
+            Q_ASSERT( item );
+
+            if ( item->playlist()->author()->isLocal() )
+                deletePlaylist( idx );
+        }
+        event->accept();
+    }
+    else
+    {
+        event->ignore();
+    }
+    QTreeView::keyPressEvent( event );
+}
+
+
+void
+SourceTreeView::paintEvent( QPaintEvent* event )
+{
+    if ( m_dragging && !m_dropRect.isEmpty() )
+    {
+        QPainter painter( viewport() );
+        const QRect itemRect = visualRect( m_dropIndex );
+
+        QStyleOptionViewItemV4 opt;
+        opt.initFrom( this );
+        opt.rect = itemRect;
+        opt.state = QStyle::State_Enabled | QStyle::State_Selected;
+
+        style()->drawPrimitive( QStyle::PE_PanelItemViewRow, &opt, &painter, this );
+    }
+
+    QTreeView::paintEvent( event );
+}
+
+
+void
+SourceTreeView::drawRow( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
+{
+    QTreeView::drawRow( painter, option, index );
+}
+
+
+template< typename T > T*
+SourceTreeView::itemFromIndex( const QModelIndex& index ) const
+{
+    Q_ASSERT( model()->data( index, SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
+
+    T* item = qobject_cast< T* >( model()->data( index, SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
+    Q_ASSERT( item );
+
+    return item;
+}
+
+
+void
+SourceTreeView::update( const QModelIndex &index )
+{
+    dataChanged( index, index );
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/SourceTreeView.h Added

@@ -0,0 +1,122 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 SOURCETREEVIEW_H
+#define SOURCETREEVIEW_H
+
+#include "Typedefs.h"
+#include "SourcePlaylistInterface.h"
+
+#include <QtGui/QTreeView>
+#include <QtGui/QMenu>
+
+class CollectionModel;
+class PlaylistModel;
+class SourcesModel;
+class SourcesProxyModel;
+class SourceDelegate;
+
+namespace Tomahawk
+{
+    class LatchManager;
+}
+
+class SourceTreeView : public QTreeView
+{
+Q_OBJECT
+
+public:
+    explicit SourceTreeView( QWidget* parent = 0 );
+    ~SourceTreeView();
+
+public slots:
+    void showOfflineSources( bool offlineSourcesShown );
+
+    void renamePlaylist();
+
+    void update( const QModelIndex &index );
+
+signals:
+    void onOnline( const QModelIndex& index );
+    void onOffline( const QModelIndex& index );
+
+    void latchRequest( const Tomahawk::source_ptr& source );
+    void unlatchRequest( const Tomahawk::source_ptr& source );
+    void catchUpRequest();
+    void latchModeChangeRequest( const Tomahawk::source_ptr& source, bool realtime );
+
+private slots:
+    void onItemExpanded( const QModelIndex& idx );
+    void onItemActivated( const QModelIndex& index );
+    void selectRequest( const QPersistentModelIndex& idx );
+    void expandRequest( const QPersistentModelIndex& idx );
+    void toggleExpandRequest( const QPersistentModelIndex& idx );
+    void onItemDoubleClicked( const QModelIndex& idx );
+
+    void loadPlaylist();
+    void deletePlaylist( const QModelIndex& = QModelIndex() );
+    void copyPlaylistLink();
+    void exportPlaylist();
+    void addToLocal();
+
+    void latchOnOrCatchUp();
+    void latchOff();
+    void latchOnOrCatchUp( const Tomahawk::source_ptr& source );
+    void latchOff( const Tomahawk::source_ptr& source );
+    void latchModeToggled( bool checked );
+
+    void onCustomContextMenu( const QPoint& pos );
+    void onSelectionChanged();
+
+protected:
+    void drawRow( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
+
+    virtual void paintEvent( QPaintEvent* event );
+
+    virtual void dragEnterEvent( QDragEnterEvent* event );
+    virtual void dragLeaveEvent( QDragLeaveEvent* event );
+    virtual void dragMoveEvent( QDragMoveEvent* event );
+    virtual void dropEvent( QDropEvent* event );
+    virtual void keyPressEvent( QKeyEvent* event );
+
+private:
+    void setupMenus();
+
+    template< typename T >
+    T* itemFromIndex( const QModelIndex& index ) const;
+
+    SourcesModel* m_model;
+    SourcesProxyModel* m_proxyModel;
+    QModelIndex m_contextMenuIndex;
+    SourceDelegate* m_delegate;
+    Tomahawk::LatchManager* m_latchManager;
+
+    QMenu m_playlistMenu;
+    QMenu m_roPlaylistMenu;
+    QMenu m_latchMenu;
+    QMenu m_privacyMenu;
+
+    bool m_dragging;
+    QRect m_dropRect;
+    QPersistentModelIndex m_dropIndex;
+    
+    QPersistentModelIndex m_selectedIndex;
+};
+
+#endif // SOURCETREEVIEW_H

tomahawk-0.5.5.tar.bz2/src/sourcetree/SourcesModel.cpp Added

@@ -0,0 +1,677 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "sourcetree/SourcesModel.h"
+
+#include <boost/bind.hpp>
+
+#include <QMimeData>
+#include <QSize>
+
+#include "sourcetree/items/SourceTreeItem.h"
+#include "sourcetree/items/SourceItem.h"
+#include "sourcetree/items/GroupItem.h"
+#include "sourcetree/items/GenericPageItems.h"
+#include "sourcetree/items/HistoryItem.h"
+#include "SourceList.h"
+#include "Playlist.h"
+#include "Collection.h"
+#include "Source.h"
+#include "ViewManager.h"
+
+#include "utils/Logger.h"
+#include "GlobalActionManager.h"
+#include "DropJob.h"
+#include "items/PlaylistItems.h"
+#include "playlist/TreeView.h"
+#include "playlist/PlaylistView.h"
+#include "playlist/dynamic/widgets/DynamicWidget.h"
+
+using namespace Tomahawk;
+
+
+SourcesModel::SourcesModel( QObject* parent )
+    : QAbstractItemModel( parent )
+    , m_rootItem( 0 )
+    , m_viewPageDelayedCacheItem( 0 )
+{
+    m_rootItem = new SourceTreeItem( this, 0, Invalid );
+
+    appendGroups();
+    onSourcesAdded( SourceList::instance()->sources() );
+
+    connect( SourceList::instance(), SIGNAL( sourceAdded( Tomahawk::source_ptr ) ), SLOT( onSourceAdded( Tomahawk::source_ptr ) ) );
+    connect( SourceList::instance(), SIGNAL( sourceRemoved( Tomahawk::source_ptr ) ), SLOT( onSourceRemoved( Tomahawk::source_ptr ) ) );
+    connect( ViewManager::instance(), SIGNAL( viewPageActivated( Tomahawk::ViewPage* ) ), this, SLOT( viewPageActivated( Tomahawk::ViewPage* ) ) );
+}
+
+
+SourcesModel::~SourcesModel()
+{
+    delete m_rootItem;
+}
+
+
+QString
+SourcesModel::rowTypeToString( RowType type )
+{
+    switch ( type )
+    {
+        case Group:
+            return tr( "Group" );
+
+        case Collection:
+            return tr( "Collection" );
+
+        case StaticPlaylist:
+            return tr( "Playlist" );
+
+        case AutomaticPlaylist:
+            return tr( "Automatic Playlist" );
+
+        case Station:
+            return tr( "Station" );
+
+        default:
+            return QString( "Unknown" );
+    }
+}
+
+
+QVariant
+SourcesModel::data( const QModelIndex& index, int role ) const
+{
+    if ( !index.isValid() )
+        return QVariant();
+
+    SourceTreeItem* item = itemFromIndex( index );
+    if ( !item )
+        return QVariant();
+
+    switch ( role )
+    {
+    case Qt::SizeHintRole:
+        return QSize( 0, 18 );
+    case SourceTreeItemRole:
+        return QVariant::fromValue< SourceTreeItem* >( item );
+    case SourceTreeItemTypeRole:
+        return item->type();
+    case Qt::DisplayRole:
+    case Qt::EditRole:
+        return item->text();
+    case Qt::DecorationRole:
+        return item->icon();
+    case SourcesModel::SortRole:
+        return item->peerSortValue();
+    case SourcesModel::IDRole:
+        return item->IDValue();
+    case SourcesModel::LatchedOnRole:
+    {
+        if ( item->type() == Collection )
+        {
+            SourceItem* cItem = qobject_cast< SourceItem* >( item );
+            return cItem->localLatchedOn();
+        }
+        return false;
+    }
+    case SourcesModel::LatchedRealtimeRole:
+    {
+        if ( item->type() == Collection )
+        {
+            SourceItem* cItem = qobject_cast< SourceItem* >( item );
+            return cItem->localLatchMode() == Tomahawk::PlaylistModes::RealTime;
+        }
+        return false;
+    }
+    case SourcesModel::CustomActionRole:
+    {
+        return QVariant::fromValue< QList< QAction* > >( item->customActions() );
+    }
+    case Qt::ToolTipRole:
+        if ( !item->tooltip().isEmpty() )
+            return item->tooltip();
+    }
+    return QVariant();
+}
+
+
+int
+SourcesModel::columnCount( const QModelIndex& ) const
+{
+    return 1;
+}
+
+
+int
+SourcesModel::rowCount( const QModelIndex& parent ) const
+{
+    if( !parent.isValid() )
+    {
+        return m_rootItem->children().count();
+    }
+
+    return itemFromIndex( parent )->children().count();
+}
+
+
+QModelIndex
+SourcesModel::parent( const QModelIndex& child ) const
+{
+    if( !child.isValid() )
+    {
+        return QModelIndex();
+    }
+
+    SourceTreeItem* node = itemFromIndex( child );
+    SourceTreeItem* parent = node->parent();
+    if( parent == m_rootItem )
+        return QModelIndex();
+
+    return createIndex( rowForItem( parent ), 0, parent );
+}
+
+
+QModelIndex
+SourcesModel::index( int row, int column, const QModelIndex& parent ) const
+{
+    if( row < 0 || column < 0 )
+        return QModelIndex();
+
+    if( hasIndex( row, column, parent ) )
+    {
+        SourceTreeItem *parentNode = itemFromIndex( parent );
+        SourceTreeItem *childNode = parentNode->children().at( row );
+        return createIndex( row, column, childNode );
+    }
+
+    return QModelIndex();
+
+}
+
+
+bool
+SourcesModel::setData( const QModelIndex& index, const QVariant& value, int role )
+{
+    SourceTreeItem* item = itemFromIndex( index );
+    return item->setData( value, role );
+}
+
+
+QStringList
+SourcesModel::mimeTypes() const
+{
+    return DropJob::mimeTypes();
+}
+
+
+QMimeData*
+SourcesModel::mimeData( const QModelIndexList& ) const
+{
+    // TODO
+    return new QMimeData();
+}
+
+
+bool
+SourcesModel::dropMimeData( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent )
+{
+    SourceTreeItem* item = 0;
+//    qDebug() << "Got mime data dropped:" << row << column << parent << itemFromIndex( parent )->text();
+    if( row == -1 && column == -1 )
+        item = itemFromIndex( parent );
+    else if( column == 0 )
+        item = itemFromIndex( index( row, column, parent ) );
+    else if( column == -1 ) // column is -1, that means the drop is happening "below" the indices. that means we actually want the one before it
+        item = itemFromIndex( index( row - 1, 0, parent ) );
+
+    Q_ASSERT( item );
+
+//    qDebug() << "Dropping on:" << item->text();
+    return item->dropMimeData( data, action );
+}
+
+
+Qt::DropActions
+SourcesModel::supportedDropActions() const
+{
+#ifdef Q_WS_MAC
+    return Qt::CopyAction | Qt::MoveAction;
+#else
+    return Qt::CopyAction;
+#endif
+}
+
+
+Qt::ItemFlags
+SourcesModel::flags( const QModelIndex& index ) const
+{
+    if ( index.isValid() )
+    {
+        return itemFromIndex( index )->flags();
+    }
+    else
+        return 0;
+}
+
+
+void
+SourcesModel::appendGroups()
+{
+    beginInsertRows( QModelIndex(), rowCount(), rowCount() + 3 );
+
+    GroupItem* browse = new GroupItem( this, m_rootItem, tr( "Browse" ), 0 );
+    new HistoryItem( this, m_rootItem, tr( "Search History" ), 1 );
+//    new SourceTreeItem( this, m_rootItem, SourcesModel::Divider, 2 );
+    m_myMusicGroup = new GroupItem( this, m_rootItem, tr( "My Music" ), 3 );
+
+    GenericPageItem* dashboard = new GenericPageItem( this, browse, tr( "Dashboard" ), QIcon( RESPATH "images/dashboard.png" ),
+                                                      boost::bind( &ViewManager::showWelcomePage, ViewManager::instance() ),
+                                                      boost::bind( &ViewManager::welcomeWidget, ViewManager::instance() ) );
+    dashboard->setSortValue( 0 );
+
+    // super collection
+    GenericPageItem* sc = new GenericPageItem( this, browse, tr( "SuperCollection" ), QIcon( RESPATH "images/supercollection.png" ),
+                                                  boost::bind( &ViewManager::showSuperCollection, ViewManager::instance() ),
+                                                  boost::bind( &ViewManager::superCollectionView, ViewManager::instance() ) );
+    sc->setSortValue( 1 );
+
+    // browse section
+    GenericPageItem* loved = new GenericPageItem( this, browse, tr( "Top Loved Tracks" ), QIcon( RESPATH "images/loved_playlist.png" ),
+                                                  boost::bind( &ViewManager::showTopLovedPage, ViewManager::instance() ),
+                                                  boost::bind( &ViewManager::topLovedWidget, ViewManager::instance() ) );
+    loved->setSortValue( 2 );
+
+    GenericPageItem* recent = new GenericPageItem( this, browse, tr( "Recently Played" ), QIcon( RESPATH "images/recently-played.png" ),
+                                                   boost::bind( &ViewManager::showRecentPlaysPage, ViewManager::instance() ),
+                                                   boost::bind( &ViewManager::recentPlaysWidget, ViewManager::instance() ) );
+    recent->setSortValue( 3 );
+
+    GenericPageItem* hot = new GenericPageItem( this, browse, tr( "Charts" ), QIcon( RESPATH "images/charts.png" ),
+                                                boost::bind( &ViewManager::showWhatsHotPage, ViewManager::instance() ),
+                                                boost::bind( &ViewManager::whatsHotWidget, ViewManager::instance() ) );
+    hot->setSortValue( 4 );
+
+    GenericPageItem* newReleases = new GenericPageItem( this, browse, tr( "New Releases" ), QIcon( RESPATH "images/new-releases.png" ),
+                                                boost::bind( &ViewManager::showNewReleasesPage, ViewManager::instance() ),
+                                                boost::bind( &ViewManager::newReleasesWidget, ViewManager::instance() ) );
+    newReleases->setSortValue( 5 );
+
+    m_collectionsGroup = new GroupItem( this, m_rootItem, tr( "Friends" ), 4 );
+
+    endInsertRows();
+}
+
+
+void
+SourcesModel::appendItem( const Tomahawk::source_ptr& source )
+{
+    GroupItem* parent;
+    if ( !source.isNull() && source->isLocal() )
+    {
+        parent = m_myMusicGroup;
+    }
+    else
+    {
+        parent = m_collectionsGroup;
+    }
+
+    QModelIndex idx = indexFromItem( parent );
+    beginInsertRows( idx, rowCount( idx ), rowCount( idx ) );
+    new SourceItem( this, parent, source );
+    endInsertRows();
+
+    parent->checkExpandedState();
+}
+
+
+bool
+SourcesModel::removeItem( const Tomahawk::source_ptr& source )
+{
+//    qDebug() << "Removing source item from SourceTree:" << source->friendlyName();
+
+    QModelIndex idx;
+    int rows = rowCount();
+    for ( int row = 0; row < rows; row++ )
+    {
+        QModelIndex idx = index( row, 0, QModelIndex() );
+        SourceItem* item = static_cast< SourceItem* >( idx.internalPointer() );
+        if ( item && item->source() == source )
+        {
+//            qDebug() << "Found removed source item:" << item->source()->userName();
+            beginRemoveRows( QModelIndex(), row, row );
+            m_rootItem->removeChild( item );
+            endRemoveRows();
+
+//             onItemOffline( idx );
+
+            delete item;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+void
+SourcesModel::viewPageActivated( Tomahawk::ViewPage* page )
+{
+    if ( !m_sourcesWithViewPage.isEmpty() )
+    {
+        // Hide again any offline sources we exposed, since we're showing a different page now. they'll be re-shown if the user selects a playlist that is from an offline user
+        QList< source_ptr > temp = m_sourcesWithViewPage;
+        m_sourcesWithViewPage.clear();
+        foreach ( const source_ptr& s, temp )
+        {
+            QModelIndex idx = indexFromItem( m_sourcesWithViewPageItems.value( s ) );
+            emit dataChanged( idx, idx );
+        }
+        m_sourcesWithViewPageItems.clear();
+    }
+
+    if ( m_sourceTreeLinks.contains( page ) )
+    {
+        Q_ASSERT( m_sourceTreeLinks page  );
+//        qDebug() << "Got view page activated for item:" << m_sourceTreeLinks page ->text();
+        QModelIndex idx = indexFromItem( m_sourceTreeLinks page  );
+
+        if ( !idx.isValid() )
+            m_sourceTreeLinks.remove( page );
+        else
+            emit selectRequest( QPersistentModelIndex( idx ) );
+    }
+    else
+    {
+        playlist_ptr p = ViewManager::instance()->playlistForPage( page );
+        // HACK
+        // try to find it if it is a playlist. not pretty at all.... but this happens when ViewManager loads a playlist or dynplaylist NOT from the sidebar but from somewhere else
+        // we don't know which sourcetreeitem is related to it, so we have to find it. we also don't know if this page is a playlist or dynplaylist or not, but we can't check as we can't
+        // include DynamicWidget.h here (so can't dynamic_cast).
+        // this could also be fixed by keeping a master list of playlists/sourcetreeitems... but that's even uglier i think. this is only called the first time a certain viewpage is clicked from external
+        // sources.
+        SourceTreeItem* item = activatePlaylistPage( page, m_rootItem );
+        m_viewPageDelayedCacheItem = page;
+
+        if ( !p.isNull() )
+        {
+            source_ptr s= p->author();
+            if ( !s.isNull() && !s->isOnline() && item )
+            {
+                m_sourcesWithViewPage << s;
+
+                // show the collection now... yeah.
+                if ( !item->parent() || !item->parent()->parent() )
+                {
+                    tLog() << "Found playlist item with no category parent or collection parent!" << item->text();
+                    return;
+                }
+
+                SourceTreeItem* collectionOfPlaylist = item->parent()->parent();
+                if ( !m_rootItem->children().contains( collectionOfPlaylist ) ) // verification to make sure we're not stranded
+                {
+                    tLog() << "Got what we assumed to be a parent col of a playlist not as a child of our root node...:" << collectionOfPlaylist;
+                    return;
+                }
+
+                QModelIndex idx = indexFromItem( collectionOfPlaylist );
+                m_sourcesWithViewPageItems s  = collectionOfPlaylist;
+                tDebug() << "Emitting dataChanged for offline source:" << idx << idx.isValid() << collectionOfPlaylist << collectionOfPlaylist->text();
+                emit dataChanged( idx, idx );
+            }
+        }
+    }
+}
+
+
+SourceTreeItem*
+SourcesModel::activatePlaylistPage( ViewPage* p, SourceTreeItem* i )
+{
+    if( !i )
+        return 0;
+
+    if( qobject_cast< PlaylistItem* >( i ) &&
+        qobject_cast< PlaylistItem* >( i )->activateCurrent() )
+        return i;
+
+    SourceTreeItem* ret = 0;
+    for( int k = 0; k < i->children().size(); k++ )
+    {
+        if( SourceTreeItem* retItem = activatePlaylistPage( p, i->children().at( k ) ) )
+            ret = retItem;
+    }
+
+    return ret;
+}
+
+
+void
+SourcesModel::loadSources()
+{
+    QList<source_ptr> sources = SourceList::instance()->sources();
+
+    foreach( const source_ptr& source, sources )
+        appendItem( source );
+}
+
+
+void
+SourcesModel::onSourcesAdded( const QList<source_ptr>& sources )
+{
+    foreach( const source_ptr& source, sources )
+        appendItem( source );
+}
+
+
+void
+SourcesModel::onSourceAdded( const source_ptr& source )
+{
+    appendItem( source );
+}
+
+
+void
+SourcesModel::onSourceRemoved( const source_ptr& source )
+{
+    removeItem( source );
+}
+
+
+void
+SourcesModel::itemUpdated()
+{
+    Q_ASSERT( qobject_cast< SourceTreeItem* >( sender() ) );
+    SourceTreeItem* item = qobject_cast< SourceTreeItem* >( sender() );
+
+    if( !item )
+        return;
+
+    QModelIndex idx = indexFromItem( item );
+    if( idx.isValid() )
+        emit dataChanged( idx, idx );
+}
+
+
+void
+SourcesModel::onItemRowsAddedBegin( int first, int last )
+{
+    Q_ASSERT( qobject_cast< SourceTreeItem* >( sender() ) );
+    SourceTreeItem* item = qobject_cast< SourceTreeItem* >( sender() );
+
+    if( !item )
+        return;
+
+    QModelIndex idx = indexFromItem( item );
+    beginInsertRows( idx, first, last );
+}
+
+
+void
+SourcesModel::onItemRowsAddedDone()
+{
+    Q_ASSERT( qobject_cast< SourceTreeItem* >( sender() ) );
+
+    endInsertRows();
+}
+
+
+void
+SourcesModel::onItemRowsRemovedBegin( int first, int last )
+{
+    Q_ASSERT( qobject_cast< SourceTreeItem* >( sender() ) );
+    SourceTreeItem* item = qobject_cast< SourceTreeItem* >( sender() );
+
+    if( !item )
+        return;
+
+    QModelIndex idx = indexFromItem( item );
+    beginRemoveRows( idx, first, last );
+}
+
+
+void
+SourcesModel::onItemRowsRemovedDone()
+{
+    Q_ASSERT( qobject_cast< SourceTreeItem* >( sender() ) );
+
+    endRemoveRows();
+}
+
+
+void
+SourcesModel::linkSourceItemToPage( SourceTreeItem* item, ViewPage* p )
+{
+    // TODO handle removal
+    m_sourceTreeLinks p  = item;
+
+    if ( p && m_viewPageDelayedCacheItem == p )
+        emit selectRequest( QPersistentModelIndex( indexFromItem( item ) ) );
+
+    if ( QObject* obj = dynamic_cast< QObject* >( p ) )
+    {
+        if( obj->metaObject()->indexOfSignal( "destroyed(QWidget*)" ) > -1 )
+            connect( obj, SIGNAL( destroyed( QWidget* ) ), SLOT( onWidgetDestroyed( QWidget* ) ), Qt::UniqueConnection );
+    }
+    m_viewPageDelayedCacheItem = 0;
+}
+
+
+void
+SourcesModel::onWidgetDestroyed( QWidget* w )
+{
+    int ret = m_sourceTreeLinks.remove( dynamic_cast< Tomahawk::ViewPage* > ( w ) );
+    qDebug() << "REMOVED STALE SOURCE PAGE?" << ret;
+}
+
+
+void
+SourcesModel::removeSourceItemLink( SourceTreeItem* item )
+{
+    QList< ViewPage* > pages = m_sourceTreeLinks.keys( item );
+    foreach( ViewPage* p, pages )
+        m_sourceTreeLinks.remove( p );
+}
+
+
+SourceTreeItem*
+SourcesModel::itemFromIndex( const QModelIndex& idx ) const
+{
+    if( !idx.isValid() )
+        return m_rootItem;
+
+    Q_ASSERT( idx.internalPointer() );
+
+    return reinterpret_cast< SourceTreeItem* >( idx.internalPointer() );
+}
+
+
+QModelIndex
+SourcesModel::indexFromItem( SourceTreeItem* item ) const
+{
+    if( !item || !item->parent() ) // should never happen..
+        return QModelIndex();
+
+    // reconstructs a modelindex from a sourcetreeitem that is somewhere in the tree
+    // traverses the item to the root node, then rebuilds the qmodeindices from there back down
+    // each int is the row of that item in the parent.
+    /**
+     * In this diagram, if the \param item is G, childIndexList will contain 0, 2, 0
+     *
+     *    A
+     *      D
+     *      E
+     *      F
+     *        G
+     *        H
+     *    B
+     *    C
+     *
+     **/
+    QList< int > childIndexList;
+    SourceTreeItem* curItem = item;
+    while( curItem != m_rootItem ) {
+        int row  = rowForItem( curItem );
+        if( row < 0 ) // something went wrong, bail
+            return QModelIndex();
+
+        childIndexList << row;
+
+        curItem = curItem->parent();
+    }
+//     qDebug() << "build child index list:" << childIndexList;
+    // now rebuild the qmodelindex we need
+    QModelIndex idx;
+    for( int i = childIndexList.size() - 1; i >= 0 ; i-- ) {
+        idx = index( childIndexList i , 0, idx );
+    }
+//     qDebug() << "Got index from item:" << idx << idx.data( Qt::DisplayRole ).toString();
+//     qDebug() << "parent:" << idx.parent();
+    return idx;
+}
+
+
+int
+SourcesModel::rowForItem( SourceTreeItem* item ) const
+{
+    if ( !item || !item->parent() || !item->parent()->children().contains( item ) )
+        return -1;
+
+    return item->parent()->children().indexOf( item );
+}
+
+
+void
+SourcesModel::itemSelectRequest( SourceTreeItem* item )
+{
+    emit selectRequest( QPersistentModelIndex( indexFromItem( item ) ) );
+}
+
+
+void
+SourcesModel::itemExpandRequest( SourceTreeItem *item )
+{
+    emit expandRequest( QPersistentModelIndex( indexFromItem( item ) ) );
+}
+
+
+void
+SourcesModel::itemToggleExpandRequest( SourceTreeItem *item )
+{
+    emit toggleExpandRequest( QPersistentModelIndex( indexFromItem( item ) ) );
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/SourcesModel.h Added

@@ -0,0 +1,158 @@
+/* === 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>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 SOURCESMODEL_H
+#define SOURCESMODEL_H
+
+#include <QModelIndex>
+#include <QStringList>
+
+#include "Typedefs.h"
+#include "Source.h"
+
+#include <QList>
+#include <QAction>
+
+class QMimeData;
+
+class SourceTreeItem;
+class GroupItem;
+
+namespace Tomahawk {
+    class Source;
+    class Playlist;
+    class ViewPage;
+}
+
+class SourcesModel : public QAbstractItemModel
+{
+    Q_OBJECT
+public:
+    enum RowType {
+        Invalid = -1,
+        Divider = 9,
+
+        Collection = 0,
+        Group = 8,
+
+        Category = 1,
+        CategoryAdd = 2,
+
+        StaticPlaylist = 3,
+        AutomaticPlaylist = 4,
+        Station = 5,
+
+        GenericPage = 6,
+        TemporaryPage = 7
+    };
+
+    enum CategoryType {
+        PlaylistsCategory = 0,
+        StationsCategory = 1
+    };
+
+    enum Roles {
+        SourceTreeItemRole      = Qt::UserRole + 10,
+        SourceTreeItemTypeRole  = Qt::UserRole + 11,
+        SortRole                = Qt::UserRole + 12,
+        IDRole                  = Qt::UserRole + 13,
+        LatchedOnRole           = Qt::UserRole + 14,
+        LatchedRealtimeRole     = Qt::UserRole + 15,
+        CustomActionRole        = Qt::UserRole + 16 // QList< QAction* >
+    };
+
+    SourcesModel( QObject* parent = 0 );
+    virtual ~SourcesModel();
+
+    static QString rowTypeToString( RowType type );
+
+    // reimplemented from QAIM
+    virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
+    virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
+    virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
+    virtual QModelIndex parent(const QModelIndex& child) const;
+    virtual QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const;
+    virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
+
+    virtual QStringList mimeTypes() const;
+    virtual QMimeData* mimeData(const QModelIndexList& indexes) const;
+    virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
+    virtual Qt::DropActions supportedDropActions() const;
+    virtual Qt::ItemFlags flags(const QModelIndex& index) const;
+
+    void appendGroups();
+
+    void appendItem( const Tomahawk::source_ptr& source );
+    bool removeItem( const Tomahawk::source_ptr& source );
+
+    void linkSourceItemToPage( SourceTreeItem* item, Tomahawk::ViewPage* p );
+    void removeSourceItemLink( SourceTreeItem* item );
+
+    QModelIndex indexFromItem( SourceTreeItem* item ) const;
+
+    QList< Tomahawk::source_ptr > sourcesWithViewPage() const { return m_sourcesWithViewPage; }
+
+public slots:
+    void loadSources();
+
+    void itemUpdated();
+    void onItemRowsAddedBegin( int first, int last );
+    void onItemRowsAddedDone();
+    void onItemRowsRemovedBegin( int first, int last );
+    void onItemRowsRemovedDone();
+
+    void viewPageActivated( Tomahawk::ViewPage* );
+
+    void itemSelectRequest( SourceTreeItem* item );
+    void itemExpandRequest( SourceTreeItem* item );
+    void itemToggleExpandRequest( SourceTreeItem* item );
+
+signals:
+    void selectRequest( const QPersistentModelIndex& idx );
+    void expandRequest( const QPersistentModelIndex& idx );
+    void toggleExpandRequest( const QPersistentModelIndex& idx );
+
+private slots:
+    void onSourcesAdded( const QList<Tomahawk::source_ptr>& sources );
+    void onSourceAdded( const Tomahawk::source_ptr& source );
+    void onSourceRemoved( const Tomahawk::source_ptr& source );
+
+    void onWidgetDestroyed( QWidget* w );
+
+private:
+    SourceTreeItem* itemFromIndex( const QModelIndex& idx ) const;
+    int rowForItem( SourceTreeItem* item ) const;
+    SourceTreeItem* activatePlaylistPage( Tomahawk::ViewPage* p, SourceTreeItem* i );
+
+    SourceTreeItem* m_rootItem;
+    GroupItem* m_collectionsGroup;
+    GroupItem* m_myMusicGroup;
+
+    QList< Tomahawk::source_ptr > m_sourcesWithViewPage;
+    QHash< Tomahawk::source_ptr, SourceTreeItem* > m_sourcesWithViewPageItems;
+
+    QHash< Tomahawk::ViewPage*, SourceTreeItem* > m_sourceTreeLinks;
+    Tomahawk::ViewPage* m_viewPageDelayedCacheItem;
+};
+
+Q_DECLARE_METATYPE( QList< QAction* > )
+
+#endif // SOURCESMODEL_H

tomahawk-0.5.5.tar.bz2/src/sourcetree/SourcesProxyModel.cpp Added

@@ -0,0 +1,131 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 "SourcesProxyModel.h"
+
+#include <QtGui/QTreeView>
+
+#include "SourceList.h"
+#include "SourcesModel.h"
+#include "sourcetree/items/SourceItem.h"
+
+#include "utils/Logger.h"
+
+
+SourcesProxyModel::SourcesProxyModel( SourcesModel* model, QObject* parent )
+    : QSortFilterProxyModel( parent )
+    , m_model( model )
+    , m_filtered( false )
+{
+    setDynamicSortFilter( true );
+    setSortRole( SourcesModel::SortRole );
+
+    setSourceModel( model );
+
+    connect( model, SIGNAL( rowsInserted( QModelIndex, int, int ) ), SLOT( onModelChanged() ) );
+    connect( model, SIGNAL( rowsRemoved( QModelIndex, int, int ) ), SLOT( onModelChanged() ) );
+
+    if ( model && model->metaObject()->indexOfSignal( "toggleExpandRequest(QPersistentModelIndex)" ) > -1 )
+        connect( model, SIGNAL( toggleExpandRequest( QPersistentModelIndex ) ), this, SLOT( toggleExpandRequested( QPersistentModelIndex ) ), Qt::QueuedConnection );
+    if ( model && model->metaObject()->indexOfSignal( "expandRequest(QPersistentModelIndex)" ) > -1 )
+        connect( model, SIGNAL( expandRequest( QPersistentModelIndex ) ), this, SLOT( expandRequested( QPersistentModelIndex ) ), Qt::QueuedConnection );
+    if ( model && model->metaObject()->indexOfSignal( "selectRequest(QPersistentModelIndex)" ) > -1 )
+        connect( model, SIGNAL( selectRequest( QPersistentModelIndex ) ), this, SLOT( selectRequested( QPersistentModelIndex ) ), Qt::QueuedConnection );
+}
+
+
+void
+SourcesProxyModel::showOfflineSources( bool offlineSourcesShown )
+{
+    m_filtered = !offlineSourcesShown;
+    invalidateFilter();
+}
+
+
+bool
+SourcesProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const
+{
+    // always filter empty top-level groups
+    SourceTreeItem* item = m_model->data( sourceModel()->index( sourceRow, 0, sourceParent ), SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >();
+
+    if ( item && item->type() != SourcesModel::Divider && item->parent()->parent() == 0 && !item->children().count() )
+        return false;
+   
+    if ( !m_filtered )
+        return true;
+
+    SourceItem* sti = qobject_cast< SourceItem* >( item );
+    if ( sti )
+    {
+        if ( sti->source().isNull() || sti->source()->isOnline() )
+            return true;
+        else if ( m_model->sourcesWithViewPage().contains( sti->source() ) )
+            return true;
+        else
+            return false;
+    }
+
+    // accept rows that aren't sources
+    return true;
+}
+
+
+void
+SourcesProxyModel::selectRequested( const QPersistentModelIndex& idx )
+{
+    emit selectRequest( QPersistentModelIndex( mapFromSource( idx ) ) );
+}
+
+
+void
+SourcesProxyModel::expandRequested( const QPersistentModelIndex& idx )
+{
+    emit expandRequest( QPersistentModelIndex( mapFromSource( idx ) ) );
+}
+
+
+void
+SourcesProxyModel::toggleExpandRequested( const QPersistentModelIndex& idx )
+{
+    emit toggleExpandRequest( QPersistentModelIndex( mapFromSource( idx ) ) );
+}
+
+
+bool
+SourcesProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const
+{
+    if ( m_model->data( left, SourcesModel::SortRole ) != m_model->data( right, SourcesModel::SortRole ) )
+        return ( m_model->data( left, SourcesModel::SortRole ).toInt() < m_model->data( right, SourcesModel::SortRole ).toInt() );
+
+    const QString& lefts = left.data().toString().toLower();
+    const QString& rights = right.data().toString().toLower();
+
+    if ( lefts == rights )
+        return ( m_model->data( left, SourcesModel::IDRole ).toInt() < m_model->data( right, SourcesModel::IDRole ).toInt() );
+    else
+        return QString::localeAwareCompare( lefts, rights ) < 0;
+}
+
+
+void
+SourcesProxyModel::onModelChanged()
+{
+    invalidateFilter();
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/SourcesProxyModel.h Added

@@ -0,0 +1,59 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.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 SOURCESPROXYMODEL_H
+#define SOURCESPROXYMODEL_H
+
+#include <QtGui/QSortFilterProxyModel>
+
+class SourcesModel;
+
+class SourcesProxyModel : public QSortFilterProxyModel
+{
+Q_OBJECT
+
+public:
+    explicit SourcesProxyModel( SourcesModel* model, QObject* parent = 0 );
+
+public slots:
+    void showOfflineSources( bool offlineSourcesShown );
+
+    void selectRequested( const QPersistentModelIndex& );
+    void expandRequested( const QPersistentModelIndex& );
+    void toggleExpandRequested( const QPersistentModelIndex& );
+
+signals:
+    void selectRequest( const QPersistentModelIndex& idx );
+    void expandRequest( const QPersistentModelIndex& idx );
+    void toggleExpandRequest( const QPersistentModelIndex& idx );
+
+protected:
+    bool filterAcceptsRow( int sourceRow, const QModelIndex& sourceParent ) const;
+    bool lessThan( const QModelIndex& left, const QModelIndex& right ) const;
+
+private slots:
+    void onModelChanged();
+
+private:
+    SourcesModel* m_model;
+
+    bool m_filtered;
+};
+
+#endif // SOURCESPROXYMODEL_H

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/CategoryItems.cpp Added

@@ -0,0 +1,379 @@
+/*
+ *  Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *  Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
+ *
+ *  This program 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 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "CategoryItems.h"
+
+#include <QMimeData>
+
+#include "TomahawkApp.h"
+#include "ViewManager.h"
+#include "ViewPage.h"
+#include "SourceList.h"
+#include "SourceTreeView.h"
+#include "utils/TomahawkUtils.h"
+#include "widgets/NewPlaylistWidget.h"
+#include "TomahawkWindow.h"
+#include <playlist/dynamic/GeneratorInterface.h>
+#include "utils/Logger.h"
+#include "DropJob.h"
+
+#include <echonest/Playlist.h>
+
+using namespace Tomahawk;
+
+
+/// CategoryAddItem
+
+CategoryAddItem::CategoryAddItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::CategoryType type )
+    : SourceTreeItem( model, parent, SourcesModel::CategoryAdd )
+    , m_categoryType( type )
+{
+    m_icon = QIcon( RESPATH "images/add.png" );
+}
+
+
+CategoryAddItem::~CategoryAddItem()
+{
+}
+
+
+QString
+CategoryAddItem::text() const
+{
+    switch( m_categoryType )
+    {
+        case SourcesModel::PlaylistsCategory:
+            return tr( "Create new Playlist" );
+
+        case SourcesModel::StationsCategory:
+            return tr( "Create new Station" );
+    }
+
+    return QString();
+}
+
+
+void
+CategoryAddItem::activate()
+{
+    switch( m_categoryType )
+    {
+        case SourcesModel::PlaylistsCategory:
+            APP->mainWindow()->createPlaylist();
+            break;
+
+        case SourcesModel::StationsCategory:
+            APP->mainWindow()->createStation();
+            break;
+    }
+}
+
+
+Qt::ItemFlags
+CategoryAddItem::flags() const
+{
+    switch ( m_categoryType )
+    {
+        case SourcesModel::PlaylistsCategory:
+            return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled;
+
+        case SourcesModel::StationsCategory:
+            return Qt::ItemIsEnabled | Qt::ItemIsDropEnabled;
+
+        default:
+            return Qt::ItemIsEnabled;
+            break;
+    }
+}
+
+
+QIcon
+CategoryAddItem::icon() const
+{
+    return m_icon;
+}
+
+
+bool
+CategoryAddItem::willAcceptDrag( const QMimeData* data ) const
+{
+    if ( ( m_categoryType == SourcesModel::PlaylistsCategory || m_categoryType == SourcesModel::StationsCategory ) && DropJob::acceptsMimeData( data ) )
+    {
+        return true;
+    }
+
+    return false;
+}
+
+
+SourceTreeItem::DropTypes
+CategoryAddItem::supportedDropTypes( const QMimeData* data ) const
+{
+    SourceTreeItem::DropTypes types = DropTypesNone;
+
+    if ( m_categoryType == SourcesModel::PlaylistsCategory )
+    {
+        if ( data->hasFormat( "application/tomahawk.query.list" ) )
+            return types | DropTypeThisTrack | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
+        else if ( data->hasFormat( "application/tomahawk.result.list" ) )
+            return types | DropTypeThisTrack | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
+        else if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
+            return types | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
+        else if ( data->hasFormat( "application/tomahawk.metadata.artist" ) )
+            return types | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
+    }
+
+    return types;
+}
+
+
+bool
+CategoryAddItem::dropMimeData( const QMimeData* data, Qt::DropAction )
+{
+    // As DropJob always converts dropped items to query_ptrs for all tracks we need to extract album/artist metadata ourselves for stations
+    if ( m_categoryType == SourcesModel::StationsCategory &&
+         ( data->hasFormat( "application/tomahawk.metadata.artist" ) || data->hasFormat( "application/tomahawk.metadata.album" ) ) )
+    {
+        QByteArray mimeData;
+        if ( data->hasFormat( "application/tomahawk.metadata.artist" ) )
+            mimeData = data->data( "application/tomahawk.metadata.artist" );
+        else if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
+            mimeData = data->data( "application/tomahawk.metadata.album" );
+
+        QDataStream stream( &mimeData, QIODevice::ReadOnly );
+
+        dynplaylist_ptr newpl = DynamicPlaylist::create( SourceList::instance()->getLocal(), uuid(), QString(), "", SourceList::instance()->getLocal()->friendlyName(), OnDemand, false );
+        newpl->setMode( OnDemand );
+
+        QString firstArtist;
+        // now we want to add each artist as a filter...
+        QList< dyncontrol_ptr > contrls;
+        while ( !stream.atEnd() )
+        {
+            QString artist;
+            stream >> artist;
+            if ( firstArtist.isEmpty() )
+                firstArtist = artist;
+
+            QString album;
+            if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
+                stream >> album; // throw away album title... we only create artists filters for now
+
+            dyncontrol_ptr c = newpl->generator()->createControl( "Artist" );
+            c->setInput( QString( "%1" ).arg( artist ) );
+            contrls << c;
+        }
+
+        QString name = firstArtist.isEmpty() ? tr( "New Station" ) : tr( "%1 Station" ).arg( firstArtist );
+        newpl->createNewRevision( uuid(), newpl->currentrevision(), newpl->type(), contrls );
+        newpl->setProperty( "newname", name );
+        connect( newpl.data(), SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ), this, SLOT( playlistToRenameLoaded() ) );
+
+        ViewManager::instance()->show( newpl );
+        return true;
+    }
+
+    // This could be needed once echonest supports filtering by album.
+    // If they never will, or if they do and this code still is not used, throw it away!
+    // If you enable this, make sure to remove the checks for album above.
+
+    /* if ( m_categoryType == SourcesModel::StationsCategory && data->hasFormat( "application/tomahawk.metadata.album" ) )
+    {
+        QByteArray mimeData = data->data( "application/tomahawk.metadata.album" );
+        QDataStream stream( &mimeData, QIODevice::ReadOnly );
+
+        dynplaylist_ptr newpl = DynamicPlaylist::create( SourceList::instance()->getLocal(), uuid(), QString(), "", SourceList::instance()->getLocal()->friendlyName(), OnDemand, false );
+        newpl->setMode( OnDemand );
+
+        QString firstAlbum;
+        // now we want to add each artist as a filter...
+        QList< dyncontrol_ptr > contrls;
+        while ( !stream.atEnd() )
+        {
+            QString artist;
+            stream >> artist;
+            QString album;
+            stream >> album;
+
+            if ( firstAlbum.isEmpty() )
+            {
+                firstAlbum = album;
+            }
+
+            dyncontrol_ptr c = newpl->generator()->createControl( "Album" );
+            c->setInput( QString( "%1" ).arg( artist ) );
+            contrls << c;
+        }
+
+        QString name = firstAlbum.isEmpty() ? tr( "New Station" ) : tr( "%1 Station" ).arg( firstAlbum );
+        newpl->rename( name );
+        newpl->createNewRevision( uuid(), newpl->currentrevision(), newpl->type(), contrls );
+
+        ViewManager::instance()->show( newpl );
+        // Give a shot to try to rename it. The playlist has to be created first. ugly.
+        QTimer::singleShot( 300, APP->mainWindow()->sourceTreeView(), SLOT( renamePlaylist() ) );
+        return true;
+
+    } */
+
+    // Create a new playlist seeded with these items
+    DropJob *dj = new DropJob();
+
+    connect( dj, SIGNAL( tracks( QList< Tomahawk::query_ptr > ) ), this, SLOT( parsedDroppedTracks( QList< Tomahawk::query_ptr > ) ), Qt::QueuedConnection );
+    if ( dropType() == DropTypeAllFromArtist )
+        dj->setGetWholeArtists( true );
+    if ( dropType() == DropTypeThisAlbum )
+        dj->setGetWholeAlbums( true );
+
+    if ( dropType() == DropTypeLocalItems )
+    {
+        dj->setGetWholeArtists( true );
+        dj->tracksFromMimeData( data, false, true );
+    }
+    else if ( dropType() == DropTypeTop50 )
+    {
+        dj->setGetWholeArtists( true );
+        dj->tracksFromMimeData( data, false, false, true );
+    }
+    else
+        dj->tracksFromMimeData( data, false, false );
+
+    return true;
+}
+
+
+void
+CategoryAddItem::playlistToRenameLoaded()
+{
+    Playlist* pl = qobject_cast< Playlist* >( sender() );
+    Q_ASSERT( pl );
+
+    QString name = sender()->property( "newname" ).toString();
+    if ( !name.isEmpty() )
+        pl->rename( name );
+    else
+        QTimer::singleShot( 400, APP->mainWindow()->sourceTreeView(), SLOT( renamePlaylist() ) );
+
+    disconnect( pl, SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ), this, SLOT( playlistToRenameLoaded() ) );
+    disconnect( pl, SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistToRenameLoaded() ) );
+}
+
+
+void
+CategoryAddItem::parsedDroppedTracks( const QList< query_ptr >& tracks )
+{
+    if ( m_categoryType == SourcesModel::PlaylistsCategory )
+    {
+        playlist_ptr newpl = Playlist::create( SourceList::instance()->getLocal(), uuid(), "New Playlist", "", SourceList::instance()->getLocal()->friendlyName(), false, tracks );
+        ViewManager::instance()->show( newpl );
+
+        connect( newpl.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ), this, SLOT( playlistToRenameLoaded() ) );
+    }
+    else if ( m_categoryType == SourcesModel::StationsCategory )
+    {
+        // seed the playlist with these song or artist filters
+        QString name;
+        name = tracks.isEmpty() ? tr( "New Station" ) : tr( "%1 Station" ).arg( tracks.first()->track() );
+
+        dynplaylist_ptr newpl = DynamicPlaylist::create( SourceList::instance()->getLocal(), uuid(), name, "", SourceList::instance()->getLocal()->friendlyName(), OnDemand, false );
+        newpl->setMode( OnDemand );
+
+        // now we want to add each query as a song or similar artist filter...
+        QList< dyncontrol_ptr > controls;
+        foreach ( const Tomahawk::query_ptr& q, tracks )
+        {
+            dyncontrol_ptr c = newpl->generator()->createControl( "Song" );
+            c->setInput( QString( "%1 %2" ).arg( q->track() ).arg( q->artist() ) );
+            controls << c;
+        }
+
+        newpl->createNewRevision( uuid(), newpl->currentrevision(), newpl->type(), controls );
+
+        ViewManager::instance()->show( newpl );
+        connect( newpl.data(), SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ), this, SLOT( playlistToRenameLoaded() ) );
+    }
+}
+
+
+int
+CategoryAddItem::peerSortValue() const
+{
+    return INT_MAX; // after any siblings
+}
+
+
+/// CategoryItem
+
+CategoryItem::CategoryItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::CategoryType category, bool showAddItem )
+    : SourceTreeItem( model, parent, SourcesModel::Category )
+    , m_category( category )
+    , m_addItem( 0 )
+    , m_showAdd( showAddItem )
+{
+    // in the constructor we're still being added to the parent, so we don't exist to have rows addded yet. so this is safe.
+    //     beginRowsAdded( 0, 0 );
+    if ( m_showAdd )
+    {
+        m_addItem = new CategoryAddItem( model, this, m_category );
+    }
+    //     endRowsAdded();
+}
+
+
+void
+CategoryItem::insertItem( SourceTreeItem* item )
+{
+    insertItems( QList< SourceTreeItem* >() << item );
+}
+
+
+void
+CategoryItem::insertItems( QList< SourceTreeItem* > items )
+{
+    // add the items to the category, and connect to the signals
+    int curCount = children().size();
+    if ( m_showAdd ) // if there's an add item, add it before that
+        curCount--;
+
+    beginRowsAdded( curCount, curCount + items.size() - 1 );
+    foreach( SourceTreeItem* item, items )
+    {
+        insertChild( children().count() - 1, item );
+    }
+    endRowsAdded();
+}
+
+
+int
+CategoryItem::peerSortValue() const
+{
+    if ( m_category == SourcesModel::PlaylistsCategory )
+        return -100;
+    else if ( m_category == SourcesModel::StationsCategory )
+        return 100;
+    else
+        return 0;
+}
+
+
+void
+CategoryItem::activate()
+{
+    emit toggleExpandRequest( this );
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/CategoryItems.h Added

@@ -0,0 +1,86 @@
+/*
+ *  Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *
+ *  This program 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 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef CATEGORY_ITEM_H
+#define CATEGORY_ITEM_H
+
+#include "SourceTreeItem.h"
+
+class CategoryAddItem : public SourceTreeItem
+{
+    Q_OBJECT
+public:
+    CategoryAddItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::CategoryType type );
+    ~CategoryAddItem();
+
+    virtual Qt::ItemFlags flags() const;
+    virtual QString text() const;
+    virtual void activate();
+    virtual QIcon icon() const;
+    virtual int peerSortValue() const;
+
+    virtual bool willAcceptDrag(const QMimeData* data) const;
+    virtual DropTypes supportedDropTypes(const QMimeData* data) const;
+    virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action);
+
+private slots:
+    void parsedDroppedTracks( const QList< Tomahawk::query_ptr >& tracks );
+
+    // Do the rename only after the revision is loaded
+    void playlistToRenameLoaded();
+
+private:
+    SourcesModel::CategoryType m_categoryType;
+    QIcon m_icon;
+
+};
+
+class CategoryItem : public SourceTreeItem
+{
+    Q_OBJECT
+public:
+    CategoryItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::CategoryType category, bool showAddItem );
+
+    virtual QString text() const {
+        switch( m_category )
+        {
+            case SourcesModel::PlaylistsCategory:
+                return tr( "Playlists" );
+            case SourcesModel::StationsCategory:
+                return tr( "Stations" );
+        }
+        return QString();
+    }
+    virtual void activate();
+    virtual int peerSortValue() const;
+    virtual Qt::ItemFlags flags() const { return Qt::ItemIsEnabled; }
+
+    // inserts an item at the end, but before the category add item
+    void insertItem( SourceTreeItem* item );
+    void insertItems( QList< SourceTreeItem* > item );
+
+    SourcesModel::CategoryType categoryType() { return m_category; }
+
+private:
+    SourcesModel::CategoryType m_category;
+    CategoryAddItem* m_addItem;
+    bool m_showAdd;
+};
+
+
+#endif

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/GenericPageItems.cpp Added

@@ -0,0 +1,92 @@
+/*
+ *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *
+ *    This program 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 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "GenericPageItems.h"
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "ViewManager.h"
+#include "audio/AudioEngine.h"
+
+using namespace Tomahawk;
+
+
+/// Generic page item
+GenericPageItem::GenericPageItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, const QIcon& icon, boost::function< ViewPage* () > show, boost::function< ViewPage* () > get )
+    : SourceTreeItem( model, parent, SourcesModel::GenericPage )
+    , m_icon( icon )
+    , m_text( text )
+    , m_sortValue( 0 )
+    , m_show( show )
+    , m_get( get )
+{
+    if( ViewPage* p = m_get() )
+        model->linkSourceItemToPage( this, p );
+}
+
+
+GenericPageItem::~GenericPageItem()
+{
+}
+
+
+void
+GenericPageItem::activate()
+{
+    ViewPage* p = m_show();
+    model()->linkSourceItemToPage( this, p );
+}
+
+
+QString
+GenericPageItem::text() const
+{
+    return m_text;
+}
+
+
+QIcon
+GenericPageItem::icon() const
+{
+    return m_icon;
+}
+
+
+bool
+GenericPageItem::willAcceptDrag(const QMimeData* data) const
+{
+    Q_UNUSED( data );
+    return false;
+}
+
+
+void
+GenericPageItem::setText( const QString &text )
+{
+    m_text = text;
+    emit updated();
+}
+
+bool
+GenericPageItem::isBeingPlayed() const
+{
+    if ( m_get() )
+        return m_get()->isBeingPlayed();
+
+    return false;
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/GenericPageItems.h Added

@@ -0,0 +1,57 @@
+/*
+ *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *
+ *    This program 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 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef GENERIC_PAGE_ITEM_H
+#define GENERIC_PAGE_ITEM_H
+
+#include "SourceTreeItem.h"
+
+#include "boost/function.hpp"
+#include "boost/bind.hpp"
+
+// generic item that has some name, some text, and calls a certain slot when activated. badabing!
+class GenericPageItem : public SourceTreeItem
+{
+    Q_OBJECT
+public:
+    // takes 2 function pointers: show: called when wanting to show the desired view page. get: called to get the view page from ViewManager if it exists
+    GenericPageItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, const QIcon& icon, boost::function<Tomahawk::ViewPage*()> show, boost::function<Tomahawk::ViewPage*()> get );
+    virtual ~GenericPageItem();
+
+    virtual QString text() const;
+    virtual void activate();
+    virtual bool willAcceptDrag( const QMimeData* data ) const;
+    virtual QIcon icon() const;
+    virtual int peerSortValue() const { return m_sortValue; } // How to sort relative to peers in the tree.
+    virtual bool isBeingPlayed() const;
+
+    void setText( const QString& text );
+    void setSortValue( int value ) { m_sortValue = value; }
+
+signals:
+    void activated();
+
+private:
+    QIcon m_icon;
+    QString m_text;
+    int m_sortValue;
+    boost::function< Tomahawk::ViewPage*() > m_show;
+    boost::function< Tomahawk::ViewPage*() > m_get;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/GroupItem.cpp Added

@@ -0,0 +1,73 @@
+/* === 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
+ *   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 "GroupItem.h"
+
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "ViewManager.h"
+#include "audio/AudioEngine.h"
+
+using namespace Tomahawk;
+
+
+GroupItem::GroupItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, int peerSortValue )
+    : SourceTreeItem( model, parent, SourcesModel::Group, peerSortValue )
+    , m_text( text )
+    , m_defaultExpanded( true )
+{
+}
+
+
+GroupItem::~GroupItem()
+{
+}
+
+
+void
+GroupItem::activate()
+{
+    emit toggleExpandRequest( this );
+}
+
+
+void
+GroupItem::requestExpanding()
+{
+    emit expandRequest( this );
+}
+
+
+void
+GroupItem::checkExpandedState()
+{
+    if ( m_defaultExpanded )
+    {
+        // only default expand once
+        m_defaultExpanded = false;
+        requestExpanding();
+    }
+}
+
+
+QString
+GroupItem::text() const
+{
+    return m_text;
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/GroupItem.h Added

@@ -0,0 +1,58 @@
+/* === 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
+ *   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 GROUP_ITEM_H
+#define GROUP_ITEM_H
+
+#include "SourceTreeItem.h"
+
+#include "boost/function.hpp"
+#include "boost/bind.hpp"
+
+class GroupItem : public SourceTreeItem
+{
+    Q_OBJECT
+public:
+    // takes 2 function pointers: show: called when wanting to show the desired view page. get: called to get the view page from ViewManager if it exists
+    GroupItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, int peerSortValue = 0 );
+    virtual ~GroupItem();
+
+    virtual QString text() const;
+    virtual bool willAcceptDrag( const QMimeData* data ) const { Q_UNUSED( data ); return false; }
+    virtual QIcon icon() const { return QIcon(); }
+    virtual bool isBeingPlayed() const { return false; }
+
+    void checkExpandedState();
+    void setDefaultExpanded( bool b ) { m_defaultExpanded = b; }
+
+public slots:
+    virtual void activate();
+
+signals:
+    void activated();
+
+private slots:
+    void requestExpanding();
+
+private:
+    QString m_text;
+    bool m_defaultExpanded;
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/HistoryItem.cpp Added

@@ -0,0 +1,88 @@
+/* === 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
+ *   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 "HistoryItem.h"
+
+#include "ViewManager.h"
+#include "GenericPageItems.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "playlist/CustomPlaylistView.h"
+#include "TemporaryPageItem.h"
+#include "SourceList.h"
+
+using namespace Tomahawk;
+
+
+HistoryItem::HistoryItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, int peerSortValue )
+    : GroupItem( model, parent, text, peerSortValue )
+{
+    connect( ViewManager::instance(), SIGNAL( tempPageActivated( Tomahawk::ViewPage* ) ), SLOT( tempPageActivated( Tomahawk::ViewPage* ) ) );
+}
+
+
+HistoryItem::~HistoryItem()
+{
+}
+
+
+void
+HistoryItem::tempPageActivated( Tomahawk::ViewPage* v )
+{
+    const int idx = children().count();
+    int latest = idx;
+    if ( idx )
+    {
+        latest = children().last()->IDValue();
+
+        foreach ( TemporaryPageItem* page, m_tempItems )
+        {
+            if ( page->page() == v )
+            {
+                emit selectRequest( page );
+                return;
+            }
+        }
+    }
+
+    // Only keep 5 temporary pages at once
+    while ( m_tempItems.size() > 4 )
+    {
+        TemporaryPageItem* item = m_tempItems.takeFirst();
+        QTimer::singleShot( 0, item, SLOT( removeFromList() ) );
+    }
+
+    emit beginRowsAdded( idx, idx );
+
+    TemporaryPageItem* tempPage = new TemporaryPageItem( model(), this, v, latest + 1 );
+    connect( tempPage, SIGNAL( removed() ), this, SLOT( temporaryPageDestroyed() ) );
+    m_tempItems << tempPage;
+    endRowsAdded();
+
+    emit selectRequest( tempPage );
+}
+
+
+void
+HistoryItem::temporaryPageDestroyed()
+{
+    TemporaryPageItem* tempPage = qobject_cast< TemporaryPageItem* >( sender() );
+    Q_ASSERT( tempPage );
+    m_tempItems.removeAll( tempPage );
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/HistoryItem.h Added

@@ -0,0 +1,51 @@
+/* === 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
+ *   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 HISTORY_ITEM_H
+#define HISTORY_ITEM_H
+
+#include "GroupItem.h"
+
+class TemporaryPageItem;
+class GenericPageItem;
+class CategoryItem;
+
+namespace Tomahawk
+{
+    class ViewPage;
+}
+
+class HistoryItem : public GroupItem
+{
+    Q_OBJECT
+public:
+    HistoryItem( SourcesModel* model, SourceTreeItem* parent, const QString& text, int peerSortValue = 0 );
+    virtual ~HistoryItem();
+
+private slots:
+    void tempPageActivated( Tomahawk::ViewPage* );
+    void temporaryPageDestroyed();
+
+private:
+    QList< TemporaryPageItem* > m_tempItems;
+
+private:
+};
+
+#endif

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/PlaylistItems.cpp Added

@@ -0,0 +1,540 @@
+/*
+ *
+ *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *
+ *    This program 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 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "PlaylistItems.h"
+
+#include <QMimeData>
+#include <QPainter>
+
+#include "Query.h"
+#include "ViewManager.h"
+#include "playlist/dynamic/GeneratorInterface.h"
+#include "playlist/PlaylistView.h"
+#include "CategoryItems.h"
+#include "SourceItem.h"
+#include "utils/TomahawkUtils.h"
+#include "utils/Logger.h"
+#include "DropJob.h"
+#include "Source.h"
+#include "audio/AudioEngine.h"
+
+using namespace Tomahawk;
+
+
+PlaylistItem::PlaylistItem( SourcesModel* mdl, SourceTreeItem* parent, const playlist_ptr& pl, int index )
+    : SourceTreeItem( mdl, parent, SourcesModel::StaticPlaylist, index )
+    , m_loaded( false )
+    , m_playlist( pl )
+{
+    connect( pl.data(), SIGNAL( revisionLoaded( Tomahawk::PlaylistRevision ) ),
+             SLOT( onPlaylistLoaded( Tomahawk::PlaylistRevision ) ), Qt::QueuedConnection );
+    connect( pl.data(), SIGNAL( changed() ),
+             SLOT( onUpdated() ), Qt::QueuedConnection );
+
+    m_icon = QIcon( RESPATH "images/playlist-icon.png" );
+
+    if( ViewManager::instance()->pageForPlaylist( pl ) )
+        model()->linkSourceItemToPage( this, ViewManager::instance()->pageForPlaylist( pl ) );
+
+    if ( !m_playlist->updaters().isEmpty() )
+        createOverlay();
+}
+
+
+QString
+PlaylistItem::text() const
+{
+    return m_playlist->title();
+}
+
+
+Tomahawk::playlist_ptr
+PlaylistItem::playlist() const
+{
+    return m_playlist;
+}
+
+
+void
+PlaylistItem::onPlaylistLoaded( Tomahawk::PlaylistRevision revision )
+{
+    Q_UNUSED( revision );
+
+    m_loaded = true;
+    emit updated();
+}
+
+
+void
+PlaylistItem::onPlaylistChanged()
+{
+    emit updated();
+}
+
+
+int
+PlaylistItem::peerSortValue() const
+{
+//    return m_playlist->createdOn();
+    return 0;
+}
+
+
+int
+PlaylistItem::IDValue() const
+{
+    return m_playlist->createdOn();
+}
+
+
+bool
+PlaylistItem::isBeingPlayed() const
+{
+    if ( ViewManager::instance()->pageForPlaylist( m_playlist ) )
+        return AudioEngine::instance()->currentTrackPlaylist() == ViewManager::instance()->pageForPlaylist( m_playlist )->playlistInterface();
+    return false;
+}
+
+
+Qt::ItemFlags
+PlaylistItem::flags() const
+{
+    Qt::ItemFlags flags = SourceTreeItem::flags();
+    flags |= Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+
+    if ( !m_loaded )
+        flags &= !Qt::ItemIsEnabled;
+    if ( playlist()->author()->isLocal() )
+        flags |= Qt::ItemIsEditable;
+
+    if ( playlist()->busy() )
+    {
+        flags &= !Qt::ItemIsEnabled;
+        flags &= !Qt::ItemIsEditable;
+        flags &= !Qt::ItemIsDropEnabled;
+    }
+
+    return flags;
+}
+
+
+void
+PlaylistItem::activate()
+{
+    ViewPage* p = ViewManager::instance()->show( m_playlist );
+    model()->linkSourceItemToPage( this, p );
+}
+
+
+void
+PlaylistItem::doubleClicked()
+{
+    ViewPage* p = ViewManager::instance()->currentPage();
+    if ( PlaylistView* view = dynamic_cast< PlaylistView* >( p ) )
+    {
+        view->startPlayingFromStart();
+    }
+}
+
+
+void
+PlaylistItem::setLoaded( bool loaded )
+{
+    m_loaded = loaded;
+}
+
+
+bool
+PlaylistItem::willAcceptDrag( const QMimeData* data ) const
+{
+    Q_UNUSED( data );
+    return !m_playlist.isNull() && m_playlist->author()->isLocal() && DropJob::acceptsMimeData( data, DropJob::Track ) && !m_playlist->busy();
+}
+
+PlaylistItem::DropTypes
+PlaylistItem::supportedDropTypes( const QMimeData* data ) const
+{
+    if ( data->hasFormat( "application/tomahawk.mixed" ) )
+    {
+        // If this is mixed but only queries/results, we can still handle them
+        bool mixedQueries = true;
+
+        QByteArray itemData = data->data( "application/tomahawk.mixed" );
+        QDataStream stream( &itemData, QIODevice::ReadOnly );
+        QString mimeType;
+        qlonglong val;
+
+        while ( !stream.atEnd() )
+        {
+            stream >> mimeType;
+            if ( mimeType != "application/tomahawk.query.list" &&
+                 mimeType != "application/tomahawk.result.list" )
+            {
+                mixedQueries = false;
+                break;
+            }
+            stream >> val;
+        }
+
+        if ( mixedQueries )
+            return DropTypeThisTrack | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
+        else
+            return DropTypesNone;
+    }
+
+    if ( data->hasFormat( "application/tomahawk.query.list" ) )
+        return DropTypeThisTrack | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
+    else if ( data->hasFormat( "application/tomahawk.result.list" ) )
+        return DropTypeThisTrack | DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
+    else if ( data->hasFormat( "application/tomahawk.metadata.album" ) )
+        return DropTypeThisAlbum | DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
+    else if ( data->hasFormat( "application/tomahawk.metadata.artist" ) )
+        return DropTypeAllFromArtist | DropTypeLocalItems | DropTypeTop50;
+    else if ( data->hasFormat( "text/plain" ) )
+    {
+        return DropTypesNone;
+    }
+    return DropTypesNone;
+}
+
+
+bool
+PlaylistItem::dropMimeData( const QMimeData* data, Qt::DropAction action )
+{
+    Q_UNUSED( action );
+
+    if ( m_playlist->busy() )
+        return false;
+
+    QList< Tomahawk::query_ptr > queries;
+
+    if ( data->hasFormat( "application/tomahawk.playlist.id" ) &&
+        data->data( "application/tomahawk.playlist.id" ) == m_playlist->guid() )
+        return false; // don't allow dropping on ourselves
+
+    if ( !DropJob::acceptsMimeData( data, DropJob::Track ) )
+        return false;
+
+    DropJob *dj = new DropJob();
+    dj->setDropTypes( DropJob::Track );
+    dj->setDropAction( DropJob::Append );
+
+    connect( dj, SIGNAL( tracks( QList< Tomahawk::query_ptr > ) ), this, SLOT( parsedDroppedTracks( QList< Tomahawk::query_ptr > ) ) );
+
+    if ( dropType() == DropTypeAllFromArtist )
+        dj->setGetWholeArtists( true );
+    if ( dropType() == DropTypeThisAlbum )
+        dj->setGetWholeAlbums( true );
+
+    if ( dropType() == DropTypeLocalItems )
+    {
+        dj->setGetWholeArtists( true );
+        dj->tracksFromMimeData( data, false, true );
+    }
+    else if ( dropType() == DropTypeTop50 )
+    {
+        dj->setGetWholeArtists( true );
+        dj->tracksFromMimeData( data, false, false, true );
+    }
+    else
+        dj->tracksFromMimeData( data, false, false );
+
+    // TODO can't know if it works or not yet...
+    return true;
+}
+
+
+void
+PlaylistItem::parsedDroppedTracks( const QList< query_ptr >& tracks )
+{
+    qDebug() << "adding" << tracks.count() << "tracks";
+    if ( tracks.count() && !m_playlist.isNull() && m_playlist->author()->isLocal() )
+    {
+        qDebug() << "on playlist:" << m_playlist->title() << m_playlist->guid() << m_playlist->currentrevision();
+
+        m_playlist->addEntries( tracks, m_playlist->currentrevision() );
+    }
+}
+
+
+void
+PlaylistItem::onUpdated()
+{
+    const bool newOverlay = createOverlay();
+    if ( !newOverlay && !m_overlaidIcon.isNull() )
+        m_overlaidIcon = QIcon();
+
+    emit updated();
+}
+
+
+bool
+PlaylistItem::createOverlay()
+{
+    Q_ASSERT( !m_playlist.isNull() );
+
+    if ( m_playlist->updaters().isEmpty() )
+        return false;
+
+    QList< QPixmap > icons;
+    foreach ( PlaylistUpdaterInterface* updater, m_playlist->updaters() )
+    {
+        if ( updater->sync() && !updater->typeIcon().isNull() )
+            icons << updater->typeIcon();
+    }
+
+    if ( icons.isEmpty() )
+        return false;
+
+    // For now we only support up to 2 overlaid updater icons,
+    // we need to add smarter scaling etc to manage more at once
+    if ( icons.size() > 2 )
+        icons = icons.mid( 0, 2 );
+
+    m_overlaidIcon = QIcon();
+    m_overlaidUpdaters = m_playlist->updaters();
+
+    QPixmap base = m_icon.pixmap( 48, 48 );
+    QPainter p( &base );
+    const int w = base.width() / 2;
+    QRect overlayRect( base.rect().right() - w, base.rect().height() - w, w, w );
+
+    foreach ( const QPixmap& overlay, icons )
+    {
+        p.drawPixmap( overlayRect, overlay );
+
+        // NOTE only works if icons.size == 2 as ensured above
+        overlayRect.moveLeft( 0 );
+    }
+
+    p.end();
+
+    m_overlaidIcon.addPixmap( base );
+
+    return true;
+}
+
+
+QIcon
+PlaylistItem::icon() const
+{
+    if ( !m_overlaidIcon.isNull() )
+        return m_overlaidIcon;
+    else
+        return m_icon;
+}
+
+
+bool
+PlaylistItem::setData( const QVariant& v, bool role )
+{
+    Q_UNUSED( role );
+
+    if ( m_playlist->author()->isLocal() )
+    {
+        m_playlist->rename( v.toString() );
+
+        return true;
+    }
+    return false;
+}
+
+SourceTreeItem*
+PlaylistItem::activateCurrent()
+{
+    if( ViewManager::instance()->pageForPlaylist( m_playlist ) == ViewManager::instance()->currentPage() )
+    {
+        model()->linkSourceItemToPage( this, ViewManager::instance()->currentPage() );
+        emit selectRequest( this );
+
+        return this;
+    }
+
+    return 0;
+}
+
+
+DynamicPlaylistItem::DynamicPlaylistItem( SourcesModel* mdl, SourceTreeItem* parent, const dynplaylist_ptr& pl, int index )
+    : PlaylistItem( mdl, parent, pl.staticCast< Playlist >(), index )
+    , m_dynplaylist( pl )
+{
+    setRowType( m_dynplaylist->mode() == Static ? SourcesModel::AutomaticPlaylist : SourcesModel::Station );
+
+    connect( pl.data(), SIGNAL( dynamicRevisionLoaded( Tomahawk::DynamicPlaylistRevision ) ),
+             SLOT( onDynamicPlaylistLoaded( Tomahawk::DynamicPlaylistRevision ) ), Qt::QueuedConnection );
+
+    m_stationIcon = QIcon( RESPATH "images/station.png" );
+    m_automaticPlaylistIcon = QIcon( RESPATH "images/automatic-playlist.png" );
+
+    if( ViewManager::instance()->pageForDynPlaylist( pl ) )
+        model()->linkSourceItemToPage( this, ViewManager::instance()->pageForDynPlaylist( pl ) );
+}
+
+
+DynamicPlaylistItem::~DynamicPlaylistItem()
+{
+}
+
+
+void
+DynamicPlaylistItem::activate()
+{
+    ViewPage* p = ViewManager::instance()->show( m_dynplaylist );
+    model()->linkSourceItemToPage( this, p );
+}
+
+
+void
+DynamicPlaylistItem::onDynamicPlaylistLoaded( DynamicPlaylistRevision revision )
+{
+    setLoaded( true );
+    checkReparentHackNeeded( revision );
+    // END HACK
+    emit updated();
+}
+
+
+int
+DynamicPlaylistItem::peerSortValue() const
+{
+//    return m_dynplaylist->createdOn();
+    return 0;
+}
+
+
+int
+DynamicPlaylistItem::IDValue() const
+{
+    return m_dynplaylist->createdOn();
+}
+
+
+void
+DynamicPlaylistItem::checkReparentHackNeeded( const DynamicPlaylistRevision& revision )
+{
+    // HACK HACK HACK  workaround for an ugly hack where we have to be compatible with older tomahawks (pre-0.1.0) that created dynplaylists as OnDemand then changed them to Static if they were static.
+    //  we need to reparent this playlist to the correct category :-/.
+    CategoryItem* cat = qobject_cast< CategoryItem* >( parent() );
+
+//    qDebug() << "with category" << cat;
+//    if( cat ) qDebug() << "and cat type:" << cat->categoryType();
+    if( cat )
+    {
+        CategoryItem* from = cat;
+        CategoryItem* to = 0;
+        if( cat->categoryType() == SourcesModel::PlaylistsCategory && revision.mode == OnDemand ) { // WRONG
+            SourceItem* col = qobject_cast< SourceItem* >( cat->parent() );
+            to = col->stationsCategory();
+            if( !to ) { // you have got to be fucking kidding me
+                int fme = col->children().count();
+                col->beginRowsAdded( fme, fme );
+                to = new CategoryItem( model(), col, SourcesModel::StationsCategory, false );
+                col->appendChild( to ); // we f'ing know it's not local b/c we're not getting into this mess ourselves
+                col->endRowsAdded();
+                col->setStationsCategory( to );
+            }
+        } else if( cat->categoryType() == SourcesModel::StationsCategory && revision.mode == Static ) { // WRONG
+            SourceItem* col = qobject_cast< SourceItem* >( cat->parent() );
+            to = col->playlistsCategory();
+//            qDebug() << "TRYING TO HACK TO:" << to;
+            if( !to ) { // you have got to be fucking kidding me
+                int fme = col->children().count();
+                col->beginRowsAdded( fme, fme );
+                to = new CategoryItem( model(), col, SourcesModel::PlaylistsCategory, false );
+                col->appendChild( to ); // we f'ing know it's not local b/c we're not getting into this mess ourselves
+                col->endRowsAdded();
+                col->setPlaylistsCategory( to );
+            }
+        }
+        if( to ) {
+//            qDebug() << "HACKING! moving dynamic playlist from" << from->text() << "to:" << to->text();
+            // remove and add
+            int idx = from->children().indexOf( this );
+            from->beginRowsRemoved( idx, idx );
+            from->removeChild( this );
+            from->endRowsRemoved();
+
+            idx = to->children().count();
+            to->beginRowsAdded( idx, idx );
+            to->appendChild( this );
+            to->endRowsAdded();
+
+            setParentItem( to );
+        }
+    }
+}
+
+
+dynplaylist_ptr
+DynamicPlaylistItem::dynPlaylist() const
+{
+    return m_dynplaylist;
+}
+
+
+QString
+DynamicPlaylistItem::text() const
+{
+    return m_dynplaylist->title();
+}
+
+
+bool
+DynamicPlaylistItem::willAcceptDrag( const QMimeData* data ) const
+{
+    Q_UNUSED( data );
+    return false;
+}
+
+
+QIcon
+DynamicPlaylistItem::icon() const
+{
+    if ( m_dynplaylist->mode() == OnDemand )
+    {
+        return m_stationIcon;
+    }
+    else
+    {
+        return m_automaticPlaylistIcon;
+    }
+}
+
+SourceTreeItem*
+DynamicPlaylistItem::activateCurrent()
+{
+    if( ViewManager::instance()->pageForDynPlaylist( m_dynplaylist ) == ViewManager::instance()->currentPage() )
+    {
+        model()->linkSourceItemToPage( this, ViewManager::instance()->currentPage() );
+        emit selectRequest( this );
+
+        return this;
+    }
+
+    return 0;
+}
+
+bool
+DynamicPlaylistItem::isBeingPlayed() const
+{
+    if ( ViewManager::instance()->pageForDynPlaylist( m_dynplaylist ) )
+        return AudioEngine::instance()->currentTrackPlaylist() == ViewManager::instance()->pageForDynPlaylist( m_dynplaylist )->playlistInterface();
+    return false;
+}
+

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/PlaylistItems.h Added

@@ -0,0 +1,100 @@
+/*
+ *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *
+ *    This program 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 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef PLAYLIST_ITEM_H
+#define PLAYLIST_ITEM_H
+
+#include "SourceTreeItem.h"
+#include "playlist/dynamic/DynamicPlaylist.h"
+
+class PlaylistItem : public SourceTreeItem
+{
+    Q_OBJECT
+public:
+    PlaylistItem( SourcesModel* model, SourceTreeItem* parent, const Tomahawk::playlist_ptr& pl, int index = -1 );
+
+    virtual QString text() const;
+    virtual Tomahawk::playlist_ptr playlist() const;
+    virtual Qt::ItemFlags flags() const;
+    virtual bool willAcceptDrag( const QMimeData* data ) const;
+    virtual DropTypes supportedDropTypes( const QMimeData* data ) const;
+    virtual bool dropMimeData( const QMimeData* data, Qt::DropAction action );
+    virtual QIcon icon() const;
+    virtual bool setData(const QVariant& v, bool role);
+    virtual int peerSortValue() const;
+    virtual int IDValue() const;
+    virtual bool isBeingPlayed() const;
+
+    virtual SourceTreeItem* activateCurrent();
+
+public slots:
+    virtual void activate();
+    virtual void doubleClicked();
+
+protected:
+    void setLoaded( bool loaded );
+
+private slots:
+    void onPlaylistLoaded( Tomahawk::PlaylistRevision revision );
+    void onPlaylistChanged();
+    void parsedDroppedTracks( const QList<Tomahawk::query_ptr>& tracks );
+
+    void onUpdated();
+private:
+    bool createOverlay();
+
+    bool m_loaded;
+    Tomahawk::playlist_ptr m_playlist;
+    QIcon m_icon, m_overlaidIcon;
+    QList<Tomahawk::PlaylistUpdaterInterface*> m_overlaidUpdaters;
+};
+Q_DECLARE_OPERATORS_FOR_FLAGS(PlaylistItem::DropTypes)
+
+// can be a station or an auto playlist
+class DynamicPlaylistItem : public PlaylistItem
+{
+    Q_OBJECT
+public:
+    DynamicPlaylistItem( SourcesModel* model, SourceTreeItem* parent, const Tomahawk::dynplaylist_ptr& pl, int index = -1 );
+    virtual ~DynamicPlaylistItem();
+
+    virtual QString text() const;
+    Tomahawk::dynplaylist_ptr dynPlaylist() const;
+    virtual bool willAcceptDrag( const QMimeData* data ) const;
+    virtual void activate();
+    virtual int peerSortValue() const;
+    virtual int IDValue() const;
+    virtual QIcon icon() const;
+
+    virtual SourceTreeItem* activateCurrent();
+    virtual bool isBeingPlayed() const;
+
+private slots:
+    void onDynamicPlaylistLoaded( Tomahawk::DynamicPlaylistRevision revision );
+
+private:
+    void checkReparentHackNeeded( const Tomahawk::DynamicPlaylistRevision& rev );
+
+    Tomahawk::dynplaylist_ptr m_dynplaylist;
+
+    QIcon m_stationIcon;
+    QIcon m_automaticPlaylistIcon;
+};
+
+
+#endif

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/SourceItem.cpp Added

@@ -0,0 +1,616 @@
+/*
+ *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *    Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
+ *
+ *    This program 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 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "SourceItem.h"
+
+#include "CategoryItems.h"
+#include "PlaylistItems.h"
+#include "ViewManager.h"
+#include "Playlist.h"
+#include "GenericPageItems.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "widgets/SocialPlaylistWidget.h"
+#include "playlist/CustomPlaylistView.h"
+#include "playlist/PlaylistView.h"
+#include "playlist/RecentlyAddedModel.h"
+#include "playlist/RecentlyPlayedModel.h"
+#include "playlist/PlaylistLargeItemDelegate.h"
+#include "Source.h"
+#include "SourceList.h"
+
+/// SourceItem
+
+using namespace Tomahawk;
+
+SourceItem::SourceItem( SourcesModel* mdl, SourceTreeItem* parent, const Tomahawk::source_ptr& source )
+    : SourceTreeItem( mdl, parent, SourcesModel::Collection )
+    , m_source( source )
+    , m_playlists( 0 )
+    , m_stations( 0 )
+    , m_latchedOn( false )
+    , m_sourceInfoItem( 0 )
+    , m_coolPlaylistsItem( 0 )
+    , m_collectionPage( 0 )
+    , m_sourceInfoPage( 0 )
+    , m_coolPlaylistsPage( 0 )
+    , m_lovedTracksPage( 0 )
+    , m_latestAdditionsPage( 0 )
+    , m_recentPlaysPage( 0 )
+    , m_whatsHotPage( 0 )
+{
+    if ( m_source.isNull() )
+    {
+        m_superCol = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/supercollection.png" ) );
+        return;
+    }
+
+    m_collectionItem = new GenericPageItem( model(), this, tr( "Collection" ), QIcon( RESPATH "images/collection.png" ), //FIXME different icon
+                                            boost::bind( &SourceItem::collectionClicked, this ),
+                                            boost::bind( &SourceItem::getCollectionPage, this ) );
+
+/*    m_sourceInfoItem = new GenericPageItem( model(), this, tr( "New Additions" ), QIcon( RESPATH "images/new-additions.png" ),
+                                            boost::bind( &SourceItem::sourceInfoClicked, this ),
+                                            boost::bind( &SourceItem::getSourceInfoPage, this ) );*/
+
+    m_latestAdditionsItem = new GenericPageItem( model(), this, tr( "Latest Additions" ), QIcon( RESPATH "images/new-additions.png" ),
+                                                 boost::bind( &SourceItem::latestAdditionsClicked, this ),
+                                                 boost::bind( &SourceItem::getLatestAdditionsPage, this ) );
+
+    m_recentPlaysItem = new GenericPageItem( model(), this, tr( "Recently Played" ), QIcon( RESPATH "images/recently-played.png" ),
+                                             boost::bind( &SourceItem::recentPlaysClicked, this ),
+                                             boost::bind( &SourceItem::getRecentPlaysPage, this ) );
+
+    m_lovedTracksItem = new GenericPageItem( model(), this, tr( "Loved Tracks" ), QIcon( RESPATH "images/loved_playlist.png" ),
+                                             boost::bind( &SourceItem::lovedTracksClicked, this ),
+                                             boost::bind( &SourceItem::getLovedTracksPage, this ) );
+
+    m_collectionItem->setSortValue( -350 );
+//    m_sourceInfoItem->setSortValue( -300 );
+    m_latestAdditionsItem->setSortValue( -250 );
+    m_recentPlaysItem->setSortValue( -200 );
+    m_lovedTracksItem->setSortValue( -150 );
+
+    // create category items if there are playlists to show, or stations to show
+    QList< playlist_ptr > playlists = source->collection()->playlists();
+    QList< dynplaylist_ptr > autoplaylists = source->collection()->autoPlaylists();
+    QList< dynplaylist_ptr > stations = source->collection()->stations();
+
+    if ( !playlists.isEmpty() || !autoplaylists.isEmpty() || source->isLocal() )
+    {
+        m_playlists = new CategoryItem( model(), this, SourcesModel::PlaylistsCategory, source->isLocal() );
+        onPlaylistsAdded( playlists );
+        onAutoPlaylistsAdded( autoplaylists );
+    }
+    if ( !stations.isEmpty() || source->isLocal() )
+    {
+        m_stations = new CategoryItem( model(), this, SourcesModel::StationsCategory, source->isLocal() );
+        onStationsAdded( stations );
+    }
+
+/*    if ( ViewManager::instance()->pageForCollection( source->collection() ) )
+        model()->linkSourceItemToPage( this, ViewManager::instance()->pageForCollection( source->collection() ) );*/
+
+    m_defaultAvatar = TomahawkUtils::createAvatarFrame( QPixmap( RESPATH "images/user-avatar.png" ) );
+
+    // load auto playlists and stations!
+
+    connect( source.data(), SIGNAL( stats( QVariantMap ) ), SIGNAL( updated() ) );
+    connect( source.data(), SIGNAL( syncedWithDatabase() ), SIGNAL( updated() ) );
+    connect( source.data(), SIGNAL( stateChanged() ), SIGNAL( updated() ) );
+    connect( source.data(), SIGNAL( offline() ), SIGNAL( updated() ) );
+    connect( source.data(), SIGNAL( online() ), SIGNAL( updated() ) );
+    connect( SourceList::instance(), SIGNAL( sourceLatchedOn( Tomahawk::source_ptr, Tomahawk::source_ptr ) ), SLOT( latchedOn( Tomahawk::source_ptr, Tomahawk::source_ptr ) ) );
+    connect( SourceList::instance(), SIGNAL( sourceLatchedOff( Tomahawk::source_ptr, Tomahawk::source_ptr ) ), SLOT( latchedOff( Tomahawk::source_ptr, Tomahawk::source_ptr ) ) );
+
+    connect( source->collection().data(), SIGNAL( playlistsAdded( QList<Tomahawk::playlist_ptr> ) ),
+             SLOT( onPlaylistsAdded( QList<Tomahawk::playlist_ptr> ) ), Qt::QueuedConnection );
+    connect( source->collection().data(), SIGNAL( autoPlaylistsAdded( QList< Tomahawk::dynplaylist_ptr > ) ),
+             SLOT( onAutoPlaylistsAdded( QList<Tomahawk::dynplaylist_ptr> ) ), Qt::QueuedConnection );
+    connect( source->collection().data(), SIGNAL( stationsAdded( QList<Tomahawk::dynplaylist_ptr> ) ),
+             SLOT( onStationsAdded( QList<Tomahawk::dynplaylist_ptr> ) ), Qt::QueuedConnection );
+
+    if ( m_source->isLocal() )
+        QTimer::singleShot( 0, this, SLOT( requestExpanding() ) );
+}
+
+
+Tomahawk::source_ptr
+SourceItem::source() const
+{
+    return m_source;
+}
+
+
+QString
+SourceItem::text() const
+{
+    return m_source.isNull() ? tr( "SuperCollection" ) : m_source->friendlyName();
+}
+
+
+QString
+SourceItem::tooltip() const
+{
+    if ( !m_source.isNull() && !m_source->currentTrack().isNull() )
+        return m_source->textStatus();
+
+    return QString();
+}
+
+
+int
+SourceItem::IDValue() const
+{
+    if ( m_source.isNull() )
+        return -1;
+    if ( m_source->isLocal() )
+        return 0;
+
+    return m_source->id();
+}
+
+
+int
+SourceItem::peerSortValue() const
+{
+    if ( m_source.isNull() || m_source->isLocal() )
+        return -1;
+
+    return 1;
+}
+
+
+void
+SourceItem::activate()
+{
+    ViewPage* p = 0;
+    if ( source().isNull() )
+        p = ViewManager::instance()->showSuperCollection();
+    else
+        emit toggleExpandRequest( this );
+
+    model()->linkSourceItemToPage( this, p );
+}
+
+
+QIcon
+SourceItem::icon() const
+{
+    if ( m_source.isNull() )
+       return m_superCol;
+    else
+    {
+        if ( m_source->avatar().isNull() )
+            return m_defaultAvatar;
+        else
+            return m_source->avatar( Source::FancyStyle );
+    }
+}
+
+
+bool
+SourceItem::localLatchedOn() const
+{
+    // Don't show a listen icon if this is the local collection and we are latched on to someone who went offline
+    // we are technically still latched on (if they come back online we'll be still listening along) but it's not visible
+    // in the UI and confusing to the user why the red headphones are still there
+
+    if ( !m_source.isNull() && m_source->isLocal() &&
+         !m_latchedOnTo.isNull() && !m_latchedOnTo->isOnline() )
+        return false;
+
+    return m_latchedOn;
+}
+
+
+Tomahawk::PlaylistModes::LatchMode
+SourceItem::localLatchMode() const
+{
+    if ( !m_source.isNull() && !m_source->isLocal() )
+        return m_source->playlistInterface()->latchMode();
+
+    return Tomahawk::PlaylistModes::StayOnSong;
+}
+
+
+void
+SourceItem::latchedOff( const source_ptr& from, const source_ptr& to )
+{
+    if ( from->isLocal() && ( m_source == to || m_source == from ) )
+    {
+        m_latchedOn = false;
+        disconnect( m_latchedOnTo->playlistInterface().data(), SIGNAL( latchModeChanged( Tomahawk::PlaylistModes::LatchMode ) ) );
+        m_latchedOnTo.clear();
+        emit updated();
+    }
+}
+
+
+void
+SourceItem::latchedOn( const source_ptr& from, const source_ptr& to )
+{
+    if ( from->isLocal() && ( m_source == to || m_source == from ) )
+    {
+        m_latchedOn = true;
+        m_latchedOnTo = to;
+        connect( m_latchedOnTo->playlistInterface().data(), SIGNAL( latchModeChanged( Tomahawk::PlaylistModes::LatchMode ) ), SLOT( latchModeChanged( Tomahawk::PlaylistModes::LatchMode ) ) );
+        emit updated();
+    }
+}
+
+
+void
+SourceItem::latchModeChanged( Tomahawk::PlaylistModes::LatchMode mode )
+{
+    Q_UNUSED( mode );
+    emit updated();
+}
+
+
+void
+SourceItem::playlistsAddedInternal( SourceTreeItem* parent, const QList< dynplaylist_ptr >& playlists )
+{
+    QList< SourceTreeItem* > items;
+    int addOffset = playlists.first()->author()->isLocal() ? 1 : 0;
+
+    int from = parent->children().count() - addOffset;
+    parent->beginRowsAdded( from, from + playlists.count() - 1 );
+    foreach ( const dynplaylist_ptr& p, playlists )
+    {
+        DynamicPlaylistItem* plItem = new DynamicPlaylistItem( model(), parent, p, parent->children().count() - addOffset );
+//        qDebug() << "Dynamic Playlist added:" << p->title() << p->creator() << p->info();
+        p->loadRevision();
+        items << plItem;
+
+        if ( p->mode() == Static )
+        {
+            if ( m_source->isLocal() )
+                connect( p.data(), SIGNAL( aboutToBeDeleted( Tomahawk::dynplaylist_ptr ) ),
+                        SLOT( onAutoPlaylistDeleted( Tomahawk::dynplaylist_ptr ) ), Qt::QueuedConnection );
+            else
+                connect( p.data(), SIGNAL( deleted( Tomahawk::dynplaylist_ptr ) ),
+                        SLOT( onAutoPlaylistDeleted( Tomahawk::dynplaylist_ptr ) ), Qt::QueuedConnection );
+        }
+        else
+        {
+            if ( m_source->isLocal() )
+                connect( p.data(), SIGNAL( aboutToBeDeleted( Tomahawk::dynplaylist_ptr ) ),
+                        SLOT( onStationDeleted( Tomahawk::dynplaylist_ptr ) ), Qt::QueuedConnection );
+            else
+                connect( p.data(), SIGNAL( deleted( Tomahawk::dynplaylist_ptr ) ),
+                        SLOT( onStationDeleted( Tomahawk::dynplaylist_ptr ) ), Qt::QueuedConnection );
+        }
+    }
+    parent->endRowsAdded();
+}
+
+
+template< typename T >
+void
+SourceItem::playlistDeletedInternal( SourceTreeItem* parent, const T& p )
+{
+    Q_ASSERT( parent ); // How can we delete playlists if we have none?
+    int curCount = parent->children().count();
+    for( int i = 0; i < curCount; i++ )
+    {
+        PlaylistItem* pl = qobject_cast< PlaylistItem* >( parent->children().at( i ) );
+        if ( pl && pl->playlist() == p )
+        {
+            parent->beginRowsRemoved( i, i );
+            parent->removeChild( pl );
+            parent->endRowsRemoved();
+
+            delete pl;
+            break;
+        }
+    }
+
+    if ( ( parent == m_playlists || parent == m_stations ) &&
+         parent->children().isEmpty() && parent->parent() ) // Don't leave an empty Playlist or Station category
+    {
+        int idx = parent->parent()->children().indexOf( parent );
+        if ( idx < 0 )
+            return;
+
+        parent->parent()->beginRowsRemoved( idx, idx );
+        parent->parent()->removeChild( parent );
+        parent->parent()->endRowsRemoved();
+
+        if ( parent == m_playlists )
+            m_playlists = 0;
+        else if ( parent == m_stations )
+            m_stations = 0;
+        delete parent;
+    }
+}
+
+
+void
+SourceItem::onPlaylistsAdded( const QList< playlist_ptr >& playlists )
+{
+    if ( playlists.isEmpty() )
+        return;
+
+    if ( !m_playlists )
+    {
+        // add the category too
+        int cur = children().count();
+        beginRowsAdded( cur, cur );
+        m_playlists = new CategoryItem( model(), this, SourcesModel::PlaylistsCategory, source()->isLocal() );
+        endRowsAdded();
+    }
+
+    QList< SourceTreeItem* > items;
+    int addOffset = playlists.first()->author()->isLocal() ? 1 : 0;
+
+    int from = m_playlists->children().count() - addOffset;
+    m_playlists->beginRowsAdded( from, from + playlists.count() - 1 );
+    foreach ( const playlist_ptr& p, playlists )
+    {
+        PlaylistItem* plItem = new PlaylistItem( model(), m_playlists, p, m_playlists->children().count() - addOffset );
+        p->loadRevision();
+        items << plItem;
+
+        if ( m_source->isLocal() )
+            connect( p.data(), SIGNAL( aboutToBeDeleted( Tomahawk::playlist_ptr ) ),
+                     SLOT( onPlaylistDeleted( Tomahawk::playlist_ptr ) ), Qt::QueuedConnection );
+        else
+            connect( p.data(), SIGNAL( deleted( Tomahawk::playlist_ptr ) ),
+                     SLOT( onPlaylistDeleted( Tomahawk::playlist_ptr ) ), Qt::QueuedConnection );
+
+    }
+    m_playlists->endRowsAdded();
+}
+
+
+void
+SourceItem::onPlaylistDeleted( const playlist_ptr& playlist )
+{
+    playlistDeletedInternal( m_playlists, playlist );
+}
+
+
+void
+SourceItem::onAutoPlaylistsAdded( const QList< dynplaylist_ptr >& playlists )
+{
+    if ( playlists.isEmpty() )
+        return;
+
+    if ( !m_playlists )
+    {
+        // add the category too
+        int cur = children().count();
+        beginRowsAdded( cur, cur );
+        m_playlists = new CategoryItem( model(), this, SourcesModel::PlaylistsCategory, source()->isLocal() );
+        endRowsAdded();
+    }
+
+    playlistsAddedInternal( m_playlists, playlists );
+}
+
+
+void
+SourceItem::onAutoPlaylistDeleted( const dynplaylist_ptr& playlist )
+{
+    if ( !m_playlists )
+        qDebug() << "NO playlist category item for a deleting playlist...";
+
+    playlistDeletedInternal( m_playlists, playlist );
+}
+
+
+void
+SourceItem::onStationsAdded( const QList< dynplaylist_ptr >& stations )
+{
+    if ( stations.isEmpty() )
+        return;
+
+    if ( !m_stations )
+    {
+        // add the category too
+        int cur = children().count();
+        beginRowsAdded( cur, cur );
+        m_stations = new CategoryItem( model(), this, SourcesModel::StationsCategory, source()->isLocal() );
+        endRowsAdded();
+    }
+
+    playlistsAddedInternal( m_stations, stations );
+}
+
+
+void
+SourceItem::onStationDeleted( const dynplaylist_ptr& station )
+{
+    playlistDeletedInternal( m_stations, station );
+}
+
+
+void
+SourceItem::requestExpanding()
+{
+    emit expandRequest( this );
+}
+
+
+ViewPage*
+SourceItem::sourceInfoClicked()
+{
+    if ( m_source.isNull() )
+        return 0;
+
+    m_sourceInfoPage = ViewManager::instance()->show( m_source );
+    return m_sourceInfoPage;
+}
+
+
+ViewPage*
+SourceItem::getSourceInfoPage() const
+{
+    return m_sourceInfoPage;
+}
+
+
+ViewPage*
+SourceItem::collectionClicked()
+{
+    if ( m_source.isNull() )
+        return 0;
+
+    m_collectionPage = ViewManager::instance()->show( m_source->collection() );
+    return m_collectionPage;
+}
+
+
+ViewPage*
+SourceItem::getCollectionPage() const
+{
+    return m_collectionPage;;
+}
+
+
+ViewPage*
+SourceItem::coolPlaylistsClicked()
+{
+    if ( !m_source.isNull() )
+        return 0;
+
+    if ( !m_coolPlaylistsPage )
+        m_coolPlaylistsPage = new SocialPlaylistWidget( ViewManager::instance()->widget() );
+
+    ViewManager::instance()->show( m_coolPlaylistsPage );
+    return m_coolPlaylistsPage;
+}
+
+
+ViewPage*
+SourceItem::getCoolPlaylistsPage() const
+{
+    return m_coolPlaylistsPage;
+}
+
+
+ViewPage*
+SourceItem::lovedTracksClicked()
+{
+    if ( !m_lovedTracksPage )
+    {
+        CustomPlaylistView* view = new CustomPlaylistView( m_source.isNull() ? CustomPlaylistView::TopLovedTracks : CustomPlaylistView::SourceLovedTracks, m_source, ViewManager::instance()->widget() );
+        PlaylistLargeItemDelegate* del = new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::LovedTracks, view, view->proxyModel() );
+        connect( del, SIGNAL( updateIndex( QModelIndex ) ), view, SLOT( update( QModelIndex ) ) );
+        view->setItemDelegate( del );
+        view->setEmptyTip( tr( "Sorry, we could not find any loved tracks!" ) );
+
+        m_lovedTracksPage = view;
+    }
+
+    ViewManager::instance()->show( m_lovedTracksPage );
+    return m_lovedTracksPage;
+}
+
+
+ViewPage*
+SourceItem::getLovedTracksPage() const
+{
+    return m_lovedTracksPage;
+}
+
+
+ViewPage*
+SourceItem::latestAdditionsClicked()
+{
+    if ( !m_latestAdditionsPage )
+    {
+        TrackView* cv = new TrackView( ViewManager::instance()->widget() );
+        cv->setFrameShape( QFrame::NoFrame );
+        cv->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+
+        RecentlyAddedModel* raModel = new RecentlyAddedModel( cv );
+        raModel->setStyle( PlayableModel::Large );
+        raModel->setTitle( tr( "Latest Additions" ) );
+
+        if ( m_source->isLocal() )
+            raModel->setDescription( tr( "Latest additions to your collection" ) );
+        else
+            raModel->setDescription( tr( "Latest additions to %1's collection" ).arg( m_source->friendlyName() ) );
+
+        PlaylistLargeItemDelegate* del = new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::LatestAdditions, cv, cv->proxyModel() );
+        connect( del, SIGNAL( updateIndex( QModelIndex ) ), cv, SLOT( update( QModelIndex ) ) );
+        cv->setItemDelegate( del );
+
+        cv->setPlayableModel( raModel );
+        cv->sortByColumn( PlayableModel::Age, Qt::DescendingOrder );
+        cv->setEmptyTip( tr( "Sorry, we could not find any recent additions!" ) );
+
+        raModel->setSource( m_source );
+
+        m_latestAdditionsPage = cv;
+    }
+
+    ViewManager::instance()->show( m_latestAdditionsPage );
+    return m_latestAdditionsPage;
+}
+
+
+ViewPage*
+SourceItem::getLatestAdditionsPage() const
+{
+    return m_latestAdditionsPage;
+}
+
+
+ViewPage*
+SourceItem::recentPlaysClicked()
+{
+    if ( !m_recentPlaysPage )
+    {
+        PlaylistView* pv = new PlaylistView( ViewManager::instance()->widget() );
+        pv->setFrameShape( QFrame::NoFrame );
+        pv->setAttribute( Qt::WA_MacShowFocusRect, 0 );
+
+        RecentlyPlayedModel* raModel = new RecentlyPlayedModel( pv );
+        raModel->setStyle( PlayableModel::Large );
+        raModel->setTitle( tr( "Recently Played Tracks" ) );
+
+        if ( m_source->isLocal() )
+            raModel->setDescription( tr( "Your recently played tracks" ) );
+        else
+            raModel->setDescription( tr( "%1's recently played tracks" ).arg( m_source->friendlyName() ) );
+
+        PlaylistLargeItemDelegate* del = new PlaylistLargeItemDelegate( PlaylistLargeItemDelegate::RecentlyPlayed, pv, pv->proxyModel() );
+        connect( del, SIGNAL( updateIndex( QModelIndex ) ), pv, SLOT( update( QModelIndex ) ) );
+        pv->setItemDelegate( del );
+
+        pv->setPlaylistModel( raModel );
+        pv->setEmptyTip( tr( "Sorry, we could not find any recent plays!" ) );
+        raModel->setSource( m_source );
+
+        m_recentPlaysPage = pv;
+    }
+
+    ViewManager::instance()->show( m_recentPlaysPage );
+    return m_recentPlaysPage;
+}
+
+
+ViewPage*
+SourceItem::getRecentPlaysPage() const
+{
+    return m_recentPlaysPage;
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/SourceItem.h Added

@@ -0,0 +1,121 @@
+/*
+ *    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *    Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
+ *
+ *    This program 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 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef SOURCE_ITEM_H
+#define SOURCE_ITEM_H
+
+#include "SourceTreeItem.h"
+
+class TemporaryPageItem;
+class GenericPageItem;
+class CategoryItem;
+
+namespace Tomahawk
+{
+    class ViewPage;
+}
+
+class SourceItem : public SourceTreeItem
+{
+    Q_OBJECT
+public:
+    SourceItem( SourcesModel* model, SourceTreeItem* parent, const Tomahawk::source_ptr& source );
+
+    virtual QString text() const;
+    virtual QString tooltip() const;
+    virtual QIcon icon() const;
+    virtual int peerSortValue() const;
+    virtual int IDValue() const;
+
+    virtual bool localLatchedOn() const;
+    virtual Tomahawk::PlaylistModes::LatchMode localLatchMode() const;
+
+    Tomahawk::source_ptr source() const;
+
+    CategoryItem* stationsCategory() const { return m_stations; }
+    CategoryItem* playlistsCategory() const { return m_playlists; }
+    void setStationsCategory( CategoryItem* item ) { m_stations = item; }
+    void setPlaylistsCategory( CategoryItem* item ) { m_playlists = item; }
+
+public slots:
+    virtual void activate();
+
+private slots:
+    void onPlaylistsAdded( const QList<Tomahawk::playlist_ptr>& playlists );
+    void onPlaylistDeleted( const Tomahawk::playlist_ptr& playlists );
+    void onAutoPlaylistsAdded( const QList<Tomahawk::dynplaylist_ptr>& playlists );
+    void onAutoPlaylistDeleted( const Tomahawk::dynplaylist_ptr& playlists );
+    void onStationsAdded( const QList<Tomahawk::dynplaylist_ptr>& stations );
+    void onStationDeleted( const Tomahawk::dynplaylist_ptr& stations );
+
+    void latchedOn( const Tomahawk::source_ptr&, const Tomahawk::source_ptr& );
+    void latchedOff( const Tomahawk::source_ptr&, const Tomahawk::source_ptr& );
+    void latchModeChanged( Tomahawk::PlaylistModes::LatchMode mode );
+
+    void requestExpanding();
+
+    Tomahawk::ViewPage* sourceInfoClicked();
+    Tomahawk::ViewPage* getSourceInfoPage() const;
+
+    Tomahawk::ViewPage* collectionClicked();
+    Tomahawk::ViewPage* getCollectionPage() const;
+
+    Tomahawk::ViewPage* coolPlaylistsClicked();
+    Tomahawk::ViewPage* getCoolPlaylistsPage() const;
+
+    Tomahawk::ViewPage* lovedTracksClicked();
+    Tomahawk::ViewPage* getLovedTracksPage() const;
+
+    Tomahawk::ViewPage* latestAdditionsClicked();
+    Tomahawk::ViewPage* getLatestAdditionsPage() const;
+
+    Tomahawk::ViewPage* recentPlaysClicked();
+    Tomahawk::ViewPage* getRecentPlaysPage() const;
+
+private:
+    void playlistsAddedInternal( SourceTreeItem* parent, const QList< Tomahawk::dynplaylist_ptr >& playlists );
+    template< typename T >
+    void playlistDeletedInternal( SourceTreeItem* parent, const T& playlists );
+
+    Tomahawk::source_ptr m_source;
+    QPixmap m_superCol, m_defaultAvatar;
+    CategoryItem* m_playlists;
+    CategoryItem* m_stations;
+
+    bool m_latchedOn;
+    Tomahawk::source_ptr m_latchedOnTo;
+
+    GenericPageItem* m_collectionItem;
+    GenericPageItem* m_sourceInfoItem;
+    GenericPageItem* m_coolPlaylistsItem;
+    GenericPageItem* m_lovedTracksItem;
+    GenericPageItem* m_latestAdditionsItem;
+    GenericPageItem* m_recentPlaysItem;
+
+    Tomahawk::ViewPage* m_collectionPage;
+    Tomahawk::ViewPage* m_sourceInfoPage;
+    Tomahawk::ViewPage* m_coolPlaylistsPage;
+    Tomahawk::ViewPage* m_lovedTracksPage;
+    Tomahawk::ViewPage* m_latestAdditionsPage;
+    Tomahawk::ViewPage* m_recentPlaysPage;
+    Tomahawk::ViewPage* m_whatsHotPage;
+};
+
+
+#endif

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/SourceTreeItem.cpp Added

@@ -0,0 +1,56 @@
+/*
+    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+
+    This program 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "SourceTreeItem.h"
+
+#include "utils/Logger.h"
+
+using namespace Tomahawk;
+
+
+SourceTreeItem::SourceTreeItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::RowType thisType, int peerSortValue, int index )
+    : QObject()
+    , m_type( thisType )
+    , m_parent( parent )
+    , m_model( model )
+    , m_peerSortValue( peerSortValue )
+{
+    connect( this, SIGNAL( beginChildRowsAdded( int, int ) ), m_model, SLOT( onItemRowsAddedBegin( int, int ) ) );
+    connect( this, SIGNAL( beginChildRowsRemoved( int, int ) ), m_model, SLOT( onItemRowsRemovedBegin( int, int ) ) );
+    connect( this, SIGNAL( childRowsAdded() ), m_model, SLOT( onItemRowsAddedDone() ) );
+    connect( this, SIGNAL( childRowsRemoved() ), m_model, SLOT( onItemRowsRemovedDone() ) );
+    connect( this, SIGNAL( updated() ), m_model, SLOT( itemUpdated() ) );
+    connect( this, SIGNAL( selectRequest( SourceTreeItem* ) ), m_model, SLOT( itemSelectRequest( SourceTreeItem* ) ) );
+    connect( this, SIGNAL( expandRequest( SourceTreeItem* ) ), m_model, SLOT( itemExpandRequest( SourceTreeItem* ) ) );
+    connect( this, SIGNAL( toggleExpandRequest( SourceTreeItem* ) ), m_model, SLOT( itemToggleExpandRequest( SourceTreeItem* ) ) );
+
+    if ( !m_parent )
+        return;
+
+    // caller must call begin/endInsertRows
+    if ( index < 0 )
+        m_parent->appendChild( this );
+    else
+        m_parent->insertChild( index, this );
+}
+
+
+SourceTreeItem::~SourceTreeItem()
+{
+    qDeleteAll( m_children );
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/SourceTreeItem.h Added

@@ -0,0 +1,114 @@
+/*
+    Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+
+    This program 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef SOURCETREEITEM_H
+#define SOURCETREEITEM_H
+
+#include <QIcon>
+
+#include "Typedefs.h"
+#include "SourcesModel.h"
+
+class QMimeData;
+
+class SourceTreeItem : public QObject
+{
+    Q_OBJECT
+public:
+    enum DropType
+    {
+        DropTypesNone =         0x00,
+        DropTypeThisTrack =     0x01,
+        DropTypeThisAlbum =     0x02,
+        DropTypeAllFromArtist = 0x04,
+        DropTypeLocalItems =    0x08,
+        DropTypeTop50 =         0x10,
+        DropTypesAllTypes =     0xff
+    };
+    Q_DECLARE_FLAGS( DropTypes, DropType )
+
+    SourceTreeItem() : m_type( SourcesModel::Invalid ), m_parent( 0 ), m_model( 0 ) {}
+    SourceTreeItem( SourcesModel* model, SourceTreeItem* parent, SourcesModel::RowType thisType, int peerSortValue = 0, int index = -1 ); // if index is -1, append at end of parent's child list
+    virtual ~SourceTreeItem();
+
+    // generic info used by the tree model
+    SourcesModel::RowType type() const { return m_type; }
+    SourceTreeItem* parent() const { return m_parent; }
+    SourcesModel* model() const { return m_model; }
+
+    QList< SourceTreeItem* > children() const { return m_children; }
+    void appendChild( SourceTreeItem* item ) { m_children.append( item ); }
+    void insertChild( int index, SourceTreeItem* item ) { m_children.insert( index, item ); }
+    void removeChild( SourceTreeItem* item ) { m_children.removeAll( item ); }
+
+    // varies depending on the type of the item
+    virtual QString text() const { return QString(); }
+    virtual QString tooltip() const { return QString(); }
+    virtual Qt::ItemFlags flags() const { return Qt::ItemIsSelectable | Qt::ItemIsEnabled; }
+    virtual QIcon icon() const { return QIcon(); }
+    virtual bool willAcceptDrag( const QMimeData* ) const { return false; }
+    virtual bool dropMimeData( const QMimeData*, Qt::DropAction ) { return false; }
+    virtual bool setData( const QVariant&, bool ) { return false; }
+    virtual int peerSortValue() const { return m_peerSortValue; } // How to sort relative to peers in the tree.
+    virtual int IDValue() const { return 0; }
+    virtual DropTypes supportedDropTypes( const QMimeData* mimeData ) const { Q_UNUSED( mimeData ); return DropTypesNone; }
+    virtual void setDropType( DropType type ) { m_dropType = type; }
+    virtual DropType dropType() const { return m_dropType; }
+    virtual bool isBeingPlayed() const { return false; }
+    virtual QList< QAction* > customActions() const { return QList< QAction* >(); }
+
+    /// don't call me unless you are a sourcetreeitem. i prefer this to making everyone a friend
+    void beginRowsAdded( int from, int to ) { emit beginChildRowsAdded( from, to ); }
+    void endRowsAdded() { emit childRowsAdded(); }
+    void beginRowsRemoved( int from, int to ) { emit beginChildRowsRemoved( from, to ); }
+    void endRowsRemoved() { emit childRowsRemoved(); }
+
+public slots:
+    virtual void activate() {}
+    virtual void doubleClicked() {}
+
+signals:
+    void updated();
+    void selectRequest( SourceTreeItem* );
+    void expandRequest( SourceTreeItem* );
+    void toggleExpandRequest( SourceTreeItem* );
+
+    void beginChildRowsAdded( int fromRow, int toRow );
+    void childRowsAdded();
+
+    void beginChildRowsRemoved( int fromRow, int toRow );
+    void childRowsRemoved();
+
+protected:
+    void setRowType( SourcesModel::RowType t ) { m_type = t; }
+    void setParentItem( SourceTreeItem* item ) { m_parent = item; }
+
+private:
+    SourcesModel::RowType m_type;
+
+    SourceTreeItem* m_parent;
+    QList< SourceTreeItem* > m_children;
+    SourcesModel* m_model;
+    int m_peerSortValue;
+
+    DropType m_dropType;
+};
+
+Q_DECLARE_METATYPE( SourceTreeItem* );
+
+#endif // SOURCETREEITEM_H

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/TemporaryPageItem.cpp Added

@@ -0,0 +1,173 @@
+/* === 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 "TemporaryPageItem.h"
+
+#include "GlobalActionManager.h"
+#include "ViewManager.h"
+#include "widgets/infowidgets/AlbumInfoWidget.h"
+#include "widgets/infowidgets/ArtistInfoWidget.h"
+#include "widgets/infowidgets/TrackInfoWidget.h"
+#include "widgets/SearchWidget.h"
+#include "utils/Closure.h"
+
+#include <QAction>
+
+namespace {
+    enum LinkType {
+        ArtistLink,
+        AlbumLink,
+        TrackLink
+    };
+}
+
+using namespace Tomahawk;
+
+TemporaryPageItem::TemporaryPageItem ( SourcesModel* mdl, SourceTreeItem* parent, ViewPage* page, int sortValue )
+    : SourceTreeItem( mdl, parent, SourcesModel::TemporaryPage )
+    , m_page( page )
+    , m_icon( QIcon( RESPATH "images/playlist-icon.png" ) )
+    , m_sortValue( sortValue )
+{
+    QAction* action = 0;
+
+    if ( dynamic_cast< ArtistInfoWidget* >( page ) )
+    {
+        action = new QAction( tr( "Copy Artist Link" ), this );
+        action->setProperty( "linkType", (int)ArtistLink );
+
+        m_icon = QIcon( RESPATH "images/artist-icon.png" );
+    }
+    else if ( dynamic_cast< AlbumInfoWidget* >( page ) )
+    {
+        action = new QAction( tr( "Copy Album Link" ), this );
+        action->setProperty( "linkType", (int)AlbumLink );
+
+        m_icon = QIcon( RESPATH "images/album-icon.png" );
+    }
+    else if ( dynamic_cast< TrackInfoWidget* >( page ) )
+    {
+        action = new QAction( tr( "Copy Track Link" ), this );
+        action->setProperty( "linkType", (int)TrackLink );
+
+        m_icon = QIcon( RESPATH "images/track-icon-sidebar.png" );
+    }
+    else if ( dynamic_cast< SearchWidget* >( page ) )
+    {
+        m_icon = QIcon( RESPATH "images/search-icon.png" );
+    }
+
+    if ( action )
+    {
+        m_customActions << action;
+        NewClosure( action, SIGNAL( triggered() ), this, SLOT( linkActionTriggered( QAction* ) ), action );
+    }
+
+    model()->linkSourceItemToPage( this, page );
+}
+
+
+QString
+TemporaryPageItem::text() const
+{
+    return m_page->title();
+}
+
+
+void
+TemporaryPageItem::activate()
+{
+    ViewManager::instance()->show( m_page );
+}
+
+
+QIcon
+TemporaryPageItem::icon() const
+{
+    return m_icon;
+}
+
+
+int
+TemporaryPageItem::peerSortValue() const
+{
+    return m_sortValue;
+}
+
+
+int
+TemporaryPageItem::IDValue() const
+{
+    return m_sortValue;
+}
+
+
+void
+TemporaryPageItem::removeFromList()
+{
+    ViewManager::instance()->destroyPage( m_page );
+
+    model()->removeSourceItemLink( this );
+
+    int idx = parent()->children().indexOf( this );
+    parent()->beginRowsRemoved( idx, idx );
+    parent()->removeChild( this );
+    parent()->endRowsRemoved();
+
+    emit removed();
+
+    deleteLater();
+}
+
+
+void
+TemporaryPageItem::linkActionTriggered( QAction* action )
+{
+    Q_ASSERT( action );
+    if ( !action )
+        return;
+
+    const LinkType type = (LinkType)action->property( "linkType" ).toInt();
+    switch( type )
+    {
+    case ArtistLink:
+    {
+        ArtistInfoWidget* aPage = dynamic_cast< ArtistInfoWidget* >( m_page );
+        Q_ASSERT( aPage );
+        GlobalActionManager::instance()->copyOpenLink( aPage->artist() );
+
+        break;
+    }
+    case AlbumLink:
+    {
+        AlbumInfoWidget* aPage = dynamic_cast< AlbumInfoWidget* >( m_page );
+        Q_ASSERT( aPage );
+        GlobalActionManager::instance()->copyOpenLink( aPage->album() );
+
+        break;
+    }
+    case TrackLink:
+    {
+        TrackInfoWidget* tPage = dynamic_cast< TrackInfoWidget* >( m_page );
+        Q_ASSERT( tPage );
+        GlobalActionManager::instance()->copyToClipboard( tPage->query() );
+
+        break;
+    }
+    }
+}

tomahawk-0.5.5.tar.bz2/src/sourcetree/items/TemporaryPageItem.h Added

@@ -0,0 +1,62 @@
+/* === 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 TEMPORARYPAGEITEM_H
+#define TEMPORARYPAGEITEM_H
+
+#include "items/SourceTreeItem.h"
+#include "ViewPage.h"
+
+class QAction;
+
+class TemporaryPageItem : public SourceTreeItem
+{
+    Q_OBJECT
+public:
+    TemporaryPageItem ( SourcesModel* model, SourceTreeItem* parent, Tomahawk::ViewPage* page, int sortValue );
+
+    virtual QString text() const;
+    virtual void activate();
+
+    virtual QIcon icon() const;
+    virtual int peerSortValue() const;
+    virtual int IDValue() const;
+    virtual QList< QAction* > customActions() const { return m_customActions; }
+
+    Tomahawk::ViewPage* page() const { return m_page; }
+    virtual bool isBeingPlayed() const { return m_page->isBeingPlayed(); }
+
+public slots:
+    void removeFromList();
+
+signals:
+    bool removed();
+
+private slots:
+    void linkActionTriggered( QAction* );
+
+private:
+    Tomahawk::ViewPage* m_page;
+    QIcon m_icon;
+    int m_sortValue;
+    QList< QAction* > m_customActions;
+};
+
+Q_DECLARE_METATYPE( QAction* )
+
+#endif // TEMPORARYPAGEITEM_H

tomahawk-0.5.5.tar.bz2/src/web/Api_v1.cpp Added

@@ -0,0 +1,404 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@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 "Api_v1.h"
+
+#include <QHash>
+
+#include "utils/Logger.h"
+
+#include "utils/TomahawkUtils.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_AddClientAuth.h"
+#include "database/DatabaseCommand_ClientAuthValid.h"
+#include "network/Servent.h"
+#include "Pipeline.h"
+#include "Source.h"
+
+using namespace Tomahawk;
+
+
+void
+Api_v1::auth_1( QxtWebRequestEvent* event, QString arg )
+{
+    qDebug() << "AUTH_1 HTTP" << event->url.toString() << arg;
+
+    if ( !event->url.hasQueryItem( "website" ) || !event->url.hasQueryItem( "name" ) )
+    {
+        qDebug() << "Malformed HTTP resolve request";
+        send404( event );
+        return;
+    }
+
+    QString formToken = uuid();
+
+    if ( event->url.hasQueryItem( "json" ) )
+    {
+        // JSON response
+        QVariantMap m;
+        m "formtoken"  = formToken;
+        sendJSON( m, event );
+    }
+    else
+    {
+        // webpage request
+        QString authPage = RESPATH "www/auth.html";
+        QHash< QString, QString > args;
+        if ( event->url.hasQueryItem( "receiverurl" ) )
+            args "url"  = QUrl::fromPercentEncoding( event->url.queryItemValue( "receiverurl" ).toUtf8() );
+
+        args "formtoken"  = formToken;
+        args "website"  = QUrl::fromPercentEncoding( event->url.queryItemValue( "website" ).toUtf8() );
+        args "name"  = QUrl::fromPercentEncoding( event->url.queryItemValue( "name" ).toUtf8() );
+        sendWebpageWithArgs( event, authPage, args );
+    }
+}
+
+
+void
+Api_v1::auth_2( QxtWebRequestEvent* event, QString arg )
+{
+    qDebug() << "AUTH_2 HTTP" << event->url.toString() << arg;
+    if ( event->content.isNull() )
+    {
+        qDebug() << "Null content";
+        send404( event );
+        return;
+    }
+
+    QString params = QUrl::fromPercentEncoding( event->content->readAll() );
+    params = params.mid( params.indexOf( '?' ) );
+    QStringList pieces = params.split( '&' );
+    QHash< QString, QString > queryItems;
+
+    foreach ( const QString& part, pieces )
+    {
+        QStringList keyval = part.split( '=' );
+        if ( keyval.size() == 2 )
+            queryItems.insert( keyval.first(), keyval.last() );
+        else
+            qDebug() << "Failed parsing url parameters:" << part;
+    }
+
+    qDebug() << "has query items:" << pieces;
+    if ( !params.contains( "website" ) || !params.contains( "name" ) || !params.contains( "formtoken" ) )
+    {
+        qDebug() << "Malformed HTTP resolve request";
+        send404( event );
+        return;
+    }
+
+    QString website = queryItems "website" ;
+    QString name  = queryItems "name" ;
+    QByteArray authtoken = uuid().toLatin1();
+    qDebug() << "HEADERS:" << event->headers;
+    if ( !queryItems.contains( "receiverurl" ) || queryItems.value( "receiverurl" ).isEmpty() )
+    {
+        //no receiver url, so do it ourselves
+        if ( queryItems.contains( "json" ) )
+        {
+            QVariantMap m;
+            m "authtoken"  = authtoken;
+
+            sendJSON( m, event );
+        }
+        else
+        {
+            QString authPage = RESPATH "www/auth.na.html";
+            QHash< QString, QString > args;
+            args "authcode"  = authtoken;
+            args "website"  = website;
+            args "name"  = name;
+            sendWebpageWithArgs( event, authPage, args );
+        }
+    }
+    else
+    {
+        // do what the client wants
+        QUrl receiverurl = QUrl( queryItems.value( "receiverurl" ), QUrl::TolerantMode );
+        receiverurl.addEncodedQueryItem( "authtoken", "#" + authtoken );
+        qDebug() << "Got receiver url:" << receiverurl.toString();
+
+        QxtWebRedirectEvent* e = new QxtWebRedirectEvent( event->sessionID, event->requestID, receiverurl.toString() );
+        postEvent( e );
+        // TODO validation of receiverurl?
+    }
+
+    DatabaseCommand_AddClientAuth* dbcmd = new DatabaseCommand_AddClientAuth( authtoken, website, name, event->headers.key( "ua" ) );
+    Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(dbcmd) );
+}
+
+
+// all v1 api calls go to /api/
+void
+Api_v1::api( QxtWebRequestEvent* event )
+{
+    qDebug() << "HTTP" << event->url.toString();
+
+    const QUrl& url = event->url;
+    if ( url.hasQueryItem( "method" ) )
+    {
+        const QString method = url.queryItemValue( "method" );
+
+        if ( method == "stat" )        return stat( event );
+        if ( method == "resolve" )     return resolve( event );
+        if ( method == "get_results" ) return get_results( event );
+    }
+
+    send404( event );
+}
+
+
+// request for stream: /sid/<id>
+void
+Api_v1::sid( QxtWebRequestEvent* event, QString unused )
+{
+    Q_UNUSED( unused );
+
+    RID rid = event->url.path().mid( 5 );
+    qDebug() << "Request for sid" << rid;
+
+    result_ptr rp = Pipeline::instance()->result( rid );
+    if ( rp.isNull() )
+    {
+        return send404( event );
+    }
+
+    QSharedPointer<QIODevice> iodev = Servent::instance()->getIODeviceForUrl( rp );
+    if ( iodev.isNull() )
+    {
+        return send404( event ); // 503?
+    }
+
+    QxtWebPageEvent* e = new QxtWebPageEvent( event->sessionID, event->requestID, iodev );
+    e->streaming = iodev->isSequential();
+    e->contentType = rp->mimetype().toAscii();
+    if ( rp->size() > 0 )
+        e->headers.insert( "Content-Length", QString::number( rp->size() ) );
+    postEvent( e );
+}
+
+
+void
+Api_v1::send404( QxtWebRequestEvent* event )
+{
+    qDebug() << "404" << event->url.toString();
+    QxtWebPageEvent* wpe = new QxtWebPageEvent( event->sessionID, event->requestID, "<h1>Not Found</h1>" );
+    wpe->status = 404;
+    wpe->statusMessage = "no event found";
+    postEvent( wpe );
+}
+
+
+void
+Api_v1::stat( QxtWebRequestEvent* event )
+{
+    qDebug() << "Got Stat request:" << event->url.toString();
+    m_storedEvent = event;
+
+    if ( !event->content.isNull() )
+        qDebug() << "BODY:" << event->content->readAll();
+
+    if ( event->url.hasQueryItem( "auth" ) )
+    {
+        // check for auth status
+        DatabaseCommand_ClientAuthValid* dbcmd = new DatabaseCommand_ClientAuthValid( event->url.queryItemValue( "auth" ) );
+        connect( dbcmd, SIGNAL( authValid( QString, QString, bool ) ), this, SLOT( statResult( QString, QString, bool ) ) );
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(dbcmd) );
+    }
+    else
+    {
+        statResult( QString(), QString(), false );
+    }
+}
+
+
+void
+Api_v1::statResult( const QString& clientToken, const QString& name, bool valid )
+{
+    Q_UNUSED( clientToken )
+    Q_UNUSED( name )
+
+    Q_ASSERT( m_storedEvent );
+    if ( !m_storedEvent )
+        return;
+    
+    QVariantMap m;
+    m.insert( "name", "playdar" );
+    m.insert( "version", "0.1.1" ); // TODO (needs to be >=0.1.1 for JS to work)
+    m.insert( "authenticated", valid ); // TODO
+    m.insert( "capabilities", QVariantList() );
+    sendJSON( m, m_storedEvent );
+
+    m_storedEvent = 0;
+}
+
+
+void
+Api_v1::resolve( QxtWebRequestEvent* event )
+{
+    if ( !event->url.hasQueryItem( "artist" ) ||
+         !event->url.hasQueryItem( "track" ) )
+    {
+        qDebug() << "Malformed HTTP resolve request";
+        return send404( event );
+    }
+
+    const QString artist = QUrl::fromPercentEncoding( event->url.queryItemValue( "artist" ).toUtf8() );
+    const QString track = QUrl::fromPercentEncoding( event->url.queryItemValue( "track" ).toUtf8() );
+    const QString album = QUrl::fromPercentEncoding( event->url.queryItemValue( "album" ).toUtf8() );
+
+    if ( artist.trimmed().isEmpty() ||
+         track.trimmed().isEmpty() )
+    {
+        qDebug() << "Malformed HTTP resolve request";
+        return send404( event );
+    }
+
+    QString qid;
+    if ( event->url.hasQueryItem( "qid" ) )
+        qid = event->url.queryItemValue( "qid" );
+    else
+        qid = uuid();
+
+    query_ptr qry = Query::get( artist, track, album, qid, false );
+    if ( qry.isNull() )
+    {
+        return send404( event );
+    }
+
+    Pipeline::instance()->resolve( qry, true, true );
+
+    QVariantMap r;
+    r.insert( "qid", qid );
+    sendJSON( r, event );
+}
+
+
+void
+Api_v1::staticdata( QxtWebRequestEvent* event, const QString& str )
+{
+    qDebug() << "STATIC request:" << event << str;
+    if ( str.contains( "tomahawk_auth_logo.png" ) )
+    {
+        QFile f( RESPATH "www/tomahawk_banner_small.png" );
+        f.open( QIODevice::ReadOnly );
+        QByteArray data = f.readAll();
+        QxtWebPageEvent * e = new QxtWebPageEvent( event->sessionID, event->requestID, data );
+        e->contentType = "image/png";
+        postEvent( e );
+    }
+}
+
+
+void
+Api_v1::get_results( QxtWebRequestEvent* event )
+{
+    if ( !event->url.hasQueryItem( "qid" ) )
+    {
+        tDebug() << "Malformed HTTP get_results request";
+        send404( event );
+        return;
+    }
+
+    query_ptr qry = Pipeline::instance()->query( event->url.queryItemValue( "qid" ) );
+    if ( qry.isNull() )
+    {
+        send404( event );
+        return;
+    }
+
+    QVariantMap r;
+    r.insert( "qid", qry->id() );
+    r.insert( "poll_interval", 1300 );
+    r.insert( "refresh_interval", 1000 );
+    r.insert( "poll_limit", 14 );
+    r.insert( "solved", qry->playable() );
+    r.insert( "query", qry->toVariant() );
+
+    QVariantList res;
+    foreach( const result_ptr& rp, qry->results() )
+    {
+        if ( rp->isOnline() )
+            res << rp->toVariant();
+    }
+    r.insert( "results", res );
+
+    sendJSON( r, event );
+}
+
+
+void
+Api_v1::sendJSON( const QVariantMap& m, QxtWebRequestEvent* event )
+{
+    QJson::Serializer ser;
+    QByteArray ctype;
+    QByteArray body = ser.serialize( m );
+
+    if ( event->url.hasQueryItem("jsonp") && !event->url.queryItemValue( "jsonp" ).isEmpty() )
+    {
+        ctype = "text/javascript; charset=utf-8";
+        body.prepend( QString("%1( ").arg( event->url.queryItemValue( "jsonp" ) ).toAscii() );
+        body.append( " );" );
+    }
+    else
+    {
+        ctype = "appplication/json; charset=utf-8";
+    }
+
+    QxtWebPageEvent * e = new QxtWebPageEvent( event->sessionID, event->requestID, body );
+    e->contentType = ctype;
+    e->headers.insert( "Content-Length", QString::number( body.length() ) );
+    postEvent( e );
+    qDebug() << "JSON response" << event->url.toString() << body;
+}
+
+
+// load an html template from a file, replace args from map
+// then serve
+void
+Api_v1::sendWebpageWithArgs( QxtWebRequestEvent* event, const QString& filenameSource, const QHash< QString, QString >& args )
+{
+    if ( !QFile::exists( filenameSource ) )
+        qWarning() << "Passed invalid file for html source:" << filenameSource;
+
+    QFile f( filenameSource );
+    f.open( QIODevice::ReadOnly );
+    QByteArray html = f.readAll();
+
+    foreach( const QString& param, args.keys() )
+    {
+        html.replace( QString( "<%%1%>" ).arg( param.toUpper() ), args.value( param ).toUtf8() );
+    }
+    // workaround for receiverurl
+    if ( !args.keys().contains( "URL" ) )
+        html.replace( QString( "<%URL%>" ).toLatin1(), QByteArray() );
+
+
+    QxtWebPageEvent* e = new QxtWebPageEvent( event->sessionID, event->requestID, html );
+    postEvent( e );
+}
+
+
+void
+Api_v1::index( QxtWebRequestEvent* event )
+{
+    send404( event );
+}

tomahawk-0.5.5.tar.bz2/src/web/Api_v1.h Added

@@ -0,0 +1,80 @@
+/* === 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
+ *   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 TOMAHAWK_WEBAPI_V1
+#define TOMAHAWK_WEBAPI_V1
+
+// See: http://doc.libqxt.org/tip/qxtweb.html
+
+#include "QxtHttpServerConnector"
+#include "QxtHttpSessionManager"
+#include "QxtWebContent"
+#include "QxtWebSlotService"
+#include "QxtWebPageEvent"
+
+#include <qjson/parser.h>
+#include <qjson/serializer.h>
+#include <qjson/qobjecthelper.h>
+
+#include <QFile>
+#include <QSharedPointer>
+#include <QStringList>
+
+class Api_v1 : public QxtWebSlotService
+{
+Q_OBJECT
+
+public:
+
+    Api_v1( QxtAbstractWebSessionManager* sm, QObject* parent = 0 )
+        : QxtWebSlotService( sm, parent )
+    {
+    }
+
+public slots:
+    // authenticating uses /auth_1
+    // we redirect to /auth_2 for the callback
+    void auth_1( QxtWebRequestEvent* event, QString unused = QString() );
+    void auth_2( QxtWebRequestEvent* event, QString unused = QString() );
+
+    // all v1 api calls go to /api/
+    void api( QxtWebRequestEvent* event );
+
+    // request for stream: /sid/<id>
+    void sid( QxtWebRequestEvent* event, QString unused = QString() );
+    void send404( QxtWebRequestEvent* event );
+    void stat( QxtWebRequestEvent* event );
+    void statResult( const QString& clientToken, const QString& name, bool valid );
+    void resolve( QxtWebRequestEvent* event );
+    void staticdata( QxtWebRequestEvent* event,const QString& );
+    void get_results( QxtWebRequestEvent* event );
+    void sendJSON( const QVariantMap& m, QxtWebRequestEvent* event );
+
+    // load an html template from a file, replace args from map
+    // then serve
+    void sendWebpageWithArgs( QxtWebRequestEvent* event, const QString& filenameSource, const QHash< QString, QString >& args );
+
+    void index( QxtWebRequestEvent* event );
+
+private:
+    QxtWebRequestEvent* m_storedEvent;
+};
+
+#endif
+

tomahawk-0.5.5.tar.bz2/src/xmppbot/XmppBot.cpp Added

@@ -0,0 +1,452 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 "XmppBot.h"
+
+#include "infosystem/InfoSystem.h"
+#include "Album.h"
+#include "Typedefs.h"
+#include "TomahawkSettings.h"
+
+#include "audio/AudioEngine.h"
+
+#include <gloox/client.h>
+#include <gloox/rostermanager.h>
+#include <gloox/message.h>
+#include <gloox/connectiontcpclient.h>
+
+#include <QtCore/QStringList>
+
+#include "utils/Logger.h"
+
+using namespace gloox;
+using namespace Tomahawk::InfoSystem;
+
+static QString s_botInfoIdentifier = QString( "XMPPBot" );
+
+
+XMPPBot::XMPPBot(QObject *parent)
+    : QObject(parent)
+    , m_currReturnMessage("\n")
+{
+    qDebug() << Q_FUNC_INFO;
+    TomahawkSettings *settings = TomahawkSettings::instance();
+    QString server = settings->xmppBotServer();
+    QString jidstring = settings->xmppBotJid();
+    QString password = settings->xmppBotPassword();
+    int port = settings->xmppBotPort();
+    if (jidstring.isEmpty() || password.isEmpty())
+        return;
+
+    JID jid(jidstring.toStdString());
+    jid.setResource( QString( "tomahawkbot%1" ).arg( qrand() ).toStdString() );
+
+    m_client = new XMPPBotClient(this, jid, password.toStdString(), port);
+    if (!server.isEmpty())
+        m_client.data()->setServer(server.toStdString());
+
+    m_client.data()->registerConnectionListener(this);
+    m_client.data()->registerSubscriptionHandler(this);
+    m_client.data()->registerMessageHandler(this);
+    m_client.data()->setPresence(Presence::Available, 1, "Tomahawkbot available");
+
+    connect(AudioEngine::instance(), SIGNAL(started(const Tomahawk::result_ptr &)),
+            SLOT(newTrackSlot(const Tomahawk::result_ptr &)));
+
+    connect(InfoSystem::instance(),
+        SIGNAL(info(QString, Tomahawk::InfoSystem::InfoType, QVariant, QVariant, QVariantMap)),
+        SLOT(infoReturnedSlot(QString, Tomahawk::InfoSystem::InfoType, QVariant, QVariant, QVariantMap)));
+
+    connect(InfoSystem::instance(), SIGNAL(finished(QString)), SLOT(infoFinishedSlot(QString)));
+
+    bool success = m_client.data()->gloox::Client::connect(false);
+    if (success)
+        m_client.data()->run();
+    else
+        qDebug() << "XMPPBot failed to connect with Client";
+}
+
+XMPPBot::~XMPPBot()
+{
+    qDebug() << Q_FUNC_INFO;
+    if (!m_client.isNull())
+        m_client.data()->gloox::Client::disconnect();
+}
+
+void XMPPBot::newTrackSlot(const Tomahawk::result_ptr &track)
+{
+    m_currTrack = track;
+    if (!track)
+        return;
+    QString status = QString("%1 - %2 (%3)")
+                    .arg(track->artist()->name())
+                    .arg(track->track())
+                    .arg(track->album()->name());
+
+    m_client.data()->setPresence(Presence::Available, 1, status.toStdString());
+}
+
+void XMPPBot::onConnect()
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "XMPPBot Connected";
+}
+
+void XMPPBot::onDisconnect(ConnectionError e)
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "XMPPBot Disconnected";
+    qDebug() << "Connection error msg:" << e;
+}
+
+bool XMPPBot::onTLSConnect(const gloox::CertInfo& info)
+{
+    //WARNING: Blindly accepts all certificates, at the moment
+    qDebug() << Q_FUNC_INFO;
+    return true;
+}
+
+void XMPPBot::handleSubscription(const gloox::Subscription& subscription)
+{
+    qDebug() << Q_FUNC_INFO;
+    if (subscription.subtype() == Subscription::Subscribed)
+    {
+        qDebug() << "XMPPBot is now subscribed to " << subscription.from().bare().c_str();
+        return;
+    }
+    else if(subscription.subtype() == Subscription::Unsubscribed)
+    {
+        qDebug() << "XMPPBot is now unsubscribed from " << subscription.from().bare().c_str();
+        return;
+    }
+    else if(subscription.subtype() == Subscription::Subscribe)
+    {
+        m_client.data()->rosterManager()->ackSubscriptionRequest(subscription.from().bareJID(), true);
+        m_client.data()->rosterManager()->subscribe(subscription.from().bareJID(), EmptyString, StringList(), "Let me in?");
+    }
+    else if(subscription.subtype() == Subscription::Unsubscribe)
+    {
+        m_client.data()->rosterManager()->ackSubscriptionRequest(subscription.from().bareJID(), true);
+        m_client.data()->rosterManager()->unsubscribe(subscription.from().bareJID(), "Sorry to see you go.");
+    }
+}
+
+void XMPPBot::handleMessage(const Message& msg, MessageSession* session)
+{
+    //TODO: implement "properly" with MessageSessions, if the bot is to be multi-user
+    if ( msg.subtype() != Message::Chat || msg.from().full().empty() || msg.to().full().empty() )
+        return;
+
+    QString body = QString::fromStdString( msg.body() ).toLower().trimmed();
+    QString originatingJid = QString::fromStdString( msg.from().full() );
+
+    if ( body.startsWith( "play" ) )
+    {
+        QStringList tokens = body.right( body.length() - 5 ).split( QString( "-" ), QString::SkipEmptyParts );
+        if ( tokens.count() < 2 )
+            AudioEngine::instance()->play();
+
+        Tomahawk::query_ptr q = Tomahawk::Query::get( tokens.first().trimmed(), tokens.last().trimmed(), QString() );
+        if ( q.isNull() )
+            return;
+
+        connect( q.data(), SIGNAL( resultsAdded( QList<Tomahawk::result_ptr> ) ),
+                             SLOT( onResultsAdded( QList<Tomahawk::result_ptr> ) ) );
+
+        return;
+    }
+    else if ( body.startsWith( "stop" ) )
+    {
+        AudioEngine::instance()->stop();
+        return;
+    }
+    else if ( body.startsWith( "prev" ) )
+    {
+        AudioEngine::instance()->previous();
+        return;
+    }
+    else if ( body.startsWith( "next" ) )
+    {
+        AudioEngine::instance()->next();
+        return;
+    }
+    else if ( body.startsWith( "pause" ) )
+    {
+        AudioEngine::instance()->pause();
+        return;
+    }
+
+    QStringList tokens( body.split( QString( " and " ), QString::SkipEmptyParts ) );
+    if ( tokens.isEmpty() )
+        return;
+
+    qDebug() << "jid from:" << QString::fromStdString(msg.from().full()) << ", jid to:" << QString::fromStdString(msg.to().full());
+    qDebug() << "Operating on tokens:" << tokens;
+
+    if (m_currTrack.isNull() || m_currTrack->artist()->name().isEmpty() || m_currTrack->track().isEmpty())
+    {
+        qDebug() << "XMPPBot can't figure out track";
+        QString m_currReturnMessage("\n\nSorry, I can't figure out what track is playing.\n\n");
+        Message retMsg(Message::Chat, JID(originatingJid.toStdString()), m_currReturnMessage.toStdString());
+        m_client.data()->send(retMsg);
+        return;
+    }
+
+    InfoTypeMap infoMap;
+    Q_FOREACH(QString token, tokens)
+    {
+        if (token == "biography")
+            infoMapInfoArtistBiography = m_currTrack.data()->artist()->name();
+        if (token == "terms")
+            infoMapInfoArtistTerms = m_currTrack.data()->artist()->name();
+        if (token == "hotttness")
+            infoMapInfoArtistHotttness = m_currTrack.data()->artist()->name();
+        if (token == "familiarity")
+            infoMapInfoArtistFamiliarity = m_currTrack.data()->artist()->name();
+        if (token == "lyrics")
+        {
+            QVariantMap myhash;
+            myhash"trackName" = QVariant::fromValue<QString>(m_currTrack.data()->track());
+            myhash"artistName" = QVariant::fromValue<QString>(m_currTrack.data()->artist()->name());
+            infoMapInfoTrackLyrics = QVariant::fromValue<QVariantMap>(myhash);
+        }
+    }
+
+    if (infoMap.isEmpty())
+    {
+        qDebug() << "XMPPBot can't figure out track";
+        QString m_currReturnMessage("\n\nSorry, I couldn't recognize any commands.\n\n");
+        Message retMsg(Message::Chat, JID(originatingJid.toStdString()), m_currReturnMessage.toStdString());
+        m_client.data()->send(retMsg);
+        return;
+    }
+
+    m_currInfoMap.unite(infoMap);
+    QString waitMsg("Please wait...");
+    Message retMsg(Message::Chat, JID(originatingJid.toStdString()), waitMsg.toStdString());
+    m_client.data()->send(retMsg);
+    QVariantMap hash;
+    hash"XMPPBotSendToJID" = originatingJid;
+    InfoSystem::instance()->getInfo(s_botInfoIdentifier, infoMap, hash);
+}
+
+void XMPPBot::infoReturnedSlot(QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input, QVariant output, QVariantMap customData)
+{
+    qDebug() << Q_FUNC_INFO;
+
+    if (caller != s_botInfoIdentifier ||
+        input.isNull() || !input.isValid() ||
+        !customData.contains("XMPPBotSendToJID")
+       )
+    {
+        qDebug() << "Not the right object, custom data is null, or don't have a set JID";
+        return;
+    }
+
+    if (!m_currInfoMap.contains(type))
+    {
+        qDebug() << "not in currInfoMap";
+        return;
+    }
+    else
+        m_currInfoMap.remove(type);
+
+    QString jid = customData"XMPPBotSendToJID".toString();
+    if (!m_currReturnJid.isEmpty() && m_currReturnJid != jid && !m_currReturnMessage.isEmpty())
+    {
+        gloox::Message msg(Message::Chat, JID(jid.toStdString()), m_currReturnMessage.toStdString());
+        m_client.data()->send(msg);
+        m_currReturnMessage = QString("\n");
+    }
+    m_currReturnJid = jid;
+
+    switch(type)
+    {
+        case InfoArtistBiography:
+        {
+            qDebug() << "Artist bio requested";
+            if (!output.canConvert<Tomahawk::InfoSystem::InfoGenericMap>() ||
+                !input.canConvert<QString>()
+               )
+            {
+                qDebug() << "Variants failed to be valid";
+                break;
+            }
+            InfoGenericMap bmap = output.value<Tomahawk::InfoSystem::InfoGenericMap>();
+            QString artist = input.toString();
+            m_currReturnMessage += QString("\nBiographies for %1\n").arg(artist);
+            Q_FOREACH(QString source, bmap.keys())
+            {
+                m_currReturnMessage += (bmapsource"attribution".isEmpty() ?
+                        QString("From %1:\n").arg(bmapsource"site") :
+                        QString("From %1 at %2:\n").arg(bmapsource"attribution").arg(bmapsource"site"));
+                m_currReturnMessage += bmapsource"text" + QString("\n");
+            }
+            break;
+        }
+        case InfoArtistTerms:
+        {
+            qDebug() << "Artist terms requested";
+            if (!output.canConvert<Tomahawk::InfoSystem::InfoGenericMap>() ||
+                !input.canConvert<QString>()
+               )
+            {
+                qDebug() << "Variants failed to be valid";
+                break;
+            }
+            InfoGenericMap tmap = output.value<Tomahawk::InfoSystem::InfoGenericMap>();
+            QString artist = input.toString();
+            m_currReturnMessage += tr("\nTerms for %1:\n").arg(artist);
+            if (tmap.isEmpty())
+                m_currReturnMessage += tr("No terms found, sorry.");
+            else
+            {
+                bool first = true;
+                Q_FOREACH(QString term, tmap.keys())
+                {
+                    if (first)
+                        m_currReturnMessage += (first ?
+                            QString("%1 (weight %2, frequency %3)")
+                                .arg(term).arg(tmapterm"weight").arg(tmapterm"frequency")
+                              :
+                            QString("\n%1 (weight %2, frequency %3)")
+                                .arg(term).arg(tmapterm"weight").arg(tmapterm"frequency")
+                              );
+                    first = false;
+                }
+                m_currReturnMessage += QString("\n");
+            }
+            break;
+        }
+        case InfoArtistHotttness:
+        {
+            qDebug() << "Artist hotttness requested";
+            if (!output.canConvert<qreal>() ||
+                !input.canConvert<QString>()
+               )
+            {
+                qDebug() << "Variants failed to be valid";
+                break;
+            }
+            QString artist = input.toString();
+            qreal retVal = output.toReal();
+            QString retValString = (retVal == 0.0 ? "(none)" : QString::number(retVal));
+            m_currReturnMessage += tr("\nHotttness for %1: %2\n").arg(artist, retValString);
+            break;
+        }
+        case InfoArtistFamiliarity:
+        {
+            qDebug() << "Artist familiarity requested";
+            if (!output.canConvert<qreal>() ||
+                !input.canConvert<QString>()
+               )
+            {
+                qDebug() << "Variants failed to be valid";
+                break;
+            }
+            QString artist = input.toString();
+            qreal retVal = output.toReal();
+            QString retValString = (retVal == 0.0 ? "(none)" : QString::number(retVal));
+            m_currReturnMessage += tr("\nFamiliarity for %1: %2\n").arg(artist, retValString);
+            break;
+        }
+        case InfoTrackLyrics:
+        {
+            qDebug() << "Lyrics requested";
+            if (!output.canConvert<QString>() ||
+                !input.canConvert<QVariantMap>()
+               )
+            {
+                qDebug() << "Variants failed to be valid";
+                break;
+            }
+            QVariantMap inHash = input.value<QVariantMap>();
+            QString artist = inHash"artistName".toString();
+            QString track = inHash"trackName".toString();
+            QString lyrics = output.toString();
+            qDebug() << "lyrics = " << lyrics;
+            m_currReturnMessage += tr("\nLyrics for \"%1\" by %2:\n\n%3\n").arg(track, artist, lyrics);
+            break;
+        }
+        default:
+            break;
+    }
+
+    if (m_currReturnMessage.isEmpty())
+    {
+        qDebug() << "Empty message, not sending anything back";
+        return;
+    }
+
+    qDebug() << "Going to send message: " << m_currReturnMessage << " to " << jid;
+
+    //gloox::Message msg(Message::Chat, JID(jid.toStdString()), m_currReturnMessage.toStdString());
+    //m_client.data()->send(msg);
+}
+
+void XMPPBot::infoFinishedSlot(QString caller)
+{
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "current return message is" << m_currReturnMessage;
+    qDebug() << "id is" << caller << "and our id is" << s_botInfoIdentifier;
+    if (m_currReturnMessage.isEmpty() || caller != s_botInfoIdentifier)
+        return;
+
+    qDebug() << "Sending message to JID" << m_currReturnJid;
+    gloox::Message msg(Message::Chat, JID(m_currReturnJid.toStdString()), m_currReturnMessage.toStdString());
+    m_client.data()->send(msg);
+    m_currReturnMessage = QString("\n");
+    m_currReturnJid.clear();
+}
+
+
+void XMPPBot::onResultsAdded( const QList<Tomahawk::result_ptr>& result )
+{
+    AudioEngine::instance()->playItem( 0, result.first() );
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+XMPPBotClient::XMPPBotClient(QObject *parent, JID &jid, std::string password, int port)
+    : QObject(parent)
+    , Client(jid, password, port)
+    , m_timer(this)
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+XMPPBotClient::~XMPPBotClient()
+{
+    qDebug() << Q_FUNC_INFO;
+}
+
+void XMPPBotClient::run()
+{
+    qDebug() << Q_FUNC_INFO;
+    QObject::connect(&m_timer, SIGNAL(timeout()), SLOT(recvSlot()));
+    m_timer.start(200);
+    qDebug() << "XMPPBot running";
+}
+
+void XMPPBotClient::recvSlot()
+{
+    gloox::ConnectionError error = recv(100);
+    if (error != gloox::ConnNoError)
+        qDebug() << "ERROR: in XMPPBotClient::recvSlot" << error;
+}

tomahawk-0.5.5.tar.bz2/src/xmppbot/XmppBot.h Added

@@ -0,0 +1,96 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.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 XMPPBOT_H
+#define XMPPBOT_H
+
+#include <result.h>
+#include <infosystem/InfoSystem.h>
+
+#include <QtCore/QObject>
+#include <QtCore/qsharedpointer.h>
+#include <QTimer>
+
+#include <gloox/messagehandler.h>
+#include <gloox/messagesessionhandler.h>
+#include <gloox/client.h>
+#include <gloox/connectionlistener.h>
+#include <gloox/subscriptionhandler.h>
+#include <gloox/messagehandler.h>
+
+class XMPPBotClient
+    : public QObject
+    , public gloox::Client
+{
+    Q_OBJECT
+
+public:
+    XMPPBotClient(QObject* parent, gloox::JID &jid, std::string password, int port);
+    virtual ~XMPPBotClient();
+
+    void run();
+
+private slots:
+    void recvSlot();
+
+private:
+    QTimer m_timer;
+};
+
+class XMPPBot
+    : public QObject
+    , public gloox::ConnectionListener
+    , public gloox::SubscriptionHandler
+    , public gloox::MessageHandler
+{
+    Q_OBJECT
+
+public:
+    XMPPBot(QObject *parent);
+    virtual ~XMPPBot();
+
+public slots:
+    virtual void newTrackSlot(const Tomahawk::result_ptr &track);
+    virtual void infoReturnedSlot(QString caller, Tomahawk::InfoSystem::InfoType type, QVariant input, QVariant output, QVariantMap customData);
+    virtual void infoFinishedSlot(QString caller);
+
+protected:
+    // ConnectionListener
+    virtual void onConnect();
+    virtual void onDisconnect(gloox::ConnectionError e);
+    virtual bool onTLSConnect(const gloox::CertInfo &info);
+
+    // SubscriptionHandler
+    virtual void handleSubscription(const gloox::Subscription &subscription);
+
+    // MessageHandler
+    virtual void handleMessage(const gloox::Message &msg, gloox::MessageSession *session = 0);
+
+private slots:
+    void onResultsAdded( const QList<Tomahawk::result_ptr>& result );
+
+private:
+    QWeakPointer<XMPPBotClient> m_client;
+    Tomahawk::result_ptr m_currTrack;
+    Tomahawk::InfoSystem::InfoTypeMap m_currInfoMap;
+    QString m_currReturnMessage;
+    QString m_currReturnJid;
+};
+
+#endif // XMPPBOT_H

tomahawk-0.4.2.tar.bz2/thirdparty/CMakeLists.txt -> tomahawk-0.5.5.tar.bz2/thirdparty/CMakeLists.txt Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/CMakeLists.txt -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/CMakeLists.txt Changed

@@ -32,13 +32,15 @@
             common/mac/macho_utilities.cc
             common/mac/macho_walker.cc
             common/mac/string_utilities.cc
-            common/md5.c
+            common/md5.cc
             common/mac/dump_syms.mm
             common/mac/MachIPC.mm
             common/mac/SimpleStringDictionary.mm
+            common/mac/bootstrap_compat.cc
         )
     ELSE(APPLE)
         SET( breakpadSources
+            common/linux/safe_readlink.cc
             client/linux/crash_generation/crash_generation_client.cc
             client/linux/crash_generation/crash_generation_server.cc
             client/linux/minidump_writer/minidump_writer.cc
@@ -52,9 +54,10 @@
             common/linux/http_upload.cc
             common/linux/guid_creator.cc
             common/linux/elf_symbols_to_module.cc
-            common/string_conversion.cc
-            common/convert_UTF.c
             client/minidump_file_writer.cc
+            client/linux/minidump_writer/linux_ptrace_dumper.cc
+            common/linux/memory_mapped_file.cc
+            client/linux/log/log.cc
         )
     ENDIF(APPLE)

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/apple Added

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/apple/Framework Added

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/apple/Framework/BreakpadDefines.h Added

@@ -0,0 +1,72 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Keys for configuration file
+#define kReporterMinidumpDirectoryKey "MinidumpDir"
+#define kReporterMinidumpIDKey        "MinidumpID"
+
+// Filename for recording uploaded IDs
+#define kReporterLogFilename          "uploads.log"
+
+// The default subdirectory of the Library to put crash dumps in
+// The subdirectory is
+//  ~/Library/<kDefaultLibrarySubdirectory>/<GoogleBreakpadProduct>
+#define kDefaultLibrarySubdirectory   "Breakpad"
+
+// Specify some special keys to be used in the configuration file that is
+// generated by Breakpad and consumed by the crash_sender.
+#define BREAKPAD_PRODUCT               "BreakpadProduct"
+#define BREAKPAD_PRODUCT_DISPLAY       "BreakpadProductDisplay"
+#define BREAKPAD_VERSION               "BreakpadVersion"
+#define BREAKPAD_VENDOR                "BreakpadVendor"
+#define BREAKPAD_URL                   "BreakpadURL"
+#define BREAKPAD_REPORT_INTERVAL       "BreakpadReportInterval"
+#define BREAKPAD_SKIP_CONFIRM          "BreakpadSkipConfirm"
+#define BREAKPAD_CONFIRM_TIMEOUT       "BreakpadConfirmTimeout"
+#define BREAKPAD_SEND_AND_EXIT         "BreakpadSendAndExit"
+#define BREAKPAD_DUMP_DIRECTORY        "BreakpadMinidumpLocation"
+#define BREAKPAD_INSPECTOR_LOCATION    "BreakpadInspectorLocation"
+#define BREAKPAD_REPORTER_EXE_LOCATION \
+  "BreakpadReporterExeLocation"
+#define BREAKPAD_LOGFILES              "BreakpadLogFiles"
+#define BREAKPAD_LOGFILE_UPLOAD_SIZE   "BreakpadLogFileTailSize"
+#define BREAKPAD_REQUEST_COMMENTS      "BreakpadRequestComments"
+#define BREAKPAD_COMMENTS              "BreakpadComments"
+#define BREAKPAD_REQUEST_EMAIL         "BreakpadRequestEmail"
+#define BREAKPAD_EMAIL                 "BreakpadEmail"
+#define BREAKPAD_SERVER_TYPE           "BreakpadServerType"
+#define BREAKPAD_SERVER_PARAMETER_DICT "BreakpadServerParameters"
+
+// The keys below are NOT user supplied, and are used internally.
+#define BREAKPAD_PROCESS_START_TIME       "BreakpadProcStartTime"
+#define BREAKPAD_PROCESS_UP_TIME          "BreakpadProcessUpTime"
+#define BREAKPAD_PROCESS_CRASH_TIME       "BreakpadProcessCrashTime"
+#define BREAKPAD_LOGFILE_KEY_PREFIX       "BreakpadAppLogFile"
+#define BREAKPAD_SERVER_PARAMETER_PREFIX  "BreakpadServerParameterPrefix_"
+#define BREAKPAD_ON_DEMAND                "BreakpadOnDemand"

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/android_link.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/android_link.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/crash_generation/crash_generation_server.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/crash_generation/crash_generation_server.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/handler/exception_handler.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/handler/exception_handler.cc Changed

@@ -73,19 +73,16 @@
 #include <stdio.h>
 #include <sys/mman.h>
 #include <sys/prctl.h>
-#if !defined(__ANDROID__)
-#include <sys/signal.h>
-#endif
 #include <sys/syscall.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
 #if !defined(__ANDROID__)
+#include <sys/signal.h>
 #include <sys/ucontext.h>
 #include <sys/user.h>
-#endif
-#include <sys/wait.h>
-#if !defined(__ANDROID__)
 #include <ucontext.h>
 #endif
-#include <unistd.h>
 
 #include <algorithm>
 #include <utility>
@@ -93,6 +90,7 @@
 
 #include "common/linux/linux_libc_support.h"
 #include "common/memory.h"
+#include "client/linux/log/log.h"
 #include "client/linux/minidump_writer/linux_dumper.h"
 #include "client/linux/minidump_writer/minidump_writer.h"
 #include "common/linux/guid_creator.h"
@@ -190,14 +188,18 @@
   // such a small stack.
   static const unsigned kSigStackSize = 8192;
 
-  signal_stack = malloc(kSigStackSize);
   stack_t stack;
-  memset(&stack, 0, sizeof(stack));
-  stack.ss_sp = signal_stack;
-  stack.ss_size = kSigStackSize;
-
-  if (sys_sigaltstack(&stack, NULL) == -1)
-    return false;
+  // Only set an alternative stack if there isn't already one, or if the current
+  // one is too small.
+  if (sys_sigaltstack(NULL, &stack) == -1 || !stack.ss_sp ||
+      stack.ss_size < kSigStackSize) {
+    memset(&stack, 0, sizeof(stack));
+    stack.ss_sp = malloc(kSigStackSize);
+    stack.ss_size = kSigStackSize;
+
+    if (sys_sigaltstack(&stack, NULL) == -1)
+      return false;
+  }
 
   struct sigaction sa;
   memset(&sa, 0, sizeof(sa));
@@ -390,17 +392,23 @@
     // is the write() and read() calls will fail with EBADF
     static const char no_pipe_msg = "ExceptionHandler::GenerateDump \
                                        sys_pipe failed:";
-    sys_write(2, no_pipe_msg, sizeof(no_pipe_msg) - 1);
-    sys_write(2, strerror(errno), strlen(strerror(errno)));
-    sys_write(2, "\n", 1);
+    logger::write(no_pipe_msg, sizeof(no_pipe_msg) - 1);
+    logger::write(strerror(errno), strlen(strerror(errno)));
+    logger::write("\n", 1);
   }
 
+#if defined(__ANDROID__)
+  const pid_t child = clone(
+      ThreadEntry, stack, CLONE_FILES | CLONE_FS | CLONE_UNTRACED,
+      &thread_arg);
+#else
   const pid_t child = sys_clone(
       ThreadEntry, stack, CLONE_FILES | CLONE_FS | CLONE_UNTRACED,
       &thread_arg, NULL, NULL, NULL);
+#endif
   int r, status;
   // Allow the child to ptrace us
-  prctl(PR_SET_PTRACER, child, 0, 0, 0);
+  sys_prctl(PR_SET_PTRACER, child);
   SendContinueSignalToChild();
   do {
     r = sys_waitpid(child, &status, __WALL);
@@ -411,9 +419,9 @@
 
   if (r == -1) {
     static const char msg = "ExceptionHandler::GenerateDump waitpid failed:";
-    sys_write(2, msg, sizeof(msg) - 1);
-    sys_write(2, strerror(errno), strlen(strerror(errno)));
-    sys_write(2, "\n", 1);
+    logger::write(msg, sizeof(msg) - 1);
+    logger::write(strerror(errno), strlen(strerror(errno)));
+    logger::write("\n", 1);
   }
 
   bool success = r != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0;
@@ -433,9 +441,9 @@
   if(r == -1) {
     static const char msg = "ExceptionHandler::SendContinueSignalToChild \
                                sys_write failed:";
-    sys_write(2, msg, sizeof(msg) - 1);
-    sys_write(2, strerror(errno), strlen(strerror(errno)));
-    sys_write(2, "\n", 1);
+    logger::write(msg, sizeof(msg) - 1);
+    logger::write(strerror(errno), strlen(strerror(errno)));
+    logger::write("\n", 1);
   }
 }
 
@@ -448,9 +456,9 @@
   if(r == -1) {
     static const char msg = "ExceptionHandler::WaitForContinueSignal \
                                sys_read failed:";
-    sys_write(2, msg, sizeof(msg) - 1);
-    sys_write(2, strerror(errno), strlen(strerror(errno)));
-    sys_write(2, "\n", 1);
+    logger::write(msg, sizeof(msg) - 1);
+    logger::write(strerror(errno), strlen(strerror(errno)));
+    logger::write("\n", 1);
   }
 }
 
@@ -503,7 +511,8 @@
   info.start_addr = start_address;
   info.size = mapping_size;
   info.offset = file_offset;
-  strncpy(info.name, name.c_str(), std::min(name.size(), sizeof(info)));
+  strncpy(info.name, name.c_str(), sizeof(info.name) - 1);
+  info.namesizeof(info.name) - 1 = '\0';
 
   MappingEntry mapping;
   mapping.first = info;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/handler/exception_handler.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/handler/exception_handler.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/handler/exception_handler_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/handler/exception_handler_unittest.cc Changed

@@ -44,17 +44,12 @@
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/file_id.h"
 #include "common/linux/linux_libc_support.h"
+#include "common/tests/auto_tempdir.h"
 #include "third_party/lss/linux_syscall_support.h"
 #include "google_breakpad/processor/minidump.h"
 
 using namespace google_breakpad;
 
-#if !defined(__ANDROID__)
-#define TEMPDIR "/tmp"
-#else
-#define TEMPDIR "/data/local/tmp"
-#endif
-
 // Length of a formatted GUID string =
 // sizeof(MDGUID) * 2 + 4 (for dashes) + 1 (null terminator)
 const int kGUIDStringSize = 37;
@@ -79,7 +74,8 @@
 };
 
 TEST(ExceptionHandlerTest, Simple) {
-  ExceptionHandler handler(TEMPDIR, NULL, NULL, NULL, true);
+  AutoTempDir temp_dir;
+  ExceptionHandler handler(temp_dir.path(), NULL, NULL, NULL, true);
 }
 
 static bool DoneCallback(const char* dump_path,
@@ -99,13 +95,14 @@
 }
 
 TEST(ExceptionHandlerTest, ChildCrash) {
+  AutoTempDir temp_dir;
   int fds2;
   ASSERT_NE(pipe(fds), -1);
 
   const pid_t child = fork();
   if (child == 0) {
     close(fds0);
-    ExceptionHandler handler(TEMPDIR, NULL, DoneCallback, (void*) fds1,
+    ExceptionHandler handler(temp_dir.path(), NULL, DoneCallback, (void*) fds1,
                              true);
     *reinterpret_cast<volatile int*>(NULL) = 0;
   }
@@ -133,7 +130,7 @@
   filenamelen = 0;
   close(fds0);
 
-  const std::string minidump_filename = std::string(TEMPDIR) + "/" + filename +
+  const std::string minidump_filename = temp_dir.path() + "/" + filename +
                                         ".dmp";
 
   struct stat st;
@@ -145,6 +142,7 @@
 // Test that memory around the instruction pointer is written
 // to the dump as a MinidumpMemoryRegion.
 TEST(ExceptionHandlerTest, InstructionPointerMemory) {
+  AutoTempDir temp_dir;
   int fds2;
   ASSERT_NE(pipe(fds), -1);
 
@@ -158,8 +156,8 @@
   const pid_t child = fork();
   if (child == 0) {
     close(fds0);
-    ExceptionHandler handler(TEMPDIR, NULL, DoneCallback, (void*) fds1,
-                             true);
+    ExceptionHandler handler(temp_dir.path(), NULL, DoneCallback,
+                             (void*) fds1, true);
     // Get some executable memory.
     char* memory =
       reinterpret_cast<char*>(mmap(NULL,
@@ -206,7 +204,7 @@
   filenamelen = 0;
   close(fds0);
 
-  const std::string minidump_filename = std::string(TEMPDIR) + "/" + filename +
+  const std::string minidump_filename = temp_dir.path() + "/" + filename +
                                         ".dmp";
 
   struct stat st;
@@ -269,6 +267,7 @@
 // Test that the memory region around the instruction pointer is
 // bounded correctly on the low end.
 TEST(ExceptionHandlerTest, InstructionPointerMemoryMinBound) {
+  AutoTempDir temp_dir;
   int fds2;
   ASSERT_NE(pipe(fds), -1);
 
@@ -282,8 +281,8 @@
   const pid_t child = fork();
   if (child == 0) {
     close(fds0);
-    ExceptionHandler handler(TEMPDIR, NULL, DoneCallback, (void*) fds1,
-                             true);
+    ExceptionHandler handler(temp_dir.path(), NULL, DoneCallback,
+                             (void*) fds1, true);
     // Get some executable memory.
     char* memory =
       reinterpret_cast<char*>(mmap(NULL,
@@ -330,7 +329,7 @@
   filenamelen = 0;
   close(fds0);
 
-  const std::string minidump_filename = std::string(TEMPDIR) + "/" + filename +
+  const std::string minidump_filename = temp_dir.path() + "/" + filename +
                                         ".dmp";
 
   struct stat st;
@@ -390,6 +389,7 @@
 // Test that the memory region around the instruction pointer is
 // bounded correctly on the high end.
 TEST(ExceptionHandlerTest, InstructionPointerMemoryMaxBound) {
+  AutoTempDir temp_dir;
   int fds2;
   ASSERT_NE(pipe(fds), -1);
 
@@ -406,8 +406,8 @@
   const pid_t child = fork();
   if (child == 0) {
     close(fds0);
-    ExceptionHandler handler(TEMPDIR, NULL, DoneCallback, (void*) fds1,
-                             true);
+    ExceptionHandler handler(temp_dir.path(), NULL, DoneCallback,
+                             (void*) fds1, true);
     // Get some executable memory.
     char* memory =
       reinterpret_cast<char*>(mmap(NULL,
@@ -454,7 +454,7 @@
   filenamelen = 0;
   close(fds0);
 
-  const std::string minidump_filename = std::string(TEMPDIR) + "/" + filename +
+  const std::string minidump_filename = temp_dir.path() + "/" + filename +
                                         ".dmp";
 
   struct stat st;
@@ -515,6 +515,7 @@
 // Ensure that an extra memory block doesn't get added when the
 // instruction pointer is not in mapped memory.
 TEST(ExceptionHandlerTest, InstructionPointerMemoryNullPointer) {
+  AutoTempDir temp_dir;
   int fds2;
   ASSERT_NE(pipe(fds), -1);
 
@@ -522,8 +523,8 @@
   const pid_t child = fork();
   if (child == 0) {
     close(fds0);
-    ExceptionHandler handler(TEMPDIR, NULL, DoneCallback, (void*) fds1,
-                             true);
+    ExceptionHandler handler(temp_dir.path(), NULL, DoneCallback,
+                             (void*) fds1, true);
     // Try calling a NULL pointer.
     typedef void (*void_function)(void);
     void_function memory_function =
@@ -554,7 +555,7 @@
   filenamelen = 0;
   close(fds0);
 
-  const std::string minidump_filename = std::string(TEMPDIR) + "/" + filename +
+  const std::string minidump_filename = temp_dir.path() + "/" + filename +
                                         ".dmp";
 
   struct stat st;
@@ -625,11 +626,12 @@
                                  MAP_PRIVATE | MAP_ANON,
                                  -1,
                                  0));
-  const u_int64_t kMemoryAddress = reinterpret_cast<u_int64_t>(memory);
+  const uintptr_t kMemoryAddress = reinterpret_cast<uintptr_t>(memory);
   ASSERT_TRUE(memory);
 
   string minidump_filename;
-  ExceptionHandler handler(TEMPDIR, NULL, SimpleCallback,
+  AutoTempDir temp_dir;
+  ExceptionHandler handler(temp_dir.path(), NULL, SimpleCallback,
                            (void*)&minidump_filename, true);
   // Add info about the anonymous memory mapping.
   handler.AddMappingInfo(kMemoryName,
@@ -667,7 +669,14 @@
              void* context) {
   const int fd = (intptr_t) context;
   int fds2;
-  pipe(fds);
+  if (pipe(fds) == -1) {
+    // There doesn't seem to be any way to reliably handle
+    // this failure without the parent process hanging
+    // At least make sure that this process doesn't access
+    // unexpected file descriptors
+    fds0 = -1;
+    fds1 = -1;
+  }
   struct kernel_msghdr msg = {0};
   struct kernel_iovec iov;
   iov.iov_base = const_cast<void*>(crash_context);
@@ -734,6 +743,7 @@
   ASSERT_EQ(n, kCrashContextSize);
   ASSERT_EQ(msg.msg_controllen, kControlMsgSize);
   ASSERT_EQ(msg.msg_flags, 0);
+  ASSERT_EQ(close(fds0), 0);
 
   pid_t crashing_pid = -1;
   int signal_fd = -1;
@@ -756,12 +766,13 @@
   ASSERT_NE(crashing_pid, -1);
   ASSERT_NE(signal_fd, -1);
 
-  char templ = TEMPDIR "/exception-handler-unittest-XXXXXX";
-  mktemp(templ);
-  ASSERT_TRUE(WriteMinidump(templ, crashing_pid, context,
+  AutoTempDir temp_dir;
+  std::string templ = temp_dir.path() + "/exception-handler-unittest";
+  ASSERT_TRUE(WriteMinidump(templ.c_str(), crashing_pid, context,
                             kCrashContextSize));
   static const char b = 0;
   HANDLE_EINTR(write(signal_fd, &b, 1));
+  ASSERT_EQ(close(signal_fd), 0);
 
   int status;
   ASSERT_NE(HANDLE_EINTR(waitpid(child, &status, 0)), -1);
@@ -769,7 +780,7 @@
   ASSERT_EQ(WTERMSIG(status), SIGSEGV);
 
   struct stat st;
-  ASSERT_EQ(stat(templ, &st), 0);
+  ASSERT_EQ(stat(templ.c_str(), &st), 0);
   ASSERT_GT(st.st_size, 0u);
-  unlink(templ);
+  unlink(templ.c_str());
 }

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/log Added

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/log/log.cc Added

@@ -0,0 +1,48 @@
+// Copyright (c) 2012 Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "client/linux/log/log.h"
+
+#if defined(__ANDROID__)
+#include <android/log.h>
+#else
+#include "third_party/lss/linux_syscall_support.h"
+#endif
+
+namespace logger {
+
+int write(const char* buf, size_t nbytes) {
+#if defined(__ANDROID__)
+  return __android_log_write(ANDROID_LOG_WARN, "google-breakpad", buf);
+#else
+  return sys_write(2, buf, nbytes);
+#endif
+}
+
+}  // namespace logger

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/log/log.h Added

@@ -0,0 +1,41 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CLIENT_LINUX_LOG_LOG_H_
+#define CLIENT_LINUX_LOG_LOG_H_
+
+#include <stddef.h>
+
+namespace logger {
+
+int write(const char* buf, size_t nbytes);
+
+}  // namespace logger
+
+#endif  // CLIENT_LINUX_LOG_LOG_H_

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/line_reader_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/line_reader_unittest.cc Changed

@@ -33,6 +33,7 @@
 
 #include "client/linux/minidump_writer/line_reader.h"
 #include "breakpad_googletest_includes.h"
+#include "common/linux/eintr_wrapper.h"
 
 using namespace google_breakpad;
 
@@ -70,16 +71,17 @@
 
 TEST(LineReaderTest, OneLineTerminated) {
   const int fd = TemporaryFile();
-  write(fd, "a\n", 2);
+  const int r = HANDLE_EINTR(write(fd, "a\n", 2));
+  ASSERT_EQ(2, r);
   lseek(fd, 0, SEEK_SET);
   LineReader reader(fd);
 
   const char *line;
   unsigned int len;
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
-  ASSERT_EQ(len, (unsigned int)1);
-  ASSERT_EQ(line0, 'a');
-  ASSERT_EQ(line1, 0);
+  ASSERT_EQ((unsigned int)1, len);
+  ASSERT_EQ('a', line0);
+  ASSERT_EQ('\0', line1);
   reader.PopLine(len);
 
   ASSERT_FALSE(reader.GetNextLine(&line, &len));
@@ -89,16 +91,17 @@
 
 TEST(LineReaderTest, OneLine) {
   const int fd = TemporaryFile();
-  write(fd, "a", 1);
+  const int r = HANDLE_EINTR(write(fd, "a", 1));
+  ASSERT_EQ(1, r);
   lseek(fd, 0, SEEK_SET);
   LineReader reader(fd);
 
   const char *line;
   unsigned len;
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
-  ASSERT_EQ(len, (unsigned)1);
-  ASSERT_EQ(line0, 'a');
-  ASSERT_EQ(line1, 0);
+  ASSERT_EQ((unsigned)1, len);
+  ASSERT_EQ('a', line0);
+  ASSERT_EQ('\0', line1);
   reader.PopLine(len);
 
   ASSERT_FALSE(reader.GetNextLine(&line, &len));
@@ -108,22 +111,23 @@
 
 TEST(LineReaderTest, TwoLinesTerminated) {
   const int fd = TemporaryFile();
-  write(fd, "a\nb\n", 4);
+  const int r = HANDLE_EINTR(write(fd, "a\nb\n", 4));
+  ASSERT_EQ(4, r);
   lseek(fd, 0, SEEK_SET);
   LineReader reader(fd);
 
   const char *line;
   unsigned len;
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
-  ASSERT_EQ(len, (unsigned)1);
-  ASSERT_EQ(line0, 'a');
-  ASSERT_EQ(line1, 0);
+  ASSERT_EQ((unsigned)1, len);
+  ASSERT_EQ('a', line0);
+  ASSERT_EQ('\0', line1);
   reader.PopLine(len);
 
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
-  ASSERT_EQ(len, (unsigned)1);
-  ASSERT_EQ(line0, 'b');
-  ASSERT_EQ(line1, 0);
+  ASSERT_EQ((unsigned)1, len);
+  ASSERT_EQ('b', line0);
+  ASSERT_EQ('\0', line1);
   reader.PopLine(len);
 
   ASSERT_FALSE(reader.GetNextLine(&line, &len));
@@ -133,22 +137,23 @@
 
 TEST(LineReaderTest, TwoLines) {
   const int fd = TemporaryFile();
-  write(fd, "a\nb", 3);
+  const int r = HANDLE_EINTR(write(fd, "a\nb", 3));
+  ASSERT_EQ(3, r);
   lseek(fd, 0, SEEK_SET);
   LineReader reader(fd);
 
   const char *line;
   unsigned len;
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
-  ASSERT_EQ(len, (unsigned)1);
-  ASSERT_EQ(line0, 'a');
-  ASSERT_EQ(line1, 0);
+  ASSERT_EQ((unsigned)1, len);
+  ASSERT_EQ('a', line0);
+  ASSERT_EQ('\0', line1);
   reader.PopLine(len);
 
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
-  ASSERT_EQ(len, (unsigned)1);
-  ASSERT_EQ(line0, 'b');
-  ASSERT_EQ(line1, 0);
+  ASSERT_EQ((unsigned)1, len);
+  ASSERT_EQ('b', line0);
+  ASSERT_EQ('\0', line1);
   reader.PopLine(len);
 
   ASSERT_FALSE(reader.GetNextLine(&line, &len));
@@ -160,16 +165,17 @@
   const int fd = TemporaryFile();
   char lLineReader::kMaxLineLen - 1;
   memset(l, 'a', sizeof(l));
-  write(fd, l, sizeof(l));
+  const int r = HANDLE_EINTR(write(fd, l, sizeof(l)));
+  ASSERT_EQ(sizeof(l), r);
   lseek(fd, 0, SEEK_SET);
   LineReader reader(fd);
 
   const char *line;
   unsigned len;
   ASSERT_TRUE(reader.GetNextLine(&line, &len));
-  ASSERT_EQ(len, sizeof(l));
+  ASSERT_EQ(sizeof(l), len);
   ASSERT_TRUE(memcmp(l, line, sizeof(l)) == 0);
-  ASSERT_EQ(linelen, 0);
+  ASSERT_EQ('\0', linelen);
 
   close(fd);
 }
@@ -178,7 +184,8 @@
   const int fd = TemporaryFile();
   char lLineReader::kMaxLineLen;
   memset(l, 'a', sizeof(l));
-  write(fd, l, sizeof(l));
+  const int r = HANDLE_EINTR(write(fd, l, sizeof(l)));
+  ASSERT_EQ(sizeof(l), r);
   lseek(fd, 0, SEEK_SET);
   LineReader reader(fd);

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_core_dumper.cc Added

@@ -0,0 +1,234 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// linux_core_dumper.cc: Implement google_breakpad::LinuxCoreDumper.
+// See linux_core_dumper.h for details.
+
+#include "client/linux/minidump_writer/linux_core_dumper.h"
+
+#include <asm/ptrace.h>
+#include <assert.h>
+#include <elf.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/procfs.h>
+
+#include "common/linux/linux_libc_support.h"
+
+namespace google_breakpad {
+
+LinuxCoreDumper::LinuxCoreDumper(pid_t pid,
+                                 const char* core_path,
+                                 const char* procfs_path)
+    : LinuxDumper(pid),
+      core_path_(core_path),
+      procfs_path_(procfs_path),
+      thread_infos_(&allocator_, 8) {
+  assert(core_path_);
+}
+
+bool LinuxCoreDumper::BuildProcPath(char* path, pid_t pid,
+                                    const char* node) const {
+  if (!path || !node)
+    return false;
+
+  size_t node_len = my_strlen(node);
+  if (node_len == 0)
+    return false;
+
+  size_t procfs_path_len = my_strlen(procfs_path_);
+  size_t total_length = procfs_path_len + 1 + node_len;
+  if (total_length >= NAME_MAX)
+    return false;
+
+  memcpy(path, procfs_path_, procfs_path_len);
+  pathprocfs_path_len = '/';
+  memcpy(path + procfs_path_len + 1, node, node_len);
+  pathtotal_length = '\0';
+  return true;
+}
+
+void LinuxCoreDumper::CopyFromProcess(void* dest, pid_t child,
+                                      const void* src, size_t length) {
+  ElfCoreDump::Addr virtual_address = reinterpret_cast<ElfCoreDump::Addr>(src);
+  // TODO(benchan): Investigate whether the data to be copied could span
+  // across multiple segments in the core dump file. ElfCoreDump::CopyData
+  // and this method do not handle that case yet.
+  if (!core_.CopyData(dest, virtual_address, length)) {
+    // If the data segment is not found in the core dump, fill the result
+    // with marker characters.
+    memset(dest, 0xab, length);
+  }
+}
+
+bool LinuxCoreDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
+  if (index >= thread_infos_.size())
+    return false;
+
+  *info = thread_infos_index;
+  const uint8_t* stack_pointer;
+#if defined(__i386)
+  memcpy(&stack_pointer, &info->regs.esp, sizeof(info->regs.esp));
+#elif defined(__x86_64)
+  memcpy(&stack_pointer, &info->regs.rsp, sizeof(info->regs.rsp));
+#elif defined(__ARM_EABI__)
+  memcpy(&stack_pointer, &info->regs.ARM_sp, sizeof(info->regs.ARM_sp));
+#else
+#error "This code hasn't been ported to your platform yet."
+#endif
+
+  return GetStackInfo(&info->stack, &info->stack_len,
+                      reinterpret_cast<uintptr_t>(stack_pointer));
+}
+
+bool LinuxCoreDumper::IsPostMortem() const {
+  return true;
+}
+
+bool LinuxCoreDumper::ThreadsSuspend() {
+  return true;
+}
+
+bool LinuxCoreDumper::ThreadsResume() {
+  return true;
+}
+
+bool LinuxCoreDumper::EnumerateThreads() {
+  if (!mapped_core_file_.Map(core_path_)) {
+    fprintf(stderr, "Could not map core dump file into memory\n");
+    return false;
+  }
+
+  core_.SetContent(mapped_core_file_.content());
+  if (!core_.IsValid()) {
+    fprintf(stderr, "Invalid core dump file\n");
+    return false;
+  }
+
+  ElfCoreDump::Note note = core_.GetFirstNote();
+  if (!note.IsValid()) {
+    fprintf(stderr, "PT_NOTE section not found\n");
+    return false;
+  }
+
+  bool first_thread = true;
+  do {
+    ElfCoreDump::Word type = note.GetType();
+    MemoryRange name = note.GetName();
+    MemoryRange description = note.GetDescription();
+
+    if (type == 0 || name.IsEmpty() || description.IsEmpty()) {
+      fprintf(stderr, "Could not found a valid PT_NOTE.\n");
+      return false;
+    }
+
+    // Based on write_note_info() in linux/kernel/fs/binfmt_elf.c, notes are
+    // ordered as follows (NT_PRXFPREG and NT_386_TLS are i386 specific):
+    //   Thread           Name          Type
+    //   -------------------------------------------------------------------
+    //   1st thread       CORE          NT_PRSTATUS
+    //   process-wide     CORE          NT_PRPSINFO
+    //   process-wide     CORE          NT_AUXV
+    //   1st thread       CORE          NT_FPREGSET
+    //   1st thread       LINUX         NT_PRXFPREG
+    //   1st thread       LINUX         NT_386_TLS
+    //
+    //   2nd thread       CORE          NT_PRSTATUS
+    //   2nd thread       CORE          NT_FPREGSET
+    //   2nd thread       LINUX         NT_PRXFPREG
+    //   2nd thread       LINUX         NT_386_TLS
+    //
+    //   3rd thread       CORE          NT_PRSTATUS
+    //   3rd thread       CORE          NT_FPREGSET
+    //   3rd thread       LINUX         NT_PRXFPREG
+    //   3rd thread       LINUX         NT_386_TLS
+    //
+    // The following code only works if notes are ordered as expected.
+    switch (type) {
+      case NT_PRSTATUS: {
+        if (description.length() != sizeof(elf_prstatus)) {
+          fprintf(stderr, "Found NT_PRSTATUS descriptor of unexpected size\n");
+          return false;
+        }
+
+        const elf_prstatus* status =
+            reinterpret_cast<const elf_prstatus*>(description.data());
+        pid_t pid = status->pr_pid;
+        ThreadInfo info;
+        memset(&info, 0, sizeof(ThreadInfo));
+        info.tgid = status->pr_pgrp;
+        info.ppid = status->pr_ppid;
+        memcpy(&info.regs, status->pr_reg, sizeof(info.regs));
+        if (first_thread) {
+          crash_thread_ = pid;
+          crash_signal_ = status->pr_info.si_signo;
+        }
+        first_thread = false;
+        threads_.push_back(pid);
+        thread_infos_.push_back(info);
+        break;
+      }
+#if defined(__i386) || defined(__x86_64)
+      case NT_FPREGSET: {
+        if (thread_infos_.empty())
+          return false;
+
+        ThreadInfo* info = &thread_infos_.back();
+        if (description.length() != sizeof(info->fpregs)) {
+          fprintf(stderr, "Found NT_FPREGSET descriptor of unexpected size\n");
+          return false;
+        }
+
+        memcpy(&info->fpregs, description.data(), sizeof(info->fpregs));
+        break;
+      }
+#endif
+#if defined(__i386)
+      case NT_PRXFPREG: {
+        if (thread_infos_.empty())
+          return false;
+
+        ThreadInfo* info = &thread_infos_.back();
+        if (description.length() != sizeof(info->fpxregs)) {
+          fprintf(stderr, "Found NT_PRXFPREG descriptor of unexpected size\n");
+          return false;
+        }
+
+        memcpy(&info->fpxregs, description.data(), sizeof(info->fpxregs));
+        break;
+      }
+#endif
+    }
+    note = note.GetNextNote();
+  } while (note.IsValid());
+
+  return true;
+}
+
+}  // namespace google_breakpad

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_core_dumper.h Added

@@ -0,0 +1,122 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// linux_core_dumper.h: Define the google_breakpad::LinuxCoreDumper
+// class, which is derived from google_breakpad::LinuxDumper to extract
+// information from a crashed process via its core dump and proc files.
+
+#ifndef CLIENT_LINUX_MINIDUMP_WRITER_LINUX_CORE_DUMPER_H_
+#define CLIENT_LINUX_MINIDUMP_WRITER_LINUX_CORE_DUMPER_H_
+
+#include "client/linux/minidump_writer/linux_dumper.h"
+#include "common/linux/elf_core_dump.h"
+#include "common/linux/memory_mapped_file.h"
+
+namespace google_breakpad {
+
+class LinuxCoreDumper : public LinuxDumper {
+ public:
+  // Constructs a dumper for extracting information of a given process
+  // with a process ID of |pid| via its core dump file at |core_path| and
+  // its proc files at |procfs_path|. If |procfs_path| is a copy of
+  // /proc/<pid>, it should contain the following files:
+  //     auxv, cmdline, environ, exe, maps, status
+  LinuxCoreDumper(pid_t pid, const char* core_path, const char* procfs_path);
+
+  // Implements LinuxDumper::BuildProcPath().
+  // Builds a proc path for a certain pid for a node (/proc/<pid>/<node>).
+  // |path| is a character array of at least NAME_MAX bytes to return the
+  // result.|node| is the final node without any slashes. Return true on
+  // success.
+  //
+  // As this dumper performs a post-mortem dump and makes use of a copy
+  // of the proc files of the crashed process, this derived method does
+  // not actually make use of |pid| and always returns a subpath of
+  // |procfs_path_| regardless of whether |pid| corresponds to the main
+  // process or a thread of the process, i.e. assuming both the main process
+  // and its threads have the following proc files with the same content:
+  //     auxv, cmdline, environ, exe, maps, status
+  virtual bool BuildProcPath(char* path, pid_t pid, const char* node) const;
+
+  // Implements LinuxDumper::CopyFromProcess().
+  // Copies content of |length| bytes from a given process |child|,
+  // starting from |src|, into |dest|. This method extracts the content
+  // the core dump and fills |dest| with a sequence of marker bytes
+  // if the expected data is not found in the core dump.
+  virtual void CopyFromProcess(void* dest, pid_t child, const void* src,
+                               size_t length);
+
+  // Implements LinuxDumper::GetThreadInfoByIndex().
+  // Reads information about the |index|-th thread of |threads_|.
+  // Returns true on success. One must have called |ThreadsSuspend| first.
+  virtual bool GetThreadInfoByIndex(size_t index, ThreadInfo* info);
+
+  // Implements LinuxDumper::IsPostMortem().
+  // Always returns true to indicate that this dumper performs a
+  // post-mortem dump of a crashed process via a core dump file.
+  virtual bool IsPostMortem() const;
+
+  // Implements LinuxDumper::ThreadsSuspend().
+  // As the dumper performs a post-mortem dump via a core dump file,
+  // there is no threads to suspend. This method does nothing and
+  // always returns true.
+  virtual bool ThreadsSuspend();
+
+  // Implements LinuxDumper::ThreadsResume().
+  // As the dumper performs a post-mortem dump via a core dump file,
+  // there is no threads to resume. This method does nothing and
+  // always returns true.
+  virtual bool ThreadsResume();
+
+ protected:
+  // Implements LinuxDumper::EnumerateThreads().
+  // Enumerates all threads of the given process into |threads_|.
+  virtual bool EnumerateThreads();
+
+ private:
+  // Path of the core dump file.
+  const char* core_path_;
+
+  // Path of the directory containing the proc files of the given process,
+  // which is usually a copy of /proc/<pid>.
+  const char* procfs_path_;
+
+  // Memory-mapped core dump file at |core_path_|.
+  MemoryMappedFile mapped_core_file_;
+
+  // Content of the core dump file.
+  ElfCoreDump core_;
+
+  // Thread info found in the core dump file.
+  wasteful_vector<ThreadInfo> thread_infos_;
+};
+
+}  // namespace google_breakpad
+
+#endif  // CLIENT_LINUX_HANDLER_LINUX_CORE_DUMPER_H_

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_core_dumper_unittest.cc Added

@@ -0,0 +1,109 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// linux_core_dumper_unittest.cc:
+// Unit tests for google_breakpad::LinuxCoreDumoer.
+
+#include "breakpad_googletest_includes.h"
+#include "client/linux/minidump_writer/linux_core_dumper.h"
+#include "common/linux/tests/crash_generator.h"
+
+using std::string;
+using namespace google_breakpad;
+
+TEST(LinuxCoreDumperTest, BuildProcPath) {
+  const pid_t pid = getpid();
+  const char procfs_path = "/procfs_copy";
+  LinuxCoreDumper dumper(getpid(), "core_file", procfs_path);
+
+  char maps_pathNAME_MAX = "";
+  char maps_path_expectedNAME_MAX;
+  snprintf(maps_path_expected, sizeof(maps_path_expected),
+           "%s/maps", procfs_path);
+  EXPECT_TRUE(dumper.BuildProcPath(maps_path, pid, "maps"));
+  EXPECT_STREQ(maps_path_expected, maps_path);
+
+  EXPECT_FALSE(dumper.BuildProcPath(NULL, pid, "maps"));
+  EXPECT_FALSE(dumper.BuildProcPath(maps_path, pid, ""));
+  EXPECT_FALSE(dumper.BuildProcPath(maps_path, pid, NULL));
+
+  char long_nodeNAME_MAX;
+  size_t long_node_len = NAME_MAX - strlen(procfs_path) - 1;
+  memset(long_node, 'a', long_node_len);
+  long_nodelong_node_len = '\0';
+  EXPECT_FALSE(dumper.BuildProcPath(maps_path, pid, long_node));
+}
+
+TEST(LinuxCoreDumperTest, VerifyDumpWithMultipleThreads) {
+  CrashGenerator crash_generator;
+  if (!crash_generator.HasDefaultCorePattern()) {
+    fprintf(stderr, "LinuxCoreDumperTest.VerifyDumpWithMultipleThreads test "
+            "is skipped due to non-default core pattern\n");
+    return;
+  }
+
+  const unsigned kNumOfThreads = 3;
+  const unsigned kCrashThread = 1;
+  const int kCrashSignal = SIGABRT;
+  pid_t child_pid;
+  // TODO(benchan): Revert to use ASSERT_TRUE once the flakiness in
+  // CrashGenerator is identified and fixed.
+  if (!crash_generator.CreateChildCrash(kNumOfThreads, kCrashThread,
+                                        kCrashSignal, &child_pid)) {
+    fprintf(stderr, "LinuxCoreDumperTest.VerifyDumpWithMultipleThreads test "
+            "is skipped due to no core dump generated\n");
+    return;
+  }
+
+  pid_t pid = getpid();
+  const string core_file = crash_generator.GetCoreFilePath();
+  const string procfs_path = crash_generator.GetDirectoryOfProcFilesCopy();
+  LinuxCoreDumper dumper(child_pid, core_file.c_str(), procfs_path.c_str());
+  dumper.Init();
+
+  EXPECT_TRUE(dumper.IsPostMortem());
+
+  // These are no-ops and should always return true.
+  EXPECT_TRUE(dumper.ThreadsSuspend());
+  EXPECT_TRUE(dumper.ThreadsResume());
+
+  // LinuxCoreDumper cannot determine the crash address and thus it always
+  // sets the crash address to 0.
+  EXPECT_EQ(0, dumper.crash_address());
+  EXPECT_EQ(kCrashSignal, dumper.crash_signal());
+  EXPECT_EQ(crash_generator.GetThreadId(kCrashThread),
+            dumper.crash_thread());
+
+  EXPECT_EQ(kNumOfThreads, dumper.threads().size());
+  for (unsigned i = 0; i < kNumOfThreads; ++i) {
+    ThreadInfo info;
+    EXPECT_TRUE(dumper.GetThreadInfoByIndex(i, &info));
+    EXPECT_EQ(getpid(), info.ppid);
+  }
+}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper.cc Changed

@@ -27,6 +27,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// linux_dumper.cc: Implement google_breakpad::LinuxDumper.
+// See linux_dumper.h for details.
+
 // This code deals with the mechanics of getting information about a crashed
 // process. Since this code may run in a compromised address space, the same
 // rules apply as detailed at the top of minidump_writer.h: no libc calls and
@@ -34,75 +37,22 @@
 
 #include "client/linux/minidump_writer/linux_dumper.h"
 
-#include <asm/ptrace.h>
 #include <assert.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
-#if !defined(__ANDROID__)
-#include <link.h>
-#endif
 #include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <sys/ptrace.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include <algorithm>
 
-#include "client/linux/minidump_writer/directory_reader.h"
 #include "client/linux/minidump_writer/line_reader.h"
 #include "common/linux/file_id.h"
 #include "common/linux/linux_libc_support.h"
+#include "common/linux/memory_mapped_file.h"
+#include "common/linux/safe_readlink.h"
 #include "third_party/lss/linux_syscall_support.h"
 
 static const char kMappedFileUnsafePrefix = "/dev/";
 static const char kDeletedSuffix = " (deleted)";
 
-// Suspend a thread by attaching to it.
-static bool SuspendThread(pid_t pid) {
-  // This may fail if the thread has just died or debugged.
-  errno = 0;
-  if (sys_ptrace(PTRACE_ATTACH, pid, NULL, NULL) != 0 &&
-      errno != 0) {
-    return false;
-  }
-  while (sys_waitpid(pid, NULL, __WALL) < 0) {
-    if (errno != EINTR) {
-      sys_ptrace(PTRACE_DETACH, pid, NULL, NULL);
-      return false;
-    }
-  }
-#if defined(__i386) || defined(__x86_64)
-  // On x86, the stack pointer is NULL or -1, when executing trusted code in
-  // the seccomp sandbox. Not only does this cause difficulties down the line
-  // when trying to dump the thread's stack, it also results in the minidumps
-  // containing information about the trusted threads. This information is
-  // generally completely meaningless and just pollutes the minidumps.
-  // We thus test the stack pointer and exclude any threads that are part of
-  // the seccomp sandbox's trusted code.
-  user_regs_struct regs;
-  if (sys_ptrace(PTRACE_GETREGS, pid, NULL, &regs) == -1 ||
-#if defined(__i386)
-      !regs.esp
-#elif defined(__x86_64)
-      !regs.rsp
-#endif
-      ) {
-    sys_ptrace(PTRACE_DETACH, pid, NULL, NULL);
-    return false;
-  }
-#endif
-  return true;
-}
-
-// Resume a thread by detaching from it.
-static bool ResumeThread(pid_t pid) {
-  return sys_ptrace(PTRACE_DETACH, pid, NULL, NULL) >= 0;
-}
-
 inline static bool IsMappedFileOpenUnsafe(
     const google_breakpad::MappingInfo& mapping) {
   // It is unsafe to attempt to open a mapped file that lives under /dev,
@@ -116,90 +66,20 @@
 
 namespace google_breakpad {
 
-LinuxDumper::LinuxDumper(int pid)
+LinuxDumper::LinuxDumper(pid_t pid)
     : pid_(pid),
-      threads_suspended_(false),
+      crash_address_(0),
+      crash_signal_(0),
+      crash_thread_(0),
       threads_(&allocator_, 8),
       mappings_(&allocator_) {
 }
 
-bool LinuxDumper::Init() {
-  return EnumerateThreads(&threads_) &&
-         EnumerateMappings(&mappings_);
+LinuxDumper::~LinuxDumper() {
 }
 
-bool LinuxDumper::ThreadsSuspend() {
-  if (threads_suspended_)
-    return true;
-  for (size_t i = 0; i < threads_.size(); ++i) {
-    if (!SuspendThread(threads_i)) {
-      // If the thread either disappeared before we could attach to it, or if
-      // it was part of the seccomp sandbox's trusted code, it is OK to
-      // silently drop it from the minidump.
-      memmove(&threads_i, &threads_i+1,
-              (threads_.size() - i - 1) * sizeof(threads_i));
-      threads_.resize(threads_.size() - 1);
-      --i;
-    }
-  }
-  threads_suspended_ = true;
-  return threads_.size() > 0;
-}
-
-bool LinuxDumper::ThreadsResume() {
-  if (!threads_suspended_)
-    return false;
-  bool good = true;
-  for (size_t i = 0; i < threads_.size(); ++i)
-    good &= ResumeThread(threads_i);
-  threads_suspended_ = false;
-  return good;
-}
-
-void
-LinuxDumper::BuildProcPath(char* path, pid_t pid, const char* node) const {
-  assert(path);
-  if (!path) {
-    return;
-  }
-
-  path0 = '\0';
-
-  const unsigned pid_len = my_int_len(pid);
-
-  assert(node);
-  if (!node) {
-    return;
-  }
-
-  size_t node_len = my_strlen(node);
-  assert(node_len < NAME_MAX);
-  if (node_len >= NAME_MAX) {
-    return;
-  }
-
-  assert(node_len > 0);
-  if (node_len == 0) {
-    return;
-  }
-
-  assert(pid > 0);
-  if (pid <= 0) {
-    return;
-  }
-
-  const size_t total_length = 6 + pid_len + 1 + node_len;
-
-  assert(total_length < NAME_MAX);
-  if (total_length >= NAME_MAX) {
-    return;
-  }
-
-  memcpy(path, "/proc/", 6);
-  my_itos(path + 6, pid, pid_len);
-  memcpy(path + 6 + pid_len, "/", 1);
-  memcpy(path + 6 + pid_len + 1, node, node_len);
-  pathtotal_length = '\0';
+bool LinuxDumper::Init() {
+  return EnumerateThreads() && EnumerateMappings();
 }
 
 bool
@@ -237,24 +117,12 @@
   filenamefilename_len = '\0';
   bool filename_modified = HandleDeletedFileInMapping(filename);
 
-  int fd = sys_open(filename, O_RDONLY, 0);
-  if (fd < 0)
-    return false;
-  struct kernel_stat st;
-  if (sys_fstat(fd, &st) != 0) {
-    sys_close(fd);
-    return false;
-  }
-#if defined(__x86_64)
-#define sys_mmap2 sys_mmap
-#endif
-  void* base = sys_mmap2(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-  sys_close(fd);
-  if (base == MAP_FAILED)
+  MemoryMappedFile mapped_file(filename);
+  if (!mapped_file.data())  // Should probably check if size >= ElfW(Ehdr)?
     return false;
 
-  bool success = FileID::ElfFileIdentifierFromMappedFile(base, identifier);
-  sys_munmap(base, st.st_size);
+  bool success =
+      FileID::ElfFileIdentifierFromMappedFile(mapped_file.data(), identifier);
   if (success && member && filename_modified) {
     mappings_mapping_id->namefilename_len -
                                 sizeof(kDeletedSuffix) + 1 = '\0';
@@ -264,12 +132,10 @@
 }
 
 void*
-LinuxDumper::FindBeginningOfLinuxGateSharedLibrary(const pid_t pid) const {
+LinuxDumper::FindBeginningOfLinuxGateSharedLibrary(pid_t pid) const {
   char auxv_pathNAME_MAX;
-  BuildProcPath(auxv_path, pid, "auxv");
-
-  // If BuildProcPath errors out due to invalid input, we'll handle it when
-  // we try to sys_open the file.
+  if (!BuildProcPath(auxv_path, pid, "auxv"))
+    return NULL;
 
   // Find the AT_SYSINFO_EHDR entry for linux-gate.so
   // See http://www.trilithium.com/johan/2005/08/linux-gate/ for more
@@ -293,10 +159,36 @@
   return NULL;
 }
 
-bool
-LinuxDumper::EnumerateMappings(wasteful_vector<MappingInfo*>* result) const {
+void*
+LinuxDumper::FindEntryPoint(pid_t pid) const {
+  char auxv_pathNAME_MAX;
+  if (!BuildProcPath(auxv_path, pid, "auxv"))
+    return NULL;
+
+  int fd = sys_open(auxv_path, O_RDONLY, 0);
+  if (fd < 0) {
+    return NULL;
+  }
+
+  // Find the AT_ENTRY entry
+  elf_aux_entry one_aux_entry;
+  while (sys_read(fd,
+                  &one_aux_entry,
+                  sizeof(elf_aux_entry)) == sizeof(elf_aux_entry) &&
+         one_aux_entry.a_type != AT_NULL) {
+    if (one_aux_entry.a_type == AT_ENTRY) {
+      close(fd);
+      return reinterpret_cast<void*>(one_aux_entry.a_un.a_val);
+    }
+  }
+  close(fd);
+  return NULL;
+}
+
+bool LinuxDumper::EnumerateMappings() {
   char maps_pathNAME_MAX;
-  BuildProcPath(maps_path, pid_, "maps");
+  if (!BuildProcPath(maps_path, pid_, "maps"))
+    return false;
 
   // linux_gate_loc is the beginning of the kernel's mapping of
   // linux-gate.so in the process.  It doesn't actually show up in the
@@ -305,6 +197,10 @@
   // of mappings.
   const void* linux_gate_loc;
   linux_gate_loc = FindBeginningOfLinuxGateSharedLibrary(pid_);
+  // Although the initial executable is usually the first mapping, it's not
+  // guaranteed (see http://crosbug.com/25355); therefore, try to use the
+  // actual entry point to find the mapping.
+  const void* entry_point_loc = FindEntryPoint(pid_);
 
   const int fd = sys_open(maps_path, O_RDONLY, 0);
   if (fd < 0)
@@ -333,8 +229,8 @@
           }
           // Merge adjacent mappings with the same name into one module,
           // assuming they're a single library mapped by the dynamic linker
-          if (name && result->size()) {
-            MappingInfo* module = (*result)result->size() - 1;
+          if (name && !mappings_.empty()) {
+            MappingInfo* module = mappings_.back();
             if ((start_addr == module->start_addr + module->size) &&
                 (my_strlen(name) == my_strlen(module->name)) &&
                 (my_strncmp(name, module->name, my_strlen(name)) == 0)) {
@@ -353,7 +249,25 @@
             if (l < sizeof(module->name))
               memcpy(module->name, name, l);
           }
-          result->push_back(module);
+          // If this is the entry-point mapping, and it's not already the
+          // first one, then we need to make it be first.  This is because
+          // the minidump format assumes the first module is the one that
+          // corresponds to the main executable (as codified in
+          // processor/minidump.cc:MinidumpModuleList::GetMainModule()).
+          if (entry_point_loc &&
+              (entry_point_loc >=
+                  reinterpret_cast<void*>(module->start_addr)) &&
+              (entry_point_loc <
+                  reinterpret_cast<void*>(module->start_addr+module->size)) &&
+              !mappings_.empty()) {
+            // push the module onto the front of the list.
+            mappings_.resize(mappings_.size() + 1);
+            for (size_t idx = mappings_.size() - 1; idx > 0; idx--)
+              mappings_idx = mappings_idx - 1;
+            mappings_0 = module;
+          } else {
+            mappings_.push_back(module);
+          }
         }
       }
     }
@@ -362,114 +276,7 @@
 
   sys_close(fd);
 
-  return result->size() > 0;
-}
-
-// Parse /proc/$pid/task to list all the threads of the process identified by
-// pid.
-bool LinuxDumper::EnumerateThreads(wasteful_vector<pid_t>* result) const {
-  char task_pathNAME_MAX;
-  BuildProcPath(task_path, pid_, "task");
-
-  const int fd = sys_open(task_path, O_RDONLY | O_DIRECTORY, 0);
-  if (fd < 0)
-    return false;
-  DirectoryReader* dir_reader = new(allocator_) DirectoryReader(fd);
-
-  // The directory may contain duplicate entries which we filter by assuming
-  // that they are consecutive.
-  int last_tid = -1;
-  const char* dent_name;
-  while (dir_reader->GetNextEntry(&dent_name)) {
-    if (my_strcmp(dent_name, ".") &&
-        my_strcmp(dent_name, "..")) {
-      int tid = 0;
-      if (my_strtoui(&tid, dent_name) &&
-          last_tid != tid) {
-        last_tid = tid;
-        result->push_back(tid);
-      }
-    }
-    dir_reader->PopEntry();
-  }
-
-  sys_close(fd);
-  return true;
-}
-
-// Read thread info from /proc/$pid/status.
-// Fill out the |tgid|, |ppid| and |pid| members of |info|. If unavailable,
-// these members are set to -1. Returns true iff all three members are
-// available.
-bool LinuxDumper::ThreadInfoGet(pid_t tid, ThreadInfo* info) {
-  assert(info != NULL);
-  char status_pathNAME_MAX;
-  BuildProcPath(status_path, tid, "status");
-
-  const int fd = open(status_path, O_RDONLY);
-  if (fd < 0)
-    return false;
-
-  LineReader* const line_reader = new(allocator_) LineReader(fd);
-  const char* line;
-  unsigned line_len;
-
-  info->ppid = info->tgid = -1;
-
-  while (line_reader->GetNextLine(&line, &line_len)) {
-    if (my_strncmp("Tgid:\t", line, 6) == 0) {
-      my_strtoui(&info->tgid, line + 6);
-    } else if (my_strncmp("PPid:\t", line, 6) == 0) {
-      my_strtoui(&info->ppid, line + 6);
-    }
-
-    line_reader->PopLine(line_len);
-  }
-
-  if (info->ppid == -1 || info->tgid == -1)
-    return false;
-
-  if (sys_ptrace(PTRACE_GETREGS, tid, NULL, &info->regs) == -1) {
-    return false;
-  }
-
-#if !defined(__ANDROID__)
-  if (sys_ptrace(PTRACE_GETFPREGS, tid, NULL, &info->fpregs) == -1) {
-    return false;
-  }
-#endif
-
-#if defined(__i386)
-  if (sys_ptrace(PTRACE_GETFPXREGS, tid, NULL, &info->fpxregs) == -1)
-    return false;
-#endif
-
-#if defined(__i386) || defined(__x86_64)
-  for (unsigned i = 0; i < ThreadInfo::kNumDebugRegisters; ++i) {
-    if (sys_ptrace(
-        PTRACE_PEEKUSER, tid,
-        reinterpret_cast<void*> (offsetof(struct user,
-                                          u_debugreg0) + i *
-                                 sizeof(debugreg_t)),
-        &info->dregsi) == -1) {
-      return false;
-    }
-  }
-#endif
-
-  const uint8_t* stack_pointer;
-#if defined(__i386)
-  memcpy(&stack_pointer, &info->regs.esp, sizeof(info->regs.esp));
-#elif defined(__x86_64)
-  memcpy(&stack_pointer, &info->regs.rsp, sizeof(info->regs.rsp));
-#elif defined(__ARM_EABI__)
-  memcpy(&stack_pointer, &info->regs.ARM_sp, sizeof(info->regs.ARM_sp));
-#else
-#error "This code hasn't been ported to your platform yet."
-#endif
-
-  return GetStackInfo(&info->stack, &info->stack_len,
-                      (uintptr_t) stack_pointer);
+  return !mappings_.empty();
 }
 
 // Get information about the stack, given the stack pointer. We don't try to
@@ -498,25 +305,6 @@
   return true;
 }
 
-// static
-void LinuxDumper::CopyFromProcess(void* dest, pid_t child, const void* src,
-                                  size_t length) {
-  unsigned long tmp = 55;
-  size_t done = 0;
-  static const size_t word_size = sizeof(tmp);
-  uint8_t* const local = (uint8_t*) dest;
-  uint8_t* const remote = (uint8_t*) src;
-
-  while (done < length) {
-    const size_t l = length - done > word_size ? word_size : length - done;
-    if (sys_ptrace(PTRACE_PEEKDATA, child, remote + done, &tmp) == -1) {
-      tmp = 0;
-    }
-    memcpy(local + done, &tmp, l);
-    done += l;
-  }
-}
-
 // Find the mapping which the given memory address falls in.
 const MappingInfo* LinuxDumper::FindMapping(const void* address) const {
   const uintptr_t addr = (uintptr_t) address;
@@ -546,11 +334,10 @@
   // Check |path| against the /proc/pid/exe 'symlink'.
   char exe_linkNAME_MAX;
   char new_pathNAME_MAX;
-  BuildProcPath(exe_link, pid_, "exe");
-  ssize_t new_path_len = sys_readlink(exe_link, new_path, NAME_MAX);
-  if (new_path_len <= 0 || new_path_len == NAME_MAX)
+  if (!BuildProcPath(exe_link, pid_, "exe"))
+    return false;
+  if (!SafeReadLink(exe_link, new_path))
     return false;
-  new_pathnew_path_len = '\0';
   if (my_strcmp(path, new_path) != 0)
     return false;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper.h Changed

@@ -27,6 +27,14 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// linux_dumper.h: Define the google_breakpad::LinuxDumper class, which
+// is a base class for extracting information of a crashed process. It
+// was originally a complete implementation using the ptrace API, but
+// has been refactored to allow derived implementations supporting both
+// ptrace and core dump. A portion of the original implementation is now
+// in google_breakpad::LinuxPtraceDumper (see linux_ptrace_dumper.h for
+// details).
+
 #ifndef CLIENT_LINUX_MINIDUMP_WRITER_LINUX_DUMPER_H_
 #define CLIENT_LINUX_MINIDUMP_WRITER_LINUX_DUMPER_H_
 
@@ -66,7 +74,7 @@
 #define AT_SYSINFO_EHDR 33
 #endif
 #endif  // __ANDROID__
-#elif defined(__x86_64__)
+#elif defined(__x86_64)
 typedef Elf64_auxv_t elf_aux_entry;
 #endif
 // When we find the VDSO mapping in the process's address space, this
@@ -118,16 +126,21 @@
  public:
   explicit LinuxDumper(pid_t pid);
 
+  virtual ~LinuxDumper();
+
   // Parse the data for |threads| and |mappings|.
-  bool Init();
+  virtual bool Init();
+
+  // Return true if the dumper performs a post-mortem dump.
+  virtual bool IsPostMortem() const = 0;
 
   // Suspend/resume all threads in the given process.
-  bool ThreadsSuspend();
-  bool ThreadsResume();
+  virtual bool ThreadsSuspend() = 0;
+  virtual bool ThreadsResume() = 0;
 
-  // Read information about the given thread. Returns true on success. One must
-  // have called |ThreadsSuspend| first.
-  bool ThreadInfoGet(pid_t tid, ThreadInfo* info);
+  // Read information about the |index|-th thread of |threads_|.
+  // Returns true on success. One must have called |ThreadsSuspend| first.
+  virtual bool GetThreadInfoByIndex(size_t index, ThreadInfo* info) = 0;
 
   // These are only valid after a call to |Init|.
   const wasteful_vector<pid_t> &threads() { return threads_; }
@@ -142,14 +155,16 @@
 
   PageAllocator* allocator() { return &allocator_; }
 
-  // memcpy from a remote process.
-  static void CopyFromProcess(void* dest, pid_t child, const void* src,
-                              size_t length);
+  // Copy content of |length| bytes from a given process |child|,
+  // starting from |src|, into |dest|.
+  virtual void CopyFromProcess(void* dest, pid_t child, const void* src,
+                               size_t length) = 0;
 
-  // Builds a proc path for a certain pid for a node.  path is a
-  // character array that is overwritten, and node is the final node
-  // without any slashes.
-  void BuildProcPath(char* path, pid_t pid, const char* node) const;
+  // Builds a proc path for a certain pid for a node (/proc/<pid>/<node>).
+  // |path| is a character array of at least NAME_MAX bytes to return the
+  // result.|node| is the final node without any slashes. Returns true on
+  // success.
+  virtual bool BuildProcPath(char* path, pid_t pid, const char* node) const = 0;
 
   // Generate a File ID from the .text section of a mapped entry.
   // If not a member, mapping_id is ignored.
@@ -163,10 +178,25 @@
   // vdso, but we can't guarantee that it's the only virtual dynamic
   // shared object.  Parsing the auxilary vector for AT_SYSINFO_EHDR
   // is the safest way to go.)
-  void* FindBeginningOfLinuxGateSharedLibrary(const pid_t pid) const;
- private:
-  bool EnumerateMappings(wasteful_vector<MappingInfo*>* result) const;
-  bool EnumerateThreads(wasteful_vector<pid_t>* result) const;
+  void* FindBeginningOfLinuxGateSharedLibrary(pid_t pid) const;
+  // Utility method to find the entry point location.
+  void* FindEntryPoint(pid_t pid) const;
+
+  uintptr_t crash_address() const { return crash_address_; }
+  void set_crash_address(uintptr_t crash_address) {
+    crash_address_ = crash_address;
+  }
+
+  int crash_signal() const { return crash_signal_; }
+  void set_crash_signal(int crash_signal) { crash_signal_ = crash_signal; }
+
+  pid_t crash_thread() const { return crash_thread_; }
+  void set_crash_thread(pid_t crash_thread) { crash_thread_ = crash_thread; }
+
+ protected:
+  virtual bool EnumerateMappings();
+
+  virtual bool EnumerateThreads() = 0;
 
   // For the case where a running program has been deleted, it'll show up in
   // /proc/pid/maps as "/path/to/program (deleted)". If this is the case, then
@@ -179,13 +209,25 @@
   // Returns true if |path| is modified.
   bool HandleDeletedFileInMapping(char* path) const;
 
+   // ID of the crashed process.
   const pid_t pid_;
 
+  // Virtual address at which the process crashed.
+  uintptr_t crash_address_;
+
+  // Signal that terminated the crashed process.
+  int crash_signal_;
+
+  // ID of the crashed thread.
+  pid_t crash_thread_;
+
   mutable PageAllocator allocator_;
 
-  bool threads_suspended_;
-  wasteful_vector<pid_t> threads_;  // the ids of all the threads
-  wasteful_vector<MappingInfo*> mappings_;  // info from /proc/<pid>/maps
+  // IDs of all the threads.
+  wasteful_vector<pid_t> threads_;
+
+  // Info from /proc/<pid>/maps.
+  wasteful_vector<MappingInfo*> mappings_;
 };
 
 }  // namespace google_breakpad

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper_unittest_helper.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_dumper_unittest_helper.cc Changed

@@ -51,7 +51,14 @@
 #endif
 
 void *thread_function(void *data) {
+  int pipefd = *static_cast<int *>(data);
   volatile pid_t thread_id = syscall(__NR_gettid);
+  // Signal parent that a thread has started.
+  uint8_t byte = 1;
+  if (write(pipefd, &byte, sizeof(byte)) != sizeof(byte)) {
+    perror("ERROR: parent notification failed");
+    return NULL;
+  }
   register volatile pid_t *thread_id_ptr asm(TID_PTR_REGISTER) = &thread_id;
   while (true)
     asm volatile ("" : : "r" (thread_id_ptr));
@@ -59,9 +66,9 @@
 }
 
 int main(int argc, char *argv) {
-  if (argc < 2) {
+  if (argc < 3) {
     fprintf(stderr,
-            "usage: linux_dumper_unittest_helper <pipe fd> <# of threads\n");
+            "usage: linux_dumper_unittest_helper <pipe fd> <# of threads>\n");
     return 1;
   }
   int pipefd = atoi(argv1);
@@ -75,11 +82,8 @@
   pthread_attr_init(&thread_attributes);
   pthread_attr_setdetachstate(&thread_attributes, PTHREAD_CREATE_DETACHED);
   for (int i = 1; i < num_threads; i++) {
-    pthread_create(&threadsi, &thread_attributes, &thread_function, NULL);
+    pthread_create(&threadsi, &thread_attributes, &thread_function, &pipefd);
   }
-  // Signal parent that this process has started all threads.
-  uint8_t byte = 1;
-  write(pipefd, &byte, sizeof(byte));
-  thread_function(NULL);
+  thread_function(&pipefd);
   return 0;
 }

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_ptrace_dumper.cc Added

@@ -0,0 +1,293 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// linux_ptrace_dumper.cc: Implement google_breakpad::LinuxPtraceDumper.
+// See linux_ptrace_dumper.h for detals.
+// This class was originally splitted from google_breakpad::LinuxDumper.
+
+// This code deals with the mechanics of getting information about a crashed
+// process. Since this code may run in a compromised address space, the same
+// rules apply as detailed at the top of minidump_writer.h: no libc calls and
+// use the alternative allocator.
+
+#include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+
+#include <asm/ptrace.h>
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ptrace.h>
+#include <sys/wait.h>
+
+#include "client/linux/minidump_writer/directory_reader.h"
+#include "client/linux/minidump_writer/line_reader.h"
+#include "common/linux/linux_libc_support.h"
+#include "third_party/lss/linux_syscall_support.h"
+
+// Suspends a thread by attaching to it.
+static bool SuspendThread(pid_t pid) {
+  // This may fail if the thread has just died or debugged.
+  errno = 0;
+  if (sys_ptrace(PTRACE_ATTACH, pid, NULL, NULL) != 0 &&
+      errno != 0) {
+    return false;
+  }
+  while (sys_waitpid(pid, NULL, __WALL) < 0) {
+    if (errno != EINTR) {
+      sys_ptrace(PTRACE_DETACH, pid, NULL, NULL);
+      return false;
+    }
+  }
+#if defined(__i386) || defined(__x86_64)
+  // On x86, the stack pointer is NULL or -1, when executing trusted code in
+  // the seccomp sandbox. Not only does this cause difficulties down the line
+  // when trying to dump the thread's stack, it also results in the minidumps
+  // containing information about the trusted threads. This information is
+  // generally completely meaningless and just pollutes the minidumps.
+  // We thus test the stack pointer and exclude any threads that are part of
+  // the seccomp sandbox's trusted code.
+  user_regs_struct regs;
+  if (sys_ptrace(PTRACE_GETREGS, pid, NULL, &regs) == -1 ||
+#if defined(__i386)
+      !regs.esp
+#elif defined(__x86_64)
+      !regs.rsp
+#endif
+      ) {
+    sys_ptrace(PTRACE_DETACH, pid, NULL, NULL);
+    return false;
+  }
+#endif
+  return true;
+}
+
+// Resumes a thread by detaching from it.
+static bool ResumeThread(pid_t pid) {
+  return sys_ptrace(PTRACE_DETACH, pid, NULL, NULL) >= 0;
+}
+
+namespace google_breakpad {
+
+LinuxPtraceDumper::LinuxPtraceDumper(pid_t pid)
+    : LinuxDumper(pid),
+      threads_suspended_(false) {
+}
+
+bool LinuxPtraceDumper::BuildProcPath(char* path, pid_t pid,
+                                      const char* node) const {
+  if (!path || !node || pid <= 0)
+    return false;
+
+  size_t node_len = my_strlen(node);
+  if (node_len == 0)
+    return false;
+
+  const unsigned pid_len = my_int_len(pid);
+  const size_t total_length = 6 + pid_len + 1 + node_len;
+  if (total_length >= NAME_MAX)
+    return false;
+
+  memcpy(path, "/proc/", 6);
+  my_itos(path + 6, pid, pid_len);
+  path6 + pid_len = '/';
+  memcpy(path + 6 + pid_len + 1, node, node_len);
+  pathtotal_length = '\0';
+  return true;
+}
+
+void LinuxPtraceDumper::CopyFromProcess(void* dest, pid_t child,
+                                        const void* src, size_t length) {
+  unsigned long tmp = 55;
+  size_t done = 0;
+  static const size_t word_size = sizeof(tmp);
+  uint8_t* const local = (uint8_t*) dest;
+  uint8_t* const remote = (uint8_t*) src;
+
+  while (done < length) {
+    const size_t l = (length - done > word_size) ? word_size : (length - done);
+    if (sys_ptrace(PTRACE_PEEKDATA, child, remote + done, &tmp) == -1) {
+      tmp = 0;
+    }
+    memcpy(local + done, &tmp, l);
+    done += l;
+  }
+}
+
+// Read thread info from /proc/$pid/status.
+// Fill out the |tgid|, |ppid| and |pid| members of |info|. If unavailable,
+// these members are set to -1. Returns true iff all three members are
+// available.
+bool LinuxPtraceDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) {
+  if (index >= threads_.size())
+    return false;
+
+  pid_t tid = threads_index;
+
+  assert(info != NULL);
+  char status_pathNAME_MAX;
+  if (!BuildProcPath(status_path, tid, "status"))
+    return false;
+
+  const int fd = sys_open(status_path, O_RDONLY, 0);
+  if (fd < 0)
+    return false;
+
+  LineReader* const line_reader = new(allocator_) LineReader(fd);
+  const char* line;
+  unsigned line_len;
+
+  info->ppid = info->tgid = -1;
+
+  while (line_reader->GetNextLine(&line, &line_len)) {
+    if (my_strncmp("Tgid:\t", line, 6) == 0) {
+      my_strtoui(&info->tgid, line + 6);
+    } else if (my_strncmp("PPid:\t", line, 6) == 0) {
+      my_strtoui(&info->ppid, line + 6);
+    }
+
+    line_reader->PopLine(line_len);
+  }
+  sys_close(fd);
+
+  if (info->ppid == -1 || info->tgid == -1)
+    return false;
+
+  if (sys_ptrace(PTRACE_GETREGS, tid, NULL, &info->regs) == -1) {
+    return false;
+  }
+
+#if !defined(__ANDROID__)
+  if (sys_ptrace(PTRACE_GETFPREGS, tid, NULL, &info->fpregs) == -1) {
+    return false;
+  }
+#endif
+
+#if defined(__i386)
+  if (sys_ptrace(PTRACE_GETFPXREGS, tid, NULL, &info->fpxregs) == -1)
+    return false;
+#endif
+
+#if defined(__i386) || defined(__x86_64)
+  for (unsigned i = 0; i < ThreadInfo::kNumDebugRegisters; ++i) {
+    if (sys_ptrace(
+        PTRACE_PEEKUSER, tid,
+        reinterpret_cast<void*> (offsetof(struct user,
+                                          u_debugreg0) + i *
+                                 sizeof(debugreg_t)),
+        &info->dregsi) == -1) {
+      return false;
+    }
+  }
+#endif
+
+  const uint8_t* stack_pointer;
+#if defined(__i386)
+  memcpy(&stack_pointer, &info->regs.esp, sizeof(info->regs.esp));
+#elif defined(__x86_64)
+  memcpy(&stack_pointer, &info->regs.rsp, sizeof(info->regs.rsp));
+#elif defined(__ARM_EABI__)
+  memcpy(&stack_pointer, &info->regs.ARM_sp, sizeof(info->regs.ARM_sp));
+#else
+#error "This code hasn't been ported to your platform yet."
+#endif
+
+  return GetStackInfo(&info->stack, &info->stack_len,
+                      (uintptr_t) stack_pointer);
+}
+
+bool LinuxPtraceDumper::IsPostMortem() const {
+  return false;
+}
+
+bool LinuxPtraceDumper::ThreadsSuspend() {
+  if (threads_suspended_)
+    return true;
+  for (size_t i = 0; i < threads_.size(); ++i) {
+    if (!SuspendThread(threads_i)) {
+      // If the thread either disappeared before we could attach to it, or if
+      // it was part of the seccomp sandbox's trusted code, it is OK to
+      // silently drop it from the minidump.
+      memmove(&threads_i, &threads_i+1,
+              (threads_.size() - i - 1) * sizeof(threads_i));
+      threads_.resize(threads_.size() - 1);
+      --i;
+    }
+  }
+  threads_suspended_ = true;
+  return threads_.size() > 0;
+}
+
+bool LinuxPtraceDumper::ThreadsResume() {
+  if (!threads_suspended_)
+    return false;
+  bool good = true;
+  for (size_t i = 0; i < threads_.size(); ++i)
+    good &= ResumeThread(threads_i);
+  threads_suspended_ = false;
+  return good;
+}
+
+// Parse /proc/$pid/task to list all the threads of the process identified by
+// pid.
+bool LinuxPtraceDumper::EnumerateThreads() {
+  char task_pathNAME_MAX;
+  if (!BuildProcPath(task_path, pid_, "task"))
+    return false;
+
+  const int fd = sys_open(task_path, O_RDONLY | O_DIRECTORY, 0);
+  if (fd < 0)
+    return false;
+  DirectoryReader* dir_reader = new(allocator_) DirectoryReader(fd);
+
+  // The directory may contain duplicate entries which we filter by assuming
+  // that they are consecutive.
+  int last_tid = -1;
+  const char* dent_name;
+  while (dir_reader->GetNextEntry(&dent_name)) {
+    if (my_strcmp(dent_name, ".") &&
+        my_strcmp(dent_name, "..")) {
+      int tid = 0;
+      if (my_strtoui(&tid, dent_name) &&
+          last_tid != tid) {
+        last_tid = tid;
+        threads_.push_back(tid);
+      }
+    }
+    dir_reader->PopEntry();
+  }
+
+  sys_close(fd);
+  return true;
+}
+
+}  // namespace google_breakpad

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_ptrace_dumper.h Added

@@ -0,0 +1,92 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// linux_ptrace_dumper.h: Define the google_breakpad::LinuxPtraceDumper
+// class, which is derived from google_breakpad::LinuxDumper to extract
+// information from a crashed process via ptrace.
+// This class was originally splitted from google_breakpad::LinuxDumper.
+
+#ifndef CLIENT_LINUX_MINIDUMP_WRITER_LINUX_PTRACE_DUMPER_H_
+#define CLIENT_LINUX_MINIDUMP_WRITER_LINUX_PTRACE_DUMPER_H_
+
+#include "client/linux/minidump_writer/linux_dumper.h"
+
+namespace google_breakpad {
+
+class LinuxPtraceDumper : public LinuxDumper {
+ public:
+  // Constructs a dumper for extracting information of a given process
+  // with a process ID of |pid|.
+  explicit LinuxPtraceDumper(pid_t pid);
+
+  // Implements LinuxDumper::BuildProcPath().
+  // Builds a proc path for a certain pid for a node (/proc/<pid>/<node>).
+  // |path| is a character array of at least NAME_MAX bytes to return the
+  // result. |node| is the final node without any slashes. Returns true on
+  // success.
+  virtual bool BuildProcPath(char* path, pid_t pid, const char* node) const;
+
+  // Implements LinuxDumper::CopyFromProcess().
+  // Copies content of |length| bytes from a given process |child|,
+  // starting from |src|, into |dest|. This method uses ptrace to extract
+  // the content from the target process.
+  virtual void CopyFromProcess(void* dest, pid_t child, const void* src,
+                               size_t length);
+
+  // Implements LinuxDumper::GetThreadInfoByIndex().
+  // Reads information about the |index|-th thread of |threads_|.
+  // Returns true on success. One must have called |ThreadsSuspend| first.
+  virtual bool GetThreadInfoByIndex(size_t index, ThreadInfo* info);
+
+  // Implements LinuxDumper::IsPostMortem().
+  // Always returns false to indicate this dumper performs a dump of
+  // a crashed process via ptrace.
+  virtual bool IsPostMortem() const;
+
+  // Implements LinuxDumper::ThreadsSuspend().
+  // Suspends all threads in the given process. Returns true on success.
+  virtual bool ThreadsSuspend();
+
+  // Implements LinuxDumper::ThreadsResume().
+  // Resumes all threads in the given process. Returns true on success.
+  virtual bool ThreadsResume();
+
+ protected:
+  // Implements LinuxDumper::EnumerateThreads().
+  // Enumerates all threads of the given process into |threads_|.
+  virtual bool EnumerateThreads();
+
+ private:
+  // Set to true if all threads of the crashed process are suspended.
+  bool threads_suspended_;
+};
+
+}  // namespace google_breakpad
+
+#endif  // CLIENT_LINUX_HANDLER_LINUX_PTRACE_DUMPER_H_

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc Added

@@ -0,0 +1,445 @@
+// Copyright (c) 2009, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// linux_ptrace_dumper_unittest.cc:
+// Unit tests for google_breakpad::LinuxPtraceDumoer.
+//
+// This file was renamed from linux_dumper_unittest.cc and modified due
+// to LinuxDumper being splitted into two classes.
+
+#include <fcntl.h>
+#include <limits.h>
+#include <unistd.h>
+#include <signal.h>
+#include <stdint.h>
+#include <sys/mman.h>
+#include <sys/poll.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <string>
+
+#include "breakpad_googletest_includes.h"
+#include "client/linux/minidump_writer/linux_ptrace_dumper.h"
+#include "common/linux/eintr_wrapper.h"
+#include "common/linux/file_id.h"
+#include "common/linux/safe_readlink.h"
+#include "common/memory.h"
+
+using std::string;
+using namespace google_breakpad;
+
+namespace {
+
+typedef testing::Test LinuxPtraceDumperTest;
+
+string GetHelperBinary() {
+  // Locate helper binary next to the current binary.
+  char self_pathPATH_MAX;
+  if (!SafeReadLink("/proc/self/exe", self_path)) {
+    return "";
+  }
+  string helper_path(self_path);
+  size_t pos = helper_path.rfind('/');
+  if (pos == string::npos) {
+    return "";
+  }
+  helper_path.erase(pos + 1);
+  helper_path += "linux_dumper_unittest_helper";
+
+  return helper_path;
+}
+
+}  // namespace
+
+TEST(LinuxPtraceDumperTest, Setup) {
+  LinuxPtraceDumper dumper(getpid());
+}
+
+TEST(LinuxPtraceDumperTest, FindMappings) {
+  LinuxPtraceDumper dumper(getpid());
+  ASSERT_TRUE(dumper.Init());
+
+  ASSERT_TRUE(dumper.FindMapping(reinterpret_cast<void*>(getpid)));
+  ASSERT_TRUE(dumper.FindMapping(reinterpret_cast<void*>(printf)));
+  ASSERT_FALSE(dumper.FindMapping(NULL));
+}
+
+TEST(LinuxPtraceDumperTest, ThreadList) {
+  LinuxPtraceDumper dumper(getpid());
+  ASSERT_TRUE(dumper.Init());
+
+  ASSERT_GE(dumper.threads().size(), (size_t)1);
+  bool found = false;
+  for (size_t i = 0; i < dumper.threads().size(); ++i) {
+    if (dumper.threads()i == getpid()) {
+      found = true;
+      break;
+    }
+  }
+}
+
+// Helper stack class to close a file descriptor and unmap
+// a mmap'ed mapping.
+class StackHelper {
+ public:
+  StackHelper(int fd, char* mapping, size_t size)
+    : fd_(fd), mapping_(mapping), size_(size) {}
+  ~StackHelper() {
+    munmap(mapping_, size_);
+    close(fd_);
+  }
+
+ private:
+  int fd_;
+  char* mapping_;
+  size_t size_;
+};
+
+TEST(LinuxPtraceDumperTest, MergedMappings) {
+  string helper_path(GetHelperBinary());
+  if (helper_path.empty()) {
+    FAIL() << "Couldn't find helper binary";
+    exit(1);
+  }
+
+  // mmap two segments out of the helper binary, one
+  // enclosed in the other, but with different protections.
+  const size_t kPageSize = sysconf(_SC_PAGESIZE);
+  const size_t kMappingSize = 3 * kPageSize;
+  int fd = open(helper_path.c_str(), O_RDONLY);
+  ASSERT_NE(-1, fd);
+  char* mapping =
+    reinterpret_cast<char*>(mmap(NULL,
+                                 kMappingSize,
+                                 PROT_READ,
+                                 MAP_SHARED,
+                                 fd,
+                                 0));
+  ASSERT_TRUE(mapping);
+
+  const uintptr_t kMappingAddress = reinterpret_cast<uintptr_t>(mapping);
+
+  // Ensure that things get cleaned up.
+  StackHelper helper(fd, mapping, kMappingSize);
+
+  // Carve a page out of the first mapping with different permissions.
+  char* inside_mapping =  reinterpret_cast<char*>(
+      mmap(mapping + 2 *kPageSize,
+           kPageSize,
+           PROT_NONE,
+           MAP_SHARED | MAP_FIXED,
+           fd,
+           // Map a different offset just to
+           // better test real-world conditions.
+           kPageSize));
+  ASSERT_TRUE(inside_mapping);
+
+  // Now check that LinuxPtraceDumper interpreted the mappings properly.
+  LinuxPtraceDumper dumper(getpid());
+  ASSERT_TRUE(dumper.Init());
+  int mapping_count = 0;
+  for (unsigned i = 0; i < dumper.mappings().size(); ++i) {
+    const MappingInfo& mapping = *dumper.mappings()i;
+    if (strcmp(mapping.name, helper_path.c_str()) == 0) {
+      // This mapping should encompass the entire original mapped
+      // range.
+      EXPECT_EQ(kMappingAddress, mapping.start_addr);
+      EXPECT_EQ(kMappingSize, mapping.size);
+      EXPECT_EQ(0, mapping.offset);
+      mapping_count++;
+    }
+  }
+  EXPECT_EQ(1, mapping_count);
+}
+
+TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) {
+  static const int kNumberOfThreadsInHelperProgram = 5;
+  char kNumberOfThreadsArgument2;
+  sprintf(kNumberOfThreadsArgument, "%d", kNumberOfThreadsInHelperProgram);
+
+  int fds2;
+  ASSERT_NE(-1, pipe(fds));
+
+  pid_t child_pid = fork();
+  if (child_pid == 0) {
+    // In child process.
+    close(fds0);
+
+    string helper_path(GetHelperBinary());
+    if (helper_path.empty()) {
+      FAIL() << "Couldn't find helper binary";
+      exit(1);
+    }
+
+    // Pass the pipe fd and the number of threads as arguments.
+    char pipe_fd_string8;
+    sprintf(pipe_fd_string, "%d", fds1);
+    execl(helper_path.c_str(),
+          "linux_dumper_unittest_helper",
+          pipe_fd_string,
+          kNumberOfThreadsArgument,
+          NULL);
+    // Kill if we get here.
+    printf("Errno from exec: %d", errno);
+    FAIL() << "Exec of " << helper_path << " failed: " << strerror(errno);
+    exit(0);
+  }
+  close(fds1);
+
+  // Wait for all child threads to indicate that they have started
+  for (int threads = 0; threads < kNumberOfThreadsInHelperProgram; threads++) {
+    struct pollfd pfd;
+    memset(&pfd, 0, sizeof(pfd));
+    pfd.fd = fds0;
+    pfd.events = POLLIN | POLLERR;
+
+    const int r = HANDLE_EINTR(poll(&pfd, 1, 1000));
+    ASSERT_EQ(1, r);
+    ASSERT_TRUE(pfd.revents & POLLIN);
+    uint8_t junk;
+    ASSERT_EQ(read(fds0, &junk, sizeof(junk)), sizeof(junk));
+  }
+  close(fds0);
+
+  // There is a race here because we may stop a child thread before
+  // it is actually running the busy loop. Empirically this sleep
+  // is sufficient to avoid the race.
+  usleep(100000);
+
+  // Children are ready now.
+  LinuxPtraceDumper dumper(child_pid);
+  ASSERT_TRUE(dumper.Init());
+  EXPECT_EQ((size_t)kNumberOfThreadsInHelperProgram, dumper.threads().size());
+  EXPECT_TRUE(dumper.ThreadsSuspend());
+
+  ThreadInfo one_thread;
+  for (size_t i = 0; i < dumper.threads().size(); ++i) {
+    EXPECT_TRUE(dumper.GetThreadInfoByIndex(i, &one_thread));
+    // In the helper program, we stored a pointer to the thread id in a
+    // specific register. Check that we can recover its value.
+#if defined(__ARM_EABI__)
+    pid_t *process_tid_location = (pid_t *)(one_thread.regs.uregs3);
+#elif defined(__i386)
+    pid_t *process_tid_location = (pid_t *)(one_thread.regs.ecx);
+#elif defined(__x86_64)
+    pid_t *process_tid_location = (pid_t *)(one_thread.regs.rcx);
+#else
+#error This test has not been ported to this platform.
+#endif
+    pid_t one_thread_id;
+    dumper.CopyFromProcess(&one_thread_id,
+                           dumper.threads()i,
+                           process_tid_location,
+                           4);
+    EXPECT_EQ(dumper.threads()i, one_thread_id);
+  }
+  EXPECT_TRUE(dumper.ThreadsResume());
+  kill(child_pid, SIGKILL);
+
+  // Reap child
+  int status;
+  ASSERT_NE(-1, HANDLE_EINTR(waitpid(child_pid, &status, 0)));
+  ASSERT_TRUE(WIFSIGNALED(status));
+  ASSERT_EQ(SIGKILL, WTERMSIG(status));
+}
+
+TEST(LinuxPtraceDumperTest, BuildProcPath) {
+  const pid_t pid = getpid();
+  LinuxPtraceDumper dumper(pid);
+
+  char maps_pathNAME_MAX = "";
+  char maps_path_expectedNAME_MAX;
+  snprintf(maps_path_expected, sizeof(maps_path_expected),
+           "/proc/%d/maps", pid);
+  EXPECT_TRUE(dumper.BuildProcPath(maps_path, pid, "maps"));
+  EXPECT_STREQ(maps_path_expected, maps_path);
+
+  EXPECT_FALSE(dumper.BuildProcPath(NULL, pid, "maps"));
+  EXPECT_FALSE(dumper.BuildProcPath(maps_path, 0, "maps"));
+  EXPECT_FALSE(dumper.BuildProcPath(maps_path, pid, ""));
+  EXPECT_FALSE(dumper.BuildProcPath(maps_path, pid, NULL));
+
+  char long_nodeNAME_MAX;
+  size_t long_node_len = NAME_MAX - strlen("/proc/123") - 1;
+  memset(long_node, 'a', long_node_len);
+  long_nodelong_node_len = '\0';
+  EXPECT_FALSE(dumper.BuildProcPath(maps_path, 123, long_node));
+}
+
+#if !defined(__ARM_EABI__)
+// Ensure that the linux-gate VDSO is included in the mapping list.
+TEST(LinuxPtraceDumperTest, MappingsIncludeLinuxGate) {
+  LinuxPtraceDumper dumper(getpid());
+  ASSERT_TRUE(dumper.Init());
+
+  void* linux_gate_loc = dumper.FindBeginningOfLinuxGateSharedLibrary(getpid());
+  ASSERT_TRUE(linux_gate_loc);
+  bool found_linux_gate = false;
+
+  const wasteful_vector<MappingInfo*> mappings = dumper.mappings();
+  const MappingInfo* mapping;
+  for (unsigned i = 0; i < mappings.size(); ++i) {
+    mapping = mappingsi;
+    if (!strcmp(mapping->name, kLinuxGateLibraryName)) {
+      found_linux_gate = true;
+      break;
+    }
+  }
+  EXPECT_TRUE(found_linux_gate);
+  EXPECT_EQ(linux_gate_loc, reinterpret_cast<void*>(mapping->start_addr));
+  EXPECT_EQ(0, memcmp(linux_gate_loc, ELFMAG, SELFMAG));
+}
+
+// Ensure that the linux-gate VDSO can generate a non-zeroed File ID.
+TEST(LinuxPtraceDumperTest, LinuxGateMappingID) {
+  LinuxPtraceDumper dumper(getpid());
+  ASSERT_TRUE(dumper.Init());
+
+  bool found_linux_gate = false;
+  const wasteful_vector<MappingInfo*> mappings = dumper.mappings();
+  unsigned index = 0;
+  for (unsigned i = 0; i < mappings.size(); ++i) {
+    if (!strcmp(mappingsi->name, kLinuxGateLibraryName)) {
+      found_linux_gate = true;
+      index = i;
+      break;
+    }
+  }
+  ASSERT_TRUE(found_linux_gate);
+
+  uint8_t identifiersizeof(MDGUID);
+  ASSERT_TRUE(dumper.ElfFileIdentifierForMapping(*mappingsindex,
+                                                 true,
+                                                 index,
+                                                 identifier));
+  uint8_t empty_identifiersizeof(MDGUID);
+  memset(empty_identifier, 0, sizeof(empty_identifier));
+  EXPECT_NE(0, memcmp(empty_identifier, identifier, sizeof(identifier)));
+}
+
+// Ensure that the linux-gate VDSO can generate a non-zeroed File ID
+// from a child process.
+TEST(LinuxPtraceDumperTest, LinuxGateMappingIDChild) {
+  int fds2;
+  ASSERT_NE(-1, pipe(fds));
+
+  // Fork a child so ptrace works.
+  const pid_t child = fork();
+  if (child == 0) {
+    close(fds1);
+    // Now wait forever for the parent.
+    char b;
+    HANDLE_EINTR(read(fds0, &b, sizeof(b)));
+    close(fds0);
+    syscall(__NR_exit);
+  }
+  close(fds0);
+
+  LinuxPtraceDumper dumper(child);
+  ASSERT_TRUE(dumper.Init());
+
+  bool found_linux_gate = false;
+  const wasteful_vector<MappingInfo*> mappings = dumper.mappings();
+  unsigned index = 0;
+  for (unsigned i = 0; i < mappings.size(); ++i) {
+    if (!strcmp(mappingsi->name, kLinuxGateLibraryName)) {
+      found_linux_gate = true;
+      index = i;
+      break;
+    }
+  }
+  ASSERT_TRUE(found_linux_gate);
+
+  // Need to suspend the child so ptrace actually works.
+  ASSERT_TRUE(dumper.ThreadsSuspend());
+  uint8_t identifiersizeof(MDGUID);
+  ASSERT_TRUE(dumper.ElfFileIdentifierForMapping(*mappingsindex,
+                                                 true,
+                                                 index,
+                                                 identifier));
+  uint8_t empty_identifiersizeof(MDGUID);
+  memset(empty_identifier, 0, sizeof(empty_identifier));
+  EXPECT_NE(0, memcmp(empty_identifier, identifier, sizeof(identifier)));
+  EXPECT_TRUE(dumper.ThreadsResume());
+  close(fds1);
+}
+#endif
+
+TEST(LinuxPtraceDumperTest, FileIDsMatch) {
+  // Calculate the File ID of our binary using both
+  // FileID::ElfFileIdentifier and LinuxDumper::ElfFileIdentifierForMapping
+  // and ensure that we get the same result from both.
+  char exe_namePATH_MAX;
+  ASSERT_TRUE(SafeReadLink("/proc/self/exe", exe_name));
+
+  int fds2;
+  ASSERT_NE(-1, pipe(fds));
+
+  // Fork a child so ptrace works.
+  const pid_t child = fork();
+  if (child == 0) {
+    close(fds1);
+    // Now wait forever for the parent.
+    char b;
+    HANDLE_EINTR(read(fds0, &b, sizeof(b)));
+    close(fds0);
+    syscall(__NR_exit);
+  }
+  close(fds0);
+
+  LinuxPtraceDumper dumper(child);
+  ASSERT_TRUE(dumper.Init());
+  const wasteful_vector<MappingInfo*> mappings = dumper.mappings();
+  bool found_exe = false;
+  unsigned i;
+  for (i = 0; i < mappings.size(); ++i) {
+    const MappingInfo* mapping = mappingsi;
+    if (!strcmp(mapping->name, exe_name)) {
+      found_exe = true;
+      break;
+    }
+  }
+  ASSERT_TRUE(found_exe);
+
+  uint8_t identifier1sizeof(MDGUID);
+  uint8_t identifier2sizeof(MDGUID);
+  EXPECT_TRUE(dumper.ElfFileIdentifierForMapping(*mappingsi, true, i,
+                                                 identifier1));
+  FileID fileid(exe_name);
+  EXPECT_TRUE(fileid.ElfFileIdentifier(identifier2));
+  char identifier_string137;
+  char identifier_string237;
+  FileID::ConvertIdentifierToString(identifier1, identifier_string1,
+                                    37);
+  FileID::ConvertIdentifierToString(identifier2, identifier_string2,
+                                    37);
+  EXPECT_STREQ(identifier_string1, identifier_string2);
+  close(fds1);
+}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/minidump_writer.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/minidump_writer.cc Changed

@@ -46,26 +46,24 @@
 #include "client/linux/minidump_writer/minidump_writer.h"
 #include "client/minidump_file_writer-inl.h"
 
+#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #if !defined(__ANDROID__)
 #include <link.h>
 #endif
 #include <stdio.h>
-#include <unistd.h>
-#include <ctype.h>
 #if !defined(__ANDROID__)
 #include <sys/ucontext.h>
 #include <sys/user.h>
 #endif
 #include <sys/utsname.h>
+#include <unistd.h>
 
 #include <algorithm>
 
 #include "client/minidump_file_writer.h"
 #include "google_breakpad/common/minidump_format.h"
-#include "google_breakpad/common/minidump_cpu_amd64.h"
-#include "google_breakpad/common/minidump_cpu_x86.h"
 
 #if defined(__ANDROID__)
 #include "client/linux/android_link.h"
@@ -74,8 +72,11 @@
 #include "client/linux/handler/exception_handler.h"
 #include "client/linux/minidump_writer/line_reader.h"
 #include "client/linux/minidump_writer/linux_dumper.h"
+#include "client/linux/minidump_writer/linux_ptrace_dumper.h"
 #include "client/linux/minidump_writer/minidump_extension_linux.h"
+#include "client/minidump_file_writer.h"
 #include "common/linux/linux_libc_support.h"
+#include "google_breakpad/common/minidump_format.h"
 #include "third_party/lss/linux_syscall_support.h"
 
 // Minidump defines register structures which are different from the raw
@@ -368,32 +369,30 @@
 class MinidumpWriter {
  public:
   MinidumpWriter(const char* filename,
-                 pid_t crashing_pid,
                  const ExceptionHandler::CrashContext* context,
-                 const MappingList& mappings)
+                 const MappingList& mappings,
+                 LinuxDumper* dumper)
       : filename_(filename),
-        siginfo_(&context->siginfo),
-        ucontext_(&context->context),
+        ucontext_(context ? &context->context : NULL),
 #if !defined(__ARM_EABI__)
-        float_state_(&context->float_state),
+        float_state_(context ? &context->float_state : NULL),
 #else
         // TODO: fix this after fixing ExceptionHandler
         float_state_(NULL),
 #endif
-        crashing_tid_(context->tid),
-        dumper_(crashing_pid),
-        memory_blocks_(dumper_.allocator()),
+        dumper_(dumper),
+        memory_blocks_(dumper_->allocator()),
         mapping_list_(mappings) {
   }
 
   bool Init() {
-    return dumper_.Init() && minidump_writer_.Open(filename_) &&
-           dumper_.ThreadsSuspend();
+    return dumper_->Init() && minidump_writer_.Open(filename_) &&
+           dumper_->ThreadsSuspend();
   }
 
   ~MinidumpWriter() {
     minidump_writer_.Close();
-    dumper_.ThreadsResume();
+    dumper_->ThreadsResume();
   }
 
   bool Dump() {
@@ -403,17 +402,25 @@
     struct r_debug* r_debug = NULL;
     uint32_t dynamic_length = 0;
 #if !defined(__ANDROID__)
-    // The Android NDK is missing structure definitions for most of this.
-    // For now, it's simpler just to skip it.
-    for (int i = 0;;) {
-      ElfW(Dyn) dyn;
-      dynamic_length += sizeof(dyn);
-      dumper_.CopyFromProcess(&dyn, crashing_tid_, _DYNAMIC+i++, sizeof(dyn));
-      if (dyn.d_tag == DT_DEBUG) {
-        r_debug = (struct r_debug*)dyn.d_un.d_ptr;
-        continue;
-      } else if (dyn.d_tag == DT_NULL) {
-        break;
+    // This code assumes the crashing process is the same as this process and
+    // may hang or take a long time to complete if not so.
+    // Thus, we skip this code for a post-mortem based dump.
+    if (!dumper_->IsPostMortem()) {
+      // The Android NDK is missing structure definitions for most of this.
+      // For now, it's simpler just to skip it.
+      for (int i = 0;;) {
+        ElfW(Dyn) dyn;
+        dynamic_length += sizeof(dyn);
+        // NOTE: Use of _DYNAMIC assumes this is the same process as the
+        // crashing process. This loop will go forever if it's out of bounds.
+        dumper_->CopyFromProcess(&dyn, GetCrashThread(), _DYNAMIC+i++,
+                                 sizeof(dyn));
+        if (dyn.d_tag == DT_DEBUG) {
+          r_debug = (struct r_debug*)dyn.d_un.d_ptr;
+          continue;
+        } else if (dyn.d_tag == DT_NULL) {
+          break;
+        }
       }
     }
 #endif
@@ -467,7 +474,7 @@
     dir.CopyIndex(dir_index++, &dirent);
 
     dirent.stream_type = MD_LINUX_PROC_STATUS;
-    if (!WriteProcFile(&dirent.location, crashing_tid_, "status"))
+    if (!WriteProcFile(&dirent.location, GetCrashThread(), "status"))
       NullifyDirectoryEntry(&dirent);
     dir.CopyIndex(dir_index++, &dirent);
 
@@ -477,22 +484,22 @@
     dir.CopyIndex(dir_index++, &dirent);
 
     dirent.stream_type = MD_LINUX_CMD_LINE;
-    if (!WriteProcFile(&dirent.location, crashing_tid_, "cmdline"))
+    if (!WriteProcFile(&dirent.location, GetCrashThread(), "cmdline"))
       NullifyDirectoryEntry(&dirent);
     dir.CopyIndex(dir_index++, &dirent);
 
     dirent.stream_type = MD_LINUX_ENVIRON;
-    if (!WriteProcFile(&dirent.location, crashing_tid_, "environ"))
+    if (!WriteProcFile(&dirent.location, GetCrashThread(), "environ"))
       NullifyDirectoryEntry(&dirent);
     dir.CopyIndex(dir_index++, &dirent);
 
     dirent.stream_type = MD_LINUX_AUXV;
-    if (!WriteProcFile(&dirent.location, crashing_tid_, "auxv"))
+    if (!WriteProcFile(&dirent.location, GetCrashThread(), "auxv"))
       NullifyDirectoryEntry(&dirent);
     dir.CopyIndex(dir_index++, &dirent);
 
     dirent.stream_type = MD_LINUX_MAPS;
-    if (!WriteProcFile(&dirent.location, crashing_tid_, "maps"))
+    if (!WriteProcFile(&dirent.location, GetCrashThread(), "maps"))
       NullifyDirectoryEntry(&dirent);
     dir.CopyIndex(dir_index++, &dirent);
 
@@ -506,7 +513,7 @@
     // If you add more directory entries, don't forget to update kNumWriters,
     // above.
 
-    dumper_.ThreadsResume();
+    dumper_->ThreadsResume();
     return true;
   }
 
@@ -629,7 +636,7 @@
 
   // Write information about the threads.
   bool WriteThreadListStream(MDRawDirectory* dirent) {
-    const unsigned num_threads = dumper_.threads().size();
+    const unsigned num_threads = dumper_->threads().size();
 
     TypedMDRVA<uint32_t> list(&minidump_writer_);
     if (!list.AllocateObjectAndArray(num_threads, sizeof(MDRawThread)))
@@ -643,21 +650,23 @@
     for (unsigned i = 0; i < num_threads; ++i) {
       MDRawThread thread;
       my_memset(&thread, 0, sizeof(thread));
-      thread.thread_id = dumper_.threads()i;
+      thread.thread_id = dumper_->threads()i;
       // We have a different source of information for the crashing thread. If
       // we used the actual state of the thread we would find it running in the
       // signal handler with the alternative stack, which would be deeply
       // unhelpful.
-      if ((pid_t)thread.thread_id == crashing_tid_) {
+      if (static_cast<pid_t>(thread.thread_id) == GetCrashThread() &&
+          !dumper_->IsPostMortem()) {
         const void* stack;
         size_t stack_len;
-        if (!dumper_.GetStackInfo(&stack, &stack_len, GetStackPointer()))
+        if (!dumper_->GetStackInfo(&stack, &stack_len, GetStackPointer()))
           return false;
         UntypedMDRVA memory(&minidump_writer_);
         if (!memory.Allocate(stack_len))
           return false;
-        uint8_t* stack_copy = (uint8_t*) dumper_.allocator()->Alloc(stack_len);
-        dumper_.CopyFromProcess(stack_copy, thread.thread_id, stack, stack_len);
+        uint8_t* stack_copy = reinterpret_cast<uint8_t*>(Alloc(stack_len));
+        dumper_->CopyFromProcess(stack_copy, thread.thread_id, stack,
+                                 stack_len);
         memory.Copy(stack_copy, stack_len);
         thread.stack.start_of_memory_range = (uintptr_t) (stack);
         thread.stack.memory = memory.location();
@@ -671,8 +680,8 @@
         // don't bother trying to write it.
         bool ip_is_mapped = false;
         MDMemoryDescriptor ip_memory_d;
-        for (unsigned i = 0; i < dumper_.mappings().size(); ++i) {
-          const MappingInfo& mapping = *dumper_.mappings()i;
+        for (unsigned j = 0; j < dumper_->mappings().size(); ++j) {
+          const MappingInfo& mapping = *dumper_->mappings()j;
           if (ip >= mapping.start_addr &&
               ip < mapping.start_addr + mapping.size) {
             ip_is_mapped = true;
@@ -695,12 +704,12 @@
           if (!ip_memory.Allocate(ip_memory_d.memory.data_size))
             return false;
           uint8_t* memory_copy =
-            (uint8_t*) dumper_.allocator()->Alloc(ip_memory_d.memory.data_size);
-          dumper_.CopyFromProcess(
-            memory_copy,
-            thread.thread_id,
-            reinterpret_cast<void*>(ip_memory_d.start_of_memory_range),
-            ip_memory_d.memory.data_size);
+              reinterpret_cast<uint8_t*>(Alloc(ip_memory_d.memory.data_size));
+          dumper_->CopyFromProcess(
+              memory_copy,
+              thread.thread_id,
+              reinterpret_cast<void*>(ip_memory_d.start_of_memory_range),
+              ip_memory_d.memory.data_size);
           ip_memory.Copy(memory_copy, ip_memory_d.memory.data_size);
           ip_memory_d.memory = ip_memory.location();
           memory_blocks_.push_back(ip_memory_d);
@@ -716,15 +725,14 @@
         crashing_thread_context_ = cpu.location();
       } else {
         ThreadInfo info;
-        if (!dumper_.ThreadInfoGet(dumper_.threads()i, &info))
+        if (!dumper_->GetThreadInfoByIndex(i, &info))
           return false;
         UntypedMDRVA memory(&minidump_writer_);
         if (!memory.Allocate(info.stack_len))
           return false;
-        uint8_t* stack_copy =
-            (uint8_t*) dumper_.allocator()->Alloc(info.stack_len);
-        dumper_.CopyFromProcess(stack_copy, thread.thread_id, info.stack,
-                                info.stack_len);
+        uint8_t* stack_copy = reinterpret_cast<uint8_t*>(Alloc(info.stack_len));
+        dumper_->CopyFromProcess(stack_copy, thread.thread_id, info.stack,
+                                 info.stack_len);
         memory.Copy(stack_copy, info.stack_len);
         thread.stack.start_of_memory_range = (uintptr_t)(info.stack);
         thread.stack.memory = memory.location();
@@ -737,6 +745,10 @@
         CPUFillFromThreadInfo(cpu.get(), info);
         PopSeccompStackFrame(cpu.get(), thread, stack_copy);
         thread.thread_context = cpu.location();
+        if (dumper_->threads()i == GetCrashThread()) {
+          assert(dumper_->IsPostMortem());
+          crashing_thread_context_ = cpu.location();
+        }
       }
 
       list.CopyIndexAfterObject(i, &thread, sizeof(thread));
@@ -777,11 +789,11 @@
   // Because of this, we also include the full, unparsed, /proc/$x/maps file in
   // another stream in the file.
   bool WriteMappings(MDRawDirectory* dirent) {
-    const unsigned num_mappings = dumper_.mappings().size();
+    const unsigned num_mappings = dumper_->mappings().size();
     unsigned num_output_mappings = mapping_list_.size();
 
-    for (unsigned i = 0; i < dumper_.mappings().size(); ++i) {
-      const MappingInfo& mapping = *dumper_.mappings()i;
+    for (unsigned i = 0; i < dumper_->mappings().size(); ++i) {
+      const MappingInfo& mapping = *dumper_->mappings()i;
       if (ShouldIncludeMapping(mapping) && !HaveMappingInfo(mapping))
         num_output_mappings++;
     }
@@ -797,7 +809,7 @@
     // First write all the mappings from the dumper
     unsigned int j = 0;
     for (unsigned i = 0; i < num_mappings; ++i) {
-      const MappingInfo& mapping = *dumper_.mappings()i;
+      const MappingInfo& mapping = *dumper_->mappings()i;
       if (!ShouldIncludeMapping(mapping) || HaveMappingInfo(mapping))
         continue;
 
@@ -859,8 +871,8 @@
       // GUID was provided by caller.
       memcpy(signature, identifier, sizeof(MDGUID));
     } else {
-      dumper_.ElfFileIdentifierForMapping(mapping, member,
-                                          mapping_id, signature);
+      dumper_->ElfFileIdentifierForMapping(mapping, member,
+                                           mapping_id, signature);
     }
     my_memset(cv_ptr, 0, sizeof(uint32_t));  // Set age to 0 on Linux.
     cv_ptr += sizeof(uint32_t);
@@ -905,10 +917,9 @@
     dirent->stream_type = MD_EXCEPTION_STREAM;
     dirent->location = exc.location();
 
-    exc.get()->thread_id = crashing_tid_;
-    exc.get()->exception_record.exception_code = siginfo_->si_signo;
-    exc.get()->exception_record.exception_address =
-        (uintptr_t) siginfo_->si_addr;
+    exc.get()->thread_id = GetCrashThread();
+    exc.get()->exception_record.exception_code = dumper_->crash_signal();
+    exc.get()->exception_record.exception_address = dumper_->crash_address();
     exc.get()->thread_context = crashing_thread_context_;
 
     return true;
@@ -945,11 +956,11 @@
     // Count the number of loaded DSOs
     int dso_count = 0;
     struct r_debug debug_entry;
-    dumper_.CopyFromProcess(&debug_entry, crashing_tid_, r_debug,
-                            sizeof(debug_entry));
+    dumper_->CopyFromProcess(&debug_entry, GetCrashThread(), r_debug,
+                             sizeof(debug_entry));
     for (struct link_map* ptr = debug_entry.r_map; ptr; ) {
       struct link_map map;
-      dumper_.CopyFromProcess(&map, crashing_tid_, ptr, sizeof(map));
+      dumper_->CopyFromProcess(&map, GetCrashThread(), ptr, sizeof(map));
       ptr = map.l_next;
       dso_count++;
     }
@@ -967,12 +978,12 @@
       // Iterate over DSOs and write their information to mini dump
       for (struct link_map* ptr = debug_entry.r_map; ptr; ) {
         struct link_map map;
-        dumper_.CopyFromProcess(&map, crashing_tid_, ptr, sizeof(map));
+        dumper_->CopyFromProcess(&map, GetCrashThread(), ptr, sizeof(map));
         ptr = map.l_next;
         char filename257 = { 0 };
         if (map.l_name) {
-          dumper_.CopyFromProcess(filename, crashing_tid_, map.l_name,
-                                  sizeof(filename) - 1);
+          dumper_->CopyFromProcess(filename, GetCrashThread(), map.l_name,
+                                   sizeof(filename) - 1);
         }
         MDLocationDescriptor location;
         if (!minidump_writer_.WriteString(filename, 0, &location))
@@ -1001,8 +1012,8 @@
     debug.get()->dynamic = (void*)&_DYNAMIC;
 
     char *dso_debug_data = new chardynamic_length;
-    dumper_.CopyFromProcess(dso_debug_data, crashing_tid_, &_DYNAMIC,
-                            dynamic_length);
+    dumper_->CopyFromProcess(dso_debug_data, GetCrashThread(), &_DYNAMIC,
+                             dynamic_length);
     debug.CopyIndexAfterObject(0, dso_debug_data, dynamic_length);
     delete dso_debug_data;
 
@@ -1011,6 +1022,14 @@
   }
 
  private:
+  void* Alloc(unsigned bytes) {
+    return dumper_->allocator()->Alloc(bytes);
+  }
+
+  pid_t GetCrashThread() const {
+    return dumper_->crash_thread();
+  }
+
 #if defined(__i386)
   uintptr_t GetStackPointer() {
     return ucontext_->uc_mcontext.gregsREG_ESP;
@@ -1175,16 +1194,15 @@
     // to read as much as we can into a buffer.
     static const unsigned kBufSize = 1024 - 2*sizeof(void*);
     struct Buffers {
-      struct Buffers* next;
+      Buffers* next;
       size_t len;
       uint8_t datakBufSize;
-    } *buffers =
-        (struct Buffers*) dumper_.allocator()->Alloc(sizeof(struct Buffers));
+    } *buffers = reinterpret_cast<Buffers*>(Alloc(sizeof(Buffers)));
     buffers->next = NULL;
     buffers->len = 0;
 
     size_t total = 0;
-    for (struct Buffers* bufptr = buffers;;) {
+    for (Buffers* bufptr = buffers;;) {
       ssize_t r;
       do {
         r = sys_read(fd, &bufptr->databufptr->len, kBufSize - bufptr->len);
@@ -1196,8 +1214,7 @@
       total += r;
       bufptr->len += r;
       if (bufptr->len == kBufSize) {
-        bufptr->next =
-          (struct Buffers*) dumper_.allocator()->Alloc(sizeof(struct Buffers));
+        bufptr->next = reinterpret_cast<Buffers*>(Alloc(sizeof(Buffers)));
         bufptr = bufptr->next;
         bufptr->next = NULL;
         bufptr->len = 0;
@@ -1277,16 +1294,15 @@
   bool WriteProcFile(MDLocationDescriptor* result, pid_t pid,
                      const char* filename) {
     char bufNAME_MAX;
-    dumper_.BuildProcPath(buf, pid, filename);
+    if (!dumper_->BuildProcPath(buf, pid, filename))
+      return false;
     return WriteFile(result, buf);
   }
 
   const char* const filename_;  // output filename
-  const siginfo_t* const siginfo_;  // from the signal handler (see sigaction)
   const struct ucontext* const ucontext_;  // also from the signal handler
   const struct _libc_fpstate* const float_state_;  // ditto
-  const pid_t crashing_tid_;  // the process which actually crashed
-  LinuxDumper dumper_;
+  LinuxDumper* dumper_;
   MinidumpFileWriter minidump_writer_;
   MDLocationDescriptor crashing_thread_context_;
   // Blocks of memory written to the dump. These are all currently
@@ -1310,7 +1326,21 @@
     return false;
   const ExceptionHandler::CrashContext* context =
       reinterpret_cast<const ExceptionHandler::CrashContext*>(blob);
-  MinidumpWriter writer(filename, crashing_process, context, mappings);
+  LinuxPtraceDumper dumper(crashing_process);
+  dumper.set_crash_address(
+      reinterpret_cast<uintptr_t>(context->siginfo.si_addr));
+  dumper.set_crash_signal(context->siginfo.si_signo);
+  dumper.set_crash_thread(context->tid);
+  MinidumpWriter writer(filename, context, mappings, &dumper);
+  if (!writer.Init())
+    return false;
+  return writer.Dump();
+}
+
+bool WriteMinidump(const char* filename,
+                   const MappingList& mappings,
+                   LinuxDumper* dumper) {
+  MinidumpWriter writer(filename, NULL, mappings, dumper);
   if (!writer.Init())
     return false;
   return writer.Dump();

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/minidump_writer.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/minidump_writer.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/minidump_writer_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/minidump_writer/minidump_writer_unittest.cc Changed

@@ -42,16 +42,12 @@
 #include "client/linux/minidump_writer/minidump_writer.h"
 #include "common/linux/eintr_wrapper.h"
 #include "common/linux/file_id.h"
+#include "common/linux/safe_readlink.h"
+#include "common/tests/auto_tempdir.h"
 #include "google_breakpad/processor/minidump.h"
 
 using namespace google_breakpad;
 
-#if !defined(__ANDROID__)
-#define TEMPDIR "/tmp"
-#else
-#define TEMPDIR "/data/local/tmp"
-#endif
-
 // Length of a formatted GUID string =
 // sizeof(MDGUID) * 2 + 4 (for dashes) + 1 (null terminator)
 const int kGUIDStringSize = 37;
@@ -77,15 +73,14 @@
   ExceptionHandler::CrashContext context;
   memset(&context, 0, sizeof(context));
 
-  char templ = TEMPDIR "/minidump-writer-unittest-XXXXXX";
-  mktemp(templ);
+  AutoTempDir temp_dir;
+  std::string templ = temp_dir.path() + "/minidump-writer-unittest";
   // Set a non-zero tid to avoid tripping asserts.
   context.tid = 1;
-  ASSERT_TRUE(WriteMinidump(templ, child, &context, sizeof(context)));
+  ASSERT_TRUE(WriteMinidump(templ.c_str(), child, &context, sizeof(context)));
   struct stat st;
-  ASSERT_EQ(stat(templ, &st), 0);
+  ASSERT_EQ(stat(templ.c_str(), &st), 0);
   ASSERT_GT(st.st_size, 0u);
-  unlink(templ);
 
   close(fds1);
 }
@@ -126,7 +121,7 @@
                                  MAP_PRIVATE | MAP_ANON,
                                  -1,
                                  0));
-  const u_int64_t kMemoryAddress = reinterpret_cast<u_int64_t>(memory);
+  const uintptr_t kMemoryAddress = reinterpret_cast<uintptr_t>(memory);
   ASSERT_TRUE(memory);
 
   const pid_t child = fork();
@@ -143,8 +138,8 @@
   memset(&context, 0, sizeof(context));
   context.tid = 1;
 
-  char templ = TEMPDIR "/minidump-writer-unittest-XXXXXX";
-  mktemp(templ);
+  AutoTempDir temp_dir;
+  std::string templ = temp_dir.path() + "/minidump-writer-unittest";
 
   // Add information about the mapped memory.
   MappingInfo info;
@@ -158,12 +153,13 @@
   mapping.first = info;
   memcpy(mapping.second, kModuleGUID, sizeof(MDGUID));
   mappings.push_back(mapping);
-  ASSERT_TRUE(WriteMinidump(templ, child, &context, sizeof(context), mappings));
+  ASSERT_TRUE(WriteMinidump(templ.c_str(), child, &context, sizeof(context),
+                            mappings));
 
   // Read the minidump. Load the module list, and ensure that
   // the mmap'ed |memory| is listed with the given module name
   // and debug ID.
-  Minidump minidump(templ);
+  Minidump minidump(templ.c_str());
   ASSERT_TRUE(minidump.Read());
 
   MinidumpModuleList* module_list = minidump.GetModuleList();
@@ -177,7 +173,6 @@
   EXPECT_EQ(kMemoryName, module->code_file());
   EXPECT_EQ(module_identifier, module->debug_identifier());
 
-  unlink(templ);
   close(fds1);
 }
 
@@ -211,11 +206,11 @@
   module_identifier += "0";
 
   // mmap a file
-  char tempfile = TEMPDIR "/minidump-writer-unittest-temp-XXXXXX";
-  mktemp(tempfile);
-  int fd = open(tempfile, O_RDWR | O_CREAT, 0);
+  AutoTempDir temp_dir;
+  std::string tempfile = temp_dir.path() + "/minidump-writer-unittest-temp";
+  int fd = open(tempfile.c_str(), O_RDWR | O_CREAT, 0);
   ASSERT_NE(-1, fd);
-  unlink(tempfile);
+  unlink(tempfile.c_str());
   // fill with zeros
   char bufferkMemorySize;
   memset(buffer, 0, kMemorySize);
@@ -229,7 +224,7 @@
                                  MAP_PRIVATE,
                                  fd,
                                  0));
-  const u_int64_t kMemoryAddress = reinterpret_cast<u_int64_t>(memory);
+  const uintptr_t kMemoryAddress = reinterpret_cast<uintptr_t>(memory);
   ASSERT_TRUE(memory);
   close(fd);
 
@@ -247,8 +242,7 @@
   memset(&context, 0, sizeof(context));
   context.tid = 1;
 
-  char dumpfile = TEMPDIR "/minidump-writer-unittest-XXXXXX";
-  mktemp(dumpfile);
+  std::string dumpfile = temp_dir.path() + "/minidump-writer-unittest";
 
   // Add information about the mapped memory. Report it as being larger than
   // it actually is.
@@ -264,12 +258,13 @@
   memcpy(mapping.second, kModuleGUID, sizeof(MDGUID));
   mappings.push_back(mapping);
   ASSERT_TRUE(
-      WriteMinidump(dumpfile, child, &context, sizeof(context), mappings));
+      WriteMinidump(dumpfile.c_str(), child, &context, sizeof(context),
+                    mappings));
 
   // Read the minidump. Load the module list, and ensure that
   // the mmap'ed |memory| is listed with the given module name
   // and debug ID.
-  Minidump minidump(dumpfile);
+  Minidump minidump(dumpfile.c_str());
   ASSERT_TRUE(minidump.Read());
 
   MinidumpModuleList* module_list = minidump.GetModuleList();
@@ -283,7 +278,6 @@
   EXPECT_EQ(kMemoryName, module->code_file());
   EXPECT_EQ(module_identifier, module->debug_identifier());
 
-  unlink(dumpfile);
   close(fds1);
 }
 
@@ -294,8 +288,8 @@
 
   // Locate helper binary next to the current binary.
   char self_pathPATH_MAX;
-  if (readlink("/proc/self/exe", self_path, sizeof(self_path) - 1) == -1) {
-    FAIL() << "readlink failed: " << strerror(errno);
+  if (!SafeReadLink("/proc/self/exe", self_path)) {
+    FAIL() << "readlink failed";
     exit(1);
   }
   string helper_path(self_path);
@@ -308,12 +302,13 @@
   helper_path += "linux_dumper_unittest_helper";
 
   // Copy binary to a temp file.
-  char binpath = TEMPDIR "/linux-dumper-unittest-helper-XXXXXX";
-  mktemp(binpath);
+  AutoTempDir temp_dir;
+  std::string binpath = temp_dir.path() + "/linux-dumper-unittest-helper";
   char cmdline2 * PATH_MAX;
-  sprintf(cmdline, "/bin/cp \"%s\" \"%s\"", helper_path.c_str(), binpath);
+  sprintf(cmdline, "/bin/cp \"%s\" \"%s\"", helper_path.c_str(),
+          binpath.c_str());
   ASSERT_EQ(0, system(cmdline));
-  ASSERT_EQ(0, chmod(binpath, 0755));
+  ASSERT_EQ(0, chmod(binpath.c_str(), 0755));
 
   int fds2;
   ASSERT_NE(-1, pipe(fds));
@@ -326,8 +321,8 @@
     // Pass the pipe fd and the number of threads as arguments.
     char pipe_fd_string8;
     sprintf(pipe_fd_string, "%d", fds1);
-    execl(binpath,
-          binpath,
+    execl(binpath.c_str(),
+          binpath.c_str(),
           pipe_fd_string,
           kNumberOfThreadsArgument,
           NULL);
@@ -343,37 +338,38 @@
   ASSERT_EQ(1, r);
   ASSERT_TRUE(pfd.revents & POLLIN);
   uint8_t junk;
-  read(fds0, &junk, sizeof(junk));
+  const int nr = HANDLE_EINTR(read(fds0, &junk, sizeof(junk)));
+  ASSERT_EQ(sizeof(junk), nr);
   close(fds0);
 
   // Child is ready now.
   // Unlink the test binary.
-  unlink(binpath);
+  unlink(binpath.c_str());
 
   ExceptionHandler::CrashContext context;
   memset(&context, 0, sizeof(context));
 
-  char templ = TEMPDIR "/minidump-writer-unittest-XXXXXX";
-  mktemp(templ);
+  std::string templ = temp_dir.path() + "/minidump-writer-unittest";
   // Set a non-zero tid to avoid tripping asserts.
   context.tid = 1;
-  ASSERT_TRUE(WriteMinidump(templ, child_pid, &context, sizeof(context)));
+  ASSERT_TRUE(WriteMinidump(templ.c_str(), child_pid, &context,
+                            sizeof(context)));
   kill(child_pid, SIGKILL);
 
   struct stat st;
-  ASSERT_EQ(stat(templ, &st), 0);
+  ASSERT_EQ(stat(templ.c_str(), &st), 0);
   ASSERT_GT(st.st_size, 0u);
 
 
 
-  Minidump minidump(templ);
+  Minidump minidump(templ.c_str());
   ASSERT_TRUE(minidump.Read());
 
   // Check that the main module filename is correct.
   MinidumpModuleList* module_list = minidump.GetModuleList();
   ASSERT_TRUE(module_list);
   const MinidumpModule* module = module_list->GetMainModule();
-  EXPECT_STREQ(binpath, module->code_file().c_str());
+  EXPECT_STREQ(binpath.c_str(), module->code_file().c_str());
   // Check that the file ID is correct.
   FileID fileid(helper_path.c_str());
   uint8_t identifiersizeof(MDGUID);
@@ -391,6 +387,4 @@
   // which is always zero on Linux.
   module_identifier += "0";
   EXPECT_EQ(module_identifier, module->debug_identifier());
-
-  unlink(templ);
 }

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/linux/sender/google_crash_report_sender.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/linux/sender/google_crash_report_sender.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/Breakpad.xcodeproj/project.pbxproj -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/Breakpad.xcodeproj/project.pbxproj Changed

@@ -35,14 +35,25 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		163201D61443019E00C4DBF5 /* ConfigFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 163201D41443019E00C4DBF5 /* ConfigFile.h */; };
+		163201D71443019E00C4DBF5 /* ConfigFile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 163201D51443019E00C4DBF5 /* ConfigFile.mm */; };
+		163201E31443029300C4DBF5 /* ConfigFile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 163201D51443019E00C4DBF5 /* ConfigFile.mm */; };
+		16C7C918147D45AE00776EAD /* BreakpadDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 16C7C917147D45AE00776EAD /* BreakpadDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		16E02DB8147410F0008C604D /* uploader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 16E02DB4147410D4008C604D /* uploader.mm */; };
 		3329D4ED0FA16D820007BBC5 /* Breakpad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3329D4EC0FA16D820007BBC5 /* Breakpad.xib */; };
 		33880C800F9E097100817F82 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 33880C7E0F9E097100817F82 /* InfoPlist.strings */; };
 		4084699D0F5D9CF900FDCA37 /* crash_report_sender.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4084699C0F5D9CF900FDCA37 /* crash_report_sender.icns */; };
-		4D72CA0E13DFAD5C006CABE3 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.c */; };
-		4D72CA2513DFAE1C006CABE3 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.c */; };
-		4D72CA2F13DFAE65006CABE3 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.c */; };
-		4D72CA3813DFAE91006CABE3 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.c */; };
-		4D72CA3913DFAE92006CABE3 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.c */; };
+		4D61A25F14F43CFC002D5862 /* bootstrap_compat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */; };
+		4D61A26B14F43D3C002D5862 /* bootstrap_compat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */; };
+		4D61A26C14F43D42002D5862 /* bootstrap_compat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */; };
+		4D61A26D14F43D43002D5862 /* bootstrap_compat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */; };
+		4D61A26E14F43D45002D5862 /* bootstrap_compat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */; };
+		4D61A26F14F43D48002D5862 /* bootstrap_compat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */; };
+		4D72CA0E13DFAD5C006CABE3 /* md5.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.cc */; };
+		4D72CA2513DFAE1C006CABE3 /* md5.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.cc */; };
+		4D72CA2F13DFAE65006CABE3 /* md5.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.cc */; };
+		4D72CA3813DFAE91006CABE3 /* md5.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.cc */; };
+		4D72CA3913DFAE92006CABE3 /* md5.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.cc */; };
 		4DBE49A6134A4F200072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
 		4DBE49A7134A4F280072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
 		4DBE49A8134A4F380072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
@@ -544,11 +555,18 @@
 		0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 		1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		163201D41443019E00C4DBF5 /* ConfigFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConfigFile.h; path = crash_generation/ConfigFile.h; sourceTree = "<group>"; };
+		163201D51443019E00C4DBF5 /* ConfigFile.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = ConfigFile.mm; path = crash_generation/ConfigFile.mm; sourceTree = "<group>"; };
+		163202431443201300C4DBF5 /* uploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = uploader.h; path = sender/uploader.h; sourceTree = "<group>"; };
+		16C7C917147D45AE00776EAD /* BreakpadDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BreakpadDefines.h; sourceTree = "<group>"; };
+		16E02DB4147410D4008C604D /* uploader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = uploader.mm; path = sender/uploader.mm; sourceTree = "<group>"; };
 		32DBCF5E0370ADEE00C91783 /* Breakpad_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Breakpad_Prefix.pch; path = Framework/Breakpad_Prefix.pch; sourceTree = "<group>"; };
 		3329D4EC0FA16D820007BBC5 /* Breakpad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Breakpad.xib; path = sender/Breakpad.xib; sourceTree = "<group>"; };
 		33880C7F0F9E097100817F82 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = sender/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		4084699C0F5D9CF900FDCA37 /* crash_report_sender.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = crash_report_sender.icns; path = sender/crash_report_sender.icns; sourceTree = "<group>"; };
-		4D72CA0D13DFAD5C006CABE3 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md5.c; path = ../../common/md5.c; sourceTree = SOURCE_ROOT; };
+		4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bootstrap_compat.cc; path = ../../common/mac/bootstrap_compat.cc; sourceTree = SOURCE_ROOT; };
+		4D61A25E14F43CFC002D5862 /* bootstrap_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bootstrap_compat.h; path = ../../common/mac/bootstrap_compat.h; sourceTree = SOURCE_ROOT; };
+		4D72CA0D13DFAD5C006CABE3 /* md5.cc */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = md5.cc; path = ../../common/md5.cc; sourceTree = SOURCE_ROOT; };
 		4DBE4769134A4F080072546A /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
 		8B31007011F0CD3C00FCF3E4 /* GTMDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GTMDefines.h; path = ../../common/mac/GTMDefines.h; sourceTree = SOURCE_ROOT; };
 		8B3101E911F0CDE300FCF3E4 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -577,28 +595,28 @@
 		D2F9A4C8121336C7002747C1 /* crash_generation_server.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = crash_generation_server.cc; path = crash_generation/crash_generation_server.cc; sourceTree = "<group>"; };
 		D2F9A4CE121336F7002747C1 /* crash_generation_server_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = crash_generation_server_test.cc; path = tests/crash_generation_server_test.cc; sourceTree = "<group>"; };
 		D2F9A546121383A1002747C1 /* crash_generation_server_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = crash_generation_server_test; sourceTree = BUILT_PRODUCTS_DIR; };
-		DE43467411C72855004F095F /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = sender/da.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43467511C72857004F095F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = sender/de.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43467611C7285B004F095F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = sender/es.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43467711C72862004F095F /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = sender/fr.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43467811C72869004F095F /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = sender/it.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43467911C7286D004F095F /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = sender/nl.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43467A11C72873004F095F /* no */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = no; path = sender/no.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43467B11C72877004F095F /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sender/sl.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43467C11C7287A004F095F /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sender/sv.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43467E11C728DC004F095F /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = sender/ja.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43467F11C728E1004F095F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = sender/tr.lproj/Localizable.strings; sourceTree = "<group>"; };
-		DE43468611C72958004F095F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = sender/de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DE43468711C7295D004F095F /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = sender/da.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DE43468811C7295F004F095F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = sender/es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DE43468911C72964004F095F /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = sender/fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DE43468A11C72967004F095F /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = sender/it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DE43468B11C7296B004F095F /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = sender/ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DE43468C11C7296D004F095F /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = sender/nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DE43468D11C7296F004F095F /* no */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = no; path = sender/no.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DE43468E11C72971004F095F /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sender/sl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DE43468F11C72973004F095F /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sender/sv.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DE43469011C72976004F095F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = sender/tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43467411C72855004F095F /* da */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = da; path = sender/da.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43467511C72857004F095F /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = sender/de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43467611C7285B004F095F /* es */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = es; path = sender/es.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43467711C72862004F095F /* fr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr; path = sender/fr.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43467811C72869004F095F /* it */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = it; path = sender/it.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43467911C7286D004F095F /* nl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nl; path = sender/nl.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43467A11C72873004F095F /* no */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = no; path = sender/no.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43467B11C72877004F095F /* sl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sl; path = sender/sl.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43467C11C7287A004F095F /* sv */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sv; path = sender/sv.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43467E11C728DC004F095F /* ja */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ja; path = sender/ja.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43467F11C728E1004F095F /* tr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = tr; path = sender/tr.lproj/Localizable.strings; sourceTree = "<group>"; };
+		DE43468611C72958004F095F /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = sender/de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43468711C7295D004F095F /* da */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = da; path = sender/da.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43468811C7295F004F095F /* es */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = es; path = sender/es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43468911C72964004F095F /* fr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr; path = sender/fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43468A11C72967004F095F /* it */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = it; path = sender/it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43468B11C7296B004F095F /* ja */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ja; path = sender/ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43468C11C7296D004F095F /* nl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = nl; path = sender/nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43468D11C7296F004F095F /* no */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = no; path = sender/no.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43468E11C72971004F095F /* sl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sl; path = sender/sl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43468F11C72973004F095F /* sv */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sv; path = sender/sv.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		DE43469011C72976004F095F /* tr */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = tr; path = sender/tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		F91AF5CF0FD60393009D8BE2 /* BreakpadFramework_Test.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = BreakpadFramework_Test.mm; path = tests/BreakpadFramework_Test.mm; sourceTree = "<group>"; };
 		F9286B380F7EB25800A4DCC8 /* Inspector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Inspector.h; path = crash_generation/Inspector.h; sourceTree = "<group>"; };
 		F9286B390F7EB25800A4DCC8 /* InspectorMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = InspectorMain.mm; path = crash_generation/InspectorMain.mm; sourceTree = "<group>"; };
@@ -666,7 +684,7 @@
 		F9C44DAF0EF07288003AEBAA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = testapp/Info.plist; sourceTree = "<group>"; };
 		F9C44DB00EF07288003AEBAA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = testapp/main.m; sourceTree = "<group>"; };
 		F9C44DB10EF07288003AEBAA /* TestClass.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = TestClass.mm; path = testapp/TestClass.mm; sourceTree = "<group>"; };
-		F9C44DB90EF072A0003AEBAA /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = testapp/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		F9C44DB90EF072A0003AEBAA /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = testapp/English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		F9C44DBB0EF072A0003AEBAA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = testapp/English.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		F9C44DBF0EF0778F003AEBAA /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Controller.h; path = testapp/Controller.h; sourceTree = "<group>"; };
 		F9C44DC00EF0778F003AEBAA /* TestClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestClass.h; path = testapp/TestClass.h; sourceTree = "<group>"; };
@@ -848,6 +866,23 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		16C7C915147D45AE00776EAD /* apple */ = {
+			isa = PBXGroup;
+			children = (
+				16C7C916147D45AE00776EAD /* Framework */,
+			);
+			name = apple;
+			path = ../apple;
+			sourceTree = SOURCE_ROOT;
+		};
+		16C7C916147D45AE00776EAD /* Framework */ = {
+			isa = PBXGroup;
+			children = (
+				16C7C917147D45AE00776EAD /* BreakpadDefines.h */,
+			);
+			path = Framework;
+			sourceTree = "<group>";
+		};
 		D244536912426EE7009BBCE0 /* processor */ = {
 			isa = PBXGroup;
 			children = (
@@ -894,7 +929,7 @@
 				D244540A12439BA0009BBCE0 /* memory_unittest.cc */,
 				F92C53870ECCE6C0009BE4BA /* convert_UTF.c */,
 				F92C53880ECCE6C0009BE4BA /* convert_UTF.h */,
-				4D72CA0D13DFAD5C006CABE3 /* md5.c */,
+				4D72CA0D13DFAD5C006CABE3 /* md5.cc */,
 				F92C53850ECCE6AD009BE4BA /* string_conversion.cc */,
 				F92C53860ECCE6AD009BE4BA /* string_conversion.h */,
 				F92C53840ECCE68D009BE4BA /* mac */,
@@ -916,6 +951,8 @@
 				F92C53770ECCE635009BE4BA /* HTTPMultipartUpload.m */,
 				F92C53780ECCE635009BE4BA /* MachIPC.h */,
 				F92C53790ECCE635009BE4BA /* MachIPC.mm */,
+				4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */,
+				4D61A25E14F43CFC002D5862 /* bootstrap_compat.h */,
 				F92C537A0ECCE635009BE4BA /* macho_id.cc */,
 				F92C537B0ECCE635009BE4BA /* macho_id.h */,
 				F92C537C0ECCE635009BE4BA /* macho_utilities.cc */,
@@ -933,6 +970,7 @@
 		F92C538D0ECCE6F2009BE4BA /* client */ = {
 			isa = PBXGroup;
 			children = (
+				16C7C915147D45AE00776EAD /* apple */,
 				F92C53990ECCE78E009BE4BA /* mac */,
 				F92C538E0ECCE70A009BE4BA /* minidump_file_writer-inl.h */,
 				F92C538F0ECCE70A009BE4BA /* minidump_file_writer.cc */,
@@ -958,6 +996,8 @@
 		F92C53B50ECCE799009BE4BA /* crash_generation */ = {
 			isa = PBXGroup;
 			children = (
+				163201D41443019E00C4DBF5 /* ConfigFile.h */,
+				163201D51443019E00C4DBF5 /* ConfigFile.mm */,
 				D2F9A4C4121336C7002747C1 /* client_info.h */,
 				D2F9A4C5121336C7002747C1 /* crash_generation_client.h */,
 				D2F9A4C6121336C7002747C1 /* crash_generation_client.cc */,
@@ -985,6 +1025,8 @@
 		F92C56A60ECE04B6009BE4BA /* sender */ = {
 			isa = PBXGroup;
 			children = (
+				16E02DB4147410D4008C604D /* uploader.mm */,
+				163202431443201300C4DBF5 /* uploader.h */,
 				F9B6309F100FF96B00D0F4AC /* goArrow.png */,
 				F92C56A70ECE04C5009BE4BA /* crash_report_sender.h */,
 				F92C56A80ECE04C5009BE4BA /* crash_report_sender.m */,
@@ -1098,6 +1140,8 @@
 				D2F9A4C9121336C7002747C1 /* client_info.h in Headers */,
 				D2F9A4CA121336C7002747C1 /* crash_generation_client.h in Headers */,
 				D2F9A4CC121336C7002747C1 /* crash_generation_server.h in Headers */,
+				163201D61443019E00C4DBF5 /* ConfigFile.h in Headers */,
+				16C7C918147D45AE00776EAD /* BreakpadDefines.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1621,6 +1665,7 @@
 				F92C56340ECD0DF1009BE4BA /* OnDemandServer.mm in Sources */,
 				D2F9A4CB121336C7002747C1 /* crash_generation_client.cc in Sources */,
 				D2F9A4CD121336C7002747C1 /* crash_generation_server.cc in Sources */,
+				163201D71443019E00C4DBF5 /* ConfigFile.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1643,7 +1688,8 @@
 				D246419612BAA55A005170D0 /* macho_id.cc in Sources */,
 				D24641A012BAA67F005170D0 /* macho_walker.cc in Sources */,
 				D24641AF12BAA82D005170D0 /* macho_utilities.cc in Sources */,
-				4D72CA2513DFAE1C006CABE3 /* md5.c in Sources */,
+				4D72CA2513DFAE1C006CABE3 /* md5.cc in Sources */,
+				4D61A26C14F43D42002D5862 /* bootstrap_compat.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1681,7 +1727,8 @@
 				D24641ED12BAC6FB005170D0 /* minidump.cc in Sources */,
 				D24641EE12BAC6FB005170D0 /* pathname_stripper.cc in Sources */,
 				D24641EF12BAC6FB005170D0 /* basic_code_modules.cc in Sources */,
-				4D72CA3913DFAE92006CABE3 /* md5.c in Sources */,
+				4D72CA3913DFAE92006CABE3 /* md5.cc in Sources */,
+				4D61A26F14F43D48002D5862 /* bootstrap_compat.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1691,6 +1738,8 @@
 			files = (
 				F92C53B80ECCE7B3009BE4BA /* Inspector.mm in Sources */,
 				F9286B3A0F7EB25800A4DCC8 /* InspectorMain.mm in Sources */,
+				163201E31443029300C4DBF5 /* ConfigFile.mm in Sources */,
+				4D61A26B14F43D3C002D5862 /* bootstrap_compat.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1706,12 +1755,13 @@
 				F92C56430ECD10CA009BE4BA /* macho_utilities.cc in Sources */,
 				F92C56440ECD10CA009BE4BA /* macho_walker.cc in Sources */,
 				F92C56450ECD10CA009BE4BA /* MachIPC.mm in Sources */,
-				4D72CA0E13DFAD5C006CABE3 /* md5.c in Sources */,
+				4D72CA0E13DFAD5C006CABE3 /* md5.cc in Sources */,
 				F92C56460ECD10CA009BE4BA /* minidump_file_writer.cc in Sources */,
 				F92C56470ECD10CA009BE4BA /* minidump_generator.cc in Sources */,
 				F92C56480ECD10CA009BE4BA /* SimpleStringDictionary.mm in Sources */,
 				F92C56490ECD10CA009BE4BA /* string_utilities.cc in Sources */,
 				F92C564A0ECD10CA009BE4BA /* string_conversion.cc in Sources */,
+				4D61A25F14F43CFC002D5862 /* bootstrap_compat.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1722,6 +1772,7 @@
 				F9C44EA20EF09F93003AEBAA /* HTTPMultipartUpload.m in Sources */,
 				F92C56A90ECE04C5009BE4BA /* crash_report_sender.m in Sources */,
 				F9C44EE90EF0A3C1003AEBAA /* GTMLogger.m in Sources */,
+				16E02DB8147410F0008C604D /* uploader.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1749,7 +1800,8 @@
 				F93803D60F8083B7004D428B /* macho_walker.cc in Sources */,
 				F93803D70F8083B7004D428B /* string_utilities.cc in Sources */,
 				D23F4B2E12A7E13200686C8D /* minidump_generator_test.cc in Sources */,
-				4D72CA2F13DFAE65006CABE3 /* md5.c in Sources */,
+				4D72CA2F13DFAE65006CABE3 /* md5.cc in Sources */,
+				4D61A26D14F43D43002D5862 /* bootstrap_compat.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1789,7 +1841,8 @@
 				F93DE33F0F82C66B00608B94 /* string_utilities.cc in Sources */,
 				D2F9A3D51212F87C002747C1 /* exception_handler_test.cc in Sources */,
 				D244540B12439BA0009BBCE0 /* memory_unittest.cc in Sources */,
-				4D72CA3813DFAE91006CABE3 /* md5.c in Sources */,
+				4D72CA3813DFAE91006CABE3 /* md5.cc in Sources */,
+				4D61A26E14F43D45002D5862 /* bootstrap_compat.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2055,9 +2108,6 @@
 			buildSettings = {
 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				SDKROOT = macosx10.5;
-				"SDKROOTarch=i386" = macosx10.4;
-				"SDKROOTarch=ppc" = macosx10.4;
-				"SDKROOTarch=x86_64" = macosx10.6;
 			};
 			name = Debug;
 		};
@@ -2091,6 +2141,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = ../..;
 				INSTALL_PATH = /usr/local/bin;
 				PREBINDING = NO;
 				PRODUCT_NAME = minidump_generator_test_helper;
@@ -2105,6 +2156,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = ../..;
 				INSTALL_PATH = /usr/local/bin;
 				PREBINDING = NO;
 				PRODUCT_NAME = minidump_generator_test_helper;
@@ -2120,7 +2172,7 @@
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				HEADER_SEARCH_PATHS = (
-					$inherited,
+					"$(inherited)",
 					../../testing,
 					../../testing/include,
 					../../testing/gtest,
@@ -2135,6 +2187,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					../../testing,
+					../../testing/include,
+					../../testing/gtest,
+					../../testing/gtest/include,
+				);
 				PREBINDING = NO;
 				PRODUCT_NAME = gtest;
 			};
@@ -2147,6 +2206,13 @@
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					../../testing,
+					../../testing/include,
+					../../testing/gtest,
+					../../testing/gtest/include,
+				);
 				PREBINDING = NO;
 				PRODUCT_NAME = gtest;
 				ZERO_LINK = NO;
@@ -2178,24 +2244,36 @@
 		D2F9A544121383A1002747C1 /* Debug With Code Coverage */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = ../..;
+				HEADER_SEARCH_PATHS = (
+					../..,
+					../../testing,
+					../../testing/include,
+					../../testing/gtest,
+					../../testing/gtest/include,
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\\\"$(SRCROOT)/build/Debug\\\"",
 				);
-				PRODUCT_NAME = handler_test;
+				PRODUCT_NAME = crash_generation_server_test;
 			};
 			name = "Debug With Code Coverage";
 		};
 		D2F9A545121383A1002747C1 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = ../..;
+				HEADER_SEARCH_PATHS = (
+					../..,
+					../../testing,
+					../../testing/include,
+					../../testing/gtest,
+					../../testing/gtest/include,
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\\\"$(SRCROOT)/build/Debug\\\"",
 				);
-				PRODUCT_NAME = handler_test;
+				PRODUCT_NAME = crash_generation_server_test;
 			};
 			name = Release;
 		};
@@ -2282,7 +2360,14 @@
 		F93803C10F808210004D428B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = ../..;
+				HEADER_SEARCH_PATHS = (
+					../..,
+					../../..,
+					../../testing,
+					../../testing/include,
+					../../testing/gtest,
+					../../testing/gtest/include,
+				);
 				PRODUCT_NAME = generator_test;
 			};
 			name = Release;
@@ -2329,7 +2414,14 @@
 		F93DE32F0F82C55700608B94 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = ../..;
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../..,
+					../../testing,
+					../../testing/include,
+					../../testing/gtest,
+					../../testing/gtest/include,
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/build/Debug\"",
@@ -2428,7 +2520,14 @@
 		F93DE3C10F830E7000608B94 /* Debug With Code Coverage */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = ../..;
+				HEADER_SEARCH_PATHS = (
+					../..,
+					../../..,
+					../../testing,
+					../../testing/include,
+					../../testing/gtest,
+					../../testing/gtest/include,
+				);
 				PRODUCT_NAME = generator_test;
 			};
 			name = "Debug With Code Coverage";
@@ -2444,7 +2543,14 @@
 		F93DE3C30F830E7000608B94 /* Debug With Code Coverage */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				HEADER_SEARCH_PATHS = ../..;
+				HEADER_SEARCH_PATHS = (
+					../../..,
+					../..,
+					../../testing,
+					../../testing/include,
+					../../testing/gtest,
+					../../testing/gtest/include,
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/build/Debug\"",

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/Framework/Breakpad.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/Framework/Breakpad.h Changed

@@ -41,6 +41,10 @@
 // modify the default behavior to suit your needs and wants and
 // desires.
 
+// A service name associated with the original bootstrap parent port, saved in
+// OnDemandServer and restored in Inspector.
+#define BREAKPAD_BOOTSTRAP_PARENT_PORT    "com.Breakpad.BootstrapParent"
+
 typedef void *BreakpadRef;
 
 #ifdef __cplusplus
@@ -50,49 +54,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <Foundation/Foundation.h>
 
-// Keys for configuration file
-#define kReporterMinidumpDirectoryKey "MinidumpDir"
-#define kReporterMinidumpIDKey        "MinidumpID"
-
-// Filename for recording uploaded IDs
-#define kReporterLogFilename          "uploads.log"
-
-// The default subdirectory of the Library to put crash dumps in
-// The subdirectory is
-//  ~/Library/<kDefaultLibrarySubdirectory>/<GoogleBreakpadProduct>
-#define kDefaultLibrarySubdirectory   "Breakpad"
-
-// Specify some special keys to be used in the configuration file that is
-// generated by Breakpad and consumed by the crash_sender.
-#define BREAKPAD_PRODUCT               "BreakpadProduct"
-#define BREAKPAD_PRODUCT_DISPLAY       "BreakpadProductDisplay"
-#define BREAKPAD_VERSION               "BreakpadVersion"
-#define BREAKPAD_VENDOR                "BreakpadVendor"
-#define BREAKPAD_URL                   "BreakpadURL"
-#define BREAKPAD_REPORT_INTERVAL       "BreakpadReportInterval"
-#define BREAKPAD_SKIP_CONFIRM          "BreakpadSkipConfirm"
-#define BREAKPAD_CONFIRM_TIMEOUT       "BreakpadConfirmTimeout"
-#define BREAKPAD_SEND_AND_EXIT         "BreakpadSendAndExit"
-#define BREAKPAD_DUMP_DIRECTORY        "BreakpadMinidumpLocation"
-#define BREAKPAD_INSPECTOR_LOCATION    "BreakpadInspectorLocation"
-#define BREAKPAD_REPORTER_EXE_LOCATION \
-  "BreakpadReporterExeLocation"
-#define BREAKPAD_LOGFILES              "BreakpadLogFiles"
-#define BREAKPAD_LOGFILE_UPLOAD_SIZE   "BreakpadLogFileTailSize"
-#define BREAKPAD_REQUEST_COMMENTS      "BreakpadRequestComments"
-#define BREAKPAD_COMMENTS              "BreakpadComments"
-#define BREAKPAD_REQUEST_EMAIL         "BreakpadRequestEmail"
-#define BREAKPAD_EMAIL                 "BreakpadEmail"
-#define BREAKPAD_SERVER_TYPE           "BreakpadServerType"
-#define BREAKPAD_SERVER_PARAMETER_DICT "BreakpadServerParameters"
-
-// The keys below are NOT user supplied, and are used internally.
-#define BREAKPAD_PROCESS_START_TIME       "BreakpadProcStartTime"
-#define BREAKPAD_PROCESS_UP_TIME          "BreakpadProcessUpTime"
-#define BREAKPAD_PROCESS_CRASH_TIME       "BreakpadProcessCrashTime"
-#define BREAKPAD_LOGFILE_KEY_PREFIX       "BreakpadAppLogFile"
-#define BREAKPAD_SERVER_PARAMETER_PREFIX  "BreakpadServerParameterPrefix_"
-#define BREAKPAD_ON_DEMAND                "BreakpadOnDemand"
+#include "BreakpadDefines.h"
 
 // Optional user-defined function to dec to decide if we should handle
 // this crash or forward it along.
@@ -224,13 +186,15 @@
 // completeness.  They are calculated by Breakpad during initialization &
 // crash-dump generation, or entered in by the user.
 //
-// BREAKPAD_PROCESS_START_TIME       The time the process started.
+// BREAKPAD_PROCESS_START_TIME       The time, in seconds since the Epoch, the
+//                                   process started
 //
-// BREAKPAD_PROCESS_CRASH_TIME       The time the process crashed.
+// BREAKPAD_PROCESS_CRASH_TIME       The time, in seconds since the Epoch, the
+//                                   process crashed.
 //
-// BREAKPAD_PROCESS_UP_TIME          The total time the process has been
-//                                   running.  This parameter is not set
-//                                   until the crash-dump-generation phase.
+// BREAKPAD_PROCESS_UP_TIME          The total time in milliseconds the process
+//                                   has been running.  This parameter is not
+//                                   set until the crash-dump-generation phase.
 //
 // BREAKPAD_LOGFILE_KEY_PREFIX       Used to find out which parameters in the
 //                                   parameter dictionary correspond to log

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/Framework/Breakpad.mm -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/Framework/Breakpad.mm Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/Framework/OnDemandServer.mm -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/Framework/OnDemandServer.mm Changed

@@ -29,11 +29,23 @@
 
 #import "OnDemandServer.h"
 
+#import "Breakpad.h"
+#include "common/mac/bootstrap_compat.h"
+
 #if DEBUG
   #define PRINT_MACH_RESULT(result_, message_) \
     printf(message_"%s (%d)\n", mach_error_string(result_), result_ );
+#if defined(MAC_OS_X_VERSION_10_5) && \
+    MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+  #define PRINT_BOOTSTRAP_RESULT(result_, message_) \
+    printf(message_"%s (%d)\n", bootstrap_strerror(result_), result_ );
+#else
+  #define PRINT_BOOTSTRAP_RESULT(result_, message_) \
+    PRINT_MACH_RESULT(result_, message_)
+#endif
 #else
   #define PRINT_MACH_RESULT(result_, message_)
+  #define PRINT_BOOTSTRAP_RESULT(result_, message_)
 #endif
 
 //==============================================================================
@@ -67,15 +79,45 @@
                                          bool unregister_on_cleanup) {
   unregister_on_cleanup_ = unregister_on_cleanup;
 
-  kern_return_t kr =
-    bootstrap_create_server(bootstrap_port,
-                            const_cast<char*>(server_command),
-                            geteuid(),       // server uid
-                            true,
-                            &server_port_);
+  mach_port_t self_task = mach_task_self();
 
+  mach_port_t bootstrap_port;
+  kern_return_t kr = task_get_bootstrap_port(self_task, &bootstrap_port);
   if (kr != KERN_SUCCESS) {
-    PRINT_MACH_RESULT(kr, "bootstrap_create_server() : ");
+    PRINT_MACH_RESULT(kr, "task_get_bootstrap_port(): ");
+    return kr;
+  }
+
+  mach_port_t bootstrap_subset_port;
+  kr = bootstrap_subset(bootstrap_port, self_task, &bootstrap_subset_port);
+  if (kr != BOOTSTRAP_SUCCESS) {
+    PRINT_BOOTSTRAP_RESULT(kr, "bootstrap_subset(): ");
+    return kr;
+  }
+
+  // The inspector will be invoked with its bootstrap port set to the subset,
+  // but the sender will need access to the original bootstrap port. Although
+  // the original port is the subset's parent, bootstrap_parent can't be used
+  // because it requires extra privileges. Stash the original bootstrap port
+  // in the subset by registering it under a known name. The inspector will
+  // recover this port and set it as its own bootstrap port in Inspector.mm
+  // Inspector::ResetBootstrapPort.
+  kr = breakpad::BootstrapRegister(
+      bootstrap_subset_port,
+      const_cast<char*>(BREAKPAD_BOOTSTRAP_PARENT_PORT),
+      bootstrap_port);
+  if (kr != BOOTSTRAP_SUCCESS) {
+    PRINT_BOOTSTRAP_RESULT(kr, "bootstrap_register(): ");
+    return kr;
+  }
+
+  kr = bootstrap_create_server(bootstrap_subset_port,
+                               const_cast<char*>(server_command),
+                               geteuid(),       // server uid
+                               true,
+                               &server_port_);
+  if (kr != BOOTSTRAP_SUCCESS) {
+    PRINT_BOOTSTRAP_RESULT(kr, "bootstrap_create_server(): ");
     return kr;
   }
 
@@ -86,15 +128,14 @@
   kr = bootstrap_create_service(server_port_,
                                 const_cast<char*>(service_name),
                                 &service_port_);
-
-  if (kr != KERN_SUCCESS) {
-    PRINT_MACH_RESULT(kr, "bootstrap_create_service() : ");
+  if (kr != BOOTSTRAP_SUCCESS) {
+    PRINT_BOOTSTRAP_RESULT(kr, "bootstrap_create_service(): ");
 
     // perhaps the service has already been created - try to look it up
     kr = bootstrap_look_up(bootstrap_port, (char*)service_name, &service_port_);
 
-    if (kr != KERN_SUCCESS) {
-      PRINT_MACH_RESULT(kr, "bootstrap_look_up() : ");
+    if (kr != BOOTSTRAP_SUCCESS) {
+      PRINT_BOOTSTRAP_RESULT(kr, "bootstrap_look_up(): ");
       Unregister();  // clean up server port
       return kr;
     }
@@ -131,9 +172,9 @@
 
   if (server_port_ != MACH_PORT_NULL) {
     // unregister the service
-    kern_return_t kr = bootstrap_register(server_port_,
-                                          service_name_,
-                                          MACH_PORT_NULL);
+    kern_return_t kr = breakpad::BootstrapRegister(server_port_,
+                                                   service_name_,
+                                                   MACH_PORT_NULL);
 
     if (kr != KERN_SUCCESS) {
       PRINT_MACH_RESULT(kr, "Breakpad UNREGISTER : bootstrap_register() : ");

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/crash_generation/ConfigFile.h Added

@@ -0,0 +1,83 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Utility class that can persist a SimpleStringDictionary to disk.
+
+#import <Foundation/Foundation.h>
+
+#import "common/mac/SimpleStringDictionary.h"
+
+namespace google_breakpad {
+
+BOOL EnsureDirectoryPathExists(NSString *dirPath);
+
+//=============================================================================
+class ConfigFile {
+ public:
+  ConfigFile() {
+    config_file_ = -1;
+    config_file_path_0 = 0;
+    has_created_file_ = false;
+  };
+
+  ~ConfigFile() {
+  };
+
+  void WriteFile(const char* directory,
+                 const SimpleStringDictionary *configurationParameters,
+                 const char *dump_dir,
+                 const char *minidump_id);
+
+  const char *GetFilePath() { return config_file_path_; }
+
+  void Unlink() {
+    if (config_file_ != -1)
+      unlink(config_file_path_);
+
+    config_file_ = -1;
+  }
+
+ private:
+  BOOL WriteData(const void *data, size_t length);
+
+  BOOL AppendConfigData(const char *key,
+                        const void *data,
+                        size_t length);
+
+  BOOL AppendConfigString(const char *key,
+                          const char *value);
+
+  BOOL AppendCrashTimeParameters(const char *processStartTimeString);
+
+  int   config_file_;                    // descriptor for config file
+  char  config_file_path_PATH_MAX;     // Path to configuration file
+  bool  has_created_file_;
+};
+
+} // namespace google_breakpad

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/crash_generation/ConfigFile.mm Added

@@ -0,0 +1,190 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Utility class that can persist a SimpleStringDictionary to disk.
+
+#import "client/mac/crash_generation/ConfigFile.h"
+
+#import <Foundation/Foundation.h>
+#include <stdio.h>
+#include <sys/time.h>
+
+#import "client/apple/Framework/BreakpadDefines.h"
+#import "common/mac/SimpleStringDictionary.h"
+#import "GTMDefines.h"
+
+#define VERBOSE 0
+
+#if VERBOSE
+  bool gDebugLog = true;
+#else
+  bool gDebugLog = false;
+#endif
+
+#define DEBUGLOG if (gDebugLog) fprintf
+
+namespace google_breakpad {
+
+//=============================================================================
+BOOL EnsureDirectoryPathExists(NSString *dirPath) {
+  NSFileManager *mgr = NSFileManager defaultManager;
+
+  NSDictionary *attrs =
+    NSDictionary dictionaryWithObject:NSNumber numberWithUnsignedLong:0750
+                                forKey:NSFilePosixPermissions;
+
+  return mgr createDirectoryAtPath:dirPath
+        withIntermediateDirectories:YES
+                         attributes:attrs
+                              error:nil;
+}
+
+//=============================================================================
+BOOL ConfigFile::WriteData(const void *data, size_t length) {
+  size_t result = write(config_file_, data, length);
+
+  return result == length;
+}
+
+//=============================================================================
+BOOL ConfigFile::AppendConfigData(const char *key,
+                                  const void *data, size_t length) {
+  assert(config_file_ != -1);
+
+  if (!key) {
+    DEBUGLOG(stderr, "Breakpad: Missing Key\n");
+    return NO;
+  }
+
+  if (!data) {
+    DEBUGLOG(stderr, "Breakpad: Missing data for key: %s\n", key ? key :
+            "<Unknown Key>");
+    return NO;
+  }
+
+  // Write the key, \n, length of data (ascii integer), \n, data
+  char buffer16;
+  char nl = '\n';
+  BOOL result = WriteData(key, strlen(key));
+
+  snprintf(buffer, sizeof(buffer) - 1, "\n%lu\n", length);
+  result &= WriteData(buffer, strlen(buffer));
+  result &= WriteData(data, length);
+  result &= WriteData(&nl, 1);
+  return result;
+}
+
+//=============================================================================
+BOOL ConfigFile::AppendConfigString(const char *key,
+                                    const char *value) {
+  return AppendConfigData(key, value, strlen(value));
+}
+
+//=============================================================================
+BOOL ConfigFile::AppendCrashTimeParameters(const char *processStartTimeString) {
+  // Set process uptime parameter
+  struct timeval tv;
+  gettimeofday(&tv, NULL);
+
+  char processUptimeString32, processCrashtimeString32;
+  // Set up time if we've received the start time.
+  if (processStartTimeString) {
+    time_t processStartTime = strtol(processStartTimeString, NULL, 10);
+    time_t processUptime = tv.tv_sec - processStartTime;
+    // Store the uptime in milliseconds.
+    sprintf(processUptimeString, "%llu",
+        static_cast<unsigned long long int>(processUptime) * 1000);
+    if (!AppendConfigString(BREAKPAD_PROCESS_UP_TIME, processUptimeString))
+      return false;
+  }
+
+  sprintf(processCrashtimeString, "%zd", tv.tv_sec);
+  return AppendConfigString(BREAKPAD_PROCESS_CRASH_TIME,
+                            processCrashtimeString);
+}
+
+//=============================================================================
+void ConfigFile::WriteFile(const char* directory,
+                           const SimpleStringDictionary *configurationParameters,
+                           const char *dump_dir,
+                           const char *minidump_id) {
+
+  assert(config_file_ == -1);
+
+  // Open and write out configuration file preamble
+  if (directory) {
+    snprintf(config_file_path_, sizeof(config_file_path_), "%s/Config-XXXXXX",
+             directory);
+  } else {
+    strlcpy(config_file_path_, "/tmp/Config-XXXXXX",
+            sizeof(config_file_path_));
+  }
+  config_file_ = mkstemp(config_file_path_);
+
+  if (config_file_ == -1) {
+    DEBUGLOG(stderr,
+             "mkstemp(config_file_path_) == -1 (%s)\n",
+             strerror(errno));
+    return;
+  }
+  else {
+    DEBUGLOG(stderr, "Writing config file to (%s)\n", config_file_path_);
+  }
+
+  has_created_file_ = true;
+
+  // Add the minidump dir
+  AppendConfigString(kReporterMinidumpDirectoryKey, dump_dir);
+  AppendConfigString(kReporterMinidumpIDKey, minidump_id);
+
+  // Write out the configuration parameters
+  BOOL result = YES;
+  const SimpleStringDictionary &dictionary = *configurationParameters;
+
+  const KeyValueEntry *entry = NULL;
+  SimpleStringDictionaryIterator iter(dictionary);
+
+  while ((entry = iter.Next())) {
+    DEBUGLOG(stderr,
+             "config: (%s) -> (%s)\n",
+             entry->GetKey(),
+             entry->GetValue());
+    result = AppendConfigString(entry->GetKey(), entry->GetValue());
+
+    if (!result)
+      break;
+  }
+  AppendCrashTimeParameters(
+      configurationParameters->GetValueForKey(BREAKPAD_PROCESS_START_TIME));
+
+  close(config_file_);
+  config_file_ = -1;
+}
+
+} // namespace google_breakpad

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/crash_generation/Inspector.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/crash_generation/Inspector.h Changed

@@ -33,9 +33,10 @@
 #import "common/mac/SimpleStringDictionary.h"
 
 #import <Foundation/Foundation.h>
-#import "client/mac/handler/minidump_generator.h"
+#include <mach/mach.h>
 
-#define VERBOSE 0
+#import "client/mac/crash_generation/ConfigFile.h"
+#import "client/mac/handler/minidump_generator.h"
 
 extern bool gDebugLog;
 
@@ -78,48 +79,6 @@
 
 namespace google_breakpad {
 
-BOOL EnsureDirectoryPathExists(NSString *dirPath);
-
-//=============================================================================
-class ConfigFile {
- public:
-  ConfigFile() {
-    config_file_ = -1;
-    config_file_path_0 = 0;
-    has_created_file_ = false;
-  };
-
-  ~ConfigFile() {
-  };
-
-  void WriteFile(const SimpleStringDictionary *configurationParameters,
-                 const char *dump_dir,
-                 const char *minidump_id);
-
-  const char *GetFilePath() { return config_file_path_; }
-
-  void Unlink() {
-    if (config_file_ != -1)
-      unlink(config_file_path_);
-
-    config_file_ = -1;
-  }
-
- private:
-  BOOL WriteData(const void *data, size_t length);
-
-  BOOL AppendConfigData(const char *key,
-                        const void *data,
-                        size_t length);
-
-  BOOL AppendConfigString(const char *key,
-                          const char *value);
-
-  int   config_file_;                    // descriptor for config file
-  char  config_file_path_PATH_MAX;     // Path to configuration file
-  bool  has_created_file_;
-};
-
 //=============================================================================
 class MinidumpLocation {
  public:
@@ -163,6 +122,18 @@
   void            Inspect(const char *receive_port_name);
 
  private:
+  // The Inspector is invoked with its bootstrap port set to the bootstrap
+  // subset established in OnDemandServer.mm OnDemandServer::Initialize.
+  // For proper communication with the system, the sender (which will inherit
+  // the Inspector's bootstrap port) needs the per-session bootstrap namespace
+  // available directly in its bootstrap port. OnDemandServer stashed this
+  // port into the subset namespace under a special name. ResetBootstrapPort
+  // recovers this port and switches this task to use it as its own bootstrap
+  // (ensuring that children like the sender will inherit it), and saves the
+  // subset in bootstrap_subset_port_ for use by ServiceCheckIn and
+  // ServiceCheckOut.
+  kern_return_t   ResetBootstrapPort();
+
   kern_return_t   ServiceCheckIn(const char *receive_port_name);
   kern_return_t   ServiceCheckOut(const char *receive_port_name);
 
@@ -172,7 +143,9 @@
   kern_return_t   SendAcknowledgement();
   void            LaunchReporter(const char *inConfigFilePath);
 
-  void            SetCrashTimeParameters();
+  // The bootstrap port in which the inspector is registered and into which it
+  // must check in.
+  mach_port_t     bootstrap_subset_port_;
 
   mach_port_t     service_rcv_port_;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/crash_generation/Inspector.mm -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/crash_generation/Inspector.mm Changed

@@ -31,10 +31,10 @@
 
 #include <cstdio>
 #include <iostream>
+#include <servers/bootstrap.h>
 #include <stdio.h>
 #include <string.h>
 #include <string>
-#include <sys/time.h>
 
 #import "client/mac/crash_generation/Inspector.h"
 
@@ -43,167 +43,22 @@
 
 #import "common/mac/SimpleStringDictionary.h"
 #import "common/mac/MachIPC.h"
+#include "common/mac/bootstrap_compat.h"
 
 #import "GTMDefines.h"
 
 #import <Foundation/Foundation.h>
 
-#if VERBOSE
-  bool gDebugLog = true;
-#else
-  bool gDebugLog = false;
-#endif
-
 namespace google_breakpad {
 
 //=============================================================================
-BOOL EnsureDirectoryPathExists(NSString *dirPath) {
-  NSFileManager *mgr = NSFileManager defaultManager;
-
-  // If we got a relative path, prepend the current directory
-  if (!dirPath isAbsolutePath)
-    dirPath = mgr currentDirectoryPath stringByAppendingPathComponent:dirPath;
-
-  NSString *path = dirPath;
-
-  // Ensure that no file exists within the path which would block creation
-  while (1) {
-    BOOL isDir;
-    if (mgr fileExistsAtPath:path isDirectory:&isDir) {
-      if (isDir)
-        break;
-
-      return NO;
-    }
-
-    path = path stringByDeletingLastPathComponent;
-  }
-
-  // Path now contains the first valid directory (or is empty)
-  if (!path length)
-    return NO;
-
-  NSString *common =
-    dirPath commonPrefixWithString:path options:NSLiteralSearch;
-
-  // If everything is good
-  if (common isEqualToString:dirPath)
-    return YES;
-
-  // Break up the difference into components
-  NSString *diff = dirPath substringFromIndex:common length + 1;
-  NSArray *components = diff pathComponents;
-  NSUInteger count = components count;
-
-  // Rebuild the path one component at a time
-  NSDictionary *attrs =
-    NSDictionary dictionaryWithObject:NSNumber numberWithUnsignedLong:0750
-                                forKey:NSFilePosixPermissions;
-  path = common;
-  for (NSUInteger i = 0; i < count; ++i) {
-    path = path stringByAppendingPathComponent:components objectAtIndex:i;
-
-    if (!mgr createDirectoryAtPath:path attributes:attrs)
-      return NO;
-  }
-
-  return YES;
-}
-
-//=============================================================================
-BOOL ConfigFile::WriteData(const void *data, size_t length) {
-  size_t result = write(config_file_, data, length);
-
-  return result == length;
-}
-
-//=============================================================================
-BOOL ConfigFile::AppendConfigData(const char *key,
-                                  const void *data, size_t length) {
-  assert(config_file_ != -1);
-
-  if (!key) {
-    DEBUGLOG(stderr, "Breakpad: Missing Key\n");
-    return NO;
-  }
-
-  if (!data) {
-    DEBUGLOG(stderr, "Breakpad: Missing data for key: %s\n", key ? key :
-            "<Unknown Key>");
-    return NO;
-  }
-
-  // Write the key, \n, length of data (ascii integer), \n, data
-  char buffer16;
-  char nl = '\n';
-  BOOL result = WriteData(key, strlen(key));
-
-  snprintf(buffer, sizeof(buffer) - 1, "\n%lu\n", length);
-  result &= WriteData(buffer, strlen(buffer));
-  result &= WriteData(data, length);
-  result &= WriteData(&nl, 1);
-  return result;
-}
-
-//=============================================================================
-BOOL ConfigFile::AppendConfigString(const char *key,
-                                    const char *value) {
-  return AppendConfigData(key, value, strlen(value));
-}
-
-//=============================================================================
-void ConfigFile::WriteFile(const SimpleStringDictionary *configurationParameters,
-                           const char *dump_dir,
-                           const char *minidump_id) {
-
-  assert(config_file_ == -1);
-
-  // Open and write out configuration file preamble
-  strlcpy(config_file_path_, "/tmp/Config-XXXXXX",
-          sizeof(config_file_path_));
-  config_file_ = mkstemp(config_file_path_);
-
-  if (config_file_ == -1) {
-    DEBUGLOG(stderr,
-             "mkstemp(config_file_path_) == -1 (%s)\n",
-             strerror(errno));
+void Inspector::Inspect(const char *receive_port_name) {
+  kern_return_t result = ResetBootstrapPort();
+  if (result != KERN_SUCCESS) {
     return;
   }
-  else {
-    DEBUGLOG(stderr, "Writing config file to (%s)\n", config_file_path_);
-  }
-
-  has_created_file_ = true;
-
-  // Add the minidump dir
-  AppendConfigString(kReporterMinidumpDirectoryKey, dump_dir);
-  AppendConfigString(kReporterMinidumpIDKey, minidump_id);
-
-  // Write out the configuration parameters
-  BOOL result = YES;
-  const SimpleStringDictionary &dictionary = *configurationParameters;
-
-  const KeyValueEntry *entry = NULL;
-  SimpleStringDictionaryIterator iter(dictionary);
-
-  while ((entry = iter.Next())) {
-    DEBUGLOG(stderr,
-             "config: (%s) -> (%s)\n",
-             entry->GetKey(),
-             entry->GetValue());
-    result = AppendConfigString(entry->GetKey(), entry->GetValue());
-
-    if (!result)
-      break;
-  }
-
-  close(config_file_);
-  config_file_ = -1;
-}
 
-//=============================================================================
-void Inspector::Inspect(const char *receive_port_name) {
-  kern_return_t result = ServiceCheckIn(receive_port_name);
+  result = ServiceCheckIn(receive_port_name);
 
   if (result == KERN_SUCCESS) {
     result = ReadMessages();
@@ -241,10 +96,55 @@
 }
 
 //=============================================================================
+kern_return_t Inspector::ResetBootstrapPort() {
+  // A reasonable default, in case anything fails.
+  bootstrap_subset_port_ = bootstrap_port;
+
+  mach_port_t self_task = mach_task_self();
+
+  kern_return_t kr = task_get_bootstrap_port(self_task,
+                                             &bootstrap_subset_port_);
+  if (kr != KERN_SUCCESS) {
+    NSLog(@"ResetBootstrapPort: task_get_bootstrap_port failed: %s (%d)",
+          mach_error_string(kr), kr);
+    return kr;
+  }
+
+  mach_port_t bootstrap_parent_port;
+  kr = bootstrap_look_up(bootstrap_subset_port_,
+                         const_cast<char*>(BREAKPAD_BOOTSTRAP_PARENT_PORT),
+                         &bootstrap_parent_port);
+  if (kr != BOOTSTRAP_SUCCESS) {
+    NSLog(@"ResetBootstrapPort: bootstrap_look_up failed: %s (%d)",
+#if defined(MAC_OS_X_VERSION_10_5) && \
+    MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+          bootstrap_strerror(kr),
+#else
+          mach_error_string(kr),
+#endif
+          kr);
+    return kr;
+  }
+
+  kr = task_set_bootstrap_port(self_task, bootstrap_parent_port);
+  if (kr != KERN_SUCCESS) {
+    NSLog(@"ResetBootstrapPort: task_set_bootstrap_port failed: %s (%d)",
+          mach_error_string(kr), kr);
+    return kr;
+  }
+
+  // Some things access the bootstrap port through this global variable
+  // instead of calling task_get_bootstrap_port.
+  bootstrap_port = bootstrap_parent_port;
+
+  return KERN_SUCCESS;
+}
+
+//=============================================================================
 kern_return_t Inspector::ServiceCheckIn(const char *receive_port_name) {
   // We need to get the mach port representing this service, so we can
   // get information from the crashed process.
-  kern_return_t kr = bootstrap_check_in(bootstrap_port,
+  kern_return_t kr = bootstrap_check_in(bootstrap_subset_port_,
                                         (char*)receive_port_name,
                                         &service_rcv_port_);
 
@@ -275,9 +175,9 @@
   }
 
   // Unregister the service associated with the receive port.
-  kr = bootstrap_register(bootstrap_port,
-                          (char*)receive_port_name,
-                          MACH_PORT_NULL);
+  kr = breakpad::BootstrapRegister(bootstrap_subset_port_,
+                                   (char*)receive_port_name,
+                                   MACH_PORT_NULL);
 
   if (kr != KERN_SUCCESS) {
     PRINT_MACH_RESULT(kr, "Inspector: UNREGISTERING: bootstrap_register()");
@@ -363,30 +263,6 @@
 }
 
 //=============================================================================
-// Sets keys in the parameters dictionary that are specific to process uptime.
-// The two we set are process up time, and process crash time.
-void Inspector::SetCrashTimeParameters() {
-  // Set process uptime parameter
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-
-  char processUptimeString32, processCrashtimeString32;
-  const char *processStartTimeString =
-    config_params_.GetValueForKey(BREAKPAD_PROCESS_START_TIME);
-
-  // Set up time if we've received the start time.
-  if (processStartTimeString) {
-    time_t processStartTime = strtol(processStartTimeString, NULL, 10);
-    time_t processUptime = tv.tv_sec - processStartTime;
-    sprintf(processUptimeString, "%zd", processUptime);
-    config_params_.SetKeyValue(BREAKPAD_PROCESS_UP_TIME, processUptimeString);
-  }
-
-  sprintf(processCrashtimeString, "%zd", tv.tv_sec);
-  config_params_.SetKeyValue(BREAKPAD_PROCESS_CRASH_TIME,
-                             processCrashtimeString);
-}
-
 bool Inspector::InspectTask() {
   // keep the task quiet while we're looking at it
   task_suspend(remote_task_);
@@ -397,7 +273,6 @@
   const char *minidumpDirectory =
     config_params_.GetValueForKey(BREAKPAD_DUMP_DIRECTORY);
 
-  SetCrashTimeParameters();
   // If the client app has not specified a minidump directory,
   // use a default of Library/<kDefaultLibrarySubdirectory>/<Product Name>
   if (!minidumpDirectory || 0 == strlen(minidumpDirectory)) {
@@ -448,7 +323,8 @@
            minidumpPath UTF8String);
 
 
-  config_file_.WriteFile( &config_params_,
+  config_file_.WriteFile( 0,
+                          &config_params_,
                           minidumpLocation.GetPath(),
                           minidumpLocation.GetID());

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/breakpad_nlist_64.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/handler/breakpad_nlist_64.cc Changed

@@ -67,6 +67,7 @@
 
 #include "breakpad_nlist_64.h"
 
+#include <CoreFoundation/CoreFoundation.h>
 #include <fcntl.h>
 #include <mach-o/nlist.h>
 #include <mach-o/loader.h>
@@ -189,16 +190,16 @@
 
   struct exec buf;
   if (read(fd, (char *)&buf, sizeof(buf)) != sizeof(buf) ||
-      (N_BADMAG(buf) && *((long *)&buf) != magic &&
-       NXSwapBigLongToHost(*((long *)&buf)) != FAT_MAGIC) &&
-      /* The following is the big-endian ppc64 check */
-      (*((long*)&buf)) != FAT_MAGIC) {
+      (N_BADMAG(buf) && *((uint32_t *)&buf) != magic &&
+        CFSwapInt32BigToHost(*((uint32_t *)&buf)) != FAT_MAGIC &&
+       /* The following is the big-endian ppc64 check */
+       (*((uint32_t*)&buf)) != FAT_MAGIC)) {
     return -1;
   }
 
   /* Deal with fat file if necessary */
   unsigned arch_offset = 0;
-  if (NXSwapBigLongToHost(*((long *)&buf)) == FAT_MAGIC ||
+  if (CFSwapInt32BigToHost(*((uint32_t *)&buf)) == FAT_MAGIC ||
       /* The following is the big-endian ppc64 check */
       *((unsigned int *)&buf) == FAT_MAGIC) {
     /* Get host info */
@@ -222,7 +223,7 @@
     }
 
     /* Convert fat_narchs to host byte order */
-    fh.nfat_arch = NXSwapBigIntToHost(fh.nfat_arch);
+    fh.nfat_arch = CFSwapInt32BigToHost(fh.nfat_arch);
 
     /* Read in the fat archs */
     struct fat_arch *fat_archs =
@@ -232,7 +233,7 @@
     }
     if (read(fd, (char *)fat_archs,
              sizeof(struct fat_arch) * fh.nfat_arch) !=
-        (ssize_t)sizeof(struct fat_arch) * fh.nfat_arch) {
+        (ssize_t)(sizeof(struct fat_arch) * fh.nfat_arch)) {
       free(fat_archs);
       return -1;
     }
@@ -243,15 +244,15 @@
      */
     for (unsigned i = 0; i < fh.nfat_arch; i++) {
       fat_archsi.cputype =
-        NXSwapBigIntToHost(fat_archsi.cputype);
+        CFSwapInt32BigToHost(fat_archsi.cputype);
       fat_archsi.cpusubtype =
-        NXSwapBigIntToHost(fat_archsi.cpusubtype);
+        CFSwapInt32BigToHost(fat_archsi.cpusubtype);
       fat_archsi.offset =
-        NXSwapBigIntToHost(fat_archsi.offset);
+        CFSwapInt32BigToHost(fat_archsi.offset);
       fat_archsi.size =
-        NXSwapBigIntToHost(fat_archsi.size);
+        CFSwapInt32BigToHost(fat_archsi.size);
       fat_archsi.align =
-        NXSwapBigIntToHost(fat_archsi.align);
+        CFSwapInt32BigToHost(fat_archsi.align);
     }
 
     struct fat_arch *fap = NULL;
@@ -296,7 +297,7 @@
       return -1;
     }
     if (read(fd, (char *)load_commands, mh.sizeofcmds) !=
-        mh.sizeofcmds) {
+        (ssize_t)mh.sizeofcmds) {
       free(load_commands);
       return -1;
     }
@@ -304,7 +305,7 @@
     struct load_command *lcp = load_commands;
     // iterate through all load commands, looking for
     // LC_SYMTAB load command
-    for (long i = 0; i < mh.ncmds; i++) {
+    for (uint32_t i = 0; i < mh.ncmds; i++) {
       if (lcp->cmdsize % sizeof(word_type) != 0 ||
           lcp->cmdsize <= 0 ||
           (char *)lcp + lcp->cmdsize >

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/dynamic_images.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/handler/dynamic_images.cc Changed

@@ -35,19 +35,22 @@
   #include <stdio.h>
 }
 
-#include "breakpad_nlist_64.h"
-#include <AvailabilityMacros.h>
 #include <assert.h>
-#include <CoreServices/CoreServices.h>
+#include <AvailabilityMacros.h>
 #include <dlfcn.h>
-#include <mach/mach_vm.h>
 #include <mach/task_info.h>
 #include <sys/sysctl.h>
+#include <TargetConditionals.h>
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
+#include "breakpad_nlist_64.h"
+
+#if !TARGET_OS_IPHONE
+#include <CoreServices/CoreServices.h>
+
 #ifndef MAC_OS_X_VERSION_10_6
 #define MAC_OS_X_VERSION_10_6 1060
 #endif
@@ -67,6 +70,8 @@
 
 #endif
 
+#endif  // !TARGET_OS_IPHONE
+
 namespace google_breakpad {
 
 using std::string;
@@ -358,6 +363,11 @@
   return list.n_value;
 }
 
+#if TARGET_OS_IPHONE
+static bool HasTaskDyldInfo() {
+  return true;
+}
+#else
 static SInt32 GetOSVersionInternal() {
   SInt32 os_version = 0;
   Gestalt(gestaltSystemVersion, &os_version);
@@ -369,21 +379,22 @@
   return os_version;
 }
 
-static bool IsSnowLeopardOrLater() {
+static bool HasTaskDyldInfo() {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
   return true;
 #else
   return GetOSVersion() >= 0x1060;
 #endif
 }
+#endif  // TARGET_OS_IPHONE
 
 uint64_t DynamicImages::GetDyldAllImageInfosPointer() {
-  if (IsSnowLeopardOrLater()) {
+  if (HasTaskDyldInfo()) {
     task_dyld_info_data_t task_dyld_info;
     mach_msg_type_number_t count = TASK_DYLD_INFO_COUNT;
     if (task_info(task_, TASK_DYLD_INFO, (task_info_t)&task_dyld_info,
                   &count) != KERN_SUCCESS) {
-      return NULL;
+      return 0;
     }
 
     return (uint64_t)task_dyld_info.all_image_info_addr;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/dynamic_images.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/handler/dynamic_images.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/exception_handler.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/handler/exception_handler.cc Changed

@@ -28,16 +28,25 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <map>
+#include <mach/exc.h>
+#include <mach/mig.h>
 #include <pthread.h>
+#include <signal.h>
+#include <TargetConditionals.h>
 
 #include "client/mac/handler/exception_handler.h"
 #include "client/mac/handler/minidump_generator.h"
 #include "common/mac/macho_utilities.h"
 #include "common/mac/scoped_task_suspend-inl.h"
+#include "google_breakpad/common/minidump_exception_mac.h"
 
 #ifndef USE_PROTECTED_ALLOCATIONS
+#if TARGET_OS_IPHONE
+#define USE_PROTECTED_ALLOCATIONS 1
+#else
 #define USE_PROTECTED_ALLOCATIONS 0
 #endif
+#endif
 
 // If USE_PROTECTED_ALLOCATIONS is activated then the
 // gBreakpadAllocator needs to be setup in other code
@@ -48,9 +57,15 @@
   extern ProtectedMemoryAllocator *gBreakpadAllocator;
 #endif
 
-
 namespace google_breakpad {
 
+static union {
+#if USE_PROTECTED_ALLOCATIONS
+  char protected_bufferPAGE_SIZE __attribute__((aligned(PAGE_SIZE)));
+#endif
+  google_breakpad::ExceptionHandler *handler;
+} gProtectedData;
+
 using std::map;
 
 // These structures and techniques are illustrated in
@@ -87,6 +102,7 @@
 exception_mask_t s_exception_mask = EXC_MASK_BAD_ACCESS |
 EXC_MASK_BAD_INSTRUCTION | EXC_MASK_ARITHMETIC | EXC_MASK_BREAKPOINT;
 
+#if !TARGET_OS_IPHONE
 extern "C"
 {
   // Forward declarations for functions that need "C" style compilation
@@ -102,128 +118,98 @@
                                       exception_data_t code,
                                       mach_msg_type_number_t code_count)
       __attribute__((visibility("default")));
-
-  kern_return_t ForwardException(mach_port_t task,
-                                 mach_port_t failed_thread,
-                                 exception_type_t exception,
-                                 exception_data_t code,
-                                 mach_msg_type_number_t code_count);
-
-  kern_return_t exception_raise(mach_port_t target_port,
-                                mach_port_t failed_thread,
-                                mach_port_t task,
-                                exception_type_t exception,
-                                exception_data_t exception_code,
-                                mach_msg_type_number_t exception_code_count);
-
-  kern_return_t
-    exception_raise_state(mach_port_t target_port,
-                          mach_port_t failed_thread,
-                          mach_port_t task,
-                          exception_type_t exception,
-                          exception_data_t exception_code,
-                          mach_msg_type_number_t code_count,
-                          thread_state_flavor_t *target_flavor,
-                          thread_state_t in_thread_state,
-                          mach_msg_type_number_t in_thread_state_count,
-                          thread_state_t out_thread_state,
-                          mach_msg_type_number_t *out_thread_state_count);
-
-  kern_return_t
-    exception_raise_state_identity(mach_port_t target_port,
-                                   mach_port_t failed_thread,
-                                   mach_port_t task,
-                                   exception_type_t exception,
-                                   exception_data_t exception_code,
-                                   mach_msg_type_number_t exception_code_count,
-                                   thread_state_flavor_t *target_flavor,
-                                   thread_state_t in_thread_state,
-                                   mach_msg_type_number_t in_thread_state_count,
-                                   thread_state_t out_thread_state,
-                                   mach_msg_type_number_t *out_thread_state_count);
-
-  kern_return_t breakpad_exception_raise_state(mach_port_t exception_port,
-                                               exception_type_t exception,
-                                               const exception_data_t code,
-                                               mach_msg_type_number_t codeCnt,
-                                               int *flavor,
-                                               const thread_state_t old_state,
-                                               mach_msg_type_number_t old_stateCnt,
-                                               thread_state_t new_state,
-                                               mach_msg_type_number_t *new_stateCnt
-                                               );
-
-  kern_return_t breakpad_exception_raise_state_identity(mach_port_t exception_port,
-                                                        mach_port_t thread,
-                                                        mach_port_t task,
-                                                        exception_type_t exception,
-                                                        exception_data_t code,
-                                                        mach_msg_type_number_t codeCnt,
-                                                        int *flavor,
-                                                        thread_state_t old_state,
-                                                        mach_msg_type_number_t old_stateCnt,
-                                                        thread_state_t new_state,
-                                                        mach_msg_type_number_t *new_stateCnt
-                                                        );
-
-  kern_return_t breakpad_exception_raise(mach_port_t port, mach_port_t failed_thread,
-                                         mach_port_t task,
-                                         exception_type_t exception,
-                                         exception_data_t code,
-                                         mach_msg_type_number_t code_count);
 }
+#endif
 
+kern_return_t ForwardException(mach_port_t task,
+                               mach_port_t failed_thread,
+                               exception_type_t exception,
+                               exception_data_t code,
+                               mach_msg_type_number_t code_count);
+
+#if TARGET_OS_IPHONE
+// Implementation is based on the implementation generated by mig.
+boolean_t breakpad_exc_server(mach_msg_header_t *InHeadP,
+                              mach_msg_header_t *OutHeadP) {
+   OutHeadP->msgh_bits =
+       MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(InHeadP->msgh_bits), 0);
+   OutHeadP->msgh_remote_port = InHeadP->msgh_remote_port;
+   /* Minimal size: routine() will update it if different */
+   OutHeadP->msgh_size = (mach_msg_size_t)sizeof(mig_reply_error_t);
+   OutHeadP->msgh_local_port = MACH_PORT_NULL;
+   OutHeadP->msgh_id = InHeadP->msgh_id + 100;
+
+  if (InHeadP->msgh_id != 2401) {
+    ((mig_reply_error_t *)OutHeadP)->NDR = NDR_record;
+    ((mig_reply_error_t *)OutHeadP)->RetCode = MIG_BAD_ID;
+    return FALSE;
+  }
 
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+  typedef struct {
+    mach_msg_header_t Head;
+    /* start of the kernel processed data */
+    mach_msg_body_t msgh_body;
+    mach_msg_port_descriptor_t thread;
+    mach_msg_port_descriptor_t task;
+    /* end of the kernel processed data */
+    NDR_record_t NDR;
+    exception_type_t exception;
+    mach_msg_type_number_t codeCnt;
+    integer_t code2;
+    mach_msg_trailer_t trailer;
+  } Request;
+
+  typedef struct {
+    mach_msg_header_t Head;
+    NDR_record_t NDR;
+    kern_return_t RetCode;
+  } Reply;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
 
-kern_return_t breakpad_exception_raise_state(mach_port_t exception_port,
-					     exception_type_t exception,
-					     const exception_data_t code,
-					     mach_msg_type_number_t codeCnt,
-					     int *flavor,
-					     const thread_state_t old_state,
-					     mach_msg_type_number_t old_stateCnt,
-					     thread_state_t new_state,
-					     mach_msg_type_number_t *new_stateCnt
-                                             )
-{
-  return KERN_SUCCESS;
-}
+  Request *In0P = (Request *)InHeadP;
+  Reply *OutP = (Reply *)OutHeadP;
 
-kern_return_t breakpad_exception_raise_state_identity(mach_port_t exception_port,
-						      mach_port_t thread,
-						      mach_port_t task,
-						      exception_type_t exception,
-						      exception_data_t code,
-						      mach_msg_type_number_t codeCnt,
-						      int *flavor,
-						      thread_state_t old_state,
-						      mach_msg_type_number_t old_stateCnt,
-						      thread_state_t new_state,
-						      mach_msg_type_number_t *new_stateCnt
-                                                      )
-{
-  return KERN_SUCCESS;
+  if (In0P->task.name != mach_task_self()) {
+    return FALSE;
+  }
+  OutP->RetCode = ForwardException(In0P->task.name,
+                                   In0P->thread.name,
+                                   In0P->exception,
+                                   In0P->code,
+                                   In0P->codeCnt);
+  OutP->NDR = NDR_record;
+  return TRUE;
+}
+#else
+boolean_t breakpad_exc_server(mach_msg_header_t *request,
+                              mach_msg_header_t *reply) {
+  return exc_server(request, reply);
 }
 
-kern_return_t breakpad_exception_raise(mach_port_t port, mach_port_t failed_thread,
-                                       mach_port_t task,
-                                       exception_type_t exception,
-                                       exception_data_t code,
-                                       mach_msg_type_number_t code_count) {
-
+// Callback from exc_server()
+kern_return_t catch_exception_raise(mach_port_t port, mach_port_t failed_thread,
+                                    mach_port_t task,
+                                    exception_type_t exception,
+                                    exception_data_t code,
+                                    mach_msg_type_number_t code_count) {
   if (task != mach_task_self()) {
     return KERN_FAILURE;
   }
   return ForwardException(task, failed_thread, exception, code, code_count);
 }
-
+#endif
 
 ExceptionHandler::ExceptionHandler(const string &dump_path,
                                    FilterCallback filter,
                                    MinidumpCallback callback,
                                    void *callback_context,
                                    bool install_handler,
-				   const char *port_name)
+                                   const char *port_name)
     : dump_path_(),
       filter_(filter),
       callback_(callback),
@@ -239,8 +225,10 @@
   // This will update to the ID and C-string pointers
   set_dump_path(dump_path);
   MinidumpGenerator::GatherSystemInformation();
+#if !TARGET_OS_IPHONE
   if (port_name)
     crash_generation_client_.reset(new CrashGenerationClient(port_name));
+#endif
   Setup(install_handler);
 }
 
@@ -322,6 +310,8 @@
 				    EXC_I386_BPT,
 #elif defined (__ppc__) || defined (__ppc64__)
 				    EXC_PPC_BREAKPOINT,
+#elif defined (__arm__)
+				    EXC_ARM_BREAKPOINT,
 #else
 #error architecture not supported
 #endif
@@ -340,7 +330,8 @@
                                                   int exception_code,
                                                   int exception_subcode,
                                                   mach_port_t thread_name,
-                                                  bool exit_after_write) {
+                                                  bool exit_after_write,
+                                                  bool report_current_thread) {
   bool result = false;
 
   if (directCallback_) {
@@ -352,6 +343,7 @@
       if (exit_after_write)
         _exit(exception_type);
     }
+#if !TARGET_OS_IPHONE
   } else if (IsOutOfProcess()) {
     if (exception_type && exception_code) {
       // If this is a real exception, give the filter (if any) a chance to
@@ -364,13 +356,16 @@
 		 exception_subcode,
 		 thread_name);
     }
+#endif
   } else {
     string minidump_id;
 
     // Putting the MinidumpGenerator in its own context will ensure that the
     // destructor is executed, closing the newly created minidump file.
     if (!dump_path_.empty()) {
-      MinidumpGenerator md;
+      MinidumpGenerator md(mach_task_self(),
+                           report_current_thread ? MACH_PORT_NULL :
+                                                   mach_thread_self());
       if (exception_type && exception_code) {
         // If this is a real exception, give the filter (if any) a chance to
         // decide if this should be sent.
@@ -411,13 +406,13 @@
 
   current.count = EXC_TYPES_COUNT;
   mach_port_t current_task = mach_task_self();
-  kern_return_t result = task_get_exception_ports(current_task,
-                                                  s_exception_mask,
-                                                  current.masks,
-                                                  &current.count,
-                                                  current.ports,
-                                                  current.behaviors,
-                                                  current.flavors);
+  task_get_exception_ports(current_task,
+                           s_exception_mask,
+                           current.masks,
+                           &current.count,
+                           current.ports,
+                           current.behaviors,
+                           current.flavors);
 
   // Find the first exception handler that matches the exception
   unsigned int found;
@@ -435,48 +430,16 @@
 
   mach_port_t target_port = current.portsfound;
   exception_behavior_t target_behavior = current.behaviorsfound;
-  thread_state_flavor_t target_flavor = current.flavorsfound;
 
-  mach_msg_type_number_t thread_state_count = THREAD_STATE_MAX;
-  breakpad_thread_state_data_t thread_state;
+  kern_return_t result;
   switch (target_behavior) {
     case EXCEPTION_DEFAULT:
       result = exception_raise(target_port, failed_thread, task, exception,
                                code, code_count);
       break;
 
-    case EXCEPTION_STATE:
-      result = thread_get_state(failed_thread, target_flavor, thread_state,
-                                &thread_state_count);
-      if (result == KERN_SUCCESS)
-        result = exception_raise_state(target_port, failed_thread, task,
-                                       exception, code,
-                                       code_count, &target_flavor,
-                                       thread_state, thread_state_count,
-                                       thread_state, &thread_state_count);
-      if (result == KERN_SUCCESS)
-        result = thread_set_state(failed_thread, target_flavor, thread_state,
-                                  thread_state_count);
-      break;
-
-    case EXCEPTION_STATE_IDENTITY:
-      result = thread_get_state(failed_thread, target_flavor, thread_state,
-                                &thread_state_count);
-      if (result == KERN_SUCCESS)
-        result = exception_raise_state_identity(target_port, failed_thread,
-                                                task, exception, code,
-                                                code_count, &target_flavor,
-                                                thread_state,
-                                                thread_state_count,
-                                                thread_state,
-                                                &thread_state_count);
-      if (result == KERN_SUCCESS)
-        result = thread_set_state(failed_thread, target_flavor, thread_state,
-                                  thread_state_count);
-      break;
-
     default:
-      fprintf(stderr, "** Unknown exception behavior\n");
+      fprintf(stderr, "** Unknown exception behavior: %d\n", target_behavior);
       result = KERN_FAILURE;
       break;
   }
@@ -484,18 +447,6 @@
   return result;
 }
 
-// Callback from exc_server()
-kern_return_t catch_exception_raise(mach_port_t port, mach_port_t failed_thread,
-                                    mach_port_t task,
-                                    exception_type_t exception,
-                                    exception_data_t code,
-                                    mach_msg_type_number_t code_count) {
-  if (task != mach_task_self()) {
-    return KERN_FAILURE;
-  }
-  return ForwardException(task, failed_thread, exception, code, code_count);
-}
-
 // static
 void *ExceptionHandler::WaitForMessage(void *exception_handler_class) {
   ExceptionHandler *self =
@@ -534,7 +485,7 @@
         self->SuspendThreads();
 
 #if USE_PROTECTED_ALLOCATIONS
-        if(gBreakpadAllocator)
+        if (gBreakpadAllocator)
           gBreakpadAllocator->Unprotect();
 #endif
 
@@ -548,6 +499,8 @@
           exception_code = EXC_I386_BPT;
 #elif defined (__ppc__) || defined (__ppc64__)
           exception_code = EXC_PPC_BREAKPOINT;
+#elif defined (__arm__)
+          exception_code = EXC_ARM_BREAKPOINT;
 #else
 #error architecture not supported
 #endif
@@ -557,10 +510,10 @@
         self->last_minidump_write_result_ =
           self->WriteMinidumpWithException(exception_type, exception_code,
                                            0, thread,
-                                           false);
+                                           false, false);
 
 #if USE_PROTECTED_ALLOCATIONS
-        if(gBreakpadAllocator)
+        if (gBreakpadAllocator)
           gBreakpadAllocator->Protect();
 #endif
 
@@ -575,13 +528,13 @@
         // exceptions that occur in the parent process are caught and
         // processed.  If the exception was not caused by this task, we
         // still need to call into the exception server and have it return
-        // KERN_FAILURE (see breakpad_exception_raise) in order for the kernel
+        // KERN_FAILURE (see catch_exception_raise) in order for the kernel
         // to move onto the host exception handler for the child task
         if (receive.task.name == mach_task_self()) {
           self->SuspendThreads();
 
 #if USE_PROTECTED_ALLOCATIONS
-        if(gBreakpadAllocator)
+        if (gBreakpadAllocator)
           gBreakpadAllocator->Unprotect();
 #endif
 
@@ -591,34 +544,35 @@
 
         // Generate the minidump with the exception data.
         self->WriteMinidumpWithException(receive.exception, receive.code0,
-                                         subcode, receive.thread.name, true);
+                                         subcode, receive.thread.name, true,
+                                         false);
 
 #if USE_PROTECTED_ALLOCATIONS
         // This may have become protected again within
         // WriteMinidumpWithException, but it needs to be unprotected for
         // UninstallHandler.
-        if(gBreakpadAllocator)
+        if (gBreakpadAllocator)
           gBreakpadAllocator->Unprotect();
 #endif
 
         self->UninstallHandler(true);
 
 #if USE_PROTECTED_ALLOCATIONS
-        if(gBreakpadAllocator)
+        if (gBreakpadAllocator)
           gBreakpadAllocator->Protect();
 #endif
         }
         // Pass along the exception to the server, which will setup the
-        // message and call breakpad_exception_raise() and put the return
+        // message and call catch_exception_raise() and put the return
         // code into the reply.
         ExceptionReplyMessage reply;
-        if (!exc_server(&receive.header, &reply.header))
+        if (!breakpad_exc_server(&receive.header, &reply.header))
           exit(1);
 
         // Send a reply and exit
-        result = mach_msg(&(reply.header), MACH_SEND_MSG,
-                          reply.header.msgh_size, 0, MACH_PORT_NULL,
-                          MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
+        mach_msg(&(reply.header), MACH_SEND_MSG,
+                 reply.header.msgh_size, 0, MACH_PORT_NULL,
+                 MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
       }
     }
   }
@@ -626,7 +580,52 @@
   return NULL;
 }
 
+//static
+void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) {
+#if USE_PROTECTED_ALLOCATIONS
+  if (gBreakpadAllocator)
+    gBreakpadAllocator->Unprotect();
+#endif
+  gProtectedData.handler->WriteMinidumpWithException(
+      EXC_SOFTWARE,
+      MD_EXCEPTION_CODE_MAC_ABORT,
+      0,
+      mach_thread_self(),
+      true,
+      true);
+#if USE_PROTECTED_ALLOCATIONS
+  if (gBreakpadAllocator)
+    gBreakpadAllocator->Protect();
+#endif
+}
+
 bool ExceptionHandler::InstallHandler() {
+  // If a handler is already installed, something is really wrong.
+  if (gProtectedData.handler != NULL) {
+    return false;
+  }
+#if TARGET_OS_IPHONE
+  if (!IsOutOfProcess()) {
+    struct sigaction sa;
+    memset(&sa, 0, sizeof(sa));
+    sigemptyset(&sa.sa_mask);
+    sigaddset(&sa.sa_mask, SIGABRT);
+    sa.sa_sigaction = ExceptionHandler::SignalHandler;
+    sa.sa_flags = SA_SIGINFO;
+
+    scoped_ptr<struct sigaction> old(new struct sigaction);
+    if (sigaction(SIGABRT, &sa, old.get()) == -1) {
+      return false;
+    }
+    old_handler_.swap(old);
+    gProtectedData.handler = this;
+#if USE_PROTECTED_ALLOCATIONS
+    assert(((size_t)(gProtectedData.protected_buffer) & PAGE_MASK) == 0);
+    mprotect(gProtectedData.protected_buffer, PAGE_SIZE, PROT_READ);
+#endif
+  }
+#endif
+
   try {
 #if USE_PROTECTED_ALLOCATIONS
     previous_ = new (gBreakpadAllocator->Allocate(sizeof(ExceptionParameters)) )
@@ -665,6 +664,16 @@
 bool ExceptionHandler::UninstallHandler(bool in_exception) {
   kern_return_t result = KERN_SUCCESS;
 
+  if (old_handler_.get()) {
+    sigaction(SIGABRT, old_handler_.get(), NULL);
+#if USE_PROTECTED_ALLOCATIONS
+    mprotect(gProtectedData.protected_buffer, PAGE_SIZE,
+        PROT_READ | PROT_WRITE);
+#endif
+    old_handler_.reset();
+    gProtectedData.handler = NULL;
+  }
+
   if (installed_exception_handler_) {
     mach_port_t current_task = mach_task_self();
 
@@ -744,7 +753,7 @@
   }
 
   handler_thread_ = NULL;
-  handler_port_ = NULL;
+  handler_port_ = MACH_PORT_NULL;
   pthread_mutex_destroy(&minidump_write_mutex_);
 
   return result == KERN_SUCCESS;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/exception_handler.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/handler/exception_handler.h Changed

@@ -37,12 +37,16 @@
 #define CLIENT_MAC_HANDLER_EXCEPTION_HANDLER_H__
 
 #include <mach/mach.h>
+#include <TargetConditionals.h>
 
 #include <string>
 
-#include "client/mac/crash_generation/crash_generation_client.h"
 #include "processor/scoped_ptr.h"
 
+#if !TARGET_OS_IPHONE
+#include "client/mac/crash_generation/crash_generation_client.h"
+#endif
+
 namespace google_breakpad {
 
 using std::string;
@@ -152,7 +156,11 @@
 
   // Returns whether out-of-process dump generation is used or not.
   bool IsOutOfProcess() const {
+#if TARGET_OS_IPHONE
+    return false;
+#else
     return crash_generation_client_.get() != NULL;
+#endif
   }
 
  private:
@@ -179,12 +187,16 @@
                                   int exception_code,
                                   int exception_subcode,
                                   mach_port_t thread_name,
-                                  bool exit_after_write);
+                                  bool exit_after_write,
+                                  bool report_current_thread);
 
   // When installed, this static function will be call from a newly created
   // pthread with |this| as the argument
   static void *WaitForMessage(void *exception_handler_class);
 
+  // Signal handler for SIGABRT.
+  static void SignalHandler(int sig, siginfo_t* info, void* uc);
+
   // disallow copy ctor and operator=
   explicit ExceptionHandler(const ExceptionHandler &);
   void operator=(const ExceptionHandler &);
@@ -250,8 +262,14 @@
   // True, if we're using the mutext to indicate when mindump writing occurs
   bool use_minidump_write_mutex_;
 
+  // Old signal handler for SIGABRT. Used to be able to restore it when
+  // uninstalling.
+  scoped_ptr<struct sigaction> old_handler_;
+
+#if !TARGET_OS_IPHONE
   // Client for out-of-process dump generation.
   scoped_ptr<CrashGenerationClient> crash_generation_client_;
+#endif
 };
 
 }  // namespace google_breakpad

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/handler/mach_vm_compat.h Added

@@ -0,0 +1,49 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CLIENT_MAC_GENERATOR_MACH_VM_COMPAT_H_
+#define CLIENT_MAC_GENERATOR_MACH_VM_COMPAT_H_
+
+#include <TargetConditionals.h>
+
+// On iOS 5, mach/mach_vm.h is not supported anymore. As the architecture is 32
+// bits, we can use the simple vm_ functions instead of the mach_vm_ ones.
+#if TARGET_OS_IPHONE
+#include <mach/vm_map.h>
+#define mach_vm_address_t vm_address_t
+#define mach_vm_deallocate vm_deallocate
+#define mach_vm_read vm_read
+#define mach_vm_region vm_region
+#define mach_vm_region_recurse vm_region_recurse
+#define mach_vm_size_t vm_size_t
+#else
+#include <mach/mach_vm.h>
+#endif  // TARGET_OS_IPHONE
+
+#endif  // CLIENT_MAC_GENERATOR_MACH_VM_COMPAT_H_

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/minidump_generator.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/handler/minidump_generator.cc Changed

@@ -31,8 +31,6 @@
 #include <cstdio>
 
 #include <mach/host_info.h>
-#include <mach/i386/thread_status.h>
-#include <mach/mach_vm.h>
 #include <mach/vm_statistics.h>
 #include <mach-o/dyld.h>
 #include <mach-o/loader.h>
@@ -43,12 +41,19 @@
 
 #include "client/mac/handler/minidump_generator.h"
 
+#ifdef HAS_ARM_SUPPORT
+#include <mach/arm/thread_status.h>
+#endif
 #ifdef HAS_PPC_SUPPORT
 #include <mach/ppc/thread_status.h>
 #endif
+#ifdef HAS_X86_SUPPORT
+#include <mach/i386/thread_status.h>
+#endif
 
 #include "client/minidump_file_writer-inl.h"
 #include "common/mac/file_id.h"
+#include "common/mac/macho_id.h"
 #include "common/mac/string_utilities.h"
 
 using MacStringUtils::ConvertToString;
@@ -130,14 +135,19 @@
   CFURLCreateDataAndPropertiesFromResource(NULL, sys_vers, &data, NULL, NULL,
                                            &error);
 
-  if (!data)
+  if (!data) {
+    CFRelease(sys_vers);
     return;
+  }
 
   CFDictionaryRef list = static_cast<CFDictionaryRef>
     (CFPropertyListCreateFromXMLData(NULL, data, kCFPropertyListImmutable,
                                      NULL));
-  if (!list)
+  if (!list) {
+    CFRelease(sys_vers);
+    CFRelease(data);
     return;
+  }
 
   CFStringRef build_version = static_cast<CFStringRef>
     (CFDictionaryGetValue(list, CFSTR("ProductBuildVersion")));
@@ -348,16 +358,22 @@
 bool MinidumpGenerator::WriteStack(breakpad_thread_state_data_t state,
                                    MDMemoryDescriptor *stack_location) {
   switch (cpu_type_) {
+#ifdef HAS_ARM_SUPPORT
+    case CPU_TYPE_ARM:
+      return WriteStackARM(state, stack_location);
+#endif
 #ifdef HAS_PPC_SUPPORT
     case CPU_TYPE_POWERPC:
       return WriteStackPPC(state, stack_location);
     case CPU_TYPE_POWERPC64:
       return WriteStackPPC64(state, stack_location);
 #endif
+#ifdef HAS_X86_SUPPORT
     case CPU_TYPE_I386:
       return WriteStackX86(state, stack_location);
     case CPU_TYPE_X86_64:
       return WriteStackX86_64(state, stack_location);
+#endif
     default:
       return false;
   }
@@ -366,16 +382,22 @@
 bool MinidumpGenerator::WriteContext(breakpad_thread_state_data_t state,
                                      MDLocationDescriptor *register_location) {
   switch (cpu_type_) {
+#ifdef HAS_ARM_SUPPORT
+    case CPU_TYPE_ARM:
+      return WriteContextARM(state, register_location);
+#endif
 #ifdef HAS_PPC_SUPPORT
     case CPU_TYPE_POWERPC:
       return WriteContextPPC(state, register_location);
     case CPU_TYPE_POWERPC64:
       return WriteContextPPC64(state, register_location);
 #endif
+#ifdef HAS_X86_SUPPORT
     case CPU_TYPE_I386:
       return WriteContextX86(state, register_location);
     case CPU_TYPE_X86_64:
       return WriteContextX86_64(state, register_location);
+#endif
     default:
       return false;
   }
@@ -384,22 +406,86 @@
 u_int64_t MinidumpGenerator::CurrentPCForStack(
     breakpad_thread_state_data_t state) {
   switch (cpu_type_) {
+#ifdef HAS_ARM_SUPPORT
+    case CPU_TYPE_ARM:
+      return CurrentPCForStackARM(state);
+#endif
 #ifdef HAS_PPC_SUPPORT
     case CPU_TYPE_POWERPC:
       return CurrentPCForStackPPC(state);
     case CPU_TYPE_POWERPC64:
       return CurrentPCForStackPPC64(state);
 #endif
+#ifdef HAS_X86_SUPPORT
     case CPU_TYPE_I386:
       return CurrentPCForStackX86(state);
     case CPU_TYPE_X86_64:
       return CurrentPCForStackX86_64(state);
+#endif
     default:
       assert("Unknown CPU type!");
       return 0;
   }
 }
 
+#ifdef HAS_ARM_SUPPORT
+bool MinidumpGenerator::WriteStackARM(breakpad_thread_state_data_t state,
+                                      MDMemoryDescriptor *stack_location) {
+  arm_thread_state_t *machine_state =
+      reinterpret_cast<arm_thread_state_t *>(state);
+  mach_vm_address_t start_addr = REGISTER_FROM_THREADSTATE(machine_state, sp);
+  return WriteStackFromStartAddress(start_addr, stack_location);
+}
+
+u_int64_t
+MinidumpGenerator::CurrentPCForStackARM(breakpad_thread_state_data_t state) {
+  arm_thread_state_t *machine_state =
+      reinterpret_cast<arm_thread_state_t *>(state);
+
+  return REGISTER_FROM_THREADSTATE(machine_state, pc);
+}
+
+bool MinidumpGenerator::WriteContextARM(breakpad_thread_state_data_t state,
+                                        MDLocationDescriptor *register_location)
+{
+  TypedMDRVA<MDRawContextARM> context(&writer_);
+  arm_thread_state_t *machine_state =
+      reinterpret_cast<arm_thread_state_t *>(state);
+
+  if (!context.Allocate())
+    return false;
+
+  *register_location = context.location();
+  MDRawContextARM *context_ptr = context.get();
+  context_ptr->context_flags = MD_CONTEXT_ARM_FULL;
+
+#define AddGPR(a) context_ptr->iregsa = REGISTER_FROM_THREADSTATE(machine_state, ra)
+
+  context_ptr->iregs13 = REGISTER_FROM_THREADSTATE(machine_state, sp);
+  context_ptr->iregs14 = REGISTER_FROM_THREADSTATE(machine_state, lr);
+  context_ptr->iregs15 = REGISTER_FROM_THREADSTATE(machine_state, pc);
+  context_ptr->cpsr = REGISTER_FROM_THREADSTATE(machine_state, cpsr);
+
+  AddGPR(0);
+  AddGPR(1);
+  AddGPR(2);
+  AddGPR(3);
+  AddGPR(4);
+  AddGPR(5);
+  AddGPR(6);
+  AddGPR(7);
+  AddGPR(8);
+  AddGPR(9);
+  AddGPR(10);
+  AddGPR(11);
+  AddGPR(12);
+#undef AddReg
+#undef AddGPR
+
+  return true;
+}
+#endif
+
 #ifdef HAS_PCC_SUPPORT
 bool MinidumpGenerator::WriteStackPPC(breakpad_thread_state_data_t state,
                                       MDMemoryDescriptor *stack_location) {
@@ -560,6 +646,7 @@
 
 #endif
 
+#ifdef HAS_X86_SUPPORT
 bool MinidumpGenerator::WriteStackX86(breakpad_thread_state_data_t state,
                                    MDMemoryDescriptor *stack_location) {
   i386_thread_state_t *machine_state =
@@ -678,12 +765,18 @@
 
   return true;
 }
+#endif
 
 bool MinidumpGenerator::GetThreadState(thread_act_t target_thread,
                                        thread_state_t state,
                                        mach_msg_type_number_t *count) {
   thread_state_flavor_t flavor;
   switch (cpu_type_) {
+#ifdef HAS_ARM_SUPPORT
+    case CPU_TYPE_ARM:
+      flavor = ARM_THREAD_STATE;
+      break;
+#endif
 #ifdef HAS_PPC_SUPPORT
     case CPU_TYPE_POWERPC:
       flavor = PPC_THREAD_STATE;
@@ -692,12 +785,14 @@
       flavor = PPC_THREAD_STATE64;
       break;
 #endif
+#ifdef HAS_X86_SUPPORT
     case CPU_TYPE_I386:
       flavor = i386_THREAD_STATE;
       break;
     case CPU_TYPE_X86_64:
       flavor = x86_THREAD_STATE64;
       break;
+#endif
     default:
       return false;
   }
@@ -927,10 +1022,18 @@
   MDRawSystemInfo *info_ptr = info.get();
 
   switch (cpu_type_) {
+#ifdef HAS_ARM_SUPPORT
+    case CPU_TYPE_ARM:
+      info_ptr->processor_architecture = MD_CPU_ARCHITECTURE_ARM;
+      break;
+#endif
+#ifdef HAS_PPC_SUPPORT
     case CPU_TYPE_POWERPC:
     case CPU_TYPE_POWERPC64:
       info_ptr->processor_architecture = MD_CPU_ARCHITECTURE_PPC;
       break;
+#endif
+#ifdef HAS_X86_SUPPORT
     case CPU_TYPE_I386:
     case CPU_TYPE_X86_64:
       if (cpu_type_ == CPU_TYPE_I386)
@@ -994,13 +1097,18 @@
 
 #endif  // __i386__ || __x86_64_
       break;
+#endif  // HAS_X86_SUPPORT
     default:
       info_ptr->processor_architecture = MD_CPU_ARCHITECTURE_UNKNOWN;
       break;
   }
 
   info_ptr->number_of_processors = number_of_processors;
+#if TARGET_OS_IPHONE
+  info_ptr->platform_id = MD_OS_IOS;
+#else
   info_ptr->platform_id = MD_OS_MAC_OS_X;
+#endif  // TARGET_OS_IPHONE
 
   MDLocationDescriptor build_string_loc;
 
@@ -1057,7 +1165,7 @@
       module->version_info.file_version_lo |= (modVersion & 0xff);
     }
 
-    if (!WriteCVRecord(module, image->GetCPUType(), name.c_str())) {
+    if (!WriteCVRecord(module, image->GetCPUType(), name.c_str(), false)) {
       return false;
     }
   } else {
@@ -1103,7 +1211,11 @@
           module->size_of_image = static_cast<u_int32_t>(seg->vmsize);
           module->module_name_rva = string_location.rva;
 
-          if (!WriteCVRecord(module, cpu_type, name))
+          bool in_memory = false;
+#if TARGET_OS_IPHONE
+          in_memory = true;
+#endif
+          if (!WriteCVRecord(module, cpu_type, name, in_memory))
             return false;
 
           return true;
@@ -1141,7 +1253,7 @@
 }
 
 bool MinidumpGenerator::WriteCVRecord(MDRawModule *module, int cpu_type,
-                                      const char *module_path) {
+                                      const char *module_path, bool in_memory) {
   TypedMDRVA<MDCVInfoPDB70> cv(&writer_);
 
   // Only return the last path component of the full module path
@@ -1167,10 +1279,23 @@
   cv_ptr->age = 0;
 
   // Get the module identifier
-  FileID file_id(module_path);
   unsigned char identifier16;
+  bool result = false;
+  if (in_memory) {
+    MacFileUtilities::MachoID macho(module_path,
+        reinterpret_cast<void *>(module->base_of_image),
+        static_cast<size_t>(module->size_of_image));
+    result = macho.UUIDCommand(cpu_type, identifier);
+    if (!result)
+      result = macho.MD5(cpu_type, identifier);
+  }
 
-  if (file_id.MachoIdentifier(cpu_type, identifier)) {
+  if (!result) {
+     FileID file_id(module_path);
+     result = file_id.MachoIdentifier(cpu_type, identifier);
+  }
+
+  if (result) {
     cv_ptr->signature.data1 = (uint32_t)identifier0 << 24 |
       (uint32_t)identifier1 << 16 | (uint32_t)identifier2 << 8 |
       (uint32_t)identifier3;
@@ -1193,8 +1318,9 @@
     MDRawDirectory *module_list_stream) {
   TypedMDRVA<MDRawModuleList> list(&writer_);
 
-  int image_count = dynamic_images_ ?
-    dynamic_images_->GetImageCount() : _dyld_image_count();
+  size_t image_count = dynamic_images_ ?
+      static_cast<size_t>(dynamic_images_->GetImageCount()) :
+      _dyld_image_count();
 
   if (!list.AllocateObjectAndArray(image_count, MD_MODULE_SIZE))
     return false;
@@ -1205,7 +1331,7 @@
 
   // Write out the executable module as the first one
   MDRawModule module;
-  int executableIndex = FindExecutableModule();
+  size_t executableIndex = FindExecutableModule();
 
   if (!WriteModuleStream(executableIndex, &module)) {
     return false;
@@ -1214,7 +1340,7 @@
   list.CopyIndexAfterObject(0, &module, MD_MODULE_SIZE);
   int destinationIndex = 1;  // Write all other modules after this one
 
-  for (int i = 0; i < image_count; ++i) {
+  for (size_t i = 0; i < image_count; ++i) {
     if (i != executableIndex) {
       if (!WriteModuleStream(i, &module)) {
         return false;
@@ -1257,19 +1383,11 @@
   int mib4 = { CTL_KERN, KERN_PROC, KERN_PROC_PID,
                  static_cast<int>(info_ptr->process_id) };
   u_int mibsize = static_cast<u_int>(sizeof(mib) / sizeof(mib0));
-  size_t size;
-  if (!sysctl(mib, mibsize, NULL, &size, NULL, 0)) {
-    mach_vm_address_t addr;
-    if (mach_vm_allocate(mach_task_self(),
-                         &addr,
-                         size,
-                         true) == KERN_SUCCESS) {
-      struct kinfo_proc *proc = (struct kinfo_proc *)addr;
-      if (!sysctl(mib, mibsize, proc, &size, NULL, 0))
-        info_ptr->process_create_time =
-            static_cast<u_int32_t>(proc->kp_proc.p_starttime.tv_sec);
-      mach_vm_deallocate(mach_task_self(), addr, size);
-    }
+  struct kinfo_proc proc;
+  size_t size = sizeof(proc);
+  if (sysctl(mib, mibsize, &proc, &size, NULL, 0) == 0) {
+    info_ptr->process_create_time =
+        static_cast<u_int32_t>(proc.kp_proc.p_starttime.tv_sec);
   }
 
   // Speed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/minidump_generator.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/handler/minidump_generator.h Changed

@@ -33,6 +33,7 @@
 #define CLIENT_MAC_GENERATOR_MINIDUMP_GENERATOR_H__
 
 #include <mach/mach.h>
+#include <TargetConditionals.h>
 
 #include <string>
 
@@ -42,10 +43,16 @@
 #include "google_breakpad/common/minidump_format.h"
 
 #include "dynamic_images.h"
+#include "mach_vm_compat.h"
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
+#if !TARGET_OS_IPHONE && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7)
   #define HAS_PPC_SUPPORT
 #endif
+#if defined(__arm__)
+  #define HAS_ARM_SUPPORT
+#elif defined(__i386__) || defined(__x86_64__)
+  #define HAS_X86_SUPPORT
+#endif
 
 namespace google_breakpad {
 
@@ -53,7 +60,7 @@
 
 // Use the REGISTER_FROM_THREADSTATE to access a register name from the
 // breakpad_thread_state_t structure.
-#if __DARWIN_UNIX03 || TARGET_CPU_X86_64 || TARGET_CPU_PPC64
+#if __DARWIN_UNIX03 || TARGET_CPU_X86_64 || TARGET_CPU_PPC64 || TARGET_CPU_ARM
 // In The 10.5 SDK Headers Apple prepended __ to the variable names in the
 // i386_thread_state_t structure.  There's no good way to tell what version of
 // the SDK we're compiling against so we just toggle on the same preprocessor
@@ -75,7 +82,7 @@
   MinidumpGenerator();
   MinidumpGenerator(mach_port_t crashing_task, mach_port_t handler_thread);
 
-  ~MinidumpGenerator();
+  virtual ~MinidumpGenerator();
 
   // Return <dir>/<unique_name>.dmp
   // Sets |unique_name| (if requested) to the unique name for the minidump
@@ -99,13 +106,19 @@
   // the MinidumpGenerator class.
   static void GatherSystemInformation();
 
+ protected:
+  // Overridable Stream writers
+  virtual bool WriteExceptionStream(MDRawDirectory *exception_stream);
+
+  // Overridable Helper
+  virtual bool WriteThreadStream(mach_port_t thread_id, MDRawThread *thread);
+
  private:
-    typedef bool (MinidumpGenerator::*WriteStreamFN)(MDRawDirectory *);
+  typedef bool (MinidumpGenerator::*WriteStreamFN)(MDRawDirectory *);
 
   // Stream writers
   bool WriteThreadListStream(MDRawDirectory *thread_list_stream);
   bool WriteMemoryListStream(MDRawDirectory *memory_list_stream);
-  bool WriteExceptionStream(MDRawDirectory *exception_stream);
   bool WriteSystemInfoStream(MDRawDirectory *system_info_stream);
   bool WriteModuleListStream(MDRawDirectory *module_list_stream);
   bool WriteMiscInfoStream(MDRawDirectory *misc_info_stream);
@@ -121,14 +134,20 @@
                   MDMemoryDescriptor *stack_location);
   bool WriteContext(breakpad_thread_state_data_t state,
                     MDLocationDescriptor *register_location);
-  bool WriteThreadStream(mach_port_t thread_id, MDRawThread *thread);
-  bool WriteCVRecord(MDRawModule *module, int cpu_type, 
-                     const char *module_path);
+  bool WriteCVRecord(MDRawModule *module, int cpu_type,
+                     const char *module_path, bool in_memory);
   bool WriteModuleStream(unsigned int index, MDRawModule *module);
   size_t CalculateStackSize(mach_vm_address_t start_addr);
   int  FindExecutableModule();
 
   // Per-CPU implementations of these methods
+#ifdef HAS_ARM_SUPPORT
+  bool WriteStackARM(breakpad_thread_state_data_t state,
+                     MDMemoryDescriptor *stack_location);
+  bool WriteContextARM(breakpad_thread_state_data_t state,
+                       MDLocationDescriptor *register_location);
+  u_int64_t CurrentPCForStackARM(breakpad_thread_state_data_t state);
+#endif
 #ifdef HAS_PPC_SUPPORT
   bool WriteStackPPC(breakpad_thread_state_data_t state,
                      MDMemoryDescriptor *stack_location);
@@ -141,6 +160,7 @@
                        MDLocationDescriptor *register_location);
   u_int64_t CurrentPCForStackPPC64(breakpad_thread_state_data_t state);
 #endif
+#ifdef HAS_X86_SUPPORT
   bool WriteStackX86(breakpad_thread_state_data_t state,
                        MDMemoryDescriptor *stack_location);
   bool WriteContextX86(breakpad_thread_state_data_t state,
@@ -151,14 +171,17 @@
   bool WriteContextX86_64(breakpad_thread_state_data_t state,
                           MDLocationDescriptor *register_location);
   u_int64_t CurrentPCForStackX86_64(breakpad_thread_state_data_t state);
+#endif
 
   // disallow copy ctor and operator=
   explicit MinidumpGenerator(const MinidumpGenerator &);
   void operator=(const MinidumpGenerator &);
 
+ protected:
   // Use this writer to put the data to disk
   MinidumpFileWriter writer_;
 
+ private:
   // Exception information
   int exception_type_;
   int exception_code_;
@@ -183,6 +206,7 @@
   // directly from the system, even while handling an exception.
   mutable PageAllocator allocator_;
 
+ protected:
   // Blocks of memory written to the dump. These are all currently
   // written while writing the thread list stream, but saved here
   // so a memory list stream can be written afterwards.

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/minidump_test.xcodeproj/project.pbxproj -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/handler/minidump_test.xcodeproj/project.pbxproj Changed

@@ -72,7 +72,7 @@
 		F93A88880E8B4C9A0026AF89 /* bytereader.cc in Sources */ = {isa = PBXBuildFile; fileRef = F9721F760E8B0DC700D7E813 /* bytereader.cc */; };
 		F93A88890E8B4C9A0026AF89 /* dwarf2reader.cc in Sources */ = {isa = PBXBuildFile; fileRef = F9721F770E8B0DC700D7E813 /* dwarf2reader.cc */; };
 		F93A888A0E8B4C9A0026AF89 /* functioninfo.cc in Sources */ = {isa = PBXBuildFile; fileRef = F9721F780E8B0DC700D7E813 /* functioninfo.cc */; };
-		F93A888B0E8B4C9A0026AF89 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = F9721FA80E8B0E4800D7E813 /* md5.c */; };
+		F93A888B0E8B4C9A0026AF89 /* md5.cc in Sources */ = {isa = PBXBuildFile; fileRef = F9721FA80E8B0E4800D7E813 /* md5.cc */; };
 		F9721F6C0E8B0D7000D7E813 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9721F6B0E8B0D7000D7E813 /* Cocoa.framework */; };
 		F9721FA20E8B0E2300D7E813 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9721FA10E8B0E2300D7E813 /* SenTestingKit.framework */; };
 		F982089C0DB3280D0017AECA /* breakpad_nlist_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = F982089B0DB3280D0017AECA /* breakpad_nlist_test.cc */; };
@@ -157,7 +157,7 @@
 		F9721F770E8B0DC700D7E813 /* dwarf2reader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dwarf2reader.cc; path = ../../../common/dwarf/dwarf2reader.cc; sourceTree = SOURCE_ROOT; };
 		F9721F780E8B0DC700D7E813 /* functioninfo.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = functioninfo.cc; path = ../../../common/dwarf/functioninfo.cc; sourceTree = SOURCE_ROOT; };
 		F9721FA10E8B0E2300D7E813 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
-		F9721FA80E8B0E4800D7E813 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md5.c; path = ../../../common/md5.c; sourceTree = SOURCE_ROOT; };
+		F9721FA80E8B0E4800D7E813 /* md5.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md5.cc; path = ../../../common/md5.cc; sourceTree = SOURCE_ROOT; };
 		F982089A0DB3280D0017AECA /* breakpad_nlist_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = breakpad_nlist_test.h; sourceTree = "<group>"; };
 		F982089B0DB3280D0017AECA /* breakpad_nlist_test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = breakpad_nlist_test.cc; sourceTree = "<group>"; };
 		F98208A10DB32CAE0017AECA /* breakpad_nlist_64.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = breakpad_nlist_64.cc; sourceTree = "<group>"; };
@@ -236,7 +236,7 @@
 				8BFC812011FF99D5002CB4DC /* Breakpad.xcconfig */,
 				8BFC812111FF99D5002CB4DC /* BreakpadDebug.xcconfig */,
 				8BFC812211FF99D5002CB4DC /* BreakpadRelease.xcconfig */,
-				F9721FA80E8B0E4800D7E813 /* md5.c */,
+				F9721FA80E8B0E4800D7E813 /* md5.cc */,
 				F9721F760E8B0DC700D7E813 /* bytereader.cc */,
 				F9721F770E8B0DC700D7E813 /* dwarf2reader.cc */,
 				F9721F780E8B0DC700D7E813 /* functioninfo.cc */,
@@ -451,7 +451,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB923508733DC60010E9CD /* Build configuration list for PBXProject "minidump_test" */;
 			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* MinidumpWriter */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -594,7 +601,7 @@
 				F93A88880E8B4C9A0026AF89 /* bytereader.cc in Sources */,
 				F93A88890E8B4C9A0026AF89 /* dwarf2reader.cc in Sources */,
 				F93A888A0E8B4C9A0026AF89 /* functioninfo.cc in Sources */,
-				F93A888B0E8B4C9A0026AF89 /* md5.c in Sources */,
+				F93A888B0E8B4C9A0026AF89 /* md5.cc in Sources */,
 				F93A887D0E8B4C8C0026AF89 /* macho_walker.cc in Sources */,
 				F93A887E0E8B4C8C0026AF89 /* macho_id.cc in Sources */,
 				F93A887F0E8B4C8C0026AF89 /* macho_utilities.cc in Sources */,

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/handler/testcases/DynamicImagesTests.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/handler/testcases/DynamicImagesTests.cc Changed

@@ -55,21 +55,17 @@
   // pick test2 as a symbol we know to be valid to read
   // anything will work, really
   void *addr = reinterpret_cast<void*>(&test2);
-  void *buf;
+  std::vector<uint8_t> buf(getpagesize());
 
   fprintf(stderr, "reading 0x%p\n", addr);
-  buf = google_breakpad::ReadTaskMemory(mach_task_self(),
-                                        addr,
-                                        getpagesize(),
-                                        &kr);
+  kr = google_breakpad::ReadTaskMemory(mach_task_self(),
+                                       (uint64_t)addr,
+                                       getpagesize(),
+                                       buf);
 
   CPTAssert(kr == KERN_SUCCESS);
 
-  CPTAssert(buf != NULL);
-
-  CPTAssert(0 == memcmp(buf, (const void*)addr, getpagesize()));
-
-  free(buf);
+  CPTAssert(0 == memcmp(&buf0, (const void*)addr, getpagesize()));
 }
 
 void DynamicImagesTests::ReadLibrariesFromLocalTaskTest() {
@@ -79,7 +75,5 @@
 
   fprintf(stderr,"Local task image count: %d\n", d->GetImageCount());
 
-  d->TestPrint();
-
   CPTAssert(d->GetImageCount() > 0);
 }

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/sender/crash_report_sender.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/sender/crash_report_sender.h Changed

@@ -32,17 +32,11 @@
 // It will perform throttling based on the parameters passed to it and will
 // prompt the user to send the minidump.
 
-#include <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
 
-#include "client/mac/Framework/Breakpad.h"
+#include "client/mac/sender/uploader.h"
 #import "GTMDefines.h"
 
-#define kClientIdPreferenceKey @"clientid"
-
-extern NSString *const kGoogleServerType;
-extern NSString *const kSocorroServerType;
-extern NSString *const kDefaultServerType;
-
 // We're sublcassing NSTextField in order to override a particular
 // method (see the implementation) that lets us reject changes if they
 // are longer than a particular length.  Bindings would normally solve
@@ -87,29 +81,12 @@
   NSString *countdownMessage_;             // Message indicating time
                                            // left for input.
  @private
-  int configFile_;                         // File descriptor for config file
-  NSMutableDictionary *parameters_;        // Key value pairs of data (STRONG)
-  NSData *minidumpContents_;               // The data in the minidump (STRONG)
-  NSData *logFileData_;                    // An NSdata for the tar,
-                                           // bz2'd log file.
   NSTimeInterval remainingDialogTime_;     // Keeps track of how long
                                            // we have until we cancel
                                            // the dialog
   NSTimer *messageTimer_;                  // Timer we use to update
                                            // the dialog
-  NSMutableDictionary *serverDictionary_;  // The dictionary mapping a
-                                           // server type name to a
-                                           // dictionary of server
-                                           // parameter names.
-  NSMutableDictionary *socorroDictionary_; // The dictionary for
-                                           // Socorro.
-  NSMutableDictionary *googleDictionary_;  // The dictionary for
-                                           // Google.
-  NSMutableDictionary *extraServerVars_;   // A dictionary containing
-                                           // extra key/value pairs
-                                           // that are uploaded to the
-                                           // crash server with the
-                                           // minidump.
+  Uploader* uploader_;                     // Uploader we use to send the data.
 }
 
 // Stops the modal panel with an NSAlertDefaultReturn value. This is the action

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/sender/crash_report_sender.m -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/sender/crash_report_sender.m Changed

@@ -27,31 +27,26 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#import <pwd.h>
-#import <sys/stat.h>
-#import <unistd.h>
+#import "client/mac/sender/crash_report_sender.h"
 
 #import <Cocoa/Cocoa.h>
+#import <pwd.h>
+#import <sys/stat.h>
 #import <SystemConfiguration/SystemConfiguration.h>
+#import <unistd.h>
 
-#import "common/mac/HTTPMultipartUpload.h"
-
-#import "crash_report_sender.h"
+#import "client/apple/Framework/BreakpadDefines.h"
 #import "common/mac/GTMLogger.h"
+#import "common/mac/HTTPMultipartUpload.h"
 
 
 #define kLastSubmission @"LastSubmission"
-const int kMinidumpFileLengthLimit = 800000;
 const int kUserCommentsMaxLength = 1500;
 const int kEmailMaxLength = 64;
 
 #define kApplePrefsSyncExcludeAllKey \
   @"com.apple.PreferenceSync.ExcludeAllSyncKeys"
 
-NSString *const kGoogleServerType = @"google";
-NSString *const kSocorroServerType = @"socorro";
-NSString *const kDefaultServerType = @"google";
-
 #pragma mark -
 
 @interface NSView (ResizabilityExtentions)
@@ -160,18 +155,8 @@
 
 #pragma mark -
 
-
 @interface Reporter(PrivateMethods)
-+ (uid_t)consoleUID;
-
-- (id)initWithConfigurationFD:(int)fd;
-
-- (NSString *)readString;
-- (NSData *)readData:(ssize_t)length;
-
-- (BOOL)readConfigurationData;
-- (BOOL)readMinidumpData;
-- (BOOL)readLogFileData;
+- (id)initWithConfigFile:(const char *)configFile;
 
 // Returns YES if it has been long enough since the last report that we should
 // submit a report for this crash.
@@ -221,30 +206,6 @@
 - (NSInteger)runModalWindow:(NSWindow*)window 
                 withTimeout:(NSTimeInterval)timeout;
 
-// Returns a unique client id (user-specific), creating a persistent
-// one in the user defaults, if necessary.
-- (NSString*)clientID;
-
-// Returns a dictionary that can be used to map Breakpad parameter names to
-// URL parameter names.
-- (NSMutableDictionary *)dictionaryForServerType:(NSString *)serverType;
-
-// Helper method to set HTTP parameters based on server type.  This is
-// called right before the upload - crashParameters will contain, on exit,
-// URL parameters that should be sent with the minidump.
-- (BOOL)populateServerDictionary:(NSMutableDictionary *)crashParameters;
-
-// Initialization helper to create dictionaries mapping Breakpad
-// parameters to URL parameters
-- (void)createServerParameterDictionaries;
-
-// Accessor method for the URL parameter dictionary
-- (NSMutableDictionary *)urlParameterDictionary;
-
-// This method adds a key/value pair to the dictionary that
-// will be uploaded to the crash server.
-- (void)addServerParameter:(id)value forKey:(NSString *)key;
-
 // This method is used to periodically update the UI with how many
 // seconds are left in the dialog display.
 - (void)updateSecondsLeftInDialogDisplay:(NSTimer*)theTimer;
@@ -255,289 +216,22 @@
 // in their comments/email.
 - (void)controlTextDidBeginEditing:(NSNotification *)aNotification;
 
-// Records the uploaded crash ID to the log file.
-- (void)logUploadWithID:(const char *)uploadID;
+- (void)report;
 
 @end
 
 @implementation Reporter
 //=============================================================================
-+ (uid_t)consoleUID {
-  SCDynamicStoreRef store =
-    SCDynamicStoreCreate(kCFAllocatorDefault, CFSTR("Reporter"), NULL, NULL);
-  uid_t uid = -2;  // Default to "nobody"
-  if (store) {
-    CFStringRef user = SCDynamicStoreCopyConsoleUser(store, &uid, NULL);
-
-    if (user)
-      CFRelease(user);
-    else
-      uid = -2;
-
-    CFRelease(store);
-  }
-
-  return uid;
-}
-
-//=============================================================================
-- (id)initWithConfigurationFD:(int)fd {
+- (id)initWithConfigFile:(const char *)configFile {
   if ((self = super init)) {
-    configFile_ = fd;
     remainingDialogTime_ = 0;
-  }
-
-  // Because the reporter is embedded in the framework (and many copies
-  // of the framework may exist) its not completely certain that the OS
-  // will obey the com.apple.PreferenceSync.ExcludeAllSyncKeys in our
-  // Info.plist. To make sure, also set the key directly if needed.
-  NSUserDefaults *ud = NSUserDefaults standardUserDefaults;
-  if (!ud boolForKey:kApplePrefsSyncExcludeAllKey) {
-    ud setBool:YES forKey:kApplePrefsSyncExcludeAllKey;
-  }
-
-  self createServerParameterDictionaries;
-
-  return self;
-}
-
-//=============================================================================
-- (NSString *)readString {
-  NSMutableString *str = NSMutableString stringWithCapacity:32;
-  char ch2 = { 0 };
-
-  while (read(configFile_, &ch0, 1) == 1) {
-    if (ch0 == '\n') {
-      // Break if this is the first newline after reading some other string
-      // data.
-      if (str length)
-        break;
-    } else {
-      str appendString:NSString stringWithUTF8String:ch;
+    uploader_ = Uploader alloc initWithConfigFile:configFile;
+    if (!uploader_) {
+      self release;
+      return nil;
     }
   }
-
-  return str;
-}
-
-//=============================================================================
-- (NSData *)readData:(ssize_t)length {
-  NSMutableData *data = NSMutableData dataWithLength:length;
-  char *bytes = (char *)data bytes;
-
-  if (read(configFile_, bytes, length) != length)
-    return nil;
-
-  return data;
-}
-
-//=============================================================================
-- (BOOL)readConfigurationData {
-  parameters_ = NSMutableDictionary alloc init;
-
-  while (1) {
-    NSString *key = self readString;
-
-    if (!key length)
-      break;
-
-    // Read the data.  Try to convert to a UTF-8 string, or just save
-    // the data
-    NSString *lenStr = self readString;
-    ssize_t len = lenStr intValue;
-    NSData *data = self readData:len;
-    id value = NSString alloc initWithData:data
-                                     encoding:NSUTF8StringEncoding;
-
-    // If the keyname is prefixed by BREAKPAD_SERVER_PARAMETER_PREFIX
-    // that indicates that it should be uploaded to the server along
-    // with the minidump, so we treat it specially.
-    if (key hasPrefix:@BREAKPAD_SERVER_PARAMETER_PREFIX) {
-      NSString *urlParameterKey =
-        key substringFromIndex:@BREAKPAD_SERVER_PARAMETER_PREFIX length;
-      if (urlParameterKey length) {
-        if (value) {
-          self addServerParameter:value
-                            forKey:urlParameterKey;
-        } else {
-          self addServerParameter:data
-                            forKey:urlParameterKey;
-        }
-      }
-    } else {
-      parameters_ setObject:(value ? value : data) forKey:key;
-    }
-    value release;
-  }
-
-  // generate a unique client ID based on this host's MAC address
-  // then add a key/value pair for it
-  NSString *clientID = self clientID;
-  parameters_ setObject:clientID forKey:@"guid";
-
-  close(configFile_);
-  configFile_ = -1;
-
-  return YES;
-}
-
-// Per user per machine
-- (NSString *)clientID {
-  NSUserDefaults *ud = NSUserDefaults standardUserDefaults;
-  NSString *crashClientID = ud stringForKey:kClientIdPreferenceKey;
-  if (crashClientID) {
-    return crashClientID;
-  }
-
-  // Otherwise, if we have no client id, generate one!
-  srandom((int)NSDate date timeIntervalSince1970);
-  long clientId1 = random();
-  long clientId2 = random();
-  long clientId3 = random();
-  crashClientID = NSString stringWithFormat:@"%x%x%x",
-                            clientId1, clientId2, clientId3;
-
-  ud setObject:crashClientID forKey:kClientIdPreferenceKey;
-  ud synchronize;
-  return crashClientID;
-}
-
-//=============================================================================
-- (BOOL)readLogFileData {
-  unsigned int logFileCounter = 0;
-
-  NSString *logPath;
-  size_t logFileTailSize =
-      parameters_ objectForKey:@BREAKPAD_LOGFILE_UPLOAD_SIZE intValue;
-
-  NSMutableArray *logFilenames; // An array of NSString, one per log file
-  logFilenames = NSMutableArray alloc init;
-
-  char tmpDirTemplate80 = "/tmp/CrashUpload-XXXXX";
-  char *tmpDir = mkdtemp(tmpDirTemplate);
-
-  // Construct key names for the keys we expect to contain log file paths
-  for(logFileCounter = 0;; logFileCounter++) {
-    NSString *logFileKey = NSString stringWithFormat:@"%@%d",
-                                     @BREAKPAD_LOGFILE_KEY_PREFIX,
-                                     logFileCounter;
-
-    logPath = parameters_ objectForKey:logFileKey;
-
-    // They should all be consecutive, so if we don't find one, assume
-    // we're done
-
-    if (!logPath) {
-      break;
-    }
-
-    NSData *entireLogFile = NSData alloc initWithContentsOfFile:logPath;
-
-    if (entireLogFile == nil) {
-      continue;
-    }
-
-    NSRange fileRange;
-
-    // Truncate the log file, only if necessary
-
-    if (entireLogFile length <= logFileTailSize) {
-      fileRange = NSMakeRange(0, entireLogFile length);
-    } else {
-      fileRange = NSMakeRange(entireLogFile length - logFileTailSize,
-                              logFileTailSize);
-    }
-
-    char tmpFilenameTemplate100;
-
-    // Generate a template based on the log filename
-    sprintf(tmpFilenameTemplate,"%s/%s-XXXX", tmpDir,
-            logPath lastPathComponent fileSystemRepresentation);
-
-    char *tmpFile = mktemp(tmpFilenameTemplate);
-
-    NSData *logSubdata = entireLogFile subdataWithRange:fileRange;
-    NSString *tmpFileString = NSString stringWithUTF8String:tmpFile;
-    logSubdata writeToFile:tmpFileString atomically:NO;
-
-    logFilenames addObject:tmpFileString lastPathComponent;
-    entireLogFile release;
-  }
-
-  if (logFilenames count == 0) {
-    logFilenames release;
-    logFileData_ =  nil;
-    return NO;
-  }
-
-  // now, bzip all files into one
-  NSTask *tarTask = NSTask alloc init;
-
-  tarTask setCurrentDirectoryPath:NSString stringWithUTF8String:tmpDir;
-  tarTask setLaunchPath:@"/usr/bin/tar";
-
-  NSMutableArray *bzipArgs = NSMutableArray arrayWithObjects:@"-cjvf",
-                                             @"log.tar.bz2",nil;
-  bzipArgs addObjectsFromArray:logFilenames;
-
-  logFilenames release;
-
-  tarTask setArguments:bzipArgs;
-  tarTask launch;
-  tarTask waitUntilExit;
-  tarTask release;
-
-  NSString *logTarFile = NSString stringWithFormat:@"%s/log.tar.bz2",tmpDir;
-  logFileData_ = NSData alloc initWithContentsOfFile:logTarFile;
-  if (logFileData_ == nil) {
-    GTMLoggerDebug(@"Cannot find temp tar log file: %@", logTarFile);
-    return NO;
-  }
-  return YES;
-
-}
-
-//=============================================================================
-- (BOOL)readMinidumpData {
-  NSString *minidumpDir = parameters_ objectForKey:@kReporterMinidumpDirectoryKey;
-  NSString *minidumpID = parameters_ objectForKey:@kReporterMinidumpIDKey;
-
-  if (!minidumpID length)
-    return NO;
-
-  NSString *path = minidumpDir stringByAppendingPathComponent:minidumpID;
-  path = path stringByAppendingPathExtension:@"dmp";
-
-  // check the size of the minidump and limit it to a reasonable size
-  // before attempting to load into memory and upload
-  const char *fileName = path fileSystemRepresentation;
-  struct stat fileStatus;
-
-  BOOL success = YES;
-
-  if (!stat(fileName, &fileStatus)) {
-    if (fileStatus.st_size > kMinidumpFileLengthLimit) {
-      fprintf(stderr, "Breakpad Reporter: minidump file too large " \
-              "to upload : %d\n", (int)fileStatus.st_size);
-      success = NO;
-    }
-  } else {
-      fprintf(stderr, "Breakpad Reporter: unable to determine minidump " \
-              "file length\n");
-      success = NO;
-  }
-
-  if (success) {
-    minidumpContents_ = NSData alloc initWithContentsOfFile:path;
-    success = (minidumpContents_ length ? YES : NO);
-  }
-
-  if (!success) {
-    // something wrong with the minidump file -- delete it
-    unlink(fileName);
-  }
-
-  return success;
+  return self;
 }
 
 //=============================================================================
@@ -560,12 +254,14 @@
 
     buttonPressed = self runModalWindow:alertWindow_ withTimeout:timeout;
 
-    // Extract info from the user into the parameters_ dictionary
+    // Extract info from the user into the uploader_.
     if (self commentsValue) {
-      parameters_ setObject:self commentsValue forKey:@BREAKPAD_COMMENTS;
+      uploader_ parameters setObject:self commentsValue
+                                 forKey:@BREAKPAD_COMMENTS;
     }
     if (self emailValue) {
-      parameters_ setObject:self emailValue forKey:@BREAKPAD_EMAIL;
+      uploader_ parameters setObject:self emailValue
+                                 forKey:@BREAKPAD_EMAIL;
     }
   } else {
     // Create an alert panel to tell the user something happened
@@ -804,9 +500,9 @@
 #pragma mark -
 //=============================================================================
 - (BOOL)reportIntervalElapsed {
-  float interval = parameters_ objectForKey:@BREAKPAD_REPORT_INTERVAL
-    floatValue;
-  NSString *program = parameters_ objectForKey:@BREAKPAD_PRODUCT;
+  float interval = uploader_ parameters
+      objectForKey:@BREAKPAD_REPORT_INTERVAL floatValue;
+  NSString *program = uploader_ parameters objectForKey:@BREAKPAD_PRODUCT;
   NSUserDefaults *ud = NSUserDefaults standardUserDefaults;
   NSMutableDictionary *programDict =
     NSMutableDictionary dictionaryWithDictionary:ud dictionaryForKey:program;
@@ -831,29 +527,30 @@
 }
 
 - (BOOL)isOnDemand {
-  return parameters_ objectForKey:@BREAKPAD_ON_DEMAND
+  return uploader_ parameters objectForKey:@BREAKPAD_ON_DEMAND
 	   isEqualToString:@"YES";
 }
 
 - (BOOL)shouldSubmitSilently {
-  return parameters_ objectForKey:@BREAKPAD_SKIP_CONFIRM
+  return uploader_ parameters objectForKey:@BREAKPAD_SKIP_CONFIRM
             isEqualToString:@"YES";
 }
 
 - (BOOL)shouldRequestComments {
-  return parameters_ objectForKey:@BREAKPAD_REQUEST_COMMENTS
+  return uploader_ parameters objectForKey:@BREAKPAD_REQUEST_COMMENTS
             isEqualToString:@"YES";
 }
 
 - (BOOL)shouldRequestEmail {
-  return parameters_ objectForKey:@BREAKPAD_REQUEST_EMAIL
+  return uploader_ parameters objectForKey:@BREAKPAD_REQUEST_EMAIL
             isEqualToString:@"YES";
 }
 
 - (NSString*)shortDialogMessage {
-  NSString *displayName = parameters_ objectForKey:@BREAKPAD_PRODUCT_DISPLAY;
+  NSString *displayName =
+      uploader_ parameters objectForKey:@BREAKPAD_PRODUCT_DISPLAY;
   if (!displayName length)
-    displayName = parameters_ objectForKey:@BREAKPAD_PRODUCT;
+    displayName = uploader_ parameters objectForKey:@BREAKPAD_PRODUCT;
 
   if (self isOnDemand) {
     return NSString
@@ -867,11 +564,12 @@
 }
 
 - (NSString*)explanatoryDialogText {
-  NSString *displayName = parameters_ objectForKey:@BREAKPAD_PRODUCT_DISPLAY;
+  NSString *displayName =
+      uploader_ parameters objectForKey:@BREAKPAD_PRODUCT_DISPLAY;
   if (!displayName length)
-    displayName = parameters_ objectForKey:@BREAKPAD_PRODUCT;
+    displayName = uploader_ parameters objectForKey:@BREAKPAD_PRODUCT;
 
-  NSString *vendor = parameters_ objectForKey:@BREAKPAD_VENDOR;
+  NSString *vendor = uploader_ parameters objectForKey:@BREAKPAD_VENDOR;
   if (!vendor length)
     vendor = @"unknown vendor";
 
@@ -888,8 +586,8 @@
 
 - (NSTimeInterval)messageTimeout {
   // Get the timeout value for the notification.
-  NSTimeInterval timeout = parameters_ objectForKey:@BREAKPAD_CONFIRM_TIMEOUT
-                              floatValue;
+  NSTimeInterval timeout = uploader_ parameters
+      objectForKey:@BREAKPAD_CONFIRM_TIMEOUT floatValue;
   // Require a timeout of at least a minute (except 0, which means no timeout).
   if (timeout > 0.001 && timeout < 60.0) {
     timeout = 60.0;
@@ -897,194 +595,13 @@
   return timeout;
 }
 
-- (void)createServerParameterDictionaries {
-  serverDictionary_ = NSMutableDictionary alloc init;
-  socorroDictionary_ = NSMutableDictionary alloc init;
-  googleDictionary_ = NSMutableDictionary alloc init;
-  extraServerVars_ = NSMutableDictionary alloc init;
-
-  serverDictionary_ setObject:socorroDictionary_ forKey:kSocorroServerType;
-  serverDictionary_ setObject:googleDictionary_ forKey:kGoogleServerType;
-
-  googleDictionary_ setObject:@"ptime" forKey:@BREAKPAD_PROCESS_UP_TIME;
-  googleDictionary_ setObject:@"email" forKey:@BREAKPAD_EMAIL;
-  googleDictionary_ setObject:@"comments" forKey:@BREAKPAD_COMMENTS;
-  googleDictionary_ setObject:@"prod" forKey:@BREAKPAD_PRODUCT;
-  googleDictionary_ setObject:@"ver" forKey:@BREAKPAD_VERSION;
-
-  socorroDictionary_ setObject:@"Comments" forKey:@BREAKPAD_COMMENTS;
-  socorroDictionary_ setObject:@"CrashTime"
-                         forKey:@BREAKPAD_PROCESS_CRASH_TIME;
-  socorroDictionary_ setObject:@"StartupTime"
-                         forKey:@BREAKPAD_PROCESS_START_TIME;
-  socorroDictionary_ setObject:@"Version"
-                         forKey:@BREAKPAD_VERSION;
-  socorroDictionary_ setObject:@"ProductName"
-                         forKey:@BREAKPAD_PRODUCT;
-  socorroDictionary_ setObject:@"Email"
-                         forKey:@BREAKPAD_EMAIL;
-}
-
-- (NSMutableDictionary *)dictionaryForServerType:(NSString *)serverType {
-  if (serverType == nil || serverType length == 0) {
-    return serverDictionary_ objectForKey:kDefaultServerType;
-  }
-  return serverDictionary_ objectForKey:serverType;
-}
-
-- (NSMutableDictionary *)urlParameterDictionary {
-  NSString *serverType = parameters_ objectForKey:@BREAKPAD_SERVER_TYPE;
-  return self dictionaryForServerType:serverType;
-
-}
-
-- (BOOL)populateServerDictionary:(NSMutableDictionary *)crashParameters {
-  NSDictionary *urlParameterNames = self urlParameterDictionary;
-
-  id key;
-  NSEnumerator *enumerator = parameters_ keyEnumerator;
-
-  while ((key = enumerator nextObject)) {
-    // The key from parameters_ corresponds to a key in
-    // urlParameterNames.  The value in parameters_ gets stored in
-    // crashParameters with a key that is the value in
-    // urlParameterNames.
-
-    // For instance, if parameters_ has PRODUCT_NAME => "FOOBAR" and
-    // urlParameterNames has PRODUCT_NAME => "pname" the final HTTP
-    // URL parameter becomes pname => "FOOBAR".
-    NSString *breakpadParameterName = (NSString *)key;
-    NSString *urlParameter = urlParameterNames
-                                   objectForKey:breakpadParameterName;
-    if (urlParameter) {
-      crashParameters setObject:parameters_ objectForKey:key
-                          forKey:urlParameter;
-    }
-  }
-
-  // Now, add the parameters that were added by the application.
-  enumerator = extraServerVars_ keyEnumerator;
-
-  while ((key = enumerator nextObject)) {
-    NSString *urlParameterName = (NSString *)key;
-    NSString *urlParameterValue =
-      extraServerVars_ objectForKey:urlParameterName;
-    crashParameters setObject:urlParameterValue
-                        forKey:urlParameterName;
-  }
-  return YES;
-}
-
-- (void)addServerParameter:(id)value forKey:(NSString *)key {
-  extraServerVars_ setObject:value forKey:key;
-}
-
-//=============================================================================
 - (void)report {
-  NSURL *url = NSURL URLWithString:parameters_ objectForKey:@BREAKPAD_URL;
-  HTTPMultipartUpload *upload = HTTPMultipartUpload alloc initWithURL:url;
-  NSMutableDictionary *uploadParameters = NSMutableDictionary dictionary;
-
-  if (!self populateServerDictionary:uploadParameters) {
-    return;
-  }
-
-  upload setParameters:uploadParameters;
-
-  // Add minidump file
-  if (minidumpContents_) {
-    upload addFileContents:minidumpContents_ name:@"upload_file_minidump";
-
-    // Send it
-    NSError *error = nil;
-    NSData *data = upload send:&error;
-    NSString *result = NSString alloc initWithData:data
-                                         encoding:NSUTF8StringEncoding;
-    const char *reportID = "ERR";
-
-    if (error) {
-      fprintf(stderr, "Breakpad Reporter: Send Error: %s\n",
-              error description UTF8String);
-    } else {
-      NSCharacterSet *trimSet = NSCharacterSet whitespaceAndNewlineCharacterSet;
-      reportID = result stringByTrimmingCharactersInSet:trimSet UTF8String;
-      self logUploadWithID:reportID;
-    }
-
-    // rename the minidump file according to the id returned from the server
-    NSString *minidumpDir = parameters_ objectForKey:@kReporterMinidumpDirectoryKey;
-    NSString *minidumpID = parameters_ objectForKey:@kReporterMinidumpIDKey;
-
-    NSString *srcString = NSString stringWithFormat:@"%@/%@.dmp",
-                                    minidumpDir, minidumpID;
-    NSString *destString = NSString stringWithFormat:@"%@/%s.dmp",
-                                     minidumpDir, reportID;
-
-    const char *src = srcString fileSystemRepresentation;
-    const char *dest = destString fileSystemRepresentation;
-
-    if (rename(src, dest) == 0) {
-      GTMLoggerInfo(@"Breakpad Reporter: Renamed %s to %s after successful " \
-                    "upload",src, dest);
-    }
-    else {
-      // can't rename - don't worry - it's not important for users
-      GTMLoggerDebug(@"Breakpad Reporter: successful upload report ID = %s\n",
-                     reportID );
-    }
-    result release;
-  }
-
-  if (logFileData_) {
-    HTTPMultipartUpload *logUpload = HTTPMultipartUpload alloc initWithURL:url;
-
-    uploadParameters setObject:@"log" forKey:@"type";
-    logUpload setParameters:uploadParameters;
-    logUpload addFileContents:logFileData_ name:@"log";
-
-    NSError *error = nil;
-    NSData *data = logUpload send:&error;
-    NSString *result = NSString alloc initWithData:data
-                                         encoding:NSUTF8StringEncoding;
-    result release;
-    logUpload release;
-  }
-
-  upload release;
-}
-
-- (void)logUploadWithID:(const char *)uploadID {
-  NSString *minidumpDir =
-      parameters_ objectForKey:@kReporterMinidumpDirectoryKey;
-  NSString *logFilePath = NSString stringWithFormat:@"%@/%s",
-      minidumpDir, kReporterLogFilename;
-  NSString *logLine = NSString stringWithFormat:@"%0.f,%s\n",
-      NSDate date timeIntervalSince1970, uploadID;
-  NSData *logData = logLine dataUsingEncoding:kCFStringEncodingUTF8;
-
-  NSFileManager *fileManager = NSFileManager defaultManager;
-  if (fileManager fileExistsAtPath:logFilePath) {
-    NSFileHandle *logFileHandle =
-       NSFileHandle fileHandleForWritingAtPath:logFilePath;
-    logFileHandle seekToEndOfFile;
-    logFileHandle writeData:logData;
-    logFileHandle closeFile;
-  } else {
-    fileManager createFileAtPath:logFilePath
-                         contents:logData
-                       attributes:nil;
-  }
+  uploader_ report;
 }
 
 //=============================================================================
 - (void)dealloc {
-  parameters_ release;
-  minidumpContents_ release;
-  logFileData_ release;
-  googleDictionary_ release;
-  socorroDictionary_ release;
-  serverDictionary_ release;
-  extraServerVars_ release;
+  uploader_ release;
   super dealloc;
 }
 
@@ -1175,40 +692,12 @@
     exit(1);
   }
 
-  // Open the file before (potentially) switching to console user
-  int configFile = open(argv1, O_RDONLY, 0600);
-
-  if (configFile == -1) {
-    GTMLoggerDebug(@"Couldn't open config file %s - %s",
-                   argv1,
-                   strerror(errno));
-  }
-
-  // we want to avoid a build-up of old config files even if they
-  // have been incorrectly written by the framework
-  unlink(argv1);
-
-  if (configFile == -1) {
-    GTMLoggerDebug(@"Couldn't unlink config file %s - %s",
-                   argv1,
-                   strerror(errno));
-    exit(1);
-  }
-
-  Reporter *reporter = Reporter alloc initWithConfigurationFD:configFile;
-
-  // Gather the configuration data
-  if (!reporter readConfigurationData) {
-    GTMLoggerDebug(@"reporter readConfigurationData failed");
+  Reporter *reporter = Reporter alloc initWithConfigFile:argv1;
+  if (!reporter) {
+    GTMLoggerDebug(@"reporter initialization failed");
     exit(1);
   }
 
-  // Read the minidump into memory before we (potentially) switch from the
-  // root user
-  reporter readMinidumpData;
-
-  reporter readLogFileData;
-
   // only submit a report if we have not recently crashed in the past
   BOOL shouldSubmitReport = reporter reportIntervalElapsed;
   BOOL okayToSend = NO;

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/sender/uploader.h Added

@@ -0,0 +1,81 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// This component uses the HTTPMultipartUpload of the breakpad project to send
+// the minidump and associated data to the crash reporting servers.
+// It will perform throttling based on the parameters passed to it and will
+// prompt the user to send the minidump.
+
+#include <Foundation/Foundation.h>
+
+#import "common/mac/GTMDefines.h"
+
+#define kClientIdPreferenceKey @"clientid"
+
+extern NSString *const kGoogleServerType;
+extern NSString *const kSocorroServerType;
+extern NSString *const kDefaultServerType;
+
+@interface Uploader : NSObject {
+ @private
+  NSMutableDictionary *parameters_;        // Key value pairs of data (STRONG)
+  NSData *minidumpContents_;               // The data in the minidump (STRONG)
+  NSData *logFileData_;                    // An NSdata for the tar,
+                                           // bz2'd log file.
+  NSMutableDictionary *serverDictionary_;  // The dictionary mapping a
+                                           // server type name to a
+                                           // dictionary of server
+                                           // parameter names.
+  NSMutableDictionary *socorroDictionary_; // The dictionary for
+                                           // Socorro.
+  NSMutableDictionary *googleDictionary_;  // The dictionary for
+                                           // Google.
+  NSMutableDictionary *extraServerVars_;   // A dictionary containing
+                                           // extra key/value pairs
+                                           // that are uploaded to the
+                                           // crash server with the
+                                           // minidump.
+}
+
+- (id)initWithConfigFile:(const char *)configFile;
+
+- (id)initWithConfig:(NSDictionary *)config;
+
+- (NSMutableDictionary *)parameters;
+
+- (void)report;
+
+// Upload the given data to the crash server.
+- (void)uploadData:(NSData *)data name:(NSString *)name;
+
+// This method adds a key/value pair to the dictionary that
+// will be uploaded to the crash server.
+- (void)addServerParameter:(id)value forKey:(NSString *)key;
+
+@end

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/sender/uploader.mm Added

@@ -0,0 +1,619 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#import <fcntl.h>
+#import <pwd.h>
+#import <sys/stat.h>
+#include <TargetConditionals.h>
+#import <unistd.h>
+
+#import <SystemConfiguration/SystemConfiguration.h>
+
+#import "common/mac/HTTPMultipartUpload.h"
+
+#import "client/apple/Framework/BreakpadDefines.h"
+#import "client/mac/sender/uploader.h"
+#import "common/mac/GTMLogger.h"
+
+const int kMinidumpFileLengthLimit = 2 * 1024 * 1024;  // 2MB
+
+#define kApplePrefsSyncExcludeAllKey \
+  @"com.apple.PreferenceSync.ExcludeAllSyncKeys"
+
+NSString *const kGoogleServerType = @"google";
+NSString *const kSocorroServerType = @"socorro";
+NSString *const kDefaultServerType = @"google";
+
+#pragma mark -
+
+namespace {
+// Read one line from the configuration file.
+NSString *readString(int fileId) {
+  NSMutableString *str = NSMutableString stringWithCapacity:32;
+  char ch2 = { 0 };
+
+  while (read(fileId, &ch0, 1) == 1) {
+    if (ch0 == '\n') {
+      // Break if this is the first newline after reading some other string
+      // data.
+      if (str length)
+        break;
+    } else {
+      str appendString:NSString stringWithUTF8String:ch;
+    }
+  }
+
+  return str;
+}
+
+//=============================================================================
+// Read |length| of binary data from the configuration file. This method will
+// returns |nil| in case of error.
+NSData *readData(int fileId, ssize_t length) {
+  NSMutableData *data = NSMutableData dataWithLength:length;
+  char *bytes = (char *)data bytes;
+
+  if (read(fileId, bytes, length) != length)
+    return nil;
+
+  return data;
+}
+
+//=============================================================================
+// Read the configuration from the config file.
+NSDictionary *readConfigurationData(const char *configFile) {
+  int fileId = open(configFile, O_RDONLY, 0600);
+  if (fileId == -1) {
+    GTMLoggerDebug(@"Couldn't open config file %s - %s",
+                   configFile,
+                   strerror(errno));
+  }
+
+  // we want to avoid a build-up of old config files even if they
+  // have been incorrectly written by the framework
+  if (unlink(configFile)) {
+    GTMLoggerDebug(@"Couldn't unlink config file %s - %s",
+                   configFile,
+                   strerror(errno));
+  }
+
+  if (fileId == -1) {
+    return nil;
+  }
+
+  NSMutableDictionary *config = NSMutableDictionary dictionary;
+
+  while (1) {
+    NSString *key = readString(fileId);
+
+    if (!key length)
+      break;
+
+    // Read the data.  Try to convert to a UTF-8 string, or just save
+    // the data
+    NSString *lenStr = readString(fileId);
+    ssize_t len = lenStr intValue;
+    NSData *data = readData(fileId, len);
+    id value = NSString alloc initWithData:data
+                                     encoding:NSUTF8StringEncoding;
+
+    config setObject:(value ? value : data) forKey:key;
+    value release;
+  }
+
+  close(fileId);
+  return config;
+}
+}  // namespace
+
+#pragma mark -
+
+@interface Uploader(PrivateMethods)
+
+// Update |parameters_| as well as the server parameters using |config|.
+- (void)translateConfigurationData:(NSDictionary *)config;
+
+// Read the minidump referenced in |parameters_| and update |minidumpContents_|
+// with its content.
+- (BOOL)readMinidumpData;
+
+// Read the log files referenced in |parameters_| and update |logFileData_|
+// with their content.
+- (BOOL)readLogFileData;
+
+// Returns a unique client id (user-specific), creating a persistent
+// one in the user defaults, if necessary.
+- (NSString*)clientID;
+
+// Returns a dictionary that can be used to map Breakpad parameter names to
+// URL parameter names.
+- (NSMutableDictionary *)dictionaryForServerType:(NSString *)serverType;
+
+// Helper method to set HTTP parameters based on server type.  This is
+// called right before the upload - crashParameters will contain, on exit,
+// URL parameters that should be sent with the minidump.
+- (BOOL)populateServerDictionary:(NSMutableDictionary *)crashParameters;
+
+// Initialization helper to create dictionaries mapping Breakpad
+// parameters to URL parameters
+- (void)createServerParameterDictionaries;
+
+// Accessor method for the URL parameter dictionary
+- (NSMutableDictionary *)urlParameterDictionary;
+
+// Records the uploaded crash ID to the log file.
+- (void)logUploadWithID:(const char *)uploadID;
+@end
+
+@implementation Uploader
+
+//=============================================================================
+- (id)initWithConfigFile:(const char *)configFile {
+  NSDictionary *config = readConfigurationData(configFile);
+  if (!config)
+    return nil;
+
+  return self initWithConfig:config;
+}
+
+//=============================================================================
+- (id)initWithConfig:(NSDictionary *)config {
+  if ((self = super init)) {
+    // Because the reporter is embedded in the framework (and many copies
+    // of the framework may exist) its not completely certain that the OS
+    // will obey the com.apple.PreferenceSync.ExcludeAllSyncKeys in our
+    // Info.plist. To make sure, also set the key directly if needed.
+    NSUserDefaults *ud = NSUserDefaults standardUserDefaults;
+    if (!ud boolForKey:kApplePrefsSyncExcludeAllKey) {
+      ud setBool:YES forKey:kApplePrefsSyncExcludeAllKey;
+    }
+
+    self createServerParameterDictionaries;
+
+    self translateConfigurationData:config;
+
+    // Read the minidump into memory.
+    self readMinidumpData;
+    self readLogFileData;
+  }
+  return self;
+}
+
+//=============================================================================
+- (void)translateConfigurationData:(NSDictionary *)config {
+  parameters_ = NSMutableDictionary alloc init;
+
+  NSEnumerator *it = config keyEnumerator;
+  while (NSString *key = it nextObject) {
+    // If the keyname is prefixed by BREAKPAD_SERVER_PARAMETER_PREFIX
+    // that indicates that it should be uploaded to the server along
+    // with the minidump, so we treat it specially.
+    if (key hasPrefix:@BREAKPAD_SERVER_PARAMETER_PREFIX) {
+      NSString *urlParameterKey =
+        key substringFromIndex:@BREAKPAD_SERVER_PARAMETER_PREFIX length;
+      if (urlParameterKey length) {
+        id value = config objectForKey:key;
+        if (value isKindOfClass:NSString class) {
+          self addServerParameter:(NSString *)value
+                            forKey:urlParameterKey;
+        } else {
+          self addServerParameter:(NSData *)value
+                            forKey:urlParameterKey;
+        }
+      }
+    } else {
+      parameters_ setObject:config objectForKey:key forKey:key;
+    }
+  }
+
+  // generate a unique client ID based on this host's MAC address
+  // then add a key/value pair for it
+  NSString *clientID = self clientID;
+  parameters_ setObject:clientID forKey:@"guid";
+}
+
+// Per user per machine
+- (NSString *)clientID {
+  NSUserDefaults *ud = NSUserDefaults standardUserDefaults;
+  NSString *crashClientID = ud stringForKey:kClientIdPreferenceKey;
+  if (crashClientID) {
+    return crashClientID;
+  }
+
+  // Otherwise, if we have no client id, generate one!
+  srandom((int)NSDate date timeIntervalSince1970);
+  long clientId1 = random();
+  long clientId2 = random();
+  long clientId3 = random();
+  crashClientID = NSString stringWithFormat:@"%lx%lx%lx",
+                            clientId1, clientId2, clientId3;
+
+  ud setObject:crashClientID forKey:kClientIdPreferenceKey;
+  ud synchronize;
+  return crashClientID;
+}
+
+//=============================================================================
+- (BOOL)readLogFileData {
+#if TARGET_OS_IPHONE
+  return NO;
+#else
+  unsigned int logFileCounter = 0;
+
+  NSString *logPath;
+  size_t logFileTailSize =
+      parameters_ objectForKey:@BREAKPAD_LOGFILE_UPLOAD_SIZE intValue;
+
+  NSMutableArray *logFilenames; // An array of NSString, one per log file
+  logFilenames = NSMutableArray alloc init;
+
+  char tmpDirTemplate80 = "/tmp/CrashUpload-XXXXX";
+  char *tmpDir = mkdtemp(tmpDirTemplate);
+
+  // Construct key names for the keys we expect to contain log file paths
+  for(logFileCounter = 0;; logFileCounter++) {
+    NSString *logFileKey = NSString stringWithFormat:@"%@%d",
+                                     @BREAKPAD_LOGFILE_KEY_PREFIX,
+                                     logFileCounter;
+
+    logPath = parameters_ objectForKey:logFileKey;
+
+    // They should all be consecutive, so if we don't find one, assume
+    // we're done
+
+    if (!logPath) {
+      break;
+    }
+
+    NSData *entireLogFile = NSData alloc initWithContentsOfFile:logPath;
+
+    if (entireLogFile == nil) {
+      continue;
+    }
+
+    NSRange fileRange;
+
+    // Truncate the log file, only if necessary
+
+    if (entireLogFile length <= logFileTailSize) {
+      fileRange = NSMakeRange(0, entireLogFile length);
+    } else {
+      fileRange = NSMakeRange(entireLogFile length - logFileTailSize,
+                              logFileTailSize);
+    }
+
+    char tmpFilenameTemplate100;
+
+    // Generate a template based on the log filename
+    sprintf(tmpFilenameTemplate,"%s/%s-XXXX", tmpDir,
+            logPath lastPathComponent fileSystemRepresentation);
+
+    char *tmpFile = mktemp(tmpFilenameTemplate);
+
+    NSData *logSubdata = entireLogFile subdataWithRange:fileRange;
+    NSString *tmpFileString = NSString stringWithUTF8String:tmpFile;
+    logSubdata writeToFile:tmpFileString atomically:NO;
+
+    logFilenames addObject:tmpFileString lastPathComponent;
+    entireLogFile release;
+  }
+
+  if (logFilenames count == 0) {
+    logFilenames release;
+    logFileData_ =  nil;
+    return NO;
+  }
+
+  // now, bzip all files into one
+  NSTask *tarTask = NSTask alloc init;
+
+  tarTask setCurrentDirectoryPath:NSString stringWithUTF8String:tmpDir;
+  tarTask setLaunchPath:@"/usr/bin/tar";
+
+  NSMutableArray *bzipArgs = NSMutableArray arrayWithObjects:@"-cjvf",
+                                             @"log.tar.bz2",nil;
+  bzipArgs addObjectsFromArray:logFilenames;
+
+  logFilenames release;
+
+  tarTask setArguments:bzipArgs;
+  tarTask launch;
+  tarTask waitUntilExit;
+  tarTask release;
+
+  NSString *logTarFile = NSString stringWithFormat:@"%s/log.tar.bz2",tmpDir;
+  logFileData_ = NSData alloc initWithContentsOfFile:logTarFile;
+  if (logFileData_ == nil) {
+    GTMLoggerDebug(@"Cannot find temp tar log file: %@", logTarFile);
+    return NO;
+  }
+  return YES;
+#endif  // TARGET_OS_IPHONE
+}
+
+//=============================================================================
+- (BOOL)readMinidumpData {
+  NSString *minidumpDir =
+      parameters_ objectForKey:@kReporterMinidumpDirectoryKey;
+  NSString *minidumpID = parameters_ objectForKey:@kReporterMinidumpIDKey;
+
+  if (!minidumpID length)
+    return NO;
+
+  NSString *path = minidumpDir stringByAppendingPathComponent:minidumpID;
+  path = path stringByAppendingPathExtension:@"dmp";
+
+  // check the size of the minidump and limit it to a reasonable size
+  // before attempting to load into memory and upload
+  const char *fileName = path fileSystemRepresentation;
+  struct stat fileStatus;
+
+  BOOL success = YES;
+
+  if (!stat(fileName, &fileStatus)) {
+    if (fileStatus.st_size > kMinidumpFileLengthLimit) {
+      fprintf(stderr, "Breakpad Uploader: minidump file too large " \
+              "to upload : %d\n", (int)fileStatus.st_size);
+      success = NO;
+    }
+  } else {
+      fprintf(stderr, "Breakpad Uploader: unable to determine minidump " \
+              "file length\n");
+      success = NO;
+  }
+
+  if (success) {
+    minidumpContents_ = NSData alloc initWithContentsOfFile:path;
+    success = (minidumpContents_ length ? YES : NO);
+  }
+
+  if (!success) {
+    // something wrong with the minidump file -- delete it
+    unlink(fileName);
+  }
+
+  return success;
+}
+
+#pragma mark -
+//=============================================================================
+
+- (void)createServerParameterDictionaries {
+  serverDictionary_ = NSMutableDictionary alloc init;
+  socorroDictionary_ = NSMutableDictionary alloc init;
+  googleDictionary_ = NSMutableDictionary alloc init;
+  extraServerVars_ = NSMutableDictionary alloc init;
+
+  serverDictionary_ setObject:socorroDictionary_ forKey:kSocorroServerType;
+  serverDictionary_ setObject:googleDictionary_ forKey:kGoogleServerType;
+
+  googleDictionary_ setObject:@"ptime" forKey:@BREAKPAD_PROCESS_UP_TIME;
+  googleDictionary_ setObject:@"email" forKey:@BREAKPAD_EMAIL;
+  googleDictionary_ setObject:@"comments" forKey:@BREAKPAD_COMMENTS;
+  googleDictionary_ setObject:@"prod" forKey:@BREAKPAD_PRODUCT;
+  googleDictionary_ setObject:@"ver" forKey:@BREAKPAD_VERSION;
+  googleDictionary_ setObject:@"guid" forKey:@"guid";
+
+  socorroDictionary_ setObject:@"Comments" forKey:@BREAKPAD_COMMENTS;
+  socorroDictionary_ setObject:@"CrashTime"
+                         forKey:@BREAKPAD_PROCESS_CRASH_TIME;
+  socorroDictionary_ setObject:@"StartupTime"
+                         forKey:@BREAKPAD_PROCESS_START_TIME;
+  socorroDictionary_ setObject:@"Version"
+                         forKey:@BREAKPAD_VERSION;
+  socorroDictionary_ setObject:@"ProductName"
+                         forKey:@BREAKPAD_PRODUCT;
+  socorroDictionary_ setObject:@"Email"
+                         forKey:@BREAKPAD_EMAIL;
+}
+
+- (NSMutableDictionary *)dictionaryForServerType:(NSString *)serverType {
+  if (serverType == nil || serverType length == 0) {
+    return serverDictionary_ objectForKey:kDefaultServerType;
+  }
+  return serverDictionary_ objectForKey:serverType;
+}
+
+- (NSMutableDictionary *)urlParameterDictionary {
+  NSString *serverType = parameters_ objectForKey:@BREAKPAD_SERVER_TYPE;
+  return self dictionaryForServerType:serverType;
+
+}
+
+- (BOOL)populateServerDictionary:(NSMutableDictionary *)crashParameters {
+  NSDictionary *urlParameterNames = self urlParameterDictionary;
+
+  id key;
+  NSEnumerator *enumerator = parameters_ keyEnumerator;
+
+  while ((key = enumerator nextObject)) {
+    // The key from parameters_ corresponds to a key in
+    // urlParameterNames.  The value in parameters_ gets stored in
+    // crashParameters with a key that is the value in
+    // urlParameterNames.
+
+    // For instance, if parameters_ has PRODUCT_NAME => "FOOBAR" and
+    // urlParameterNames has PRODUCT_NAME => "pname" the final HTTP
+    // URL parameter becomes pname => "FOOBAR".
+    NSString *breakpadParameterName = (NSString *)key;
+    NSString *urlParameter = urlParameterNames
+                                   objectForKey:breakpadParameterName;
+    if (urlParameter) {
+      crashParameters setObject:parameters_ objectForKey:key
+                          forKey:urlParameter;
+    }
+  }
+
+  // Now, add the parameters that were added by the application.
+  enumerator = extraServerVars_ keyEnumerator;
+
+  while ((key = enumerator nextObject)) {
+    NSString *urlParameterName = (NSString *)key;
+    NSString *urlParameterValue =
+      extraServerVars_ objectForKey:urlParameterName;
+    crashParameters setObject:urlParameterValue
+                        forKey:urlParameterName;
+  }
+  return YES;
+}
+
+- (void)addServerParameter:(id)value forKey:(NSString *)key {
+  extraServerVars_ setObject:value forKey:key;
+}
+
+//=============================================================================
+- (void)report {
+  NSURL *url = NSURL URLWithString:parameters_ objectForKey:@BREAKPAD_URL;
+  HTTPMultipartUpload *upload = HTTPMultipartUpload alloc initWithURL:url;
+  NSMutableDictionary *uploadParameters = NSMutableDictionary dictionary;
+
+  if (!self populateServerDictionary:uploadParameters) {
+    upload release;
+    return;
+  }
+
+  upload setParameters:uploadParameters;
+
+  // Add minidump file
+  if (minidumpContents_) {
+    upload addFileContents:minidumpContents_ name:@"upload_file_minidump";
+
+    // If there is a log file, upload it together with the minidump.
+    if (logFileData_) {
+      upload addFileContents:logFileData_ name:@"log";
+    }
+
+    // Send it
+    NSError *error = nil;
+    NSData *data = upload send:&error;
+    NSString *result = NSString alloc initWithData:data
+                                         encoding:NSUTF8StringEncoding;
+    const char *reportID = "ERR";
+
+    if (error) {
+      fprintf(stderr, "Breakpad Uploader: Send Error: %s\n",
+              error description UTF8String);
+    } else {
+      NSCharacterSet *trimSet =
+          NSCharacterSet whitespaceAndNewlineCharacterSet;
+      reportID = result stringByTrimmingCharactersInSet:trimSet UTF8String;
+      self logUploadWithID:reportID;
+    }
+
+    // rename the minidump file according to the id returned from the server
+    NSString *minidumpDir =
+        parameters_ objectForKey:@kReporterMinidumpDirectoryKey;
+    NSString *minidumpID = parameters_ objectForKey:@kReporterMinidumpIDKey;
+
+    NSString *srcString = NSString stringWithFormat:@"%@/%@.dmp",
+                                    minidumpDir, minidumpID;
+    NSString *destString = NSString stringWithFormat:@"%@/%s.dmp",
+                                     minidumpDir, reportID;
+
+    const char *src = srcString fileSystemRepresentation;
+    const char *dest = destString fileSystemRepresentation;
+
+    if (rename(src, dest) == 0) {
+      GTMLoggerInfo(@"Breakpad Uploader: Renamed %s to %s after successful " \
+                    "upload",src, dest);
+    }
+    else {
+      // can't rename - don't worry - it's not important for users
+      GTMLoggerDebug(@"Breakpad Uploader: successful upload report ID = %s\n",
+                     reportID );
+    }
+    result release;
+  } else {
+    // Minidump is missing -- upload just the log file.
+    if (logFileData_) {
+      self uploadData:logFileData_ name:@"log";
+    }
+  }
+  upload release;
+}
+
+- (void)uploadData:(NSData *)data name:(NSString *)name {
+  NSURL *url = NSURL URLWithString:parameters_ objectForKey:@BREAKPAD_URL;
+  NSMutableDictionary *uploadParameters = NSMutableDictionary dictionary;
+
+  if (!self populateServerDictionary:uploadParameters)
+    return;
+
+  HTTPMultipartUpload *upload =
+      HTTPMultipartUpload alloc initWithURL:url;
+
+  uploadParameters setObject:name forKey:@"type";
+  upload setParameters:uploadParameters;
+  upload addFileContents:data name:name;
+
+  upload send:nil;
+  upload release;
+}
+
+- (void)logUploadWithID:(const char *)uploadID {
+  NSString *minidumpDir =
+      parameters_ objectForKey:@kReporterMinidumpDirectoryKey;
+  NSString *logFilePath = NSString stringWithFormat:@"%@/%s",
+      minidumpDir, kReporterLogFilename;
+  NSString *logLine = NSString stringWithFormat:@"%0.f,%s\n",
+      NSDate date timeIntervalSince1970, uploadID;
+  NSData *logData = logLine dataUsingEncoding:NSUTF8StringEncoding;
+
+  NSFileManager *fileManager = NSFileManager defaultManager;
+  if (fileManager fileExistsAtPath:logFilePath) {
+    NSFileHandle *logFileHandle =
+       NSFileHandle fileHandleForWritingAtPath:logFilePath;
+    logFileHandle seekToEndOfFile;
+    logFileHandle writeData:logData;
+    logFileHandle closeFile;
+  } else {
+    fileManager createFileAtPath:logFilePath
+                         contents:logData
+                       attributes:nil;
+  }
+}
+
+//=============================================================================
+- (NSMutableDictionary *)parameters {
+  return parameters_;
+}
+
+//=============================================================================
+- (void)dealloc {
+  parameters_ release;
+  minidumpContents_ release;
+  logFileData_ release;
+  googleDictionary_ release;
+  socorroDictionary_ release;
+  serverDictionary_ release;
+  extraServerVars_ release;
+  super dealloc;
+}
+
+@end

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/tests/crash_generation_server_test.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/tests/crash_generation_server_test.cc Changed

@@ -43,8 +43,8 @@
 #include "client/mac/crash_generation/crash_generation_client.h"
 #include "client/mac/crash_generation/crash_generation_server.h"
 #include "client/mac/handler/exception_handler.h"
-#include "client/mac/tests/auto_tempdir.h"
 #include "client/mac/tests/spawn_child_process.h"
+#include "common/tests/auto_tempdir.h"
 #include "google_breakpad/processor/minidump.h"
 
 namespace google_breakpad {
@@ -111,12 +111,12 @@
 // Test without actually dumping
 TEST_F(CrashGenerationServerTest, testRequestDumpNoDump) {
   CrashGenerationServer server(mach_port_name,
-			       NULL,  // dump callback
-			       NULL,  // dump context
-			       NULL,  // exit callback
-			       NULL,  // exit context
-			       false, // don't generate dumps
-			       temp_dir.path); // dump path
+                               NULL,  // dump callback
+                               NULL,  // dump context
+                               NULL,  // exit callback
+                               NULL,  // exit context
+                               false, // don't generate dumps
+                               temp_dir.path()); // dump path
   ASSERT_TRUE(server.Start());
 
   pid_t pid = fork();
@@ -133,7 +133,7 @@
   EXPECT_EQ(0, WEXITSTATUS(ret));
   EXPECT_TRUE(server.Stop());
   // check that no minidump was written
-  string pattern = temp_dir.path + "/*";
+  string pattern = temp_dir.path() + "/*";
   glob_t dirContents;
   ret = glob(pattern.c_str(), GLOB_NOSORT, NULL, &dirContents);
   EXPECT_EQ(GLOB_NOMATCH, ret);
@@ -161,12 +161,12 @@
 // Test that actually writing a minidump works
 TEST_F(CrashGenerationServerTest, testRequestDump) {
   CrashGenerationServer server(mach_port_name,
-			       dumpCallback,  // dump callback
-			       this,  // dump context
-			       NULL,  // exit callback
-			       NULL,  // exit context
-			       true, //  generate dumps
-			       temp_dir.path); // dump path
+                               dumpCallback,  // dump callback
+                               this,  // dump context
+                               NULL,  // exit callback
+                               NULL,  // exit context
+                               true, //  generate dumps
+                               temp_dir.path()); // dump path
   ASSERT_TRUE(server.Start());
 
   pid_t pid = fork();
@@ -209,12 +209,12 @@
 // the parent.
 TEST_F(CrashGenerationServerTest, testChildProcessCrash) {
   CrashGenerationServer server(mach_port_name,
-			       dumpCallback,  // dump callback
-			       this,  // dump context
-			       NULL,  // exit callback
-			       NULL,  // exit context
-			       true, //  generate dumps
-			       temp_dir.path); // dump path
+                               dumpCallback,  // dump callback
+                               this,  // dump context
+                               NULL,  // exit callback
+                               NULL,  // exit context
+                               true, //  generate dumps
+                               temp_dir.path()); // dump path
   ASSERT_TRUE(server.Start());
 
   pid_t pid = fork();
@@ -270,12 +270,12 @@
 // produces a valid minidump.
 TEST_F(CrashGenerationServerTest, testChildProcessCrashCrossArchitecture) {
   CrashGenerationServer server(mach_port_name,
-			       dumpCallback,  // dump callback
-			       this,  // dump context
-			       NULL,  // exit callback
-			       NULL,  // exit context
-			       true, //  generate dumps
-			       temp_dir.path); // dump path
+                               dumpCallback,  // dump callback
+                               this,  // dump context
+                               NULL,  // exit callback
+                               NULL,  // exit context
+                               true, //  generate dumps
+                               temp_dir.path()); // dump path
   ASSERT_TRUE(server.Start());
 
   // Spawn a child process

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/tests/exception_handler_test.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/tests/exception_handler_test.cc Changed

@@ -36,8 +36,8 @@
 
 #include "breakpad_googletest_includes.h"
 #include "client/mac/handler/exception_handler.h"
-#include "client/mac/tests/auto_tempdir.h"
 #include "common/mac/MachIPC.h"
+#include "common/tests/auto_tempdir.h"
 #include "google_breakpad/processor/minidump.h"
 
 namespace google_breakpad {
@@ -64,6 +64,7 @@
 
 class ExceptionHandlerTest : public Test {
  public:
+  void InProcessCrash(bool aborting);
   AutoTempDir tempDir;
   string lastDumpName;
 };
@@ -75,8 +76,13 @@
   fprintf(stdout, "A = %d", *a);
 }
 
-static void SoonToCrash() {
-  Crasher();
+static void AbortCrasher() {
+  fprintf(stdout, "Going to crash...\n");
+  abort();
+}
+
+static void SoonToCrash(void(*crasher)()) {
+  crasher();
 }
 
 static bool MDCallback(const char *dump_dir, const char *file_name,
@@ -94,7 +100,7 @@
   return true;
 }
 
-TEST_F(ExceptionHandlerTest, InProcess) {
+void ExceptionHandlerTest::InProcessCrash(bool aborting) {
   // Give the child process a pipe to report back on.
   int fds2;
   ASSERT_EQ(0, pipe(fds));
@@ -103,9 +109,9 @@
   if (pid == 0) {
     // In the child process.
     close(fds0);
-    ExceptionHandler eh(tempDir.path, NULL, MDCallback, &fds1, true, NULL);
+    ExceptionHandler eh(tempDir.path(), NULL, MDCallback, &fds1, true, NULL);
     // crash
-    SoonToCrash();
+    SoonToCrash(aborting ? &AbortCrasher : &Crasher);
     // not reached
     exit(1);
   }
@@ -128,6 +134,16 @@
   EXPECT_EQ(0, WEXITSTATUS(ret));
 }
 
+TEST_F(ExceptionHandlerTest, InProcess) {
+  InProcessCrash(false);
+}
+
+#if TARGET_OS_IPHONE
+TEST_F(ExceptionHandlerTest, InProcessAbort) {
+  InProcessCrash(true);
+}
+#endif
+
 static bool DumpNameMDCallback(const char *dump_dir, const char *file_name,
                                void *context, bool success) {
   ExceptionHandlerTest *self = reinterpret_cast<ExceptionHandlerTest*>(context);
@@ -141,7 +157,8 @@
 }
 
 TEST_F(ExceptionHandlerTest, WriteMinidump) {
-  ExceptionHandler eh(tempDir.path, NULL, DumpNameMDCallback, this, true, NULL);
+  ExceptionHandler eh(tempDir.path(), NULL, DumpNameMDCallback, this, true,
+                      NULL);
   ASSERT_TRUE(eh.WriteMinidump());
 
   // Ensure that minidump file exists and is > 0 bytes.
@@ -159,7 +176,8 @@
 }
 
 TEST_F(ExceptionHandlerTest, WriteMinidumpWithException) {
-  ExceptionHandler eh(tempDir.path, NULL, DumpNameMDCallback, this, true, NULL);
+  ExceptionHandler eh(tempDir.path(), NULL, DumpNameMDCallback, this, true,
+                      NULL);
   ASSERT_TRUE(eh.WriteMinidump(true));
 
   // Ensure that minidump file exists and is > 0 bytes.
@@ -227,10 +245,10 @@
 
   // Write a minidump of the child process.
   bool result = ExceptionHandler::WriteMinidumpForChild(child_task,
-							child_thread,
-							tempDir.path,
-							DumpNameMDCallback,
-							this);
+                                                        child_thread,
+                                                        tempDir.path(),
+                                                        DumpNameMDCallback,
+                                                        this);
   ASSERT_EQ(true, result);
 
   // Ensure that minidump file exists and is > 0 bytes.
@@ -267,7 +285,7 @@
   pid_t pid = fork();
   if (pid == 0) {
     close(fds0);
-    ExceptionHandler eh(tempDir.path, NULL, MDCallback, &fds1, true, NULL);
+    ExceptionHandler eh(tempDir.path(), NULL, MDCallback, &fds1, true, NULL);
     // Get some executable memory.
     char* memory =
       reinterpret_cast<char*>(mmap(NULL,
@@ -379,7 +397,7 @@
   pid_t pid = fork();
   if (pid == 0) {
     close(fds0);
-    ExceptionHandler eh(tempDir.path, NULL, MDCallback, &fds1, true, NULL);
+    ExceptionHandler eh(tempDir.path(), NULL, MDCallback, &fds1, true, NULL);
     // Get some executable memory.
     char* memory =
       reinterpret_cast<char*>(mmap(NULL,
@@ -491,7 +509,7 @@
   pid_t pid = fork();
   if (pid == 0) {
     close(fds0);
-    ExceptionHandler eh(tempDir.path, NULL, MDCallback, &fds1, true, NULL);
+    ExceptionHandler eh(tempDir.path(), NULL, MDCallback, &fds1, true, NULL);
     // Get some executable memory.
     char* memory =
       reinterpret_cast<char*>(mmap(NULL,
@@ -594,7 +612,7 @@
   pid_t pid = fork();
   if (pid == 0) {
     close(fds0);
-    ExceptionHandler eh(tempDir.path, NULL, MDCallback, &fds1, true, NULL);
+    ExceptionHandler eh(tempDir.path(), NULL, MDCallback, &fds1, true, NULL);
     // Try calling a NULL pointer.
     typedef void (*void_function)(void);
     void_function memory_function =
@@ -651,7 +669,7 @@
   pid_t pid = fork();
   if (pid == 0) {
     close(fds0);
-    ExceptionHandler eh(tempDir.path, NULL, MDCallback, &fds1, true, NULL);
+    ExceptionHandler eh(tempDir.path(), NULL, MDCallback, &fds1, true, NULL);
 
     // Run an extra thread so >2 memory regions will be written.
     pthread_t junk_thread;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/mac/tests/minidump_generator_test.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/mac/tests/minidump_generator_test.cc Changed

@@ -41,9 +41,9 @@
 
 #include "breakpad_googletest_includes.h"
 #include "client/mac/handler/minidump_generator.h"
-#include "client/mac/tests/auto_tempdir.h"
 #include "client/mac/tests/spawn_child_process.h"
 #include "common/mac/MachIPC.h"
+#include "common/tests/auto_tempdir.h"
 #include "google_breakpad/processor/minidump.h"
 
 namespace google_breakpad {
@@ -88,8 +88,8 @@
 
 TEST_F(MinidumpGeneratorTest, InProcess) {
   MinidumpGenerator generator;
-  string dump_filename = MinidumpGenerator::UniqueNameInDirectory(tempDir.path,
-                                                                  NULL);
+  string dump_filename =
+      MinidumpGenerator::UniqueNameInDirectory(tempDir.path(), NULL);
 
   // Run an extra thread since MinidumpGenerator assumes there
   // are 2 or more threads.
@@ -179,8 +179,8 @@
 
   // Write a minidump of the child process.
   MinidumpGenerator generator(child_task, MACH_PORT_NULL);
-  string dump_filename = MinidumpGenerator::UniqueNameInDirectory(tempDir.path,
-                                                                  NULL);
+  string dump_filename =
+      MinidumpGenerator::UniqueNameInDirectory(tempDir.path(), NULL);
   ASSERT_TRUE(generator.Write(dump_filename.c_str()));
 
   // Ensure that minidump file exists and is > 0 bytes.
@@ -258,8 +258,8 @@
 
   // Write a minidump of the child process.
   MinidumpGenerator generator(child_task, MACH_PORT_NULL);
-  string dump_filename = MinidumpGenerator::UniqueNameInDirectory(tempDir.path,
-                                                                  NULL);
+  string dump_filename =
+      MinidumpGenerator::UniqueNameInDirectory(tempDir.path(), NULL);
   ASSERT_TRUE(generator.Write(dump_filename.c_str()));
 
   // Ensure that minidump file exists and is > 0 bytes.

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/build/common.gypi -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/build/common.gypi Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/common/auto_critical_section.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/common/auto_critical_section.h Changed

@@ -40,13 +40,30 @@
  public:
   // Creates a new instance with the given critical section object
   // and enters the critical section immediately.
-  explicit AutoCriticalSection(CRITICAL_SECTION* cs) : cs_(cs) {
+  explicit AutoCriticalSection(CRITICAL_SECTION* cs) : cs_(cs), taken_(false) {
     assert(cs_);
-    EnterCriticalSection(cs_);
+    Acquire();
   }
 
   // Destructor: leaves the critical section.
   ~AutoCriticalSection() {
+    if (taken_) {
+      Release();
+    }
+  }
+
+  // Enters the critical section. Recursive Acquire() calls are not allowed.
+  void Acquire() {
+    assert(!taken_);
+    EnterCriticalSection(cs_);
+    taken_ = true;
+  }
+
+  // Leaves the critical section. The caller should not call Release() unless
+  // the critical seciton has been entered already.
+  void Release() {
+    assert(taken_);
+    taken_ = false;
     LeaveCriticalSection(cs_);
   }
 
@@ -56,6 +73,7 @@
   AutoCriticalSection& operator=(const AutoCriticalSection&);
 
   CRITICAL_SECTION* cs_;
+  bool taken_;
 };
 
 }  // namespace google_breakpad

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/common/ipc_protocol.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/common/ipc_protocol.h Changed

@@ -90,7 +90,8 @@
   MESSAGE_TAG_NONE = 0,
   MESSAGE_TAG_REGISTRATION_REQUEST = 1,
   MESSAGE_TAG_REGISTRATION_RESPONSE = 2,
-  MESSAGE_TAG_REGISTRATION_ACK = 3
+  MESSAGE_TAG_REGISTRATION_ACK = 3,
+  MESSAGE_TAG_UPLOAD_REQUEST = 4
 };
 
 struct CustomClientInfo {
@@ -102,7 +103,7 @@
 struct ProtocolMessage {
   ProtocolMessage()
       : tag(MESSAGE_TAG_NONE),
-        pid(0),
+        id(0),
         dump_type(MiniDumpNormal),
         thread_id(0),
         exception_pointers(NULL),
@@ -115,7 +116,7 @@
 
   // Creates an instance with the given parameters.
   ProtocolMessage(MessageTag arg_tag,
-                  DWORD arg_pid,
+                  DWORD arg_id,
                   MINIDUMP_TYPE arg_dump_type,
                   DWORD* arg_thread_id,
                   EXCEPTION_POINTERS** arg_exception_pointers,
@@ -125,7 +126,7 @@
                   HANDLE arg_dump_generated_handle,
                   HANDLE arg_server_alive)
     : tag(arg_tag),
-      pid(arg_pid),
+      id(arg_id),
       dump_type(arg_dump_type),
       thread_id(arg_thread_id),
       exception_pointers(arg_exception_pointers),
@@ -139,8 +140,9 @@
   // Tag in the message.
   MessageTag tag;
 
-  // Process id.
-  DWORD pid;
+  // The id for this message. This may be either a process id or a crash id
+  // depending on the type of message.
+  DWORD id;
 
   // Dump type requested.
   MINIDUMP_TYPE dump_type;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/client_info.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/client_info.cc Changed

@@ -31,6 +31,7 @@
 #include "client/windows/common/ipc_protocol.h"
 
 static const wchar_t kCustomInfoProcessUptimeName = L"ptime";
+static const size_t kMaxCustomInfoEntries = 4096;
 
 namespace google_breakpad {
 
@@ -52,7 +53,8 @@
       dump_requested_handle_(NULL),
       dump_generated_handle_(NULL),
       dump_request_wait_handle_(NULL),
-      process_exit_wait_handle_(NULL) {
+      process_exit_wait_handle_(NULL),
+      crash_id_(NULL) {
   GetSystemTimeAsFileTime(&start_time_);
 }
 
@@ -62,6 +64,12 @@
     return false;
   }
 
+  // The crash_id will be the low order word of the process creation time.
+  FILETIME creation_time, exit_time, kernel_time, user_time;
+  if (GetProcessTimes(process_handle_, &creation_time, &exit_time,
+                      &kernel_time, &user_time))
+    crash_id_ = creation_time.dwLowDateTime;
+
   dump_requested_handle_ = CreateEvent(NULL,    // Security attributes.
                                        TRUE,    // Manual reset.
                                        FALSE,   // Initial state.
@@ -160,6 +168,9 @@
 }
 
 bool ClientInfo::PopulateCustomInfo() {
+  if (custom_client_info_.count > kMaxCustomInfoEntries)
+    return false;
+
   SIZE_T bytes_count = 0;
   SIZE_T read_count = sizeof(CustomInfoEntry) * custom_client_info_.count;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/client_info.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/client_info.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/crash_generation_client.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/crash_generation_client.cc Changed

@@ -167,6 +167,23 @@
   return success;
 }
 
+bool CrashGenerationClient::RequestUpload(DWORD crash_id) {
+  HANDLE pipe = ConnectToServer();
+  if (!pipe) {
+    return false;
+  }
+
+  CustomClientInfo custom_info = {NULL, 0};
+  ProtocolMessage msg(MESSAGE_TAG_UPLOAD_REQUEST, crash_id,
+                      static_cast<MINIDUMP_TYPE>(NULL), NULL, NULL, NULL,
+                      custom_info, NULL, NULL, NULL);
+  DWORD bytes_count = 0;
+  bool success = WriteFile(pipe, &msg, sizeof(msg), &bytes_count, NULL) != 0;
+
+  CloseHandle(pipe);
+  return success;
+}
+
 HANDLE CrashGenerationClient::ConnectToServer() {
   HANDLE pipe = ConnectToPipe(pipe_name_.c_str(),
                               kPipeDesiredAccess,
@@ -223,7 +240,7 @@
   crash_event_ = reply.dump_request_handle;
   crash_generated_ = reply.dump_generated_handle;
   server_alive_ = reply.server_alive_handle;
-  server_process_id_ = reply.pid;
+  server_process_id_ = reply.id;
 
   return true;
 }
@@ -261,7 +278,7 @@
 bool CrashGenerationClient::ValidateResponse(
     const ProtocolMessage& msg) const {
   return (msg.tag == MESSAGE_TAG_REGISTRATION_RESPONSE) &&
-         (msg.pid != 0) &&
+         (msg.id != 0) &&
          (msg.dump_request_handle != NULL) &&
          (msg.dump_generated_handle != NULL) &&
          (msg.server_alive_handle != NULL);

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/crash_generation_client.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/crash_generation_client.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/crash_generation_server.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/crash_generation_server.cc Changed

@@ -84,11 +84,12 @@
 static const int kShutdownSleepIntervalMs = 5;
 
 static bool IsClientRequestValid(const ProtocolMessage& msg) {
-  return msg.tag == MESSAGE_TAG_REGISTRATION_REQUEST &&
-         msg.pid != 0 &&
-         msg.thread_id != NULL &&
-         msg.exception_pointers != NULL &&
-         msg.assert_info != NULL;
+  return msg.tag == MESSAGE_TAG_UPLOAD_REQUEST ||
+         (msg.tag == MESSAGE_TAG_REGISTRATION_REQUEST &&
+          msg.id != 0 &&
+          msg.thread_id != NULL &&
+          msg.exception_pointers != NULL &&
+          msg.assert_info != NULL);
 }
 
 CrashGenerationServer::CrashGenerationServer(
@@ -100,6 +101,8 @@
     void* dump_context,
     OnClientExitedCallback exit_callback,
     void* exit_context,
+    OnClientUploadRequestCallback upload_request_callback,
+    void* upload_context,
     bool generate_dumps,
     const std::wstring* dump_path)
     : pipe_name_(pipe_name),
@@ -113,6 +116,8 @@
       dump_context_(dump_context),
       exit_callback_(exit_callback),
       exit_context_(exit_context),
+      upload_request_callback_(upload_request_callback),
+      upload_context_(upload_context),
       generate_dumps_(generate_dumps),
       dump_generator_(NULL),
       server_state_(IPC_SERVER_STATE_UNINITIALIZED),
@@ -120,7 +125,7 @@
       overlapped_(),
       client_info_(NULL),
       cleanup_item_count_(0) {
-  InitializeCriticalSection(&clients_sync_);
+  InitializeCriticalSection(&sync_);
 
   if (dump_path) {
     dump_generator_.reset(new MinidumpGenerator(*dump_path));
@@ -128,38 +133,41 @@
 }
 
 CrashGenerationServer::~CrashGenerationServer() {
-  // Indicate to existing threads that server is shutting down.
-  shutting_down_ = true;
-
-  // Even if there are no current worker threads running, it is possible that
-  // an I/O request is pending on the pipe right now but not yet done. In fact,
-  // it's very likely this is the case unless we are in an ERROR state. If we
-  // don't wait for the pending I/O to be done, then when the I/O completes,
-  // it may write to invalid memory. AppVerifier will flag this problem too.
-  // So we disconnect from the pipe and then wait for the server to get into
-  // error state so that the pending I/O will fail and get cleared.
-  DisconnectNamedPipe(pipe_);
-  int num_tries = 100;
-  while (num_tries-- && server_state_ != IPC_SERVER_STATE_ERROR) {
-    Sleep(10);
-  }
-
-  // Unregister wait on the pipe.
-  if (pipe_wait_handle_) {
-    // Wait for already executing callbacks to finish.
-    UnregisterWaitEx(pipe_wait_handle_, INVALID_HANDLE_VALUE);
-  }
+  // New scope to release the lock automatically.
+  {
+    AutoCriticalSection lock(&sync_);
+
+    // Indicate to existing threads that server is shutting down.
+    shutting_down_ = true;
+
+    // Even if there are no current worker threads running, it is possible that
+    // an I/O request is pending on the pipe right now but not yet done.
+    // In fact, it's very likely this is the case unless we are in an ERROR
+    // state. If we don't wait for the pending I/O to be done, then when the I/O
+    // completes, it may write to invalid memory. AppVerifier will flag this
+    // problem too. So we disconnect from the pipe and then wait for the server
+    // to get into error state so that the pending I/O will fail and get
+    // cleared.
+    DisconnectNamedPipe(pipe_);
+    int num_tries = 100;
+    while (num_tries-- && server_state_ != IPC_SERVER_STATE_ERROR) {
+      lock.Release();
+      Sleep(10);
+      lock.Acquire();
+    }
 
-  // Close the pipe to avoid further client connections.
-  if (pipe_) {
-    CloseHandle(pipe_);
-  }
+    // Unregister wait on the pipe.
+    if (pipe_wait_handle_) {
+      // Wait for already executing callbacks to finish.
+      UnregisterWaitEx(pipe_wait_handle_, INVALID_HANDLE_VALUE);
+    }
 
-  // Request all ClientInfo objects to unregister all waits.
-  // New scope to hold the lock for the shortest time.
-  {
-    AutoCriticalSection lock(&clients_sync_);
+    // Close the pipe to avoid further client connections.
+    if (pipe_) {
+      CloseHandle(pipe_);
+    }
 
+    // Request all ClientInfo objects to unregister all waits.
     std::list<ClientInfo*>::iterator iter;
     for (iter = clients_.begin(); iter != clients_.end(); ++iter) {
       ClientInfo* client_info = *iter;
@@ -180,33 +188,35 @@
     }
   }
 
-  // Clean up all the ClientInfo objects.
   // New scope to hold the lock for the shortest time.
   {
-    AutoCriticalSection lock(&clients_sync_);
+    AutoCriticalSection lock(&sync_);
 
+    // Clean up all the ClientInfo objects.
     std::list<ClientInfo*>::iterator iter;
     for (iter = clients_.begin(); iter != clients_.end(); ++iter) {
       ClientInfo* client_info = *iter;
       delete client_info;
     }
-  }
 
-  if (server_alive_handle_) {
-    // Release the mutex before closing the handle so that clients requesting
-    // dumps wait for a long time for the server to generate a dump.
-    ReleaseMutex(server_alive_handle_);
-    CloseHandle(server_alive_handle_);
-  }
+    if (server_alive_handle_) {
+      // Release the mutex before closing the handle so that clients requesting
+      // dumps wait for a long time for the server to generate a dump.
+      ReleaseMutex(server_alive_handle_);
+      CloseHandle(server_alive_handle_);
+    }
 
-  if (overlapped_.hEvent) {
-    CloseHandle(overlapped_.hEvent);
+    if (overlapped_.hEvent) {
+      CloseHandle(overlapped_.hEvent);
+    }
   }
 
-  DeleteCriticalSection(&clients_sync_);
+  DeleteCriticalSection(&sync_);
 }
 
 bool CrashGenerationServer::Start() {
+  AutoCriticalSection lock(&sync_);
+
   if (server_state_ != IPC_SERVER_STATE_UNINITIALIZED) {
     return false;
   }
@@ -416,9 +426,16 @@
     return;
   }
 
+  if (msg_.tag == MESSAGE_TAG_UPLOAD_REQUEST) {
+    if (upload_request_callback_)
+      upload_request_callback_(upload_context_, msg_.id);
+    EnterStateImmediately(IPC_SERVER_STATE_DISCONNECTING);
+    return;
+  }
+
   scoped_ptr<ClientInfo> client_info(
       new ClientInfo(this,
-                     msg_.pid,
+                     msg_.id,
                      msg_.dump_type,
                      msg_.thread_id,
                      msg_.exception_pointers,
@@ -582,7 +599,7 @@
 bool CrashGenerationServer::PrepareReply(const ClientInfo& client_info,
                                          ProtocolMessage* reply) const {
   reply->tag = MESSAGE_TAG_REGISTRATION_RESPONSE;
-  reply->pid = GetCurrentProcessId();
+  reply->id = GetCurrentProcessId();
 
   if (CreateClientHandles(client_info, reply)) {
     return true;
@@ -670,6 +687,8 @@
 // implements the state machine described in ReadMe.txt along with the
 // helper methods HandleXXXState.
 void CrashGenerationServer::HandleConnectionRequest() {
+  AutoCriticalSection lock(&sync_);
+
   // If we are shutting doen then get into ERROR state, reset the event so more
   // workers don't run and return immediately.
   if (shutting_down_) {
@@ -756,7 +775,7 @@
 
   // New scope to hold the lock for the shortest time.
   {
-    AutoCriticalSection lock(&clients_sync_);
+    AutoCriticalSection lock(&sync_);
     clients_.push_back(client_info);
   }
 
@@ -793,6 +812,7 @@
   CrashGenerationServer* crash_server = client_info->crash_server();
   assert(crash_server);
 
+  client_info->UnregisterWaits();
   InterlockedIncrement(&crash_server->cleanup_item_count_);
 
   if (!QueueUserWorkItem(CleanupClient, context, WT_EXECUTEDEFAULT)) {
@@ -823,7 +843,7 @@
 
   // Start a new scope to release lock automatically.
   {
-    AutoCriticalSection lock(&clients_sync_);
+    AutoCriticalSection lock(&sync_);
     clients_.remove(client_info);
   }

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/crash_generation_server.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/crash_generation/crash_generation_server.h Changed

@@ -59,6 +59,9 @@
   typedef void (*OnClientExitedCallback)(void* context,
                                          const ClientInfo* client_info);
 
+  typedef void (*OnClientUploadRequestCallback)(void* context,
+                                                const DWORD crash_id);
+
   // Creates an instance with the given parameters.
   //
   // Parameter pipe_name: Name of the Windows named pipe
@@ -86,6 +89,8 @@
                         void* dump_context,
                         OnClientExitedCallback exit_callback,
                         void* exit_context,
+                        OnClientUploadRequestCallback upload_request_callback,
+                        void* upload_context,
                         bool generate_dumps,
                         const std::wstring* dump_path);
 
@@ -211,8 +216,9 @@
   // asynchronous IO operation.
   void EnterStateWhenSignaled(IPCServerState state);
 
-  // Sync object for thread-safe access to the shared list of clients.
-  CRITICAL_SECTION clients_sync_;
+  // Sync object for thread-safe access to the shared list of clients and
+  // the server's state.
+  CRITICAL_SECTION sync_;
 
   // List of clients.
   std::list<ClientInfo*> clients_;
@@ -250,6 +256,12 @@
   // Context for client process exit callback.
   void* exit_context_;
 
+  // Callback for upload request.
+  OnClientUploadRequestCallback upload_request_callback_;
+
+  // Context for upload request callback.
+  void* upload_context_;
+
   // Whether to generate dumps.
   bool generate_dumps_;
 
@@ -260,10 +272,10 @@
   // Note that since we restrict the pipe to one instance, we
   // only need to keep one state of the server. Otherwise, server
   // would have one state per client it is talking to.
-  volatile IPCServerState server_state_;
+  IPCServerState server_state_;
 
   // Whether the server is shutting down.
-  volatile bool shutting_down_;
+  bool shutting_down_;
 
   // Overlapped instance for async I/O on the pipe.
   OVERLAPPED overlapped_;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/handler/exception_handler.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/handler/exception_handler.cc Changed

@@ -39,8 +39,6 @@
 #include "client/windows/handler/exception_handler.h"
 #include "common/windows/guid_string.h"
 
-typedef VOID (WINAPI *RtlCaptureContextPtr) (PCONTEXT pContextRecord);
-
 namespace google_breakpad {
 
 static const int kWaitForHandlerThreadMs = 60000;
@@ -223,8 +221,8 @@
       previous_iph_ = _set_invalid_parameter_handler(HandleInvalidParameter);
 #endif  // _MSC_VER >= 1400
 
-//     if (handler_types & HANDLER_PURECALL)
-//       previous_pch_ = _set_purecall_handler(HandlePureVirtualCall);
+//    if (handler_types & HANDLER_PURECALL)
+//      previous_pch_ = _set_purecall_handler(HandlePureVirtualCall);
 
     LeaveCriticalSection(&handler_stack_critical_section_);
   }
@@ -250,8 +248,8 @@
       _set_invalid_parameter_handler(previous_iph_);
 #endif  // _MSC_VER >= 1400
 
-//     if (handler_types_ & HANDLER_PURECALL)
-//       _set_purecall_handler(previous_pch_);
+//    if (handler_types_ & HANDLER_PURECALL)
+//      _set_purecall_handler(previous_pch_);
 
     if (handler_stack_->back() == this) {
       handler_stack_->pop_back();
@@ -314,6 +312,10 @@
   }
 }
 
+bool ExceptionHandler::RequestUpload(DWORD crash_id) {
+  return crash_generation_client_->RequestUpload(crash_id);
+}
+
 // static
 DWORD ExceptionHandler::ExceptionHandlerThreadMain(void* lpParameter) {
   ExceptionHandler* self = reinterpret_cast<ExceptionHandler *>(lpParameter);
@@ -380,7 +382,7 @@
 #if _MSC_VER >= 1400  // MSVC 2005/8
     _set_invalid_parameter_handler(handler_->previous_iph_);
 #endif  // _MSC_VER >= 1400
-//     _set_purecall_handler(handler_->previous_pch_);
+//    _set_purecall_handler(handler_->previous_pch_);
   }
 
   ~AutoExceptionHandler() {
@@ -389,7 +391,7 @@
 #if _MSC_VER >= 1400  // MSVC 2005/8
     _set_invalid_parameter_handler(ExceptionHandler::HandleInvalidParameter);
 #endif  // _MSC_VER >= 1400
-//     _set_purecall_handler(ExceptionHandler::HandlePureVirtualCall);
+//    _set_purecall_handler(ExceptionHandler::HandlePureVirtualCall);
 
     --ExceptionHandler::handler_stack_index_;
     LeaveCriticalSection(&ExceptionHandler::handler_stack_critical_section_);
@@ -498,27 +500,19 @@
   CONTEXT exception_context = {};
   EXCEPTION_POINTERS exception_ptrs = { &exception_record, &exception_context };
 
-  EXCEPTION_POINTERS* exinfo = NULL;
-
-  RtlCaptureContextPtr fnRtlCaptureContext = (RtlCaptureContextPtr)
-    GetProcAddress(GetModuleHandleW(L"kernel32"), "RtlCaptureContext");
-  if (fnRtlCaptureContext) {
-    fnRtlCaptureContext(&exception_context);
-
-    exception_record.ExceptionCode = STATUS_NONCONTINUABLE_EXCEPTION;
+  ::RtlCaptureContext(&exception_context);
 
-    // We store pointers to the the expression and function strings,
-    // and the line as exception parameters to make them easy to
-    // access by the developer on the far side.
-    exception_record.NumberParameters = 3;
-    exception_record.ExceptionInformation0 =
-        reinterpret_cast<ULONG_PTR>(&assertion.expression);
-    exception_record.ExceptionInformation1 =
-        reinterpret_cast<ULONG_PTR>(&assertion.file);
-    exception_record.ExceptionInformation2 = assertion.line;
+  exception_record.ExceptionCode = STATUS_INVALID_PARAMETER;
 
-    exinfo = &exception_ptrs;
-  }
+  // We store pointers to the the expression and function strings,
+  // and the line as exception parameters to make them easy to
+  // access by the developer on the far side.
+  exception_record.NumberParameters = 3;
+  exception_record.ExceptionInformation0 =
+      reinterpret_cast<ULONG_PTR>(&assertion.expression);
+  exception_record.ExceptionInformation1 =
+      reinterpret_cast<ULONG_PTR>(&assertion.file);
+  exception_record.ExceptionInformation2 = assertion.line;
 
   bool success = false;
   // In case of out-of-process dump generation, directly call
@@ -526,10 +520,10 @@
   if (current_handler->IsOutOfProcess()) {
     success = current_handler->WriteMinidumpWithException(
         GetCurrentThreadId(),
-        exinfo,
+        &exception_ptrs,
         &assertion);
   } else {
-    success = current_handler->WriteMinidumpOnHandlerThread(exinfo,
+    success = current_handler->WriteMinidumpOnHandlerThread(&exception_ptrs,
                                                             &assertion);
   }
 
@@ -586,27 +580,19 @@
   CONTEXT exception_context = {};
   EXCEPTION_POINTERS exception_ptrs = { &exception_record, &exception_context };
 
-  EXCEPTION_POINTERS* exinfo = NULL;
-
-  RtlCaptureContextPtr fnRtlCaptureContext = (RtlCaptureContextPtr)
-    GetProcAddress(GetModuleHandleW(L"kernel32"), "RtlCaptureContext");
-  if (fnRtlCaptureContext) {
-    fnRtlCaptureContext(&exception_context);
+  ::RtlCaptureContext(&exception_context);
 
-    exception_record.ExceptionCode = STATUS_NONCONTINUABLE_EXCEPTION;
+  exception_record.ExceptionCode = STATUS_NONCONTINUABLE_EXCEPTION;
 
-    // We store pointers to the the expression and function strings,
-    // and the line as exception parameters to make them easy to
-    // access by the developer on the far side.
-    exception_record.NumberParameters = 3;
-    exception_record.ExceptionInformation0 =
-        reinterpret_cast<ULONG_PTR>(&assertion.expression);
-    exception_record.ExceptionInformation1 =
-        reinterpret_cast<ULONG_PTR>(&assertion.file);
-    exception_record.ExceptionInformation2 = assertion.line;
-
-    exinfo = &exception_ptrs;
-  }
+  // We store pointers to the the expression and function strings,
+  // and the line as exception parameters to make them easy to
+  // access by the developer on the far side.
+  exception_record.NumberParameters = 3;
+  exception_record.ExceptionInformation0 =
+      reinterpret_cast<ULONG_PTR>(&assertion.expression);
+  exception_record.ExceptionInformation1 =
+      reinterpret_cast<ULONG_PTR>(&assertion.file);
+  exception_record.ExceptionInformation2 = assertion.line;
 
   bool success = false;
   // In case of out-of-process dump generation, directly call
@@ -615,10 +601,10 @@
   if (current_handler->IsOutOfProcess()) {
     success = current_handler->WriteMinidumpWithException(
         GetCurrentThreadId(),
-        exinfo,
+        &exception_ptrs,
         &assertion);
   } else {
-    success = current_handler->WriteMinidumpOnHandlerThread(exinfo,
+    success = current_handler->WriteMinidumpOnHandlerThread(&exception_ptrs,
                                                             &assertion);
   }
 
@@ -678,7 +664,18 @@
 }
 
 bool ExceptionHandler::WriteMinidump() {
-  return WriteMinidumpForException(NULL);
+  // Make up an exception record for the current thread and CPU context
+  // to make it possible for the crash processor to classify these
+  // as do regular crashes, and to make it humane for developers to
+  // analyze them.
+  EXCEPTION_RECORD exception_record = {};
+  CONTEXT exception_context = {};
+  EXCEPTION_POINTERS exception_ptrs = { &exception_record, &exception_context };
+
+  ::RtlCaptureContext(&exception_context);
+  exception_record.ExceptionCode = STATUS_NONCONTINUABLE_EXCEPTION;
+
+  return WriteMinidumpForException(&exception_ptrs);
 }
 
 bool ExceptionHandler::WriteMinidumpForException(EXCEPTION_POINTERS* exinfo) {
@@ -775,7 +772,7 @@
         if (exinfo) {
           // Find a memory region of 256 bytes centered on the
           // faulting instruction pointer.
-          const ULONG64 instruction_pointer =
+          const ULONG64 instruction_pointer = 
 #if defined(_M_IX86)
             exinfo->ContextRecord->Eip;
 #elif defined(_M_AMD64)
@@ -854,7 +851,7 @@
     callback_context->finished = true;
     return TRUE;
   }
-
+    
     // Include all modules.
   case IncludeModuleCallback:
   case ModuleCallback:
@@ -866,11 +863,10 @@
     return TRUE;
 
     // Stop receiving cancel callbacks.
-//FIXME: CancelCallback is missing in our mingw headers currently, but it's present in trunk, so we need to comment this in as soon as mingw is updated in opensuse (domme)
-//   case CancelCallback:
-//     callback_output->CheckCancel = FALSE;
-//     callback_output->Cancel = FALSE;
-//     return TRUE;
+  case CancelCallback:
+    callback_output->CheckCancel = FALSE;
+    callback_output->Cancel = FALSE;
+    return TRUE;
   }
   // Ignore other callback types.
   return FALSE;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/handler/exception_handler.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/handler/exception_handler.h Changed

@@ -88,9 +88,9 @@
   // if any.
   //
   // If a FilterCallback returns true, Breakpad will continue processing,
-  // attempting to write a minidump.  If a FilterCallback returns false, Breakpad
-  // will immediately report the exception as unhandled without writing a
-  // minidump, allowing another handler the opportunity to handle it.
+  // attempting to write a minidump.  If a FilterCallback returns false,
+  // Breakpad will immediately report the exception as unhandled without
+  // writing a minidump, allowing another handler the opportunity to handle it.
   typedef bool (*FilterCallback)(void* context, EXCEPTION_POINTERS* exinfo,
                                  MDRawAssertionInfo* assertion);
 
@@ -177,6 +177,9 @@
     UpdateNextID();  // Necessary to put dump_path_ in next_minidump_path_.
   }
 
+  // Requests that a previously reported crash be uploaded.
+  bool RequestUpload(DWORD crash_id);
+
   // Writes a minidump immediately.  This can be used to capture the
   // execution state independently of a crash.  Returns true on success.
   bool WriteMinidump();

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/tests/crash_generation_app/crash_generation_app.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/tests/crash_generation_app/crash_generation_app.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/tests/crash_generation_app/crash_generation_app.gyp -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/tests/crash_generation_app/crash_generation_app.gyp Changed

@@ -1,61 +1,61 @@
-# Copyright (c) 2010, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-{
-  'includes': 
-    '../../build/common.gypi',
-  ,
-  'targets': 
-    {
-      'target_name': 'crash_generation_app',
-      'type': 'executable',
-      'sources': 
-        'abstract_class.cc',
-        'abstract_class.h',
-        'crash_generation_app.cc',
-        'crash_generation_app.h',
-        'crash_generation_app.ico',
-        'crash_generation_app.rc',
-        'resource.h',
-        'small.ico',
-      ,
-      'dependencies': 
-        '../../breakpad_client.gyp:common',
-        '../../crash_generation/crash_generation.gyp:crash_generation_server',
-        '../../crash_generation/crash_generation.gyp:crash_generation_client',
-        '../../handler/exception_handler.gyp:exception_handler',
-      ,
-      'msvs_settings': {
-        'VCLinkerTool': {
-          'SubSystem': '2',  # Windows Subsystem as opposed to a console app
-        },
-      },
-    }
-  
-}
+# Copyright (c) 2010, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+{
+  'includes': 
+    '../../build/common.gypi',
+  ,
+  'targets': 
+    {
+      'target_name': 'crash_generation_app',
+      'type': 'executable',
+      'sources': 
+        'abstract_class.cc',
+        'abstract_class.h',
+        'crash_generation_app.cc',
+        'crash_generation_app.h',
+        'crash_generation_app.ico',
+        'crash_generation_app.rc',
+        'resource.h',
+        'small.ico',
+      ,
+      'dependencies': 
+        '../../breakpad_client.gyp:common',
+        '../../crash_generation/crash_generation.gyp:crash_generation_server',
+        '../../crash_generation/crash_generation.gyp:crash_generation_client',
+        '../../handler/exception_handler.gyp:exception_handler',
+      ,
+      'msvs_settings': {
+        'VCLinkerTool': {
+          'SubSystem': '2',  # Windows Subsystem as opposed to a console app
+        },
+      },
+    }
+  
+}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/unittests/crash_generation_server_test.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/unittests/crash_generation_server_test.cc Changed

@@ -1,298 +1,306 @@
-// Copyright 2010, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/include/gmock/gmock.h"
-
-#include "client/windows/crash_generation/crash_generation_server.h"
-#include "client/windows/common/ipc_protocol.h"
-
-using testing::_;
-
-namespace {
-
-const wchar_t kPipeName =
-  L"\\\\.\\pipe\\CrashGenerationServerTest\\TestCaseServer";
-
-const DWORD kPipeDesiredAccess = FILE_READ_DATA |
-                                 FILE_WRITE_DATA |
-                                 FILE_WRITE_ATTRIBUTES;
-
-const DWORD kPipeFlagsAndAttributes = SECURITY_IDENTIFICATION |
-                                      SECURITY_SQOS_PRESENT;
-
-const DWORD kPipeMode = PIPE_READMODE_MESSAGE;
-
-int kCustomInfoCount = 2;
-
-google_breakpad::CustomInfoEntry kCustomInfoEntries = {
-    google_breakpad::CustomInfoEntry(L"prod", L"CrashGenerationServerTest"),
-    google_breakpad::CustomInfoEntry(L"ver", L"1.0"),
-};
-
-class CrashGenerationServerTest : public ::testing::Test {
- public:
-  CrashGenerationServerTest()
-      : crash_generation_server_(kPipeName,
-                                 NULL,
-                                 CallOnClientConnected, &mock_callbacks_,
-                                 CallOnClientDumpRequested, &mock_callbacks_,
-                                 CallOnClientExited, &mock_callbacks_,
-                                 false,
-                                 NULL),
-        thread_id_(0),
-        exception_pointers_(NULL) {
-    memset(&assert_info_, 0, sizeof(assert_info_));
-  }
-
- protected:
-  class MockCrashGenerationServerCallbacks {
-   public:
-    MOCK_METHOD1(OnClientConnected,
-                 void(const google_breakpad::ClientInfo* client_info));
-    MOCK_METHOD2(OnClientDumpRequested,
-                 void(const google_breakpad::ClientInfo* client_info,
-                      const std::wstring* file_path));
-    MOCK_METHOD1(OnClientExited,
-                 void(const google_breakpad::ClientInfo* client_info));
-  };
-
-  enum ClientFault {
-    NO_FAULT,
-    CLOSE_AFTER_CONNECT,
-    SEND_INVALID_REGISTRATION,
-    TRUNCATE_REGISTRATION,
-    CLOSE_AFTER_REGISTRATION,
-    RESPONSE_BUFFER_TOO_SMALL,
-    CLOSE_AFTER_RESPONSE,
-    SEND_INVALID_ACK
-  };
-
-  void SetUp() {
-    ASSERT_TRUE(crash_generation_server_.Start());
-  }
-
-  void FaultyClient(ClientFault fault_type) {
-    HANDLE pipe = CreateFile(kPipeName,
-                             kPipeDesiredAccess,
-                             0,
-                             NULL,
-                             OPEN_EXISTING,
-                             kPipeFlagsAndAttributes,
-                             NULL);
-
-    if (pipe == INVALID_HANDLE_VALUE) {
-      ASSERT_EQ(ERROR_PIPE_BUSY, GetLastError());
-
-      // Cannot continue retrying if wait on pipe fails.
-      ASSERT_TRUE(WaitNamedPipe(kPipeName, 500));
-
-      pipe = CreateFile(kPipeName,
-                        kPipeDesiredAccess,
-                        0,
-                        NULL,
-                        OPEN_EXISTING,
-                        kPipeFlagsAndAttributes,
-                        NULL);
-    }
-
-    ASSERT_NE(pipe, INVALID_HANDLE_VALUE);
-
-    DWORD mode = kPipeMode;
-    ASSERT_TRUE(SetNamedPipeHandleState(pipe, &mode, NULL, NULL));
-
-    DoFaultyClient(fault_type, pipe);
-
-    CloseHandle(pipe);
-  }
-
-  void DoTestFault(ClientFault fault) {
-    EXPECT_CALL(mock_callbacks_, OnClientConnected(_)).Times(0);
-    ASSERT_NO_FATAL_FAILURE(FaultyClient(fault));
-    ASSERT_NO_FATAL_FAILURE(FaultyClient(fault));
-    ASSERT_NO_FATAL_FAILURE(FaultyClient(fault));
-
-    EXPECT_CALL(mock_callbacks_, OnClientConnected(_));
-
-    ASSERT_NO_FATAL_FAILURE(FaultyClient(NO_FAULT));
-
-    // Slight hack. The OnClientConnected is only invoked after the ack is
-    // received by the server. At that point, the FaultyClient call has already
-    // returned. The best way to wait until the server is done handling that is
-    // to send one more ping, whose processing will be blocked by delivery of
-    // the OnClientConnected message.
-    ASSERT_NO_FATAL_FAILURE(FaultyClient(CLOSE_AFTER_CONNECT));
-  }
-
-  MockCrashGenerationServerCallbacks mock_callbacks_;
-
- private:
-  // Depends on the caller to successfully open the pipe before invocation and
-  // to close it immediately afterwards.
-  void DoFaultyClient(ClientFault fault_type, HANDLE pipe) {
-    if (fault_type == CLOSE_AFTER_CONNECT) {
-      return;
-    }
-
-    google_breakpad::CustomClientInfo custom_info = {kCustomInfoEntries,
-                                                     kCustomInfoCount};
-
-    google_breakpad::ProtocolMessage msg(
-      fault_type == SEND_INVALID_REGISTRATION ?
-        google_breakpad::MESSAGE_TAG_NONE :
-        google_breakpad::MESSAGE_TAG_REGISTRATION_REQUEST,
-      GetCurrentProcessId(),
-      MiniDumpNormal,
-      &thread_id_,
-      &exception_pointers_,
-      &assert_info_,
-      custom_info,
-      NULL,
-      NULL,
-      NULL);
-
-    DWORD bytes_count = 0;
-
-    ASSERT_TRUE(WriteFile(pipe,
-                          &msg,
-                          fault_type == TRUNCATE_REGISTRATION ?
-                            sizeof(msg) / 2 : sizeof(msg),
-                          &bytes_count,
-                          NULL));
-
-    if (fault_type == CLOSE_AFTER_REGISTRATION) {
-      return;
-    }
-
-    google_breakpad::ProtocolMessage reply;
-
-    if (!ReadFile(pipe,
-                  &reply,
-                  fault_type == RESPONSE_BUFFER_TOO_SMALL ?
-                    sizeof(google_breakpad::ProtocolMessage) / 2 :
-                    sizeof(google_breakpad::ProtocolMessage),
-                  &bytes_count,
-                  NULL)) {
-      switch (fault_type) {
-        case TRUNCATE_REGISTRATION:
-        case RESPONSE_BUFFER_TOO_SMALL:
-        case SEND_INVALID_REGISTRATION:
-          return;
-
-        default:
-          FAIL() << "Unexpectedly failed to register.";
-      }
-    }
-
-    if (fault_type == CLOSE_AFTER_RESPONSE) {
-      return;
-    }
-
-    google_breakpad::ProtocolMessage ack_msg;
-    ack_msg.tag = google_breakpad::MESSAGE_TAG_REGISTRATION_ACK;
-
-    ASSERT_TRUE(WriteFile(pipe,
-                          &ack_msg,
-                          SEND_INVALID_ACK ?
-                            sizeof(ack_msg) : sizeof(ack_msg) / 2,
-                          &bytes_count,
-                          NULL));
-
-    return;
-  }
-
-  static void CallOnClientConnected(
-    void* context, const google_breakpad::ClientInfo* client_info) {
-    static_cast<MockCrashGenerationServerCallbacks*>(context)->
-      OnClientConnected(client_info);
-  }
-
-  static void CallOnClientDumpRequested(
-    void* context,
-    const google_breakpad::ClientInfo* client_info,
-    const std::wstring* file_path) {
-    static_cast<MockCrashGenerationServerCallbacks*>(context)->
-      OnClientDumpRequested(client_info, file_path);
-  }
-
-  static void CallOnClientExited(
-    void* context, const google_breakpad::ClientInfo* client_info) {
-    static_cast<MockCrashGenerationServerCallbacks*>(context)->
-      OnClientExited(client_info);
-  }
-
-  DWORD thread_id_;
-  EXCEPTION_POINTERS* exception_pointers_;
-  MDRawAssertionInfo assert_info_;
-
-  google_breakpad::CrashGenerationServer crash_generation_server_;
-};
-
-TEST_F(CrashGenerationServerTest, PingServerTest) {
-  DoTestFault(CLOSE_AFTER_CONNECT);
-}
-
-TEST_F(CrashGenerationServerTest, InvalidRegistration) {
-  DoTestFault(SEND_INVALID_REGISTRATION);
-}
-
-TEST_F(CrashGenerationServerTest, TruncateRegistration) {
-  DoTestFault(TRUNCATE_REGISTRATION);
-}
-
-TEST_F(CrashGenerationServerTest, CloseAfterRegistration) {
-  DoTestFault(CLOSE_AFTER_REGISTRATION);
-}
-
-TEST_F(CrashGenerationServerTest, ResponseBufferTooSmall) {
-  DoTestFault(RESPONSE_BUFFER_TOO_SMALL);
-}
-
-TEST_F(CrashGenerationServerTest, CloseAfterResponse) {
-  DoTestFault(CLOSE_AFTER_RESPONSE);
-}
-
-// It turns out that, as long as you send one byte, the ACK is accepted and
-// registration succeeds.
-TEST_F(CrashGenerationServerTest, SendInvalidAck) {
-  EXPECT_CALL(mock_callbacks_, OnClientConnected(_));
-  ASSERT_NO_FATAL_FAILURE(FaultyClient(SEND_INVALID_ACK));
-
-  // See DoTestFault for an explanation of this line
-  ASSERT_NO_FATAL_FAILURE(FaultyClient(CLOSE_AFTER_CONNECT));
-
-  EXPECT_CALL(mock_callbacks_, OnClientConnected(_));
-  ASSERT_NO_FATAL_FAILURE(FaultyClient(NO_FAULT));
-
-  // See DoTestFault for an explanation of this line
-  ASSERT_NO_FATAL_FAILURE(FaultyClient(CLOSE_AFTER_CONNECT));
-}
-
-}  // anonymous namespace
+// Copyright 2010, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/include/gmock/gmock.h"
+
+#include "client/windows/crash_generation/crash_generation_server.h"
+#include "client/windows/common/ipc_protocol.h"
+
+using testing::_;
+
+namespace {
+
+const wchar_t kPipeName =
+  L"\\\\.\\pipe\\CrashGenerationServerTest\\TestCaseServer";
+
+const DWORD kPipeDesiredAccess = FILE_READ_DATA |
+                                 FILE_WRITE_DATA |
+                                 FILE_WRITE_ATTRIBUTES;
+
+const DWORD kPipeFlagsAndAttributes = SECURITY_IDENTIFICATION |
+                                      SECURITY_SQOS_PRESENT;
+
+const DWORD kPipeMode = PIPE_READMODE_MESSAGE;
+
+int kCustomInfoCount = 2;
+
+google_breakpad::CustomInfoEntry kCustomInfoEntries = {
+    google_breakpad::CustomInfoEntry(L"prod", L"CrashGenerationServerTest"),
+    google_breakpad::CustomInfoEntry(L"ver", L"1.0"),
+};
+
+class CrashGenerationServerTest : public ::testing::Test {
+ public:
+  CrashGenerationServerTest()
+      : crash_generation_server_(kPipeName,
+                                 NULL,
+                                 CallOnClientConnected, &mock_callbacks_,
+                                 CallOnClientDumpRequested, &mock_callbacks_,
+                                 CallOnClientExited, &mock_callbacks_,
+                                 CallOnClientUploadRequested, &mock_callbacks_,
+                                 false,
+                                 NULL),
+        thread_id_(0),
+        exception_pointers_(NULL) {
+    memset(&assert_info_, 0, sizeof(assert_info_));
+  }
+
+ protected:
+  class MockCrashGenerationServerCallbacks {
+   public:
+    MOCK_METHOD1(OnClientConnected,
+                 void(const google_breakpad::ClientInfo* client_info));
+    MOCK_METHOD2(OnClientDumpRequested,
+                 void(const google_breakpad::ClientInfo* client_info,
+                      const std::wstring* file_path));
+    MOCK_METHOD1(OnClientExited,
+                 void(const google_breakpad::ClientInfo* client_info));
+    MOCK_METHOD1(OnClientUploadRequested,
+                 void(const DWORD crash_id));
+  };
+
+  enum ClientFault {
+    NO_FAULT,
+    CLOSE_AFTER_CONNECT,
+    SEND_INVALID_REGISTRATION,
+    TRUNCATE_REGISTRATION,
+    CLOSE_AFTER_REGISTRATION,
+    RESPONSE_BUFFER_TOO_SMALL,
+    CLOSE_AFTER_RESPONSE,
+    SEND_INVALID_ACK
+  };
+
+  void SetUp() {
+    ASSERT_TRUE(crash_generation_server_.Start());
+  }
+
+  void FaultyClient(ClientFault fault_type) {
+    HANDLE pipe = CreateFile(kPipeName,
+                             kPipeDesiredAccess,
+                             0,
+                             NULL,
+                             OPEN_EXISTING,
+                             kPipeFlagsAndAttributes,
+                             NULL);
+
+    if (pipe == INVALID_HANDLE_VALUE) {
+      ASSERT_EQ(ERROR_PIPE_BUSY, GetLastError());
+
+      // Cannot continue retrying if wait on pipe fails.
+      ASSERT_TRUE(WaitNamedPipe(kPipeName, 500));
+
+      pipe = CreateFile(kPipeName,
+                        kPipeDesiredAccess,
+                        0,
+                        NULL,
+                        OPEN_EXISTING,
+                        kPipeFlagsAndAttributes,
+                        NULL);
+    }
+
+    ASSERT_NE(pipe, INVALID_HANDLE_VALUE);
+
+    DWORD mode = kPipeMode;
+    ASSERT_TRUE(SetNamedPipeHandleState(pipe, &mode, NULL, NULL));
+
+    DoFaultyClient(fault_type, pipe);
+
+    CloseHandle(pipe);
+  }
+
+  void DoTestFault(ClientFault fault) {
+    EXPECT_CALL(mock_callbacks_, OnClientConnected(_)).Times(0);
+    ASSERT_NO_FATAL_FAILURE(FaultyClient(fault));
+    ASSERT_NO_FATAL_FAILURE(FaultyClient(fault));
+    ASSERT_NO_FATAL_FAILURE(FaultyClient(fault));
+
+    EXPECT_CALL(mock_callbacks_, OnClientConnected(_));
+
+    ASSERT_NO_FATAL_FAILURE(FaultyClient(NO_FAULT));
+
+    // Slight hack. The OnClientConnected is only invoked after the ack is
+    // received by the server. At that point, the FaultyClient call has already
+    // returned. The best way to wait until the server is done handling that is
+    // to send one more ping, whose processing will be blocked by delivery of
+    // the OnClientConnected message.
+    ASSERT_NO_FATAL_FAILURE(FaultyClient(CLOSE_AFTER_CONNECT));
+  }
+
+  MockCrashGenerationServerCallbacks mock_callbacks_;
+
+ private:
+  // Depends on the caller to successfully open the pipe before invocation and
+  // to close it immediately afterwards.
+  void DoFaultyClient(ClientFault fault_type, HANDLE pipe) {
+    if (fault_type == CLOSE_AFTER_CONNECT) {
+      return;
+    }
+
+    google_breakpad::CustomClientInfo custom_info = {kCustomInfoEntries,
+                                                     kCustomInfoCount};
+
+    google_breakpad::ProtocolMessage msg(
+      fault_type == SEND_INVALID_REGISTRATION ?
+        google_breakpad::MESSAGE_TAG_NONE :
+        google_breakpad::MESSAGE_TAG_REGISTRATION_REQUEST,
+      GetCurrentProcessId(),
+      MiniDumpNormal,
+      &thread_id_,
+      &exception_pointers_,
+      &assert_info_,
+      custom_info,
+      NULL,
+      NULL,
+      NULL);
+
+    DWORD bytes_count = 0;
+
+    ASSERT_TRUE(WriteFile(pipe,
+                          &msg,
+                          fault_type == TRUNCATE_REGISTRATION ?
+                            sizeof(msg) / 2 : sizeof(msg),
+                          &bytes_count,
+                          NULL));
+
+    if (fault_type == CLOSE_AFTER_REGISTRATION) {
+      return;
+    }
+
+    google_breakpad::ProtocolMessage reply;
+
+    if (!ReadFile(pipe,
+                  &reply,
+                  fault_type == RESPONSE_BUFFER_TOO_SMALL ?
+                    sizeof(google_breakpad::ProtocolMessage) / 2 :
+                    sizeof(google_breakpad::ProtocolMessage),
+                  &bytes_count,
+                  NULL)) {
+      switch (fault_type) {
+        case TRUNCATE_REGISTRATION:
+        case RESPONSE_BUFFER_TOO_SMALL:
+        case SEND_INVALID_REGISTRATION:
+          return;
+
+        default:
+          FAIL() << "Unexpectedly failed to register.";
+      }
+    }
+
+    if (fault_type == CLOSE_AFTER_RESPONSE) {
+      return;
+    }
+
+    google_breakpad::ProtocolMessage ack_msg;
+    ack_msg.tag = google_breakpad::MESSAGE_TAG_REGISTRATION_ACK;
+
+    ASSERT_TRUE(WriteFile(pipe,
+                          &ack_msg,
+                          SEND_INVALID_ACK ?
+                            sizeof(ack_msg) : sizeof(ack_msg) / 2,
+                          &bytes_count,
+                          NULL));
+
+    return;
+  }
+
+  static void CallOnClientConnected(
+    void* context, const google_breakpad::ClientInfo* client_info) {
+    static_cast<MockCrashGenerationServerCallbacks*>(context)->
+      OnClientConnected(client_info);
+  }
+
+  static void CallOnClientDumpRequested(
+    void* context,
+    const google_breakpad::ClientInfo* client_info,
+    const std::wstring* file_path) {
+    static_cast<MockCrashGenerationServerCallbacks*>(context)->
+      OnClientDumpRequested(client_info, file_path);
+  }
+
+  static void CallOnClientExited(
+    void* context, const google_breakpad::ClientInfo* client_info) {
+    static_cast<MockCrashGenerationServerCallbacks*>(context)->
+      OnClientExited(client_info);
+  }
+
+  static void CallOnClientUploadRequested(void* context, const DWORD crash_id) {
+    static_cast<MockCrashGenerationServerCallbacks*>(context)->
+      OnClientUploadRequested(crash_id);
+  }
+
+  DWORD thread_id_;
+  EXCEPTION_POINTERS* exception_pointers_;
+  MDRawAssertionInfo assert_info_;
+
+  google_breakpad::CrashGenerationServer crash_generation_server_;
+};
+
+TEST_F(CrashGenerationServerTest, PingServerTest) {
+  DoTestFault(CLOSE_AFTER_CONNECT);
+}
+
+TEST_F(CrashGenerationServerTest, InvalidRegistration) {
+  DoTestFault(SEND_INVALID_REGISTRATION);
+}
+
+TEST_F(CrashGenerationServerTest, TruncateRegistration) {
+  DoTestFault(TRUNCATE_REGISTRATION);
+}
+
+TEST_F(CrashGenerationServerTest, CloseAfterRegistration) {
+  DoTestFault(CLOSE_AFTER_REGISTRATION);
+}
+
+TEST_F(CrashGenerationServerTest, ResponseBufferTooSmall) {
+  DoTestFault(RESPONSE_BUFFER_TOO_SMALL);
+}
+
+TEST_F(CrashGenerationServerTest, CloseAfterResponse) {
+  DoTestFault(CLOSE_AFTER_RESPONSE);
+}
+
+// It turns out that, as long as you send one byte, the ACK is accepted and
+// registration succeeds.
+TEST_F(CrashGenerationServerTest, SendInvalidAck) {
+  EXPECT_CALL(mock_callbacks_, OnClientConnected(_));
+  ASSERT_NO_FATAL_FAILURE(FaultyClient(SEND_INVALID_ACK));
+
+  // See DoTestFault for an explanation of this line
+  ASSERT_NO_FATAL_FAILURE(FaultyClient(CLOSE_AFTER_CONNECT));
+
+  EXPECT_CALL(mock_callbacks_, OnClientConnected(_));
+  ASSERT_NO_FATAL_FAILURE(FaultyClient(NO_FAULT));
+
+  // See DoTestFault for an explanation of this line
+  ASSERT_NO_FATAL_FAILURE(FaultyClient(CLOSE_AFTER_CONNECT));
+}
+
+}  // anonymous namespace

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/unittests/dump_analysis.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/unittests/dump_analysis.cc Changed

@@ -1,184 +1,184 @@
-// Copyright (c) 2010, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <windows.h>
-#include <objbase.h>
-#include <dbghelp.h>
-
-#include "dump_analysis.h"  // NOLINT
-#include "gtest/gtest.h"
-
-DumpAnalysis::~DumpAnalysis() {
-  if (dump_file_view_ != NULL) {
-    EXPECT_TRUE(::UnmapViewOfFile(dump_file_view_));
-    ::CloseHandle(dump_file_mapping_);
-    dump_file_mapping_ = NULL;
-  }
-
-  if (dump_file_handle_ != NULL) {
-    ::CloseHandle(dump_file_handle_);
-    dump_file_handle_ = NULL;
-  }
-}
-
-void DumpAnalysis::EnsureDumpMapped() {
-  if (dump_file_view_ == NULL) {
-    dump_file_handle_ = ::CreateFile(dump_file_.c_str(),
-      GENERIC_READ,
-      0,
-      NULL,
-      OPEN_EXISTING,
-      0,
-      NULL);
-    ASSERT_TRUE(dump_file_handle_ != NULL);
-    ASSERT_TRUE(dump_file_mapping_ == NULL);
-
-    dump_file_mapping_ = ::CreateFileMapping(dump_file_handle_,
-      NULL,
-      PAGE_READONLY,
-      0,
-      0,
-      NULL);
-    ASSERT_TRUE(dump_file_mapping_ != NULL);
-
-    dump_file_view_ = ::MapViewOfFile(dump_file_mapping_,
-      FILE_MAP_READ,
-      0,
-      0,
-      0);
-    ASSERT_TRUE(dump_file_view_ != NULL);
-  }
-}
-
-bool DumpAnalysis::HasTebs() const {
-  MINIDUMP_THREAD_LIST* thread_list = NULL;
-  size_t thread_list_size = GetStream(ThreadListStream, &thread_list);
-
-  if (thread_list_size > 0 && thread_list != NULL) {
-    for (ULONG i = 0; i < thread_list->NumberOfThreads; ++i) {
-      if (!HasMemory(thread_list->Threadsi.Teb))
-        return false;
-    }
-
-    return true;
-  }
-
-  // No thread list, no TEB info.
-  return false;
-}
-
-bool DumpAnalysis::HasPeb() const {
-  MINIDUMP_THREAD_LIST* thread_list = NULL;
-  size_t thread_list_size = GetStream(ThreadListStream, &thread_list);
-
-  if (thread_list_size > 0 && thread_list != NULL &&
-      thread_list->NumberOfThreads > 0) {
-    FakeTEB* teb = NULL;
-    if (!HasMemory(thread_list->Threads0.Teb, &teb))
-      return false;
-
-    return HasMemory(teb->peb);
-  }
-
-  return false;
-}
-
-bool DumpAnalysis::HasStream(ULONG stream_number) const {
-  void* stream = NULL;
-  size_t stream_size = GetStreamImpl(stream_number, &stream);
-  return stream_size > 0 && stream != NULL;
-}
-
-size_t DumpAnalysis::GetStreamImpl(ULONG stream_number, void** stream) const {
-  MINIDUMP_DIRECTORY* directory = NULL;
-  ULONG memory_list_size = 0;
-  BOOL ret = ::MiniDumpReadDumpStream(dump_file_view_,
-                                      stream_number,
-                                      &directory,
-                                      stream,
-                                      &memory_list_size);
-
-  return ret ? memory_list_size : 0;
-}
-
-bool DumpAnalysis::HasMemoryImpl(const void *addr_in, size_t structuresize,
-                                 void **structure) const {
-  uintptr_t address = reinterpret_cast<uintptr_t>(addr_in);
-  MINIDUMP_MEMORY_LIST* memory_list = NULL;
-  size_t memory_list_size = GetStream(MemoryListStream, &memory_list);
-  if (memory_list_size > 0 && memory_list != NULL) {
-    for (ULONG i = 0; i < memory_list->NumberOfMemoryRanges; ++i) {
-      MINIDUMP_MEMORY_DESCRIPTOR& descr = memory_list->MemoryRangesi;
-      const uintptr_t range_start =
-          static_cast<uintptr_t>(descr.StartOfMemoryRange);
-      uintptr_t range_end = range_start + descr.Memory.DataSize;
-
-      if (address >= range_start &&
-          address + structuresize < range_end) {
-        // The start address falls in the range, and the end address is
-        // in bounds, return a pointer to the structure if requested.
-        if (structure != NULL)
-          *structure = RVA_TO_ADDR(dump_file_view_, descr.Memory.Rva);
-
-        return true;
-      }
-    }
-  }
-
-  // We didn't find the range in a MINIDUMP_MEMORY_LIST, so maybe this
-  // is a full dump using MINIDUMP_MEMORY64_LIST with all the memory at the
-  // end of the dump file.
-  MINIDUMP_MEMORY64_LIST* memory64_list = NULL;
-  memory_list_size = GetStream(Memory64ListStream, &memory64_list);
-  if (memory_list_size > 0 && memory64_list != NULL) {
-    // Keep track of where the current descriptor maps to.
-    RVA64 curr_rva = memory64_list->BaseRva;
-    for (ULONG i = 0; i < memory64_list->NumberOfMemoryRanges; ++i) {
-      MINIDUMP_MEMORY_DESCRIPTOR64& descr = memory64_list->MemoryRangesi;
-      uintptr_t range_start =
-          static_cast<uintptr_t>(descr.StartOfMemoryRange);
-      uintptr_t range_end = range_start + static_cast<size_t>(descr.DataSize);
-
-      if (address >= range_start &&
-          address + structuresize < range_end) {
-        // The start address falls in the range, and the end address is
-        // in bounds, return a pointer to the structure if requested.
-        if (structure != NULL)
-          *structure = RVA_TO_ADDR(dump_file_view_, curr_rva);
-
-        return true;
-      }
-
-      // Advance the current RVA.
-      curr_rva += descr.DataSize;
-    }
-  }
-
-  return false;
-}
+// Copyright (c) 2010, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <windows.h>
+#include <objbase.h>
+#include <dbghelp.h>
+
+#include "dump_analysis.h"  // NOLINT
+#include "gtest/gtest.h"
+
+DumpAnalysis::~DumpAnalysis() {
+  if (dump_file_view_ != NULL) {
+    EXPECT_TRUE(::UnmapViewOfFile(dump_file_view_));
+    ::CloseHandle(dump_file_mapping_);
+    dump_file_mapping_ = NULL;
+  }
+
+  if (dump_file_handle_ != NULL) {
+    ::CloseHandle(dump_file_handle_);
+    dump_file_handle_ = NULL;
+  }
+}
+
+void DumpAnalysis::EnsureDumpMapped() {
+  if (dump_file_view_ == NULL) {
+    dump_file_handle_ = ::CreateFile(dump_file_.c_str(),
+      GENERIC_READ,
+      0,
+      NULL,
+      OPEN_EXISTING,
+      0,
+      NULL);
+    ASSERT_TRUE(dump_file_handle_ != NULL);
+    ASSERT_TRUE(dump_file_mapping_ == NULL);
+
+    dump_file_mapping_ = ::CreateFileMapping(dump_file_handle_,
+      NULL,
+      PAGE_READONLY,
+      0,
+      0,
+      NULL);
+    ASSERT_TRUE(dump_file_mapping_ != NULL);
+
+    dump_file_view_ = ::MapViewOfFile(dump_file_mapping_,
+      FILE_MAP_READ,
+      0,
+      0,
+      0);
+    ASSERT_TRUE(dump_file_view_ != NULL);
+  }
+}
+
+bool DumpAnalysis::HasTebs() const {
+  MINIDUMP_THREAD_LIST* thread_list = NULL;
+  size_t thread_list_size = GetStream(ThreadListStream, &thread_list);
+
+  if (thread_list_size > 0 && thread_list != NULL) {
+    for (ULONG i = 0; i < thread_list->NumberOfThreads; ++i) {
+      if (!HasMemory(thread_list->Threadsi.Teb))
+        return false;
+    }
+
+    return true;
+  }
+
+  // No thread list, no TEB info.
+  return false;
+}
+
+bool DumpAnalysis::HasPeb() const {
+  MINIDUMP_THREAD_LIST* thread_list = NULL;
+  size_t thread_list_size = GetStream(ThreadListStream, &thread_list);
+
+  if (thread_list_size > 0 && thread_list != NULL &&
+      thread_list->NumberOfThreads > 0) {
+    FakeTEB* teb = NULL;
+    if (!HasMemory(thread_list->Threads0.Teb, &teb))
+      return false;
+
+    return HasMemory(teb->peb);
+  }
+
+  return false;
+}
+
+bool DumpAnalysis::HasStream(ULONG stream_number) const {
+  void* stream = NULL;
+  size_t stream_size = GetStreamImpl(stream_number, &stream);
+  return stream_size > 0 && stream != NULL;
+}
+
+size_t DumpAnalysis::GetStreamImpl(ULONG stream_number, void** stream) const {
+  MINIDUMP_DIRECTORY* directory = NULL;
+  ULONG memory_list_size = 0;
+  BOOL ret = ::MiniDumpReadDumpStream(dump_file_view_,
+                                      stream_number,
+                                      &directory,
+                                      stream,
+                                      &memory_list_size);
+
+  return ret ? memory_list_size : 0;
+}
+
+bool DumpAnalysis::HasMemoryImpl(const void *addr_in, size_t structuresize,
+                                 void **structure) const {
+  uintptr_t address = reinterpret_cast<uintptr_t>(addr_in);
+  MINIDUMP_MEMORY_LIST* memory_list = NULL;
+  size_t memory_list_size = GetStream(MemoryListStream, &memory_list);
+  if (memory_list_size > 0 && memory_list != NULL) {
+    for (ULONG i = 0; i < memory_list->NumberOfMemoryRanges; ++i) {
+      MINIDUMP_MEMORY_DESCRIPTOR& descr = memory_list->MemoryRangesi;
+      const uintptr_t range_start =
+          static_cast<uintptr_t>(descr.StartOfMemoryRange);
+      uintptr_t range_end = range_start + descr.Memory.DataSize;
+
+      if (address >= range_start &&
+          address + structuresize < range_end) {
+        // The start address falls in the range, and the end address is
+        // in bounds, return a pointer to the structure if requested.
+        if (structure != NULL)
+          *structure = RVA_TO_ADDR(dump_file_view_, descr.Memory.Rva);
+
+        return true;
+      }
+    }
+  }
+
+  // We didn't find the range in a MINIDUMP_MEMORY_LIST, so maybe this
+  // is a full dump using MINIDUMP_MEMORY64_LIST with all the memory at the
+  // end of the dump file.
+  MINIDUMP_MEMORY64_LIST* memory64_list = NULL;
+  memory_list_size = GetStream(Memory64ListStream, &memory64_list);
+  if (memory_list_size > 0 && memory64_list != NULL) {
+    // Keep track of where the current descriptor maps to.
+    RVA64 curr_rva = memory64_list->BaseRva;
+    for (ULONG i = 0; i < memory64_list->NumberOfMemoryRanges; ++i) {
+      MINIDUMP_MEMORY_DESCRIPTOR64& descr = memory64_list->MemoryRangesi;
+      uintptr_t range_start =
+          static_cast<uintptr_t>(descr.StartOfMemoryRange);
+      uintptr_t range_end = range_start + static_cast<size_t>(descr.DataSize);
+
+      if (address >= range_start &&
+          address + structuresize < range_end) {
+        // The start address falls in the range, and the end address is
+        // in bounds, return a pointer to the structure if requested.
+        if (structure != NULL)
+          *structure = RVA_TO_ADDR(dump_file_view_, curr_rva);
+
+        return true;
+      }
+
+      // Advance the current RVA.
+      curr_rva += descr.DataSize;
+    }
+  }
+
+  return false;
+}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/unittests/dump_analysis.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/unittests/dump_analysis.h Changed

@@ -1,102 +1,102 @@
-// Copyright (c) 2010, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CLIENT_WINDOWS_UNITTESTS_DUMP_ANALYSIS_H_
-#define CLIENT_WINDOWS_UNITTESTS_DUMP_ANALYSIS_H_
-
-#include "../crash_generation/minidump_generator.h"
-
-// Convenience to get to the PEB pointer in a TEB.
-struct FakeTEB {
-  char dummy0x30;
-  void* peb;
-};
-
-class DumpAnalysis {
- public:
-  explicit DumpAnalysis(const std::wstring& file_path)
-      : dump_file_(file_path), dump_file_view_(NULL), dump_file_mapping_(NULL),
-        dump_file_handle_(NULL) {
-    EnsureDumpMapped();
-  }
-  ~DumpAnalysis();
-
-  bool HasStream(ULONG stream_number) const;
-
-  // This is template to keep type safety in the front, but we end up casting
-  // to void** inside the implementation to pass the pointer to Win32. So
-  // casting here is considered safe.
-  template <class StreamType>
-  size_t GetStream(ULONG stream_number, StreamType** stream) const {
-    return GetStreamImpl(stream_number, reinterpret_cast<void**>(stream));
-  }
-
-  bool HasTebs() const;
-  bool HasPeb() const;
-  bool HasMemory(ULONG64 address) const {
-    return HasMemory<BYTE>(address, NULL);
-  }
-
-  bool HasMemory(const void* address) const {
-    return HasMemory<BYTE>(address, NULL);
-  }
-
-  template <class StructureType>
-  bool HasMemory(ULONG64 address, StructureType** structure = NULL) const {
-    // We can't cope with 64 bit addresses for now.
-    if (address > 0xFFFFFFFFUL)
-      return false;
-
-    return HasMemory(reinterpret_cast<void*>(address), structure);
-  }
-
-  template <class StructureType>
-  bool HasMemory(const void* addr_in, StructureType** structure = NULL) const {
-    return HasMemoryImpl(addr_in, sizeof(StructureType),
-                             reinterpret_cast<void**>(structure));
-  }
-
- protected:
-  void EnsureDumpMapped();
-
-  HANDLE dump_file_mapping_;
-  HANDLE dump_file_handle_;
-  void* dump_file_view_;
-  std::wstring dump_file_;
-
- private:
-  // This is the implementation of GetStream<>.
-  size_t GetStreamImpl(ULONG stream_number, void** stream) const;
-
-  // This is the implementation of HasMemory<>.
-  bool HasMemoryImpl(const void* addr_in, size_t pointersize,
-                     void** structure) const;
-};
-
-#endif  // CLIENT_WINDOWS_UNITTESTS_DUMP_ANALYSIS_H_
+// Copyright (c) 2010, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef CLIENT_WINDOWS_UNITTESTS_DUMP_ANALYSIS_H_
+#define CLIENT_WINDOWS_UNITTESTS_DUMP_ANALYSIS_H_
+
+#include "../crash_generation/minidump_generator.h"
+
+// Convenience to get to the PEB pointer in a TEB.
+struct FakeTEB {
+  char dummy0x30;
+  void* peb;
+};
+
+class DumpAnalysis {
+ public:
+  explicit DumpAnalysis(const std::wstring& file_path)
+      : dump_file_(file_path), dump_file_view_(NULL), dump_file_mapping_(NULL),
+        dump_file_handle_(NULL) {
+    EnsureDumpMapped();
+  }
+  ~DumpAnalysis();
+
+  bool HasStream(ULONG stream_number) const;
+
+  // This is template to keep type safety in the front, but we end up casting
+  // to void** inside the implementation to pass the pointer to Win32. So
+  // casting here is considered safe.
+  template <class StreamType>
+  size_t GetStream(ULONG stream_number, StreamType** stream) const {
+    return GetStreamImpl(stream_number, reinterpret_cast<void**>(stream));
+  }
+
+  bool HasTebs() const;
+  bool HasPeb() const;
+  bool HasMemory(ULONG64 address) const {
+    return HasMemory<BYTE>(address, NULL);
+  }
+
+  bool HasMemory(const void* address) const {
+    return HasMemory<BYTE>(address, NULL);
+  }
+
+  template <class StructureType>
+  bool HasMemory(ULONG64 address, StructureType** structure = NULL) const {
+    // We can't cope with 64 bit addresses for now.
+    if (address > 0xFFFFFFFFUL)
+      return false;
+
+    return HasMemory(reinterpret_cast<void*>(address), structure);
+  }
+
+  template <class StructureType>
+  bool HasMemory(const void* addr_in, StructureType** structure = NULL) const {
+    return HasMemoryImpl(addr_in, sizeof(StructureType),
+                             reinterpret_cast<void**>(structure));
+  }
+
+ protected:
+  void EnsureDumpMapped();
+
+  HANDLE dump_file_mapping_;
+  HANDLE dump_file_handle_;
+  void* dump_file_view_;
+  std::wstring dump_file_;
+
+ private:
+  // This is the implementation of GetStream<>.
+  size_t GetStreamImpl(ULONG stream_number, void** stream) const;
+
+  // This is the implementation of HasMemory<>.
+  bool HasMemoryImpl(const void* addr_in, size_t pointersize,
+                     void** structure) const;
+};
+
+#endif  // CLIENT_WINDOWS_UNITTESTS_DUMP_ANALYSIS_H_

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/unittests/exception_handler_death_test.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/unittests/exception_handler_death_test.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/unittests/exception_handler_test.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/unittests/exception_handler_test.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/client/windows/unittests/minidump_test.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/client/windows/unittests/minidump_test.cc Changed

@@ -1,332 +1,332 @@
-// Copyright (c) 2010, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <windows.h>
-#include <objbase.h>
-#include <dbghelp.h>
-
-#include "../crash_generation/minidump_generator.h"
-#include "dump_analysis.h"  // NOLINT
-
-#include "gtest/gtest.h"
-
-namespace {
-
-// Minidump with stacks, PEB, TEB, and unloaded module list.
-const MINIDUMP_TYPE kSmallDumpType = static_cast<MINIDUMP_TYPE>(
-    MiniDumpWithProcessThreadData |  // Get PEB and TEB.
-    MiniDumpWithUnloadedModules);  // Get unloaded modules when available.
-
-// Minidump with all of the above, plus memory referenced from stack.
-const MINIDUMP_TYPE kLargerDumpType = static_cast<MINIDUMP_TYPE>(
-    MiniDumpWithProcessThreadData |  // Get PEB and TEB.
-    MiniDumpWithUnloadedModules |  // Get unloaded modules when available.
-    MiniDumpWithIndirectlyReferencedMemory);  // Get memory referenced by stack.
-
-// Large dump with all process memory.
-const MINIDUMP_TYPE kFullDumpType = static_cast<MINIDUMP_TYPE>(
-    MiniDumpWithFullMemory |  // Full memory from process.
-    MiniDumpWithProcessThreadData |  // Get PEB and TEB.
-    MiniDumpWithHandleData |  // Get all handle information.
-    MiniDumpWithUnloadedModules);  // Get unloaded modules when available.
-
-class MinidumpTest: public testing::Test {
- public:
-  MinidumpTest() {
-    wchar_t temp_dir_path MAX_PATH  = {0};
-    ::GetTempPath(MAX_PATH, temp_dir_path);
-    dump_path_ = temp_dir_path;
-  }
-
-  virtual void SetUp() {
-    // Make sure URLMon isn't loaded into our process.
-    ASSERT_EQ(NULL, ::GetModuleHandle(L"urlmon.dll"));
-
-    // Then load and unload it to ensure we have something to
-    // stock the unloaded module list with.
-    HMODULE urlmon = ::LoadLibrary(L"urlmon.dll");
-    ASSERT_TRUE(urlmon != NULL);
-    ASSERT_TRUE(::FreeLibrary(urlmon));
-  }
-
-  virtual void TearDown() {
-    if (!dump_file_.empty()) {
-      ::DeleteFile(dump_file_.c_str());
-      dump_file_ = L"";
-    }
-    if (!full_dump_file_.empty()) {
-      ::DeleteFile(full_dump_file_.c_str());
-      full_dump_file_ = L"";
-    }
-  }
-
-  bool WriteDump(ULONG flags) {
-    using google_breakpad::MinidumpGenerator;
-
-    // Fake exception is access violation on write to this.
-    EXCEPTION_RECORD ex_record = {
-        STATUS_ACCESS_VIOLATION,  // ExceptionCode
-        0,  // ExceptionFlags
-        NULL,  // ExceptionRecord;
-        reinterpret_cast<void*>(0xCAFEBABE),  // ExceptionAddress;
-        2,  // NumberParameters;
-        { EXCEPTION_WRITE_FAULT, reinterpret_cast<ULONG_PTR>(this) }
-    };
-    CONTEXT ctx_record = {};
-    EXCEPTION_POINTERS ex_ptrs = {
-      &ex_record,
-      &ctx_record,
-    };
-
-    MinidumpGenerator generator(dump_path_);
-
-    // And write a dump
-    bool result = generator.WriteMinidump(::GetCurrentProcess(),
-                                          ::GetCurrentProcessId(),
-                                          ::GetCurrentThreadId(),
-                                          ::GetCurrentThreadId(),
-                                          &ex_ptrs,
-                                          NULL,
-                                          static_cast<MINIDUMP_TYPE>(flags),
-                                          TRUE,
-                                          &dump_file_,
-                                          &full_dump_file_);
-    return result == TRUE;
-  }
-
- protected:
-  std::wstring dump_file_;
-  std::wstring full_dump_file_;
-
-  std::wstring dump_path_;
-};
-
-// We need to be able to get file information from Windows
-bool HasFileInfo(const std::wstring& file_path) {
-  DWORD dummy;
-  const wchar_t* path = file_path.c_str();
-  DWORD length = ::GetFileVersionInfoSize(path, &dummy);
-  if (length == 0)
-    return NULL;
-
-  void* data = calloc(length, 1);
-  if (!data)
-    return false;
-
-  if (!::GetFileVersionInfo(path, dummy, length, data)) {
-    free(data);
-    return false;
-  }
-
-  void* translate = NULL;
-  UINT page_count;
-  BOOL query_result = VerQueryValue(
-      data,
-      L"\\VarFileInfo\\Translation",
-      static_cast<void**>(&translate),
-      &page_count);
-
-  free(data);
-  if (query_result && translate) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-TEST_F(MinidumpTest, Version) {
-  API_VERSION* version = ::ImagehlpApiVersion();
-
-  HMODULE dbg_help = ::GetModuleHandle(L"dbghelp.dll");
-  ASSERT_TRUE(dbg_help != NULL);
-
-  wchar_t dbg_help_file1024 = {};
-  ASSERT_TRUE(::GetModuleFileName(dbg_help,
-                                  dbg_help_file,
-                                  sizeof(dbg_help_file) /
-                                      sizeof(*dbg_help_file)));
-  ASSERT_TRUE(HasFileInfo(std::wstring(dbg_help_file)) != NULL);
-
-//  LOG(INFO) << "DbgHelp.dll version: " << file_info->file_version();
-}
-
-TEST_F(MinidumpTest, Normal) {
-  EXPECT_TRUE(WriteDump(MiniDumpNormal));
-  DumpAnalysis mini(dump_file_);
-
-  // We expect threads, modules and some memory.
-  EXPECT_TRUE(mini.HasStream(ThreadListStream));
-  EXPECT_TRUE(mini.HasStream(ModuleListStream));
-  EXPECT_TRUE(mini.HasStream(MemoryListStream));
-  EXPECT_TRUE(mini.HasStream(ExceptionStream));
-  EXPECT_TRUE(mini.HasStream(SystemInfoStream));
-  EXPECT_TRUE(mini.HasStream(MiscInfoStream));
-
-  EXPECT_FALSE(mini.HasStream(ThreadExListStream));
-  EXPECT_FALSE(mini.HasStream(Memory64ListStream));
-  EXPECT_FALSE(mini.HasStream(CommentStreamA));
-  EXPECT_FALSE(mini.HasStream(CommentStreamW));
-  EXPECT_FALSE(mini.HasStream(HandleDataStream));
-  EXPECT_FALSE(mini.HasStream(FunctionTableStream));
-  EXPECT_FALSE(mini.HasStream(UnloadedModuleListStream));
-  EXPECT_FALSE(mini.HasStream(MemoryInfoListStream));
-  EXPECT_FALSE(mini.HasStream(ThreadInfoListStream));
-  EXPECT_FALSE(mini.HasStream(HandleOperationListStream));
-  EXPECT_FALSE(mini.HasStream(TokenStream));
-
-  // We expect no PEB nor TEBs in this dump.
-  EXPECT_FALSE(mini.HasTebs());
-  EXPECT_FALSE(mini.HasPeb());
-
-  // We expect no off-stack memory in this dump.
-  EXPECT_FALSE(mini.HasMemory(this));
-}
-
-TEST_F(MinidumpTest, SmallDump) {
-  ASSERT_TRUE(WriteDump(kSmallDumpType));
-  DumpAnalysis mini(dump_file_);
-
-  EXPECT_TRUE(mini.HasStream(ThreadListStream));
-  EXPECT_TRUE(mini.HasStream(ModuleListStream));
-  EXPECT_TRUE(mini.HasStream(MemoryListStream));
-  EXPECT_TRUE(mini.HasStream(ExceptionStream));
-  EXPECT_TRUE(mini.HasStream(SystemInfoStream));
-  EXPECT_TRUE(mini.HasStream(UnloadedModuleListStream));
-  EXPECT_TRUE(mini.HasStream(MiscInfoStream));
-
-  // We expect PEB and TEBs in this dump.
-  EXPECT_TRUE(mini.HasTebs());
-  EXPECT_TRUE(mini.HasPeb());
-
-  EXPECT_FALSE(mini.HasStream(ThreadExListStream));
-  EXPECT_FALSE(mini.HasStream(Memory64ListStream));
-  EXPECT_FALSE(mini.HasStream(CommentStreamA));
-  EXPECT_FALSE(mini.HasStream(CommentStreamW));
-  EXPECT_FALSE(mini.HasStream(HandleDataStream));
-  EXPECT_FALSE(mini.HasStream(FunctionTableStream));
-  EXPECT_FALSE(mini.HasStream(MemoryInfoListStream));
-  EXPECT_FALSE(mini.HasStream(ThreadInfoListStream));
-  EXPECT_FALSE(mini.HasStream(HandleOperationListStream));
-  EXPECT_FALSE(mini.HasStream(TokenStream));
-
-  // We expect no off-stack memory in this dump.
-  EXPECT_FALSE(mini.HasMemory(this));
-}
-
-TEST_F(MinidumpTest, LargerDump) {
-  ASSERT_TRUE(WriteDump(kLargerDumpType));
-  DumpAnalysis mini(dump_file_);
-
-  // The dump should have all of these streams.
-  EXPECT_TRUE(mini.HasStream(ThreadListStream));
-  EXPECT_TRUE(mini.HasStream(ModuleListStream));
-  EXPECT_TRUE(mini.HasStream(MemoryListStream));
-  EXPECT_TRUE(mini.HasStream(ExceptionStream));
-  EXPECT_TRUE(mini.HasStream(SystemInfoStream));
-  EXPECT_TRUE(mini.HasStream(UnloadedModuleListStream));
-  EXPECT_TRUE(mini.HasStream(MiscInfoStream));
-
-  // We expect memory referenced by stack in this dump.
-  EXPECT_TRUE(mini.HasMemory(this));
-
-  // We expect PEB and TEBs in this dump.
-  EXPECT_TRUE(mini.HasTebs());
-  EXPECT_TRUE(mini.HasPeb());
-
-  EXPECT_FALSE(mini.HasStream(ThreadExListStream));
-  EXPECT_FALSE(mini.HasStream(Memory64ListStream));
-  EXPECT_FALSE(mini.HasStream(CommentStreamA));
-  EXPECT_FALSE(mini.HasStream(CommentStreamW));
-  EXPECT_FALSE(mini.HasStream(HandleDataStream));
-  EXPECT_FALSE(mini.HasStream(FunctionTableStream));
-  EXPECT_FALSE(mini.HasStream(MemoryInfoListStream));
-  EXPECT_FALSE(mini.HasStream(ThreadInfoListStream));
-  EXPECT_FALSE(mini.HasStream(HandleOperationListStream));
-  EXPECT_FALSE(mini.HasStream(TokenStream));
-}
-
-TEST_F(MinidumpTest, FullDump) {
-  ASSERT_TRUE(WriteDump(kFullDumpType));
-  ASSERT_TRUE(dump_file_ != L"");
-  ASSERT_TRUE(full_dump_file_ != L"");
-  DumpAnalysis mini(dump_file_);
-  DumpAnalysis full(full_dump_file_);
-
-  // Either dumps can contain part of the information.
-
-  // The dump should have all of these streams.
-  EXPECT_TRUE(mini.HasStream(ThreadListStream));
-  EXPECT_TRUE(full.HasStream(ThreadListStream));
-  EXPECT_TRUE(mini.HasStream(ModuleListStream));
-  EXPECT_TRUE(full.HasStream(ModuleListStream));
-  EXPECT_TRUE(mini.HasStream(ExceptionStream));
-  EXPECT_TRUE(full.HasStream(ExceptionStream));
-  EXPECT_TRUE(mini.HasStream(SystemInfoStream));
-  EXPECT_TRUE(full.HasStream(SystemInfoStream));
-  EXPECT_TRUE(mini.HasStream(UnloadedModuleListStream));
-  EXPECT_TRUE(full.HasStream(UnloadedModuleListStream));
-  EXPECT_TRUE(mini.HasStream(MiscInfoStream));
-  EXPECT_TRUE(full.HasStream(MiscInfoStream));
-  EXPECT_TRUE(mini.HasStream(HandleDataStream));
-  EXPECT_TRUE(full.HasStream(HandleDataStream));
-
-  // We expect memory referenced by stack in this dump.
-  EXPECT_FALSE(mini.HasMemory(this));
-  EXPECT_TRUE(full.HasMemory(this));
-
-  // We expect PEB and TEBs in this dump.
-  EXPECT_TRUE(mini.HasTebs() || full.HasTebs());
-  EXPECT_TRUE(mini.HasPeb() || full.HasPeb());
-
-  EXPECT_TRUE(mini.HasStream(MemoryListStream));
-  EXPECT_TRUE(full.HasStream(Memory64ListStream));
-  EXPECT_FALSE(mini.HasStream(Memory64ListStream));
-  EXPECT_FALSE(full.HasStream(MemoryListStream));
-
-  // This is the only place we don't use OR because we want both not
-  // to have the streams.
-  EXPECT_FALSE(mini.HasStream(ThreadExListStream));
-  EXPECT_FALSE(full.HasStream(ThreadExListStream));
-  EXPECT_FALSE(mini.HasStream(CommentStreamA));
-  EXPECT_FALSE(full.HasStream(CommentStreamA));
-  EXPECT_FALSE(mini.HasStream(CommentStreamW));
-  EXPECT_FALSE(full.HasStream(CommentStreamW));
-  EXPECT_FALSE(mini.HasStream(FunctionTableStream));
-  EXPECT_FALSE(full.HasStream(FunctionTableStream));
-  EXPECT_FALSE(mini.HasStream(MemoryInfoListStream));
-  EXPECT_FALSE(full.HasStream(MemoryInfoListStream));
-  EXPECT_FALSE(mini.HasStream(ThreadInfoListStream));
-  EXPECT_FALSE(full.HasStream(ThreadInfoListStream));
-  EXPECT_FALSE(mini.HasStream(HandleOperationListStream));
-  EXPECT_FALSE(full.HasStream(HandleOperationListStream));
-  EXPECT_FALSE(mini.HasStream(TokenStream));
-  EXPECT_FALSE(full.HasStream(TokenStream));
-}
-
-}  // namespace
+// Copyright (c) 2010, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include <windows.h>
+#include <objbase.h>
+#include <dbghelp.h>
+
+#include "../crash_generation/minidump_generator.h"
+#include "dump_analysis.h"  // NOLINT
+
+#include "gtest/gtest.h"
+
+namespace {
+
+// Minidump with stacks, PEB, TEB, and unloaded module list.
+const MINIDUMP_TYPE kSmallDumpType = static_cast<MINIDUMP_TYPE>(
+    MiniDumpWithProcessThreadData |  // Get PEB and TEB.
+    MiniDumpWithUnloadedModules);  // Get unloaded modules when available.
+
+// Minidump with all of the above, plus memory referenced from stack.
+const MINIDUMP_TYPE kLargerDumpType = static_cast<MINIDUMP_TYPE>(
+    MiniDumpWithProcessThreadData |  // Get PEB and TEB.
+    MiniDumpWithUnloadedModules |  // Get unloaded modules when available.
+    MiniDumpWithIndirectlyReferencedMemory);  // Get memory referenced by stack.
+
+// Large dump with all process memory.
+const MINIDUMP_TYPE kFullDumpType = static_cast<MINIDUMP_TYPE>(
+    MiniDumpWithFullMemory |  // Full memory from process.
+    MiniDumpWithProcessThreadData |  // Get PEB and TEB.
+    MiniDumpWithHandleData |  // Get all handle information.
+    MiniDumpWithUnloadedModules);  // Get unloaded modules when available.
+
+class MinidumpTest: public testing::Test {
+ public:
+  MinidumpTest() {
+    wchar_t temp_dir_path MAX_PATH  = {0};
+    ::GetTempPath(MAX_PATH, temp_dir_path);
+    dump_path_ = temp_dir_path;
+  }
+
+  virtual void SetUp() {
+    // Make sure URLMon isn't loaded into our process.
+    ASSERT_EQ(NULL, ::GetModuleHandle(L"urlmon.dll"));
+
+    // Then load and unload it to ensure we have something to
+    // stock the unloaded module list with.
+    HMODULE urlmon = ::LoadLibrary(L"urlmon.dll");
+    ASSERT_TRUE(urlmon != NULL);
+    ASSERT_TRUE(::FreeLibrary(urlmon));
+  }
+
+  virtual void TearDown() {
+    if (!dump_file_.empty()) {
+      ::DeleteFile(dump_file_.c_str());
+      dump_file_ = L"";
+    }
+    if (!full_dump_file_.empty()) {
+      ::DeleteFile(full_dump_file_.c_str());
+      full_dump_file_ = L"";
+    }
+  }
+
+  bool WriteDump(ULONG flags) {
+    using google_breakpad::MinidumpGenerator;
+
+    // Fake exception is access violation on write to this.
+    EXCEPTION_RECORD ex_record = {
+        STATUS_ACCESS_VIOLATION,  // ExceptionCode
+        0,  // ExceptionFlags
+        NULL,  // ExceptionRecord;
+        reinterpret_cast<void*>(0xCAFEBABE),  // ExceptionAddress;
+        2,  // NumberParameters;
+        { EXCEPTION_WRITE_FAULT, reinterpret_cast<ULONG_PTR>(this) }
+    };
+    CONTEXT ctx_record = {};
+    EXCEPTION_POINTERS ex_ptrs = {
+      &ex_record,
+      &ctx_record,
+    };
+
+    MinidumpGenerator generator(dump_path_);
+
+    // And write a dump
+    bool result = generator.WriteMinidump(::GetCurrentProcess(),
+                                          ::GetCurrentProcessId(),
+                                          ::GetCurrentThreadId(),
+                                          ::GetCurrentThreadId(),
+                                          &ex_ptrs,
+                                          NULL,
+                                          static_cast<MINIDUMP_TYPE>(flags),
+                                          TRUE,
+                                          &dump_file_,
+                                          &full_dump_file_);
+    return result == TRUE;
+  }
+
+ protected:
+  std::wstring dump_file_;
+  std::wstring full_dump_file_;
+
+  std::wstring dump_path_;
+};
+
+// We need to be able to get file information from Windows
+bool HasFileInfo(const std::wstring& file_path) {
+  DWORD dummy;
+  const wchar_t* path = file_path.c_str();
+  DWORD length = ::GetFileVersionInfoSize(path, &dummy);
+  if (length == 0)
+    return NULL;
+
+  void* data = calloc(length, 1);
+  if (!data)
+    return false;
+
+  if (!::GetFileVersionInfo(path, dummy, length, data)) {
+    free(data);
+    return false;
+  }
+
+  void* translate = NULL;
+  UINT page_count;
+  BOOL query_result = VerQueryValue(
+      data,
+      L"\\VarFileInfo\\Translation",
+      static_cast<void**>(&translate),
+      &page_count);
+
+  free(data);
+  if (query_result && translate) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+TEST_F(MinidumpTest, Version) {
+  API_VERSION* version = ::ImagehlpApiVersion();
+
+  HMODULE dbg_help = ::GetModuleHandle(L"dbghelp.dll");
+  ASSERT_TRUE(dbg_help != NULL);
+
+  wchar_t dbg_help_file1024 = {};
+  ASSERT_TRUE(::GetModuleFileName(dbg_help,
+                                  dbg_help_file,
+                                  sizeof(dbg_help_file) /
+                                      sizeof(*dbg_help_file)));
+  ASSERT_TRUE(HasFileInfo(std::wstring(dbg_help_file)) != NULL);
+
+//  LOG(INFO) << "DbgHelp.dll version: " << file_info->file_version();
+}
+
+TEST_F(MinidumpTest, Normal) {
+  EXPECT_TRUE(WriteDump(MiniDumpNormal));
+  DumpAnalysis mini(dump_file_);
+
+  // We expect threads, modules and some memory.
+  EXPECT_TRUE(mini.HasStream(ThreadListStream));
+  EXPECT_TRUE(mini.HasStream(ModuleListStream));
+  EXPECT_TRUE(mini.HasStream(MemoryListStream));
+  EXPECT_TRUE(mini.HasStream(ExceptionStream));
+  EXPECT_TRUE(mini.HasStream(SystemInfoStream));
+  EXPECT_TRUE(mini.HasStream(MiscInfoStream));
+
+  EXPECT_FALSE(mini.HasStream(ThreadExListStream));
+  EXPECT_FALSE(mini.HasStream(Memory64ListStream));
+  EXPECT_FALSE(mini.HasStream(CommentStreamA));
+  EXPECT_FALSE(mini.HasStream(CommentStreamW));
+  EXPECT_FALSE(mini.HasStream(HandleDataStream));
+  EXPECT_FALSE(mini.HasStream(FunctionTableStream));
+  EXPECT_FALSE(mini.HasStream(UnloadedModuleListStream));
+  EXPECT_FALSE(mini.HasStream(MemoryInfoListStream));
+  EXPECT_FALSE(mini.HasStream(ThreadInfoListStream));
+  EXPECT_FALSE(mini.HasStream(HandleOperationListStream));
+  EXPECT_FALSE(mini.HasStream(TokenStream));
+
+  // We expect no PEB nor TEBs in this dump.
+  EXPECT_FALSE(mini.HasTebs());
+  EXPECT_FALSE(mini.HasPeb());
+
+  // We expect no off-stack memory in this dump.
+  EXPECT_FALSE(mini.HasMemory(this));
+}
+
+TEST_F(MinidumpTest, SmallDump) {
+  ASSERT_TRUE(WriteDump(kSmallDumpType));
+  DumpAnalysis mini(dump_file_);
+
+  EXPECT_TRUE(mini.HasStream(ThreadListStream));
+  EXPECT_TRUE(mini.HasStream(ModuleListStream));
+  EXPECT_TRUE(mini.HasStream(MemoryListStream));
+  EXPECT_TRUE(mini.HasStream(ExceptionStream));
+  EXPECT_TRUE(mini.HasStream(SystemInfoStream));
+  EXPECT_TRUE(mini.HasStream(UnloadedModuleListStream));
+  EXPECT_TRUE(mini.HasStream(MiscInfoStream));
+
+  // We expect PEB and TEBs in this dump.
+  EXPECT_TRUE(mini.HasTebs());
+  EXPECT_TRUE(mini.HasPeb());
+
+  EXPECT_FALSE(mini.HasStream(ThreadExListStream));
+  EXPECT_FALSE(mini.HasStream(Memory64ListStream));
+  EXPECT_FALSE(mini.HasStream(CommentStreamA));
+  EXPECT_FALSE(mini.HasStream(CommentStreamW));
+  EXPECT_FALSE(mini.HasStream(HandleDataStream));
+  EXPECT_FALSE(mini.HasStream(FunctionTableStream));
+  EXPECT_FALSE(mini.HasStream(MemoryInfoListStream));
+  EXPECT_FALSE(mini.HasStream(ThreadInfoListStream));
+  EXPECT_FALSE(mini.HasStream(HandleOperationListStream));
+  EXPECT_FALSE(mini.HasStream(TokenStream));
+
+  // We expect no off-stack memory in this dump.
+  EXPECT_FALSE(mini.HasMemory(this));
+}
+
+TEST_F(MinidumpTest, LargerDump) {
+  ASSERT_TRUE(WriteDump(kLargerDumpType));
+  DumpAnalysis mini(dump_file_);
+
+  // The dump should have all of these streams.
+  EXPECT_TRUE(mini.HasStream(ThreadListStream));
+  EXPECT_TRUE(mini.HasStream(ModuleListStream));
+  EXPECT_TRUE(mini.HasStream(MemoryListStream));
+  EXPECT_TRUE(mini.HasStream(ExceptionStream));
+  EXPECT_TRUE(mini.HasStream(SystemInfoStream));
+  EXPECT_TRUE(mini.HasStream(UnloadedModuleListStream));
+  EXPECT_TRUE(mini.HasStream(MiscInfoStream));
+
+  // We expect memory referenced by stack in this dump.
+  EXPECT_TRUE(mini.HasMemory(this));
+
+  // We expect PEB and TEBs in this dump.
+  EXPECT_TRUE(mini.HasTebs());
+  EXPECT_TRUE(mini.HasPeb());
+
+  EXPECT_FALSE(mini.HasStream(ThreadExListStream));
+  EXPECT_FALSE(mini.HasStream(Memory64ListStream));
+  EXPECT_FALSE(mini.HasStream(CommentStreamA));
+  EXPECT_FALSE(mini.HasStream(CommentStreamW));
+  EXPECT_FALSE(mini.HasStream(HandleDataStream));
+  EXPECT_FALSE(mini.HasStream(FunctionTableStream));
+  EXPECT_FALSE(mini.HasStream(MemoryInfoListStream));
+  EXPECT_FALSE(mini.HasStream(ThreadInfoListStream));
+  EXPECT_FALSE(mini.HasStream(HandleOperationListStream));
+  EXPECT_FALSE(mini.HasStream(TokenStream));
+}
+
+TEST_F(MinidumpTest, FullDump) {
+  ASSERT_TRUE(WriteDump(kFullDumpType));
+  ASSERT_TRUE(dump_file_ != L"");
+  ASSERT_TRUE(full_dump_file_ != L"");
+  DumpAnalysis mini(dump_file_);
+  DumpAnalysis full(full_dump_file_);
+
+  // Either dumps can contain part of the information.
+
+  // The dump should have all of these streams.
+  EXPECT_TRUE(mini.HasStream(ThreadListStream));
+  EXPECT_TRUE(full.HasStream(ThreadListStream));
+  EXPECT_TRUE(mini.HasStream(ModuleListStream));
+  EXPECT_TRUE(full.HasStream(ModuleListStream));
+  EXPECT_TRUE(mini.HasStream(ExceptionStream));
+  EXPECT_TRUE(full.HasStream(ExceptionStream));
+  EXPECT_TRUE(mini.HasStream(SystemInfoStream));
+  EXPECT_TRUE(full.HasStream(SystemInfoStream));
+  EXPECT_TRUE(mini.HasStream(UnloadedModuleListStream));
+  EXPECT_TRUE(full.HasStream(UnloadedModuleListStream));
+  EXPECT_TRUE(mini.HasStream(MiscInfoStream));
+  EXPECT_TRUE(full.HasStream(MiscInfoStream));
+  EXPECT_TRUE(mini.HasStream(HandleDataStream));
+  EXPECT_TRUE(full.HasStream(HandleDataStream));
+
+  // We expect memory referenced by stack in this dump.
+  EXPECT_FALSE(mini.HasMemory(this));
+  EXPECT_TRUE(full.HasMemory(this));
+
+  // We expect PEB and TEBs in this dump.
+  EXPECT_TRUE(mini.HasTebs() || full.HasTebs());
+  EXPECT_TRUE(mini.HasPeb() || full.HasPeb());
+
+  EXPECT_TRUE(mini.HasStream(MemoryListStream));
+  EXPECT_TRUE(full.HasStream(Memory64ListStream));
+  EXPECT_FALSE(mini.HasStream(Memory64ListStream));
+  EXPECT_FALSE(full.HasStream(MemoryListStream));
+
+  // This is the only place we don't use OR because we want both not
+  // to have the streams.
+  EXPECT_FALSE(mini.HasStream(ThreadExListStream));
+  EXPECT_FALSE(full.HasStream(ThreadExListStream));
+  EXPECT_FALSE(mini.HasStream(CommentStreamA));
+  EXPECT_FALSE(full.HasStream(CommentStreamA));
+  EXPECT_FALSE(mini.HasStream(CommentStreamW));
+  EXPECT_FALSE(full.HasStream(CommentStreamW));
+  EXPECT_FALSE(mini.HasStream(FunctionTableStream));
+  EXPECT_FALSE(full.HasStream(FunctionTableStream));
+  EXPECT_FALSE(mini.HasStream(MemoryInfoListStream));
+  EXPECT_FALSE(full.HasStream(MemoryInfoListStream));
+  EXPECT_FALSE(mini.HasStream(ThreadInfoListStream));
+  EXPECT_FALSE(full.HasStream(ThreadInfoListStream));
+  EXPECT_FALSE(mini.HasStream(HandleOperationListStream));
+  EXPECT_FALSE(full.HasStream(HandleOperationListStream));
+  EXPECT_FALSE(mini.HasStream(TokenStream));
+  EXPECT_FALSE(full.HasStream(TokenStream));
+}
+
+}  // namespace

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/basictypes.h Added

@@ -0,0 +1,39 @@
+// Copyright (c) 2011 Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef COMMON_BASICTYPES_H_
+#define COMMON_BASICTYPES_H_
+
+// A macro to disallow the copy constructor and operator= functions
+// This should be used in the private: declarations for a class
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName&);               \
+  void operator=(const TypeName&)
+
+#endif  // COMMON_BASICTYPES_H_

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2diehandler.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2diehandler.cc Changed

@@ -176,11 +176,21 @@
 void DIEDispatcher::ProcessAttributeString(uint64 offset,
                                            enum DwarfAttribute attr,
                                            enum DwarfForm form,
-                                           const string& data) {
+                                           const std::string& data) {
   HandlerStack &current = die_handlers_.top();
   // This had better be an attribute of the DIE we were meant to handle.
   assert(offset == current.offset_);
   current.handler_->ProcessAttributeString(attr, form, data);
 }
 
+void DIEDispatcher::ProcessAttributeSignature(uint64 offset,
+                                              enum DwarfAttribute attr,
+                                              enum DwarfForm form,
+                                              uint64 signature) {
+  HandlerStack &current = die_handlers_.top();
+  // This had better be an attribute of the DIE we were meant to handle.
+  assert(offset == current.offset_);
+  current.handler_->ProcessAttributeSignature(attr, form, signature);
+}
+
 } // namespace dwarf2reader

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2diehandler.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2diehandler.h Changed

@@ -208,7 +208,10 @@
                                       uint64 len) { }
   virtual void ProcessAttributeString(enum DwarfAttribute attr,
                                       enum DwarfForm form,
-                                      const string& data) { }
+                                      const std::string& data) { }
+  virtual void ProcessAttributeSignature(enum DwarfAttribute attr,
+                                         enum DwarfForm form,
+                                         uint64 signture) { }
 
   // Once we have reported all the DIE's attributes' values, we call
   // this member function.  If it returns false, we skip all the DIE's
@@ -313,7 +316,11 @@
   void ProcessAttributeString(uint64 offset,
                               enum DwarfAttribute attr,
                               enum DwarfForm form,
-                              const string &data);
+                              const std::string &data);
+  void ProcessAttributeSignature(uint64 offset,
+                                 enum DwarfAttribute attr,
+                                 enum DwarfForm form,
+                                 uint64 signature);
   void EndDIE(uint64 offset);
 
  private:
@@ -347,7 +354,7 @@
   // - When we decide to ignore a subtree, we only push an entry on
   //   the stack for the root of the tree being ignored, rather than
   //   pushing lots of stack entries with handler_ set to NULL.
-  stack<HandlerStack> die_handlers_;
+  std::stack<HandlerStack> die_handlers_;
 
   // The root handler.  We don't push it on die_handlers_ until we
   // actually get the StartDIE call for the root.

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2diehandler_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2diehandler_unittest.cc Changed

@@ -32,10 +32,16 @@
 
 // dwarf2diehander_unittest.cc: Unit tests for google_breakpad::DIEDispatcher.
 
+#include <string>
+#include <utility>
+
 #include "breakpad_googletest_includes.h"
 
 #include "common/dwarf/dwarf2diehandler.h"
 
+using std::make_pair;
+using std::string;
+
 using ::testing::_;
 using ::testing::ContainerEq;
 using ::testing::ElementsAreArray;
@@ -65,6 +71,8 @@
                void(DwarfAttribute, DwarfForm, const char *, uint64));
   MOCK_METHOD3(ProcessAttributeString,
                void(DwarfAttribute, DwarfForm, const string &));
+  MOCK_METHOD3(ProcessAttributeSignature,
+               void(DwarfAttribute, DwarfForm, uint64));
   MOCK_METHOD0(EndAttributes, bool());
   MOCK_METHOD3(FindChildHandler, DIEHandler *(uint64, DwarfTag,
                                               const AttributeList &));
@@ -83,6 +91,8 @@
                void(DwarfAttribute, DwarfForm, const char *, uint64));
   MOCK_METHOD3(ProcessAttributeString,
                void(DwarfAttribute, DwarfForm, const string &));
+  MOCK_METHOD3(ProcessAttributeSignature,
+               void(DwarfAttribute, DwarfForm, uint64));
   MOCK_METHOD0(EndAttributes, bool());
   MOCK_METHOD3(FindChildHandler, DIEHandler *(uint64, DwarfTag,
                                               const AttributeList &));
@@ -238,6 +248,11 @@
                                        (DwarfForm) 0x15762fec,
                                        StrEq(str)))
       .WillOnce(Return());
+    EXPECT_CALL(mock_root_handler,
+                ProcessAttributeSignature((DwarfAttribute) 0x58790d72,
+                                          (DwarfForm) 0x4159f138,
+                                          0x94682463613e6a5fULL))
+      .WillOnce(Return());
     EXPECT_CALL(mock_root_handler, EndAttributes())
       .WillOnce(Return(true));
     EXPECT_CALL(mock_root_handler, FindChildHandler(_, _, _))
@@ -279,6 +294,10 @@
                                         (DwarfAttribute) 0x310ed065,
                                         (DwarfForm) 0x15762fec,
                                         str);
+  die_dispatcher.ProcessAttributeSignature(0xe2222da01e29f2a9LL,
+                                           (DwarfAttribute) 0x58790d72,
+                                           (DwarfForm) 0x4159f138,
+                                           0x94682463613e6a5fULL);
 
   // Finish the root DIE (and thus the CU).
   die_dispatcher.EndDIE(0xe2222da01e29f2a9LL);

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2enums.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2enums.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2reader.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2reader.cc Changed

@@ -39,6 +39,7 @@
 #include <string.h>
 
 #include <map>
+#include <memory>
 #include <stack>
 #include <utility>
 
@@ -74,7 +75,7 @@
     iter = sections_.find("__debug_abbrev");
   assert(iter != sections_.end());
 
-  abbrevs_ = new vector<Abbrev>;
+  abbrevs_ = new std::vector<Abbrev>;
   abbrevs_->resize(1);
 
   // The only way to check whether we are reading over the end of the
@@ -121,7 +122,7 @@
       const enum DwarfAttribute name =
         static_cast<enum DwarfAttribute>(nametemp);
       const enum DwarfForm form = static_cast<enum DwarfForm>(formtemp);
-      abbrev.attributes.push_back(make_pair(name, form));
+      abbrev.attributes.push_back(std::make_pair(name, form));
     }
     assert(abbrev.number == abbrevs_->size());
     abbrevs_->push_back(abbrev);
@@ -150,41 +151,35 @@
                                                                      &len));
       start += len;
       return SkipAttribute(start, form);
-      break;
 
+    case DW_FORM_flag_present:
+      return start;
     case DW_FORM_data1:
     case DW_FORM_flag:
     case DW_FORM_ref1:
       return start + 1;
-      break;
     case DW_FORM_ref2:
     case DW_FORM_data2:
       return start + 2;
-      break;
     case DW_FORM_ref4:
     case DW_FORM_data4:
       return start + 4;
-      break;
     case DW_FORM_ref8:
     case DW_FORM_data8:
+    case DW_FORM_ref_sig8:
       return start + 8;
-      break;
     case DW_FORM_string:
       return start + strlen(start) + 1;
-      break;
     case DW_FORM_udata:
     case DW_FORM_ref_udata:
       reader_->ReadUnsignedLEB128(start, &len);
       return start + len;
-      break;
 
     case DW_FORM_sdata:
       reader_->ReadSignedLEB128(start, &len);
       return start + len;
-      break;
     case DW_FORM_addr:
       return start + reader_->AddressSize();
-      break;
     case DW_FORM_ref_addr:
       // DWARF2 and 3 differ on whether ref_addr is address size or
       // offset size.
@@ -194,27 +189,21 @@
       } else if (header_.version == 3) {
         return start + reader_->OffsetSize();
       }
-      break;
 
     case DW_FORM_block1:
       return start + 1 + reader_->ReadOneByte(start);
-      break;
     case DW_FORM_block2:
       return start + 2 + reader_->ReadTwoBytes(start);
-      break;
     case DW_FORM_block4:
       return start + 4 + reader_->ReadFourBytes(start);
-      break;
-    case DW_FORM_block: {
+    case DW_FORM_block:
+    case DW_FORM_exprloc: {
       uint64 size = reader_->ReadUnsignedLEB128(start, &len);
       return start + size + len;
     }
-      break;
     case DW_FORM_strp:
-        return start + reader_->OffsetSize();
-      break;
-    default:
-      fprintf(stderr,"Unhandled form type");
+    case DW_FORM_sec_offset:
+      return start + reader_->OffsetSize();
   }
   fprintf(stderr,"Unhandled form type");
   return NULL;
@@ -326,85 +315,78 @@
                                                                      &len));
       start += len;
       return ProcessAttribute(dieoffset, start, attr, form);
-      break;
 
+    case DW_FORM_flag_present:
+      handler_->ProcessAttributeUnsigned(dieoffset, attr, form, 1);
+      return start;
     case DW_FORM_data1:
     case DW_FORM_flag:
       handler_->ProcessAttributeUnsigned(dieoffset, attr, form,
                                          reader_->ReadOneByte(start));
       return start + 1;
-      break;
     case DW_FORM_data2:
       handler_->ProcessAttributeUnsigned(dieoffset, attr, form,
                                          reader_->ReadTwoBytes(start));
       return start + 2;
-      break;
     case DW_FORM_data4:
       handler_->ProcessAttributeUnsigned(dieoffset, attr, form,
                                          reader_->ReadFourBytes(start));
       return start + 4;
-      break;
     case DW_FORM_data8:
       handler_->ProcessAttributeUnsigned(dieoffset, attr, form,
                                          reader_->ReadEightBytes(start));
       return start + 8;
-      break;
     case DW_FORM_string: {
       const char* str = start;
       handler_->ProcessAttributeString(dieoffset, attr, form,
                                        str);
       return start + strlen(str) + 1;
     }
-      break;
     case DW_FORM_udata:
       handler_->ProcessAttributeUnsigned(dieoffset, attr, form,
                                          reader_->ReadUnsignedLEB128(start,
                                                                      &len));
       return start + len;
-      break;
 
     case DW_FORM_sdata:
       handler_->ProcessAttributeSigned(dieoffset, attr, form,
                                       reader_->ReadSignedLEB128(start, &len));
       return start + len;
-      break;
     case DW_FORM_addr:
       handler_->ProcessAttributeUnsigned(dieoffset, attr, form,
                                          reader_->ReadAddress(start));
       return start + reader_->AddressSize();
-      break;
+    case DW_FORM_sec_offset:
+      handler_->ProcessAttributeUnsigned(dieoffset, attr, form,
+                                         reader_->ReadOffset(start));
+      return start + reader_->OffsetSize();
 
     case DW_FORM_ref1:
       handler_->ProcessAttributeReference(dieoffset, attr, form,
                                           reader_->ReadOneByte(start)
                                           + offset_from_section_start_);
       return start + 1;
-      break;
     case DW_FORM_ref2:
       handler_->ProcessAttributeReference(dieoffset, attr, form,
                                           reader_->ReadTwoBytes(start)
                                           + offset_from_section_start_);
       return start + 2;
-      break;
     case DW_FORM_ref4:
       handler_->ProcessAttributeReference(dieoffset, attr, form,
                                           reader_->ReadFourBytes(start)
                                           + offset_from_section_start_);
       return start + 4;
-      break;
     case DW_FORM_ref8:
       handler_->ProcessAttributeReference(dieoffset, attr, form,
                                           reader_->ReadEightBytes(start)
                                           + offset_from_section_start_);
       return start + 8;
-      break;
     case DW_FORM_ref_udata:
       handler_->ProcessAttributeReference(dieoffset, attr, form,
                                           reader_->ReadUnsignedLEB128(start,
                                                                       &len)
                                           + offset_from_section_start_);
       return start + len;
-      break;
     case DW_FORM_ref_addr:
       // DWARF2 and 3 differ on whether ref_addr is address size or
       // offset size.
@@ -419,35 +401,36 @@
         return start + reader_->OffsetSize();
       }
       break;
+    case DW_FORM_ref_sig8:
+      handler_->ProcessAttributeSignature(dieoffset, attr, form,
+                                          reader_->ReadEightBytes(start));
+      return start + 8;
 
     case DW_FORM_block1: {
       uint64 datalen = reader_->ReadOneByte(start);
       handler_->ProcessAttributeBuffer(dieoffset, attr, form, start + 1,
-                                      datalen);
+                                       datalen);
       return start + 1 + datalen;
     }
-      break;
     case DW_FORM_block2: {
       uint64 datalen = reader_->ReadTwoBytes(start);
       handler_->ProcessAttributeBuffer(dieoffset, attr, form, start + 2,
-                                      datalen);
+                                       datalen);
       return start + 2 + datalen;
     }
-      break;
     case DW_FORM_block4: {
       uint64 datalen = reader_->ReadFourBytes(start);
       handler_->ProcessAttributeBuffer(dieoffset, attr, form, start + 4,
-                                      datalen);
+                                       datalen);
       return start + 4 + datalen;
     }
-      break;
-    case DW_FORM_block: {
+    case DW_FORM_block:
+    case DW_FORM_exprloc: {
       uint64 datalen = reader_->ReadUnsignedLEB128(start, &len);
       handler_->ProcessAttributeBuffer(dieoffset, attr, form, start + len,
-                                      datalen);
+                                       datalen);
       return start + datalen + len;
     }
-      break;
     case DW_FORM_strp: {
       assert(string_buffer_ != NULL);
 
@@ -459,11 +442,8 @@
                                        str);
       return start + reader_->OffsetSize();
     }
-      break;
-    default:
-      fprintf(stderr, "Unhandled form type");
   }
-  fprintf(stderr, "Unhandled form type");
+  fprintf(stderr, "Unhandled form type\n");
   return NULL;
 }
 
@@ -493,7 +473,7 @@
   else
     lengthstart += 4;
 
-  stack<uint64> die_stack;
+  std::stack<uint64> die_stack;
   
   while (dieptr < (lengthstart + header_.length)) {
     // We give the user the absolute offset from the beginning of
@@ -583,7 +563,7 @@
   header_.opcode_base = reader_->ReadOneByte(lineptr);
   lineptr += 1;
 
-  header_.std_opcode_lengths = new vector<unsigned char>;
+  header_.std_opcode_lengths = new std::vector<unsigned char>;
   header_.std_opcode_lengths->resize(header_.opcode_base + 1);
   (*header_.std_opcode_lengths)0 = 0;
   for (int i = 1; i < header_.opcode_base; i++) {
@@ -1024,7 +1004,7 @@
 // Rule: EXPRESSION evaluates to the address at which the register is saved.
 class CallFrameInfo::ExpressionRule: public CallFrameInfo::Rule {
  public:
-  explicit ExpressionRule(const string &expression)
+  explicit ExpressionRule(const std::string &expression)
       : expression_(expression) { }
   ~ExpressionRule() { }
   bool Handle(Handler *handler, uint64 address, int reg) const {
@@ -1038,13 +1018,13 @@
   }
   Rule *Copy() const { return new ExpressionRule(*this); }
  private:
-  string expression_;
+  std::string expression_;
 };
 
 // Rule: EXPRESSION evaluates to the address at which the register is saved.
 class CallFrameInfo::ValExpressionRule: public CallFrameInfo::Rule {
  public:
-  explicit ValExpressionRule(const string &expression)
+  explicit ValExpressionRule(const std::string &expression)
       : expression_(expression) { }
   ~ValExpressionRule() { }
   bool Handle(Handler *handler, uint64 address, int reg) const {
@@ -1059,7 +1039,7 @@
   }
   Rule *Copy() const { return new ValExpressionRule(*this); }
  private:
-  string expression_;
+  std::string expression_;
 };
 
 // A map from register numbers to rules.
@@ -1096,7 +1076,7 @@
 
  private:
   // A map from register numbers to Rules.
-  typedef map<int, Rule *> RuleByNumber;
+  typedef std::map<int, Rule *> RuleByNumber;
 
   // Remove all register rules and clear cfa_rule_.
   void Clear();
@@ -1240,7 +1220,7 @@
     unsigned register_number;  // A register number.
     uint64 offset;             // An offset or address.
     long signed_offset;        // A signed offset.
-    string expression;         // A DWARF expression.
+    std::string expression;    // A DWARF expression.
   };
 
   // Parse CFI instruction operands from STATE's instruction stream as
@@ -1341,7 +1321,7 @@
 
   // A stack of saved states, for DW_CFA_remember_state and
   // DW_CFA_restore_state.
-  stack<RuleMap> saved_rules_;
+  std::stack<RuleMap> saved_rules_;
 };
 
 bool CallFrameInfo::State::InterpretCIE(const CIE &cie) {
@@ -1427,7 +1407,7 @@
         if (len > bytes_left || expression_length > bytes_left - len)
           return ReportIncomplete();
         cursor_ += len;
-        operands->expression = string(cursor_, expression_length);
+        operands->expression = std::string(cursor_, expression_length);
         cursor_ += expression_length;
         break;
       }
@@ -1877,20 +1857,14 @@
   cie->version = reader_->ReadOneByte(cursor);
   cursor++;
 
-  // If we don't recognize the version, we can't parse any more fields
-  // of the CIE. For DWARF CFI, we handle versions 1 through 3 (there
-  // was never a version 2 of CFI data). For .eh_frame, we handle only
-  // version 1.
-  if (eh_frame_) {
-    if (cie->version != 1) {
-      reporter_->UnrecognizedVersion(cie->offset, cie->version);
-      return false;
-    }
-  } else {
-    if (cie->version < 1 || cie->version > 3) {
-      reporter_->UnrecognizedVersion(cie->offset, cie->version);
-      return false;
-    }
+  // If we don't recognize the version, we can't parse any more fields of the
+  // CIE. For DWARF CFI, we handle versions 1 through 3 (there was never a
+  // version 2 of CFI data). For .eh_frame, we handle versions 1 and 3 as well;
+  // the difference between those versions seems to be the same as for
+  // .debug_frame.
+  if (cie->version < 1 || cie->version > 3) {
+    reporter_->UnrecognizedVersion(cie->offset, cie->version);
+    return false;
   }
 
   const char *augmentation_start = cursor;
@@ -1898,7 +1872,8 @@
       memchr(augmentation_start, '\0', cie->end - augmentation_start);
   if (! augmentation_end) return ReportIncomplete(cie);
   cursor = static_cast<const char *>(augmentation_end);
-  cie->augmentation = string(augmentation_start, cursor - augmentation_start);
+  cie->augmentation = std::string(augmentation_start,
+                                  cursor - augmentation_start);
   // Skip the terminating '\0'.
   cursor++;
 
@@ -2285,7 +2260,7 @@
 }
 
 void CallFrameInfo::Reporter::UnrecognizedAugmentation(uint64 offset,
-                                                       const string &aug) {
+                                                       const std::string &aug) {
   fprintf(stderr,
           "%s: CFI frame description entry at offset 0x%llx in '%s':"
           " CIE specifies unrecognized augmentation: '%s'\n",

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2reader.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2reader.h Changed

@@ -50,8 +50,6 @@
 #include "common/dwarf/dwarf2enums.h"
 #include "common/dwarf/types.h"
 
-using namespace std;
-
 namespace dwarf2reader {
 struct LineStateMachine;
 class Dwarf2Handler;
@@ -59,8 +57,9 @@
 
 // This maps from a string naming a section to a pair containing a
 // the data for the section, and the size of the section.
-typedef map<string, pair<const char*, uint64> > SectionMap;
-typedef list<pair<enum DwarfAttribute, enum DwarfForm> > AttributeList;
+typedef std::map<std::string, std::pair<const char*, uint64> > SectionMap;
+typedef std::list<std::pair<enum DwarfAttribute, enum DwarfForm> >
+    AttributeList;
 typedef AttributeList::iterator AttributeIterator;
 typedef AttributeList::const_iterator ConstAttributeIterator;
 
@@ -75,7 +74,7 @@
   uint8 opcode_base;
   // Use a pointer so that signalsafe_addr2line is able to use this structure
   // without heap allocation problem.
-  vector<unsigned char> *std_opcode_lengths;
+  std::vector<unsigned char> *std_opcode_lengths;
 };
 
 class LineInfo {
@@ -157,7 +156,7 @@
 
   // Called when we define a directory.  NAME is the directory name,
   // DIR_NUM is the directory number
-  virtual void DefineDir(const string& name, uint32 dir_num) { }
+  virtual void DefineDir(const std::string& name, uint32 dir_num) { }
 
   // Called when we define a filename. NAME is the filename, FILE_NUM
   // is the file number which is -1 if the file index is the next
@@ -166,7 +165,7 @@
   // directory index for the directory name of this file, MOD_TIME is
   // the modification time of the file, and LENGTH is the length of
   // the file
-  virtual void DefineFile(const string& name, int32 file_num,
+  virtual void DefineFile(const std::string& name, int32 file_num,
                           uint32 dir_num, uint64 mod_time,
                           uint64 length) { }
 
@@ -313,7 +312,7 @@
   // Set of DWARF2/3 abbreviations for this compilation unit.  Indexed
   // by abbreviation number, which means that abbrevs_0 is not
   // valid.
-  vector<Abbrev>* abbrevs_;
+  std::vector<Abbrev>* abbrevs_;
 
   // String section buffer and length, if we have a string section.
   // This is here to avoid doing a section lookup for strings in
@@ -392,7 +391,16 @@
   virtual void ProcessAttributeString(uint64 offset,
                                       enum DwarfAttribute attr,
                                       enum DwarfForm form,
-                                      const string& data) { }
+                                      const std::string& data) { }
+
+  // Called when we have an attribute whose value is the 64-bit signature
+  // of a type unit in the .debug_types section. OFFSET is the offset of
+  // the DIE whose attribute we're reporting. ATTR and FORM are the
+  // attribute's name and form. SIGNATURE is the type unit's signature.
+  virtual void ProcessAttributeSignature(uint64 offset,
+                                         enum DwarfAttribute attr,
+                                         enum DwarfForm form,
+                                         uint64 signature) { }
 
   // Called when finished processing the DIE at OFFSET.
   // Because DWARF2/3 specifies a tree of DIEs, you may get starts
@@ -691,7 +699,7 @@
   // A common information entry (CIE).
   struct CIE: public Entry {
     uint8 version;                      // CFI data version number
-    string augmentation;                // vendor format extension markers
+    std::string augmentation;           // vendor format extension markers
     uint64 code_alignment_factor;       // scale for code address adjustments 
     int data_alignment_factor;          // scale for stack pointer adjustments
     unsigned return_address_register;   // which register holds the return addr
@@ -825,7 +833,7 @@
   // process a given FDE, the parser reiterates the appropriate CIE's
   // contents at the beginning of the FDE's rules.
   virtual bool Entry(size_t offset, uint64 address, uint64 length,
-                     uint8 version, const string &augmentation,
+                     uint8 version, const std::string &augmentation,
                      unsigned return_address) = 0;
 
   // When the Entry function returns true, the parser calls these
@@ -874,13 +882,13 @@
   // At ADDRESS, the DWARF expression EXPRESSION yields the address at
   // which REG was saved.
   virtual bool ExpressionRule(uint64 address, int reg,
-                              const string &expression) = 0;
+                              const std::string &expression) = 0;
 
   // At ADDRESS, the DWARF expression EXPRESSION yields the caller's
   // value for REG. (This rule doesn't provide an address at which the
   // register's value is saved.)
   virtual bool ValExpressionRule(uint64 address, int reg,
-                                 const string &expression) = 0;
+                                 const std::string &expression) = 0;
 
   // Indicate that the rules for the address range reported by the
   // last call to Entry are complete.  End should return true if
@@ -957,8 +965,8 @@
   // in a Mach-O section named __debug_frame. If we support
   // Linux-style exception handling data, we could be reading an
   // .eh_frame section.
-  Reporter(const string &filename,
-           const string &section = ".debug_frame")
+  Reporter(const std::string &filename,
+           const std::string &section = ".debug_frame")
       : filename_(filename), section_(section) { }
   virtual ~Reporter() { }
 
@@ -990,7 +998,7 @@
   // which we don't recognize. We cannot parse DWARF CFI if it uses
   // augmentations we don't recognize.
   virtual void UnrecognizedAugmentation(uint64 offset,
-                                        const string &augmentation);
+                                        const std::string &augmentation);
 
   // The pointer encoding ENCODING, specified by the CIE at OFFSET, is not
   // a valid encoding.
@@ -1031,10 +1039,10 @@
 
  protected:
   // The name of the file whose CFI we're reading.
-  string filename_;
+  std::string filename_;
 
   // The name of the CFI section in that file.
-  string section_;
+  std::string section_;
 };
 
 }  // namespace dwarf2reader

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2reader_cfi_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2reader_cfi_unittest.cc Changed

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2reader_die_unittest.cc Added

@@ -0,0 +1,486 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Original author: Jim Blandy <jimb@mozilla.com> <jimb@red-bean.com>
+
+// dwarf2reader_die_unittest.cc: Unit tests for dwarf2reader::CompilationUnit
+
+#include <stdlib.h>
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+#include "breakpad_googletest_includes.h"
+#include "common/dwarf/bytereader-inl.h"
+#include "common/dwarf/dwarf2reader_test_common.h"
+#include "common/dwarf/dwarf2reader.h"
+#include "google_breakpad/common/breakpad_types.h"
+
+using google_breakpad::test_assembler::Endianness;
+using google_breakpad::test_assembler::Label;
+using google_breakpad::test_assembler::Section;
+using google_breakpad::test_assembler::kBigEndian;
+using google_breakpad::test_assembler::kLittleEndian;
+
+using dwarf2reader::AttributeList;
+using dwarf2reader::ByteReader;
+using dwarf2reader::CompilationUnit;
+using dwarf2reader::Dwarf2Handler;
+using dwarf2reader::DwarfAttribute;
+using dwarf2reader::DwarfForm;
+using dwarf2reader::DwarfHasChild;
+using dwarf2reader::DwarfTag;
+using dwarf2reader::ENDIANNESS_BIG;
+using dwarf2reader::ENDIANNESS_LITTLE;
+using dwarf2reader::SectionMap;
+
+using std::string;
+using std::vector;
+using testing::InSequence;
+using testing::Pointee;
+using testing::Return;
+using testing::Sequence;
+using testing::Test;
+using testing::TestWithParam;
+using testing::_;
+
+class MockDwarf2Handler: public Dwarf2Handler {
+ public:
+  MOCK_METHOD5(StartCompilationUnit, bool(uint64 offset, uint8 address_size,
+                                          uint8 offset_size, uint64 cu_length,
+                                          uint8 dwarf_version));
+  MOCK_METHOD3(StartDIE, bool(uint64 offset, enum DwarfTag tag,
+                              const AttributeList& attrs));
+  MOCK_METHOD4(ProcessAttributeUnsigned, void(uint64 offset,
+                                              DwarfAttribute attr,
+                                              enum DwarfForm form,
+                                              uint64 data));
+  MOCK_METHOD4(ProcessAttributeSigned, void(uint64 offset,
+                                            enum DwarfAttribute attr,
+                                            enum DwarfForm form,
+                                            int64 data));
+  MOCK_METHOD4(ProcessAttributeReference, void(uint64 offset,
+                                               enum DwarfAttribute attr,
+                                               enum DwarfForm form,
+                                               uint64 data));
+  MOCK_METHOD5(ProcessAttributeBuffer, void(uint64 offset,
+                                            enum DwarfAttribute attr,
+                                            enum DwarfForm form,
+                                            const char* data,
+                                            uint64 len));
+  MOCK_METHOD4(ProcessAttributeString, void(uint64 offset,
+                                            enum DwarfAttribute attr,
+                                            enum DwarfForm form,
+                                            const std::string& data));
+  MOCK_METHOD4(ProcessAttributeSignature, void(uint64 offset,
+                                               DwarfAttribute attr,
+                                               enum DwarfForm form,
+                                               uint64 signature));
+  MOCK_METHOD1(EndDIE, void(uint64 offset));
+};
+
+struct DIEFixture {
+
+  DIEFixture() {
+    // Fix the initial offset of the .debug_info and .debug_abbrev sections.
+    info.start() = 0;
+    abbrevs.start() = 0;
+
+    // Default expectations for the data handler.
+    EXPECT_CALL(handler, StartCompilationUnit(_, _, _, _, _)).Times(0);
+    EXPECT_CALL(handler, StartDIE(_, _, _)).Times(0);
+    EXPECT_CALL(handler, ProcessAttributeUnsigned(_, _, _, _)).Times(0);
+    EXPECT_CALL(handler, ProcessAttributeSigned(_, _, _, _)).Times(0);
+    EXPECT_CALL(handler, ProcessAttributeReference(_, _, _, _)).Times(0);
+    EXPECT_CALL(handler, ProcessAttributeBuffer(_, _, _, _, _)).Times(0);
+    EXPECT_CALL(handler, ProcessAttributeString(_, _, _, _)).Times(0);
+    EXPECT_CALL(handler, EndDIE(_)).Times(0);
+  }
+
+  // Return a reference to a section map whose .debug_info section refers
+  // to |info|, and whose .debug_abbrev section refers to |abbrevs|. This
+  // function returns a reference to the same SectionMap each time; new
+  // calls wipe out maps established by earlier calls.
+  const SectionMap &MakeSectionMap() {
+    // Copy the sections' contents into strings that will live as long as
+    // the map itself.
+    assert(info.GetContents(&info_contents));
+    assert(abbrevs.GetContents(&abbrevs_contents));
+    section_map.clear();
+    section_map".debug_info".first  = info_contents.data();
+    section_map".debug_info".second = info_contents.size();
+    section_map".debug_abbrev".first  = abbrevs_contents.data();
+    section_map".debug_abbrev".second = abbrevs_contents.size();
+    return section_map;
+  }
+
+  TestCompilationUnit info;
+  TestAbbrevTable abbrevs;
+  MockDwarf2Handler handler;
+  string abbrevs_contents, info_contents;
+  SectionMap section_map;
+};
+
+struct DwarfHeaderParams {
+  DwarfHeaderParams(Endianness endianness, size_t format_size,
+                   int version, size_t address_size)
+      : endianness(endianness), format_size(format_size),
+        version(version), address_size(address_size) { }
+  Endianness endianness;
+  size_t format_size;                   // 4-byte or 8-byte DWARF offsets
+  int version;
+  size_t address_size;
+};
+
+class DwarfHeader: public DIEFixture,
+                   public TestWithParam<DwarfHeaderParams> { };
+
+TEST_P(DwarfHeader, Header) {
+  Label abbrev_table = abbrevs.Here();
+  abbrevs.Abbrev(1, dwarf2reader::DW_TAG_compile_unit,
+                 dwarf2reader::DW_children_yes)
+      .Attribute(dwarf2reader::DW_AT_name, dwarf2reader::DW_FORM_string)
+      .EndAbbrev()
+      .EndTable();
+
+  info.set_format_size(GetParam().format_size);
+  info.set_endianness(GetParam().endianness);
+
+  info.Header(GetParam().version, abbrev_table, GetParam().address_size)
+      .ULEB128(1)                     // DW_TAG_compile_unit, with children
+      .AppendCString("sam")           // DW_AT_name, DW_FORM_string
+      .D8(0);                         // end of children
+  info.Finish();
+
+  {
+    InSequence s;
+    EXPECT_CALL(handler,
+                StartCompilationUnit(0, GetParam().address_size,
+                                     GetParam().format_size, _,
+                                     GetParam().version))
+        .WillOnce(Return(true));
+    EXPECT_CALL(handler, StartDIE(_, dwarf2reader::DW_TAG_compile_unit, _))
+        .WillOnce(Return(true));
+    EXPECT_CALL(handler, ProcessAttributeString(_, dwarf2reader::DW_AT_name, 
+                                                dwarf2reader::DW_FORM_string,
+                                                "sam"))
+        .WillOnce(Return());
+    EXPECT_CALL(handler, EndDIE(_))
+        .WillOnce(Return());
+  }
+
+  ByteReader byte_reader(GetParam().endianness == kLittleEndian ?
+                         ENDIANNESS_LITTLE : ENDIANNESS_BIG);
+  CompilationUnit parser(MakeSectionMap(), 0, &byte_reader, &handler);
+  EXPECT_EQ(parser.Start(), info_contents.size());
+}
+
+INSTANTIATE_TEST_CASE_P(
+    HeaderVariants, DwarfHeader,
+    ::testing::Values(DwarfHeaderParams(kLittleEndian, 4, 2, 4),
+                      DwarfHeaderParams(kLittleEndian, 4, 2, 8),
+                      DwarfHeaderParams(kLittleEndian, 4, 3, 4),
+                      DwarfHeaderParams(kLittleEndian, 4, 3, 8),
+                      DwarfHeaderParams(kLittleEndian, 4, 4, 4),
+                      DwarfHeaderParams(kLittleEndian, 4, 4, 8),
+                      DwarfHeaderParams(kLittleEndian, 8, 2, 4),
+                      DwarfHeaderParams(kLittleEndian, 8, 2, 8),
+                      DwarfHeaderParams(kLittleEndian, 8, 3, 4),
+                      DwarfHeaderParams(kLittleEndian, 8, 3, 8),
+                      DwarfHeaderParams(kLittleEndian, 8, 4, 4),
+                      DwarfHeaderParams(kLittleEndian, 8, 4, 8),
+                      DwarfHeaderParams(kBigEndian,    4, 2, 4),
+                      DwarfHeaderParams(kBigEndian,    4, 2, 8),
+                      DwarfHeaderParams(kBigEndian,    4, 3, 4),
+                      DwarfHeaderParams(kBigEndian,    4, 3, 8),
+                      DwarfHeaderParams(kBigEndian,    4, 4, 4),
+                      DwarfHeaderParams(kBigEndian,    4, 4, 8),
+                      DwarfHeaderParams(kBigEndian,    8, 2, 4),
+                      DwarfHeaderParams(kBigEndian,    8, 2, 8),
+                      DwarfHeaderParams(kBigEndian,    8, 3, 4),
+                      DwarfHeaderParams(kBigEndian,    8, 3, 8),
+                      DwarfHeaderParams(kBigEndian,    8, 4, 4),
+                      DwarfHeaderParams(kBigEndian,    8, 4, 8)));
+
+struct DwarfFormsFixture: public DIEFixture {
+  // Start a compilation unit, as directed by |params|, containing one
+  // childless DIE of the given tag, with one attribute of the given name
+  // and form. The 'info' fixture member is left just after the abbrev
+  // code, waiting for the attribute value to be appended.
+  void StartSingleAttributeDIE(const DwarfHeaderParams &params,
+                               DwarfTag tag, DwarfAttribute name,
+                               DwarfForm form) {
+    // Create the abbreviation table.
+    Label abbrev_table = abbrevs.Here();
+    abbrevs.Abbrev(1, tag, dwarf2reader::DW_children_no)
+        .Attribute(name, form)
+        .EndAbbrev()
+        .EndTable();
+
+    // Create the compilation unit, up to the attribute value.
+    info.set_format_size(params.format_size);
+    info.set_endianness(params.endianness);
+    info.Header(params.version, abbrev_table, params.address_size)
+        .ULEB128(1);                    // abbrev code
+  }
+
+  // Set up handler to expect a compilation unit matching |params|,
+  // containing one childless DIE of the given tag, in the sequence s. Stop
+  // just before the expectations.
+  void ExpectBeginCompilationUnit(const DwarfHeaderParams &params,
+                                  DwarfTag tag, uint64 offset=0) {
+    EXPECT_CALL(handler,
+                StartCompilationUnit(offset, params.address_size,
+                                     params.format_size, _,
+                                     params.version))
+        .InSequence(s)
+        .WillOnce(Return(true));
+    EXPECT_CALL(handler, StartDIE(_, tag, _))
+        .InSequence(s)
+        .WillOnce(Return(true));
+  }
+
+  void ExpectEndCompilationUnit() {
+    EXPECT_CALL(handler, EndDIE(_))
+        .InSequence(s)
+        .WillOnce(Return());
+  }
+
+  void ParseCompilationUnit(const DwarfHeaderParams &params, uint64 offset=0) {
+    ByteReader byte_reader(params.endianness == kLittleEndian ?
+                           ENDIANNESS_LITTLE : ENDIANNESS_BIG);
+    CompilationUnit parser(MakeSectionMap(), offset, &byte_reader, &handler);
+    EXPECT_EQ(offset + parser.Start(), info_contents.size());
+  }
+
+  // The sequence to which the fixture's methods append expectations.
+  Sequence s;
+};
+
+struct DwarfForms: public DwarfFormsFixture,
+                   public TestWithParam<DwarfHeaderParams> { };
+
+TEST_P(DwarfForms, addr) {
+  StartSingleAttributeDIE(GetParam(), dwarf2reader::DW_TAG_compile_unit,
+                          dwarf2reader::DW_AT_low_pc,
+                          dwarf2reader::DW_FORM_addr);
+  u_int64_t value;
+  if (GetParam().address_size == 4) {
+    value = 0xc8e9ffcc;
+    info.D32(value);
+  } else {
+    value = 0xe942517fc2768564ULL;
+    info.D64(value);
+  }
+  info.Finish();
+
+  ExpectBeginCompilationUnit(GetParam(), dwarf2reader::DW_TAG_compile_unit);
+  EXPECT_CALL(handler, ProcessAttributeUnsigned(_, dwarf2reader::DW_AT_low_pc, 
+                                                dwarf2reader::DW_FORM_addr,
+                                                value))
+      .InSequence(s)
+      .WillOnce(Return());
+  ExpectEndCompilationUnit();
+
+  ParseCompilationUnit(GetParam());
+}
+
+TEST_P(DwarfForms, block2_empty) {
+  StartSingleAttributeDIE(GetParam(), (DwarfTag) 0x16e4d2f7,
+                          (DwarfAttribute) 0xe52c4463,
+                          dwarf2reader::DW_FORM_block2);
+  info.D16(0);
+  info.Finish();
+
+  ExpectBeginCompilationUnit(GetParam(), (DwarfTag) 0x16e4d2f7);
+  EXPECT_CALL(handler, ProcessAttributeBuffer(_, (DwarfAttribute) 0xe52c4463,
+                                              dwarf2reader::DW_FORM_block2,
+                                              _, 0))
+      .InSequence(s)
+      .WillOnce(Return());
+  ExpectEndCompilationUnit();
+
+  ParseCompilationUnit(GetParam());
+}
+
+TEST_P(DwarfForms, block2) {
+  StartSingleAttributeDIE(GetParam(), (DwarfTag) 0x16e4d2f7,
+                          (DwarfAttribute) 0xe52c4463,
+                          dwarf2reader::DW_FORM_block2);
+  unsigned char data258;
+  memset(data, '*', sizeof(data));
+  info.D16(sizeof(data))
+      .Append(data, sizeof(data));
+  info.Finish();
+
+  ExpectBeginCompilationUnit(GetParam(), (DwarfTag) 0x16e4d2f7);
+  EXPECT_CALL(handler, ProcessAttributeBuffer(_, (DwarfAttribute) 0xe52c4463,
+                                              dwarf2reader::DW_FORM_block2,
+                                              Pointee('*'), 258))
+      .InSequence(s)
+      .WillOnce(Return());
+  ExpectEndCompilationUnit();
+
+  ParseCompilationUnit(GetParam());
+}
+
+TEST_P(DwarfForms, flag_present) {
+  StartSingleAttributeDIE(GetParam(), (DwarfTag) 0x3e449ac2,
+                          (DwarfAttribute) 0x359d1972,
+                          dwarf2reader::DW_FORM_flag_present);
+  // DW_FORM_flag_present occupies no space in the DIE.
+  info.Finish();
+
+  ExpectBeginCompilationUnit(GetParam(), (DwarfTag) 0x3e449ac2);
+  EXPECT_CALL(handler,
+              ProcessAttributeUnsigned(_, (DwarfAttribute) 0x359d1972,
+                                       dwarf2reader::DW_FORM_flag_present,
+                                       1))
+      .InSequence(s)
+      .WillOnce(Return());
+  ExpectEndCompilationUnit();
+
+  ParseCompilationUnit(GetParam());
+}
+
+TEST_P(DwarfForms, sec_offset) {
+  StartSingleAttributeDIE(GetParam(), (DwarfTag) 0x1d971689,
+                          (DwarfAttribute) 0xa060bfd1,
+                          dwarf2reader::DW_FORM_sec_offset);
+  u_int64_t value;
+  if (GetParam().format_size == 4) {
+    value = 0xacc9c388;
+    info.D32(value);
+  } else {
+    value = 0xcffe5696ffe3ed0aULL;
+    info.D64(value);
+  }
+  info.Finish();
+
+  ExpectBeginCompilationUnit(GetParam(), (DwarfTag) 0x1d971689);
+  EXPECT_CALL(handler, ProcessAttributeUnsigned(_, (DwarfAttribute) 0xa060bfd1,
+                                                dwarf2reader::DW_FORM_sec_offset,
+                                                value))
+      .InSequence(s)
+      .WillOnce(Return());
+  ExpectEndCompilationUnit();
+
+  ParseCompilationUnit(GetParam());
+}
+
+TEST_P(DwarfForms, exprloc) {
+  StartSingleAttributeDIE(GetParam(), (DwarfTag) 0xb6d167bb,
+                          (DwarfAttribute) 0xba3ae5cb,
+                          dwarf2reader::DW_FORM_exprloc);
+  info.ULEB128(29)
+      .Append(29, 173);
+  info.Finish();
+
+  ExpectBeginCompilationUnit(GetParam(), (DwarfTag) 0xb6d167bb);
+  EXPECT_CALL(handler, ProcessAttributeBuffer(_, (DwarfAttribute) 0xba3ae5cb,
+                                              dwarf2reader::DW_FORM_exprloc,
+                                              Pointee(173), 29))
+      .InSequence(s)
+      .WillOnce(Return());
+  ExpectEndCompilationUnit();
+
+  ParseCompilationUnit(GetParam());
+}
+
+TEST_P(DwarfForms, ref_sig8) {
+  StartSingleAttributeDIE(GetParam(), (DwarfTag) 0x253e7b2b,
+                          (DwarfAttribute) 0xd708d908,
+                          dwarf2reader::DW_FORM_ref_sig8);
+  info.D64(0xf72fa0cb6ddcf9d6ULL);
+  info.Finish();
+
+  ExpectBeginCompilationUnit(GetParam(), (DwarfTag) 0x253e7b2b);
+  EXPECT_CALL(handler, ProcessAttributeSignature(_, (DwarfAttribute) 0xd708d908,
+                                                 dwarf2reader::DW_FORM_ref_sig8,
+                                                 0xf72fa0cb6ddcf9d6ULL))
+      .InSequence(s)
+      .WillOnce(Return());
+  ExpectEndCompilationUnit();
+
+  ParseCompilationUnit(GetParam());
+}
+
+// A value passed to ProcessAttributeSignature is just an absolute number,
+// not an offset within the compilation unit as most of the other
+// DW_FORM_ref forms are. Check that the reader doesn't try to apply any
+// offset to the signature, by reading it from a compilation unit that does
+// not start at the beginning of the section.
+TEST_P(DwarfForms, ref_sig8_not_first) {
+  info.Append(98, '*');
+  StartSingleAttributeDIE(GetParam(), (DwarfTag) 0x253e7b2b,
+                          (DwarfAttribute) 0xd708d908,
+                          dwarf2reader::DW_FORM_ref_sig8);
+  info.D64(0xf72fa0cb6ddcf9d6ULL);
+  info.Finish();
+
+  ExpectBeginCompilationUnit(GetParam(), (DwarfTag) 0x253e7b2b, 98);
+  EXPECT_CALL(handler, ProcessAttributeSignature(_, (DwarfAttribute) 0xd708d908,
+                                                 dwarf2reader::DW_FORM_ref_sig8,
+                                                 0xf72fa0cb6ddcf9d6ULL))
+      .InSequence(s)
+      .WillOnce(Return());
+  ExpectEndCompilationUnit();
+
+  ParseCompilationUnit(GetParam(), 98);
+}
+
+// Tests for the other attribute forms could go here.
+
+INSTANTIATE_TEST_CASE_P(
+    HeaderVariants, DwarfForms,
+    ::testing::Values(DwarfHeaderParams(kLittleEndian, 4, 2, 4),
+                      DwarfHeaderParams(kLittleEndian, 4, 2, 8),
+                      DwarfHeaderParams(kLittleEndian, 4, 3, 4),
+                      DwarfHeaderParams(kLittleEndian, 4, 3, 8),
+                      DwarfHeaderParams(kLittleEndian, 4, 4, 4),
+                      DwarfHeaderParams(kLittleEndian, 4, 4, 8),
+                      DwarfHeaderParams(kLittleEndian, 8, 2, 4),
+                      DwarfHeaderParams(kLittleEndian, 8, 2, 8),
+                      DwarfHeaderParams(kLittleEndian, 8, 3, 4),
+                      DwarfHeaderParams(kLittleEndian, 8, 3, 8),
+                      DwarfHeaderParams(kLittleEndian, 8, 4, 4),
+                      DwarfHeaderParams(kLittleEndian, 8, 4, 8),
+                      DwarfHeaderParams(kBigEndian,    4, 2, 4),
+                      DwarfHeaderParams(kBigEndian,    4, 2, 8),
+                      DwarfHeaderParams(kBigEndian,    4, 3, 4),
+                      DwarfHeaderParams(kBigEndian,    4, 3, 8),
+                      DwarfHeaderParams(kBigEndian,    4, 4, 4),
+                      DwarfHeaderParams(kBigEndian,    4, 4, 8),
+                      DwarfHeaderParams(kBigEndian,    8, 2, 4),
+                      DwarfHeaderParams(kBigEndian,    8, 2, 8),
+                      DwarfHeaderParams(kBigEndian,    8, 3, 4),
+                      DwarfHeaderParams(kBigEndian,    8, 3, 8),
+                      DwarfHeaderParams(kBigEndian,    8, 4, 4),
+                      DwarfHeaderParams(kBigEndian,    8, 4, 8)));

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/dwarf2reader_test_common.h Added

@@ -0,0 +1,149 @@
+// -*- mode: c++ -*-
+
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Original author: Jim Blandy <jimb@mozilla.com> <jimb@red-bean.com>
+
+// dwarf2reader_test_common.h: Define TestCompilationUnit and
+// TestAbbrevTable, classes for creating properly (and improperly)
+// formatted DWARF compilation unit data for unit tests.
+
+#ifndef COMMON_DWARF_DWARF2READER_TEST_COMMON_H__
+#define COMMON_DWARF_DWARF2READER_TEST_COMMON_H__
+
+#include "common/test_assembler.h"
+#include "common/dwarf/dwarf2enums.h"
+
+// A subclass of test_assembler::Section, specialized for constructing
+// DWARF compilation units.
+class TestCompilationUnit: public google_breakpad::test_assembler::Section {
+ public:
+  typedef dwarf2reader::DwarfTag DwarfTag;
+  typedef dwarf2reader::DwarfAttribute DwarfAttribute;
+  typedef dwarf2reader::DwarfForm DwarfForm;
+  typedef google_breakpad::test_assembler::Label Label;
+
+  // Set the section's DWARF format size (the 32-bit DWARF format or the
+  // 64-bit DWARF format, for lengths and section offsets --- not the
+  // address size) to format_size.
+  void set_format_size(size_t format_size) {
+    assert(format_size == 4 || format_size == 8);
+    format_size_ = format_size;
+  }
+    
+  // Append a DWARF section offset value, of the appropriate size for this
+  // compilation unit.
+  template<typename T>
+  void SectionOffset(T offset) {
+    if (format_size_ == 4)
+      D32(offset);
+    else
+      D64(offset);
+  }
+
+  // Append a DWARF compilation unit header to the section, with the given
+  // DWARF version, abbrev table offset, and address size.
+  TestCompilationUnit &Header(int version, const Label &abbrev_offset,
+                              size_t address_size) {
+    if (format_size_ == 4) {
+      D32(length_);
+    } else {
+      D32(0xffffffff);
+      D64(length_);
+    }
+    post_length_offset_ = Size();
+    D16(version);
+    SectionOffset(abbrev_offset);
+    D8(address_size);
+    return *this;
+  }
+
+  // Mark the end of this header's DIEs.
+  TestCompilationUnit &Finish() {
+    length_ = Size() - post_length_offset_;
+    return *this;
+  }
+
+ private:
+  // The DWARF format size for this compilation unit.
+  size_t format_size_;
+
+  // The offset of the point in the compilation unit header immediately
+  // after the initial length field.
+  u_int64_t post_length_offset_;
+
+  // The length of the compilation unit, not including the initial length field.
+  Label length_;
+};
+
+// A subclass of test_assembler::Section specialized for constructing DWARF
+// abbreviation tables.
+class TestAbbrevTable: public google_breakpad::test_assembler::Section {
+ public:
+  typedef dwarf2reader::DwarfTag DwarfTag;
+  typedef dwarf2reader::DwarfAttribute DwarfAttribute;
+  typedef dwarf2reader::DwarfForm DwarfForm;
+  typedef dwarf2reader::DwarfHasChild DwarfHasChild;
+  typedef google_breakpad::test_assembler::Label Label;
+
+  // Start a new abbreviation table entry for abbreviation code |code|,
+  // encoding a DIE whose tag is |tag|, and which has children if and only
+  // if |has_children| is true.
+  TestAbbrevTable &Abbrev(int code, DwarfTag tag, DwarfHasChild has_children) {
+    assert(code != 0);
+    ULEB128(code);
+    ULEB128(static_cast<unsigned>(tag));
+    D8(static_cast<unsigned>(has_children));
+    return *this;
+  };
+
+  // Add an attribute to the current abbreviation code whose name is |name|
+  // and whose form is |form|.
+  TestAbbrevTable &Attribute(DwarfAttribute name, DwarfForm form) {
+    ULEB128(static_cast<unsigned>(name));
+    ULEB128(static_cast<unsigned>(form));
+    return *this;
+  }
+
+  // Finish the current abbreviation code.
+  TestAbbrevTable &EndAbbrev() {
+    ULEB128(0);
+    ULEB128(0);
+    return *this;
+  }
+
+  // Finish the current abbreviation table.
+  TestAbbrevTable &EndTable() {
+    ULEB128(0);
+    return *this;
+  }
+};
+
+#endif // COMMON_DWARF_DWARF2READER_TEST_COMMON_H__

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf/functioninfo.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/functioninfo.cc Changed

@@ -45,8 +45,8 @@
 
 namespace dwarf2reader {
 
-CULineInfoHandler::CULineInfoHandler(vector<SourceFileInfo>* files,
-                                     vector<string>* dirs,
+CULineInfoHandler::CULineInfoHandler(std::vector<SourceFileInfo>* files,
+                                     std::vector<std::string>* dirs,
                                      LineMap* linemap):linemap_(linemap),
                                                        files_(files),
                                                        dirs_(dirs) {
@@ -61,13 +61,13 @@
   files->push_back(s);
 }
 
-void CULineInfoHandler::DefineDir(const string& name, uint32 dir_num) {
+void CULineInfoHandler::DefineDir(const std::string& name, uint32 dir_num) {
   // These should never come out of order, actually
   assert(dir_num == dirs_->size());
   dirs_->push_back(name);
 }
 
-void CULineInfoHandler::DefineFile(const string& name,
+void CULineInfoHandler::DefineFile(const std::string& name,
                                    int32 file_num, uint32 dir_num,
                                    uint64 mod_time, uint64 length) {
   assert(dir_num >= 0);
@@ -75,7 +75,7 @@
 
   // These should never come out of order, actually.
   if (file_num == (int32)files_->size() || file_num == -1) {
-    string dir = dirs_->at(dir_num);
+    std::string dir = dirs_->at(dir_num);
 
     SourceFileInfo s;
     s.lowpc = ULLONG_MAX;
@@ -95,8 +95,10 @@
 void CULineInfoHandler::AddLine(uint64 address, uint64 length, uint32 file_num,
                                 uint32 line_num, uint32 column_num) {
   if (file_num < files_->size()) {
-    linemap_->insert(make_pair(address, make_pair(files_->at(file_num).name.c_str(),
-                                                  line_num)));
+    linemap_->insert(
+        std::make_pair(address,
+                       std::make_pair(files_->at(file_num).name.c_str(),
+                                      line_num)));
 
     if(address < files_->at(file_num).lowpc) {
       files_->at(file_num).lowpc = address;
@@ -130,7 +132,8 @@
       current_function_info_->name = "";
       current_function_info_->line = 0;
       current_function_info_->file = "";
-      offset_to_funcinfo_->insert(make_pair(offset, current_function_info_));
+      offset_to_funcinfo_->insert(std::make_pair(offset,
+                                                 current_function_info_));
     };
       // FALLTHROUGH
     case DW_TAG_compile_unit:
@@ -146,7 +149,7 @@
 void CUFunctionInfoHandler::ProcessAttributeString(uint64 offset,
                                                    enum DwarfAttribute attr,
                                                    enum DwarfForm form,
-                                                   const string &data) {
+                                                   const std::string &data) {
   if (current_function_info_) {
     if (attr == DW_AT_name)
       current_function_info_->name = data;
@@ -164,9 +167,9 @@
     assert(iter != sections_.end());
 
     // this should be a scoped_ptr but we dont' use boost :-(
-    auto_ptr<LineInfo> lireader(new LineInfo(iter->second.first + data,
-                                               iter->second.second  - data,
-                                               reader_, linehandler_));
+    std::auto_ptr<LineInfo> lireader(new LineInfo(iter->second.first + data,
+                                                  iter->second.second  - data,
+                                                  reader_, linehandler_));
     lireader->Start();
   } else if (current_function_info_) {
     switch (attr) {
@@ -219,8 +222,8 @@
 
 void CUFunctionInfoHandler::EndDIE(uint64 offset) {
   if (current_function_info_ && current_function_info_->lowpc)
-    address_to_funcinfo_->insert(make_pair(current_function_info_->lowpc,
-                                           current_function_info_));
+    address_to_funcinfo_->insert(std::make_pair(current_function_info_->lowpc,
+                                                current_function_info_));
 }
 
 }  // namespace dwarf2reader

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf/functioninfo.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/functioninfo.h Changed

@@ -46,11 +46,11 @@
 
 struct FunctionInfo {
   // Name of the function
-  string name;
+  std::string name;
   // Mangled name of the function
-  string mangled_name;
+  std::string mangled_name;
   // File containing this function
-  string file;
+  std::string file;
   // Line number for start of function.
   uint32 line;
   // Beginning address for this function
@@ -61,13 +61,13 @@
 
 struct SourceFileInfo {
   // Name of the source file name
-  string name;
+  std::string name;
   // Low address of source file name
   uint64 lowpc;
 };
 
-typedef map<uint64, FunctionInfo*> FunctionMap;
-typedef map<uint64, pair<string, uint32> > LineMap;
+typedef std::map<uint64, FunctionInfo*> FunctionMap;
+typedef std::map<uint64, std::pair<std::string, uint32> > LineMap;
 
 // This class is a basic line info handler that fills in the dirs,
 // file, and linemap passed into it with the data produced from the
@@ -76,18 +76,18 @@
  public:
 
   //
-  CULineInfoHandler(vector<SourceFileInfo>* files,
-                    vector<string>* dirs,
+  CULineInfoHandler(std::vector<SourceFileInfo>* files,
+                    std::vector<std::string>* dirs,
                     LineMap* linemap);
   virtual ~CULineInfoHandler() { }
 
   // Called when we define a directory.  We just place NAME into dirs_
   // at position DIR_NUM.
-  virtual void DefineDir(const string& name, uint32 dir_num);
+  virtual void DefineDir(const std::string& name, uint32 dir_num);
 
   // Called when we define a filename.  We just place
   // concat(dirs_DIR_NUM, NAME) into files_ at position FILE_NUM.
-  virtual void DefineFile(const string& name, int32 file_num,
+  virtual void DefineFile(const std::string& name, int32 file_num,
                           uint32 dir_num, uint64 mod_time, uint64 length);
 
 
@@ -102,14 +102,14 @@
 
  private:
   LineMap* linemap_;
-  vector<SourceFileInfo>* files_;
-  vector<string>* dirs_;
+  std::vector<SourceFileInfo>* files_;
+  std::vector<std::string>* dirs_;
 };
 
 class CUFunctionInfoHandler: public Dwarf2Handler {
  public:
-  CUFunctionInfoHandler(vector<SourceFileInfo>* files,
-                        vector<string>* dirs,
+  CUFunctionInfoHandler(std::vector<SourceFileInfo>* files,
+                        std::vector<std::string>* dirs,
                         LineMap* linemap,
                         FunctionMap* offset_to_funcinfo,
                         FunctionMap* address_to_funcinfo,
@@ -163,7 +163,7 @@
   virtual void ProcessAttributeString(uint64 offset,
                                       enum DwarfAttribute attr,
                                       enum DwarfForm form,
-                                      const string& data);
+                                      const std::string& data);
 
   // Called when finished processing the DIE at OFFSET.
   // Because DWARF2/3 specifies a tree of DIEs, you may get starts
@@ -172,8 +172,8 @@
   virtual void EndDIE(uint64 offset);
 
  private:
-  vector<SourceFileInfo>* files_;
-  vector<string>* dirs_;
+  std::vector<SourceFileInfo>* files_;
+  std::vector<std::string>* dirs_;
   LineMap* linemap_;
   FunctionMap* offset_to_funcinfo_;
   FunctionMap* address_to_funcinfo_;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf/types.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf/types.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf_cfi_to_module.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf_cfi_to_module.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf_cfi_to_module_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf_cfi_to_module_unittest.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf_cu_to_module.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf_cu_to_module.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf_cu_to_module.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf_cu_to_module.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf_cu_to_module_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf_cu_to_module_unittest.cc Changed

@@ -31,11 +31,15 @@
 
 // dwarf_cu_to_module.cc: Unit tests for google_breakpad::DwarfCUToModule.
 
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "breakpad_googletest_includes.h"
 #include "common/dwarf_cu_to_module.h"
 
+using std::make_pair;
+using std::string;
 using std::vector;
 
 using dwarf2reader::AttributeList;
@@ -144,8 +148,8 @@
 
     // The handler will consult this section map to decide what to
     // pass to our line reader.
-    file_context_.section_map".debug_line" = std::make_pair(dummy_line_program_, 
-                                                   dummy_line_size_);
+    file_context_.section_map".debug_line" = make_pair(dummy_line_program_,
+                                                         dummy_line_size_);
   }
 
   // Add a line with the given address, size, filename, and line
@@ -158,7 +162,7 @@
   // Use LANGUAGE for the compilation unit. More precisely, arrange
   // for StartCU to pass the compilation unit's root DIE a
   // DW_AT_language attribute whose value is LANGUAGE.
-  void SetLanguage(dwarf2reader::DwarfLanguage language) { 
+  void SetLanguage(dwarf2reader::DwarfLanguage language) {
     language_ = language;
   }
 
@@ -192,7 +196,7 @@
   // not Finish. If NAME is non-zero, use it as the DW_AT_name
   // attribute.
   DIEHandler *StartSpecifiedDIE(DIEHandler *parent, DwarfTag tag,
-                                uint64 offset, const char *name = NULL);
+                                uint64 specification, const char *name = NULL);
  
   // Define a function as a child of PARENT with the given name,
   // address, and size. Call EndAttributes and Finish; one cannot

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf_line_to_module.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf_line_to_module.cc Changed

@@ -41,13 +41,14 @@
 // it until we actually have to deal with DWARF on Windows.
 
 // Return true if PATH is an absolute path, false if it is relative.
-static bool PathIsAbsolute(const string &path) {
+static bool PathIsAbsolute(const std::string &path) {
   return (path.size() >= 1 && path0 == '/');
 }
 
 // If PATH is an absolute path, return PATH.  If PATH is a relative path,
 // treat it as relative to BASE and return the combined path.
-static string ExpandPath(const string &path, const string &base) {
+static std::string ExpandPath(const std::string &path,
+                              const std::string &base) {
   if (PathIsAbsolute(path))
     return path;
   return base + "/" + path;
@@ -55,14 +56,14 @@
 
 namespace google_breakpad {
 
-void DwarfLineToModule::DefineDir(const string &name, uint32 dir_num) {
+void DwarfLineToModule::DefineDir(const std::string &name, uint32 dir_num) {
   // Directory number zero is reserved to mean the compilation
   // directory. Silently ignore attempts to redefine it.
   if (dir_num != 0)
     directories_dir_num = name;
 }
 
-void DwarfLineToModule::DefineFile(const string &name, int32 file_num,
+void DwarfLineToModule::DefineFile(const std::string &name, int32 file_num,
                                    uint32 dir_num, uint64 mod_time,
                                    uint64 length) {
   if (file_num == -1)

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/dwarf_line_to_module_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/dwarf_line_to_module_unittest.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/language.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/language.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/dump_symbols.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/dump_symbols.cc Changed

@@ -1,4 +1,4 @@
-// Copyright (c) 2010 Google Inc.
+// Copyright (c) 2011 Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -226,7 +226,7 @@
   explicit DumperLineToModule(dwarf2reader::ByteReader *byte_reader)
       : byte_reader_(byte_reader) { }
   void operator()(const char *program, uint64 length,
-                  Module *module, vector<Module::Line> *lines) {
+                  Module *module, std::vector<Module::Line> *lines) {
     DwarfLineToModule handler(module, lines);
     dwarf2reader::LineInfo parser(program, length, byte_reader_, &handler);
     parser.Start();
@@ -235,7 +235,7 @@
   dwarf2reader::ByteReader *byte_reader_;
 };
 
-static bool LoadDwarf(const string &dwarf_filename,
+static bool LoadDwarf(const std::string &dwarf_filename,
                       const ElfW(Ehdr) *elf_header,
                       const bool big_endian,
                       Module *module) {
@@ -253,8 +253,8 @@
   const ElfW(Shdr) *section_names = sections + elf_header->e_shstrndx;
   for (int i = 0; i < num_sections; i++) {
     const ElfW(Shdr) *section = &sectionsi;
-    string name = reinterpret_cast<const char *>(section_names->sh_offset
-                                                 + section->sh_name);
+    std::string name = reinterpret_cast<const char *>(section_names->sh_offset +
+                                                      section->sh_name);
     const char *contents = reinterpret_cast<const char *>(section->sh_offset);
     uint64 length = section->sh_size;
     file_context.section_mapname = std::make_pair(contents, length);
@@ -292,7 +292,7 @@
 // success, or false if we don't recognize HEADER's machine
 // architecture.
 static bool DwarfCFIRegisterNames(const ElfW(Ehdr) *elf_header,
-                                  vector<string> *register_names) {
+                                  std::vector<std::string> *register_names) {
   switch (elf_header->e_machine) {
     case EM_386:
       *register_names = DwarfCFIToModule::RegisterNames::I386();
@@ -308,7 +308,7 @@
   }
 }
 
-static bool LoadDwarfCFI(const string &dwarf_filename,
+static bool LoadDwarfCFI(const std::string &dwarf_filename,
                          const ElfW(Ehdr) *elf_header,
                          const char *section_name,
                          const ElfW(Shdr) *section,
@@ -319,7 +319,7 @@
                          Module *module) {
   // Find the appropriate set of register names for this file's
   // architecture.
-  vector<string> register_names;
+  std::vector<std::string> register_names;
   if (!DwarfCFIRegisterNames(elf_header, &register_names)) {
     fprintf(stderr, "%s: unrecognized ELF machine architecture '%d';"
             " cannot convert DWARF call frame information\n",
@@ -728,6 +728,7 @@
 bool WriteSymbolFileInternal(uint8_t* obj_file,
                              const std::string &obj_filename,
                              const std::string &debug_dir,
+                             bool cfi,
                              std::ostream &sym_stream) {
   ElfW(Ehdr) *elf_header = reinterpret_cast<ElfW(Ehdr) *>(obj_file);
 
@@ -803,7 +804,7 @@
       return false;
     }
   }
-  if (!module.Write(sym_stream))
+  if (!module.Write(sym_stream, cfi))
     return false;
 
   return true;
@@ -811,6 +812,7 @@
 
 bool WriteSymbolFile(const std::string &obj_file,
                      const std::string &debug_dir,
+                     bool cfi,
                      std::ostream &sym_stream) {
   MmapWrapper map_wrapper;
   ElfW(Ehdr) *elf_header = NULL;
@@ -818,7 +820,7 @@
     return false;
 
   return WriteSymbolFileInternal(reinterpret_cast<uint8_t*>(elf_header),
-                                 obj_file, debug_dir, sym_stream);
+                                 obj_file, debug_dir, cfi, sym_stream);
 }
 
 }  // namespace google_breakpad

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/dump_symbols.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/dump_symbols.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/dump_symbols_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/dump_symbols_unittest.cc Changed

@@ -47,6 +47,7 @@
 bool WriteSymbolFileInternal(uint8_t* obj_file,
                              const std::string &obj_filename,
                              const std::string &debug_dir,
+                             bool cfi,
                              std::ostream &sym_stream);
 }
 
@@ -62,7 +63,7 @@
 using ::testing::Test;
 
 class DumpSymbols : public Test {
-public:
+ public:
   void GetElfContents(ELF& elf) {
     string contents;
     ASSERT_TRUE(elf.GetContents(&contents));
@@ -84,6 +85,7 @@
   EXPECT_FALSE(WriteSymbolFileInternal(reinterpret_cast<uint8_t*>(&header),
                                        "foo",
                                        "",
+                                       true,
                                        s));
 }
 
@@ -105,11 +107,11 @@
                  SHN_UNDEF + 1);
   int index = elf.AddSection(".dynstr", table, SHT_STRTAB);
   elf.AddSection(".dynsym", syms,
-                 SHT_DYNSYM, // type
-                 SHF_ALLOC,  // flags
-                 0,          // addr
-                 index,      // link
-                 sizeof(Elf32_Sym)); // entsize
+                 SHT_DYNSYM,          // type
+                 SHF_ALLOC,           // flags
+                 0,                   // addr
+                 index,               // link
+                 sizeof(Elf32_Sym));  // entsize
 
   elf.Finish();
   GetElfContents(elf);
@@ -118,6 +120,7 @@
   ASSERT_TRUE(WriteSymbolFileInternal(elfdata,
                                       "foo",
                                       "",
+                                      true,
                                       s));
   EXPECT_EQ("MODULE Linux x86 000000000000000000000000000000000 foo\n"
             "PUBLIC 1000 0 superfunc\n",
@@ -141,11 +144,11 @@
                  SHN_UNDEF + 1);
   int index = elf.AddSection(".dynstr", table, SHT_STRTAB);
   elf.AddSection(".dynsym", syms,
-                 SHT_DYNSYM, // type
-                 SHF_ALLOC,  // flags
-                 0,          // addr
-                 index,      // link
-                 sizeof(Elf64_Sym)); // entsize
+                 SHT_DYNSYM,          // type
+                 SHF_ALLOC,           // flags
+                 0,                   // addr
+                 index,               // link
+                 sizeof(Elf64_Sym));  // entsize
 
   elf.Finish();
   GetElfContents(elf);
@@ -154,6 +157,7 @@
   ASSERT_TRUE(WriteSymbolFileInternal(elfdata,
                                       "foo",
                                       "",
+                                      true,
                                       s));
   EXPECT_EQ("MODULE Linux x86_64 000000000000000000000000000000000 foo\n"
             "PUBLIC 1000 0 superfunc\n",

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/elf_core_dump.cc Added

@@ -0,0 +1,179 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// elf_core_dump.cc: Implement google_breakpad::ElfCoreDump.
+// See elf_core_dump.h for details.
+
+#include "common/linux/elf_core_dump.h"
+
+#include <stddef.h>
+#include <string.h>
+
+namespace google_breakpad {
+
+// Implementation of ElfCoreDump::Note.
+
+ElfCoreDump::Note::Note() {}
+
+ElfCoreDump::Note::Note(const MemoryRange& content) : content_(content) {}
+
+bool ElfCoreDump::Note::IsValid() const {
+  return GetHeader() != NULL;
+}
+
+const ElfCoreDump::Nhdr* ElfCoreDump::Note::GetHeader() const {
+  return content_.GetData<Nhdr>(0);
+}
+
+ElfCoreDump::Word ElfCoreDump::Note::GetType() const {
+  const Nhdr* header = GetHeader();
+  // 0 is not being used as a NOTE type.
+  return header ? header->n_type : 0;
+}
+
+MemoryRange ElfCoreDump::Note::GetName() const {
+  const Nhdr* header = GetHeader();
+  if (header) {
+      return content_.Subrange(sizeof(Nhdr), header->n_namesz);
+  }
+  return MemoryRange();
+}
+
+MemoryRange ElfCoreDump::Note::GetDescription() const {
+  const Nhdr* header = GetHeader();
+  if (header) {
+    return content_.Subrange(AlignedSize(sizeof(Nhdr) + header->n_namesz),
+                             header->n_descsz);
+  }
+  return MemoryRange();
+}
+
+ElfCoreDump::Note ElfCoreDump::Note::GetNextNote() const {
+  MemoryRange next_content;
+  const Nhdr* header = GetHeader();
+  if (header) {
+    size_t next_offset = AlignedSize(sizeof(Nhdr) + header->n_namesz);
+    next_offset = AlignedSize(next_offset + header->n_descsz);
+    next_content =
+        content_.Subrange(next_offset, content_.length() - next_offset);
+  }
+  return Note(next_content);
+}
+
+// static
+size_t ElfCoreDump::Note::AlignedSize(size_t size) {
+  size_t mask = sizeof(Word) - 1;
+  return (size + mask) & ~mask;
+}
+
+
+// Implementation of ElfCoreDump.
+
+ElfCoreDump::ElfCoreDump() {}
+
+ElfCoreDump::ElfCoreDump(const MemoryRange& content)
+    : content_(content) {
+}
+
+void ElfCoreDump::SetContent(const MemoryRange& content) {
+  content_ = content;
+}
+
+bool ElfCoreDump::IsValid() const {
+  const Ehdr* header = GetHeader();
+  return (header &&
+          header->e_ident0 == ELFMAG0 &&
+          header->e_ident1 == ELFMAG1 &&
+          header->e_ident2 == ELFMAG2 &&
+          header->e_ident3 == ELFMAG3 &&
+          header->e_ident4 == kClass &&
+          header->e_version == EV_CURRENT &&
+          header->e_type == ET_CORE);
+}
+
+const ElfCoreDump::Ehdr* ElfCoreDump::GetHeader() const {
+  return content_.GetData<Ehdr>(0);
+}
+
+const ElfCoreDump::Phdr* ElfCoreDump::GetProgramHeader(unsigned index) const {
+  const Ehdr* header = GetHeader();
+  if (header) {
+    return reinterpret_cast<const Phdr*>(content_.GetArrayElement(
+        header->e_phoff, header->e_phentsize, index));
+  }
+  return NULL;
+}
+
+const ElfCoreDump::Phdr* ElfCoreDump::GetFirstProgramHeaderOfType(
+    Word type) const {
+  for (unsigned i = 0, n = GetProgramHeaderCount(); i < n; ++i) {
+    const Phdr* program = GetProgramHeader(i);
+    if (program->p_type == type) {
+      return program;
+    }
+  }
+  return NULL;
+}
+
+unsigned ElfCoreDump::GetProgramHeaderCount() const {
+  const Ehdr* header = GetHeader();
+  return header ? header->e_phnum : 0;
+}
+
+bool ElfCoreDump::CopyData(void* buffer, Addr virtual_address, size_t length) {
+  for (unsigned i = 0, n = GetProgramHeaderCount(); i < n; ++i) {
+    const Phdr* program = GetProgramHeader(i);
+    if (program->p_type != PT_LOAD)
+      continue;
+
+    size_t offset_in_segment = virtual_address - program->p_vaddr;
+    if (virtual_address >= program->p_vaddr &&
+        offset_in_segment < program->p_filesz) {
+      const void* data =
+          content_.GetData(program->p_offset + offset_in_segment, length);
+      if (data) {
+        memcpy(buffer, data, length);
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+ElfCoreDump::Note ElfCoreDump::GetFirstNote() const {
+  MemoryRange note_content;
+  const Phdr* program_header = GetFirstProgramHeaderOfType(PT_NOTE);
+  if (program_header) {
+    note_content = content_.Subrange(program_header->p_offset,
+                                     program_header->p_filesz);
+  }
+  return Note(note_content);
+}
+
+}  // namespace google_breakpad

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/elf_core_dump.h Added

@@ -0,0 +1,153 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// elf_core_dump.h: Define the google_breakpad::ElfCoreDump class, which
+// encapsulates an ELF core dump file mapped into memory.
+
+#ifndef COMMON_LINUX_ELF_CORE_DUMP_H_
+#define COMMON_LINUX_ELF_CORE_DUMP_H_
+
+#include <elf.h>
+#if !defined(__ANDROID__)
+#include <link.h>
+#endif
+#include <stddef.h>
+
+#include "common/memory_range.h"
+#if defined(__ANDROID__)
+#include "common/linux/android_link.h"
+#endif
+
+namespace google_breakpad {
+
+// A class encapsulating an ELF core dump file mapped into memory, which
+// provides methods for accessing program headers and the note section.
+class ElfCoreDump {
+ public:
+  // ELF types based on the value of __WORDSIZE.
+  typedef ElfW(Ehdr) Ehdr;
+  typedef ElfW(Nhdr) Nhdr;
+  typedef ElfW(Phdr) Phdr;
+  typedef ElfW(Word) Word;
+  typedef ElfW(Addr) Addr;
+#if __WORDSIZE == 32
+  static const int kClass = ELFCLASS32;
+#elif __WORDSIZE == 64
+  static const int kClass = ELFCLASS64;
+#else
+#error "Unsupported __WORDSIZE for ElfCoreDump."
+#endif
+
+  // A class encapsulating the note content in a core dump, which provides
+  // methods for accessing the name and description of a note.
+  class Note {
+   public:
+    Note();
+
+    // Constructor that takes the note content from |content|.
+    explicit Note(const MemoryRange& content);
+
+    // Returns true if this note is valid, i,e. a note header is found in
+    // |content_|, or false otherwise.
+    bool IsValid() const;
+
+    // Returns the note header, or NULL if no note header is found in
+    // |content_|.
+    const Nhdr* GetHeader() const;
+
+    // Returns the note type, or 0 if no note header is found in |content_|.
+    Word GetType() const;
+
+    // Returns a memory range covering the note name, or an empty range
+    // if no valid note name is found in |content_|.
+    MemoryRange GetName() const;
+
+    // Returns a memory range covering the note description, or an empty
+    // range if no valid note description is found in |content_|.
+    MemoryRange GetDescription() const;
+
+    // Returns the note following this note, or an empty note if no valid
+    // note is found after this note.
+    Note GetNextNote() const;
+
+   private:
+    // Returns the size in bytes round up to the word alignment, specified
+    // for the note section, of a given size in bytes.
+    static size_t AlignedSize(size_t size);
+
+    // Note content.
+    MemoryRange content_;
+  };
+
+  ElfCoreDump();
+
+  // Constructor that takes the core dump content from |content|.
+  explicit ElfCoreDump(const MemoryRange& content);
+
+  // Sets the core dump content to |content|.
+  void SetContent(const MemoryRange& content);
+
+  // Returns true if a valid ELF header in the core dump, or false otherwise.
+  bool IsValid() const;
+
+  // Returns the ELF header in the core dump, or NULL if no ELF header
+  // is found in |content_|.
+  const Ehdr* GetHeader() const;
+
+  // Returns the |index|-th program header in the core dump, or NULL if no
+  // ELF header is found in |content_| or |index| is out of bounds.
+  const Phdr* GetProgramHeader(unsigned index) const;
+
+  // Returns the first program header of |type| in the core dump, or NULL if
+  // no ELF header is found in |content_| or no program header of |type| is
+  // found.
+  const Phdr* GetFirstProgramHeaderOfType(Word type) const;
+
+  // Returns the number of program headers in the core dump, or 0 if no
+  // ELF header is found in |content_|.
+  unsigned GetProgramHeaderCount() const;
+
+  // Copies |length| bytes of data starting at |virtual_address| in the core
+  // dump to |buffer|. |buffer| should be a valid pointer to a buffer of at
+  // least |length| bytes. Returns true if the data to be copied is found in
+  // the core dump, or false otherwise.
+  bool CopyData(void* buffer, Addr virtual_address, size_t length);
+
+  // Returns the first note found in the note section of the core dump, or
+  // an empty note if no note is found.
+  Note GetFirstNote() const;
+
+ private:
+  // Core dump content.
+  MemoryRange content_;
+};
+
+}  // namespace google_breakpad
+
+#endif  // COMMON_LINUX_ELF_CORE_DUMP_H_

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/elf_core_dump_unittest.cc Added

@@ -0,0 +1,245 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// elf_core_dump_unittest.cc: Unit tests for google_breakpad::ElfCoreDump.
+
+#include <sys/procfs.h>
+
+#include <set>
+#include <string>
+
+#include "breakpad_googletest_includes.h"
+#include "common/linux/elf_core_dump.h"
+#include "common/linux/memory_mapped_file.h"
+#include "common/tests/file_utils.h"
+#include "common/linux/tests/crash_generator.h"
+
+using google_breakpad::AutoTempDir;
+using google_breakpad::CrashGenerator;
+using google_breakpad::ElfCoreDump;
+using google_breakpad::MemoryMappedFile;
+using google_breakpad::MemoryRange;
+using google_breakpad::WriteFile;
+using std::set;
+using std::string;
+
+TEST(ElfCoreDumpTest, DefaultConstructor) {
+  ElfCoreDump core;
+  EXPECT_FALSE(core.IsValid());
+  EXPECT_EQ(NULL, core.GetHeader());
+  EXPECT_EQ(0, core.GetProgramHeaderCount());
+  EXPECT_EQ(NULL, core.GetProgramHeader(0));
+  EXPECT_EQ(NULL, core.GetFirstProgramHeaderOfType(PT_LOAD));
+  EXPECT_FALSE(core.GetFirstNote().IsValid());
+}
+
+TEST(ElfCoreDumpTest, TestElfHeader) {
+  ElfCoreDump::Ehdr header;
+  memset(&header, 0, sizeof(header));
+
+  AutoTempDir temp_dir;
+  string core_path = temp_dir.path() + "/core";
+  const char* core_file = core_path.c_str();
+  MemoryMappedFile mapped_core_file;
+  ElfCoreDump core;
+
+  ASSERT_TRUE(WriteFile(core_file, &header, sizeof(header) - 1));
+  ASSERT_TRUE(mapped_core_file.Map(core_file));
+  core.SetContent(mapped_core_file.content());
+  EXPECT_FALSE(core.IsValid());
+  EXPECT_EQ(NULL, core.GetHeader());
+  EXPECT_EQ(0, core.GetProgramHeaderCount());
+  EXPECT_EQ(NULL, core.GetProgramHeader(0));
+  EXPECT_EQ(NULL, core.GetFirstProgramHeaderOfType(PT_LOAD));
+  EXPECT_FALSE(core.GetFirstNote().IsValid());
+
+  ASSERT_TRUE(WriteFile(core_file, &header, sizeof(header)));
+  ASSERT_TRUE(mapped_core_file.Map(core_file));
+  core.SetContent(mapped_core_file.content());
+  EXPECT_FALSE(core.IsValid());
+
+  header.e_ident0 = ELFMAG0;
+  ASSERT_TRUE(WriteFile(core_file, &header, sizeof(header)));
+  ASSERT_TRUE(mapped_core_file.Map(core_file));
+  core.SetContent(mapped_core_file.content());
+  EXPECT_FALSE(core.IsValid());
+
+  header.e_ident1 = ELFMAG1;
+  ASSERT_TRUE(WriteFile(core_file, &header, sizeof(header)));
+  ASSERT_TRUE(mapped_core_file.Map(core_file));
+  core.SetContent(mapped_core_file.content());
+  EXPECT_FALSE(core.IsValid());
+
+  header.e_ident2 = ELFMAG2;
+  ASSERT_TRUE(WriteFile(core_file, &header, sizeof(header)));
+  ASSERT_TRUE(mapped_core_file.Map(core_file));
+  core.SetContent(mapped_core_file.content());
+  EXPECT_FALSE(core.IsValid());
+
+  header.e_ident3 = ELFMAG3;
+  ASSERT_TRUE(WriteFile(core_file, &header, sizeof(header)));
+  ASSERT_TRUE(mapped_core_file.Map(core_file));
+  core.SetContent(mapped_core_file.content());
+  EXPECT_FALSE(core.IsValid());
+
+  header.e_ident4 = ElfCoreDump::kClass;
+  ASSERT_TRUE(WriteFile(core_file, &header, sizeof(header)));
+  ASSERT_TRUE(mapped_core_file.Map(core_file));
+  core.SetContent(mapped_core_file.content());
+  EXPECT_FALSE(core.IsValid());
+
+  header.e_version = EV_CURRENT;
+  ASSERT_TRUE(WriteFile(core_file, &header, sizeof(header)));
+  ASSERT_TRUE(mapped_core_file.Map(core_file));
+  core.SetContent(mapped_core_file.content());
+  EXPECT_FALSE(core.IsValid());
+
+  header.e_type = ET_CORE;
+  ASSERT_TRUE(WriteFile(core_file, &header, sizeof(header)));
+  ASSERT_TRUE(mapped_core_file.Map(core_file));
+  core.SetContent(mapped_core_file.content());
+  EXPECT_TRUE(core.IsValid());
+}
+
+TEST(ElfCoreDumpTest, ValidCoreFile) {
+  CrashGenerator crash_generator;
+  if (!crash_generator.HasDefaultCorePattern()) {
+    fprintf(stderr, "ElfCoreDumpTest.ValidCoreFile test is skipped "
+            "due to non-default core pattern");
+    return;
+  }
+
+  const unsigned kNumOfThreads = 3;
+  const unsigned kCrashThread = 1;
+  const int kCrashSignal = SIGABRT;
+  // TODO(benchan): Revert to use ASSERT_TRUE once the flakiness in
+  // CrashGenerator is identified and fixed.
+  if (!crash_generator.CreateChildCrash(kNumOfThreads, kCrashThread,
+                                        kCrashSignal, NULL)) {
+    fprintf(stderr, "ElfCoreDumpTest.ValidCoreFile test is skipped "
+            "due to no core dump generated");
+    return;
+  }
+  pid_t expected_crash_thread_id = crash_generator.GetThreadId(kCrashThread);
+  set<pid_t> expected_thread_ids;
+  for (unsigned i = 0; i < kNumOfThreads; ++i) {
+    expected_thread_ids.insert(crash_generator.GetThreadId(i));
+  }
+
+  MemoryMappedFile mapped_core_file;
+  ASSERT_TRUE(mapped_core_file.Map(crash_generator.GetCoreFilePath().c_str()));
+
+  ElfCoreDump core;
+  core.SetContent(mapped_core_file.content());
+  EXPECT_TRUE(core.IsValid());
+
+  // Based on write_note_info() in linux/kernel/fs/binfmt_elf.c, notes are
+  // ordered as follows (NT_PRXFPREG and NT_386_TLS are i386 specific):
+  //   Thread           Name          Type
+  //   -------------------------------------------------------------------
+  //   1st thread       CORE          NT_PRSTATUS
+  //   process-wide     CORE          NT_PRPSINFO
+  //   process-wide     CORE          NT_AUXV
+  //   1st thread       CORE          NT_FPREGSET
+  //   1st thread       LINUX         NT_PRXFPREG
+  //   1st thread       LINUX         NT_386_TLS
+  //
+  //   2nd thread       CORE          NT_PRSTATUS
+  //   2nd thread       CORE          NT_FPREGSET
+  //   2nd thread       LINUX         NT_PRXFPREG
+  //   2nd thread       LINUX         NT_386_TLS
+  //
+  //   3rd thread       CORE          NT_PRSTATUS
+  //   3rd thread       CORE          NT_FPREGSET
+  //   3rd thread       LINUX         NT_PRXFPREG
+  //   3rd thread       LINUX         NT_386_TLS
+
+  size_t num_nt_prpsinfo = 0;
+  size_t num_nt_prstatus = 0;
+  size_t num_nt_fpregset = 0;
+  size_t num_nt_prxfpreg = 0;
+  set<pid_t> actual_thread_ids;
+  ElfCoreDump::Note note = core.GetFirstNote();
+  while (note.IsValid()) {
+    MemoryRange name = note.GetName();
+    MemoryRange description = note.GetDescription();
+    EXPECT_FALSE(name.IsEmpty());
+    EXPECT_FALSE(description.IsEmpty());
+
+    switch (note.GetType()) {
+      case NT_PRPSINFO: {
+        EXPECT_TRUE(description.data() != NULL);
+        EXPECT_EQ(sizeof(elf_prpsinfo), description.length());
+        ++num_nt_prpsinfo;
+        break;
+      }
+      case NT_PRSTATUS: {
+        EXPECT_TRUE(description.data() != NULL);
+        EXPECT_EQ(sizeof(elf_prstatus), description.length());
+        const elf_prstatus* status = description.GetData<elf_prstatus>(0);
+        actual_thread_ids.insert(status->pr_pid);
+        if (num_nt_prstatus == 0) {
+          EXPECT_EQ(expected_crash_thread_id, status->pr_pid);
+          EXPECT_EQ(kCrashSignal, status->pr_info.si_signo);
+        }
+        ++num_nt_prstatus;
+        break;
+      }
+#if defined(__i386) || defined(__x86_64)
+      case NT_FPREGSET: {
+        EXPECT_TRUE(description.data() != NULL);
+        EXPECT_EQ(sizeof(user_fpregs_struct), description.length());
+        ++num_nt_fpregset;
+        break;
+      }
+#endif
+#if defined(__i386)
+      case NT_PRXFPREG: {
+        EXPECT_TRUE(description.data() != NULL);
+        EXPECT_EQ(sizeof(user_fpxregs_struct), description.length());
+        ++num_nt_prxfpreg;
+        break;
+      }
+#endif
+      default:
+        break;
+    }
+    note = note.GetNextNote();
+  }
+
+  EXPECT_TRUE(expected_thread_ids == actual_thread_ids);
+  EXPECT_EQ(1, num_nt_prpsinfo);
+  EXPECT_EQ(kNumOfThreads, num_nt_prstatus);
+#if defined(__i386) || defined(__x86_64)
+  EXPECT_EQ(kNumOfThreads, num_nt_fpregset);
+#endif
+#if defined(__i386)
+  EXPECT_EQ(kNumOfThreads, num_nt_prxfpreg);
+#endif
+}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/file_id.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/file_id.cc Changed

@@ -36,22 +36,19 @@
 
 #include <arpa/inet.h>
 #include <assert.h>
-#include <elf.h>
-#include <fcntl.h>
 #if defined(__ANDROID__)
+#include <linux/elf.h>
 #include "client/linux/android_link.h"
 #else
+#include <elf.h>
 #include <link.h>
 #endif
-#include <stdio.h>
 #include <string.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <unistd.h>
 
 #include <algorithm>
 
 #include "common/linux/linux_libc_support.h"
+#include "common/linux/memory_mapped_file.h"
 #include "third_party/lss/linux_syscall_support.h"
 
 namespace google_breakpad {
@@ -107,10 +104,10 @@
   const Shdr* section = NULL;
   for (int i = 0; i < elf_header->e_shnum; ++i) {
     if (sectionsi.sh_type == section_type) {
-      const char* section_name = (char*)(elf_base +
-                                         string_section->sh_offset +
-                                         sectionsi.sh_name);
-      if (!my_strncmp(section_name, section_name, name_len)) {
+      const char* current_section_name = (char*)(elf_base +
+                                                 string_section->sh_offset +
+                                                 sectionsi.sh_name);
+      if (!my_strncmp(current_section_name, section_name, name_len)) {
         section = &sectionsi;
         break;
       }
@@ -166,8 +163,7 @@
 
 template<typename ElfClass>
 static bool ElfClassBuildIDNoteIdentifier(const void *section,
-                                          uint8_t identifierkMDGUIDSize)
-{
+                                          uint8_t identifierkMDGUIDSize) {
   typedef typename ElfClass::Nhdr Nhdr;
 
   const Nhdr* note_header = reinterpret_cast<const Nhdr*>(section);
@@ -190,8 +186,7 @@
 // Attempt to locate a .note.gnu.build-id section in an ELF binary
 // and copy as many bytes of it as will fit into |identifier|.
 static bool FindElfBuildIDNote(const void *elf_mapped_base,
-                               uint8_t identifierkMDGUIDSize)
-{
+                               uint8_t identifierkMDGUIDSize) {
   void* note_section;
   int note_size, elfclass;
   if (!FindElfSection(elf_mapped_base, ".note.gnu.build-id", SHT_NOTE,
@@ -213,7 +208,6 @@
 // a simple hash by XORing the first page worth of bytes into |identifier|.
 static bool HashElfTextSection(const void *elf_mapped_base,
                                uint8_t identifierkMDGUIDSize) {
-
   void* text_section;
   int text_size;
   if (!FindElfSection(elf_mapped_base, ".text", SHT_PROGBITS,
@@ -234,9 +228,8 @@
 }
 
 // static
-bool FileID::ElfFileIdentifierFromMappedFile(void* base,
-                                             uint8_t identifierkMDGUIDSize)
-{
+bool FileID::ElfFileIdentifierFromMappedFile(const void* base,
+                                             uint8_t identifierkMDGUIDSize) {
   // Look for a build id note first.
   if (FindElfBuildIDNote(base, identifier))
     return true;
@@ -246,23 +239,11 @@
 }
 
 bool FileID::ElfFileIdentifier(uint8_t identifierkMDGUIDSize) {
-  int fd = open(path_, O_RDONLY);
-  if (fd < 0)
-    return false;
-  struct stat st;
-  if (fstat(fd, &st) != 0) {
-    close(fd);
-    return false;
-  }
-  void* base = mmap(NULL, st.st_size,
-                    PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-  close(fd);
-  if (base == MAP_FAILED)
+  MemoryMappedFile mapped_file(path_);
+  if (!mapped_file.data())  // Should probably check if size >= ElfW(Ehdr)?
     return false;
 
-  bool success = ElfFileIdentifierFromMappedFile(base, identifier);
-  munmap(base, st.st_size);
-  return success;
+  return ElfFileIdentifierFromMappedFile(mapped_file.data(), identifier);
 }
 
 // static

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/file_id.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/file_id.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/file_id_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/file_id_unittest.cc Changed

@@ -33,39 +33,52 @@
 #include <stdlib.h>
 
 #include "common/linux/file_id.h"
+#include "common/linux/safe_readlink.h"
 #include "common/linux/synth_elf.h"
 #include "common/test_assembler.h"
+#include "common/tests/auto_tempdir.h"
 #include "breakpad_googletest_includes.h"
 
 using namespace google_breakpad;
+using google_breakpad::SafeReadLink;
 using google_breakpad::synth_elf::BuildIDNote;
 using google_breakpad::synth_elf::ELF;
 using google_breakpad::test_assembler::kLittleEndian;
 using google_breakpad::test_assembler::Section;
 
+namespace {
+
+// Simply calling Section::Append(size, byte) produces a uninteresting pattern
+// that tends to get hashed to 0000...0000. This populates the section with
+// data to produce better hashes.
+void PopulateSection(Section* section, int size, int prime_number) {
+  for (int i = 0; i < size; i++)
+    section->Append(1, (i % prime_number) % 256);
+}
+
+}  // namespace
+
 TEST(FileIDStripTest, StripSelf) {
   // Calculate the File ID of this binary using
   // FileID::ElfFileIdentifier, then make a copy of this binary,
   // strip it, and ensure that the result is the same.
   char exe_namePATH_MAX;
-  ssize_t len = readlink("/proc/self/exe", exe_name, PATH_MAX - 1);
-  ASSERT_NE(len, -1);
-  exe_namelen = '\0';
+  ASSERT_TRUE(SafeReadLink("/proc/self/exe", exe_name));
 
   // copy our binary to a temp file, and strip it
-  char templ = "/tmp/file-id-unittest-XXXXXX";
-  mktemp(templ);
+  AutoTempDir temp_dir;
+  std::string templ = temp_dir.path() + "/file-id-unittest";
   char cmdline4096;
-  sprintf(cmdline, "cp \"%s\" \"%s\"", exe_name, templ);
+  sprintf(cmdline, "cp \"%s\" \"%s\"", exe_name, templ.c_str());
   ASSERT_EQ(system(cmdline), 0);
-  sprintf(cmdline, "strip \"%s\"", templ);
+  sprintf(cmdline, "strip \"%s\"", templ.c_str());
   ASSERT_EQ(system(cmdline), 0);
 
   uint8_t identifier1sizeof(MDGUID);
   uint8_t identifier2sizeof(MDGUID);
   FileID fileid1(exe_name);
   EXPECT_TRUE(fileid1.ElfFileIdentifier(identifier1));
-  FileID fileid2(templ);
+  FileID fileid2(templ.c_str());
   EXPECT_TRUE(fileid2.ElfFileIdentifier(identifier2));
   char identifier_string137;
   char identifier_string237;
@@ -74,7 +87,6 @@
   FileID::ConvertIdentifierToString(identifier2, identifier_string2,
                                     37);
   EXPECT_STREQ(identifier_string1, identifier_string2);
-  unlink(templ);
 }
 
 class FileIDTest : public testing::Test {
@@ -181,3 +193,92 @@
                                     sizeof(identifier_string));
   EXPECT_STREQ(expected_identifier_string, identifier_string);
 }
+
+// Test to make sure two files with different text sections produce
+// different hashes when not using a build id.
+TEST_F(FileIDTest, UniqueHashes32) {
+  char identifier_string_1 =
+    "00000000-0000-0000-0000-000000000000";
+  char identifier_string_2 =
+    "00000000-0000-0000-0000-000000000000";
+  uint8_t identifier_1sizeof(MDGUID);
+  uint8_t identifier_2sizeof(MDGUID);
+
+  {
+    ELF elf1(EM_386, ELFCLASS32, kLittleEndian);
+    Section foo_1(kLittleEndian);
+    PopulateSection(&foo_1, 32, 5);
+    elf1.AddSection(".foo", foo_1, SHT_PROGBITS);
+    Section text_1(kLittleEndian);
+    PopulateSection(&text_1, 4096, 17);
+    elf1.AddSection(".text", text_1, SHT_PROGBITS);
+    elf1.Finish();
+    GetElfContents(elf1);
+  }
+
+  EXPECT_TRUE(FileID::ElfFileIdentifierFromMappedFile(elfdata, identifier_1));
+  FileID::ConvertIdentifierToString(identifier_1, identifier_string_1,
+                                    sizeof(identifier_string_1));
+
+  {
+    ELF elf2(EM_386, ELFCLASS32, kLittleEndian);
+    Section text_2(kLittleEndian);
+    Section foo_2(kLittleEndian);
+    PopulateSection(&foo_2, 32, 5);
+    elf2.AddSection(".foo", foo_2, SHT_PROGBITS);
+    PopulateSection(&text_2, 4096, 31);
+    elf2.AddSection(".text", text_2, SHT_PROGBITS);
+    elf2.Finish();
+    GetElfContents(elf2);
+  }
+
+  EXPECT_TRUE(FileID::ElfFileIdentifierFromMappedFile(elfdata, identifier_2));
+  FileID::ConvertIdentifierToString(identifier_2, identifier_string_2,
+                                    sizeof(identifier_string_2));
+
+  EXPECT_STRNE(identifier_string_1, identifier_string_2);
+}
+
+// Same as UniqueHashes32, for x86-64.
+TEST_F(FileIDTest, UniqueHashes64) {
+  char identifier_string_1 =
+    "00000000-0000-0000-0000-000000000000";
+  char identifier_string_2 =
+    "00000000-0000-0000-0000-000000000000";
+  uint8_t identifier_1sizeof(MDGUID);
+  uint8_t identifier_2sizeof(MDGUID);
+
+  {
+    ELF elf1(EM_X86_64, ELFCLASS64, kLittleEndian);
+    Section foo_1(kLittleEndian);
+    PopulateSection(&foo_1, 32, 5);
+    elf1.AddSection(".foo", foo_1, SHT_PROGBITS);
+    Section text_1(kLittleEndian);
+    PopulateSection(&text_1, 4096, 17);
+    elf1.AddSection(".text", text_1, SHT_PROGBITS);
+    elf1.Finish();
+    GetElfContents(elf1);
+  }
+
+  EXPECT_TRUE(FileID::ElfFileIdentifierFromMappedFile(elfdata, identifier_1));
+  FileID::ConvertIdentifierToString(identifier_1, identifier_string_1,
+                                    sizeof(identifier_string_1));
+
+  {
+    ELF elf2(EM_X86_64, ELFCLASS64, kLittleEndian);
+    Section text_2(kLittleEndian);
+    Section foo_2(kLittleEndian);
+    PopulateSection(&foo_2, 32, 5);
+    elf2.AddSection(".foo", foo_2, SHT_PROGBITS);
+    PopulateSection(&text_2, 4096, 31);
+    elf2.AddSection(".text", text_2, SHT_PROGBITS);
+    elf2.Finish();
+    GetElfContents(elf2);
+  }
+
+  EXPECT_TRUE(FileID::ElfFileIdentifierFromMappedFile(elfdata, identifier_2));
+  FileID::ConvertIdentifierToString(identifier_2, identifier_string_2,
+                                    sizeof(identifier_string_2));
+
+  EXPECT_STRNE(identifier_string_1, identifier_string_2);
+}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/guid_creator.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/guid_creator.cc Changed

@@ -30,6 +30,7 @@
 #include "common/linux/guid_creator.h"
 
 #include <assert.h>
+#include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -45,10 +46,6 @@
 //
 class GUIDGenerator {
  public:
-  GUIDGenerator() {
-    srandom(time(NULL));
-  }
-
   static u_int32_t BytesToUInt32(const u_int8_t bytes) {
     return ((u_int32_t) bytes0
             | ((u_int32_t) bytes1 << 8)
@@ -63,7 +60,8 @@
     bytes3 = (n >> 24) & 0xff;
   }
 
-  bool CreateGUID(GUID *guid) const {
+  static bool CreateGUID(GUID *guid) {
+    InitOnce();
     guid->data1 = random();
     guid->data2 = (u_int16_t)(random());
     guid->data3 = (u_int16_t)(random());
@@ -71,13 +69,23 @@
     UInt32ToBytes(&guid->data44, random());
     return true;
   }
+
+ private:
+  static void InitOnce() {
+    pthread_once(&once_control, &InitOnceImpl);
+  }
+
+  static void InitOnceImpl() {
+    srandom(time(NULL));
+  }
+
+  static pthread_once_t once_control;
 };
 
-// Guid generator.
-const GUIDGenerator kGuidGenerator;
+pthread_once_t GUIDGenerator::once_control = PTHREAD_ONCE_INIT;
 
 bool CreateGUID(GUID *guid) {
-  return kGuidGenerator.CreateGUID(guid);
+  return GUIDGenerator::CreateGUID(guid);
 }
 
 // Parse guid to string.

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/http_upload.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/http_upload.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/http_upload.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/http_upload.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/linux_libc_support.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/linux_libc_support.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/linux/linux_libc_support_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/linux_libc_support_unittest.cc Changed

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/memory_mapped_file.cc Added

@@ -0,0 +1,108 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// memory_mapped_file.cc: Implement google_breakpad::MemoryMappedFile.
+// See memory_mapped_file.h for details.
+
+#include "common/linux/memory_mapped_file.h"
+
+#include <fcntl.h>
+#include <sys/mman.h>
+#if defined(__ANDROID__)
+#include <sys/stat.h>
+#endif
+#include <unistd.h>
+
+#include "common/memory_range.h"
+#include "third_party/lss/linux_syscall_support.h"
+
+namespace google_breakpad {
+
+MemoryMappedFile::MemoryMappedFile() {}
+
+MemoryMappedFile::MemoryMappedFile(const char* path) {
+  Map(path);
+}
+
+MemoryMappedFile::~MemoryMappedFile() {
+  Unmap();
+}
+
+bool MemoryMappedFile::Map(const char* path) {
+  Unmap();
+
+  int fd = sys_open(path, O_RDONLY, 0);
+  if (fd == -1) {
+    return false;
+  }
+
+#if defined(__ANDROID__)
+  struct stat st;
+  if (fstat(fd, &st) != 0) {
+#elif defined(__x86_64__)
+  struct kernel_stat st;
+  if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
+#else
+  struct kernel_stat64 st;
+  if (sys_fstat64(fd, &st) == -1 || st.st_size < 0) {
+#endif
+    sys_close(fd);
+    return false;
+  }
+
+  // If the file size is zero, simply use an empty MemoryRange and return
+  // true. Don't bother to call mmap() even though mmap() can handle an
+  // empty file on some platforms.
+  if (st.st_size == 0) {
+    sys_close(fd);
+    return true;
+  }
+
+#if defined(__x86_64__)
+  void* data = sys_mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+#else
+  void* data = sys_mmap2(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+#endif
+  sys_close(fd);
+  if (data == MAP_FAILED) {
+    return false;
+  }
+
+  content_.Set(data, st.st_size);
+  return true;
+}
+
+void MemoryMappedFile::Unmap() {
+  if (content_.data()) {
+    sys_munmap(const_cast<u_int8_t*>(content_.data()), content_.length());
+    content_.Set(NULL, 0);
+  }
+}
+
+}  // namespace google_breakpad

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/memory_mapped_file.h Added

@@ -0,0 +1,86 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// memory_mapped_file.h: Define the google_breakpad::MemoryMappedFile
+// class, which maps a file into memory for read-only access.
+
+#ifndef COMMON_LINUX_MEMORY_MAPPED_FILE_H_
+#define COMMON_LINUX_MEMORY_MAPPED_FILE_H_
+
+#include "common/basictypes.h"
+#include "common/memory_range.h"
+
+namespace google_breakpad {
+
+// A utility class for mapping a file into memory for read-only access of
+// the file content. Its implementation avoids calling into libc functions
+// by directly making system calls for open, close, mmap, and munmap.
+class MemoryMappedFile {
+ public:
+  MemoryMappedFile();
+
+  // Constructor that calls Map() to map a file at |path| into memory.
+  // If Map() fails, the object behaves as if it is default constructed.
+  explicit MemoryMappedFile(const char* path);
+
+  ~MemoryMappedFile();
+
+  // Maps a file at |path| into memory, which can then be accessed via
+  // content() as a MemoryRange object or via data(), and returns true on
+  // success. Mapping an empty file will succeed but with data() and size()
+  // returning NULL and 0, respectively. An existing mapping is unmapped
+  // before a new mapping is created.
+  bool Map(const char* path);
+
+  // Unmaps the memory for the mapped file. It's a no-op if no file is
+  // mapped.
+  void Unmap();
+
+  // Returns a MemoryRange object that covers the memory for the mapped
+  // file. The MemoryRange object is empty if no file is mapped.
+  const MemoryRange& content() const { return content_; }
+
+  // Returns a pointer to the beginning of the memory for the mapped file.
+  // or NULL if no file is mapped or the mapped file is empty.
+  const void* data() const { return content_.data(); }
+
+  // Returns the size in bytes of the mapped file, or zero if no file
+  // is mapped.
+  size_t size() const { return content_.length(); }
+
+ private:
+  // Mapped file content as a MemoryRange object.
+  MemoryRange content_;
+
+  DISALLOW_COPY_AND_ASSIGN(MemoryMappedFile);
+};
+
+}  // namespace google_breakpad
+
+#endif  // COMMON_LINUX_MEMORY_MAPPED_FILE_H_

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/memory_mapped_file_unittest.cc Added

@@ -0,0 +1,175 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// memory_mapped_file_unittest.cc:
+// Unit tests for google_breakpad::MemoryMappedFile.
+
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <string>
+
+#include "breakpad_googletest_includes.h"
+#include "common/linux/eintr_wrapper.h"
+#include "common/linux/memory_mapped_file.h"
+#include "common/tests/auto_tempdir.h"
+#include "common/tests/file_utils.h"
+
+using google_breakpad::AutoTempDir;
+using google_breakpad::MemoryMappedFile;
+using google_breakpad::WriteFile;
+using std::string;
+
+namespace {
+
+class MemoryMappedFileTest : public testing::Test {
+ protected:
+  void ExpectNoMappedData(const MemoryMappedFile& mapped_file) {
+    EXPECT_TRUE(mapped_file.content().IsEmpty());
+    EXPECT_TRUE(mapped_file.data() == NULL);
+    EXPECT_EQ(0, mapped_file.size());
+  }
+};
+
+}  // namespace
+
+TEST_F(MemoryMappedFileTest, DefaultConstructor) {
+  MemoryMappedFile mapped_file;
+  ExpectNoMappedData(mapped_file);
+}
+
+TEST_F(MemoryMappedFileTest, UnmapWithoutMap) {
+  MemoryMappedFile mapped_file;
+  mapped_file.Unmap();
+}
+
+TEST_F(MemoryMappedFileTest, MapNonexistentFile) {
+  {
+    MemoryMappedFile mapped_file("nonexistent-file");
+    ExpectNoMappedData(mapped_file);
+  }
+  {
+    MemoryMappedFile mapped_file;
+    EXPECT_FALSE(mapped_file.Map("nonexistent-file"));
+    ExpectNoMappedData(mapped_file);
+  }
+}
+
+TEST_F(MemoryMappedFileTest, MapEmptyFile) {
+  AutoTempDir temp_dir;
+  string test_file = temp_dir.path() + "/empty_file";
+  ASSERT_TRUE(WriteFile(test_file.c_str(), NULL, 0));
+
+  {
+    MemoryMappedFile mapped_file(test_file.c_str());
+    ExpectNoMappedData(mapped_file);
+  }
+  {
+    MemoryMappedFile mapped_file;
+    EXPECT_TRUE(mapped_file.Map(test_file.c_str()));
+    ExpectNoMappedData(mapped_file);
+  }
+}
+
+TEST_F(MemoryMappedFileTest, MapNonEmptyFile) {
+  char data256;
+  size_t data_size = sizeof(data);
+  for (size_t i = 0; i < data_size; ++i) {
+    datai = i;
+  }
+
+  AutoTempDir temp_dir;
+  string test_file = temp_dir.path() + "/test_file";
+  ASSERT_TRUE(WriteFile(test_file.c_str(), data, data_size));
+
+  {
+    MemoryMappedFile mapped_file(test_file.c_str());
+    EXPECT_FALSE(mapped_file.content().IsEmpty());
+    EXPECT_TRUE(mapped_file.data() != NULL);
+    EXPECT_EQ(data_size, mapped_file.size());
+    EXPECT_EQ(0, memcmp(data, mapped_file.data(), data_size));
+  }
+  {
+    MemoryMappedFile mapped_file;
+    EXPECT_TRUE(mapped_file.Map(test_file.c_str()));
+    EXPECT_FALSE(mapped_file.content().IsEmpty());
+    EXPECT_TRUE(mapped_file.data() != NULL);
+    EXPECT_EQ(data_size, mapped_file.size());
+    EXPECT_EQ(0, memcmp(data, mapped_file.data(), data_size));
+  }
+}
+
+TEST_F(MemoryMappedFileTest, RemapAfterMap) {
+  char data1256;
+  size_t data1_size = sizeof(data1);
+  for (size_t i = 0; i < data1_size; ++i) {
+    data1i = i;
+  }
+
+  char data250;
+  size_t data2_size = sizeof(data2);
+  for (size_t i = 0; i < data2_size; ++i) {
+    data2i = 255 - i;
+  }
+
+  AutoTempDir temp_dir;
+  string test_file1 = temp_dir.path() + "/test_file1";
+  string test_file2 = temp_dir.path() + "/test_file2";
+  ASSERT_TRUE(WriteFile(test_file1.c_str(), data1, data1_size));
+  ASSERT_TRUE(WriteFile(test_file2.c_str(), data2, data2_size));
+
+  {
+    MemoryMappedFile mapped_file(test_file1.c_str());
+    EXPECT_FALSE(mapped_file.content().IsEmpty());
+    EXPECT_TRUE(mapped_file.data() != NULL);
+    EXPECT_EQ(data1_size, mapped_file.size());
+    EXPECT_EQ(0, memcmp(data1, mapped_file.data(), data1_size));
+
+    mapped_file.Map(test_file2.c_str());
+    EXPECT_FALSE(mapped_file.content().IsEmpty());
+    EXPECT_TRUE(mapped_file.data() != NULL);
+    EXPECT_EQ(data2_size, mapped_file.size());
+    EXPECT_EQ(0, memcmp(data2, mapped_file.data(), data2_size));
+  }
+  {
+    MemoryMappedFile mapped_file;
+    EXPECT_TRUE(mapped_file.Map(test_file1.c_str()));
+    EXPECT_FALSE(mapped_file.content().IsEmpty());
+    EXPECT_TRUE(mapped_file.data() != NULL);
+    EXPECT_EQ(data1_size, mapped_file.size());
+    EXPECT_EQ(0, memcmp(data1, mapped_file.data(), data1_size));
+
+    mapped_file.Map(test_file2.c_str());
+    EXPECT_FALSE(mapped_file.content().IsEmpty());
+    EXPECT_TRUE(mapped_file.data() != NULL);
+    EXPECT_EQ(data2_size, mapped_file.size());
+    EXPECT_EQ(0, memcmp(data2, mapped_file.data(), data2_size));
+  }
+}

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/safe_readlink.cc Added

@@ -0,0 +1,53 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// safe_readlink.cc: Implement google_breakpad::SafeReadLink.
+// See safe_readlink.h for details.
+
+#include <stddef.h>
+
+#include "third_party/lss/linux_syscall_support.h"
+
+namespace google_breakpad {
+
+bool SafeReadLink(const char* path, char* buffer, size_t buffer_size) {
+  // sys_readlink() does not add a NULL byte to |buffer|. In order to return
+  // a NULL-terminated string in |buffer|, |buffer_size| should be at least
+  // one byte longer than the expected path length. Also, sys_readlink()
+  // returns the actual path length on success, which does not count the
+  // NULL byte, so |result_size| should be less than |buffer_size|.
+  ssize_t result_size = sys_readlink(path, buffer, buffer_size);
+  if (result_size >= 0 && static_cast<size_t>(result_size) < buffer_size) {
+    bufferresult_size = '\0';
+    return true;
+  }
+  return false;
+}
+
+}  // namespace google_breakpad

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/safe_readlink.h Added

@@ -0,0 +1,65 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// safe_readlink.h: Define the google_breakpad::SafeReadLink function,
+// which wraps sys_readlink and gurantees the result is NULL-terminated.
+
+#ifndef COMMON_LINUX_SAFE_READLINK_H_
+#define COMMON_LINUX_SAFE_READLINK_H_
+
+#include <stddef.h>
+
+namespace google_breakpad {
+
+// This function wraps sys_readlink() and performs the same functionalty,
+// but guarantees |buffer| is NULL-terminated if sys_readlink() returns
+// no error. It takes the same arguments as sys_readlink(), but unlike
+// sys_readlink(), it returns true on success.
+//
+// |buffer_size| specifies the size of |buffer| in bytes. As this function
+// always NULL-terminates |buffer| on success, |buffer_size| should be
+// at least one byte longer than the expected path length (e.g. PATH_MAX,
+// which is typically defined as the maximum length of a path name
+// including the NULL byte).
+//
+// The implementation of this function calls sys_readlink() instead of
+// readlink(), it can thus be used in the context where calling to libc
+// functions is discouraged.
+bool SafeReadLink(const char* path, char* buffer, size_t buffer_size);
+
+// Same as the three-argument version of SafeReadLink() but deduces the
+// size of |buffer| if it is a char array of known size.
+template <size_t N>
+bool SafeReadLink(const char* path, char (&buffer)N) {
+  return SafeReadLink(path, buffer, sizeof(buffer));
+}
+
+}  // namespace google_breakpad
+
+#endif  // COMMON_LINUX_SAFE_READLINK_H_

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/safe_readlink_unittest.cc Added

@@ -0,0 +1,89 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// safe_readlink_unittest.cc: Unit tests for google_breakpad::SafeReadLink.
+
+#include "breakpad_googletest_includes.h"
+#include "common/linux/safe_readlink.h"
+
+using google_breakpad::SafeReadLink;
+
+TEST(SafeReadLinkTest, ZeroBufferSize) {
+  char buffer1;
+  EXPECT_FALSE(SafeReadLink("/proc/self/exe", buffer, 0));
+}
+
+TEST(SafeReadLinkTest, BufferSizeTooSmall) {
+  char buffer1;
+  EXPECT_FALSE(SafeReadLink("/proc/self/exe", buffer, 1));
+}
+
+TEST(SafeReadLinkTest, BoundaryBufferSize) {
+  char bufferPATH_MAX;
+  EXPECT_TRUE(SafeReadLink("/proc/self/exe", buffer, sizeof(buffer)));
+  size_t path_length = strlen(buffer);
+  EXPECT_LT(0, path_length);
+  EXPECT_GT(sizeof(buffer), path_length);
+
+  // Buffer size equals to the expected path length plus 1 for the NULL byte.
+  char buffer2PATH_MAX;
+  EXPECT_TRUE(SafeReadLink("/proc/self/exe", buffer2, path_length + 1));
+  EXPECT_EQ(path_length, strlen(buffer2));
+  EXPECT_EQ(0, strncmp(buffer, buffer2, PATH_MAX));
+
+  // Buffer size equals to the expected path length.
+  EXPECT_FALSE(SafeReadLink("/proc/self/exe", buffer, path_length));
+}
+
+TEST(SafeReadLinkTest, NonexistentPath) {
+  char bufferPATH_MAX;
+  EXPECT_FALSE(SafeReadLink("nonexistent_path", buffer, sizeof(buffer)));
+}
+
+TEST(SafeReadLinkTest, NonSymbolicLinkPath) {
+  char actual_pathPATH_MAX;
+  EXPECT_TRUE(SafeReadLink("/proc/self/exe", actual_path, sizeof(actual_path)));
+
+  char bufferPATH_MAX;
+  EXPECT_FALSE(SafeReadLink(actual_path, buffer, sizeof(buffer)));
+}
+
+TEST(SafeReadLinkTest, DeduceBufferSizeFromCharArray) {
+  char bufferPATH_MAX;
+  char* buffer_pointer = buffer;
+  EXPECT_TRUE(SafeReadLink("/proc/self/exe", buffer_pointer, sizeof(buffer)));
+  size_t path_length = strlen(buffer);
+
+  // Use the template version of SafeReadLink to deduce the buffer size
+  // from the char array.
+  char buffer2PATH_MAX;
+  EXPECT_TRUE(SafeReadLink("/proc/self/exe", buffer2));
+  EXPECT_EQ(path_length, strlen(buffer2));
+  EXPECT_EQ(0, strncmp(buffer, buffer2, PATH_MAX));
+}

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/tests Added

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/tests/crash_generator.cc Added

@@ -0,0 +1,276 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// crash_generator.cc: Implement google_breakpad::CrashGenerator.
+// See crash_generator.h for details.
+
+#include "common/linux/tests/crash_generator.h"
+
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/syscall.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include <string>
+
+#include "common/linux/eintr_wrapper.h"
+#include "common/tests/auto_tempdir.h"
+#include "common/tests/file_utils.h"
+
+namespace {
+
+struct ThreadData {
+  pthread_t thread;
+  pthread_barrier_t* barrier;
+  pid_t* thread_id_ptr;
+};
+
+const char* const kProcFilesToCopy = {
+  "auxv", "cmdline", "environ", "maps", "status"
+};
+const size_t kNumProcFilesToCopy =
+    sizeof(kProcFilesToCopy) / sizeof(kProcFilesToCopy0);
+
+// Core file size limit set to 1 MB, which is big enough for test purposes.
+const rlim_t kCoreSizeLimit = 1024 * 1024;
+
+void *thread_function(void *data) {
+  ThreadData* thread_data = reinterpret_cast<ThreadData*>(data);
+  volatile pid_t thread_id = syscall(__NR_gettid);
+  *(thread_data->thread_id_ptr) = thread_id;
+  int result = pthread_barrier_wait(thread_data->barrier);
+  if (result != 0 && result != PTHREAD_BARRIER_SERIAL_THREAD) {
+    exit(1);
+  }
+  while (true) {
+    pthread_yield();
+  }
+}
+
+}  // namespace
+
+namespace google_breakpad {
+
+CrashGenerator::CrashGenerator()
+    : shared_memory_(NULL),
+      shared_memory_size_(0) {
+}
+
+CrashGenerator::~CrashGenerator() {
+  UnmapSharedMemory();
+}
+
+bool CrashGenerator::HasDefaultCorePattern() const {
+  char buffer8;
+  ssize_t buffer_size = sizeof(buffer);
+  return ReadFile("/proc/sys/kernel/core_pattern", buffer, &buffer_size) &&
+         buffer_size == 5 && memcmp(buffer, "core", 4) == 0;
+}
+
+std::string CrashGenerator::GetCoreFilePath() const {
+  return temp_dir_.path() + "/core";
+}
+
+std::string CrashGenerator::GetDirectoryOfProcFilesCopy() const {
+  return temp_dir_.path() + "/proc";
+}
+
+pid_t CrashGenerator::GetThreadId(unsigned index) const {
+  return reinterpret_cast<pid_t*>(shared_memory_)index;
+}
+
+pid_t* CrashGenerator::GetThreadIdPointer(unsigned index) {
+  return reinterpret_cast<pid_t*>(shared_memory_) + index;
+}
+
+bool CrashGenerator::MapSharedMemory(size_t memory_size) {
+  if (!UnmapSharedMemory())
+    return false;
+
+  void* mapped_memory = mmap(0, memory_size, PROT_READ | PROT_WRITE,
+                             MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+  if (mapped_memory == MAP_FAILED) {
+    perror("CrashGenerator: Failed to map shared memory");
+    return false;
+  }
+
+  memset(mapped_memory, 0, memory_size);
+  shared_memory_ = mapped_memory;
+  shared_memory_size_ = memory_size;
+  return true;
+}
+
+bool CrashGenerator::UnmapSharedMemory() {
+  if (!shared_memory_)
+    return true;
+
+  if (munmap(shared_memory_, shared_memory_size_) == 0) {
+    shared_memory_ = NULL;
+    shared_memory_size_ = 0;
+    return true;
+  }
+
+  perror("CrashGenerator: Failed to unmap shared memory");
+  return false;
+}
+
+bool CrashGenerator::SetCoreFileSizeLimit(rlim_t limit) const {
+  struct rlimit limits = { limit, limit };
+  if (setrlimit(RLIMIT_CORE, &limits) == -1) {
+    perror("CrashGenerator: Failed to set core file size limit");
+    return false;
+  }
+  return true;
+}
+
+bool CrashGenerator::CreateChildCrash(
+    unsigned num_threads, unsigned crash_thread, int crash_signal,
+    pid_t* child_pid) {
+  if (num_threads == 0 || crash_thread >= num_threads)
+    return false;
+
+  if (!MapSharedMemory(num_threads * sizeof(pid_t)))
+    return false;
+
+  pid_t pid = fork();
+  if (pid == 0) {
+    if (chdir(temp_dir_.path().c_str()) == -1) {
+      perror("CrashGenerator: Failed to change directory");
+      exit(1);
+    }
+    if (SetCoreFileSizeLimit(kCoreSizeLimit)) {
+      CreateThreadsInChildProcess(num_threads);
+      std::string proc_dir = GetDirectoryOfProcFilesCopy();
+      if (mkdir(proc_dir.c_str(), 0755) == -1) {
+        perror("CrashGenerator: Failed to create proc directory");
+        exit(1);
+      }
+      if (!CopyProcFiles(getpid(), proc_dir.c_str())) {
+        fprintf(stderr, "CrashGenerator: Failed to copy proc files\n");
+        exit(1);
+      }
+      if (kill(*GetThreadIdPointer(crash_thread), crash_signal) == -1) {
+        perror("CrashGenerator: Failed to kill thread by signal");
+      }
+    }
+    exit(1);
+  } else if (pid == -1) {
+    perror("CrashGenerator: Failed to create child process");
+    return false;
+  }
+
+  int status;
+  if (HANDLE_EINTR(waitpid(pid, &status, 0)) == -1) {
+    perror("CrashGenerator: Failed to wait for child process");
+    return false;
+  }
+  if (!WIFSIGNALED(status) || WTERMSIG(status) != crash_signal) {
+    fprintf(stderr, "CrashGenerator: Child process not killed by the expected signal\n"
+                    "  exit status=0x%x signaled=%s sig=%d expected=%d\n",
+                    status, WIFSIGNALED(status) ? "true" : "false",
+                    WTERMSIG(status), crash_signal);
+    return false;
+  }
+
+  if (child_pid)
+    *child_pid = pid;
+  return true;
+}
+
+bool CrashGenerator::CopyProcFiles(pid_t pid, const char* path) const {
+  char from_pathPATH_MAX, to_pathPATH_MAX;
+  for (size_t i = 0; i < kNumProcFilesToCopy; ++i) {
+    int num_chars = snprintf(from_path, PATH_MAX, "/proc/%d/%s",
+                             pid, kProcFilesToCopyi);
+    if (num_chars < 0 || num_chars >= PATH_MAX)
+      return false;
+
+    num_chars = snprintf(to_path, PATH_MAX, "%s/%s",
+                         path, kProcFilesToCopyi);
+    if (num_chars < 0 || num_chars >= PATH_MAX)
+      return false;
+
+    if (!CopyFile(from_path, to_path))
+      return false;
+  }
+  return true;
+}
+
+void CrashGenerator::CreateThreadsInChildProcess(unsigned num_threads) {
+  *GetThreadIdPointer(0) = getpid();
+
+  if (num_threads <= 1)
+    return;
+
+  // This method does not clean up any pthread resource, as the process
+  // is expected to be killed anyway.
+  ThreadData* thread_data = new ThreadDatanum_threads;
+
+  // Create detached threads so that we do not worry about pthread_join()
+  // later being called or not.
+  pthread_attr_t thread_attributes;
+  if (pthread_attr_init(&thread_attributes) != 0 ||
+      pthread_attr_setdetachstate(&thread_attributes,
+                                  PTHREAD_CREATE_DETACHED) != 0) {
+    fprintf(stderr, "CrashGenerator: Failed to initialize thread attribute\n");
+    exit(1);
+  }
+
+  pthread_barrier_t thread_barrier;
+  if (pthread_barrier_init(&thread_barrier, NULL, num_threads) != 0) {
+    fprintf(stderr, "CrashGenerator: Failed to initialize thread barrier\n");
+    exit(1);
+  }
+
+  for (unsigned i = 1; i < num_threads; ++i) {
+    thread_datai.barrier = &thread_barrier;
+    thread_datai.thread_id_ptr = GetThreadIdPointer(i);
+    if (pthread_create(&thread_datai.thread, &thread_attributes,
+                       thread_function, &thread_datai) != 0) {
+      fprintf(stderr, "CrashGenerator: Failed to create thread %d\n", i);
+      exit(1);
+    }
+  }
+
+  int result = pthread_barrier_wait(&thread_barrier);
+  if (result != 0 && result != PTHREAD_BARRIER_SERIAL_THREAD) {
+    fprintf(stderr, "CrashGenerator: Failed to wait for thread barrier\n");
+    exit(1);
+  }
+
+  pthread_barrier_destroy(&thread_barrier);
+  pthread_attr_destroy(&thread_attributes);
+  delete thread_data;
+}
+
+}  // namespace google_breakpad

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/linux/tests/crash_generator.h Added

@@ -0,0 +1,116 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// crash_generator.h: Define the google_breakpad::CrashGenerator class,
+// which is used to generate a crash (and a core dump file) for testing.
+
+#ifndef COMMON_LINUX_TESTS_CRASH_GENERATOR_H_
+#define COMMON_LINUX_TESTS_CRASH_GENERATOR_H_
+
+#include <sys/resource.h>
+
+#include <string>
+
+#include "common/tests/auto_tempdir.h"
+
+namespace google_breakpad {
+
+// A utility class for generating a crash (and a core dump file) for
+// testing. It creates a child process with the specified number of
+// threads, which is then termainated by the specified signal. A core
+// dump file is expected to be created upon the termination of the child
+// process, which can then be used for testing code that processes core
+// dump files.
+class CrashGenerator {
+ public:
+  CrashGenerator();
+
+  ~CrashGenerator();
+
+  // Returns true if a core dump file named 'core' will be generated in
+  // the current directory for a test that produces a crash by checking
+  // if /proc/sys/kernel/core_pattern has the default value 'core'.
+  bool HasDefaultCorePattern() const;
+
+  // Returns the expected path of the core dump file.
+  std::string GetCoreFilePath() const;
+
+  // Returns the directory of a copy of proc files of the child process.
+  std::string GetDirectoryOfProcFilesCopy() const;
+
+  // Creates a crash (and a core dump file) by creating a child process with
+  // |num_threads| threads, and the terminating the child process by sending
+  // a signal with number |crash_signal| to the |crash_thread|-th thread.
+  // Returns true on success.
+  bool CreateChildCrash(unsigned num_threads, unsigned crash_thread,
+                        int crash_signal, pid_t* child_pid);
+
+  // Returns the thread ID of the |index|-th thread in the child process.
+  // This method does not validate |index|.
+  pid_t GetThreadId(unsigned index) const;
+
+ private:
+  // Copies the following proc files of the process with |pid| to the directory
+  // at |path|: auxv, cmdline, environ, maps, status
+  // The directory must have been created. Returns true on success.
+  bool CopyProcFiles(pid_t pid, const char* path) const;
+
+  // Creates |num_threads| threads in the child process.
+  void CreateThreadsInChildProcess(unsigned num_threads);
+
+  // Sets the maximum size of core dump file (both the soft and hard limit)
+  // to |limit| bytes. Returns true on success.
+  bool SetCoreFileSizeLimit(rlim_t limit) const;
+
+  // Creates a shared memory of |memory_size| bytes for communicating thread
+  // IDs between the parent and child process. Returns true on success.
+  bool MapSharedMemory(size_t memory_size);
+
+  // Releases any shared memory created by MapSharedMemory(). Returns true on
+  // success.
+  bool UnmapSharedMemory();
+
+  // Returns the pointer to the thread ID of the |index|-th thread in the child
+  // process. This method does not validate |index|.
+  pid_t* GetThreadIdPointer(unsigned index);
+
+  // Temporary directory in which a core file is generated.
+  AutoTempDir temp_dir_;
+
+  // Shared memory for communicating thread IDs between the parent and
+  // child process.
+  void* shared_memory_;
+
+  // Number of bytes mapped for |shared_memory_|.
+  size_t shared_memory_size_;
+};
+
+}  // namespace google_breakpad
+
+#endif  // COMMON_LINUX_TESTS_CRASH_GENERATOR_H_

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/Breakpad.xcconfig -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/Breakpad.xcconfig Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/HTTPMultipartUpload.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/HTTPMultipartUpload.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/HTTPMultipartUpload.m -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/HTTPMultipartUpload.m Changed

@@ -32,6 +32,8 @@
 
 @interface HTTPMultipartUpload(PrivateMethods)
 - (NSString *)multipartBoundary;
+// Each of the following methods will append the starting multipart boundary,
+// but not the ending one.
 - (NSData *)formDataForKey:(NSString *)key value:(NSString *)value;
 - (NSData *)formDataForFileContents:(NSData *)contents name:(NSString *)name;
 - (NSData *)formDataForFile:(NSString *)file name:(NSString *)name;
@@ -67,11 +69,9 @@
   NSString *fmt = @"--%@\r\nContent-Disposition: form-data; name=\"%@\"; "
     "filename=\"minidump.dmp\"\r\nContent-Type: application/octet-stream\r\n\r\n";
   NSString *pre = NSString stringWithFormat:fmt, boundary_, escaped;
-  NSString *post = NSString stringWithFormat:@"\r\n--%@--\r\n", boundary_;
 
   data appendData:pre dataUsingEncoding:NSUTF8StringEncoding;
   data appendData:contents;
-  data appendData:post dataUsingEncoding:NSUTF8StringEncoding;
 
   return data;
 }
@@ -182,6 +182,9 @@
     postBody appendData:fileData;
   }
 
+  NSString *epilogue = NSString stringWithFormat:@"\r\n--%@--\r\n", boundary_;
+  postBody appendData:epilogue dataUsingEncoding:NSUTF8StringEncoding;
+
   req setHTTPBody:postBody;
   req setHTTPMethod:@"POST";
 
@@ -193,7 +196,8 @@
                                            error:error;
 
   response_ retain;
-  
+  req release;
+
   return data;
 }

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/MachIPC.mm -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/MachIPC.mm Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/SimpleStringDictionary.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/SimpleStringDictionary.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/SimpleStringDictionary.mm -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/SimpleStringDictionary.mm Changed

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/bootstrap_compat.cc Added

@@ -0,0 +1,42 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "common/mac/bootstrap_compat.h"
+
+namespace breakpad {
+
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+kern_return_t BootstrapRegister(mach_port_t bp,
+                                name_t service_name,
+                                mach_port_t sp) {
+  return bootstrap_register(bp, service_name, sp);
+}
+#pragma GCC diagnostic warning "-Wdeprecated-declarations"
+
+}  // namesapce breakpad

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/bootstrap_compat.h Added

@@ -0,0 +1,54 @@
+// Copyright (c) 2012, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef COMMON_MAC_BOOTSTRAP_COMPAT_H_
+#define COMMON_MAC_BOOTSTRAP_COMPAT_H_
+
+#include <servers/bootstrap.h>
+
+namespace breakpad {
+
+// Wrapper for bootstrap_register to avoid deprecation warnings.
+//
+// In 10.6, it's possible to call bootstrap_check_in as the one-stop-shop for
+// handling what bootstrap_register is used for. In 10.5, bootstrap_check_in
+// can't check in a service whose name has not yet been registered, despite
+// bootstrap_register being marked as deprecated in that OS release. Breakpad
+// needs to register new service names, and in 10.5, calling
+// bootstrap_register is the only way to achieve that. Attempts to call
+// bootstrap_check_in for a new service name on 10.5 will result in
+// BOOTSTRAP_UNKNOWN_SERVICE being returned rather than registration of the
+// new service name.
+kern_return_t BootstrapRegister(mach_port_t bp,
+                                name_t service_name,
+                                mach_port_t sp);
+
+}  // namespace breakpad
+
+#endif  // COMMON_MAC_BOOTSTRAP_COMPAT_H_

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/dump_syms.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/dump_syms.h Changed

@@ -1,6 +1,6 @@
 // -*- mode: c++ -*-
 
-// Copyright (c) 2010, Google Inc.
+// Copyright (c) 2011, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -52,9 +52,9 @@
 
 class DumpSymbols {
  public:
-  DumpSymbols() 
+  DumpSymbols()
       : input_pathname_(),
-        object_filename_(), 
+        object_filename_(),
         contents_(),
         selected_object_file_(),
         selected_object_name_() { }
@@ -84,9 +84,9 @@
   // object file, then the dumper will dump the object file whose
   // architecture matches that of this dumper program.
   bool SetArchitecture(cpu_type_t cpu_type, cpu_subtype_t cpu_subtype);
-  
-  // If this dumper's file includes an object file for |arch_name|, then select 
-  // that object file for dumping, and return true. Otherwise, return false, 
+
+  // If this dumper's file includes an object file for |arch_name|, then select
+  // that object file for dumping, and return true. Otherwise, return false,
   // and leave this dumper's selected architecture unchanged.
   //
   // By default, if this dumper's file contains only one object file, then
@@ -94,7 +94,7 @@
   // object file, then the dumper will dump the object file whose
   // architecture matches that of this dumper program.
   bool SetArchitecture(const std::string &arch_name);
-  
+
   // Return a pointer to an array of 'struct fat_arch' structures,
   // describing the object files contained in this dumper's file. Set
   // *|count| to the number of elements in the array. The returned array is
@@ -109,10 +109,10 @@
     return NULL;
   }
 
-  // Read the selected object file's debugging information, and write it
-  // out to |stream|. Return true on success; if an error occurs, report it
-  // and return false.
-  bool WriteSymbolFile(std::ostream &stream);
+  // Read the selected object file's debugging information, and write it out to
+  // |stream|. Write the CFI section if |cfi| is true. Return true on success;
+  // if an error occurs, report it and return false.
+  bool WriteSymbolFile(std::ostream &stream, bool cfi);
 
  private:
   // Used internally.
@@ -158,7 +158,7 @@
   // has exactly one element.
   vector<struct fat_arch> object_files_;
 
-  // The object file in object_files_ selected to dump, or NULL if 
+  // The object file in object_files_ selected to dump, or NULL if
   // SetArchitecture hasn't been called yet.
   const struct fat_arch *selected_object_file_;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/dump_syms.mm -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/dump_syms.mm Changed

@@ -1,6 +1,6 @@
 // -*- mode: c++ -*-
 
-// Copyright (c) 2010, Google Inc.
+// Copyright (c) 2011, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -79,7 +79,7 @@
 bool DumpSymbols::Read(NSString *filename) {
   if (!NSFileManager defaultManager fileExistsAtPath:filename) {
     fprintf(stderr, "Object file does not exist: %s\n",
-	    filename fileSystemRepresentation);
+            filename fileSystemRepresentation);
     return false;
   }
 
@@ -101,15 +101,15 @@
     // pathForResource:ofType:inDirectory likes.
     NSString *base_name = input_pathname_ lastPathComponent;
     NSString *dwarf_resource;
-    
+
     do {
       NSString *new_base_name = base_name stringByDeletingPathExtension;
 
       // If stringByDeletingPathExtension returned the name unchanged, then
       // there's nothing more for us to strip off --- lose.
       if (new_base_name isEqualToString:base_name) {
-	fprintf(stderr, "Unable to find DWARF-bearing file in bundle: %s\n",
-		input_pathname_ fileSystemRepresentation);
+        fprintf(stderr, "Unable to find DWARF-bearing file in bundle: %s\n",
+                input_pathname_ fileSystemRepresentation);
         return false;
       }
 
@@ -141,12 +141,12 @@
   // file don't affect memory and vice versa).
   NSError *error;
   contents_ = NSData dataWithContentsOfFile:object_filename_
-	                             options:0
-	                               error:&error;
+                                     options:0
+                                       error:&error;
   if (!contents_) {
     fprintf(stderr, "Error reading object file: %s: %s\n",
-	    object_filename_ fileSystemRepresentation,
-	    error localizedDescription UTF8String);
+            object_filename_ fileSystemRepresentation,
+            error localizedDescription UTF8String);
     return false;
   }
   contents_ retain;
@@ -166,7 +166,7 @@
     fat_reader.object_files(&object_files_count);
   if (object_files_count == 0) {
     fprintf(stderr, "Fat binary file contains *no* architectures: %s\n",
-	    object_filename_ fileSystemRepresentation);
+            object_filename_ fileSystemRepresentation);
     return false;
   }
   object_files_.resize(object_files_count);
@@ -197,14 +197,14 @@
   }
   return arch_set;
 }
-  
+
 string DumpSymbols::Identifier() {
   FileID file_id(object_filename_ fileSystemRepresentation);
   unsigned char identifier_bytes16;
   cpu_type_t cpu_type = selected_object_file_->cputype;
   if (!file_id.MachoIdentifier(cpu_type, identifier_bytes)) {
     fprintf(stderr, "Unable to calculate UUID of mach-o binary %s!\n",
-	    object_filename_ fileSystemRepresentation);
+            object_filename_ fileSystemRepresentation);
     return "";
   }
 
@@ -243,7 +243,7 @@
                             const mach_o::Reader &macho_reader,
                             const mach_o::SectionMap &dwarf_sections) const {
   // Build a byte reader of the appropriate endianness.
-  ByteReader byte_reader(macho_reader.big_endian() 
+  ByteReader byte_reader(macho_reader.big_endian()
                          ? dwarf2reader::ENDIANNESS_BIG
                          : dwarf2reader::ENDIANNESS_LITTLE);
 
@@ -265,10 +265,10 @@
   // There had better be a __debug_info section!
   if (!debug_info_section.first) {
     fprintf(stderr, "%s: __DWARF segment of file has no __debug_info section\n",
-	    selected_object_name_.c_str());
+            selected_object_name_.c_str());
     return false;
   }
- 
+
   // Build a line-to-module loader for the root handler to use.
   DumperLineToModule line_to_module(&byte_reader);
 
@@ -343,7 +343,7 @@
   // investigation, Mac OS X only uses DW_EH_PE_pcrel-based pointers, so
   // this is the only base address the CFI parser will need.
   byte_reader.SetCFIDataBase(section.address, cfi);
-    
+
   dwarf2reader::CallFrameInfo::Reporter dwarf_reporter(selected_object_name_,
                                                        section.section_name);
   dwarf2reader::CallFrameInfo parser(cfi, cfi_size,
@@ -421,7 +421,7 @@
   return true;
 }
 
-bool DumpSymbols::WriteSymbolFile(std::ostream &stream) {
+bool DumpSymbols::WriteSymbolFile(std::ostream &stream, bool cfi) {
   // Select an object file, if SetArchitecture hasn't been called to set one
   // explicitly.
   if (!selected_object_file_) {
@@ -433,10 +433,10 @@
       const NXArchInfo *local_arch = NXGetLocalArchInfo();
       if (!SetArchitecture(local_arch->cputype, local_arch->cpusubtype)) {
         fprintf(stderr, "%s: object file contains more than one"
-		" architecture, none of which match the current"
+                " architecture, none of which match the current"
                 " architecture; specify an architecture explicitly"
-		" with '-a ARCH' to resolve the ambiguity\n",
-		object_filename_ fileSystemRepresentation);
+                " with '-a ARCH' to resolve the ambiguity\n",
+                object_filename_ fileSystemRepresentation);
         return false;
       }
     }
@@ -472,7 +472,7 @@
   identifier += "0";
 
   // Create a module to hold the debugging information.
-  Module module(module_name UTF8String, "mac", selected_arch_name, 
+  Module module(module_name UTF8String, "mac", selected_arch_name,
                 identifier);
 
   // Parse the selected object file.
@@ -481,8 +481,8 @@
   if (!reader.Read(reinterpret_cast<const uint8_t *>(contents_ bytes)
                    + selected_object_file_->offset,
                    selected_object_file_->size,
-		   selected_object_file_->cputype,
-		   selected_object_file_->cpusubtype))
+                   selected_object_file_->cputype,
+                   selected_object_file_->cpusubtype))
     return false;
 
   // Walk its load commands, and deal with whatever is there.
@@ -490,7 +490,7 @@
   if (!reader.WalkLoadCommands(&load_command_dumper))
     return false;
 
-  return module.Write(stream);
+  return module.Write(stream, cfi);
 }
 
 }  // namespace google_breakpad

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/macho_id.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/macho_id.cc Changed

@@ -51,18 +51,29 @@
 
 namespace MacFileUtilities {
 
+using google_breakpad::MD5Init;
+using google_breakpad::MD5Update;
+using google_breakpad::MD5Final;
+
 MachoID::MachoID(const char *path)
-   : file_(0), 
+   : memory_(0),
+     memory_size_(0),
+     crc_(0), 
+     md5_context_(), 
+     update_function_(NULL) {
+  strlcpy(path_, path, sizeof(path_));
+}
+
+MachoID::MachoID(const char *path, void *memory, size_t size)
+   : memory_(memory),
+     memory_size_(size),
      crc_(0), 
      md5_context_(), 
      update_function_(NULL) {
   strlcpy(path_, path, sizeof(path_));
-  file_ = open(path, O_RDONLY);
 }
 
 MachoID::~MachoID() {
-  if (file_ != -1)
-    close(file_);
 }
 
 // The CRC info is from http://en.wikipedia.org/wiki/Adler-32
@@ -144,10 +155,8 @@
 
 bool MachoID::UUIDCommand(int cpu_type, unsigned char bytes16) {
   struct breakpad_uuid_command uuid_cmd;
-  MachoWalker walker(path_, UUIDWalkerCB, &uuid_cmd);
-
   uuid_cmd.cmd = 0;
-  if (!walker.WalkHeader(cpu_type))
+  if (!WalkHeader(cpu_type, UUIDWalkerCB, &uuid_cmd))
     return false;
 
   // If we found the command, we'll have initialized the uuid_command
@@ -162,10 +171,8 @@
 
 bool MachoID::IDCommand(int cpu_type, unsigned char identifier16) {
   struct dylib_command dylib_cmd;
-  MachoWalker walker(path_, IDWalkerCB, &dylib_cmd);
-
   dylib_cmd.cmd = 0;
-  if (!walker.WalkHeader(cpu_type))
+  if (!WalkHeader(cpu_type, IDWalkerCB, &dylib_cmd))
     return false;
 
   // If we found the command, we'll have initialized the dylib_command
@@ -204,29 +211,39 @@
 }
 
 uint32_t MachoID::Adler32(int cpu_type) {
-  MachoWalker walker(path_, WalkerCB, this);
   update_function_ = &MachoID::UpdateCRC;
   crc_ = 0;
 
-  if (!walker.WalkHeader(cpu_type))
+  if (!WalkHeader(cpu_type, WalkerCB, this))
     return 0;
 
   return crc_;
 }
 
 bool MachoID::MD5(int cpu_type, unsigned char identifier16) {
-  MachoWalker walker(path_, WalkerCB, this);
   update_function_ = &MachoID::UpdateMD5;
 
   MD5Init(&md5_context_);
 
-  if (!walker.WalkHeader(cpu_type))
+  if (!WalkHeader(cpu_type, WalkerCB, this))
     return false;
 
   MD5Final(identifier, &md5_context_);
   return true;
 }
 
+bool MachoID::WalkHeader(int cpu_type,
+                         MachoWalker::LoadCommandCallback callback,
+                         void *context) {
+  if (memory_) {
+    MachoWalker walker(memory_, memory_size_, callback, context);
+    return walker.WalkHeader(cpu_type);
+  } else {
+    MachoWalker walker(path_, callback, context);
+    return walker.WalkHeader(cpu_type);
+  }
+}
+
 // static
 bool MachoID::WalkerCB(MachoWalker *walker, load_command *cmd, off_t offset,
                        bool swap, void *context) {

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/macho_id.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/macho_id.h Changed

@@ -37,15 +37,15 @@
 #include <limits.h>
 #include <mach-o/loader.h>
 
+#include "common/mac/macho_walker.h"
 #include "common/md5.h"
 
 namespace MacFileUtilities {
 
-class MachoWalker;
-
 class MachoID {
  public:
   MachoID(const char *path);
+  MachoID(const char *path, void *memory, size_t size);
   ~MachoID();
 
   // For the given |cpu_type|, return a UUID from the LC_UUID command.
@@ -80,6 +80,10 @@
   // Bottleneck for update routines
   void Update(MachoWalker *walker, off_t offset, size_t size);
 
+  // Factory for the MachoWalker
+  bool WalkHeader(int cpu_type, MachoWalker::LoadCommandCallback callback,
+                  void *context);
+
   // The callback from the MachoWalker for CRC and MD5
   static bool WalkerCB(MachoWalker *walker, load_command *cmd, off_t offset,
                        bool swap, void *context);
@@ -95,14 +99,17 @@
   // File path
   char path_PATH_MAX;
 
-  // File descriptor
-  int file_;
+  // Memory region to read from
+  void *memory_;
+
+  // Size of the memory region
+  size_t memory_size_;
 
   // The current crc value
   uint32_t crc_;
 
   // The MD5 context
-  MD5Context md5_context_;
+  google_breakpad::MD5Context md5_context_;
 
   // The current update to call from the Update callback
   UpdateFunction update_function_;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/macho_reader.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/macho_reader.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/macho_walker.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/macho_walker.cc Changed

@@ -52,6 +52,8 @@
 MachoWalker::MachoWalker(const char *path, LoadCommandCallback callback,
                          void *context)
     : file_(0),
+      memory_(NULL),
+      memory_size_(0),
       callback_(callback),
       callback_context_(context),
       current_header_(NULL),
@@ -60,6 +62,18 @@
   file_ = open(path, O_RDONLY);
 }
 
+MachoWalker::MachoWalker(void *memory, size_t size,
+                         LoadCommandCallback callback, void *context)
+    : file_(0),
+      memory_(memory),
+      memory_size_(size),
+      callback_(callback),
+      callback_context_(context),
+      current_header_(NULL),
+      current_header_size_(0),
+      current_header_offset_(0) {
+}
+
 MachoWalker::~MachoWalker() {
   if (file_ != -1)
     close(file_);
@@ -90,7 +104,21 @@
 }
 
 bool MachoWalker::ReadBytes(void *buffer, size_t size, off_t offset) {
-  return pread(file_, buffer, size, offset) == (ssize_t)size;
+  if (memory_) {
+    if (offset < 0)
+      return false;
+    bool result = true;
+    if (offset + size > memory_size_) {
+      if (static_cast<size_t>(offset) >= memory_size_)
+        return false;
+      size = memory_size_ - offset;
+      result = false;
+    }
+    memcpy(buffer, static_cast<char *>(memory_) + offset, size);
+    return result;
+  } else {
+    return pread(file_, buffer, size, offset) == (ssize_t)size;
+  }
 }
 
 bool MachoWalker::CurrentHeader(struct mach_header_64 *header, off_t *offset) {

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/mac/macho_walker.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/mac/macho_walker.h Changed

@@ -52,7 +52,8 @@
                                       off_t offset, bool swap, void *context);
 
   MachoWalker(const char *path, LoadCommandCallback callback, void *context);
-  MachoWalker(int file_descriptor, LoadCommandCallback callback, void *context);
+  MachoWalker(void *memory, size_t size, LoadCommandCallback callback,
+              void *context);
   ~MachoWalker();
 
   // Begin walking the header for |cpu_type|.  If |cpu_type| is 0, then the
@@ -68,7 +69,7 @@
 
   // Read |size| bytes from the opened file at |offset| into |buffer|
   bool ReadBytes(void *buffer, size_t size, off_t offset);
-  
+
   // Return the current header and header offset
   bool CurrentHeader(struct mach_header_64 *header, off_t *offset);
 
@@ -87,19 +88,25 @@
   // File descriptor to the opened file
   int file_;
 
+  // Memory location to read from.
+  void *memory_;
+
+  // Size of the memory segment we can read from.
+  size_t memory_size_;
+
   // User specified callback & context
   LoadCommandCallback callback_;
   void *callback_context_;
-  
+
   // Current header, size, and offset.  The mach_header_64 is used for both
   // 32-bit and 64-bit headers because they only differ in their last field
-  // (reserved).  By adding the |current_header_size_| and the 
+  // (reserved).  By adding the |current_header_size_| and the
   // |current_header_offset_|, you can determine the offset in the file just
   // after the header.
   struct mach_header_64 *current_header_;
   unsigned long current_header_size_;
   off_t current_header_offset_;
-  
+
  private:
   MachoWalker(const MachoWalker &);
   MachoWalker &operator=(const MachoWalker &);

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/md5.cc Added

@@ -0,0 +1,251 @@
+/*
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to MD5Init, call MD5Update as
+ * needed on buffers full of bytes, and then call MD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ */
+
+#include <string.h>
+
+#include "common/md5.h"
+
+namespace google_breakpad {
+
+#ifndef WORDS_BIGENDIAN
+#define byteReverse(buf, len)   /* Nothing */
+#else
+/*
+ * Note: this code is harmless on little-endian machines.
+ */
+static void byteReverse(unsigned char *buf, unsigned longs)
+{
+  u32 t;
+  do {
+    t = (u32) ((unsigned) buf3 << 8 | buf2) << 16 |
+      ((unsigned) buf1 << 8 | buf0);
+    *(u32 *) buf = t;
+    buf += 4;
+  } while (--longs);
+}
+#endif
+
+static void MD5Transform(u32 buf4, u32 const in16);
+
+/*
+ * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
+ * initialization constants.
+ */
+void MD5Init(struct MD5Context *ctx)
+{
+  ctx->buf0 = 0x67452301;
+  ctx->buf1 = 0xefcdab89;
+  ctx->buf2 = 0x98badcfe;
+  ctx->buf3 = 0x10325476;
+
+  ctx->bits0 = 0;
+  ctx->bits1 = 0;
+}
+
+/*
+ * Update context to reflect the concatenation of another buffer full
+ * of bytes.
+ */
+void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
+{
+  u32 t;
+
+  /* Update bitcount */
+
+  t = ctx->bits0;
+  if ((ctx->bits0 = t + ((u32) len << 3)) < t)
+    ctx->bits1++;         /* Carry from low to high */
+  ctx->bits1 += len >> 29;
+
+  t = (t >> 3) & 0x3f;        /* Bytes already in shsInfo->data */
+
+  /* Handle any leading odd-sized chunks */
+
+  if (t) {
+    unsigned char *p = (unsigned char *) ctx->in + t;
+
+    t = 64 - t;
+    if (len < t) {
+      memcpy(p, buf, len);
+      return;
+    }
+    memcpy(p, buf, t);
+    byteReverse(ctx->in, 16);
+    MD5Transform(ctx->buf, (u32 *) ctx->in);
+    buf += t;
+    len -= t;
+  }
+  /* Process data in 64-byte chunks */
+
+  while (len >= 64) {
+    memcpy(ctx->in, buf, 64);
+    byteReverse(ctx->in, 16);
+    MD5Transform(ctx->buf, (u32 *) ctx->in);
+    buf += 64;
+    len -= 64;
+  }
+
+  /* Handle any remaining bytes of data. */
+
+  memcpy(ctx->in, buf, len);
+}
+
+/*
+ * Final wrapup - pad to 64-byte boundary with the bit pattern
+ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+void MD5Final(unsigned char digest16, struct MD5Context *ctx)
+{
+  unsigned count;
+  unsigned char *p;
+
+  /* Compute number of bytes mod 64 */
+  count = (ctx->bits0 >> 3) & 0x3F;
+
+  /* Set the first char of padding to 0x80.  This is safe since there is
+     always at least one byte free */
+  p = ctx->in + count;
+  *p++ = 0x80;
+
+  /* Bytes of padding needed to make 64 bytes */
+  count = 64 - 1 - count;
+
+  /* Pad out to 56 mod 64 */
+  if (count < 8) {
+    /* Two lots of padding:  Pad the first block to 64 bytes */
+    memset(p, 0, count);
+    byteReverse(ctx->in, 16);
+    MD5Transform(ctx->buf, (u32 *) ctx->in);
+
+    /* Now fill the next block with 56 bytes */
+    memset(ctx->in, 0, 56);
+  } else {
+    /* Pad block to 56 bytes */
+    memset(p, 0, count - 8);
+  }
+  byteReverse(ctx->in, 14);
+
+  /* Append length in bits and transform */
+  ((u32 *) ctx->in)14 = ctx->bits0;
+  ((u32 *) ctx->in)15 = ctx->bits1;
+
+  MD5Transform(ctx->buf, (u32 *) ctx->in);
+  byteReverse((unsigned char *) ctx->buf, 4);
+  memcpy(digest, ctx->buf, 16);
+  memset(ctx, 0, sizeof(*ctx));        /* In case it's sensitive */
+}
+
+/* The four core functions - F1 is optimized somewhat */
+
+/* #define F1(x, y, z) (x & y | ~x & z) */
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+/* This is the central step in the MD5 algorithm. */
+#define MD5STEP(f, w, x, y, z, data, s) \
+  ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+
+/*
+ * The core of the MD5 algorithm, this alters an existing MD5 hash to
+ * reflect the addition of 16 longwords of new data.  MD5Update blocks
+ * the data and converts bytes into longwords for this routine.
+ */
+static void MD5Transform(u32 buf4, u32 const in16)
+{
+  register u32 a, b, c, d;
+
+  a = buf0;
+  b = buf1;
+  c = buf2;
+  d = buf3;
+
+  MD5STEP(F1, a, b, c, d, in0 + 0xd76aa478, 7);
+  MD5STEP(F1, d, a, b, c, in1 + 0xe8c7b756, 12);
+  MD5STEP(F1, c, d, a, b, in2 + 0x242070db, 17);
+  MD5STEP(F1, b, c, d, a, in3 + 0xc1bdceee, 22);
+  MD5STEP(F1, a, b, c, d, in4 + 0xf57c0faf, 7);
+  MD5STEP(F1, d, a, b, c, in5 + 0x4787c62a, 12);
+  MD5STEP(F1, c, d, a, b, in6 + 0xa8304613, 17);
+  MD5STEP(F1, b, c, d, a, in7 + 0xfd469501, 22);
+  MD5STEP(F1, a, b, c, d, in8 + 0x698098d8, 7);
+  MD5STEP(F1, d, a, b, c, in9 + 0x8b44f7af, 12);
+  MD5STEP(F1, c, d, a, b, in10 + 0xffff5bb1, 17);
+  MD5STEP(F1, b, c, d, a, in11 + 0x895cd7be, 22);
+  MD5STEP(F1, a, b, c, d, in12 + 0x6b901122, 7);
+  MD5STEP(F1, d, a, b, c, in13 + 0xfd987193, 12);
+  MD5STEP(F1, c, d, a, b, in14 + 0xa679438e, 17);
+  MD5STEP(F1, b, c, d, a, in15 + 0x49b40821, 22);
+
+  MD5STEP(F2, a, b, c, d, in1 + 0xf61e2562, 5);
+  MD5STEP(F2, d, a, b, c, in6 + 0xc040b340, 9);
+  MD5STEP(F2, c, d, a, b, in11 + 0x265e5a51, 14);
+  MD5STEP(F2, b, c, d, a, in0 + 0xe9b6c7aa, 20);
+  MD5STEP(F2, a, b, c, d, in5 + 0xd62f105d, 5);
+  MD5STEP(F2, d, a, b, c, in10 + 0x02441453, 9);
+  MD5STEP(F2, c, d, a, b, in15 + 0xd8a1e681, 14);
+  MD5STEP(F2, b, c, d, a, in4 + 0xe7d3fbc8, 20);
+  MD5STEP(F2, a, b, c, d, in9 + 0x21e1cde6, 5);
+  MD5STEP(F2, d, a, b, c, in14 + 0xc33707d6, 9);
+  MD5STEP(F2, c, d, a, b, in3 + 0xf4d50d87, 14);
+  MD5STEP(F2, b, c, d, a, in8 + 0x455a14ed, 20);
+  MD5STEP(F2, a, b, c, d, in13 + 0xa9e3e905, 5);
+  MD5STEP(F2, d, a, b, c, in2 + 0xfcefa3f8, 9);
+  MD5STEP(F2, c, d, a, b, in7 + 0x676f02d9, 14);
+  MD5STEP(F2, b, c, d, a, in12 + 0x8d2a4c8a, 20);
+
+  MD5STEP(F3, a, b, c, d, in5 + 0xfffa3942, 4);
+  MD5STEP(F3, d, a, b, c, in8 + 0x8771f681, 11);
+  MD5STEP(F3, c, d, a, b, in11 + 0x6d9d6122, 16);
+  MD5STEP(F3, b, c, d, a, in14 + 0xfde5380c, 23);
+  MD5STEP(F3, a, b, c, d, in1 + 0xa4beea44, 4);
+  MD5STEP(F3, d, a, b, c, in4 + 0x4bdecfa9, 11);
+  MD5STEP(F3, c, d, a, b, in7 + 0xf6bb4b60, 16);
+  MD5STEP(F3, b, c, d, a, in10 + 0xbebfbc70, 23);
+  MD5STEP(F3, a, b, c, d, in13 + 0x289b7ec6, 4);
+  MD5STEP(F3, d, a, b, c, in0 + 0xeaa127fa, 11);
+  MD5STEP(F3, c, d, a, b, in3 + 0xd4ef3085, 16);
+  MD5STEP(F3, b, c, d, a, in6 + 0x04881d05, 23);
+  MD5STEP(F3, a, b, c, d, in9 + 0xd9d4d039, 4);
+  MD5STEP(F3, d, a, b, c, in12 + 0xe6db99e5, 11);
+  MD5STEP(F3, c, d, a, b, in15 + 0x1fa27cf8, 16);
+  MD5STEP(F3, b, c, d, a, in2 + 0xc4ac5665, 23);
+
+  MD5STEP(F4, a, b, c, d, in0 + 0xf4292244, 6);
+  MD5STEP(F4, d, a, b, c, in7 + 0x432aff97, 10);
+  MD5STEP(F4, c, d, a, b, in14 + 0xab9423a7, 15);
+  MD5STEP(F4, b, c, d, a, in5 + 0xfc93a039, 21);
+  MD5STEP(F4, a, b, c, d, in12 + 0x655b59c3, 6);
+  MD5STEP(F4, d, a, b, c, in3 + 0x8f0ccc92, 10);
+  MD5STEP(F4, c, d, a, b, in10 + 0xffeff47d, 15);
+  MD5STEP(F4, b, c, d, a, in1 + 0x85845dd1, 21);
+  MD5STEP(F4, a, b, c, d, in8 + 0x6fa87e4f, 6);
+  MD5STEP(F4, d, a, b, c, in15 + 0xfe2ce6e0, 10);
+  MD5STEP(F4, c, d, a, b, in6 + 0xa3014314, 15);
+  MD5STEP(F4, b, c, d, a, in13 + 0x4e0811a1, 21);
+  MD5STEP(F4, a, b, c, d, in4 + 0xf7537e82, 6);
+  MD5STEP(F4, d, a, b, c, in11 + 0xbd3af235, 10);
+  MD5STEP(F4, c, d, a, b, in2 + 0x2ad7d2bb, 15);
+  MD5STEP(F4, b, c, d, a, in9 + 0xeb86d391, 21);
+
+  buf0 += a;
+  buf1 += b;
+  buf2 += c;
+  buf3 += d;
+}
+
+}  // namespace google_breakpad
+

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/md5.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/md5.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/memory.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/memory.h Changed

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/memory_range.h Added

@@ -0,0 +1,145 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// memory_range.h: Define the google_breakpad::MemoryRange class, which
+// is a lightweight wrapper with a pointer and a length to encapsulate
+// a contiguous range of memory.
+
+#ifndef COMMON_MEMORY_RANGE_H_
+#define COMMON_MEMORY_RANGE_H_
+
+#include <stddef.h>
+
+#include "google_breakpad/common/breakpad_types.h"
+
+namespace google_breakpad {
+
+// A lightweight wrapper with a pointer and a length to encapsulate a
+// contiguous range of memory. It provides helper methods for checked
+// access of a subrange of the memory. Its implemementation does not
+// allocate memory or call into libc functions, and is thus safer to use
+// in a crashed environment.
+class MemoryRange {
+ public:
+  MemoryRange() : data_(NULL), length_(0) {}
+
+  MemoryRange(const void* data, size_t length) {
+    Set(data, length);
+  }
+
+  // Returns true if this memory range contains no data.
+  bool IsEmpty() const {
+    // Set() guarantees that |length_| is zero if |data_| is NULL.
+    return length_ == 0;
+  }
+
+  // Resets to an empty range.
+  void Reset() {
+    data_ = NULL;
+    length_ = 0;
+  }
+
+  // Sets this memory range to point to |data| and its length to |length|.
+  void Set(const void* data, size_t length) {
+    data_ = reinterpret_cast<const u_int8_t*>(data);
+    // Always set |length_| to zero if |data_| is NULL.
+    length_ = data ? length : 0;
+  }
+
+  // Returns true if this range covers a subrange of |sub_length| bytes
+  // at |sub_offset| bytes of this memory range, or false otherwise.
+  bool Covers(size_t sub_offset, size_t sub_length) const {
+    // The following checks verify that:
+    // 1. sub_offset is within  0 .. length_ - 1 
+    // 2. sub_offset + sub_length is within
+    //     sub_offset .. length_ 
+    return sub_offset < length_ &&
+           sub_offset + sub_length >= sub_offset &&
+           sub_offset + sub_length <= length_;
+  }
+
+  // Returns a raw data pointer to a subrange of |sub_length| bytes at
+  // |sub_offset| bytes of this memory range, or NULL if the subrange
+  // is out of bounds.
+  const void* GetData(size_t sub_offset, size_t sub_length) const {
+    return Covers(sub_offset, sub_length) ? (data_ + sub_offset) : NULL;
+  }
+
+  // Same as the two-argument version of GetData() but uses sizeof(DataType)
+  // as the subrange length and returns an |DataType| pointer for convenience.
+  template <typename DataType>
+  const DataType* GetData(size_t sub_offset) const {
+    return reinterpret_cast<const DataType*>(
+        GetData(sub_offset, sizeof(DataType)));
+  }
+
+  // Returns a raw pointer to the |element_index|-th element of an array
+  // of elements of length |element_size| starting at |sub_offset| bytes
+  // of this memory range, or NULL if the element is out of bounds.
+  const void* GetArrayElement(size_t element_offset,
+                              size_t element_size,
+                              unsigned element_index) const {
+    size_t sub_offset = element_offset + element_index * element_size;
+    return GetData(sub_offset, element_size);
+  }
+
+  // Same as the three-argument version of GetArrayElement() but deduces
+  // the element size using sizeof(ElementType) and returns an |ElementType|
+  // pointer for convenience.
+  template <typename ElementType>
+  const ElementType* GetArrayElement(size_t element_offset,
+                                     unsigned element_index) const {
+    return reinterpret_cast<const ElementType*>(
+        GetArrayElement(element_offset, sizeof(ElementType), element_index));
+  }
+
+  // Returns a subrange of |sub_length| bytes at |sub_offset| bytes of
+  // this memory range, or an empty range if the subrange is out of bounds.
+  MemoryRange Subrange(size_t sub_offset, size_t sub_length) const {
+    return Covers(sub_offset, sub_length) ?
+        MemoryRange(data_ + sub_offset, sub_length) : MemoryRange();
+  }
+
+  // Returns a pointer to the beginning of this memory range.
+  const u_int8_t* data() const { return data_; }
+
+  // Returns the length, in bytes, of this memory range.
+  size_t length() const { return length_; }
+
+ private:
+  // Pointer to the beginning of this memory range.
+  const u_int8_t* data_;
+
+  // Length, in bytes, of this memory range.
+  size_t length_;
+};
+
+}  // namespace google_breakpad
+
+#endif  // COMMON_MEMORY_RANGE_H_

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/memory_range_unittest.cc Added

@@ -0,0 +1,193 @@
+// Copyright (c) 2011, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// memory_range_unittest.cc: Unit tests for google_breakpad::MemoryRange.
+
+#include "breakpad_googletest_includes.h"
+#include "common/memory_range.h"
+
+using google_breakpad::MemoryRange;
+using testing::Message;
+
+namespace {
+
+const u_int32_t kBuffer10 = { 0 };
+const size_t kBufferSize = sizeof(kBuffer);
+const u_int8_t* kBufferPointer = reinterpret_cast<const u_int8_t*>(kBuffer);
+
+// Test vectors for verifying Covers, GetData, and Subrange.
+const struct {
+  bool valid;
+  size_t offset;
+  size_t length;
+} kSubranges = {
+  { true, 0, 0 },
+  { true, 0, 2 },
+  { true, 0, kBufferSize },
+  { true, 2, 0 },
+  { true, 2, 4 },
+  { true, 2, kBufferSize - 2 },
+  { true, kBufferSize - 1, 1 },
+  { false, kBufferSize, 0 },
+  { false, kBufferSize, -1 },
+  { false, kBufferSize + 1, 0 },
+  { false, -1, 2 },
+  { false, 1, kBufferSize },
+  { false, kBufferSize - 1, 2 },
+  { false, 0, -1 },
+  { false, 1, -1 },
+};
+const size_t kNumSubranges = sizeof(kSubranges) / sizeof(kSubranges0);
+
+// Test vectors for verifying GetArrayElement.
+const struct {
+  size_t offset;
+  size_t size;
+  size_t index;
+  const void* const pointer;
+} kElements = {
+  // Valid array elemenets
+  { 0, 1, 0, kBufferPointer },
+  { 0, 1, 1, kBufferPointer + 1 },
+  { 0, 1, kBufferSize - 1, kBufferPointer + kBufferSize - 1 },
+  { 0, 2, 1, kBufferPointer + 2 },
+  { 0, 4, 2, kBufferPointer + 8 },
+  { 0, 4, 9, kBufferPointer + 36 },
+  { kBufferSize - 1, 1, 0, kBufferPointer + kBufferSize - 1 },
+  // Invalid array elemenets
+  { 0, 1, kBufferSize, NULL },
+  { 0, 4, 10, NULL },
+  { kBufferSize - 1, 1, 1, NULL },
+  { kBufferSize - 1, 2, 0, NULL },
+  { kBufferSize, 1, 0, NULL },
+};
+const size_t kNumElements = sizeof(kElements) / sizeof(kElements0);
+
+}  // namespace
+
+TEST(MemoryRangeTest, DefaultConstructor) {
+  MemoryRange range;
+  EXPECT_EQ(NULL, range.data());
+  EXPECT_EQ(0, range.length());
+}
+
+TEST(MemoryRangeTest, ConstructorWithDataAndLength) {
+  MemoryRange range(kBuffer, kBufferSize);
+  EXPECT_EQ(kBufferPointer, range.data());
+  EXPECT_EQ(kBufferSize, range.length());
+}
+
+TEST(MemoryRangeTest, Reset) {
+  MemoryRange range;
+  range.Reset();
+  EXPECT_EQ(NULL, range.data());
+  EXPECT_EQ(0, range.length());
+
+  range.Set(kBuffer, kBufferSize);
+  EXPECT_EQ(kBufferPointer, range.data());
+  EXPECT_EQ(kBufferSize, range.length());
+
+  range.Reset();
+  EXPECT_EQ(NULL, range.data());
+  EXPECT_EQ(0, range.length());
+}
+
+TEST(MemoryRangeTest, Set) {
+  MemoryRange range;
+  range.Set(kBuffer, kBufferSize);
+  EXPECT_EQ(kBufferPointer, range.data());
+  EXPECT_EQ(kBufferSize, range.length());
+
+  range.Set(NULL, 0);
+  EXPECT_EQ(NULL, range.data());
+  EXPECT_EQ(0, range.length());
+}
+
+TEST(MemoryRangeTest, SubrangeOfEmptyMemoryRange) {
+  MemoryRange range;
+  MemoryRange subrange = range.Subrange(0, 10);
+  EXPECT_EQ(NULL, subrange.data());
+  EXPECT_EQ(0, subrange.length());
+}
+
+TEST(MemoryRangeTest, SubrangeAndGetData) {
+  MemoryRange range(kBuffer, kBufferSize);
+  for (size_t i = 0; i < kNumSubranges; ++i) {
+    bool valid = kSubrangesi.valid;
+    size_t sub_offset = kSubrangesi.offset;
+    size_t sub_length = kSubrangesi.length;
+    SCOPED_TRACE(Message() << "offset=" << sub_offset
+                 << ", length=" << sub_length);
+
+    MemoryRange subrange = range.Subrange(sub_offset, sub_length);
+    if (valid) {
+      EXPECT_TRUE(range.Covers(sub_offset, sub_length));
+      EXPECT_EQ(kBufferPointer + sub_offset,
+                range.GetData(sub_offset, sub_length));
+      EXPECT_EQ(kBufferPointer + sub_offset, subrange.data());
+      EXPECT_EQ(sub_length, subrange.length());
+    } else {
+      EXPECT_FALSE(range.Covers(sub_offset, sub_length));
+      EXPECT_EQ(NULL, range.GetData(sub_offset, sub_length));
+      EXPECT_EQ(NULL, subrange.data());
+      EXPECT_EQ(0, subrange.length());
+    }
+  }
+}
+
+TEST(MemoryRangeTest, GetDataWithTemplateType) {
+  MemoryRange range(kBuffer, kBufferSize);
+  const char* char_pointer = range.GetData<char>(0);
+  EXPECT_EQ(reinterpret_cast<const char*>(kBufferPointer), char_pointer);
+  const int* int_pointer = range.GetData<int>(0);
+  EXPECT_EQ(reinterpret_cast<const int*>(kBufferPointer), int_pointer);
+}
+
+TEST(MemoryRangeTest, GetArrayElement) {
+  MemoryRange range(kBuffer, kBufferSize);
+  for (size_t i = 0; i < kNumElements; ++i) {
+    size_t element_offset = kElementsi.offset;
+    size_t element_size = kElementsi.size;
+    unsigned element_index = kElementsi.index;
+    const void* const element_pointer = kElementsi.pointer;
+    SCOPED_TRACE(Message() << "offset=" << element_offset
+                 << ", size=" << element_size
+                 << ", index=" << element_index);
+    EXPECT_EQ(element_pointer, range.GetArrayElement(
+        element_offset, element_size, element_index));
+  }
+}
+
+TEST(MemoryRangeTest, GetArrayElmentWithTemplateType) {
+  MemoryRange range(kBuffer, kBufferSize);
+  const char* char_pointer = range.GetArrayElement<char>(0, 0);
+  EXPECT_EQ(reinterpret_cast<const char*>(kBufferPointer), char_pointer);
+  const int* int_pointer = range.GetArrayElement<int>(0, 0);
+  EXPECT_EQ(reinterpret_cast<const int*>(kBufferPointer), int_pointer);
+}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/memory_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/memory_unittest.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/module.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/module.cc Changed

@@ -1,4 +1,4 @@
-// Copyright (c) 2010 Google Inc.
+// Copyright (c) 2011 Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@
 #include <string.h>
 
 #include <iostream>
+#include <utility>
 
 namespace google_breakpad {
 
@@ -56,16 +57,17 @@
     load_address_(0) { }
 
 Module::~Module() {
-  for (FileByNameMap::iterator it = files_.begin(); it != files_.end(); it++)
+  for (FileByNameMap::iterator it = files_.begin(); it != files_.end(); ++it)
     delete it->second;
   for (FunctionSet::iterator it = functions_.begin();
-       it != functions_.end(); it++)
+       it != functions_.end(); ++it) {
     delete *it;
+  }
   for (vector<StackFrameEntry *>::iterator it = stack_frame_entries_.begin();
-       it != stack_frame_entries_.end(); it++)
+       it != stack_frame_entries_.end(); ++it) {
     delete *it;
-  for (ExternSet::iterator it = externs_.begin();
-       it != externs_.end(); it++)
+  }
+  for (ExternSet::iterator it = externs_.begin(); it != externs_.end(); ++it)
     delete *it;
 }
 
@@ -87,7 +89,7 @@
 
 void Module::AddFunctions(vector<Function *>::iterator begin,
                           vector<Function *>::iterator end) {
-  for (vector<Function *>::iterator it = begin; it != end; it++)
+  for (vector<Function *>::iterator it = begin; it != end; ++it)
     AddFunction(*it);
 }
 
@@ -149,7 +151,7 @@
 
 void Module::GetFiles(vector<File *> *vec) {
   vec->clear();
-  for (FileByNameMap::iterator it = files_.begin(); it != files_.end(); it++)
+  for (FileByNameMap::iterator it = files_.begin(); it != files_.end(); ++it)
     vec->push_back(it->second);
 }
 
@@ -160,16 +162,17 @@
 void Module::AssignSourceIds() {
   // First, give every source file an id of -1.
   for (FileByNameMap::iterator file_it = files_.begin();
-       file_it != files_.end(); file_it++)
+       file_it != files_.end(); ++file_it) {
     file_it->second->source_id = -1;
+  }
 
   // Next, mark all files actually cited by our functions' line number
   // info, by setting each one's source id to zero.
   for (FunctionSet::const_iterator func_it = functions_.begin();
-       func_it != functions_.end(); func_it++) {
+       func_it != functions_.end(); ++func_it) {
     Function *func = *func_it;
     for (vector<Line>::iterator line_it = func->lines.begin();
-         line_it != func->lines.end(); line_it++)
+         line_it != func->lines.end(); ++line_it)
       line_it->file->source_id = 0;
   }
 
@@ -179,9 +182,10 @@
   // lexicographical order by name, which is neat.
   int next_source_id = 0;
   for (FileByNameMap::iterator file_it = files_.begin();
-       file_it != files_.end(); file_it++)
+       file_it != files_.end(); ++file_it) {
     if (!file_it->second->source_id)
       file_it->second->source_id = next_source_id++;
+  }
 }
 
 bool Module::ReportError() {
@@ -192,7 +196,7 @@
 
 bool Module::WriteRuleMap(const RuleMap &rule_map, std::ostream &stream) {
   for (RuleMap::const_iterator it = rule_map.begin();
-       it != rule_map.end(); it++) {
+       it != rule_map.end(); ++it) {
     if (it != rule_map.begin())
       stream << ' ';
     stream << it->first << ": " << it->second;
@@ -200,7 +204,7 @@
   return stream.good();
 }
 
-bool Module::Write(std::ostream &stream) {
+bool Module::Write(std::ostream &stream, bool cfi) {
   stream << "MODULE " << os_ << " " << architecture_ << " "
          << id_ << " " << name_ << endl;
   if (!stream.good())
@@ -210,7 +214,7 @@
 
   // Write out files.
   for (FileByNameMap::iterator file_it = files_.begin();
-       file_it != files_.end(); file_it++) {
+       file_it != files_.end(); ++file_it) {
     File *file = file_it->second;
     if (file->source_id >= 0) {
       stream << "FILE " << file->source_id << " " <<  file->name << endl;
@@ -221,18 +225,18 @@
 
   // Write out functions and their lines.
   for (FunctionSet::const_iterator func_it = functions_.begin();
-       func_it != functions_.end(); func_it++) {
+       func_it != functions_.end(); ++func_it) {
     Function *func = *func_it;
     stream << "FUNC " << hex
            << (func->address - load_address_) << " "
            << func->size << " "
            << func->parameter_size << " "
            << func->name << dec << endl;
-      
+
     if (!stream.good())
       return ReportError();
     for (vector<Line>::iterator line_it = func->lines.begin();
-         line_it != func->lines.end(); line_it++) {
+         line_it != func->lines.end(); ++line_it) {
       stream << hex
              << (line_it->address - load_address_) << " "
              << line_it->size << " "
@@ -246,7 +250,7 @@
 
   // Write out 'PUBLIC' records.
   for (ExternSet::const_iterator extern_it = externs_.begin();
-       extern_it != externs_.end(); extern_it++) {
+       extern_it != externs_.end(); ++extern_it) {
     Extern *ext = *extern_it;
     stream << "PUBLIC " << hex
            << (ext->address - load_address_) << " 0 "
@@ -255,34 +259,36 @@
       return ReportError();
   }
 
-  // Write out 'STACK CFI INIT' and 'STACK CFI' records.
-  vector<StackFrameEntry *>::const_iterator frame_it;
-  for (frame_it = stack_frame_entries_.begin();
-       frame_it != stack_frame_entries_.end(); frame_it++) {
-    StackFrameEntry *entry = *frame_it;
-    stream << "STACK CFI INIT " << hex
-           << (entry->address - load_address_) << " "
-           << entry->size << " " << dec;
-    if (!stream.good()
-        || !WriteRuleMap(entry->initial_rules, stream))
-      return ReportError();
-
-    stream << endl;
-
-    // Write out this entry's delta rules as 'STACK CFI' records.
-    for (RuleChangeMap::const_iterator delta_it = entry->rule_changes.begin();
-         delta_it != entry->rule_changes.end(); delta_it++) {
-      stream << "STACK CFI " << hex
-             << (delta_it->first - load_address_) << " " << dec;
+  if (cfi) {
+    // Write out 'STACK CFI INIT' and 'STACK CFI' records.
+    vector<StackFrameEntry *>::const_iterator frame_it;
+    for (frame_it = stack_frame_entries_.begin();
+         frame_it != stack_frame_entries_.end(); ++frame_it) {
+      StackFrameEntry *entry = *frame_it;
+      stream << "STACK CFI INIT " << hex
+             << (entry->address - load_address_) << " "
+             << entry->size << " " << dec;
       if (!stream.good()
-          || !WriteRuleMap(delta_it->second, stream))
+          || !WriteRuleMap(entry->initial_rules, stream))
         return ReportError();
 
       stream << endl;
+
+      // Write out this entry's delta rules as 'STACK CFI' records.
+      for (RuleChangeMap::const_iterator delta_it = entry->rule_changes.begin();
+           delta_it != entry->rule_changes.end(); ++delta_it) {
+        stream << "STACK CFI " << hex
+               << (delta_it->first - load_address_) << " " << dec;
+        if (!stream.good()
+            || !WriteRuleMap(delta_it->second, stream))
+          return ReportError();
+
+        stream << endl;
+      }
     }
   }
 
   return true;
 }
 
-} // namespace google_breakpad
+}  // namespace google_breakpad

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/module.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/module.h Changed

@@ -259,14 +259,15 @@
   // breakpad symbol format. Return true if all goes well, or false if
   // an error occurs. This method writes out:
   // - a header based on the values given to the constructor,
-  // - the source files added via FindFile, and finally
-  // - the functions added via AddFunctions, each with its lines.
+  // - the source files added via FindFile,
+  // - the functions added via AddFunctions, each with its lines,
+  // - all public records,
+  // - and if CFI is true, all CFI records.
   // Addresses in the output are all relative to the load address
   // established by SetLoadAddress.
-  bool Write(std::ostream &stream);
+  bool Write(std::ostream &stream, bool cfi);
 
  private:
-
   // Report an error that has occurred writing the symbol file, using
   // errno to find the appropriate cause.  Return false.
   static bool ReportError();
@@ -287,7 +288,7 @@
   // Relation for maps whose keys are strings shared with some other
   // structure.
   struct CompareStringPtrs {
-    bool operator()(const string *x, const string *y) { return *x < *y; };
+    bool operator()(const string *x, const string *y) { return *x < *y; }
   };
 
   // A map from filenames to File structures.  The map's keys are
@@ -315,6 +316,6 @@
   ExternSet externs_;
 };
 
-} // namespace google_breakpad
+}  // namespace google_breakpad
 
 #endif  // COMMON_LINUX_MODULE_H__

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/module_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/module_unittest.cc Changed

@@ -70,7 +70,7 @@
 TEST(Write, Header) {
   stringstream s;
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
-  m.Write(s);
+  m.Write(s, true);
   string contents = s.str();
   EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n",
                contents.c_str());
@@ -91,7 +91,7 @@
   function->lines.push_back(line);
   m.AddFunction(function);
 
-  m.Write(s);
+  m.Write(s, true);
   string contents = s.str();
   EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
                "FILE 0 file_name.cc\n"
@@ -141,7 +141,7 @@
   // the module must work fine.
   m.SetLoadAddress(0x2ab698b0b6407073LL);
 
-  m.Write(s);
+  m.Write(s, true);
   string contents = s.str();
   EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
                "FILE 0 filename-a.cc\n"
@@ -164,7 +164,7 @@
 
   // Create some source files.
   Module::File *file1 = m.FindFile("filename1");
-  m.FindFile("filename2"); // not used by any line
+  m.FindFile("filename2");  // not used by any line
   Module::File *file3 = m.FindFile("filename3");
 
   // Create a function.
@@ -197,7 +197,7 @@
   EXPECT_NE(-1, vec2->source_id);
 
   stringstream s;
-  m.Write(s);
+  m.Write(s, true);
   string contents = s.str();
   EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
                "FILE 0 filename1\n"
@@ -209,6 +209,52 @@
                contents.c_str());
 }
 
+TEST(Write, NoCFI) {
+  stringstream s;
+  Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
+
+  // Some source files.  We will expect to see them in lexicographic order.
+  Module::File *file1 = m.FindFile("filename.cc");
+
+  // A function.
+  Module::Function *function = new(Module::Function);
+  function->name = "A_FLIBBERTIJIBBET::a_will_o_the_wisp(a clown)";
+  function->address = 0xbec774ea5dd935f3LL;
+  function->size = 0x2922088f98d3f6fcLL;
+  function->parameter_size = 0xe5e9aa008bd5f0d0LL;
+
+  // Some source lines.  The module should not sort these.
+  Module::Line line1 = { 0xbec774ea5dd935f3LL, 0x1c2be6d6c5af2611LL,
+                         file1, 41676901 };
+  function->lines.push_back(line1);
+
+  m.AddFunction(function);
+
+  // Some stack information.
+  Module::StackFrameEntry *entry = new Module::StackFrameEntry();
+  entry->address = 0x30f9e5c83323973dULL;
+  entry->size = 0x49fc9ca7c7c13dc2ULL;
+  entry->initial_rules".cfa" = "he was a handsome man";
+  entry->initial_rules"and" = "what i want to know is";
+  entry->rule_changes0x30f9e5c83323973eULL"how" =
+    "do you like your blueeyed boy";
+  entry->rule_changes0x30f9e5c83323973eULL"Mister" = "Death";
+  m.AddStackFrameEntry(entry);
+
+  // Set the load address.  Doing this after adding all the data to
+  // the module must work fine.
+  m.SetLoadAddress(0x2ab698b0b6407073LL);
+
+  m.Write(s, false);
+  string contents = s.str();
+  EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
+               "FILE 0 filename.cc\n"
+               "FUNC 9410dc39a798c580 2922088f98d3f6fc e5e9aa008bd5f0d0"
+               " A_FLIBBERTIJIBBET::a_will_o_the_wisp(a clown)\n"
+               "9410dc39a798c580 1c2be6d6c5af2611 41676901 0\n",
+               contents.c_str());
+}
+
 TEST(Construct, AddFunctions) {
   stringstream s;
   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
@@ -233,7 +279,7 @@
 
   m.AddFunctions(vec.begin(), vec.end());
 
-  m.Write(s);
+  m.Write(s, true);
   string contents = s.str();
   EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
                "FUNC 2987743d0b35b13f b369db048deb3010 938e556cb5a79988"
@@ -285,7 +331,7 @@
   m.AddStackFrameEntry(entry3);
 
   // Check that Write writes STACK CFI records properly.
-  m.Write(s);
+  m.Write(s, true);
   string contents = s.str();
   EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
                "STACK CFI INIT ddb5f41285aa7757 1486493370dc5073 \n"
@@ -361,7 +407,7 @@
   m.AddFunction(function1);
   m.AddFunction(function2);
 
-  m.Write(s);
+  m.Write(s, true);
   string contents = s.str();
   EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
                "FUNC d35402aac7a7ad5c 200b26e605f99071 f14ac4fed48c4a99"
@@ -380,7 +426,7 @@
   m.AddFunction(function1);
   m.AddFunction(function2);
 
-  m.Write(s);
+  m.Write(s, true);
   string contents = s.str();
   EXPECT_STREQ("MODULE os-name architecture id-string name with spaces\n"
                "FUNC d35402aac7a7ad5c 200b26e605f99071 f14ac4fed48c4a99"
@@ -407,7 +453,7 @@
   m.AddExtern(extern1);
   m.AddExtern(extern2);
 
-  m.Write(s);
+  m.Write(s, true);
   string contents = s.str();
 
   EXPECT_STREQ("MODULE " MODULE_OS " " MODULE_ARCH " "
@@ -434,7 +480,7 @@
   m.AddExtern(extern1);
   m.AddExtern(extern2);
 
-  m.Write(s);
+  m.Write(s, true);
   string contents = s.str();
 
   EXPECT_STREQ("MODULE " MODULE_OS " " MODULE_ARCH " "

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/stabs_reader.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/stabs_reader.cc Changed

@@ -130,7 +130,7 @@
   // There may be an N_SO entry whose name ends with a slash,
   // indicating the directory in which the compilation occurred.
   // The build directory defaults to NULL.
-  const char *build_directory = NULL;  
+  const char *build_directory = NULL;
   {
     const char *name = SymbolString();
     if (name0 && namestrlen(name) - 1 == '/') {
@@ -138,7 +138,7 @@
       ++iterator_;
     }
   }
-      
+
   // We expect to see an N_SO entry with a filename next, indicating
   // the start of the compilation unit.
   {
@@ -212,7 +212,7 @@
   queued_lines_.clear();
 
   return true;
-}          
+}
 
 bool StabsReader::ProcessFunction() {
   assert(!iterator_->at_end && iterator_->type == N_FUN);
@@ -237,7 +237,7 @@
       return false;
   }
   queued_lines_.clear();
-  
+
   while (!iterator_->at_end) {
     if (iterator_->type == N_SO || iterator_->type == N_FUN)
       break;
@@ -266,8 +266,8 @@
   if (!iterator_->at_end) {
     assert(iterator_->type == N_SO || iterator_->type == N_FUN);
     if (iterator_->type == N_FUN) {
-      const char *name = SymbolString();
-      if (name0 == '\0') {
+      const char *symbol_name = SymbolString();
+      if (symbol_name0 == '\0') {
         // An N_FUN entry with no name is a terminator for this function;
         // its value is the function's size.
         ending_address = function_address + iterator_->value;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/string_conversion.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/string_conversion.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/common/windows/pdb_source_line_writer.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/common/windows/pdb_source_line_writer.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/google_breakpad/common/minidump_cpu_arm.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/google_breakpad/common/minidump_cpu_arm.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/google_breakpad/common/minidump_exception_mac.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/google_breakpad/common/minidump_exception_mac.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/google_breakpad/common/minidump_format.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/google_breakpad/common/minidump_format.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/google_breakpad/processor/minidump_processor.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/google_breakpad/processor/minidump_processor.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/google_breakpad/processor/source_line_resolver_interface.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/google_breakpad/processor/source_line_resolver_interface.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/google_breakpad/processor/stack_frame_cpu.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/google_breakpad/processor/stack_frame_cpu.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/google_breakpad/processor/stackwalker.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/google_breakpad/processor/stackwalker.h Changed

@@ -54,7 +54,7 @@
 class SourceLineResolverInterface;
 struct StackFrame;
 class SymbolSupplier;
-class SystemInfo;
+struct SystemInfo;
 
 using std::set;
 
@@ -108,6 +108,15 @@
   // Returns false otherwise.
   bool InstructionAddressSeemsValid(u_int64_t address);
 
+  template<typename InstructionType>
+  bool ScanForReturnAddress(InstructionType location_start,
+                            InstructionType *location_found,
+                            InstructionType *ip_found) {
+    const int kRASearchWords = 30;
+    return ScanForReturnAddress(location_start, location_found, ip_found,
+                                kRASearchWords);
+  }
+
   // Scan the stack starting at location_start, looking for an address
   // that looks like a valid instruction pointer. Addresses must
   // 1) be contained in the current stack memory
@@ -120,10 +129,10 @@
   template<typename InstructionType>
   bool ScanForReturnAddress(InstructionType location_start,
                             InstructionType *location_found,
-                            InstructionType *ip_found) {
-    const int kRASearchWords = 30;
+                            InstructionType *ip_found,
+                            int searchwords) {
     for (InstructionType location = location_start;
-         location <= location_start + kRASearchWords * sizeof(InstructionType);
+         location <= location_start + searchwords * sizeof(InstructionType);
          location += sizeof(InstructionType)) {
       InstructionType ip;
       if (!memory_->GetMemoryAtAddress(location, &ip))

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/google_breakpad/processor/symbol_supplier.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/google_breakpad/processor/symbol_supplier.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/basic_source_line_resolver_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/basic_source_line_resolver_unittest.cc Changed

@@ -200,6 +200,7 @@
   ASSERT_EQ(frame.source_line_base, 0x1000);
   windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame));
   ASSERT_TRUE(windows_frame_info.get());
+  ASSERT_EQ(windows_frame_info->type_, WindowsFrameInfo::STACK_INFO_FRAME_DATA);
   ASSERT_FALSE(windows_frame_info->allocates_base_pointer);
   ASSERT_EQ(windows_frame_info->program_string,
             "$eip 4 + ^ = $esp $ebp 8 + = $ebp $ebp ^ =");
@@ -219,6 +220,7 @@
   ASSERT_EQ(frame.source_line, 0);
   windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame));
   ASSERT_TRUE(windows_frame_info.get());
+  ASSERT_EQ(windows_frame_info->type_, WindowsFrameInfo::STACK_INFO_UNKNOWN);
   ASSERT_FALSE(windows_frame_info->allocates_base_pointer);
   ASSERT_TRUE(windows_frame_info->program_string.empty());
 
@@ -228,6 +230,7 @@
   ASSERT_TRUE(frame.source_file_name.empty());
   ASSERT_EQ(frame.source_line, 0);
   windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame));
+  ASSERT_EQ(windows_frame_info->type_, WindowsFrameInfo::STACK_INFO_FRAME_DATA);
   ASSERT_TRUE(windows_frame_info.get());
   ASSERT_FALSE(windows_frame_info->allocates_base_pointer);
   ASSERT_FALSE(windows_frame_info->program_string.empty());
@@ -351,6 +354,7 @@
   ASSERT_EQ(frame.source_line_base, 0x2180);
   windows_frame_info.reset(resolver.FindWindowsFrameInfo(&frame));
   ASSERT_TRUE(windows_frame_info.get());
+  ASSERT_EQ(windows_frame_info->type_, WindowsFrameInfo::STACK_INFO_FRAME_DATA);
   ASSERT_EQ(windows_frame_info->prolog_size, 1);
 
   frame.instruction = 0x216f;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/binarystream.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/binarystream.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/disassembler_x86.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/disassembler_x86.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/exploitability.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/exploitability.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/fast_source_line_resolver.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/fast_source_line_resolver.cc Changed

@@ -107,10 +107,15 @@
 // WFI: WindowsFrameInfo.
 // Returns a WFI object reading from a raw memory chunk of data
 WindowsFrameInfo FastSourceLineResolver::CopyWFI(const char *raw) {
-  // The first 4Bytes of int data are unused.
-  // They corresponds to "int valid;" data member of WFI.
+  const WindowsFrameInfo::StackInfoTypes type =
+     static_cast<const WindowsFrameInfo::StackInfoTypes>(
+         *reinterpret_cast<const int32_t*>(raw));
+
+  // The first 8 bytes of int data are unused.
+  // They correspond to "StackInfoTypes type_;" and "int valid;"
+  // data member of WFI.
   const u_int32_t *para_uint32 = reinterpret_cast<const u_int32_t*>(
-      raw + sizeof(int32_t));
+      raw + 2 * sizeof(int32_t));
 
   u_int32_t prolog_size = para_uint320;;
   u_int32_t epilog_size = para_uint321;
@@ -122,7 +127,8 @@
   bool allocates_base_pointer = (*boolean != 0);
   std::string program_string = boolean + 1;
 
-  return WindowsFrameInfo(prolog_size,
+  return WindowsFrameInfo(type,
+                          prolog_size,
                           epilog_size,
                           parameter_size,
                           saved_register_size,

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/fast_source_line_resolver_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/fast_source_line_resolver_unittest.cc Changed

@@ -248,6 +248,7 @@
   ASSERT_EQ(frame.source_line, 0);
   windows_frame_info.reset(fast_resolver.FindWindowsFrameInfo(&frame));
   ASSERT_TRUE(windows_frame_info.get());
+  ASSERT_EQ(windows_frame_info->type_, WindowsFrameInfo::STACK_INFO_UNKNOWN);
   ASSERT_FALSE(windows_frame_info->allocates_base_pointer);
   ASSERT_TRUE(windows_frame_info->program_string.empty());
 
@@ -258,6 +259,7 @@
   ASSERT_EQ(frame.source_line, 0);
   windows_frame_info.reset(fast_resolver.FindWindowsFrameInfo(&frame));
   ASSERT_TRUE(windows_frame_info.get());
+  ASSERT_EQ(windows_frame_info->type_, WindowsFrameInfo::STACK_INFO_FRAME_DATA);
   ASSERT_FALSE(windows_frame_info->allocates_base_pointer);
   ASSERT_FALSE(windows_frame_info->program_string.empty());
 
@@ -380,6 +382,7 @@
   ASSERT_EQ(frame.source_line_base, 0x2180);
   windows_frame_info.reset(fast_resolver.FindWindowsFrameInfo(&frame));
   ASSERT_TRUE(windows_frame_info.get());
+  ASSERT_EQ(windows_frame_info->type_, WindowsFrameInfo::STACK_INFO_FRAME_DATA);
   ASSERT_EQ(windows_frame_info->prolog_size, 1);
 
   frame.instruction = 0x216f;

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/minidump.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/minidump.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/minidump_processor.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/minidump_processor.cc Changed

@@ -386,6 +386,11 @@
       break;
     }
 
+    case MD_OS_IOS: {
+      info->os = "iOS";
+      break;
+    }
+
     case MD_OS_LINUX: {
       info->os = "Linux";
       break;
@@ -451,7 +456,8 @@
     return reason;
 
   switch (raw_system_info->platform_id) {
-    case MD_OS_MAC_OS_X: {
+    case MD_OS_MAC_OS_X:
+    case MD_OS_IOS: {
       char flags_string11;
       snprintf(flags_string, sizeof(flags_string), "0x%08x", exception_flags);
       switch (exception_code) {
@@ -637,6 +643,12 @@
         case MD_EXCEPTION_MAC_SOFTWARE:
           reason = "EXC_SOFTWARE / ";
           switch (exception_flags) {
+            case MD_EXCEPTION_CODE_MAC_ABORT:
+              reason.append("SIGABRT");
+              break;
+            case MD_EXCEPTION_CODE_MAC_NS_EXCEPTION:
+              reason.append("UNCAUGHT_NS_EXCEPTION");
+              break;
             // These are ppc only but shouldn't be a problem as they're
             // unused on x86
             case MD_EXCEPTION_CODE_MAC_PPC_TRAP:

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/module_comparer.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/module_comparer.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/postfix_evaluator-inl.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/postfix_evaluator-inl.h Changed

@@ -67,132 +67,163 @@
 
 
 template<typename ValueType>
-bool PostfixEvaluator<ValueType>::EvaluateInternal(
+bool PostfixEvaluator<ValueType>::EvaluateToken(
+    const string &token,
     const string &expression,
     DictionaryValidityType *assigned) {
-  // Tokenize, splitting on whitespace.
-  istringstream stream(expression);
-  string token;
-  while (stream >> token) {
-    // There are enough binary operations that do exactly the same thing
-    // (other than the specific operation, of course) that it makes sense
-    // to share as much code as possible.
-    enum BinaryOperation {
-      BINARY_OP_NONE = 0,
-      BINARY_OP_ADD,
-      BINARY_OP_SUBTRACT,
-      BINARY_OP_MULTIPLY,
-      BINARY_OP_DIVIDE_QUOTIENT,
-      BINARY_OP_DIVIDE_MODULUS
-    };
-
-    BinaryOperation operation = BINARY_OP_NONE;
-    if (token == "+")
-      operation = BINARY_OP_ADD;
-    else if (token == "-")
-      operation = BINARY_OP_SUBTRACT;
-    else if (token == "*")
-      operation = BINARY_OP_MULTIPLY;
-    else if (token == "/")
-      operation = BINARY_OP_DIVIDE_QUOTIENT;
-    else if (token == "%")
-      operation = BINARY_OP_DIVIDE_MODULUS;
-
-    if (operation != BINARY_OP_NONE) {
-      // Get the operands.
-      ValueType operand1 = ValueType();
-      ValueType operand2 = ValueType();
-      if (!PopValues(&operand1, &operand2)) {
-        BPLOG(ERROR) << "Could not PopValues to get two values for binary "
-                        "operation " << token << ": " << expression;
+  // There are enough binary operations that do exactly the same thing
+  // (other than the specific operation, of course) that it makes sense
+  // to share as much code as possible.
+  enum BinaryOperation {
+    BINARY_OP_NONE = 0,
+    BINARY_OP_ADD,
+    BINARY_OP_SUBTRACT,
+    BINARY_OP_MULTIPLY,
+    BINARY_OP_DIVIDE_QUOTIENT,
+    BINARY_OP_DIVIDE_MODULUS,
+    BINARY_OP_ALIGN
+  };
+
+  BinaryOperation operation = BINARY_OP_NONE;
+  if (token == "+")
+    operation = BINARY_OP_ADD;
+  else if (token == "-")
+    operation = BINARY_OP_SUBTRACT;
+  else if (token == "*")
+    operation = BINARY_OP_MULTIPLY;
+  else if (token == "/")
+    operation = BINARY_OP_DIVIDE_QUOTIENT;
+  else if (token == "%")
+    operation = BINARY_OP_DIVIDE_MODULUS;
+  else if (token == "@")
+    operation = BINARY_OP_ALIGN;
+
+  if (operation != BINARY_OP_NONE) {
+    // Get the operands.
+    ValueType operand1 = ValueType();
+    ValueType operand2 = ValueType();
+    if (!PopValues(&operand1, &operand2)) {
+      BPLOG(ERROR) << "Could not PopValues to get two values for binary "
+                      "operation " << token << ": " << expression;
+      return false;
+    }
+
+    // Perform the operation.
+    ValueType result;
+    switch (operation) {
+      case BINARY_OP_ADD:
+        result = operand1 + operand2;
+        break;
+      case BINARY_OP_SUBTRACT:
+        result = operand1 - operand2;
+        break;
+      case BINARY_OP_MULTIPLY:
+        result = operand1 * operand2;
+        break;
+      case BINARY_OP_DIVIDE_QUOTIENT:
+        result = operand1 / operand2;
+        break;
+      case BINARY_OP_DIVIDE_MODULUS:
+        result = operand1 % operand2;
+        break;
+      case BINARY_OP_ALIGN:
+	result =
+	  operand1 & (static_cast<ValueType>(-1) ^ (operand2 - 1));
+        break;
+      case BINARY_OP_NONE:
+        // This will not happen, but compilers will want a default or
+        // BINARY_OP_NONE case.
+        BPLOG(ERROR) << "Not reached!";
         return false;
-      }
+        break;
+    }
 
-      // Perform the operation.
-      ValueType result;
-      switch (operation) {
-        case BINARY_OP_ADD:
-          result = operand1 + operand2;
-          break;
-        case BINARY_OP_SUBTRACT:
-          result = operand1 - operand2;
-          break;
-        case BINARY_OP_MULTIPLY:
-          result = operand1 * operand2;
-          break;
-        case BINARY_OP_DIVIDE_QUOTIENT:
-          result = operand1 / operand2;
-          break;
-        case BINARY_OP_DIVIDE_MODULUS:
-          result = operand1 % operand2;
-          break;
-        case BINARY_OP_NONE:
-          // This will not happen, but compilers will want a default or
-          // BINARY_OP_NONE case.
-          BPLOG(ERROR) << "Not reached!";
-          return false;
-          break;
-      }
+    // Save the result.
+    PushValue(result);
+  } else if (token == "^") {
+    // ^ for unary dereference.  Can't dereference without memory.
+    if (!memory_) {
+      BPLOG(ERROR) << "Attempt to dereference without memory: " <<
+                      expression;
+      return false;
+    }
 
-      // Save the result.
-      PushValue(result);
-    } else if (token == "^") {
-      // ^ for unary dereference.  Can't dereference without memory.
-      if (!memory_) {
-        BPLOG(ERROR) << "Attempt to dereference without memory: " <<
-                        expression;
-        return false;
-      }
+    ValueType address;
+    if (!PopValue(&address)) {
+      BPLOG(ERROR) << "Could not PopValue to get value to derefence: " <<
+                      expression;
+      return false;
+    }
 
-      ValueType address;
-      if (!PopValue(&address)) {
-        BPLOG(ERROR) << "Could not PopValue to get value to derefence: " <<
-                        expression;
-        return false;
-      }
+    ValueType value;
+    if (!memory_->GetMemoryAtAddress(address, &value)) {
+      BPLOG(ERROR) << "Could not dereference memory at address " <<
+                      HexString(address) << ": " << expression;
+      return false;
+    }
 
-      ValueType value;
-      if (!memory_->GetMemoryAtAddress(address, &value)) {
-        BPLOG(ERROR) << "Could not dereference memory at address " <<
-                        HexString(address) << ": " << expression;
-        return false;
-      }
+    PushValue(value);
+  } else if (token == "=") {
+    // = for assignment.
+    ValueType value;
+    if (!PopValue(&value)) {
+      BPLOG(INFO) << "Could not PopValue to get value to assign: " <<
+                     expression;
+      return false;
+    }
 
-      PushValue(value);
-    } else if (token == "=") {
-      // = for assignment.
-      ValueType value;
-      if (!PopValue(&value)) {
-        BPLOG(INFO) << "Could not PopValue to get value to assign: " <<
-                       expression;
-        return false;
-      }
+    // Assignment is only meaningful when assigning into an identifier.
+    // The identifier must name a variable, not a constant.  Variables
+    // begin with '$'.
+    string identifier;
+    if (PopValueOrIdentifier(NULL, &identifier) != POP_RESULT_IDENTIFIER) {
+      BPLOG(ERROR) << "PopValueOrIdentifier returned a value, but an "
+                      "identifier is needed to assign " <<
+                      HexString(value) << ": " << expression;
+      return false;
+    }
+    if (identifier.empty() || identifier0 != '$') {
+      BPLOG(ERROR) << "Can't assign " << HexString(value) << " to " <<
+                      identifier << ": " << expression;
+      return false;
+    }
+
+    (*dictionary_)identifier = value;
+    if (assigned)
+      (*assigned)identifier = true;
+  } else {
+    // The token is not an operator, it's a literal value or an identifier.
+    // Push it onto the stack as-is.  Use push_back instead of PushValue
+    // because PushValue pushes ValueType as a string, but token is already
+    // a string.
+    stack_.push_back(token);
+  }
+  return true;
+}
 
-      // Assignment is only meaningful when assigning into an identifier.
-      // The identifier must name a variable, not a constant.  Variables
-      // begin with '$'.
-      string identifier;
-      if (PopValueOrIdentifier(NULL, &identifier) != POP_RESULT_IDENTIFIER) {
-        BPLOG(ERROR) << "PopValueOrIdentifier returned a value, but an "
-                        "identifier is needed to assign " <<
-                        HexString(value) << ": " << expression;
+template<typename ValueType>
+bool PostfixEvaluator<ValueType>::EvaluateInternal(
+    const string &expression,
+    DictionaryValidityType *assigned) {
+  // Tokenize, splitting on whitespace.
+  istringstream stream(expression);
+  string token;
+  while (stream >> token) {
+    // Normally, tokens are whitespace-separated, but occasionally, the
+    // assignment operator is smashed up against the next token, i.e.
+    // $T0 $ebp 128 + =$eip $T0 4 + ^ =$ebp $T0 ^ =
+    // This has been observed in program strings produced by MSVS 2010 in LTO
+    // mode.
+    if (token.size() > 1 && token0 == '=') {
+      if (!EvaluateToken("=", expression, assigned)) {
         return false;
       }
-      if (identifier.empty() || identifier0 != '$') {
-        BPLOG(ERROR) << "Can't assign " << HexString(value) << " to " <<
-                        identifier << ": " << expression;
+
+      if (!EvaluateToken(token.substr(1), expression, assigned)) {
         return false;
       }
-
-      (*dictionary_)identifier = value;
-      if (assigned)
-        (*assigned)identifier = true;
-    } else {
-      // The token is not an operator, it's a literal value or an identifier.
-      // Push it onto the stack as-is.  Use push_back instead of PushValue
-      // because PushValue pushes ValueType as a string, but token is already
-      // a string.
-      stack_.push_back(token);
+    } else if (!EvaluateToken(token, expression, assigned)) {
+      return false;
     }
   }

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/postfix_evaluator.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/postfix_evaluator.h Changed

@@ -44,10 +44,12 @@
 // either literal values suitable for ValueType, or constants or variables,
 // which reference the dictionary.  The supported binary operators are +
 // (addition), - (subtraction), * (multiplication), / (quotient of division),
-// and % (modulus of division).  The unary ^ (dereference) operator is also
-// provided.  These operators allow any operand to be either a literal
-// value, constant, or variable.  Assignment (=) of any type of operand into
-// a variable is also supported.
+// % (modulus of division), and @ (data alignment). The alignment operator (@)
+// accepts a value and an alignment size, and produces a result that is a
+// multiple of the alignment size by truncating the input value.
+// The unary ^ (dereference) operator is also provided.  These operators
+// allow any operand to be either a literal value, constant, or variable.
+// Assignment (=) of any type of operand into a variable is also supported.
 //
 // The dictionary is provided as a map with string keys.  Keys beginning
 // with the '$' character are treated as variables.  All other keys are
@@ -151,6 +153,10 @@
   bool EvaluateInternal(const string &expression,
                         DictionaryValidityType *assigned);
 
+  bool EvaluateToken(const string &token,
+                     const string &expression,
+                     DictionaryValidityType *assigned);
+
   // The dictionary mapping constant and variable identifiers (strings) to
   // values.  Keys beginning with '$' are treated as variable names, and
   // PostfixEvaluator is free to create and modify these keys.  Weak pointer.

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/postfix_evaluator_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/postfix_evaluator_unittest.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/simple_serializer-inl.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/simple_serializer-inl.h Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/source_line_resolver_base.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/source_line_resolver_base.cc Changed

@@ -88,7 +88,7 @@
   int error_code = stat(map_file.c_str(), &buf);
   if (error_code == -1) {
     string error_string;
-    int error_code = ErrnoString(&error_string);
+    error_code = ErrnoString(&error_string);
     BPLOG(ERROR) << "Could not open " << map_file <<
         ", error " << error_code << ": " << error_string;
     return false;
@@ -110,7 +110,7 @@
   FILE *f = fopen(map_file.c_str(), "rt");
   if (!f) {
     string error_string;
-    int error_code = ErrnoString(&error_string);
+    error_code = ErrnoString(&error_string);
     BPLOG(ERROR) << "Could not open " << map_file <<
         ", error " << error_code << ": " << error_string;
     delete  (*symbol_data);
@@ -126,7 +126,7 @@
 
   if (items_read != file_size) {
     string error_string;
-    int error_code = ErrnoString(&error_string);
+    error_code = ErrnoString(&error_string);
     BPLOG(ERROR) << "Could not slurp " << map_file <<
         ", error " << error_code << ": " << error_string;
     delete  (*symbol_data);
@@ -240,11 +240,11 @@
   if (!code_module)
     return;
 
-  ModuleMap::iterator iter = modules_->find(code_module->code_file());
-  if (iter != modules_->end()) {
-    Module *symbol_module = iter->second;
+  ModuleMap::iterator mod_iter = modules_->find(code_module->code_file());
+  if (mod_iter != modules_->end()) {
+    Module *symbol_module = mod_iter->second;
     delete symbol_module;
-    modules_->erase(iter);
+    modules_->erase(mod_iter);
   }
 
   if (ShouldDeleteMemoryBufferAfterLoadModule()) {

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/stackwalker.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/stackwalker.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/stackwalker_amd64.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/stackwalker_amd64.cc Changed

@@ -146,18 +146,13 @@
     const vector<StackFrame *> &frames) {
   StackFrameAMD64 *last_frame = static_cast<StackFrameAMD64 *>(frames.back());
   u_int64_t last_rsp = last_frame->context.rsp;
-  u_int64_t caller_rsp, caller_rip;
-  
-  if (!ScanForReturnAddress(last_rsp, &caller_rsp, &caller_rip)) {
+  u_int64_t caller_rip_address, caller_rip;
+
+  if (!ScanForReturnAddress(last_rsp, &caller_rip_address, &caller_rip)) {
     // No plausible return address was found.
     return NULL;
   }
 
-  // ScanForReturnAddress found a reasonable return address. Advance
-  // %rsp to the location above the one where the return address was
-  // found.
-  caller_rsp += 8;
-
   // Create a new stack frame (ownership will be transferred to the caller)
   // and fill it in.
   StackFrameAMD64 *frame = new StackFrameAMD64();
@@ -165,10 +160,34 @@
   frame->trust = StackFrame::FRAME_TRUST_SCAN;
   frame->context = last_frame->context;
   frame->context.rip = caller_rip;
-  frame->context.rsp = caller_rsp;
+  // The caller's %rsp is directly underneath the return address pushed by
+  // the call.
+  frame->context.rsp = caller_rip_address + 8;
   frame->context_validity = StackFrameAMD64::CONTEXT_VALID_RIP |
                             StackFrameAMD64::CONTEXT_VALID_RSP;
 
+  // Other unwinders give up if they don't have an %rbp value, so see if we
+  // can pass some plausible value on.
+  if (last_frame->context_validity & StackFrameAMD64::CONTEXT_VALID_RBP) {
+    // Functions typically push their caller's %rbp immediately upon entry,
+    // and then set %rbp to point to that. So if the callee's %rbp is
+    // pointing to the first word below the alleged return address, presume
+    // that the caller's %rbp is saved there.
+    if (caller_rip_address - 8 == last_frame->context.rbp) {
+      u_int64_t caller_rbp = 0;
+      if (memory_->GetMemoryAtAddress(last_frame->context.rbp, &caller_rbp) &&
+          caller_rbp > caller_rip_address) {
+        frame->context.rbp = caller_rbp;
+        frame->context_validity |= StackFrameAMD64::CONTEXT_VALID_RBP;
+      }
+    } else if (last_frame->context.rbp >= caller_rip_address + 8) {
+      // If the callee's %rbp is plausible as a value for the caller's
+      // %rbp, presume that the callee left it unchanged.
+      frame->context.rbp = last_frame->context.rbp;
+      frame->context_validity |= StackFrameAMD64::CONTEXT_VALID_RBP;
+    }
+  }
+
   return frame;
 }

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/stackwalker_amd64_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/stackwalker_amd64_unittest.cc Changed

@@ -182,7 +182,7 @@
   stack_section.start() = 0x8000000080000000ULL;
   u_int64_t return_address1 = 0x50000000b0000100ULL;
   u_int64_t return_address2 = 0x50000000b0000900ULL;
-  Label frame1_sp, frame2_sp;
+  Label frame1_sp, frame2_sp, frame1_rbp;
   stack_section
     // frame 0
     .Append(16, 0)                      // space
@@ -198,6 +198,11 @@
     .D64(0x40000000b0000000ULL)         // more junk
     .D64(0x50000000d0000000ULL)
 
+    .Mark(&frame1_rbp)
+    .D64(stack_section.start())         // This is in the right place to be
+                                        // a saved rbp, but it's bogus, so
+                                        // we shouldn't report it.
+
     .D64(return_address2)               // actual return address
     // frame 2
     .Mark(&frame2_sp)
@@ -206,6 +211,7 @@
   RegionFromSection();
     
   raw_context.rip = 0x40000000c0000200ULL;
+  raw_context.rbp = frame1_rbp.Value();
   raw_context.rsp = stack_section.start().Value();
 
   StackwalkerAMD64 walker(&system_info, &raw_context, &stack_region, &modules,
@@ -222,10 +228,12 @@
   StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64 *>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
-             StackFrameAMD64::CONTEXT_VALID_RSP),
+             StackFrameAMD64::CONTEXT_VALID_RSP |
+             StackFrameAMD64::CONTEXT_VALID_RBP),
             frame1->context_validity);
   EXPECT_EQ(return_address1, frame1->context.rip);
   EXPECT_EQ(frame1_sp.Value(), frame1->context.rsp);
+  EXPECT_EQ(frame1_rbp.Value(), frame1->context.rbp);
 
   StackFrameAMD64 *frame2 = static_cast<StackFrameAMD64 *>(frames->at(2));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame2->trust);
@@ -243,7 +251,7 @@
   // lies within a function's bounds.
   stack_section.start() = 0x8000000080000000ULL;
   u_int64_t return_address = 0x50000000b0000110ULL;
-  Label frame1_sp;
+  Label frame1_sp, frame1_rbp;
 
   stack_section
     // frame 0
@@ -258,10 +266,12 @@
     .D64(return_address)                // actual return address
     // frame 1
     .Mark(&frame1_sp)
-    .Append(32, 0);                     // end of stack
+    .Append(32, 0)                      // end of stack
+    .Mark(&frame1_rbp);
   RegionFromSection();
     
   raw_context.rip = 0x40000000c0000200ULL;
+  raw_context.rbp = frame1_rbp.Value();
   raw_context.rsp = stack_section.start().Value();
 
   SetModuleSymbols(&module1,
@@ -286,14 +296,81 @@
   StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64 *>(frames->at(1));
   EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
   ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
-             StackFrameAMD64::CONTEXT_VALID_RSP),
+             StackFrameAMD64::CONTEXT_VALID_RSP |
+             StackFrameAMD64::CONTEXT_VALID_RBP),
             frame1->context_validity);
   EXPECT_EQ(return_address, frame1->context.rip);
   EXPECT_EQ(frame1_sp.Value(), frame1->context.rsp);
+  EXPECT_EQ(frame1_rbp.Value(), frame1->context.rbp);
   EXPECT_EQ("echidna", frame1->function_name);
   EXPECT_EQ(0x50000000b0000100ULL, frame1->function_base);
 }
 
+TEST_F(GetCallerFrame, CallerPushedRBP) {
+  // Functions typically push their %rbp upon entry and set %rbp pointing
+  // there.  If stackwalking finds a plausible address for the next frame's
+  // %rbp directly below the return address, assume that it is indeed the
+  // next frame's %rbp.
+  stack_section.start() = 0x8000000080000000ULL;
+  u_int64_t return_address = 0x50000000b0000110ULL;
+  Label frame0_rbp, frame1_sp, frame1_rbp;
+
+  stack_section
+    // frame 0
+    .Append(16, 0)                      // space
+
+    .D64(0x40000000b0000000ULL)         // junk that's not
+    .D64(0x50000000b0000000ULL)         // a return address
+
+    .D64(0x40000000c0001000ULL)         // a couple of plausible addresses
+    .D64(0x50000000b000aaaaULL)         // that are not within functions
+
+    .Mark(&frame0_rbp)
+    .D64(frame1_rbp)                    // caller-pushed %rbp
+    .D64(return_address)                // actual return address
+    // frame 1
+    .Mark(&frame1_sp)
+    .Append(32, 0)                      // body of frame1
+    .Mark(&frame1_rbp);                 // end of stack
+  RegionFromSection();
+
+  raw_context.rip = 0x40000000c0000200ULL;
+  raw_context.rbp = frame0_rbp.Value();
+  raw_context.rsp = stack_section.start().Value();
+
+  SetModuleSymbols(&module1,
+                   // The youngest frame's function.
+                   "FUNC 100 400 10 sasquatch\n");
+  SetModuleSymbols(&module2,
+                   // The calling frame's function.
+                   "FUNC 100 400 10 yeti\n");
+
+  StackwalkerAMD64 walker(&system_info, &raw_context, &stack_region, &modules,
+                          &supplier, &resolver);
+  ASSERT_TRUE(walker.Walk(&call_stack));
+  frames = call_stack.frames();
+  ASSERT_EQ(2U, frames->size());
+
+  StackFrameAMD64 *frame0 = static_cast<StackFrameAMD64 *>(frames->at(0));
+  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+  ASSERT_EQ(StackFrameAMD64::CONTEXT_VALID_ALL, frame0->context_validity);
+  EXPECT_EQ(frame0_rbp.Value(), frame0->context.rbp);
+  EXPECT_EQ("sasquatch", frame0->function_name);
+  EXPECT_EQ(0x40000000c0000100ULL, frame0->function_base);
+
+  StackFrameAMD64 *frame1 = static_cast<StackFrameAMD64 *>(frames->at(1));
+  EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
+  ASSERT_EQ((StackFrameAMD64::CONTEXT_VALID_RIP |
+             StackFrameAMD64::CONTEXT_VALID_RSP |
+             StackFrameAMD64::CONTEXT_VALID_RBP),
+            frame1->context_validity);
+  EXPECT_EQ(return_address, frame1->context.rip);
+  EXPECT_EQ(frame1_sp.Value(), frame1->context.rsp);
+  EXPECT_EQ(frame1_rbp.Value(), frame1->context.rbp);
+  EXPECT_EQ("yeti", frame1->function_name);
+  EXPECT_EQ(0x50000000b0000100ULL, frame1->function_base);
+}
+
 struct CFIFixture: public StackwalkerAMD64Fixture {
   CFIFixture() {
     // Provide a bunch of STACK CFI records; we'll walk to the caller

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/stackwalker_arm.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/stackwalker_arm.cc Changed

@@ -33,7 +33,6 @@
 //
 // Author: Mark Mentovai, Ted Mielczarek, Jim Blandy
 
-
 #include "google_breakpad/processor/call_stack.h"
 #include "google_breakpad/processor/memory_region.h"
 #include "google_breakpad/processor/source_line_resolver_interface.h"
@@ -48,12 +47,13 @@
 
 StackwalkerARM::StackwalkerARM(const SystemInfo *system_info,
                                const MDRawContextARM *context,
+                               int fp_register,
                                MemoryRegion *memory,
                                const CodeModules *modules,
                                SymbolSupplier *supplier,
                                SourceLineResolverInterface *resolver)
     : Stackwalker(system_info, memory, modules, supplier, resolver),
-      context_(context), 
+      context_(context), fp_register_(fp_register),
       context_frame_validity_(StackFrameARM::CONTEXT_VALID_ALL) { }
 
 
@@ -70,7 +70,7 @@
   frame->context = *context_;
   frame->context_validity = context_frame_validity_;
   frame->trust = StackFrame::FRAME_TRUST_CONTEXT;
-  frame->instruction = frame->context.iregs15;
+  frame->instruction = frame->context.iregsMD_CONTEXT_ARM_REG_PC;
 
   return frame;
 }
@@ -125,8 +125,18 @@
     CFIFrameInfo::RegisterValueMap<u_int32_t>::iterator entry =
       caller_registers.find(".ra");
     if (entry != caller_registers.end()) {
-      frame->context_validity |= StackFrameARM::CONTEXT_VALID_PC;
-      frame->context.iregsMD_CONTEXT_ARM_REG_PC = entry->second;
+      if (fp_register_ == -1) {
+        frame->context_validity |= StackFrameARM::CONTEXT_VALID_PC;
+        frame->context.iregsMD_CONTEXT_ARM_REG_PC = entry->second;
+      } else {
+        // The CFI updated the link register and not the program counter.
+        // Handle getting the program counter from the link register.
+        frame->context_validity |= StackFrameARM::CONTEXT_VALID_PC;
+        frame->context_validity |= StackFrameARM::CONTEXT_VALID_LR;
+        frame->context.iregsMD_CONTEXT_ARM_REG_LR = entry->second;
+        frame->context.iregsMD_CONTEXT_ARM_REG_PC =
+            last_frame->context.iregsMD_CONTEXT_ARM_REG_LR;
+      }
     }
   }
   // If the CFI doesn't recover the SP explicitly, then use .cfa.
@@ -154,7 +164,7 @@
   StackFrameARM *last_frame = static_cast<StackFrameARM *>(frames.back());
   u_int32_t last_sp = last_frame->context.iregsMD_CONTEXT_ARM_REG_SP;
   u_int32_t caller_sp, caller_pc;
-  
+
   if (!ScanForReturnAddress(last_sp, &caller_sp, &caller_pc)) {
     // No plausible return address was found.
     return NULL;
@@ -179,6 +189,52 @@
   return frame;
 }
 
+StackFrameARM *StackwalkerARM::GetCallerByFramePointer(
+    const vector<StackFrame *> &frames) {
+  StackFrameARM *last_frame = static_cast<StackFrameARM *>(frames.back());
+
+  if (!(last_frame->context_validity &
+        StackFrameARM::RegisterValidFlag(fp_register_))) {
+    return NULL;
+  }
+
+  u_int32_t last_fp = last_frame->context.iregsfp_register_;
+
+  u_int32_t caller_fp = 0;
+  if (last_fp && !memory_->GetMemoryAtAddress(last_fp, &caller_fp)) {
+    BPLOG(ERROR) << "Unable to read caller_fp from last_fp: 0x"
+                 << std::hex << last_fp;
+    return NULL;
+  }
+
+  u_int32_t caller_lr = 0;
+  if (last_fp && !memory_->GetMemoryAtAddress(last_fp + 4, &caller_lr)) {
+    BPLOG(ERROR) << "Unable to read caller_lr from last_fp + 4: 0x"
+                 << std::hex << (last_fp + 4);
+    return NULL;
+  }
+
+  u_int32_t caller_sp = last_fp ? last_fp + 8 :
+      last_frame->context.iregsMD_CONTEXT_ARM_REG_SP;
+
+  // Create a new stack frame (ownership will be transferred to the caller)
+  // and fill it in.
+  StackFrameARM *frame = new StackFrameARM();
+
+  frame->trust = StackFrame::FRAME_TRUST_FP;
+  frame->context = last_frame->context;
+  frame->context.iregsfp_register_ = caller_fp;
+  frame->context.iregsMD_CONTEXT_ARM_REG_SP = caller_sp;
+  frame->context.iregsMD_CONTEXT_ARM_REG_PC =
+      last_frame->context.iregsMD_CONTEXT_ARM_REG_LR;
+  frame->context.iregsMD_CONTEXT_ARM_REG_LR = caller_lr;
+  frame->context_validity = StackFrameARM::CONTEXT_VALID_PC |
+                            StackFrameARM::CONTEXT_VALID_LR |
+                            StackFrameARM::RegisterValidFlag(fp_register_) |
+                            StackFrameARM::CONTEXT_VALID_SP;
+  return frame;
+}
+
 StackFrame* StackwalkerARM::GetCallerFrame(const CallStack *stack) {
   if (!memory_ || !stack) {
     BPLOG(ERROR) << "Can't get caller frame without memory or stack";
@@ -196,10 +252,13 @@
     frame.reset(GetCallerByCFIFrameInfo(frames, cfi_frame_info.get()));
 
   // If CFI failed, or there wasn't CFI available, fall back
-  // to stack scanning.
-  if (!frame.get()) {
+  // to frame pointer, if this is configured.
+  if (fp_register_ >= 0 && !frame.get())
+    frame.reset(GetCallerByFramePointer(frames));
+
+  // If everuthing failed, fall back to stack scanning.
+  if (!frame.get())
     frame.reset(GetCallerByStackScan(frames));
-  }
 
   // If nothing worked, tell the caller.
   if (!frame.get())
@@ -225,7 +284,7 @@
   // match up with the line that contains the function call. Callers that
   // require the exact return address value may access
   // frame->context.iregsMD_CONTEXT_ARM_REG_PC.
-  frame->instruction = frame->context.iregsMD_CONTEXT_ARM_REG_PC - 1;
+  frame->instruction = frame->context.iregsMD_CONTEXT_ARM_REG_PC - 2;
 
   return frame.release();
 }

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/stackwalker_arm.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/stackwalker_arm.h Changed

@@ -40,7 +40,6 @@
 #ifndef PROCESSOR_STACKWALKER_ARM_H__
 #define PROCESSOR_STACKWALKER_ARM_H__
 
-
 #include "google_breakpad/common/breakpad_types.h"
 #include "google_breakpad/common/minidump_format.h"
 #include "google_breakpad/processor/stackwalker.h"
@@ -57,6 +56,7 @@
   // to the base Stackwalker constructor.
   StackwalkerARM(const SystemInfo *system_info,
                  const MDRawContextARM *context,
+                 int fp_register,
                  MemoryRegion *memory,
                  const CodeModules *modules,
                  SymbolSupplier *supplier,
@@ -78,14 +78,22 @@
   StackFrameARM *GetCallerByCFIFrameInfo(const vector<StackFrame *> &frames,
                                          CFIFrameInfo *cfi_frame_info);
 
+  // Use the frame pointer. The caller takes ownership of the returned frame.
+  // Return NULL on failure.
+  StackFrameARM *GetCallerByFramePointer(const vector<StackFrame *> &frames);
+
   // Scan the stack for plausible return addresses. The caller takes ownership
-  // of the returned frame. Return NULL on failure. 
+  // of the returned frame. Return NULL on failure.
   StackFrameARM *GetCallerByStackScan(const vector<StackFrame *> &frames);
 
   // Stores the CPU context corresponding to the youngest stack frame, to
   // be returned by GetContextFrame.
   const MDRawContextARM *context_;
 
+  // The register to use a as frame pointer. The value is -1 if frame pointer
+  // cannot be used.
+  int fp_register_;
+
   // Validity mask for youngest stack frame. This is always
   // CONTEXT_VALID_ALL in real use; it is only changeable for the sake of
   // unit tests.

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/stackwalker_arm_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/stackwalker_arm_unittest.cc Changed

@@ -116,7 +116,7 @@
     for (size_t i = 0; i < sizeof(*raw_context); i++)
       reinterpret_cast<u_int8_t *>(raw_context)i = (x += 17);
   }
-  
+
   SystemInfo system_info;
   MDRawContextARM raw_context;
   Section stack_section;
@@ -136,7 +136,7 @@
   // Since we have no call frame information, and all unwinding
   // requires call frame information, the stack walk will end after
   // the first frame.
-  StackwalkerARM walker(&system_info, &raw_context, &stack_region, &modules,
+  StackwalkerARM walker(&system_info, &raw_context, -1, &stack_region, &modules,
                         NULL, NULL);
   // This should succeed even without a resolver or supplier.
   ASSERT_TRUE(walker.Walk(&call_stack));
@@ -154,7 +154,7 @@
   // Since we have no call frame information, and all unwinding
   // requires call frame information, the stack walk will end after
   // the first frame.
-  StackwalkerARM walker(&system_info, &raw_context, &stack_region, &modules,
+  StackwalkerARM walker(&system_info, &raw_context, -1, &stack_region, &modules,
                         &supplier, &resolver);
   ASSERT_TRUE(walker.Walk(&call_stack));
   frames = call_stack.frames();
@@ -201,7 +201,7 @@
   raw_context.iregsMD_CONTEXT_ARM_REG_PC = 0x40005510;
   raw_context.iregsMD_CONTEXT_ARM_REG_SP = stack_section.start().Value();
 
-  StackwalkerARM walker(&system_info, &raw_context, &stack_region, &modules,
+  StackwalkerARM walker(&system_info, &raw_context, -1, &stack_region, &modules,
                         &supplier, &resolver);
   ASSERT_TRUE(walker.Walk(&call_stack));
   frames = call_stack.frames();
@@ -264,7 +264,7 @@
                    // The calling frame's function.
                    "FUNC 100 400 10 marsupial\n");
 
-  StackwalkerARM walker(&system_info, &raw_context, &stack_region, &modules,
+  StackwalkerARM walker(&system_info, &raw_context, -1, &stack_region, &modules,
                         &supplier, &resolver);
   ASSERT_TRUE(walker.Walk(&call_stack));
   frames = call_stack.frames();
@@ -374,8 +374,8 @@
     RegionFromSection();
     raw_context.iregsMD_CONTEXT_ARM_REG_SP = stack_section.start().Value();
 
-    StackwalkerARM walker(&system_info, &raw_context, &stack_region, &modules,
-                          &supplier, &resolver);
+    StackwalkerARM walker(&system_info, &raw_context, -1, &stack_region,
+                          &modules, &supplier, &resolver);
     walker.SetContextFrameValidity(context_frame_validity);
     ASSERT_TRUE(walker.Walk(&call_stack));
     frames = call_stack.frames();
@@ -417,7 +417,7 @@
     EXPECT_EQ(expected.iregsMD_CONTEXT_ARM_REG_PC,
               frame1->context.iregsMD_CONTEXT_ARM_REG_PC);
     EXPECT_EQ(expected.iregsMD_CONTEXT_ARM_REG_PC,
-              frame1->instruction + 1);
+              frame1->instruction + 2);
     EXPECT_EQ("epictetus", frame1->function_name);
   }
 
@@ -564,9 +564,9 @@
 // move in the wrong direction.
 TEST_F(CFI, RejectBackwards) {
   raw_context.iregsMD_CONTEXT_ARM_REG_PC = 0x40006000;
-  raw_context.iregsMD_CONTEXT_ARM_REG_SP = 0x80000000;  
+  raw_context.iregsMD_CONTEXT_ARM_REG_SP = 0x80000000;
   raw_context.iregsMD_CONTEXT_ARM_REG_LR = 0x40005510;
-  StackwalkerARM walker(&system_info, &raw_context, &stack_region, &modules,
+  StackwalkerARM walker(&system_info, &raw_context, -1, &stack_region, &modules,
                         &supplier, &resolver);
   ASSERT_TRUE(walker.Walk(&call_stack));
   frames = call_stack.frames();
@@ -576,11 +576,189 @@
 // Check that we reject rules whose expressions' evaluation fails.
 TEST_F(CFI, RejectBadExpressions) {
   raw_context.iregsMD_CONTEXT_ARM_REG_PC = 0x40007000;
-  raw_context.iregsMD_CONTEXT_ARM_REG_SP = 0x80000000;  
-  StackwalkerARM walker(&system_info, &raw_context, &stack_region, &modules,
+  raw_context.iregsMD_CONTEXT_ARM_REG_SP = 0x80000000;
+  StackwalkerARM walker(&system_info, &raw_context, -1, &stack_region, &modules,
                         &supplier, &resolver);
   ASSERT_TRUE(walker.Walk(&call_stack));
   frames = call_stack.frames();
   ASSERT_EQ(1U, frames->size());
 }
 
+class StackwalkerARMFixtureIOS : public StackwalkerARMFixture {
+ public:
+  StackwalkerARMFixtureIOS() {
+    system_info.os = "iOS";
+    system_info.os_short = "ios";
+  }
+};
+
+class GetFramesByFramePointer: public StackwalkerARMFixtureIOS, public Test { };
+
+TEST_F(GetFramesByFramePointer, OnlyFramePointer) {
+  stack_section.start() = 0x80000000;
+  u_int32_t return_address1 = 0x50000100;
+  u_int32_t return_address2 = 0x50000900;
+  Label frame1_sp, frame2_sp;
+  Label frame1_fp, frame2_fp;
+  stack_section
+    // frame 0
+    .Append(32, 0)           // Whatever values on the stack.
+    .D32(0x0000000D)         // junk that's not
+    .D32(0xF0000000)         // a return address.
+
+    .Mark(&frame1_fp)        // Next fp will point to the next value.
+    .D32(frame2_fp)          // Save current frame pointer.
+    .D32(return_address2)    // Save current link register.
+    .Mark(&frame1_sp)
+
+    // frame 1
+    .Append(32, 0)           // Whatever values on the stack.
+    .D32(0x0000000D)         // junk that's not
+    .D32(0xF0000000)         // a return address.
+
+    .Mark(&frame2_fp)
+    .D32(0)
+    .D32(0)
+    .Mark(&frame2_sp)
+
+    // frame 2
+    .Append(32, 0)           // Whatever values on the stack.
+    .D32(0x0000000D)         // junk that's not
+    .D32(0xF0000000);        // a return address.
+  RegionFromSection();
+
+
+  raw_context.iregsMD_CONTEXT_ARM_REG_PC = 0x40005510;
+  raw_context.iregsMD_CONTEXT_ARM_REG_LR = return_address1;
+  raw_context.iregsMD_CONTEXT_ARM_REG_IOS_FP = frame1_fp.Value();
+  raw_context.iregsMD_CONTEXT_ARM_REG_SP = stack_section.start().Value();
+
+  StackwalkerARM walker(&system_info, &raw_context, MD_CONTEXT_ARM_REG_IOS_FP,
+                        &stack_region, &modules, &supplier, &resolver);
+
+  ASSERT_TRUE(walker.Walk(&call_stack));
+  frames = call_stack.frames();
+  ASSERT_EQ(3U, frames->size());
+
+  StackFrameARM *frame0 = static_cast<StackFrameARM *>(frames->at(0));
+  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+  ASSERT_EQ(StackFrameARM::CONTEXT_VALID_ALL, frame0->context_validity);
+  EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
+
+  StackFrameARM *frame1 = static_cast<StackFrameARM *>(frames->at(1));
+  EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
+  ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
+             StackFrameARM::CONTEXT_VALID_LR |
+             StackFrameARM::RegisterValidFlag(MD_CONTEXT_ARM_REG_IOS_FP) |
+             StackFrameARM::CONTEXT_VALID_SP),
+            frame1->context_validity);
+  EXPECT_EQ(return_address1, frame1->context.iregsMD_CONTEXT_ARM_REG_PC);
+  EXPECT_EQ(return_address2, frame1->context.iregsMD_CONTEXT_ARM_REG_LR);
+  EXPECT_EQ(frame1_sp.Value(), frame1->context.iregsMD_CONTEXT_ARM_REG_SP);
+  EXPECT_EQ(frame2_fp.Value(),
+            frame1->context.iregsMD_CONTEXT_ARM_REG_IOS_FP);
+
+  StackFrameARM *frame2 = static_cast<StackFrameARM *>(frames->at(2));
+  EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame2->trust);
+  ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
+             StackFrameARM::CONTEXT_VALID_LR |
+             StackFrameARM::RegisterValidFlag(MD_CONTEXT_ARM_REG_IOS_FP) |
+             StackFrameARM::CONTEXT_VALID_SP),
+            frame2->context_validity);
+  EXPECT_EQ(return_address2, frame2->context.iregsMD_CONTEXT_ARM_REG_PC);
+  EXPECT_EQ(0, frame2->context.iregsMD_CONTEXT_ARM_REG_LR);
+  EXPECT_EQ(frame2_sp.Value(), frame2->context.iregsMD_CONTEXT_ARM_REG_SP);
+  EXPECT_EQ(0, frame2->context.iregsMD_CONTEXT_ARM_REG_IOS_FP);
+}
+
+TEST_F(GetFramesByFramePointer, FramePointerAndCFI) {
+  // Provide the standatd STACK CFI records that is obtained when exmining an
+  // executable produced by XCode.
+  SetModuleSymbols(&module1,
+                     // Adding a function in CFI.
+                     "FUNC 4000 1000 10 enchiridion\n"
+
+                     "STACK CFI INIT 4000 100 .cfa: sp 0 + .ra: lr\n"
+                     "STACK CFI 4001 .cfa: sp 8 + .ra: .cfa -4 + ^"
+                     " r7: .cfa -8 + ^\n"
+                     "STACK CFI 4002 .cfa: r7 8 +\n"
+                  );
+
+  stack_section.start() = 0x80000000;
+  u_int32_t return_address1 = 0x40004010;
+  u_int32_t return_address2 = 0x50000900;
+  Label frame1_sp, frame2_sp;
+  Label frame1_fp, frame2_fp;
+  stack_section
+    // frame 0
+    .Append(32, 0)           // Whatever values on the stack.
+    .D32(0x0000000D)         // junk that's not
+    .D32(0xF0000000)         // a return address.
+
+    .Mark(&frame1_fp)        // Next fp will point to the next value.
+    .D32(frame2_fp)          // Save current frame pointer.
+    .D32(return_address2)    // Save current link register.
+    .Mark(&frame1_sp)
+
+    // frame 1
+    .Append(32, 0)           // Whatever values on the stack.
+    .D32(0x0000000D)         // junk that's not
+    .D32(0xF0000000)         // a return address.
+
+    .Mark(&frame2_fp)
+    .D32(0)
+    .D32(0)
+    .Mark(&frame2_sp)
+
+    // frame 2
+    .Append(32, 0)           // Whatever values on the stack.
+    .D32(0x0000000D)         // junk that's not
+    .D32(0xF0000000);        // a return address.
+  RegionFromSection();
+
+
+  raw_context.iregsMD_CONTEXT_ARM_REG_PC = 0x50000400;
+  raw_context.iregsMD_CONTEXT_ARM_REG_LR = return_address1;
+  raw_context.iregsMD_CONTEXT_ARM_REG_IOS_FP = frame1_fp.Value();
+  raw_context.iregsMD_CONTEXT_ARM_REG_SP = stack_section.start().Value();
+
+  StackwalkerARM walker(&system_info, &raw_context, MD_CONTEXT_ARM_REG_IOS_FP,
+                        &stack_region, &modules, &supplier, &resolver);
+
+  ASSERT_TRUE(walker.Walk(&call_stack));
+  frames = call_stack.frames();
+  ASSERT_EQ(3U, frames->size());
+
+  StackFrameARM *frame0 = static_cast<StackFrameARM *>(frames->at(0));
+  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+  ASSERT_EQ(StackFrameARM::CONTEXT_VALID_ALL, frame0->context_validity);
+  EXPECT_EQ(0, memcmp(&raw_context, &frame0->context, sizeof(raw_context)));
+
+  StackFrameARM *frame1 = static_cast<StackFrameARM *>(frames->at(1));
+  EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
+  ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
+             StackFrameARM::CONTEXT_VALID_LR |
+             StackFrameARM::RegisterValidFlag(MD_CONTEXT_ARM_REG_IOS_FP) |
+             StackFrameARM::CONTEXT_VALID_SP),
+            frame1->context_validity);
+  EXPECT_EQ(return_address1, frame1->context.iregsMD_CONTEXT_ARM_REG_PC);
+  EXPECT_EQ(return_address2, frame1->context.iregsMD_CONTEXT_ARM_REG_LR);
+  EXPECT_EQ(frame1_sp.Value(), frame1->context.iregsMD_CONTEXT_ARM_REG_SP);
+  EXPECT_EQ(frame2_fp.Value(),
+            frame1->context.iregsMD_CONTEXT_ARM_REG_IOS_FP);
+  EXPECT_EQ("enchiridion", frame1->function_name);
+  EXPECT_EQ(0x40004000U, frame1->function_base);
+
+
+  StackFrameARM *frame2 = static_cast<StackFrameARM *>(frames->at(2));
+  EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame2->trust);
+  ASSERT_EQ((StackFrameARM::CONTEXT_VALID_PC |
+             StackFrameARM::CONTEXT_VALID_LR |
+             StackFrameARM::RegisterValidFlag(MD_CONTEXT_ARM_REG_IOS_FP) |
+             StackFrameARM::CONTEXT_VALID_SP),
+            frame2->context_validity);
+  EXPECT_EQ(return_address2, frame2->context.iregsMD_CONTEXT_ARM_REG_PC);
+  EXPECT_EQ(0, frame2->context.iregsMD_CONTEXT_ARM_REG_LR);
+  EXPECT_EQ(frame2_sp.Value(), frame2->context.iregsMD_CONTEXT_ARM_REG_SP);
+  EXPECT_EQ(0, frame2->context.iregsMD_CONTEXT_ARM_REG_IOS_FP);
+}

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/stackwalker_x86.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/stackwalker_x86.cc Changed

@@ -203,10 +203,37 @@
   dictionary".cbCalleeParams" = last_frame_callee_parameter_size;
   dictionary".cbSavedRegs" = last_frame_info->saved_register_size;
   dictionary".cbLocals" = last_frame_info->local_size;
-  dictionary".raSearchStart" = last_frame->context.esp +
-                                 last_frame_callee_parameter_size +
-                                 last_frame_info->local_size +
-                                 last_frame_info->saved_register_size;
+
+  u_int32_t raSearchStart = last_frame->context.esp +
+                            last_frame_callee_parameter_size +
+                            last_frame_info->local_size +
+                            last_frame_info->saved_register_size;
+
+  u_int32_t raSearchStartOld = raSearchStart;
+  u_int32_t found = 0; // dummy value
+  // Scan up to three words above the calculated search value, in case
+  // the stack was aligned to a quadword boundary.
+  if (ScanForReturnAddress(raSearchStart, &raSearchStart, &found, 3) &&
+      last_frame->trust == StackFrame::FRAME_TRUST_CONTEXT &&
+      last_frame->windows_frame_info != NULL &&
+      last_frame_info->type_ == WindowsFrameInfo::STACK_INFO_FPO &&
+      raSearchStartOld == raSearchStart &&
+      found == last_frame->context.eip) {
+    // The context frame represents an FPO-optimized Windows system call.
+    // On the top of the stack we have a pointer to the current instruction.
+    // This means that the callee has returned but the return address is still
+    // on the top of the stack which is very atypical situaltion.
+    // Skip one slot from the stack and do another scan in order to get the
+    // actual return address.
+    raSearchStart += 4;
+    ScanForReturnAddress(raSearchStart, &raSearchStart, &found, 3);
+  }
+
+  // The difference between raSearch and raSearchStart is unknown,
+  // but making them the same seems to work well in practice.
+  dictionary".raSearchStart" = raSearchStart;
+  dictionary".raSearch" = raSearchStart;
+
   dictionary".cbParams" = last_frame_info->parameter_size;
 
   // Decide what type of program string to use. The program string is in

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/stackwalker_x86_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/stackwalker_x86_unittest.cc Changed

@@ -69,7 +69,11 @@
       // Give the two modules reasonable standard locations and names
       // for tests to play with.
       module1(0x40000000, 0x10000, "module1", "version1"),
-      module2(0x50000000, 0x10000, "module2", "version2") {
+      module2(0x50000000, 0x10000, "module2", "version2"),
+      module3(0x771d0000, 0x180000, "module3", "version3"),
+      module4(0x75f90000, 0x46000, "module4", "version4"),
+      module5(0x75730000, 0x110000, "module5", "version5"),
+      module6(0x647f0000, 0x1ba8000, "module6", "version6") {
     // Identify the system as a Linux system.
     system_info.os = "Linux";
     system_info.os_short = "linux";
@@ -83,6 +87,10 @@
     // Create some modules with some stock debugging information.
     modules.Add(&module1);
     modules.Add(&module2);
+    modules.Add(&module3);
+    modules.Add(&module4);
+    modules.Add(&module5);
+    modules.Add(&module6);
 
     // By default, none of the modules have symbol info; call
     // SetModuleSymbols to override this.
@@ -122,6 +130,10 @@
   MockMemoryRegion stack_region;
   MockCodeModule module1;
   MockCodeModule module2;
+  MockCodeModule module3;
+  MockCodeModule module4;
+  MockCodeModule module5;
+  MockCodeModule module6;
   MockCodeModules modules;
   MockSymbolSupplier supplier;
   BasicSourceLineResolver resolver;
@@ -196,24 +208,28 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
-  EXPECT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
-  EXPECT_EQ(0x4000c7a5U, frame0->instruction);
-  EXPECT_EQ(0x4000c7a5U, frame0->context.eip);
-  EXPECT_EQ(frame0_ebp.Value(), frame0->context.ebp);
-  EXPECT_EQ(NULL, frame0->windows_frame_info);
-
-  StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
-  ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
-             | StackFrameX86::CONTEXT_VALID_ESP
-             | StackFrameX86::CONTEXT_VALID_EBP),
-            frame1->context_validity);
-  EXPECT_EQ(0x40008679U, frame1->instruction + 1);
-  EXPECT_EQ(0x40008679U, frame1->context.eip);
-  EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
-  EXPECT_EQ(NULL, frame1->windows_frame_info);
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    EXPECT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x4000c7a5U, frame0->instruction);
+    EXPECT_EQ(0x4000c7a5U, frame0->context.eip);
+    EXPECT_EQ(frame0_ebp.Value(), frame0->context.ebp);
+    EXPECT_EQ(NULL, frame0->windows_frame_info);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP),
+              frame1->context_validity);
+    EXPECT_EQ(0x40008679U, frame1->instruction + 1);
+    EXPECT_EQ(0x40008679U, frame1->context.eip);
+    EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
+    EXPECT_EQ(NULL, frame1->windows_frame_info);
+  }
 }
 
 // Walk a traditional frame, but use a bogus %ebp value, forcing a scan
@@ -247,30 +263,34 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
-  ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
-  EXPECT_EQ(0x4000f49dU, frame0->instruction);
-  EXPECT_EQ(0x4000f49dU, frame0->context.eip);
-  EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
-  EXPECT_EQ(0xd43eed6eU, frame0->context.ebp);
-  EXPECT_EQ(NULL, frame0->windows_frame_info);
-
-  StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
-  // I'd argue that CONTEXT_VALID_EBP shouldn't be here, since the
-  // walker does not actually fetch the EBP after a scan (forcing the
-  // next frame to be scanned as well). But let's grandfather the existing
-  // behavior in for now.
-  ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
-             | StackFrameX86::CONTEXT_VALID_ESP
-             | StackFrameX86::CONTEXT_VALID_EBP),
-            frame1->context_validity);
-  EXPECT_EQ(0x4000129dU, frame1->instruction + 1);
-  EXPECT_EQ(0x4000129dU, frame1->context.eip);
-  EXPECT_EQ(0x80000014U, frame1->context.esp);
-  EXPECT_EQ(0xd43eed6eU, frame1->context.ebp);
-  EXPECT_EQ(NULL, frame1->windows_frame_info);
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x4000f49dU, frame0->instruction);
+    EXPECT_EQ(0x4000f49dU, frame0->context.eip);
+    EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
+    EXPECT_EQ(0xd43eed6eU, frame0->context.ebp);
+    EXPECT_EQ(NULL, frame0->windows_frame_info);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
+    // I'd argue that CONTEXT_VALID_EBP shouldn't be here, since the
+    // walker does not actually fetch the EBP after a scan (forcing the
+    // next frame to be scanned as well). But let's grandfather the existing
+    // behavior in for now.
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP),
+              frame1->context_validity);
+    EXPECT_EQ(0x4000129dU, frame1->instruction + 1);
+    EXPECT_EQ(0x4000129dU, frame1->context.eip);
+    EXPECT_EQ(0x80000014U, frame1->context.esp);
+    EXPECT_EQ(0xd43eed6eU, frame1->context.ebp);
+    EXPECT_EQ(NULL, frame1->windows_frame_info);
+  }
 }
 
 // Force scanning for a return address a long way down the stack
@@ -304,30 +324,34 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
-  ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
-  EXPECT_EQ(0x4000f49dU, frame0->instruction);
-  EXPECT_EQ(0x4000f49dU, frame0->context.eip);
-  EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
-  EXPECT_EQ(0xd43eed6eU, frame0->context.ebp);
-  EXPECT_EQ(NULL, frame0->windows_frame_info);
-
-  StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
-  // I'd argue that CONTEXT_VALID_EBP shouldn't be here, since the
-  // walker does not actually fetch the EBP after a scan (forcing the
-  // next frame to be scanned as well). But let's grandfather the existing
-  // behavior in for now.
-  ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
-             | StackFrameX86::CONTEXT_VALID_ESP
-             | StackFrameX86::CONTEXT_VALID_EBP),
-            frame1->context_validity);
-  EXPECT_EQ(0x4000129dU, frame1->instruction + 1);
-  EXPECT_EQ(0x4000129dU, frame1->context.eip);
-  EXPECT_EQ(0x80000064U, frame1->context.esp);
-  EXPECT_EQ(0xd43eed6eU, frame1->context.ebp);
-  EXPECT_EQ(NULL, frame1->windows_frame_info);
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x4000f49dU, frame0->instruction);
+    EXPECT_EQ(0x4000f49dU, frame0->context.eip);
+    EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
+    EXPECT_EQ(0xd43eed6eU, frame0->context.ebp);
+    EXPECT_EQ(NULL, frame0->windows_frame_info);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
+    // I'd argue that CONTEXT_VALID_EBP shouldn't be here, since the
+    // walker does not actually fetch the EBP after a scan (forcing the
+    // next frame to be scanned as well). But let's grandfather the existing
+    // behavior in for now.
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP),
+              frame1->context_validity);
+    EXPECT_EQ(0x4000129dU, frame1->instruction + 1);
+    EXPECT_EQ(0x4000129dU, frame1->context.eip);
+    EXPECT_EQ(0x80000064U, frame1->context.esp);
+    EXPECT_EQ(0xd43eed6eU, frame1->context.ebp);
+    EXPECT_EQ(NULL, frame1->windows_frame_info);
+  }
 }
 
 // Use Windows frame data (a "STACK WIN 4" record, from a
@@ -371,32 +395,101 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
-  ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
-  EXPECT_EQ(0x4000aa85U, frame0->instruction);
-  EXPECT_EQ(0x4000aa85U, frame0->context.eip);
-  EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
-  EXPECT_EQ(0xf052c1deU, frame0->context.ebp);
-  EXPECT_TRUE(frame0->windows_frame_info != NULL);
-
-  StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
-  ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
-             | StackFrameX86::CONTEXT_VALID_ESP
-             | StackFrameX86::CONTEXT_VALID_EBP
-             | StackFrameX86::CONTEXT_VALID_EBX
-             | StackFrameX86::CONTEXT_VALID_ESI
-             | StackFrameX86::CONTEXT_VALID_EDI),
-            frame1->context_validity);
-  EXPECT_EQ(0x40001350U, frame1->instruction + 1);
-  EXPECT_EQ(0x40001350U, frame1->context.eip);
-  EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
-  EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
-  EXPECT_EQ(0x9068a878U, frame1->context.ebx);
-  EXPECT_EQ(0xa7120d1aU, frame1->context.esi);
-  EXPECT_EQ(0x630891beU, frame1->context.edi);
-  EXPECT_EQ(NULL, frame1->windows_frame_info);
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x4000aa85U, frame0->instruction);
+    EXPECT_EQ(0x4000aa85U, frame0->context.eip);
+    EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
+    EXPECT_EQ(0xf052c1deU, frame0->context.ebp);
+    EXPECT_TRUE(frame0->windows_frame_info != NULL);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP
+               | StackFrameX86::CONTEXT_VALID_EBX
+               | StackFrameX86::CONTEXT_VALID_ESI
+               | StackFrameX86::CONTEXT_VALID_EDI),
+              frame1->context_validity);
+    EXPECT_EQ(0x40001350U, frame1->instruction + 1);
+    EXPECT_EQ(0x40001350U, frame1->context.eip);
+    EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
+    EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
+    EXPECT_EQ(0x9068a878U, frame1->context.ebx);
+    EXPECT_EQ(0xa7120d1aU, frame1->context.esi);
+    EXPECT_EQ(0x630891beU, frame1->context.edi);
+    EXPECT_EQ(NULL, frame1->windows_frame_info);
+  }
+}
+
+// Use Windows frame data (a "STACK WIN 4" record, from a
+// FrameTypeFrameData DIA record) to walk a stack frame where the stack
+// is aligned and we must search
+TEST_F(GetCallerFrame, WindowsFrameDataAligned) {
+  SetModuleSymbols(&module1,
+                   "STACK WIN 4 aa85 176 0 0 4 4 8 0 1"
+		   " $T1 .raSearch ="
+		   " $T0 $T1 4 - 8 @ ="
+		   " $ebp $T1 4 - ^ ="
+		   " $eip $T1 ^ ="
+		   " $esp $T1 4 + =");
+  Label frame1_esp, frame1_ebp;
+  stack_section.start() = 0x80000000;
+  stack_section
+    // frame 0
+    .D32(0x0ffa0ffa)                    // unused saved register
+    .D32(0xdeaddead)                    // locals
+    .D32(0xbeefbeef)
+    .D32(0)                             // 8-byte alignment
+    .D32(frame1_ebp)
+    .D32(0x5000129d)                    // return address
+    // frame 1
+    .Mark(&frame1_esp)
+    .D32(0x1)                           // parameter
+    .Mark(&frame1_ebp)
+    .D32(0)                             // saved %ebp (stack end)
+    .D32(0);                            // saved %eip (stack end)
+
+  RegionFromSection();
+  raw_context.eip = 0x4000aa85;
+  raw_context.esp = stack_section.start().Value();
+  raw_context.ebp = 0xf052c1de;         // should not be needed to walk frame
+
+  StackwalkerX86 walker(&system_info, &raw_context, &stack_region, &modules,
+                        &supplier, &resolver);
+  ASSERT_TRUE(walker.Walk(&call_stack));
+  frames = call_stack.frames();
+  ASSERT_EQ(2U, frames->size());
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x4000aa85U, frame0->instruction);
+    EXPECT_EQ(0x4000aa85U, frame0->context.eip);
+    EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
+    EXPECT_EQ(0xf052c1deU, frame0->context.ebp);
+    EXPECT_TRUE(frame0->windows_frame_info != NULL);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP),
+              frame1->context_validity);
+    EXPECT_EQ(0x5000129dU, frame1->instruction + 1);
+    EXPECT_EQ(0x5000129dU, frame1->context.eip);
+    EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
+    EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
+    EXPECT_EQ(NULL, frame1->windows_frame_info);
+  }
 }
 
 // Use Windows frame data (a "STACK WIN 4" record, from a
@@ -455,56 +548,66 @@
   frames = call_stack.frames();
   ASSERT_EQ(3U, frames->size());
 
-  StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
-  ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
-  EXPECT_EQ(0x40001004U, frame0->instruction);
-  EXPECT_EQ(0x40001004U, frame0->context.eip);
-  EXPECT_EQ(frame0_esp.Value(), frame0->context.esp);
-  EXPECT_EQ(frame0_ebp.Value(), frame0->context.ebp);
-  EXPECT_EQ(&module1, frame0->module);
-  EXPECT_EQ("module1::wheedle", frame0->function_name);
-  EXPECT_EQ(0x40001000U, frame0->function_base);
-  // The FUNC record for module1::wheedle should have produced a
-  // WindowsFrameInfo structure with only the parameter size valid.
-  ASSERT_TRUE(frame0->windows_frame_info != NULL);
-  EXPECT_EQ(WindowsFrameInfo::VALID_PARAMETER_SIZE,
-            frame0->windows_frame_info->valid);
-  EXPECT_EQ(12U, frame0->windows_frame_info->parameter_size);
-
-  StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
-  ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
-             | StackFrameX86::CONTEXT_VALID_ESP
-             | StackFrameX86::CONTEXT_VALID_EBP),
-            frame1->context_validity);
-  EXPECT_EQ(0x5000aa95U, frame1->instruction + 1);
-  EXPECT_EQ(0x5000aa95U, frame1->context.eip);
-  EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
-  EXPECT_EQ(0x6fa902e0U, frame1->context.ebp);
-  EXPECT_EQ(&module2, frame1->module);
-  EXPECT_EQ("module2::whine", frame1->function_name);
-  EXPECT_EQ(0x5000aa85U, frame1->function_base);
-  ASSERT_TRUE(frame1->windows_frame_info != NULL);
-  EXPECT_EQ(WindowsFrameInfo::VALID_ALL, frame1->windows_frame_info->valid);
-  // This should not see the 0xbeef parameter size from the FUNC
-  // record, but should instead see the STACK WIN record.
-  EXPECT_EQ(4U, frame1->windows_frame_info->parameter_size);
-
-  StackFrameX86 *frame2 = static_cast<StackFrameX86 *>(frames->at(2));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame2->trust);
-  ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
-             | StackFrameX86::CONTEXT_VALID_ESP
-             | StackFrameX86::CONTEXT_VALID_EBP
-             | StackFrameX86::CONTEXT_VALID_EBX),
-            frame2->context_validity);
-  EXPECT_EQ(0x2a179e38U, frame2->instruction + 1);
-  EXPECT_EQ(0x2a179e38U, frame2->context.eip);
-  EXPECT_EQ(frame2_esp.Value(), frame2->context.esp);
-  EXPECT_EQ(frame2_ebp.Value(), frame2->context.ebp);
-  EXPECT_EQ(0x2558c7f3U, frame2->context.ebx);
-  EXPECT_EQ(NULL, frame2->module);
-  EXPECT_EQ(NULL, frame2->windows_frame_info);
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x40001004U, frame0->instruction);
+    EXPECT_EQ(0x40001004U, frame0->context.eip);
+    EXPECT_EQ(frame0_esp.Value(), frame0->context.esp);
+    EXPECT_EQ(frame0_ebp.Value(), frame0->context.ebp);
+    EXPECT_EQ(&module1, frame0->module);
+    EXPECT_EQ("module1::wheedle", frame0->function_name);
+    EXPECT_EQ(0x40001000U, frame0->function_base);
+    // The FUNC record for module1::wheedle should have produced a
+    // WindowsFrameInfo structure with only the parameter size valid.
+    ASSERT_TRUE(frame0->windows_frame_info != NULL);
+    EXPECT_EQ(WindowsFrameInfo::VALID_PARAMETER_SIZE,
+              frame0->windows_frame_info->valid);
+    EXPECT_EQ(WindowsFrameInfo::STACK_INFO_UNKNOWN,
+              frame0->windows_frame_info->type_);
+    EXPECT_EQ(12U, frame0->windows_frame_info->parameter_size);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_FP, frame1->trust);
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP),
+              frame1->context_validity);
+    EXPECT_EQ(0x5000aa95U, frame1->instruction + 1);
+    EXPECT_EQ(0x5000aa95U, frame1->context.eip);
+    EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
+    EXPECT_EQ(0x6fa902e0U, frame1->context.ebp);
+    EXPECT_EQ(&module2, frame1->module);
+    EXPECT_EQ("module2::whine", frame1->function_name);
+    EXPECT_EQ(0x5000aa85U, frame1->function_base);
+    ASSERT_TRUE(frame1->windows_frame_info != NULL);
+    EXPECT_EQ(WindowsFrameInfo::VALID_ALL, frame1->windows_frame_info->valid);
+    EXPECT_EQ(WindowsFrameInfo::STACK_INFO_FRAME_DATA,
+              frame1->windows_frame_info->type_);
+    // This should not see the 0xbeef parameter size from the FUNC
+    // record, but should instead see the STACK WIN record.
+    EXPECT_EQ(4U, frame1->windows_frame_info->parameter_size);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame2 = static_cast<StackFrameX86 *>(frames->at(2));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame2->trust);
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP
+               | StackFrameX86::CONTEXT_VALID_EBX),
+              frame2->context_validity);
+    EXPECT_EQ(0x2a179e38U, frame2->instruction + 1);
+    EXPECT_EQ(0x2a179e38U, frame2->context.eip);
+    EXPECT_EQ(frame2_esp.Value(), frame2->context.esp);
+    EXPECT_EQ(frame2_ebp.Value(), frame2->context.ebp);
+    EXPECT_EQ(0x2558c7f3U, frame2->context.ebx);
+    EXPECT_EQ(NULL, frame2->module);
+    EXPECT_EQ(NULL, frame2->windows_frame_info);
+  }
 }
 
 // Use Windows frame data (a "STACK WIN 4" record, from a
@@ -539,29 +642,33 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
-  ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
-  EXPECT_EQ(0x40000c9cU, frame0->instruction);
-  EXPECT_EQ(0x40000c9cU, frame0->context.eip);
-  EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
-  EXPECT_EQ(0x2ae314cdU, frame0->context.ebp);
-  EXPECT_TRUE(frame0->windows_frame_info != NULL);
-
-  StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
-  // I'd argue that CONTEXT_VALID_EBP shouldn't be here, since the walker
-  // does not actually fetch the EBP after a scan (forcing the next frame
-  // to be scanned as well). But let's grandfather the existing behavior in
-  // for now.
-  ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
-             | StackFrameX86::CONTEXT_VALID_ESP
-             | StackFrameX86::CONTEXT_VALID_EBP),
-            frame1->context_validity);
-  EXPECT_EQ(0x50007ce9U, frame1->instruction + 1);
-  EXPECT_EQ(0x50007ce9U, frame1->context.eip);
-  EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
-  EXPECT_TRUE(frame1->windows_frame_info != NULL);
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x40000c9cU, frame0->instruction);
+    EXPECT_EQ(0x40000c9cU, frame0->context.eip);
+    EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
+    EXPECT_EQ(0x2ae314cdU, frame0->context.ebp);
+    EXPECT_TRUE(frame0->windows_frame_info != NULL);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_SCAN, frame1->trust);
+    // I'd argue that CONTEXT_VALID_EBP shouldn't be here, since the walker
+    // does not actually fetch the EBP after a scan (forcing the next frame
+    // to be scanned as well). But let's grandfather the existing behavior in
+    // for now.
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP),
+              frame1->context_validity);
+    EXPECT_EQ(0x50007ce9U, frame1->instruction + 1);
+    EXPECT_EQ(0x50007ce9U, frame1->context.eip);
+    EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
+    EXPECT_TRUE(frame1->windows_frame_info != NULL);
+  }
 }
 
 // Use Windows frame data (a "STACK WIN 4" record, from a
@@ -618,30 +725,34 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
-  ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
-  EXPECT_EQ(0x40000700U, frame0->instruction);
-  EXPECT_EQ(0x40000700U, frame0->context.eip);
-  EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
-  EXPECT_EQ(frame0_ebp.Value(), frame0->context.ebp);
-  EXPECT_TRUE(frame0->windows_frame_info != NULL);
-
-  StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CFI_SCAN, frame1->trust);
-  // I'd argue that CONTEXT_VALID_EBP shouldn't be here, since the
-  // walker does not actually fetch the EBP after a scan (forcing the
-  // next frame to be scanned as well). But let's grandfather the existing
-  // behavior in for now.
-  ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
-             | StackFrameX86::CONTEXT_VALID_ESP
-             | StackFrameX86::CONTEXT_VALID_EBP),
-            frame1->context_validity);
-  EXPECT_EQ(0x5000d000U, frame1->instruction + 1);
-  EXPECT_EQ(0x5000d000U, frame1->context.eip);
-  EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
-  EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
-  EXPECT_TRUE(frame1->windows_frame_info != NULL);
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x40000700U, frame0->instruction);
+    EXPECT_EQ(0x40000700U, frame0->context.eip);
+    EXPECT_EQ(stack_section.start().Value(), frame0->context.esp);
+    EXPECT_EQ(frame0_ebp.Value(), frame0->context.ebp);
+    EXPECT_TRUE(frame0->windows_frame_info != NULL);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CFI_SCAN, frame1->trust);
+    // I'd argue that CONTEXT_VALID_EBP shouldn't be here, since the
+    // walker does not actually fetch the EBP after a scan (forcing the
+    // next frame to be scanned as well). But let's grandfather the existing
+    // behavior in for now.
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP),
+              frame1->context_validity);
+    EXPECT_EQ(0x5000d000U, frame1->instruction + 1);
+    EXPECT_EQ(0x5000d000U, frame1->context.eip);
+    EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
+    EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
+    EXPECT_TRUE(frame1->windows_frame_info != NULL);
+  }
 }
 
 // Use Windows FrameTypeFPO data to walk a stack frame for a function that
@@ -681,35 +792,41 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
-  ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
-  EXPECT_EQ(0x4000e8b8U, frame0->instruction);
-  EXPECT_EQ(0x4000e8b8U, frame0->context.eip);
-  EXPECT_EQ(frame0_esp.Value(), frame0->context.esp);
-  EXPECT_EQ(frame1_ebp.Value(), frame0->context.ebp); // unchanged from caller
-  EXPECT_EQ(&module1, frame0->module);
-  EXPECT_EQ("module1::discombobulated", frame0->function_name);
-  EXPECT_EQ(0x4000e8a8U, frame0->function_base);
-  // The STACK WIN record for module1::discombobulated should have
-  // produced a fully populated WindowsFrameInfo structure.
-  ASSERT_TRUE(frame0->windows_frame_info != NULL);
-  EXPECT_EQ(WindowsFrameInfo::VALID_ALL, frame0->windows_frame_info->valid);
-  EXPECT_EQ(0x10U, frame0->windows_frame_info->local_size);
-
-  StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
-  ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
-             | StackFrameX86::CONTEXT_VALID_ESP
-             | StackFrameX86::CONTEXT_VALID_EBP),
-            frame1->context_validity);
-  EXPECT_EQ(0x40009b5bU, frame1->instruction + 1);
-  EXPECT_EQ(0x40009b5bU, frame1->context.eip);
-  EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
-  EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
-  EXPECT_EQ(&module1, frame1->module);
-  EXPECT_EQ("", frame1->function_name);
-  EXPECT_EQ(NULL, frame1->windows_frame_info);
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x4000e8b8U, frame0->instruction);
+    EXPECT_EQ(0x4000e8b8U, frame0->context.eip);
+    EXPECT_EQ(frame0_esp.Value(), frame0->context.esp);
+    EXPECT_EQ(frame1_ebp.Value(), frame0->context.ebp); // unchanged from caller
+    EXPECT_EQ(&module1, frame0->module);
+    EXPECT_EQ("module1::discombobulated", frame0->function_name);
+    EXPECT_EQ(0x4000e8a8U, frame0->function_base);
+    // The STACK WIN record for module1::discombobulated should have
+    // produced a fully populated WindowsFrameInfo structure.
+    ASSERT_TRUE(frame0->windows_frame_info != NULL);
+    EXPECT_EQ(WindowsFrameInfo::VALID_ALL, frame0->windows_frame_info->valid);
+    EXPECT_EQ(WindowsFrameInfo::STACK_INFO_FPO,
+              frame0->windows_frame_info->type_);
+    EXPECT_EQ(0x10U, frame0->windows_frame_info->local_size);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP),
+              frame1->context_validity);
+    EXPECT_EQ(0x40009b5bU, frame1->instruction + 1);
+    EXPECT_EQ(0x40009b5bU, frame1->context.eip);
+    EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
+    EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
+    EXPECT_EQ(&module1, frame1->module);
+    EXPECT_EQ("", frame1->function_name);
+    EXPECT_EQ(NULL, frame1->windows_frame_info);
+  }
 }
 
 // Use Windows FrameTypeFPO data to walk a stack frame for a function
@@ -751,36 +868,188 @@
   frames = call_stack.frames();
   ASSERT_EQ(2U, frames->size());
 
-  StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
-  ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
-  EXPECT_EQ(0x40009ab8U, frame0->instruction);
-  EXPECT_EQ(0x40009ab8U, frame0->context.eip);
-  EXPECT_EQ(frame0_esp.Value(), frame0->context.esp);
-  EXPECT_EQ(0xecbdd1a5, frame0->context.ebp);
-  EXPECT_EQ(&module1, frame0->module);
-  EXPECT_EQ("module1::RaisedByTheAliens", frame0->function_name);
-  EXPECT_EQ(0x40009aa8U, frame0->function_base);
-  // The STACK WIN record for module1::RaisedByTheAliens should have
-  // produced a fully populated WindowsFrameInfo structure.
-  ASSERT_TRUE(frame0->windows_frame_info != NULL);
-  EXPECT_EQ(WindowsFrameInfo::VALID_ALL, frame0->windows_frame_info->valid);
-  EXPECT_EQ("", frame0->windows_frame_info->program_string);
-  EXPECT_TRUE(frame0->windows_frame_info->allocates_base_pointer);
-
-  StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
-  EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
-  ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
-             | StackFrameX86::CONTEXT_VALID_ESP
-             | StackFrameX86::CONTEXT_VALID_EBP),
-            frame1->context_validity);
-  EXPECT_EQ(0x4000debeU, frame1->instruction + 1);
-  EXPECT_EQ(0x4000debeU, frame1->context.eip);
-  EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
-  EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
-  EXPECT_EQ(&module1, frame1->module);
-  EXPECT_EQ("", frame1->function_name);
-  EXPECT_EQ(NULL, frame1->windows_frame_info);
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x40009ab8U, frame0->instruction);
+    EXPECT_EQ(0x40009ab8U, frame0->context.eip);
+    EXPECT_EQ(frame0_esp.Value(), frame0->context.esp);
+    EXPECT_EQ(0xecbdd1a5, frame0->context.ebp);
+    EXPECT_EQ(&module1, frame0->module);
+    EXPECT_EQ("module1::RaisedByTheAliens", frame0->function_name);
+    EXPECT_EQ(0x40009aa8U, frame0->function_base);
+    // The STACK WIN record for module1::RaisedByTheAliens should have
+    // produced a fully populated WindowsFrameInfo structure.
+    ASSERT_TRUE(frame0->windows_frame_info != NULL);
+    EXPECT_EQ(WindowsFrameInfo::VALID_ALL, frame0->windows_frame_info->valid);
+    EXPECT_EQ(WindowsFrameInfo::STACK_INFO_FPO,
+              frame0->windows_frame_info->type_);
+    EXPECT_EQ("", frame0->windows_frame_info->program_string);
+    EXPECT_TRUE(frame0->windows_frame_info->allocates_base_pointer);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP),
+              frame1->context_validity);
+    EXPECT_EQ(0x4000debeU, frame1->instruction + 1);
+    EXPECT_EQ(0x4000debeU, frame1->context.eip);
+    EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
+    EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
+    EXPECT_EQ(&module1, frame1->module);
+    EXPECT_EQ("", frame1->function_name);
+    EXPECT_EQ(NULL, frame1->windows_frame_info);
+  }
+}
+
+// This is a regression unit test which covers a bug which has to do with
+// FPO-optimized Windows system call stubs in the context frame.  There is
+// a more recent Windows system call dispatch mechanism which differs from
+// the one which is being tested here.  The newer system call dispatch
+// mechanism creates an extra context frame (KiFastSystemCallRet).
+TEST_F(GetCallerFrame, WindowsFPOSystemCall) {
+  SetModuleSymbols(&module3,  // ntdll.dll
+                   "PUBLIC 1f8ac c ZwWaitForSingleObject\n"
+                   "STACK WIN 0 1f8ac 1b 0 0 c 0 0 0 0 0\n");
+  SetModuleSymbols(&module4,  // kernelbase.dll
+                   "PUBLIC 109f9 c WaitForSingleObjectEx\n"
+                   "PUBLIC 36590 0 _except_handler4\n"
+                   "STACK WIN 4 109f9 df c 0 c c 48 0 1 $T0 $ebp = $eip "
+                   "$T0 4 + ^ = $ebp $T0 ^ = $esp $T0 8 + = $L "
+                   "$T0 .cbSavedRegs - = $P $T0 8 + .cbParams + =\n"
+                   "STACK WIN 4 36590 154 17 0 10 0 14 0 1 $T0 $ebp = $eip "
+                   "$T0 4 + ^ = $ebp $T0 ^ = $esp $T0 8 + = $L $T0 "
+                   ".cbSavedRegs - = $P $T0 8 + .cbParams + =\n");
+  SetModuleSymbols(&module5,  // kernel32.dll
+                   "PUBLIC 11136 8 WaitForSingleObject\n"
+                   "PUBLIC 11151 c WaitForSingleObjectExImplementation\n"
+                   "STACK WIN 4 11136 16 5 0 8 0 0 0 1 $T0 $ebp = $eip "
+                   "$T0 4 + ^ = $ebp $T0 ^ = $esp $T0 8 + = $L "
+                   "$T0 .cbSavedRegs - = $P $T0 8 + .cbParams + =\n"
+                   "STACK WIN 4 11151 7a 5 0 c 0 0 0 1 $T0 $ebp = $eip "
+                   "$T0 4 + ^ = $ebp $T0 ^ = $esp $T0 8 + = $L "
+                   "$T0 .cbSavedRegs - = $P $T0 8 + .cbParams + =\n");
+  SetModuleSymbols(&module6,  // chrome.dll
+                   "FILE 7038 some_file_name.h\n"
+                   "FILE 839776 some_file_name.cc\n"
+                   "FUNC 217fda 17 4 function_217fda\n"
+                   "217fda 4 102 839776\n"
+                   "FUNC 217ff1 a 4 function_217ff1\n"
+                   "217ff1 0 594 7038\n"
+                   "217ff1 a 596 7038\n"
+                   "STACK WIN 0 217ff1 a 0 0 4 0 0 0 0 0\n");
+
+  Label frame0_esp, frame1_esp;
+  Label frame1_ebp, frame2_ebp, frame3_ebp;
+  stack_section.start() = 0x002ff290;
+  stack_section
+    .Mark(&frame0_esp)
+    .D32(0x771ef8c1)    // EIP in frame 0 (system call)
+    .D32(0x75fa0a91)    // return address of frame 0
+    .Mark(&frame1_esp)
+    .D32(0x000017b0)    // args to child
+    .D32(0x00000000)
+    .D32(0x002ff2d8)
+    .D32(0x88014a2e)
+    .D32(0x002ff364)
+    .D32(0x000017b0)
+    .D32(0x00000000)
+    .D32(0x00000024)
+    .D32(0x00000001)
+    .D32(0x00000000)
+    .D32(0x00000000)
+    .D32(0x00000000)
+    .D32(0x00000000)
+    .D32(0x00000000)
+    .D32(0x00000000)
+    .D32(0x00000000)
+    .D32(0x9e3b9800)
+    .D32(0xfffffff7)
+    .D32(0x00000000)
+    .D32(0x002ff2a4)
+    .D32(0x64a07ff1)    // random value to be confused with a return address
+    .D32(0x002ff8dc)
+    .D32(0x75fc6590)    // random value to be confused with a return address
+    .D32(0xfdd2c6ea)
+    .D32(0x00000000)
+    .Mark(&frame1_ebp)
+    .D32(frame2_ebp)    // Child EBP
+    .D32(0x75741194)    // return address of frame 1
+    .D32(0x000017b0)    // args to child
+    .D32(0x0036ee80)
+    .D32(0x00000000)
+    .D32(0x65bc7d14)
+    .Mark(&frame2_ebp)
+    .D32(frame3_ebp)    // Child EBP
+    .D32(0x75741148)    // return address of frame 2
+    .D32(0x000017b0)    // args to child
+    .D32(0x0036ee80)
+    .D32(0x00000000)
+    .Mark(&frame3_ebp)
+    .D32(0)             // saved %ebp (stack end)
+    .D32(0);            // saved %eip (stack end)
+
+  RegionFromSection();
+  raw_context.eip = 0x771ef8c1;  // in ntdll::ZwWaitForSingleObject
+  raw_context.esp = stack_section.start().Value();
+  ASSERT_TRUE(raw_context.esp == frame0_esp.Value());
+  raw_context.ebp = frame1_ebp.Value();
+
+  StackwalkerX86 walker(&system_info, &raw_context, &stack_region, &modules,
+                        &supplier, &resolver);
+  ASSERT_TRUE(walker.Walk(&call_stack));
+  frames = call_stack.frames();
+
+  ASSERT_EQ(4U, frames->size());
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+    EXPECT_EQ(0x771ef8c1U, frame0->instruction);
+    EXPECT_EQ(0x771ef8c1U, frame0->context.eip);
+    EXPECT_EQ(frame0_esp.Value(), frame0->context.esp);
+    EXPECT_EQ(frame1_ebp.Value(), frame0->context.ebp);
+    EXPECT_EQ(&module3, frame0->module);
+    EXPECT_EQ("ZwWaitForSingleObject", frame0->function_name);
+    // The STACK WIN record for module3!ZwWaitForSingleObject should have
+    // produced a fully populated WindowsFrameInfo structure.
+    ASSERT_TRUE(frame0->windows_frame_info != NULL);
+    EXPECT_EQ(WindowsFrameInfo::VALID_ALL, frame0->windows_frame_info->valid);
+    EXPECT_EQ(WindowsFrameInfo::STACK_INFO_FPO,
+              frame0->windows_frame_info->type_);
+    EXPECT_EQ("", frame0->windows_frame_info->program_string);
+    EXPECT_FALSE(frame0->windows_frame_info->allocates_base_pointer);
+  }
+
+  {  // To avoid reusing locals by mistake
+    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+    EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
+    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP
+               | StackFrameX86::CONTEXT_VALID_ESP
+               | StackFrameX86::CONTEXT_VALID_EBP),
+              frame1->context_validity);
+    EXPECT_EQ(0x75fa0a91U, frame1->instruction + 1);
+    EXPECT_EQ(0x75fa0a91U, frame1->context.eip);
+    EXPECT_EQ(frame1_esp.Value(), frame1->context.esp);
+    EXPECT_EQ(frame1_ebp.Value(), frame1->context.ebp);
+    EXPECT_EQ(&module4, frame1->module);
+    EXPECT_EQ("WaitForSingleObjectEx", frame1->function_name);
+    // The STACK WIN record for module4!WaitForSingleObjectEx should have
+    // produced a fully populated WindowsFrameInfo structure.
+    ASSERT_TRUE(frame1->windows_frame_info != NULL);
+    EXPECT_EQ(WindowsFrameInfo::VALID_ALL, frame1->windows_frame_info->valid);
+    EXPECT_EQ(WindowsFrameInfo::STACK_INFO_FRAME_DATA,
+              frame1->windows_frame_info->type_);
+    EXPECT_EQ("$T0 $ebp = $eip $T0 4 + ^ = $ebp $T0 ^ = $esp $T0 8 + = $L "
+              "$T0 .cbSavedRegs - = $P $T0 8 + .cbParams + =",
+              frame1->windows_frame_info->program_string);
+    EXPECT_FALSE(frame1->windows_frame_info->allocates_base_pointer);
+  }
 }
 
 struct CFIFixture: public StackwalkerX86Fixture {
@@ -836,32 +1105,36 @@
     frames = call_stack.frames();
     ASSERT_EQ(2U, frames->size());
 
-    StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
-    EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
-    ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
-    EXPECT_EQ("enchiridion", frame0->function_name);
-    EXPECT_EQ(0x40004000U, frame0->function_base);
-    ASSERT_TRUE(frame0->windows_frame_info != NULL);
-    ASSERT_EQ(WindowsFrameInfo::VALID_PARAMETER_SIZE,
-              frame0->windows_frame_info->valid);
-    ASSERT_TRUE(frame0->cfi_frame_info != NULL);
-
-    StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
-    EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
-    ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP |
-               StackFrameX86::CONTEXT_VALID_ESP |
-               StackFrameX86::CONTEXT_VALID_EBP |
-               StackFrameX86::CONTEXT_VALID_EBX |
-               StackFrameX86::CONTEXT_VALID_ESI |
-               StackFrameX86::CONTEXT_VALID_EDI),
-              frame1->context_validity);
-    EXPECT_EQ(expected.eip, frame1->context.eip);
-    EXPECT_EQ(expected.esp, frame1->context.esp);
-    EXPECT_EQ(expected.ebp, frame1->context.ebp);
-    EXPECT_EQ(expected.ebx, frame1->context.ebx);
-    EXPECT_EQ(expected.esi, frame1->context.esi);
-    EXPECT_EQ(expected.edi, frame1->context.edi);
-    EXPECT_EQ("epictetus", frame1->function_name);
+    {  // To avoid reusing locals by mistake
+      StackFrameX86 *frame0 = static_cast<StackFrameX86 *>(frames->at(0));
+      EXPECT_EQ(StackFrame::FRAME_TRUST_CONTEXT, frame0->trust);
+      ASSERT_EQ(StackFrameX86::CONTEXT_VALID_ALL, frame0->context_validity);
+      EXPECT_EQ("enchiridion", frame0->function_name);
+      EXPECT_EQ(0x40004000U, frame0->function_base);
+      ASSERT_TRUE(frame0->windows_frame_info != NULL);
+      ASSERT_EQ(WindowsFrameInfo::VALID_PARAMETER_SIZE,
+                frame0->windows_frame_info->valid);
+      ASSERT_TRUE(frame0->cfi_frame_info != NULL);
+    }
+
+    {  // To avoid reusing locals by mistake
+      StackFrameX86 *frame1 = static_cast<StackFrameX86 *>(frames->at(1));
+      EXPECT_EQ(StackFrame::FRAME_TRUST_CFI, frame1->trust);
+      ASSERT_EQ((StackFrameX86::CONTEXT_VALID_EIP |
+                 StackFrameX86::CONTEXT_VALID_ESP |
+                 StackFrameX86::CONTEXT_VALID_EBP |
+                 StackFrameX86::CONTEXT_VALID_EBX |
+                 StackFrameX86::CONTEXT_VALID_ESI |
+                 StackFrameX86::CONTEXT_VALID_EDI),
+                 frame1->context_validity);
+      EXPECT_EQ(expected.eip, frame1->context.eip);
+      EXPECT_EQ(expected.esp, frame1->context.esp);
+      EXPECT_EQ(expected.ebp, frame1->context.ebp);
+      EXPECT_EQ(expected.ebx, frame1->context.ebx);
+      EXPECT_EQ(expected.esi, frame1->context.esi);
+      EXPECT_EQ(expected.edi, frame1->context.edi);
+      EXPECT_EQ("epictetus", frame1->function_name);
+    }
   }
 
   // The values the stack walker should find for the caller's registers.

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/synth_minidump_unittest.cc -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/synth_minidump_unittest.cc Changed

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/processor/windows_frame_info.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/processor/windows_frame_info.h Changed

@@ -72,7 +72,8 @@
     STACK_INFO_UNKNOWN = -1
   };
 
-  WindowsFrameInfo() : valid(VALID_NONE),
+  WindowsFrameInfo() : type_(STACK_INFO_UNKNOWN),
+                     valid(VALID_NONE),
                      prolog_size(0),
                      epilog_size(0),
                      parameter_size(0),
@@ -82,7 +83,8 @@
                      allocates_base_pointer(0),
                      program_string() {}
 
-  WindowsFrameInfo(u_int32_t set_prolog_size,
+  WindowsFrameInfo(StackInfoTypes type,
+                 u_int32_t set_prolog_size,
                  u_int32_t set_epilog_size,
                  u_int32_t set_parameter_size,
                  u_int32_t set_saved_register_size,
@@ -90,7 +92,8 @@
                  u_int32_t set_max_stack_size,
                  int set_allocates_base_pointer,
                  const std::string set_program_string)
-      : valid(VALID_ALL),
+      : type_(type),
+        valid(VALID_ALL),
         prolog_size(set_prolog_size),
         epilog_size(set_epilog_size),
         parameter_size(set_parameter_size),
@@ -140,7 +143,8 @@
       allocates_base_pointer = strtoul(tokens10, NULL, 16);
     }
 
-    return new WindowsFrameInfo(prolog_size,
+    return new WindowsFrameInfo(static_cast<StackInfoTypes>(type),
+                                prolog_size,
                                 epilog_size,
                                 parameter_size,
                                 saved_register_size,
@@ -152,6 +156,7 @@
 
   // CopyFrom makes "this" WindowsFrameInfo object identical to "that".
   void CopyFrom(const WindowsFrameInfo &that) {
+    type_ = that.type_;
     valid = that.valid;
     prolog_size = that.prolog_size;
     epilog_size = that.epilog_size;
@@ -166,10 +171,13 @@
   // Clears the WindowsFrameInfo object so that users will see it as though
   // it contains no information.
   void Clear() {
+    type_ = STACK_INFO_UNKNOWN;
     valid = VALID_NONE;
     program_string.erase();
   }
 
+  StackInfoTypes type_;
+
   // Identifies which fields in the structure are valid.  This is of
   // type Validity, but it is defined as an int because it's not
   // possible to OR values into an enumerated type.  Users must check

tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/third_party/curl/COPYING Added

@@ -0,0 +1,22 @@
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1996 - 2011, Daniel Stenberg, <daniel@haxx.se>.
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
+

tomahawk-0.4.2.tar.bz2/thirdparty/breakpad/third_party/lss/linux_syscall_support.h -> tomahawk-0.5.5.tar.bz2/thirdparty/breakpad/third_party/lss/linux_syscall_support.h Changed

@@ -87,7 +87,7 @@
  */
 #if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) ||   \
      defined(__mips__) || defined(__PPC__) || defined(__ARM_EABI__)) \
-  && defined(__linux)
+  && (defined(__linux) || defined(__ANDROID__))
 
 #ifndef SYS_CPLUSPLUS
 #ifdef __cplusplus
@@ -99,6 +99,7 @@
 #endif
 
 #include <errno.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stddef.h>
@@ -107,7 +108,7 @@
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <syscall.h>
+#include <sys/syscall.h>
 #include <unistd.h>
 #include <linux/unistd.h>
 #include <endian.h>
@@ -1844,8 +1845,6 @@
                                    void *newtls, int *child_tidptr) {
       long __res;
       {
-        register void *__tls  __asm__("r8")  = newtls;
-        register int  *__ctid __asm__("r10") = child_tidptr;
         __asm__ __volatile__(/* if (fn == NULL)
                               *   return -EINVAL;
                               */
@@ -1876,6 +1875,8 @@
                               *                %r10 = child_tidptr)
                               */
                              "movq   %2,%%rax\n"
+                             "movq   %9,%%r8\n"
+                             "movq   %10,%%r10\n"
                              LSS_ENTRYPOINT
 
                              /* if (%rax != 0)
@@ -1906,8 +1907,9 @@
                              : "=a" (__res)
                              : "0"(-EINVAL), "i"(__NR_clone), "i"(__NR_exit),
                                "r"(fn), "S"(child_stack), "D"(flags), "r"(arg),
-                               "d"(parent_tidptr), "r"(__tls), "r"(__ctid)
-                             : "rsp", "memory", "r11", "rcx");
+                               "d"(parent_tidptr), "r"(newtls),
+                               "r"(child_tidptr)
+                             : "rsp", "memory", "r8", "r10", "r11", "rcx");
       }
       LSS_RETURN(int, __res);
     }
@@ -2138,7 +2140,9 @@
                               *   return -EINVAL;
                               */
                              "cmp   %2,#0\n"
+                             "it    ne\n"
                              "cmpne %3,#0\n"
+                             "it    eq\n"
                              "moveq %0,%1\n"
                              "beq   1f\n"
 
@@ -2166,8 +2170,24 @@
                              /* In the child, now. Call "fn(arg)".
                               */
                              "ldr   r0,sp, #4\n"
+
+                             /* When compiling for Thumb-2 the "MOV LR,PC" here
+                              * won't work because it loads PC+4 into LR,
+                              * whereas the LDR is a 4-byte instruction.
+                              * This results in the child thread always
+                              * crashing with an "Illegal Instruction" when it
+                              * returned into the middle of the LDR instruction
+                              * The instruction sequence used instead was
+                              * recommended by
+                              * "https://wiki.edubuntu.org/ARM/Thumb2PortingHowto#Quick_Reference".
+                              */
+                           #ifdef __thumb2__
+                             "ldr   r7,sp\n"
+                             "blx   r7\n"
+                           #else
                              "mov   lr,pc\n"
                              "ldr   pc,sp\n"
+                           #endif
 
                              /* Call _exit(%r0).
                               */
@@ -2724,7 +2744,7 @@
   LSS_INLINE _syscall2(int,     sigaltstack,     const stack_t*, s,
                        const stack_t*, o)
   #if defined(__NR_sigreturn)
-  LSS_INLINE _syscall1(int,     sigreturn,       unsigned long, u);
+  LSS_INLINE _syscall1(int,     sigreturn,       unsigned long, u)
   #endif
   LSS_INLINE _syscall2(int,     stat,            const char*, f,
                       struct kernel_stat*,   b)
@@ -2741,7 +2761,7 @@
                        const struct kernel_iovec*, v, size_t, c)
   #if defined(__NR_getcpu)
     LSS_INLINE _syscall3(long, getcpu, unsigned *, cpu,
-                         unsigned *, node, void *, unused);
+                         unsigned *, node, void *, unused)
   #endif
   #if defined(__x86_64__) ||                                                  \
      (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI32)
@@ -3012,9 +3032,13 @@
     #define __NR__sigprocmask __NR_sigprocmask
     #define __NR__sigsuspend  __NR_sigsuspend
     #define __NR__socketcall  __NR_socketcall
+#if ! defined(__ANDROID__)
+    /* The Android NDK #defines stat64 stat, so avoid multiple-definition */
     LSS_INLINE _syscall2(int, fstat64,             int, f,
                          struct kernel_stat64 *, b)
-    LSS_INLINE _syscall5(int, _llseek,     uint, fd, ulong, hi, ulong, lo,
+#endif
+    LSS_INLINE _syscall5(int, _llseek,     uint, fd,
+                         unsigned long, hi, unsigned long, lo,
                          loff_t *, res, uint, wh)
 #if !defined(__ARM_EABI__)
     LSS_INLINE _syscall1(void*, mmap,              void*, a)
@@ -3022,7 +3046,7 @@
     LSS_INLINE _syscall6(void*, mmap2,             void*, s,
                          size_t,                   l, int,               p,
                          int,                      f, int,               d,
-                         __off64_t,                o)
+                         off_t,                o)
     LSS_INLINE _syscall3(int,   _sigaction,        int,   s,
                          const struct kernel_old_sigaction*,  a,
                          struct kernel_old_sigaction*,        o)
@@ -3037,8 +3061,11 @@
                          int,                      b,
                          unsigned long,            s)
     #endif
+#if ! defined(__ANDROID__)
+    /* The Android NDK #defines stat64 stat, so avoid multiple-definition */
     LSS_INLINE _syscall2(int, stat64,              const char *, p,
                          struct kernel_stat64 *, b)
+#endif
 
     LSS_INLINE int LSS_NAME(sigaction)(int signum,
                                        const struct kernel_sigaction *act,